X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=inline;f=include%2Fbanana.inc.php;h=0529996bf323d4e741dfc2cc2410a82f774d264d;hb=1f7c369094ff15214d6cc25a721ee025216c3ea5;hp=56f9894489e7d4440d8d37fd911c9a98946fa8e2;hpb=98c14aa5dc9bd9b76c676ab1fbf22c82bfe79751;p=platal.git

diff --git a/include/banana.inc.php b/include/banana.inc.php
index 56f9894..0529996 100644
--- a/include/banana.inc.php
+++ b/include/banana.inc.php
@@ -34,7 +34,14 @@ function hook_formatDisplayHeader($_header, $_text) {
 }
 
 function hook_checkcancel($_headers) {
-    return ($_headers['x-org-id'] == Session::get('forlife') or has_perms());
+    return ($_headers['x-org-id'] == S::v('forlife') or S::has_perms());
+}
+
+function hook_shortcuts()
+{
+    global $globals;
+    return Array('profile' => Array('<a href="' . $globals->baseurl . '/banana/profile">Préférences</a>',
+                                    'Préférences'));
 }
 
 function hook_makeLink($params) {
@@ -44,7 +51,7 @@ function hook_makeLink($params) {
         return $base . '/subscription';
     }
     if (isset($params['xface'])) {
-        return $base . '/xface/' . $params['xface'];
+        return $base . '/xface/' . strtr(base64_encode($params['xface']), '+/', '.:');
     }
 
     if (!isset($params['group'])) {
@@ -75,7 +82,7 @@ function hook_makeLink($params) {
 function hook_makeImg($img, $alt, $height, $width)
 {
     global $globals;
-    $url = $globals->baseurl . '/images/banana/' . $img . '.gif';
+    $url = $globals->baseurl . '/images/banana/' . $img;
 
     if (!is_null($width)) {
         $width = ' width="' . $width . '"';
@@ -111,16 +118,16 @@ class PlatalBanana extends Banana
     {
         global $globals;
     
-        $uid = Session::getInt('uid');
-        $req = $globals->xdb->query(
+        $uid = S::v('uid');
+        $req = XDB::query(
                 "SELECT  nom, mail, sig, FIND_IN_SET('threads',flags), FIND_IN_SET('automaj',flags)
                    FROM  {$globals->banana->table_prefix}profils
                   WHERE  uid={?}", $uid);
 
         if (!(list($nom,$mail,$sig,$disp,$maj) = $req->fetchOneRow())) {
-            $nom  = Session::get('prenom')." ".Session::get('nom');
-            $mail = Session::get('forlife')."@polytechnique.org";
-            $sig  = $nom." (".Session::getInt('promo').")";
+            $nom  = S::v('prenom')." ".S::v('nom');
+            $mail = S::v('forlife')."@polytechnique.org";
+            $sig  = $nom." (".S::v('promo').")";
             $disp = 0;
             $maj  = 1;
         }
@@ -128,13 +135,13 @@ class PlatalBanana extends Banana
         $this->profile['sig']       = $sig;
         $this->profile['display']   = $disp;
         $this->profile['autoup']    = $maj;
-        $this->profile['lastnews']  = Session::get('banana_last');
+        $this->profile['lastnews']  = S::v('banana_last');
         
         if ($maj) {
-            $globals->xdb->execute("UPDATE auth_user_quick SET banana_last={?} WHERE user_id={?}", gmdate("YmdHis"), $uid);
+            XDB::execute("UPDATE auth_user_quick SET banana_last={?} WHERE user_id={?}", gmdate("YmdHis"), $uid);
         }
 
-        $req = $globals->xdb->query("
+        $req = XDB::query("
                  SELECT  nom
                    FROM  {$globals->banana->table_prefix}abos
               LEFT JOIN  {$globals->banana->table_prefix}list ON list.fid=abos.fid
@@ -144,7 +151,7 @@ class PlatalBanana extends Banana
         array_splice($this->show_hdr,  count($this->show_hdr)  - 2, 0);
         array_splice($this->parse_hdr, count($this->parse_hdr) - 2, 0, 'x-org-id');
 
-        $this->host = 'news://web_'.Session::get('forlife')
+        $this->host = 'news://web_'.S::v('forlife')
             .":{$globals->banana->password}@{$globals->banana->server}:{$globals->banana->port}/";
 
         parent::Banana();
@@ -152,11 +159,11 @@ class PlatalBanana extends Banana
 
     function run($params = null)
     {
-        global $banana, $globals;
+        global $banana;
 
         if (Get::get('banana') == 'updateall'
                 || (!is_null($params) && isset($params['banana']) && $params['banana'] == 'updateall')) {
-            $globals->xdb->execute('UPDATE auth_user_quick SET banana_last={?} WHERE user_id={?}', gmdate('YmdHis'), Session::getInt('uid'));
+            XDB::execute('UPDATE auth_user_quick SET banana_last={?} WHERE user_id={?}', gmdate('YmdHis'), S::v('uid'));
             $_SESSION['banana_last'] = time();
         }
         return Banana::run('PlatalBanana', $params);
@@ -165,15 +172,15 @@ class PlatalBanana extends Banana
     function action_saveSubs()
     {
         global $globals;
-        $uid = Session::getInt('uid');
+        $uid = S::v('uid');
 
         $this->profile['subscribe'] = Array();
-        $globals->xdb->execute("DELETE FROM {$globals->banana->table_prefix}abos WHERE uid={?}", $uid);
+        XDB::execute("DELETE FROM {$globals->banana->table_prefix}abos WHERE uid={?}", $uid);
         if (!count($_POST['subscribe'])) {
             return true;
         }
         
-        $req  = $globals->xdb->iterRow("SELECT fid,nom FROM {$globals->banana->table_prefix}list");
+        $req  = XDB::iterRow("SELECT fid,nom FROM {$globals->banana->table_prefix}list");
         $fids = array();
         while (list($fid,$fnom) = $req->next()) {
             $fids[$fnom] = $fid;
@@ -181,12 +188,12 @@ class PlatalBanana extends Banana
 
         $diff = array_diff($_POST['subscribe'], array_keys($fids));
         foreach ($diff as $g) {
-            $globals->xdb->execute("INSERT INTO {$globals->banana->table_prefix}list (nom) VALUES ({?})", $g);
+            XDB::execute("INSERT INTO {$globals->banana->table_prefix}list (nom) VALUES ({?})", $g);
             $fids[$g] = mysql_insert_id();
         }
 
         foreach ($_POST['subscribe'] as $g) {
-            $globals->xdb->execute("INSERT INTO {$globals->banana->table_prefix}abos (fid,uid) VALUES ({?},{?})", $fids[$g], $uid);
+            XDB::execute("INSERT INTO {$globals->banana->table_prefix}abos (fid,uid) VALUES ({?},{?})", $fids[$g], $uid);
             $this->profile['subscribe'][] = $g;
         }
     }