prepare banana module

diff --git a/htdocs/banana/include/hack.inc.php b/htdocs/banana/include/hack.inc.php
index 0617837..bcb48b5 100644 (file)
--- a/htdocs/banana/include/hack.inc.php
+++ b/htdocs/banana/include/hack.inc.php
@@ -1,13 +1,19 @@
 <?php
     
 function banana($params) {
-    global $globals,$news_server,$news_port,$page,$news_auth_pass;
+    global $globals, $page;
     global $news,$locale,$first,$spool,$group,$post,$id,$profile,$css;
     $sname = $_SERVER['SCRIPT_NAME'];
     $array = explode('/',$sname);
     $sname = array_pop($array);
     unset($array);
 
+    global $news_server,$news_port,$news_auth_pass;
+
+    $news_server    = $globals->banana->server;
+    $news_port      = $globals->banana->port;
+    $news_auth_pass = $globals->banana->password;
+
     require_once("../../../banana/$sname");
 }
 

diff --git a/htdocs/banana/include/password.inc.php b/htdocs/banana/include/password.inc.php
index c3e2fa0..70f57e8 100644 (file)
--- a/htdocs/banana/include/password.inc.php
+++ b/htdocs/banana/include/password.inc.php
@@ -6,11 +6,11 @@ $sname = array_pop($array);
 unset($array);
 
 if ($sname == "spoolgen.php") {
-    $news["user"]=$news_web_user;
-    $news["pass"]=$news_web_pass;
+    $news["user"] = $globals->banana->web_user;
+    $news["pass"] = $globals->banana->web_pass;
 } elseif (isset($_SESSION['forlife'])) {
-    $news["user"]="web_".$_SESSION['forlife'];
-    $news["pass"]=$news_auth_pass;
+    $news["user"]= "web_".$_SESSION['forlife'];
+    $news["pass"]= $globals->banana->web_pass;
 }
 $news['server']="$news_server:$news_port";
 ?>

diff --git a/include/conf.d/banana.globals.inc.php b/include/conf.d/banana.globals.inc.php
new file mode 100644 (file)
index 0000000..8edc6f0
--- /dev/null
+++ b/include/conf.d/banana.globals.inc.php
@@ -0,0 +1,40 @@
+<?php
+/***************************************************************************
+ *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  http://opensource.polytechnique.org/                                   *
+ *                                                                         *
+ *  This program is free software; you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation; either version 2 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *  GNU General Public License for more details.                           *
+ *                                                                         *
+ *  You should have received a copy of the GNU General Public License      *
+ *  along with this program; if not, write to the Free Software            *
+ *  Foundation, Inc.,                                                      *
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
+ ***************************************************************************
+    $Id: banana.globals.inc.php,v 1.1 2004-11-24 14:18:40 x2000habouzit Exp $
+ ***************************************************************************/
+
+// {{{ class SkinConfig
+
+class BananaConfig
+{
+    var $server   = 'localhost';
+    var $port     = 119;
+    var $password = '***';
+    var $web_user = '***';
+    var $web_pass = '***';
+}
+
+// }}}
+
+$this->banana = new BananaConfig;
+
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
+?>