[Phpslash-commit] CVS: phpslash-ft/public_html search.php3,1.46,1.47 index.php3,1.55,1.56

[Joe S. <joe...@us...>]

Update of /cvsroot/phpslash/phpslash-ft/public_html
In directory usw-pr-cvs1:/tmp/cvs-serv14692/phpslash-ft/public_html

Modified Files:
	search.php3 index.php3 
Log Message:
htmlentity of query in search

Index: search.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/search.php3,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** search.php3	18 Mar 2002 16:11:22 -0000	1.46
--- search.php3	25 Mar 2002 16:45:51 -0000	1.47
***************
*** 143,150 ****
  /*************PAGE START*******************/
  
! /* parse cmd line variables into array   */
! while ( list($key, $val) = each($HTTP_GET_VARS )) {
!    $ary[$key] = $val;
! }
  
  /* defaults for main "index" page   */
--- 143,147 ----
  /*************PAGE START*******************/
  
! $ary = $HTTP_GET_VARS;
  
  /* defaults for main "index" page   */
***************
*** 168,172 ****
  $templ->set_file (searchpage, "searchPage.tpl");
  
! titlebar("100%",sprintf(pslgetText("Searching %s"),$query));
  
  // Required to clean the QUERY_STRING field in the template
--- 165,169 ----
  $templ->set_file (searchpage, "searchPage.tpl");
  
! titlebar("100%",sprintf(pslgetText("Searching %s"),htmlentities($query)));
  
  // Required to clean the QUERY_STRING field in the template
***************
*** 471,476 ****
     'index'  => $tplfile //"index3col.tpl"
  ));
!  
  $template->set_var(array(
     'ROOTDIR'      => $_PSL['rooturl'],
     'IMAGEDIR'     => $_PSL['imageurl'],
--- 468,479 ----
     'index'  => $tplfile //"index3col.tpl"
  ));
! 
! // TODO register_globals?
! if( !empty($QUERY_STRING)) {
!    $QUERY_STRING = "?".$QUERY_STRING;
! }
! 
  $template->set_var(array(
+    'QUERYSTRING'  => $QUERY_STRING,
     'ROOTDIR'      => $_PSL['rooturl'],
     'IMAGEDIR'     => $_PSL['imageurl'],

Index: index.php3
===================================================================
RCS file: /cvsroot/phpslash/phpslash-ft/public_html/index.php3,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** index.php3	5 Mar 2002 16:48:27 -0000	1.55
--- index.php3	25 Mar 2002 16:45:52 -0000	1.56
***************
*** 21,30 ****
  // Start of Page
  
! 
! 
! /* parse cmd line variables into array   */
! while ( list($key, $val) = each($HTTP_GET_VARS )) {
!    $ary[$key] = $val;
! }
  
  /* defaults for main "index" page   */
--- 21,25 ----
  // Start of Page
  
! $ary = $HTTP_GET_VARS;
  
  /* defaults for main "index" page   */
***************
*** 73,77 ****
--- 68,78 ----
  ));
   
+ // TODO register_globals?
+ if( !empty($QUERY_STRING)) {
+    $QUERY_STRING = "?".$QUERY_STRING;
+ }
+  
  $template->set_var(array(
+    'QUERYSTRING'  => $QUERY_STRING,
     'ROOTDIR'      => $_PSL['rooturl'],
     'IMAGEDIR'     => $_PSL['imageurl'],