Changeset 3030:1c346de31ad1

Timestamp:

07/03/15 10:44:49 (10 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add an blog option to disable internal search (404 on ?q= queries, search widget hidden), fixes #1888

Files:

• admin/blog_pref.php (modified) (2 diffs)
• inc/core/class.dc.core.php (modified) (1 diff)
• inc/dbschema/upgrade.php (modified) (1 diff)
• inc/public/lib.urlhandlers.php (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)
• locales/fr/plugins.po (modified) (1 diff)
• plugins/widgets/_widgets_functions.php (modified) (1 diff)

admin/blog_pref.php

@@ -251 +251 @@
           $blog_settings->system->put('nb_post_per_page',$nb_post_per_page);
           $blog_settings->system->put('use_smilies',!empty($_POST['use_smilies']));
+          $blog_settings->system->put('no_search',!empty($_POST['no_search']));
           $blog_settings->system->put('inc_subcats',!empty($_POST['inc_subcats']));
           $blog_settings->system->put('media_img_t_size',$media_img_t_size);
@@ -542 +543 @@
      form::checkbox('use_smilies','1',$blog_settings->system->use_smilies).
      __('Display smilies on entries and comments').'</label></p>'.
+
+     '<p><label for="no_search" class="classic">'.
+     form::checkbox('no_search','1',$blog_settings->system->no_search).
+     __('Disable internal search system').'</label></p>'.
      '</div>'.
 

inc/core/class.dc.core.php

@@ -1430 +1430 @@
                     array('use_smilies','boolean',false,
                     'Show smilies on entries and comments'),
+                    array('no_search','boolean',false,
+                    'Disable search'),
                     array('inc_subcats','boolean',false,
                     'Include sub-categories in category page and category posts feed'),

inc/dbschema/upgrade.php

@@ -448 +448 @@
                               " AND setting_value = '/\\.php\$/i' ";
                     $core->con->execute($strReq);
+                    # Some new settings should be initialized, prepare db queries
+                    $strReq = 'INSERT INTO '.$core->prefix.'setting'.
+                              ' (setting_id,setting_ns,setting_value,setting_type,setting_label)'.
+                              ' VALUES(\'%s\',\'system\',\'%s\',\'boolean\',\'%s\')';
+                    $core->con-execute(sprintf($strReq,'no_search','0','Disable internal search system'));
                }
 

inc/public/lib.urlhandlers.php

@@ -226 +226 @@
           $core =& $GLOBALS['core'];
 
-          $core->url->type='search';
-
-          $GLOBALS['_search'] = !empty($_GET['q']) ? rawurldecode($_GET['q']) : '';
-          if ($GLOBALS['_search']) {
-               $params = new ArrayObject(array('search' => $GLOBALS['_search']));
-               $core->callBehavior('publicBeforeSearchCount',$params);
-               $GLOBALS['_search_count'] = $core->blog->getPosts($params,true)->f(0);
-          }
-
-          self::serveDocument('search.html');
+          if ($core->blog->settings->system->no_search) {
+
+               # Search is disabled for this blog.
+               self::p404();
+
+          } else {
+
+               $core->url->type='search';
+
+               $GLOBALS['_search'] = !empty($_GET['q']) ? rawurldecode($_GET['q']) : '';
+               if ($GLOBALS['_search']) {
+                    $params = new ArrayObject(array('search' => $GLOBALS['_search']));
+                    $core->callBehavior('publicBeforeSearchCount',$params);
+                    $GLOBALS['_search_count'] = $core->blog->getPosts($params,true)->f(0);
+               }
+
+               self::serveDocument('search.html');
+          }
      }
 

locales/fr/main.po

@@ -405 +405 @@
 msgstr "Afficher des émoticônes dans les billets, pages et commentaires"
 
+msgid "Disable internal search system"
+msgstr "Désactiver la recherche interne"
+
 #, php-format
 msgid "Display %s entries on home page"

locales/fr/plugins.po

@@ -2628 +2628 @@
 msgid "Do not encapsulate breadcrumb in a <p id="breadcrumb">...</p> tag."
 msgstr "Ne pas encadrer le fil d'Ariane avec une balise <p id="breadcrumb">...</p>."
+
+msgid "Search:"
+msgstr "Recherche :"

plugins/widgets/_widgets_functions.php

@@ -19 +19 @@
           global $core;
 
+          if ($core->blog->settings->system->no_search)
+               return;
+
           if ($w->offline)
                return;