From: Raphaël Barrois <raphael.barrois@polytechnique.org>
Date: Mon, 27 Sep 2010 21:21:12 +0000 (+0200)
Subject: Use correct passwords for banana (Closes #1247)
X-Git-Tag: xorg/1.0.1~15^2~5
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=708d70eba7fa466ba02c2cb193b9c04991760c38;p=platal.git

Use correct passwords for banana (Closes #1247)

Commit ad59fc86 removed the distinction between banana->web_pass (used
for user 'web') and banana->password (used for real users accessing the
site)

Signed-off-by: Raphaël Barrois <raphael.barrois@polytechnique.org>
---

diff --git a/include/banana/forum.inc.php b/include/banana/forum.inc.php
index 6a6a869..26d1fe5 100644
--- a/include/banana/forum.inc.php
+++ b/include/banana/forum.inc.php
@@ -59,9 +59,12 @@ class ForumsBanana extends Banana
         $user = $globals->banana->web_user;
         if ($login != null) {
             $user .= '_' . $login;
+            $pass = $globals->banana->password;
+        } else {
+            $pass = $globals->banana->web_pass;
         }
         return $scheme . '://' . $user
-                       . ":{$globals->banana->password}@{$globals->banana->server}:{$globals->banana->port}/";
+                       . ":{$pass}@{$globals->banana->server}:{$globals->banana->port}/";
 
     }