From 55b3aa3552b0627510bce66ff208529c168a2836 Mon Sep 17 00:00:00 2001
From: vincent-peugnet <v.peugnet@free.fr>
Date: Thu, 26 Mar 2020 21:09:06 +0100
Subject: add id in deepsearchbar options

---
 app/class/Controllerhome.php | 3 ++-
 app/class/Controllerpage.php | 1 -
 app/class/Modelhome.php      | 3 +++
 app/class/Page.php           | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'app/class')

diff --git a/app/class/Controllerhome.php b/app/class/Controllerhome.php
index 71f110e..907bef7 100644
--- a/app/class/Controllerhome.php
+++ b/app/class/Controllerhome.php
@@ -74,8 +74,9 @@ class Controllerhome extends Controllerpage
     public function deepsearch() : array
     {
         if (!isset($_GET['search'])) {
-            $searchopt = ['title' => 1, 'description' => 1, 'content' => 1, 'other' => 0, 'casesensitive' => 0];
+            $searchopt = ['id' => 1, 'title' => 1, 'description' => 1, 'content' => 1, 'other' => 0, 'casesensitive' => 0];
         } else {
+            $searchopt['id'] = $_GET['id'] ?? 0;
             $searchopt['title'] = $_GET['title'] ?? 0;
             $searchopt['description'] = $_GET['description'] ?? 0;
             $searchopt['content'] = $_GET['content'] ?? 0;
diff --git a/app/class/Controllerpage.php b/app/class/Controllerpage.php
index 881f1d3..c6983af 100644
--- a/app/class/Controllerpage.php
+++ b/app/class/Controllerpage.php
@@ -221,7 +221,6 @@ class Controllerpage extends Controller
         if ($this->user->iseditor() && !$this->importpage()) {
             $this->page->reset();
             $this->page->addauthor($this->user->id());
-            $this->page->setbody(Config::defaultbody());
             $this->pagemanager->add($this->page);
             $this->routedirect('pageedit', ['page' => $this->page->id()]);
         } else {
diff --git a/app/class/Modelhome.php b/app/class/Modelhome.php
index 949c4f7..8d7a38b 100644
--- a/app/class/Modelhome.php
+++ b/app/class/Modelhome.php
@@ -142,6 +142,9 @@ class Modelhome extends Modelpage
 				$count += preg_match($regex, $page->css());
 				$count += preg_match($regex, $page->javascript());
 			}
+			if ($options['id']) {
+				$count += preg_match($regex, $page->id());
+			}
 			if ($options['title']) {
 				$count += preg_match($regex, $page->title());
 			}
diff --git a/app/class/Page.php b/app/class/Page.php
index cf73e98..d936671 100644
--- a/app/class/Page.php
+++ b/app/class/Page.php
@@ -78,7 +78,7 @@ class Page extends Dbitem
 		$this->setdaterender($now);
 		$this->setcss('');
 		$this->setjavascript('');
-		$this->setbody('');
+		$this->setbody(Config::defaultbody());
 		$this->setheader('');
 		$this->setmain('');
 		$this->setnav('');
-- 
cgit v1.2.3