X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fsearch.inc.php;h=97bc11ee2e422ff24436eadb9304eb78722adcb3;hb=42a50827dc2ac2b13ddaf77ea16c0989cd8b960d;hp=a337031e5b4dea23a77b9bdbdc2234ef6c25b581;hpb=56670b6ac6b3337d615679ec756446a05e18f113;p=platal.git

diff --git a/include/search.inc.php b/include/search.inc.php
index a337031..97bc11e 100644
--- a/include/search.inc.php
+++ b/include/search.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  Copyright (C) 2003-2006 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -23,6 +23,9 @@ require_once('xorg.plugin.inc.php');
 require_once("search/classes.inc.php");
 
 // {{{ function advancedSearchFromInput
+function getadr_join($table) {
+    return 'u.user_id='.$table.'.uid'.(Env::v('only_current',false)?' AND FIND_IN_SET(\'active\','.$table.'.statut)':'');
+}
 function advancedSearchFromInput()
 {
     if ($with_soundex = Env::has('with_soundex')) {
@@ -40,10 +43,6 @@ function advancedSearchFromInput()
     $subscriberField = new RefSField('subscriber',array('!(u.perms IN (\'admin\',\'user\'))+1'),'','','');
     $aliveField      = new RefSField('alive',array('(u.deces!=0)+1'),'','','');
 
-    function getadr_join($table) {
-        return 'u.user_id='.$table.'.uid'.(Env::get('only_current',false)?' AND FIND_IN_SET(\'active\','.$table.'.statut)':'');
-    }
-
     $townField      = new RefSField('city',array('ac.city'),'adresses','ac',getadr_join('ac'),false);
     $cityIdField    = new RefSField('cityid',array('av.cityid'),'adresses','av',getadr_join('av'));
     $countryField   = new RefSField('country',array('ap.country'),'adresses','ap',getadr_join('ap'));
@@ -105,11 +104,11 @@ class XOrgSearch extends XOrgPlugin
     {
         foreach ($this->orders as $key=>$o) {
             if ($o[3] == AUTH_COOKIE) {
-                $this->orders[$key][3] = logged();
+                $this->orders[$key][3] = S::logged();
             } elseif ($o[3] == AUTH_PUBLIC) {
                 $this->orders[$key][3] = true;
             } else {
-                $this->orders[$key][3] = identified();
+                $this->orders[$key][3] = S::identified();
             }
         }
     }
@@ -152,7 +151,7 @@ class XOrgSearch extends XOrgPlugin
         list($list, $total) = call_user_func($this->_callback, $offset, $this->limit, $sql_order);
         
 	$page_max = intval(($total-1)/$this->limit);
-        if(!logged() && $page_max > $globals->search->public_max)
+        if(!S::logged() && $page_max > $globals->search->public_max)
             $page_max = $globals->search->public_max;
 
 	$links = Array();