From 7e3dc1d1c064b8e548f104d3ea6d208519a2519d Mon Sep 17 00:00:00 2001 From: Fred Tempez Date: Sat, 15 Aug 2020 09:35:43 +0200 Subject: [PATCH] nom du module + variables static --- core/core.php | 1 - core/module/install/ressource/defaultdata.php | 2 +- .../research.php => search/search.php} | 24 +++++++++++-------- .../{research => search}/view/index/index.php | 0 .../view/result/result.php | 4 ++-- 5 files changed, 17 insertions(+), 14 deletions(-) rename module/{research/research.php => search/search.php} (89%) rename module/{research => search}/view/index/index.php (100%) rename module/{research => search}/view/result/result.php (85%) diff --git a/core/core.php b/core/core.php index c2ac6916..9a66b6eb 100755 --- a/core/core.php +++ b/core/core.php @@ -48,7 +48,6 @@ class common { 'install', 'maintenance', 'page', - 'search', 'sitemap', 'theme', 'user' diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php index 49fb8d2f..59027d38 100755 --- a/core/module/install/ressource/defaultdata.php +++ b/core/module/install/ressource/defaultdata.php @@ -599,7 +599,7 @@ class init extends common { 'breadCrumb' => false, 'metaDescription' => '', 'metaTitle' => '', - 'moduleId' => 'research', + 'moduleId' => 'search', 'modulePosition' => 'bottom', 'parentPageId' => '', 'position' => 6, diff --git a/module/research/research.php b/module/search/search.php similarity index 89% rename from module/research/research.php rename to module/search/search.php index edd6eedc..f384c452 100755 --- a/module/research/research.php +++ b/module/search/search.php @@ -17,7 +17,7 @@ // Module de recherche d'un mot ou d'une phrase clef -class research extends common { +class search extends common { public static $actions = [ 'index' => self::GROUP_VISITOR @@ -29,7 +29,11 @@ class research extends common { public static $resultTitle = ''; - const RESEARCH_VERSION = '1.1'; + public static $motclef = ''; + + public static $motentier = ''; + + const SEARCH_VERSION = '1.1'; public function index() { @@ -42,15 +46,15 @@ class research extends common { self::$nbResults = 0; // Récupération du mot clef passé par le formulaire de ...view/index.php, avec caractères accentués - $motclef=$this->getInput('searchMotphraseclef'); + self::$motclef=$this->getInput('searchMotphraseclef'); // Récupération de l'état de l'option mot entier passé par le même formulaire - $motentier=$this->getInput('searchMotentier', helper::FILTER_BOOLEAN); + self::$motentier=$this->getInput('searchMotentier', helper::FILTER_BOOLEAN); //Pour affichage de l'entête du résultat self::$resultTitle = 'Aucun résultat'; $result = ''; - if ($motclef !== "" && strlen($motclef) > 2) { + if (self::$motclef !== "" && strlen(self::$motclef) > 2) { foreach($this->getHierarchy(null,false,null) as $parentId => $childIds) { if ($this->getData(['page', $parentId, 'disable']) === false && $this->getUser('group') >= $this->getData(['page', $parentId, 'group']) && @@ -59,7 +63,7 @@ class research extends common { $titre = $this->getData(['page', $parentId, 'title']); $contenu = $this->getData(['page', $parentId, 'content']); // Pages sauf pages filles et articles de blog - $result .= $this->occurrence($url, $titre, $contenu, $motclef, $motentier); + $result .= $this->occurrence($url, $titre, $contenu, self::$motclef, self::$motentier); } foreach($childIds as $childId) { @@ -71,7 +75,7 @@ class research extends common { $titre = $this->getData(['page', $childId, 'title']); $contenu = $this->getData(['page', $childId, 'content']); //Pages filles - $result .= $this->occurrence($url, $titre, $contenu, $motclef, $motentier); + $result .= $this->occurrence($url, $titre, $contenu, self::$motclef, self::$motentier); } @@ -84,7 +88,7 @@ class research extends common { $titre = $article['title']; $contenu = $article['content']; // Articles de sous-page de type blog - $result .= $this->occurrence($url, $titre, $contenu, $motclef, $motentier); + $result .= $this->occurrence($url, $titre, $contenu, self::$motclef, self::$motentier); } } @@ -101,7 +105,7 @@ class research extends common { $titre = $article['title']; $contenu = $article['content']; // Articles de Blog - $result .= $this->occurrence($url, $titre, $contenu, $motclef, $motentier); + $result .= $this->occurrence($url, $titre, $contenu, self::$motclef, self::$motentier); } } @@ -115,7 +119,7 @@ class research extends common { } else { $result .= 'Nombre d\'occurrences : '.self::$nbResults; $notification = 'Nombre d\'occurrences : '.self::$nbResults; - self::$resultTitle = 'Résultat(s) : "' . $motclef . '" a été trouvé '. self::$nbResults . ' fois'; + self::$resultTitle = 'Résultat(s) : "' . self::$motclef . '" a été trouvé '. self::$nbResults . ' fois'; $success = true; } } else { diff --git a/module/research/view/index/index.php b/module/search/view/index/index.php similarity index 100% rename from module/research/view/index/index.php rename to module/search/view/index/index.php diff --git a/module/research/view/result/result.php b/module/search/view/result/result.php similarity index 85% rename from module/research/view/result/result.php rename to module/search/view/result/result.php index 57183a3e..2e5d2945 100755 --- a/module/research/view/result/result.php +++ b/module/search/view/result/result.php @@ -6,7 +6,7 @@ 'Votre recherche', 'help' => 'Saisir toute ou partie d\'un mot ou d\'une phrase, sans guillemets. N\'oubliez pas les accents.', - 'value' => isset($_POST['searchMotphraseclef']) === true ? $_POST['searchMotphraseclef'] : '' + 'value' => $module::$motclef ]); ?>
@@ -18,7 +18,7 @@
isset($_POST['searchMotentier']) === true ? $_POST['searchMotentier'] : '' + 'checked' => $module::$motentier ]); ?>