Changeset 1628 for branches/multiuser/cls

Timestamp:

11/07/06 07:34:01 (2 years ago)

Author:

mdodoo

Message:

Trunk sync up until [1613]. To tell the truth, I do not like doing these syncs.

Location:

branches/multiuser/cls

Files:

• l10n.php (modified) (1 diff)
• search.php (modified) (5 diffs)

branches/multiuser/cls/l10n.php

@@ -80 +80 @@
        if (isset($_REQUEST['lang']) && preg_match('#^[a-z]{2}_?([A-Z]{2})?$#',$_REQUEST['lang']) && ($_REQUEST['lang'] == 'en' || file_exists(GREGARIUS_HOME .'intl/'.$_REQUEST['lang']))) {
             $this -> __setLocaleCookie($_REQUEST['lang']);
+            rss_invalidate_cache();
             return  $_REQUEST['lang'];
         } elseif (isset($_COOKIE[RSS_LOCALE_COOKIE])) {

branches/multiuser/cls/search.php

@@ -43 +43 @@
 define ('QUERY_MATCH_EXACT','exact');
 
+// This is needed for some constants
+rss_require('cls/wrappers/toolkit.php');
 
 class SearchItemList extends ItemList {
@@ -51 +53 @@
 
     var $currentPage;
-    var $resultsPerPage;
+    var $resultsPerPage = 0;
     var $startItem;
     var $endItem;
@@ -58 +60 @@
     var $logicSep;
 
-    function SearchItemList() {
+    function SearchItemList($query=null,$results=0) {
         parent::ItemList();
+        if ($query) {
+            $this -> query=$query;
+        } elseif(isset($_REQUEST[QUERY_PRM])) {
+            $this->query = $_REQUEST[QUERY_PRM];
+        }else{
+            $this -> query = null;
+        }
+        
+        
+        // Sanitize the query parameters:
+        // fixme: this probably breaks on queries with weird characters, depending
+        // on the locale. 
+        // see: http://php.benscom.com/manual/en/reference.pcre.pattern.syntax.php
+        if ($this -> query) {
+            $this -> query = trim(preg_replace('#[^\w\s\x80-\xff]#','',$this -> query));
+        }
+        
+        $this->resultsPerPage = (int) $results;
+        
         $this -> populate();
 
@@ -101 +122 @@
 
     function populate() {
-        if (!isset($_REQUEST[QUERY_PRM])) {
-            return;
-        }
-
-                // fixme: this probably breaks on queries with weird characters, depending
-                // on the locale. 
-                // see: http://php.benscom.com/manual/en/reference.pcre.pattern.syntax.php
-        $this->query = trim(preg_replace('#[^\w\s\x80-\xff]#','',$_REQUEST[QUERY_PRM]));
         
         if (!$this->query) {
@@ -122 +135 @@
             RSS_SANITIZER_NUMERIC);
 
-        $this->resultsPerPage = sanitize(
-            ((array_key_exists(QUERY_RESULTS, $_REQUEST)) ? $_REQUEST[QUERY_RESULTS] : INFINE_RESULTS),
-            RSS_SANITIZER_NUMERIC);
-        
+        if (!$this->resultsPerPage) {
+            $this->resultsPerPage = sanitize(
+                ((array_key_exists(QUERY_RESULTS, $_REQUEST)) ? $_REQUEST[QUERY_RESULTS] : INFINE_RESULTS),
+                RSS_SANITIZER_NUMERIC);
+        }
+
         $this->currentPage = sanitize(
             (array_key_exists(QUERY_CURRENT_PAGE, $_REQUEST) ? $_REQUEST[QUERY_CURRENT_PAGE] : 0),