[Phpslash-commit] CVS: phpslash-dev/include/modules/search index.php,1.2,1.3

[Peter C. <kr...@us...>]

Update of /cvsroot/phpslash/phpslash-dev/include/modules/search
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10364

Modified Files:
	index.php 
Log Message:
Bugfix: Search module was not picking up search parameters from _GET

Index: index.php
===================================================================
RCS file: /cvsroot/phpslash/phpslash-dev/include/modules/search/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	17 Apr 2003 23:31:00 -0000	1.2
--- index.php	19 Jun 2004 14:33:24 -0000	1.3
***************
*** 5,11 ****
  // TODO: search.php needs to have it's logic ripped out and put into an object
  
! global $_PSL; 
! 
! $ary = $GLOBALS['ary'];
  
  $pagetitle   = pslgetText("Search");
--- 5,9 ----
  // TODO: search.php needs to have it's logic ripped out and put into an object
  
! global $_PSL;
  
  $pagetitle   = pslgetText("Search");
***************
*** 14,18 ****
  $maxsearchresults = $_PSL['search_maxresults'];
  
! if ($HTTP_GET_VARS['use_comments'] == 'on' && $_PSL['allow_comment_search']) {
     $search_comments = TRUE;
  } else {
--- 12,16 ----
  $maxsearchresults = $_PSL['search_maxresults'];
  
! if ($_GET['use_comments'] == 'on' && $_PSL['allow_comment_search']) {
     $search_comments = TRUE;
  } else {
***************
*** 127,133 ****
  }
  
! $ary = array();
! if(!empty($HTTP_GET_VARS)) {
!    $ary = clean($HTTP_GET_VARS);
  }
  
--- 125,131 ----
  }
  
! #$ary = array();
! if(!empty($_GET)) {
!    $ary = clean($_GET);
  }
  
***************
*** 144,148 ****
  
  $db = pslNew("slashDB");
! $db->debug = false;
  
  $query = $ary['query'];
--- 142,147 ----
  
  $db = pslNew("slashDB");
! //$db->Debug = true;
! 
  
  $query = $ary['query'];
***************
*** 189,193 ****
                        topic_name
                   FROM psl_topic, psl_topic_lut
!                 WHERE  psl_topic.topic_id = psl_topic_lut.topic_id 
               ORDER BY topic_name");
  
--- 188,192 ----
                        topic_name
                   FROM psl_topic, psl_topic_lut
!                 WHERE  psl_topic.topic_id = psl_topic_lut.topic_id
               ORDER BY topic_name");
  
***************
*** 375,379 ****
  $q .= "\n    ORDER BY story.date_available DESC LIMIT $ary[min],$maxsearchresults";
  
! // echo "<FONT SIZE=2><PRE>$q</PRE></FONT><BR>\n";
  
  $db->query ($q);
--- 374,378 ----
  $q .= "\n    ORDER BY story.date_available DESC LIMIT $ary[min],$maxsearchresults";
  
! #echo "<FONT SIZE=2><PRE>$q</PRE></FONT><BR>\n";
  
  $db->query ($q);