From b503f10846f9dd72506cdc07389fab01ff0c2c45 Mon Sep 17 00:00:00 2001
From: Dominique Fournier <dominique.fournier@grenoble.cnrs.fr>
Date: Thu, 10 Sep 2020 11:19:46 +0200
Subject: When there is no cards, the search will generate an error :
 in_array() expects parameter 2 to be array, null given at
 /var/www/html/nextcloud/apps/carnet/lib/Misc/Search.php#120

---
 lib/Misc/Search.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/Misc/Search.php b/lib/Misc/Search.php
index 018f112..74de4e3 100644
--- a/lib/Misc/Search.php
+++ b/lib/Misc/Search.php
@@ -17,6 +17,7 @@ class Search {
     private $searchCache;
     private $current=0;
     private $from;
+    private $pathArray = array ();
 
     /**
          * @param string $appName
@@ -188,4 +189,4 @@ $this->setName('carnet:search')
 
 
 }
-?>
\ No newline at end of file
+?>
-- 
cgit v1.2.3


From 750edc9dc168f12278eb9da4782463d872ec980a Mon Sep 17 00:00:00 2001
From: Dominique Fournier <dominique.fournier@grenoble.cnrs.fr>
Date: Thu, 10 Sep 2020 13:23:24 +0200
Subject: search : if there is no metadata, do not generate an error log :
 "Invalid argument supplied for foreach() at
 /var/www/html/nextcloud/apps/carnet/lib/Misc/Search.php#135",

---
 lib/Misc/Search.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/Misc/Search.php b/lib/Misc/Search.php
index 74de4e3..cdcf303 100644
--- a/lib/Misc/Search.php
+++ b/lib/Misc/Search.php
@@ -132,11 +132,14 @@ private function search($relativePath, $folder, $query, $curDepth){
                 try {
                     $metadata = json_decode($zipFile->getEntryContents("metadata.json"));
                     $hasFound = false;
-                    foreach($metadata->keywords as $keyword){
-                        if(strstr($this->removeAccents(strtolower($keyword)), $query)){
-                            $this->writeFound($relativePath,$in);
-                            $hasFound = true;
-                            break;
+                    if (is_object ($metadata))
+                    {
+                        foreach($metadata->keywords as $keyword){
+                            if(strstr($this->removeAccents(strtolower($keyword)), $query)){
+                                $this->writeFound($relativePath,$in);
+                                $hasFound = true;
+                                break;
+                            }
                         }
                     }
                     if($hasFound){
-- 
cgit v1.2.3


From 01c6e632c27d39858d5efc9b3eaf63e3b7f3b60a Mon Sep 17 00:00:00 2001
From: Dominique Fournier <dominique.fournier@grenoble.cnrs.fr>
Date: Thu, 10 Sep 2020 13:26:03 +0200
Subject: Empty search validated : do not generate a log "strstr(): Empty
 needle at /var/www/html/nextcloud/apps/carnet/lib/Misc/Search.php#152"

---
 lib/Misc/Search.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/Misc/Search.php b/lib/Misc/Search.php
index cdcf303..3ee11a0 100644
--- a/lib/Misc/Search.php
+++ b/lib/Misc/Search.php
@@ -149,7 +149,7 @@ private function search($relativePath, $folder, $query, $curDepth){
                 } catch(Exception $e){
                 }
                 $index = $zipFile->getEntryContents("index.html");
-                if(strstr(strtolower($this->removeAccents($index)), $query)){
+                if(trim ($query) !== "" && strstr(strtolower($this->removeAccents($index)), $query)){
                     $this->writeFound($relativePath,$in);
                 }
             } catch(\OCP\Files\NotFoundException $e) {
-- 
cgit v1.2.3