X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fbanana.php;h=7a88b9ca5677b29bd486522b5162e499c940b0dd;hb=1f53925a716bf5cb97ed624a6787a8319eb2bcff;hp=87c5db2075fbffdfb7c195adcfd1a997f2f3b41f;hpb=f107d806eb6cb92fb37de0f4fb4c28aa6b7f9042;p=platal.git

diff --git a/modules/banana.php b/modules/banana.php
index 87c5db2..7a88b9c 100644
--- a/modules/banana.php
+++ b/modules/banana.php
@@ -27,21 +27,52 @@ 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/updateall'    => $this->make_hook('updateall', AUTH_COOKIE),
             'banana/xface'        => $this->make_hook('xface', AUTH_COOKIE),
         );
     }
 
+    function on_subscribe($forlife, $uid, $promo, $password)
+    {
+        $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
+        $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
+            $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();
+            if (5*$effau>$effid) { // + de 20% d'inscrits
+                $mymail = new PlMailer('mails/forums.promo.tpl');
+                $mymail->assign('promo', $promo);
+                $mymail->send();
+            }
+        }
+
+        while (list ($key, $val) = each ($cible)) {
+            XDB::execute("INSERT INTO  forums.abos (fid,uid)
+                               SELECT  fid,{?} FROM forums.list WHERE nom={?}", $uid, $val);
+        }
+    }
+
     function handler_banana(&$page, $group = null, $action = null, $artid = null)
     {
         $get = Array();
         if (!is_null($group)) {
             $get['group'] = $group;
         }
+        if (Post::has('updateall')) {
+            $get['updateall'] = Post::v('updateall');
+        }
         if (!is_null($action)) {
             if ($action == 'new') {
                 $get['action'] = 'new';
-            } elseif (($action == 'reply' || $action == 'cancel') && !is_null($artid)) {
+            } elseif ($action == 'reply' && !is_null($artid)) {
+                $get['action'] = 'new';
+                $get['artid']  = $artid;
+            } elseif ($action == 'cancel' && !is_null($artid)) {
                 $get['action'] = $action;
                 $get['artid']  = $artid;
             } elseif ($action == 'from' && !is_null($artid)) {
@@ -61,17 +92,17 @@ class BananaModule extends PLModule
 
         if (!(Post::has('action') && Post::has('banananame') && Post::has('bananasig')
         && Post::has('bananadisplay') && Post::has('bananamail')
-        && Post::has('bananaupdate') && Post::get('action')=="OK" ))
+        && Post::has('bananaupdate') && Post::v('action')=="OK" ))
         {
-            $req = $globals->xdb->query("
+            $req = XDB::query("
                 SELECT  nom,mail,sig,if(FIND_IN_SET('threads',flags),'1','0'),
                         IF(FIND_IN_SET('automaj',flags),'1','0') 
                   FROM  forums.profils
-                 WHERE  uid = {?}", Session::getInt('uid'));
+                 WHERE  uid = {?}", S::v('uid'));
             if (!(list($nom,$mail,$sig,$disp,$maj) = $req->fetchOneRow())) {
-                $nom  = Session::get('prenom').' '.Session::get('nom');
-                $mail = Session::get('forlife').'@'.$globals->mail->domain;
-                $sig  = $nom.' ('.Session::getInt('promo').')';
+                $nom  = S::v('prenom').' '.S::v('nom');
+                $mail = S::v('forlife').'@'.$globals->mail->domain;
+                $sig  = $nom.' ('.S::v('promo').')';
                 $disp = 0;
                 $maj  = 0;
             }
@@ -81,22 +112,15 @@ class BananaModule extends PLModule
             $page->assign('disp', $disp);
             $page->assign('maj' , $maj);
         } else {
-            $globals->xdb->execute(
+            XDB::execute(
                 'REPLACE INTO  forums.profils (uid,sig,mail,nom,flags)
                        VALUES  ({?},{?},{?},{?},{?})',
-                Session::getInt('uid'), Post::get('bananasig'),
-                Post::get('bananamail'), Post::get('banananame'),
-                (Post::getBool('bananadisplay') ? 'threads,' : '') .
-                (Post::getBool('bananaupdate') ? 'automaj' : '')
+                S::v('uid'), Post::v('bananasig'),
+                Post::v('bananamail'), Post::v('banananame'),
+                (Post::b('bananadisplay') ? 'threads,' : '') .
+                (Post::b('bananaupdate') ? 'automaj' : '')
             );
         }
-
-        return PL_OK;
-    }
-
-    function handler_updateall(&$page)
-    {
-        return BananaModule::run_banana($page, Array('banana' => 'updateall'));
     }
 
     function handler_subscription(&$page)
@@ -106,26 +130,23 @@ class BananaModule extends PLModule
 
     function handler_xface(&$page, $face = null)
     {
-        header('Content-Type: image/jpeg');
-        passthru('echo ' . escapeshellarg(base64_decode($face))
+        header('Content-Type: image/gif');
+        passthru('echo ' . escapeshellarg(base64_decode(strtr($face, '.:', '+/')))
                 . '| uncompface -X '
-                . '| convert xbm:- jpg:-');
-        return PL_OK;
+                . '| convert -transparent white xbm:- gif:-');
     }
 
     function run_banana(&$page, $params = null)
     {
         $page->changeTpl('banana/index.tpl');
-        $page->addCssLink('css/banana.css');
+        $page->addCssLink('banana.css');
         $page->assign('xorg_title','Polytechnique.org - Forums & PA');
 
-        require_once('banana.inc.php');
+        require_once dirname(__FILE__).'/banana/banana.inc.php';
 
         $res = PlatalBanana::run($params);
         $page->assign_by_ref('banana', $banana);
         $page->assign('banana_res', $res);
-
-        return PL_OK;
     }
 }