replace a big part of the default config with a default config file

instead.

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@613 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/configs/platal.ini b/configs/platal.ini
new file mode 100644 (file)
index 0000000..bf4bd09
--- /dev/null
+++ b/configs/platal.ini
@@ -0,0 +1,34 @@
+[Banana]
+server = "localhost"
+port   = 119
+
+password = "***"
+web_user = "***"
+web_pass = "***"
+
+table_prefix = "banana_"
+
+
+[Lists]
+rpchost   = "localhost"
+rpcport   = 4949
+
+spool     = "/var/spool/platal/archives/"
+vhost_sep = "_"
+
+
+[Newsletter]
+from      = "Lettre Mensuelle <null@example.org>"
+replyto   = ""
+retpath   = ""
+
+
+[Search]
+public_max  =  25
+private_max = 800
+per_page    =  20
+
+
+[Xnet]
+secret      = ""
+evts_domain = ""

diff --git a/hooks/banana.inc.php b/hooks/banana.inc.php
index 588a94b..67b9851 100644 (file)
--- a/hooks/banana.inc.php
+++ b/hooks/banana.inc.php
@@ -19,30 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-// {{{ config HOOK
-
-// {{{ class SkinConfig
-
-class BananaConfig
-{
-    var $server       = 'localhost';
-    var $port         = 119;
-    var $password     = '***';
-    var $web_user     = '***';
-    var $web_pass     = '***';
-
-    var $table_prefix = 'banana_';
-}
-
-// }}}
-
-function banana_config()
-{
-    global $globals;
-    $globals->banana = new BananaConfig;
-}
-
-// }}}
 // {{{ subscribe HOOK
 
 function banana_subscribe($forlife, $uid, $promo, $password)

diff --git a/hooks/emails.inc.php b/hooks/emails.inc.php
index 996eedf..bdbf24f 100644 (file)
--- a/hooks/emails.inc.php
+++ b/hooks/emails.inc.php
@@ -21,8 +21,6 @@
 
 // {{{ config HOOK
 
-// {{{ class SkinConfig
-
 class MailConfig
 {
     var $domain     = '';
@@ -41,8 +39,6 @@ class MailConfig
     }
 }
 
-// }}}
-
 function emails_config()
 {
     global $globals;

diff --git a/hooks/geoloc.inc.php b/hooks/geoloc.inc.php
index 89dd7e1..3a9ca55 100644 (file)
--- a/hooks/geoloc.inc.php
+++ b/hooks/geoloc.inc.php
@@ -21,8 +21,6 @@
 
 // {{{ config HOOK
 
-// {{{ class GeolocConfig
-
 class GeolocConfig
 {
     var $webservice_url = '';
@@ -37,8 +35,6 @@ class GeolocConfig
     }
 }
 
