From: x2000habouzit <x2000habouzit>
Date: Sun, 21 Nov 2004 21:48:57 +0000 (+0000)
Subject: already included from xorg.common
X-Git-Tag: xorg/old~860
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=28b04b3a3dd34619ec4d390ef0d9603bac459cad;p=platal.git

already included from xorg.common
---

diff --git a/htdocs/banana/include/password.inc.php b/htdocs/banana/include/password.inc.php
index 43c3bbe..c3e2fa0 100644
--- a/htdocs/banana/include/password.inc.php
+++ b/htdocs/banana/include/password.inc.php
@@ -6,7 +6,6 @@ $sname = array_pop($array);
 unset($array);
 
 if ($sname == "spoolgen.php") {
-    require('config.xorg.inc.php');
     $news["user"]=$news_web_user;
     $news["pass"]=$news_web_pass;
 } elseif (isset($_SESSION['forlife'])) {
diff --git a/htdocs/groupex/export-econfiance.php b/htdocs/groupex/export-econfiance.php
index 28d4fb3..639b5e0 100644
--- a/htdocs/groupex/export-econfiance.php
+++ b/htdocs/groupex/export-econfiance.php
@@ -18,13 +18,12 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: export-econfiance.php,v 1.8 2004-11-10 10:59:09 x2000habouzit Exp $
+        $Id: export-econfiance.php,v 1.9 2004-11-21 21:48:57 x2000habouzit Exp $
  ***************************************************************************/
 
 
 /* Script permettant l'export de la liste des membres de la mailing list eConfiance, pour intégration par J-P Figer dans la liste des membres de X-Informatique */
 
-require("config.xorg.inc.php") ;
 require_once("xorg.common.inc.php");
 require_once("xml-rpc-client.inc.php");
 
diff --git a/htdocs/paiement/cyberpaiement_retour.php b/htdocs/paiement/cyberpaiement_retour.php
index a5efb45..4b7188c 100644
--- a/htdocs/paiement/cyberpaiement_retour.php
+++ b/htdocs/paiement/cyberpaiement_retour.php
@@ -18,10 +18,9 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: cyberpaiement_retour.php,v 1.10 2004-11-16 21:02:46 x2000habouzit Exp $
+        $Id: cyberpaiement_retour.php,v 1.11 2004-11-21 21:48:57 x2000habouzit Exp $
  ***************************************************************************/
 
-require("config.xorg.inc.php") ;
 require_once("xorg.common.inc.php");
 require("diogenes.hermes.inc.php");
 
diff --git a/include/auto.prepend.inc.php b/include/auto.prepend.inc.php
index 941f216..64ddcbd 100644
--- a/include/auto.prepend.inc.php
+++ b/include/auto.prepend.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: auto.prepend.inc.php,v 1.32 2004-11-21 18:33:58 x99laine Exp $
+        $Id: auto.prepend.inc.php,v 1.33 2004-11-21 21:48:58 x2000habouzit Exp $
  ***************************************************************************/
 
 function microtime_float() 
@@ -28,7 +28,6 @@ function microtime_float()
 } 
 $TIME_BEGIN = microtime_float();
  
-require("config.xorg.inc.php") ;
 require_once("xorg.common.inc.php");
 
 function _new_page($type, $tpl_name, $tpl_head, $min_auth, $admin=false) {
diff --git a/scripts/carva/redirect.php b/scripts/carva/redirect.php
index 80a1ef5..4a086c8 100644
--- a/scripts/carva/redirect.php
+++ b/scripts/carva/redirect.php
@@ -18,10 +18,9 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: redirect.php,v 1.2 2004-10-08 19:46:31 web Exp $
+        $Id: redirect.php,v 1.3 2004-11-21 21:49:26 x2000habouzit Exp $
  ***************************************************************************/
 
-require_once("../../include/config.xorg.inc.php") ;
 require_once("../../include/xorg.common.inc.php");
 
 // on coupe la chaîne REQUEST_URI selon les / et on ne garde que
diff --git a/scripts/cron/connect.db.inc.php b/scripts/cron/connect.db.inc.php
index 3d0ed8f..738e43f 100644
--- a/scripts/cron/connect.db.inc.php
+++ b/scripts/cron/connect.db.inc.php
@@ -18,17 +18,13 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: connect.db.inc.php,v 1.2 2004-11-02 06:34:27 x2000habouzit Exp $
+        $Id: connect.db.inc.php,v 1.3 2004-11-21 21:53:08 x2000habouzit Exp $
  ***************************************************************************/
 
 ini_set("include_path","/usr/share/php/diogenes:/usr/share/php:../../include");
 
-require("diogenes.database.inc.php");
-require("../../include/xorg.globals.inc.php");
-$globals = new XorgGlobals;
-
+require("../../include/xorg.common.inc.php");
 require("../../include/xorg.misc.inc.php");
-require("../../include/config.xorg.inc.php");
 $globals->dbconnect();
 
 ?>