X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fsearch%2Fclasses.inc.php;h=49cb896aa4cc126c53d17b5b7e4c95364068805e;hb=ba25f6636bf49a64833ae9107a65dc1b7f9d582b;hp=f6922bd67278fd1d9e2ec0daa68dad23ad97a612;hpb=756ff73fbb0cdd01cce2eda27ba18e1cc99bd735;p=platal.git

diff --git a/modules/search/classes.inc.php b/modules/search/classes.inc.php
index f6922bd..49cb896 100644
--- a/modules/search/classes.inc.php
+++ b/modules/search/classes.inc.php
@@ -36,7 +36,7 @@ require_once("xorg.misc.inc.php");
     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,
-    COUNT(em.email) > 0 AS actif,';
+    (COUNT(em.email) > 0 OR FIND_IN_SET("googleapps", u.mail_storage) > 0) AS actif,';
 // hide private information if not logged
 if (S::logged())
     $globals->search->result_fields .='
@@ -308,7 +308,7 @@ class QuickSearch extends SField
         }
         if (!empty($this->ip)) {
             $ip = ip_to_uint($this->ip);
-            $where[] = "( ls.ip = $ip OR ls.forward_ip = $ip )";
+            $where[] = "( ls.ip = $ip OR ls.forward_ip = $ip ) AND ls.suid = 0";
         }
 
         return join(" AND ", $where);