FIND_IN_SET syntax is FIND_IN_SET(flag, set) (eg FIND_IN_SET('myflag', flags))

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1726 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/bin/cron/checkdb.php b/bin/cron/checkdb.php
index f7bea48..de7d4ac 100755 (executable)
--- a/bin/cron/checkdb.php
+++ b/bin/cron/checkdb.php
@@ -140,14 +140,14 @@ check("SELECT e.uid, e.country, e.region FROM entreprises AS e LEFT JOIN geoloc_
 check("SELECT  a1.alias, a2.alias, e1.email, e2.flags
         FROM  emails        AS e1
         INNER JOIN  emails        AS e2 ON(e1.email = e2.email AND e1.uid!=e2.uid AND 
-            (e1.uid<e2.uid  OR  NOT FIND_IN_SET(e2.flags,'active'))
+            (e1.uid<e2.uid  OR  NOT FIND_IN_SET('active', e2.flags))
             )
         INNER JOIN  emails_watch  AS w  ON(w.email = e1.email AND w.state = 'pending')
         INNER JOIN  aliases       AS a1 ON(a1.id=e1.uid AND a1.type='a_vie')
         INNER JOIN  aliases       AS a2 ON(a2.id=e2.uid AND a2.type='a_vie')
         INNER JOIN  auth_user_md5 AS u1 ON(a1.id=u1.user_id)
         INNER JOIN  auth_user_md5 AS u2 ON(a2.id=u2.user_id)
-        WHERE  FIND_IN_SET(e1.flags,'active') AND u1.nom!=u2.nom_usage AND u2.nom!=u1.nom_usage
+        WHERE  FIND_IN_SET('active', e1.flags) AND u1.nom!=u2.nom_usage AND u2.nom!=u1.nom_usage
         ORDER BY  a1.alias",
         "donne la liste des emails douteux actuellement non traites par les administrateurs");
 
@@ -155,14 +155,14 @@ check("SELECT  a1.alias, a2.alias, e1.email, e2.flags
 info("SELECT  a1.alias, a2.alias, e1.email, e2.flags, w.state
         FROM  emails        AS e1
         INNER JOIN  emails        AS e2 ON(e1.email = e2.email AND e1.uid!=e2.uid AND 
-            (e1.uid<e2.uid  OR  NOT FIND_IN_SET(e2.flags,'active'))
+            (e1.uid<e2.uid  OR  NOT FIND_IN_SET('active', e2.flags))
             )
         INNER JOIN  emails_watch  AS w  ON(w.email = e1.email AND w.state != 'safe')
         INNER JOIN  aliases       AS a1 ON(a1.id=e1.uid AND a1.type='a_vie')
         INNER JOIN  aliases       AS a2 ON(a2.id=e2.uid AND a2.type='a_vie')
         INNER JOIN  auth_user_md5 AS u1 ON(a1.id=u1.user_id)
         INNER JOIN  auth_user_md5 AS u2 ON(a2.id=u2.user_id)
-        WHERE  FIND_IN_SET(e1.flags,'active') AND u1.nom!=u2.nom_usage AND u2.nom!=u1.nom_usage
+        WHERE  FIND_IN_SET('active', e1.flags) AND u1.nom!=u2.nom_usage AND u2.nom!=u1.nom_usage
         ORDER BY  a1.alias",
         "donne la liste des emails dangereux ou douteux");
 

diff --git a/bin/cron/emails.check.php b/bin/cron/emails.check.php
index 99958cc..5ad8bbe 100755 (executable)
--- a/bin/cron/emails.check.php
+++ b/bin/cron/emails.check.php
@@ -32,13 +32,13 @@ require('./connect.db.inc.php');
 $sql = "SELECT a1.alias, a2.alias, e1.email
           FROM emails        AS e1
     INNER JOIN emails        AS e2 ON (e1.email = e2.email AND e1.uid != e2.uid 
-                                       AND (e1.uid < e2.uid OR NOT FIND_IN_SET(e2.flags, 'active')))
+                                       AND (e1.uid < e2.uid OR NOT FIND_IN_SET('active', e2.flags)))
      LEFT JOIN emails_watch  AS w  ON (e1.email = w.email)
     INNER JOIN aliases       AS a1 ON (a1.id = e1.uid AND a1.type = 'a_vie')
     INNER JOIN aliases       AS a2 ON (a2.id = e2.uid AND a2.type = 'a_vie')
     INNER JOIN auth_user_md5 AS u1 ON (a1.id = u1.user_id)
     INNER JOIN auth_user_md5 AS u2 ON (a2.id = u2.user_id)
-         WHERE FIND_IN_SET(e1.flags, 'active') AND u1.nom != u2.nom_usage AND u2.nom != u1.nom_usage AND w.email IS NULL
+         WHERE FIND_IN_SET('active', e1.flags) AND u1.nom != u2.nom_usage AND u2.nom != u1.nom_usage AND w.email IS NULL
       ORDER BY a1.alias";
 
 $it = Xdb::iterRow($sql);

diff --git a/include/userset.inc.php b/include/userset.inc.php
index a76b7c1..aba0254 100644 (file)
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -329,7 +329,7 @@ class GeolocView implements PlView
             $it =& $this->set->get('u.user_id AS id, u.prenom, u.nom, u.promo, al.alias',
                                    "INNER JOIN  adresses AS adrf  ON (adrf.uid = u.user_id)
                                      LEFT JOIN  aliases  AS al   ON (u.user_id = al.id
-                                                                   AND FIND_IN_SET(al.flags, 'bestalias'))
+                                                                   AND FIND_IN_SET('bestalias', al.flags))
                                     INNER JOIN  adresses AS av ON (" . getadr_join('av') . ")",
                                    'adrf.cityid = ' . Env::i('cityid'), null, null, 11);
             $page->assign('users', $it);

