X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fbanana.php;h=63ce688751d1fc9f690ef1353ed929bf52547c6b;hb=5d9d45a8e223225ea5c25b857cd5e11f1aabf6f7;hp=6a82468fba412babaf95c6f618771564e89c115d;hpb=4f355064724a95757bb5ca023f1da9950a04013d;p=platal.git

diff --git a/modules/banana.php b/modules/banana.php
index 6a82468..63ce688 100644
--- a/modules/banana.php
+++ b/modules/banana.php
@@ -27,7 +27,7 @@ class BananaModule extends PLModule
             'banana'              => $this->make_hook('banana', AUTH_COOKIE),
             'banana/profile'      => $this->make_hook('profile', AUTH_MDP),
             'banana/subscription' => $this->make_hook('subscription', AUTH_COOKIE),
-            'banana/rss'          => $this->make_hook('rss', AUTH_PUBLIC),
+            'banana/rss'          => $this->make_hook('rss', AUTH_PUBLIC, 'user', NO_HTTPS),
         );
     }
 
@@ -36,11 +36,11 @@ class BananaModule extends PLModule
         $cible = array('xorg.general', 'xorg.pa.divers', 'xorg.pa.logements');
         $p_for = "xorg.promo.x$promo";
 
-        // récupération de l'id du forum promo
+        // récupération de l'id du forum promo
         $res = XDB::query("SELECT fid FROM forums.list WHERE nom={?}", $p_for);
         if ($res->numRows()) {
             $cible[] = $p_for;
-        } else { // pas de forum promo, il faut le créer
+        } else { // pas de forum promo, il faut le créer
             $res = XDB::query("SELECT  SUM(perms IN ('admin','user') AND deces=0),COUNT(*)
                                  FROM  auth_user_md5 WHERE promo={?}", $promo);
             list($effau, $effid) = $res->fetchOneRow();
@@ -79,34 +79,45 @@ class BananaModule extends PLModule
 
         if (!(Post::has('action') && Post::has('banananame') && Post::has('bananasig')
         && Post::has('bananadisplay') && Post::has('bananamail')
-        && Post::has('bananaupdate') && Post::v('action')=="OK" ))
+        && Post::has('bananaupdate') && Post::v('action')=="Enregistrer" ))
         {
             $req = XDB::query("
-                SELECT  nom,mail,sig,if(FIND_IN_SET('threads',flags),'1','0'),
-                        IF(FIND_IN_SET('automaj',flags),'1','0') 
+                SELECT  nom, mail, sig,
+                        FIND_IN_SET('threads', flags),
+                        FIND_IN_SET('automaj', flags),
+                        FIND_IN_SET('xface', flags)
                   FROM  forums.profils
                  WHERE  uid = {?}", S::v('uid'));
-            if (!(list($nom,$mail,$sig,$disp,$maj) = $req->fetchOneRow())) {
-                $nom  = S::v('prenom').' '.S::v('nom');
-                $mail = S::v('forlife').'@'.$globals->mail->domain;
-                $sig  = $nom.' ('.S::v('promo').')';
-                $disp = 0;
-                $maj  = 0;
+            if (!(list($nom, $mail, $sig, $disp, $maj, $xface) = $req->fetchOneRow())) {
+                $nom   = S::v('prenom').' '.S::v('nom');
+                $mail  = S::v('forlife').'@'.$globals->mail->domain;
+                $sig   = $nom.' ('.S::v('promo').')';
+                $disp  = 0;
+                $maj   = 0;
+                $xface = 0;
             }
-            $page->assign('nom' , $nom);
-            $page->assign('mail', $mail);
-            $page->assign('sig' , $sig);
-            $page->assign('disp', $disp);
-            $page->assign('maj' , $maj);
+            $page->assign('nom' ,  $nom);
+            $page->assign('mail',  $mail);
+            $page->assign('sig',   $sig);
+            $page->assign('disp',  $disp);
+            $page->assign('maj',   $maj);
+            $page->assign('xface', $xface);
         } else {
-            XDB::execute(
-                'REPLACE INTO  forums.profils (uid,sig,mail,nom,flags)
-                       VALUES  ({?},{?},{?},{?},{?})',
-                S::v('uid'), Post::v('bananasig'),
-                Post::v('bananamail'), Post::v('banananame'),
-                (Post::b('bananadisplay') ? 'threads,' : '') .
-                (Post::b('bananaupdate') ? 'automaj' : '')
-            );
+            $flags = array();
+            if (Post::b('bananadisplay')) {
+                $flags[] = 'threads';
+            }
+            if (Post::b('bananaupdate')) {
+                $flags[] = 'automaj';
+            }
+            if (Post::b('bananaxface')) {
+                $flags[] = 'xface';
+            }
+            XDB::execute("REPLACE INTO  forums.profils (uid, sig, mail, nom, flags)
+                                VALUES  ({?}, {?}, {?}, {?}, {?})",
+                         S::v('uid'), Post::v('bananasig'),
+                         Post::v('bananamail'), Post::v('banananame'),
+                         implode(',', $flags));
         }
     }
 
@@ -139,7 +150,7 @@ class BananaModule extends PLModule
         $_SESSION = array_merge($row, $_SESSION);
 
         require_once 'banana/forum.inc.php';
-        $banana = new ForumsBanana(array('group' => $group, 'action' => 'rss2'));
+        $banana = new ForumsBanana(S::v('forlife'), array('group' => $group, 'action' => 'rss2'));
         $banana->run();
         exit;
     }