-// }}}
-
 function geoloc_config()
 {
     global $globals;

diff --git a/hooks/lists.inc.php b/hooks/lists.inc.php
index a84448d..8123402 100644 (file)
--- a/hooks/lists.inc.php
+++ b/hooks/lists.inc.php
@@ -19,29 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-// {{{ config HOOK
-// {{{ class ListsConfig
-
-class ListsConfig
-{
-    var $rpchost     = 'localhost';
-    var $rpcport     = 4949;
-    
-    var $spool       = '/var/spool/platal/archives/';
-
-    var $admin_owner = '';
-    var $vhost_sep   = '_';
-}
-
-// }}}
-
-function lists_config()
-{
-    global $globals;
-    $globals->lists = new ListsConfig;
-}
-
-// }}}
 // {{{ subscribe HOOK
 
 function lists_subscribe($forlife, $uid, $promo, $password)

diff --git a/hooks/manageurs.inc.php b/hooks/manageurs.inc.php
index c23e613..4bdd563 100644 (file)
--- a/hooks/manageurs.inc.php
+++ b/hooks/manageurs.inc.php
@@ -20,7 +20,6 @@
  ***************************************************************************/
 
 // {{{ config HOOK
-// {{{ class ManageursConfig
 
 class ManageursConfig
 {
@@ -29,8 +28,6 @@ class ManageursConfig
     var $manageurs_pass = '';
 }
 
-// }}}
-
 function manageurs_config()
 {
     global $globals;

diff --git a/hooks/money.inc.php b/hooks/money.inc.php
index 5390aef..b0dc683 100644 (file)
--- a/hooks/money.inc.php
+++ b/hooks/money.inc.php
@@ -21,8 +21,6 @@
 
 // {{{ config HOOK
 
-// {{{ class MoneyConfig
-
 class MoneyConfig
 {
     var $mpay_enable   = true;
@@ -33,8 +31,6 @@ class MoneyConfig
     var $paypal_compte = '';
 }
 
-// }}}
-
 function money_config()
 {
     global $globals;

diff --git a/hooks/newsletter.inc.php b/hooks/newsletter.inc.php
index e88f50c..ecd0baa 100644 (file)
--- a/hooks/newsletter.inc.php
+++ b/hooks/newsletter.inc.php
@@ -19,25 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-// {{{ config HOOK
-
-// {{{ class SkinConfig
-
-class NLConfig
-{
-    var $from    = "Lettre Mensuelle <null@example.org>";
-    var $replyto = "";
-    var $retpath = "";
-}
-
-// }}}
-
-function newsletter_config() {
-    global $globals;
-    $globals->newsletter = new NLConfig;
-}
-
-// }}}
 // {{{ subscribe HOOK
 
 function newsletter_subscribe($forlife, $uid, $promo, $password)

diff --git a/hooks/search.inc.php b/hooks/search.inc.php
index 26b7d22..aa82b04 100644 (file)
--- a/hooks/search.inc.php
+++ b/hooks/search.inc.php
@@ -19,27 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-// {{{ config HOOK
-
-// {{{ class SearchConfig
-
-class SearchConfig
-{
-    var $public_max  =  25;
-    var $private_max = 800;
-
-    var $per_page    =  20;
-}
-
-// }}}
-
-function search_config()
-{
-    global $globals;
-    $globals->search = new SearchConfig;
-}
-
-// }}}
 // {{{ subscribe HOOK
 function search_subscribe($forlife, $uid, $promo, $pass)
 {

diff --git a/hooks/xnet.inc.php b/hooks/xnet.inc.php
deleted file mode 100644 (file)
index 10e0df4..0000000
--- a/hooks/xnet.inc.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/***************************************************************************
- *  Copyright (C) 2003-2006 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                *
- ***************************************************************************/
-
-// {{{ config HOOK
-
-// {{{ class SkinConfig
-
-class XnetConfig
-{
-    var $secret       = '';
-    var $evts_domain  = '';
-}
-
-// }}}
-
-function xnet_config()
-{
-    global $globals;
-    $globals->xnet = new XnetConfig;
-}
-
-// }}}
- 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
-?>

diff --git a/include/xnet/globals.inc.php b/include/xnet/globals.inc.php
index aa6c21e..585dbd5 100644 (file)
--- a/include/xnet/globals.inc.php
+++ b/include/xnet/globals.inc.php
@@ -21,8 +21,6 @@
 
 require_once('platal/globals.inc.php');
 
-// {{{ class XorgGlobals
-
 class XnetGlobals extends PlatalGlobals
 {
     function XnetGlobals()
@@ -79,7 +77,5 @@ class XnetGlobals extends PlatalGlobals
     }
 }
 
-// }}}
-
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>

diff --git a/include/xorg/globals.inc.php b/include/xorg/globals.inc.php
index 5ad3363..a8bea5a 100644 (file)
--- a/include/xorg/globals.inc.php
+++ b/include/xorg/globals.inc.php
@@ -21,8 +21,6 @@
 
 require_once('platal/globals.inc.php');
 
-// {{{ class XorgGlobals
-
 class XorgGlobals extends PlatalGlobals
 {
     function XorgGlobals()
@@ -50,7 +48,5 @@ class XorgGlobals extends PlatalGlobals
     }
 }
 
-// }}}
-
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>

diff --git a/include/xorg/hook.inc.php b/include/xorg/hook.inc.php
index c992f45..d94e7c8 100644 (file)
--- a/include/xorg/hook.inc.php
+++ b/include/xorg/hook.inc.php
@@ -19,8 +19,6 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  **************************************************************************/
 
-// {{{ class XOrgHook
-
 /**
  * XOrg's Hooks API
  *
@@ -98,7 +96,5 @@ class XOrgHook
     // }}}
 }
 
-// }}}
-
 // vim:set et sw=4 sts=4 sws=4 foldmethod=marker:
 ?>