Changeset 3030:1c346de31ad1 for inc

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

Location:

inc

Files:

• core/class.dc.core.php (modified) (1 diff)
• dbschema/upgrade.php (modified) (1 diff)
• public/lib.urlhandlers.php (modified) (1 diff)

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');
+          }
      }