Changeset 2572 for trunk/include

Timestamp:

Sep 23, 2008, 3:04:41 AM (16 years ago)

Author:

rvelices

Message:

• removed #debug css rule (why would we need that in default-layout?)
• order by rank is not available in calendar/chronology mode
• small non-functional change in functions_search.inc.php (handy for plugin)
• unused variables/smaller code/unused params in func call

Location:

trunk/include

Files:

• functions_category.inc.php (modified) (1 diff)
• functions_search.inc.php (modified) (2 diffs)
• functions_user.inc.php (modified) (2 diffs)
• ws_functions.inc.php (modified) (2 diffs)

trunk/include/functions_category.inc.php

@@ -271 +271 @@
       l10n('Rank'),
       'rank ASC',
-      ('categories' == @$page['section'] and !isset($page['flat']))
+      ('categories' == @$page['section'] and !isset($page['flat']) and !isset($page['chronology_field']) )
       )
     ));

trunk/include/functions_search.inc.php

@@ -300 +300 @@
  * @return string
  */
-function get_qsearch_like_clause($q, $field)
+function get_qsearch_like_clause($q, $field, $before='%', $after='%')
 {
   $q = stripslashes($q);
@@ -394 +394 @@
     if ( strlen($tokens[$i])==0)
       continue;
-    $clauses[] = $field.' LIKE "%'.addslashes($tokens[$i]).'%"';
+    $clauses[] = $field.' LIKE "'.$before.addslashes($tokens[$i]).$after.'"';
   }
 

trunk/include/functions_user.inc.php

@@ -43 +43 @@
 
   $atom   = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]';   // before  arobase
-  $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name  
+  $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name
   $regex = '/^' . $atom . '+' . '(\.' . $atom . '+)*' . '@' . '(' . $domain . '{1,63}\.)+' . $domain . '{2,63}$/i';
 
@@ -852 +852 @@
 function get_browser_language(&$lang)
 {
-  if (!empty($_SERVER["HTTP_ACCEPT_LANGUAGE"]))
-  {
-    $browser_language = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2);
-  }
-  else
-  {
-    $browser_language = '';
-  }
+  $browser_language = substr(@$_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2);
   foreach (get_languages() as $language_code => $language_name)
   {

trunk/include/ws_functions.inc.php

@@ -30 +30 @@
 function ws_isInvokeAllowed($res, $methodName, $params)
 {
-  global $conf, $calling_partner_id;
+  global $conf;
 
   if ( strpos($methodName,'reflection.')===0 )
@@ -416 +416 @@
       $row[$key] = (int)$row[$key];
     }
-    
+
     array_push($cats, $row);
   }