X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fbanana%2Fhooks.inc.php;h=c08c983d48a317290e9c6e4029b979ba0841e44d;hb=190efb3a08127072aa3e0876a79e7bf76aa77051;hp=9e37484d6026d0548b4c6cb8ee5a581e379fbd68;hpb=d1e6167749fdad08c81e23d09e1bbbf76e3b989b;p=platal.git

diff --git a/include/banana/hooks.inc.php b/include/banana/hooks.inc.php
index 9e37484..c08c983 100644
--- a/include/banana/hooks.inc.php
+++ b/include/banana/hooks.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,7 +19,8 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-require_once 'banana/banana.inc.php';
+require_once dirname(__FILE__) . '/../../banana/banana/banana.inc.php';
+require_once dirname(__FILE__) . '/../../banana/banana/message.func.inc.php';
 
 function hook_formatDisplayHeader($_header, $_text, $in_spool = false)
 {
@@ -76,7 +77,7 @@ function hook_platalRSS($group)
     } else {
         $group = '';
     }
-    return '/rss/' . $group . S::v('hruid') . '/' . S::s('token') . '/rss.xml';
+    return '/rss/' . $group . S::v('hruid') . '/' . S::user()->token . '/rss.xml';
 }
 
 function hook_platalMessageLink($params)
@@ -190,9 +191,9 @@ function hook_getXFace($headers)
     }
     if (isset($headers['x-face'])) {
         $user = User::getSilent($login);
-        $res = XDB::query('SELECT  pf.uid
+        $res = XDB::query("SELECT  pf.uid
                              FROM  forum_profiles AS pf
-                            WHERE  pf.uid = {?} AND FIND_IN_SET(\'xface\', pf.flags)',
+                            WHERE  pf.uid = {?} AND FIND_IN_SET('xface', pf.flags)",
                           $user->id());
         if ($res->numRows()) {
             // User wants his xface to be showed, fallback to default handler
@@ -329,7 +330,7 @@ class BananaHandler
 
 function run_banana(&$page, $class, array $args)
 {
-    $user =& S::user();
+    $user = S::user();
     $banana = new $class($user, $args);
     $page->assign('banana', $banana->run());
     $page->addCssInline($banana->css());