pending commit, finished during MQ/S download ...

[platal.git] / modules / banana.php

diff --git a/modules/banana.php b/modules/banana.php
index 578f37f..3dab3d1 100644 (file)
--- a/modules/banana.php
+++ b/modules/banana.php
@@ -68,15 +68,15 @@ class BananaModule extends PLModule
         && Post::has('bananadisplay') && Post::has('bananamail')
         && Post::has('bananaupdate') && Post::get('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;
             }
@@ -86,17 +86,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'),
+                S::v('uid'), Post::get('bananasig'),
                 Post::get('bananamail'), Post::get('banananame'),
                 (Post::getBool('bananadisplay') ? 'threads,' : '') .
                 (Post::getBool('bananaupdate') ? 'automaj' : '')
             );
         }
-
-        return PL_OK;
     }
 
     function handler_subscription(&$page)
@@ -110,7 +108,6 @@ class BananaModule extends PLModule
         passthru('echo ' . escapeshellarg(base64_decode(strtr($face, '.:', '+/')))
                 . '| uncompface -X '
                 . '| convert -transparent white xbm:- gif:-');
-        return PL_OK;
     }
 
     function run_banana(&$page, $params = null)
@@ -124,8 +121,6 @@ class BananaModule extends PLModule
         $res = PlatalBanana::run($params);
         $page->assign_by_ref('banana', $banana);
         $page->assign('banana_res', $res);
-
-        return PL_OK;
     }
 }