use php5-isms

[platal.git] / include / search / classes.inc.php

diff --git a/include/search/classes.inc.php b/include/search/classes.inc.php
index 5359e59..57f1d7d 100644 (file)
--- a/include/search/classes.inc.php
+++ b/include/search/classes.inc.php
@@ -35,7 +35,8 @@ $globals->search->result_fields = '
                 ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
                 ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
                 es.label AS secteur, ef.fonction_fr AS fonction,
-                IF(n.nat=\'\',n.pays,n.nat) AS nat, n.a2 AS iso3166,';
+                IF(n.nat=\'\',n.pays,n.nat) AS nat, n.a2 AS iso3166,
+        COUNT(em.email) > 0 AS actif,';
 // hide private information if not logged
 if (S::logged()) 
        $globals->search->result_fields .='
@@ -64,7 +65,8 @@ $globals->search->result_where_statement = '
                 LEFT JOIN  geoloc_pays    AS n   ON (u.nationalite = n.a2)
                 LEFT JOIN  adresses       AS adr ON (u.user_id = adr.uid AND FIND_IN_SET(\'active\',adr.statut))
                 LEFT JOIN  geoloc_pays    AS gp  ON (adr.country = gp.a2)
-                LEFT JOIN  geoloc_region  AS gr  ON (adr.country = gr.a2 AND adr.region = gr.region)';
+                LEFT JOIN  geoloc_region  AS gr  ON (adr.country = gr.a2 AND adr.region = gr.region)
+                LEFT JOIN  emails         AS em  ON (em.uid = u.user_id AND em.flags = \'active\')';
 
 // }}}
 // {{{ function display_lines()
@@ -100,7 +102,8 @@ class ThrowError
     function ThrowError($explain)
     {
         global $page;
-        $page->trig_run('Erreur : '.$explain);
+        $page->trig('Erreur : '.$explain);
+        $page->run();
     }
 }
 
@@ -145,7 +148,7 @@ class SField
      * on met une chaîne vide si le champ n'a pas été complété */
     function get_request()
     {
-        $this->value = trim(Env::get($this->fieldFormName));
+        $this->value = trim(Env::v($this->fieldFormName));
     }
 
     // }}}
@@ -448,7 +451,7 @@ class MapSField extends RefSField
     function MapSField($_fieldFormName, $_fieldDbName='', $_refTable, $_refAlias, $_refCondition, $_mapId=false)
     {
         if ($_mapId === false)
-            $this->mapId = Env::get($_fieldFormName, '');
+            $this->mapId = Env::v($_fieldFormName, '');
         else
             $this->mapId = $_mapId;
         $this->RefSField($_fieldFormName, $_fieldDbName, $_refTable, $_refAlias, $_refCondition, true, false);