Changeset 2092 in ExiteCMS for trunk/search.php

Timestamp:

12/05/08 20:23:35 (3 years ago)

Author:

WanWizard

Message:

ticket #58: added "search entire site" to the search module
added missing svn properties to several files

File:

• trunk/search.php (modified) (5 diffs)

trunk/search.php

@@ -36 +36 @@
 $content_filters = array();
 
-if (!isset($rowstart) || !isNum($rowstart)) $rowstart = 0;
-$variables['rowstart'] = $rowstart;
+$variables['items_per_page'] = $settings['numofthreads'];
 
 if (!isset($action)) $action = "";
@@ -72 +71 @@
 $searches = array();
 $searchindex = array();
-$result = dbquery("SELECT s.*, m.mod_folder FROM ".$db_prefix."search s LEFT JOIN ".$db_prefix."modules m ON s.search_mod_id = m.mod_id WHERE s.search_active = 1".($search_id?" AND s.search_id = '$search_id'":""));
+
+// array to store variables we use in the search templates
+$reportvars = array();
+$reportvars['output'] = array();
+
+// variable initialisation
+if (!isset($rowstart) || !isNum($rowstart)) $rowstart = 1;
+$variables['rowstart'] = $rowstart;
+
+$variables['rows'] = 0;
+$lines = 0;
+$result = dbquery("SELECT s.*, m.mod_folder FROM ".$db_prefix."search s LEFT JOIN ".$db_prefix."modules m ON s.search_mod_id = m.mod_id WHERE s.search_active = 1".(($search_id > 0 && $search_id < 99999)?" AND s.search_id = '$search_id'":""));
 while ($data = dbarray($result)) {
     if (checkgroup($data['search_visibility'])) {
@@ -93 +103 @@
                 // do any preprocessing
                 @include PATH_INCLUDES."search/search.".strtolower($data['search_name']).".php";
+                $lines = count($reportvars['output']);
             } else {
                 $data['mod_folder'] = "-";
@@ -130 +141 @@
     $variables['default_filter'] = "";
     foreach($variables['searches'] as $key => $search) {
-        if ($search['search_order'] < $variables['default_location']) {
+        if (isset($search['search_filters']) && $search['search_order'] < $variables['default_location']) {
             $variables['default_location'] = $search['search_order'];
             $variables['default_filter'] = $search['search_filters'];
-            if (!isset($search['search_filters'])) _debug($search, true);
         }
     }
@@ -149 +159 @@
 }
 
+// update the search title in case of a global search
+if ($search_id == 99999) {
+    $variables['searches'][0]['search_title'] = $locale['src524'];
+}
+
 // define the search body panel variables
 $template_panels[] = array('type' => 'body', 'name' => 'search', 'title' => $title, 'template' => 'main.search.tpl', 'locale' => $locales);