diff --git a/include/validations/medals.inc.php b/include/validations/medals.inc.php
index 3e7cce5..a742da5 100644 (file)
--- a/include/validations/medals.inc.php
+++ b/include/validations/medals.inc.php
@@ -85,7 +85,7 @@ class MedalReq extends Validate
 
     public function submit()
     {
-        $res = XDB::query("SELECT  FIND_IN_SET(flags, 'validation')
+        $res = XDB::query("SELECT  FIND_IN_SET('validation', flags)
                              FROM  profile_medals
                             WHERE  id = {?}", $this->mid);
         if ($res->fetchOneCell()) {

diff --git a/modules/events.php b/modules/events.php
index b3e2d87..c332760 100644 (file)
--- a/modules/events.php
+++ b/modules/events.php
@@ -258,7 +258,7 @@ class EventsModule extends PLModule
                                                  AND (e.promo_max = 0 || e.promo_max >= u.promo) )
               LEFT JOIN  evenements_photo AS p ON (p.eid = e.id)
              INNER JOIN  auth_user_md5   AS u2 ON (u2.user_id = e.user_id)
-                  WHERE  u.user_id = {?} AND FIND_IN_SET(e.flags, "valide")
+                  WHERE  u.user_id = {?} AND FIND_IN_SET("valide", e.flags)
                                          AND peremption >= NOW()', $uid);
         $page->assign('rss', $rss);
     }

diff --git a/modules/payment.php b/modules/payment.php
index 10587b6..940fac1 100644 (file)
--- a/modules/payment.php
+++ b/modules/payment.php
@@ -170,7 +170,7 @@ class PaymentModule extends PLModule
 
         /* on extrait les informations sur l'utilisateur */
         $res = XDB::query("
-            SELECT  a.prenom,a.nom,a.promo,l.alias,FIND_IN_SET(a.flags,'femme')
+            SELECT  a.prenom,a.nom,a.promo,l.alias,FIND_IN_SET('femme', a.flags)
               FROM  auth_user_md5 AS a
         INNER JOIN  aliases       AS l ON (a.user_id=l.id AND type!='homonyme')
              WHERE  a.user_id={?}", $uid);
@@ -277,7 +277,7 @@ class PaymentModule extends PLModule
 
         /* on extrait les informations sur l'utilisateur */
         $res = XDB::query("
-            SELECT  a.prenom,a.nom,a.promo,l.alias,FIND_IN_SET(a.flags,'femme')
+            SELECT  a.prenom,a.nom,a.promo,l.alias,FIND_IN_SET('femme', a.flags)
               FROM  auth_user_md5 AS a
         INNER JOIN  aliases       AS l ON (a.user_id=l.id AND type!='homonyme')
              WHERE  a.user_id={?}", $uid);
@@ -350,7 +350,7 @@ class PaymentModule extends PLModule
         $res = XDB::query(
                 "SELECT  id, text, url
                    FROM  {$globals->money->mpay_tprefix}paiements
-                  WHERE  asso_id = {?} AND NOT FIND_IN_SET(flags, 'old')
+                  WHERE  asso_id = {?} AND NOT FIND_IN_SET('old', flags)
                ORDER BY  id DESC", $globals->asso('id'));
         $tit = $res->fetchAllAssoc();
         $page->assign('titres', $tit);

diff --git a/modules/profile/assign_deco.inc.php b/modules/profile/assign_deco.inc.php
index fe98804..4f3c931 100644 (file)
--- a/modules/profile/assign_deco.inc.php
+++ b/modules/profile/assign_deco.inc.php
@@ -26,7 +26,7 @@ while ($tmp = $res->next()) {
     $grades[$tmp['mid']][] = $tmp;
 }
 
-$res    = XDB::iterator("SELECT *, FIND_IN_SET(flags, 'validation') AS validate FROM profile_medals ORDER BY type, text");
+$res    = XDB::iterator("SELECT *, FIND_IN_SET('validation', flags) AS validate FROM profile_medals ORDER BY type, text");
 $mlist  = Array();
 while ($tmp = $res->next()) {
     $mlist[$tmp['type']][] = $tmp;

diff --git a/modules/search/search.inc.php b/modules/search/search.inc.php
index d3edb4d..39e0f8b 100644 (file)
--- a/modules/search/search.inc.php
+++ b/modules/search/search.inc.php
@@ -38,7 +38,7 @@ function advancedSearchFromInput()
     
     $promo1Field     = new PromoSField('promo1','egal1',array('u.promo'),'');
     $promo2Field     = new PromoSField('promo2','egal2',array('u.promo'),'');
-    $womanField      = new RefSField('woman',array('FIND_IN_SET(u.flags,\'femme\')+1'),'','','');
+    $womanField      = new RefSField('woman',array('FIND_IN_SET(\'femme\',u.flags)+1'),'','','');
     $subscriberField = new RefSField('subscriber',array('!(u.perms IN (\'admin\',\'user\'))+1'),'','','');
     $aliveField      = new RefSField('alive',array('(u.deces!=0)+1'),'','','');
 

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index 057bcc7..ede566c 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -41,7 +41,7 @@ function get_infos($email)
     if ($res->numRows()) {
         $user = $res->fetchOneAssoc();
         if ($user['origine'] == 'X') {
-            $res = XDB::query("SELECT nom, prenom, promo, FIND_IN_SET(flags, 'femme') AS sexe
+            $res = XDB::query("SELECT nom, prenom, promo, FIND_IN_SET('femme', flags) AS sexe
                                  FROM auth_user_md5
                                 WHERE user_id = {?}", $user['uid']);
             $user = array_merge($user, $res->fetchOneAssoc());
@@ -55,7 +55,7 @@ function get_infos($email)
                          CONCAT(b.alias, '@m4x.org') AS email,
                          CONCAT(b.alias, '@polytechnique.org') AS email2,
                          m.perms='admin' AS perms, m.origine,
-                         FIND_IN_SET(u.flags, 'femme') AS sexe
+                         FIND_IN_SET('femme', u.flags) AS sexe
                    FROM  auth_user_md5   AS u
              INNER JOIN  aliases         AS a ON ( u.user_id = a.id AND a.type != 'homonyme' )
              INNER JOIN  aliases         AS b ON ( u.user_id = b.id AND b.type = 'a_vie' )
@@ -159,7 +159,7 @@ class XnetGrpModule extends PLModule
                                      FROM groupex.announces AS a
                                INNER JOIN auth_user_md5 AS u USING(user_id)
                                     WHERE asso_id = {?} AND peremption >= CURRENT_DATE()
-                                          AND FIND_IN_SET(a.flags, 'public')",
+                                          AND FIND_IN_SET('public', u.flags)",
                                   $globals->asso('id'));
         }
 
@@ -957,7 +957,7 @@ class XnetGrpModule extends PLModule
                                          IF(u.nom_usage != '', u.nom_usage, u.nom) AS nom, u.prenom, u.promo
                                     FROM groupex.announces AS a
                              INNER JOIN auth_user_md5 AS u USING(user_id)
-                             WHERE FIND_IN_SET(a.flags, 'public') AND peremption >= NOW() AND a.asso_id = {?}",
+                             WHERE FIND_IN_SET('public', a.flags) AND peremption >= NOW() AND a.asso_id = {?}",
                                   $globals->asso('id'));
         }
         $page->assign('asso', $globals->asso());
@@ -1064,7 +1064,7 @@ class XnetGrpModule extends PLModule
 
         if (empty($art) && !is_null($aid)) {
             $res = XDB::query("SELECT a.*, u.nom, u.prenom, u.promo, l.alias AS forlife,
-                                      FIND_IN_SET(a.flags, 'public') AS public
+                                      FIND_IN_SET('public', a.flags) AS public
                                  FROM groupex.announces AS a
                            INNER JOIN auth_user_md5 AS u USING(user_id)
                            INNER JOIN aliases AS l ON (l.id = u.user_id AND l.type = 'a_vie')