From: x2000habouzit Date: Mon, 22 Nov 2004 11:15:30 +0000 (+0000) Subject: bye bye auto.prepend.inc.php ---> xorg.inc.php X-Git-Tag: xorg/old~841 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=6f20c5f026601f7820c83df75ea17de9130d2010;p=platal.git bye bye auto.prepend.inc.php ---> xorg.inc.php --- diff --git a/htdocs/acces_smtp.php b/htdocs/acces_smtp.php index 7c0d870..7fb4b8e 100644 --- a/htdocs/acces_smtp.php +++ b/htdocs/acces_smtp.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: acces_smtp.php,v 1.4 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: acces_smtp.php,v 1.5 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('acces_smtp.tpl', AUTH_MDP); if (isset($_REQUEST['op']) && $_REQUEST['op'] == "Valider" diff --git a/htdocs/acces_wap.php b/htdocs/acces_wap.php index 917acfc..52378d8 100644 --- a/htdocs/acces_wap.php +++ b/htdocs/acces_wap.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: acces_wap.php,v 1.5 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: acces_wap.php,v 1.6 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('acces_wap.tpl', AUTH_MDP); diff --git a/htdocs/admin/admin_trombino.php b/htdocs/admin/admin_trombino.php index 9758db7..8913afe 100644 --- a/htdocs/admin/admin_trombino.php +++ b/htdocs/admin/admin_trombino.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: admin_trombino.php,v 1.3 2004-09-02 22:27:05 x2000habouzit Exp $ + $Id: admin_trombino.php,v 1.4 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('admin/admin_trombino.tpl'); $q = $globals->db->query("SELECT a.alias,promo diff --git a/htdocs/admin/ax-xorg.php b/htdocs/admin/ax-xorg.php index 8447ab4..52cebbf 100644 --- a/htdocs/admin/ax-xorg.php +++ b/htdocs/admin/ax-xorg.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: ax-xorg.php,v 1.4 2004-10-31 16:39:04 x2000chevalier Exp $ + $Id: ax-xorg.php,v 1.5 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_page('admin/ax-xorg.tpl'); // liste des différences diff --git a/htdocs/admin/deces_promo.php b/htdocs/admin/deces_promo.php index 5ceddc0..8574d39 100644 --- a/htdocs/admin/deces_promo.php +++ b/htdocs/admin/deces_promo.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: deces_promo.php,v 1.9 2004-11-18 15:35:35 x2000habouzit Exp $ + $Id: deces_promo.php,v 1.10 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('admin/deces_promo.tpl'); $promo = ( isset($_REQUEST["promo"]) ? $_REQUEST["promo"] : 0 ); diff --git a/htdocs/admin/evenements.php b/htdocs/admin/evenements.php index 9f6c1ed..0d6a5e7 100644 --- a/htdocs/admin/evenements.php +++ b/htdocs/admin/evenements.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: evenements.php,v 1.5 2004-11-13 14:16:16 x2000habouzit Exp $ + $Id: evenements.php,v 1.6 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('admin/evenements.tpl'); $arch = isset($_REQUEST['arch']) ? $_REQUEST['arch'] : 0; diff --git a/htdocs/admin/gerer_applis.php b/htdocs/admin/gerer_applis.php index 7d759c0..ffbf2db 100644 --- a/htdocs/admin/gerer_applis.php +++ b/htdocs/admin/gerer_applis.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: gerer_applis.php,v 1.2 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: gerer_applis.php,v 1.3 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_table_editor('applis_def','id'); $editor->add_join_table('applis_ins','aid',true); diff --git a/htdocs/admin/gerer_auth-groupex.php b/htdocs/admin/gerer_auth-groupex.php index 9cb638b..4107993 100644 --- a/htdocs/admin/gerer_auth-groupex.php +++ b/htdocs/admin/gerer_auth-groupex.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: gerer_auth-groupex.php,v 1.2 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: gerer_auth-groupex.php,v 1.3 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_table_editor('groupesx_auth','id'); $editor->describe('name','nom',true); diff --git a/htdocs/admin/gerer_binets.php b/htdocs/admin/gerer_binets.php index 3c4146c..7bc27c7 100644 --- a/htdocs/admin/gerer_binets.php +++ b/htdocs/admin/gerer_binets.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: gerer_binets.php,v 1.2 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: gerer_binets.php,v 1.3 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_table_editor('binets_def','id'); $editor->add_join_table('binets_ins','binet_id',true); diff --git a/htdocs/admin/gerer_coupure.php b/htdocs/admin/gerer_coupure.php index fe4ae8d..882b18f 100644 --- a/htdocs/admin/gerer_coupure.php +++ b/htdocs/admin/gerer_coupure.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: gerer_coupure.php,v 1.2 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: gerer_coupure.php,v 1.3 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_table_editor('coupures','id'); $editor->describe('debut','date',true,'timestamp'); diff --git a/htdocs/admin/gerer_groupesx.php b/htdocs/admin/gerer_groupesx.php index d363bcf..14de36b 100644 --- a/htdocs/admin/gerer_groupesx.php +++ b/htdocs/admin/gerer_groupesx.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: gerer_groupesx.php,v 1.2 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: gerer_groupesx.php,v 1.3 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_table_editor('groupesx_def','id'); $editor->add_join_table('groupesx_ins','gid',true); diff --git a/htdocs/admin/gerer_paiement.php b/htdocs/admin/gerer_paiement.php index bf8d5bb..baa93a5 100644 --- a/htdocs/admin/gerer_paiement.php +++ b/htdocs/admin/gerer_paiement.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: gerer_paiement.php,v 1.2 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: gerer_paiement.php,v 1.3 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_table_editor('paiement.paiements','id'); $editor->add_join_table('paiement.transactions','ref',true); diff --git a/htdocs/admin/gerer_skins.php b/htdocs/admin/gerer_skins.php index 7b7ce3b..7e5b737 100644 --- a/htdocs/admin/gerer_skins.php +++ b/htdocs/admin/gerer_skins.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: gerer_skins.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: gerer_skins.php,v 1.4 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_table_editor('skins','id'); $editor->describe('name','nom',true); $editor->describe('skin_tpl','nom du template',true); diff --git a/htdocs/admin/homonymes.php b/htdocs/admin/homonymes.php index 121ce7e..e7722da 100644 --- a/htdocs/admin/homonymes.php +++ b/htdocs/admin/homonymes.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: homonymes.php,v 1.9 2004-11-21 23:35:31 x2000habouzit Exp $ + $Id: homonymes.php,v 1.10 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('admin/homonymes.tpl'); require("diogenes.hermes.inc.php"); diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php index a05af0a..ccfff13 100644 --- a/htdocs/admin/index.php +++ b/htdocs/admin/index.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: index.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: index.php,v 1.4 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('admin/index.tpl'); $page->run(); diff --git a/htdocs/admin/lists.php b/htdocs/admin/lists.php index b7a2d66..013473b 100644 --- a/htdocs/admin/lists.php +++ b/htdocs/admin/lists.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: lists.php,v 1.3 2004-11-10 10:59:09 x2000habouzit Exp $ + $Id: lists.php,v 1.4 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('admin/lists.tpl'); include('xml-rpc-client.inc.php'); diff --git a/htdocs/admin/logger.php b/htdocs/admin/logger.php index 7838b86..ec46d4a 100644 --- a/htdocs/admin/logger.php +++ b/htdocs/admin/logger.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: logger.php,v 1.4 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: logger.php,v 1.5 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('logger-view.tpl'); require('diogenes.logger-view.inc.php'); diff --git a/htdocs/admin/logger_actions.php b/htdocs/admin/logger_actions.php index b37e356..9600c8e 100644 --- a/htdocs/admin/logger_actions.php +++ b/htdocs/admin/logger_actions.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: logger_actions.php,v 1.2 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: logger_actions.php,v 1.3 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_table_editor('logger.actions','id'); $editor->add_join_table('logger.events','action',true); diff --git a/htdocs/admin/newsletter.php b/htdocs/admin/newsletter.php index becc054..a3643f7 100644 --- a/htdocs/admin/newsletter.php +++ b/htdocs/admin/newsletter.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: newsletter.php,v 1.2 2004-10-18 12:57:46 x2000habouzit Exp $ + $Id: newsletter.php,v 1.3 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('admin/newsletter.tpl'); require("newsletter.inc.php"); diff --git a/htdocs/admin/newsletter_cats.php b/htdocs/admin/newsletter_cats.php index 927d965..e83d3aa 100644 --- a/htdocs/admin/newsletter_cats.php +++ b/htdocs/admin/newsletter_cats.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: newsletter_cats.php,v 1.1 2004-10-15 14:30:53 x2000habouzit Exp $ + $Id: newsletter_cats.php,v 1.2 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_table_editor('newsletter_cat','cid'); $editor->describe('titre','intitulé',true); diff --git a/htdocs/admin/newsletter_edit.php b/htdocs/admin/newsletter_edit.php index 806d03a..a099847 100644 --- a/htdocs/admin/newsletter_edit.php +++ b/htdocs/admin/newsletter_edit.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: newsletter_edit.php,v 1.6 2004-11-13 14:16:16 x2000habouzit Exp $ + $Id: newsletter_edit.php,v 1.7 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('admin/newsletter_edit.tpl', 'newsletter/head.tpl'); require("newsletter.inc.php"); diff --git a/htdocs/admin/newsletter_pattecassee.php b/htdocs/admin/newsletter_pattecassee.php index f9fb888..c253588 100644 --- a/htdocs/admin/newsletter_pattecassee.php +++ b/htdocs/admin/newsletter_pattecassee.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: newsletter_pattecassee.php,v 1.6 2004-11-22 07:40:16 x2000habouzit Exp $ + $Id: newsletter_pattecassee.php,v 1.7 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('admin/newsletter_pattecassee.tpl'); function valide_email($str) { diff --git a/htdocs/admin/postfix_blacklist.php b/htdocs/admin/postfix_blacklist.php index 73e1816..f2bbc8c 100644 --- a/htdocs/admin/postfix_blacklist.php +++ b/htdocs/admin/postfix_blacklist.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: postfix_blacklist.php,v 1.7 2004-10-08 11:30:46 x2000habouzit Exp $ + $Id: postfix_blacklist.php,v 1.8 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_table_editor('postfix_blacklist','email',true); $editor->assign('title', 'Blacklist de postfix'); diff --git a/htdocs/admin/postfix_delayed.php b/htdocs/admin/postfix_delayed.php index b715fcb..534afa1 100644 --- a/htdocs/admin/postfix_delayed.php +++ b/htdocs/admin/postfix_delayed.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: postfix_delayed.php,v 1.1 2004-10-08 12:04:04 x2000habouzit Exp $ + $Id: postfix_delayed.php,v 1.2 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_page('admin/postfix_delayed.tpl'); diff --git a/htdocs/admin/postfix_whitelist.php b/htdocs/admin/postfix_whitelist.php index 8c8373c..f027f47 100644 --- a/htdocs/admin/postfix_whitelist.php +++ b/htdocs/admin/postfix_whitelist.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: postfix_whitelist.php,v 1.1 2004-10-08 12:04:04 x2000habouzit Exp $ + $Id: postfix_whitelist.php,v 1.2 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_admin_table_editor('postfix_whitelist','email',true); $editor->assign('title', 'Whitelist de postfix'); diff --git a/htdocs/admin/utilisateurs.php b/htdocs/admin/utilisateurs.php index bdf483e..ad88150 100644 --- a/htdocs/admin/utilisateurs.php +++ b/htdocs/admin/utilisateurs.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: utilisateurs.php,v 1.31 2004-11-18 13:45:47 x2000habouzit Exp $ + $Id: utilisateurs.php,v 1.32 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('admin/utilisateurs.tpl'); require("email.classes.inc.php"); diff --git a/htdocs/admin/valider.php b/htdocs/admin/valider.php index 6e16b8a..a354d2b 100644 --- a/htdocs/admin/valider.php +++ b/htdocs/admin/valider.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: valider.php,v 1.4 2004-11-13 14:16:16 x2000habouzit Exp $ + $Id: valider.php,v 1.5 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); require("validations.inc.php"); new_admin_page('admin/valider.tpl'); diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php index 313cb4c..8033291 100644 --- a/htdocs/advanced_search.php +++ b/htdocs/advanced_search.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: advanced_search.php,v 1.31 2004-11-18 15:17:40 x2000habouzit Exp $ + $Id: advanced_search.php,v 1.32 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); require("search.classes.inc.php"); new_skinned_page('search.tpl', AUTH_COOKIE); $page->assign('advanced',1); diff --git a/htdocs/alias.php b/htdocs/alias.php index 559a68e..e866c21 100644 --- a/htdocs/alias.php +++ b/htdocs/alias.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: alias.php,v 1.8 2004-11-07 20:17:22 x2000habouzit Exp $ + $Id: alias.php,v 1.9 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); require("validations.inc.php"); new_skinned_page('alias.tpl', AUTH_MDP); diff --git a/htdocs/antispam.php b/htdocs/antispam.php index ba1159d..d6e2784 100644 --- a/htdocs/antispam.php +++ b/htdocs/antispam.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: antispam.php,v 1.10 2004-11-03 15:55:22 x2000habouzit Exp $ + $Id: antispam.php,v 1.11 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('antispam.tpl', AUTH_MDP); require("email.classes.inc.php"); diff --git a/htdocs/auth-groupex.php b/htdocs/auth-groupex.php index 0d1bbb9..0beab1c 100644 --- a/htdocs/auth-groupex.php +++ b/htdocs/auth-groupex.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: auth-groupex.php,v 1.8 2004-11-17 10:12:44 x2000habouzit Exp $ + $Id: auth-groupex.php,v 1.9 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ $gpex_pass = $_GET["pass"]; @@ -33,7 +33,7 @@ if (!preg_match("/^(http|https):\/\/.*/",$gpex_url)) $gpex_url = "http://$gpex_url"; $gpex_challenge = $_GET["challenge"]; -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('index.tpl',AUTH_COOKIE); // mise à jour de l'heure et de la machine de dernier login sauf quand on est en suid diff --git a/htdocs/auth-redirect.php b/htdocs/auth-redirect.php index 63a2719..3367e1a 100644 --- a/htdocs/auth-redirect.php +++ b/htdocs/auth-redirect.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: auth-redirect.php,v 1.2 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: auth-redirect.php,v 1.3 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('index.tpl',AUTH_COOKIE); //adresse de redirection par defaut diff --git a/htdocs/banana/article.php b/htdocs/banana/article.php index 1f3e270..b6320a4 100644 --- a/htdocs/banana/article.php +++ b/htdocs/banana/article.php @@ -7,7 +7,7 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_skinned_page('banana.tpl', AUTH_COOKIE, 'banana.head.tpl'); $page->caching = false; require('hack.inc.php'); diff --git a/htdocs/banana/disconnect.php b/htdocs/banana/disconnect.php index 1f3e270..b6320a4 100644 --- a/htdocs/banana/disconnect.php +++ b/htdocs/banana/disconnect.php @@ -7,7 +7,7 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_skinned_page('banana.tpl', AUTH_COOKIE, 'banana.head.tpl'); $page->caching = false; require('hack.inc.php'); diff --git a/htdocs/banana/index.php b/htdocs/banana/index.php index 1f3e270..b6320a4 100644 --- a/htdocs/banana/index.php +++ b/htdocs/banana/index.php @@ -7,7 +7,7 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_skinned_page('banana.tpl', AUTH_COOKIE, 'banana.head.tpl'); $page->caching = false; require('hack.inc.php'); diff --git a/htdocs/banana/post.php b/htdocs/banana/post.php index 1f3e270..b6320a4 100644 --- a/htdocs/banana/post.php +++ b/htdocs/banana/post.php @@ -7,7 +7,7 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_skinned_page('banana.tpl', AUTH_COOKIE, 'banana.head.tpl'); $page->caching = false; require('hack.inc.php'); diff --git a/htdocs/banana/subscribe.php b/htdocs/banana/subscribe.php index 1f3e270..b6320a4 100644 --- a/htdocs/banana/subscribe.php +++ b/htdocs/banana/subscribe.php @@ -7,7 +7,7 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_skinned_page('banana.tpl', AUTH_COOKIE, 'banana.head.tpl'); $page->caching = false; require('hack.inc.php'); diff --git a/htdocs/banana/thread.php b/htdocs/banana/thread.php index 1f3e270..b6320a4 100644 --- a/htdocs/banana/thread.php +++ b/htdocs/banana/thread.php @@ -7,7 +7,7 @@ * Copyright: See COPYING files that comes with this distribution ********************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_skinned_page('banana.tpl', AUTH_COOKIE, 'banana.head.tpl'); $page->caching = false; require('hack.inc.php'); diff --git a/htdocs/carnet/index.php b/htdocs/carnet/index.php index 515f9c0..b7a6d4a 100644 --- a/htdocs/carnet/index.php +++ b/htdocs/carnet/index.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: index.php,v 1.1 2004-11-04 15:33:27 x2000habouzit Exp $ + $Id: index.php,v 1.2 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('carnet/index.tpl', AUTH_COOKIE); $page->run(); diff --git a/htdocs/carnet/mescontacts.php b/htdocs/carnet/mescontacts.php index 7fa912a..9cf1ef0 100644 --- a/htdocs/carnet/mescontacts.php +++ b/htdocs/carnet/mescontacts.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: mescontacts.php,v 1.3 2004-11-18 15:17:41 x2000habouzit Exp $ + $Id: mescontacts.php,v 1.4 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("carnet/mescontacts.tpl",AUTH_COOKIE); require("applis.func.inc.php"); diff --git a/htdocs/carnet/mescontacts_pdf.php b/htdocs/carnet/mescontacts_pdf.php index 83698e6..388669b 100644 --- a/htdocs/carnet/mescontacts_pdf.php +++ b/htdocs/carnet/mescontacts_pdf.php @@ -18,14 +18,14 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: mescontacts_pdf.php,v 1.2 2004-11-17 10:12:45 x2000habouzit Exp $ + $Id: mescontacts_pdf.php,v 1.3 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ # -# $Id: mescontacts_pdf.php,v 1.2 2004-11-17 10:12:45 x2000habouzit Exp $ +# $Id: mescontacts_pdf.php,v 1.3 2004-11-22 11:15:31 x2000habouzit Exp $ # -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('index.tpl', AUTH_COOKIE); require("texify.inc.php"); require("applis.func.inc.php"); diff --git a/htdocs/carnet/notifs.php b/htdocs/carnet/notifs.php index d0ca80e..e793d66 100644 --- a/htdocs/carnet/notifs.php +++ b/htdocs/carnet/notifs.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: notifs.php,v 1.7 2004-11-07 11:54:07 x2000habouzit Exp $ + $Id: notifs.php,v 1.8 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('carnet/notifs.tpl', AUTH_COOKIE); require('notifs.inc.php'); diff --git a/htdocs/carnet/panel.php b/htdocs/carnet/panel.php index 010db71..552d485 100644 --- a/htdocs/carnet/panel.php +++ b/htdocs/carnet/panel.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: panel.php,v 1.3 2004-11-13 14:16:17 x2000habouzit Exp $ + $Id: panel.php,v 1.4 2004-11-22 11:15:31 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('carnet/panel.tpl', AUTH_COOKIE); require('notifs.inc.php'); diff --git a/htdocs/clear_all_cache.php b/htdocs/clear_all_cache.php index 9611d9f..800ab0f 100644 --- a/htdocs/clear_all_cache.php +++ b/htdocs/clear_all_cache.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: clear_all_cache.php,v 1.6 2004-10-09 12:57:45 x2000habouzit Exp $ + $Id: clear_all_cache.php,v 1.7 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('index.tpl'); $page->clear_all_cache(); $page->clear_compiled_tpl(); diff --git a/htdocs/confbanana.php b/htdocs/confbanana.php index 9dacf9e..cfabe6f 100644 --- a/htdocs/confbanana.php +++ b/htdocs/confbanana.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: confbanana.php,v 1.1 2004-09-26 15:02:32 x2000habouzit Exp $ + $Id: confbanana.php,v 1.2 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('confbanana.tpl', AUTH_MDP); if (!(isset($_POST["action"]) && isset($_POST["banananame"]) && diff --git a/htdocs/cookie_off.php b/htdocs/cookie_off.php index c94a637..dc079b1 100644 --- a/htdocs/cookie_off.php +++ b/htdocs/cookie_off.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: cookie_off.php,v 1.4 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: cookie_off.php,v 1.5 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('index.tpl', AUTH_COOKIE); setcookie('ORGaccess','',(time()+1),'/','',0); diff --git a/htdocs/cookie_on.php b/htdocs/cookie_on.php index cbd642b..8e20723 100644 --- a/htdocs/cookie_on.php +++ b/htdocs/cookie_on.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: cookie_on.php,v 1.4 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: cookie_on.php,v 1.5 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('cookie_on.tpl', AUTH_MDP); $res = @$globals->db->query( "SELECT password FROM auth_user_md5 WHERE user_id='{$_SESSION['uid']}'" ); diff --git a/htdocs/deconnexion.php b/htdocs/deconnexion.php index e23b2b7..fd3c5b6 100644 --- a/htdocs/deconnexion.php +++ b/htdocs/deconnexion.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: deconnexion.php,v 1.6 2004-10-14 18:36:46 x2000habouzit Exp $ + $Id: deconnexion.php,v 1.7 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); if (isset($_SESSION['suid'])) { require('./exit.php'); } diff --git a/htdocs/docs/apropos.php b/htdocs/docs/apropos.php index 025952f..0422da8 100644 --- a/htdocs/docs/apropos.php +++ b/htdocs/docs/apropos.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: apropos.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: apropos.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('docs/apropos.tpl', AUTH_PUBLIC); $page->run(); diff --git a/htdocs/docs/charte.php b/htdocs/docs/charte.php index 3bb7a2c..5dc5761 100644 --- a/htdocs/docs/charte.php +++ b/htdocs/docs/charte.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: charte.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: charte.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('docs/charte.tpl',AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/docs/contacts.php b/htdocs/docs/contacts.php index 9ac02d6..f0ed2a0 100644 --- a/htdocs/docs/contacts.php +++ b/htdocs/docs/contacts.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: contacts.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: contacts.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/contacts.tpl",AUTH_PUBLIC); $page->run(isset($_REQUEST['topic']) ? $_REQUEST['topic'] : ''); ?> diff --git a/htdocs/docs/convention_ax.php b/htdocs/docs/convention_ax.php index 238763f..060f5c2 100644 --- a/htdocs/docs/convention_ax.php +++ b/htdocs/docs/convention_ax.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: convention_ax.php,v 1.2 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: convention_ax.php,v 1.3 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('docs/convention_ax.tpl', AUTH_PUBLIC); $page->run(); diff --git a/htdocs/docs/doc_carva.php b/htdocs/docs/doc_carva.php index 9233ecc..7407a0f 100644 --- a/htdocs/docs/doc_carva.php +++ b/htdocs/docs/doc_carva.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: doc_carva.php,v 1.4 2004-11-13 14:16:17 x2000habouzit Exp $ + $Id: doc_carva.php,v 1.5 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/doc_carva.tpl",AUTH_COOKIE); $page->run(isset($_SESSION['alias']) ? 'alias' : ''); ?> diff --git a/htdocs/docs/doc_emails.php b/htdocs/docs/doc_emails.php index 68f57e7..68b2f65 100644 --- a/htdocs/docs/doc_emails.php +++ b/htdocs/docs/doc_emails.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: doc_emails.php,v 1.4 2004-11-13 14:16:17 x2000habouzit Exp $ + $Id: doc_emails.php,v 1.5 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/doc_emails.tpl",AUTH_COOKIE); $page->run(); ?> diff --git a/htdocs/docs/doc_forums.php b/htdocs/docs/doc_forums.php index 783e7a8..108e41f 100644 --- a/htdocs/docs/doc_forums.php +++ b/htdocs/docs/doc_forums.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: doc_forums.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: doc_forums.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/doc_forums.tpl",AUTH_COOKIE); $page->run(); ?> diff --git a/htdocs/docs/doc_from.php b/htdocs/docs/doc_from.php index 812b7e6..abaca87 100644 --- a/htdocs/docs/doc_from.php +++ b/htdocs/docs/doc_from.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: doc_from.php,v 1.2 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: doc_from.php,v 1.3 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/doc_from.tpl",AUTH_COOKIE); $page->run(); ?> diff --git a/htdocs/docs/doc_gratuits.php b/htdocs/docs/doc_gratuits.php index c6d4320..5bd36f4 100644 --- a/htdocs/docs/doc_gratuits.php +++ b/htdocs/docs/doc_gratuits.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: doc_gratuits.php,v 1.4 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: doc_gratuits.php,v 1.5 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/doc_gratuits.tpl",AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/docs/doc_melix.php b/htdocs/docs/doc_melix.php index e98a0c3..e25c2ca 100644 --- a/htdocs/docs/doc_melix.php +++ b/htdocs/docs/doc_melix.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: doc_melix.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: doc_melix.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/doc_melix.tpl",AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/docs/doc_nn.php b/htdocs/docs/doc_nn.php index 534eedf..22b0bfc 100644 --- a/htdocs/docs/doc_nn.php +++ b/htdocs/docs/doc_nn.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: doc_nn.php,v 1.4 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: doc_nn.php,v 1.5 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/doc_nn.tpl",AUTH_PUBLIC); $page->run(isset($_GET['doc']) ? $_GET['doc'] : ""); ?> diff --git a/htdocs/docs/doc_nntp.php b/htdocs/docs/doc_nntp.php index 8638b4c..07d0920 100644 --- a/htdocs/docs/doc_nntp.php +++ b/htdocs/docs/doc_nntp.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: doc_nntp.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: doc_nntp.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/doc_nntp.tpl",AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/docs/doc_oe.php b/htdocs/docs/doc_oe.php index c70e9a9..ff4c25a 100644 --- a/htdocs/docs/doc_oe.php +++ b/htdocs/docs/doc_oe.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: doc_oe.php,v 1.4 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: doc_oe.php,v 1.5 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/doc_oe.tpl",AUTH_PUBLIC); $page->run(isset($_GET['doc']) ? $_GET['doc'] : ""); ?> diff --git a/htdocs/docs/doc_patte_cassee.php b/htdocs/docs/doc_patte_cassee.php index e6d70be..b7dde30 100644 --- a/htdocs/docs/doc_patte_cassee.php +++ b/htdocs/docs/doc_patte_cassee.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: doc_patte_cassee.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: doc_patte_cassee.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/doc_patte_cassee.tpl",AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/docs/doc_smtp.php b/htdocs/docs/doc_smtp.php index 8aa103f..f268529 100644 --- a/htdocs/docs/doc_smtp.php +++ b/htdocs/docs/doc_smtp.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: doc_smtp.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: doc_smtp.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/doc_smtp.tpl",AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/docs/doc_ssl.php b/htdocs/docs/doc_ssl.php index 1ff5163..344359b 100644 --- a/htdocs/docs/doc_ssl.php +++ b/htdocs/docs/doc_ssl.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: doc_ssl.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: doc_ssl.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("docs/doc_ssl.tpl",AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/docs/en-cours.php b/htdocs/docs/en-cours.php index 45dd440..c7b2ecf 100644 --- a/htdocs/docs/en-cours.php +++ b/htdocs/docs/en-cours.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: en-cours.php,v 1.2 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: en-cours.php,v 1.3 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('docs/en-cours.tpl',AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/docs/ethique.php b/htdocs/docs/ethique.php index fc620dd..dae3fd7 100644 --- a/htdocs/docs/ethique.php +++ b/htdocs/docs/ethique.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: ethique.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: ethique.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('docs/ethique.tpl',AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/docs/faq.php b/htdocs/docs/faq.php index 730d8ab..951882d 100644 --- a/htdocs/docs/faq.php +++ b/htdocs/docs/faq.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: faq.php,v 1.4 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: faq.php,v 1.5 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('docs/faq.tpl',AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/docs/index.php b/htdocs/docs/index.php index 57c2ff6..2c4ffed 100644 --- a/htdocs/docs/index.php +++ b/htdocs/docs/index.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: index.php,v 1.5 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: index.php,v 1.6 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('docs/index.tpl',AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/docs/plan.php b/htdocs/docs/plan.php index 7b87949..f876298 100644 --- a/htdocs/docs/plan.php +++ b/htdocs/docs/plan.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: plan.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: plan.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('docs/plan.tpl',AUTH_PUBLIC); diff --git a/htdocs/docs/secu.php b/htdocs/docs/secu.php index 8ac50d5..fc56921 100644 --- a/htdocs/docs/secu.php +++ b/htdocs/docs/secu.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: secu.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: secu.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('docs/secu.tpl',AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/docs/services.php b/htdocs/docs/services.php index 9907f56..7ecf518 100644 --- a/htdocs/docs/services.php +++ b/htdocs/docs/services.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: services.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: services.php,v 1.4 2004-11-22 11:15:32 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('docs/services.tpl', AUTH_PUBLIC); $page->run(); diff --git a/htdocs/dons.php b/htdocs/dons.php index 201aac1..2dd178d 100644 --- a/htdocs/dons.php +++ b/htdocs/dons.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: dons.php,v 1.3 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: dons.php,v 1.4 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('dons.tpl', AUTH_COOKIE); $page->run(); ?> diff --git a/htdocs/emails.php b/htdocs/emails.php index f78009a..7257e12 100644 --- a/htdocs/emails.php +++ b/htdocs/emails.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: emails.php,v 1.11 2004-11-17 10:49:50 x2000habouzit Exp $ + $Id: emails.php,v 1.12 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('emails.tpl',AUTH_COOKIE); if(isset($_POST['best'])) { diff --git a/htdocs/epouse.php b/htdocs/epouse.php index e357595..91f3724 100644 --- a/htdocs/epouse.php +++ b/htdocs/epouse.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: epouse.php,v 1.10 2004-10-31 16:02:44 x2000chevalier Exp $ + $Id: epouse.php,v 1.11 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); require("validations.inc.php"); require("xorg.misc.inc.php"); diff --git a/htdocs/evenements.php b/htdocs/evenements.php index 27dd81d..d9073db 100644 --- a/htdocs/evenements.php +++ b/htdocs/evenements.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: evenements.php,v 1.2 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: evenements.php,v 1.3 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('evenements.tpl', AUTH_MDP); if (isset($_POST['titre'])) {$titre = stripslashes($_POST['titre']);} diff --git a/htdocs/exit.php b/htdocs/exit.php index 30f184f..8d81260 100644 --- a/htdocs/exit.php +++ b/htdocs/exit.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: exit.php,v 1.7 2004-10-14 18:36:46 x2000habouzit Exp $ + $Id: exit.php,v 1.8 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require_once("auto.prepend.inc.php"); +require_once("xorg.inc.php"); new_skinned_page('index.tpl',AUTH_MDP); if (isset($_SESSION['suid'])) { diff --git a/htdocs/fiche.php b/htdocs/fiche.php index 8c8ad89..3a5b746 100644 --- a/htdocs/fiche.php +++ b/htdocs/fiche.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: fiche.php,v 1.24 2004-11-18 15:28:16 x2000habouzit Exp $ + $Id: fiche.php,v 1.25 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_simple_page('fiche.tpl',AUTH_COOKIE); require_once('applis.func.inc.php'); diff --git a/htdocs/fiche_referent.php b/htdocs/fiche_referent.php index 2c50d78..99a4538 100644 --- a/htdocs/fiche_referent.php +++ b/htdocs/fiche_referent.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: fiche_referent.php,v 1.11 2004-11-17 21:37:05 x2000habouzit Exp $ + $Id: fiche_referent.php,v 1.12 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_simple_page('fiche_referent.tpl',AUTH_COOKIE); //$isnetscape = !empty($_SESSION['skin_compatible']); diff --git a/htdocs/getphoto.php b/htdocs/getphoto.php index 3252343..c626a5c 100644 --- a/htdocs/getphoto.php +++ b/htdocs/getphoto.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: getphoto.php,v 1.6 2004-09-10 23:13:03 x2000habouzit Exp $ + $Id: getphoto.php,v 1.7 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); new_skinned_page('login.tpl', AUTH_COOKIE); //require("db_connect.inc.php"); diff --git a/htdocs/groupex/export-econfiance.php b/htdocs/groupex/export-econfiance.php index 639b5e0..f19548b 100644 --- a/htdocs/groupex/export-econfiance.php +++ b/htdocs/groupex/export-econfiance.php @@ -18,13 +18,13 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: export-econfiance.php,v 1.9 2004-11-21 21:48:57 x2000habouzit Exp $ + $Id: export-econfiance.php,v 1.10 2004-11-22 11:15:33 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_once("xorg.common.inc.php"); +require_once("xorg.inc.php"); require_once("xml-rpc-client.inc.php"); $cle = $globals->econfiance; diff --git a/htdocs/index.php b/htdocs/index.php index 12a70c3..960d644 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: index.php,v 1.5 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: index.php,v 1.6 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('index.tpl', AUTH_PUBLIC); if(logged()) header("Location: login.php"); diff --git a/htdocs/inscription/index.php b/htdocs/inscription/index.php index a685779..494d037 100644 --- a/htdocs/inscription/index.php +++ b/htdocs/inscription/index.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: index.php,v 1.2 2004-11-13 14:16:18 x2000habouzit Exp $ + $Id: index.php,v 1.3 2004-11-22 11:15:35 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('inscription/index.tpl', AUTH_PUBLIC); $page->run(); diff --git a/htdocs/inscription/maj.php b/htdocs/inscription/maj.php index 7caa05e..b4b9861 100644 --- a/htdocs/inscription/maj.php +++ b/htdocs/inscription/maj.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: maj.php,v 1.3 2004-09-30 15:13:08 x2000habouzit Exp $ + $Id: maj.php,v 1.4 2004-11-22 11:15:35 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); if (isset($_REQUEST['n'])) { $sql = "SELECT * FROM envoidirect WHERE uid='".$_REQUEST["n"]."'"; diff --git a/htdocs/inscription/step1.php b/htdocs/inscription/step1.php index 09cea12..69bdc94 100644 --- a/htdocs/inscription/step1.php +++ b/htdocs/inscription/step1.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: step1.php,v 1.2 2004-11-13 14:16:18 x2000habouzit Exp $ + $Id: step1.php,v 1.3 2004-11-22 11:15:35 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); $erreur = Array(); diff --git a/htdocs/inscription/step2.php b/htdocs/inscription/step2.php index 5280b74..4ce5e00 100644 --- a/htdocs/inscription/step2.php +++ b/htdocs/inscription/step2.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: step2.php,v 1.2 2004-11-13 14:16:18 x2000habouzit Exp $ + $Id: step2.php,v 1.3 2004-11-22 11:15:35 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); require("identification.inc.php"); new_skinned_page('inscription/step2.tpl', AUTH_PUBLIC); diff --git a/htdocs/inscription/step3.php b/htdocs/inscription/step3.php index 8ff49c6..acf0b89 100644 --- a/htdocs/inscription/step3.php +++ b/htdocs/inscription/step3.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: step3.php,v 1.5 2004-11-22 07:40:16 x2000habouzit Exp $ + $Id: step3.php,v 1.6 2004-11-22 11:15:35 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); $erreur = Array(); diff --git a/htdocs/inscription/step4.php b/htdocs/inscription/step4.php index 7007851..46efd72 100644 --- a/htdocs/inscription/step4.php +++ b/htdocs/inscription/step4.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: step4.php,v 1.17 2004-11-22 07:40:16 x2000habouzit Exp $ + $Id: step4.php,v 1.18 2004-11-22 11:15:35 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('inscription/step4.tpl', AUTH_PUBLIC); require("user.func.inc.php"); diff --git a/htdocs/listes/admin.php b/htdocs/listes/admin.php index 2f52623..daa11eb 100644 --- a/htdocs/listes/admin.php +++ b/htdocs/listes/admin.php @@ -18,13 +18,13 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: admin.php,v 1.12 2004-11-13 14:16:18 x2000habouzit Exp $ + $Id: admin.php,v 1.13 2004-11-22 11:15:39 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('listes/admin.tpl', AUTH_MDP); include('xml-rpc-client.inc.php'); diff --git a/htdocs/listes/check.php b/htdocs/listes/check.php index 787b7ab..6b2e731 100644 --- a/htdocs/listes/check.php +++ b/htdocs/listes/check.php @@ -18,13 +18,13 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: check.php,v 1.6 2004-11-13 14:16:18 x2000habouzit Exp $ + $Id: check.php,v 1.7 2004-11-22 11:15:39 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('listes/check.tpl'); include('xml-rpc-client.inc.php'); diff --git a/htdocs/listes/create.php b/htdocs/listes/create.php index fa30ce5..df45942 100644 --- a/htdocs/listes/create.php +++ b/htdocs/listes/create.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: create.php,v 1.4 2004-10-13 11:21:34 x2000habouzit Exp $ + $Id: create.php,v 1.5 2004-11-22 11:15:39 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('listes/create.tpl', AUTH_MDP); $owners = empty($_POST['owners']) ? Array() : preg_split("/[\r\n]+/",$_POST['owners']); diff --git a/htdocs/listes/index.php b/htdocs/listes/index.php index 5e84dad..f0f3e28 100644 --- a/htdocs/listes/index.php +++ b/htdocs/listes/index.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: index.php,v 1.11 2004-11-10 10:59:09 x2000habouzit Exp $ + $Id: index.php,v 1.12 2004-11-22 11:15:39 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('listes/index.tpl', AUTH_MDP); include('xml-rpc-client.inc.php'); include('newsletter.inc.php'); diff --git a/htdocs/listes/members.php b/htdocs/listes/members.php index f3d4bb0..209c5c0 100644 --- a/htdocs/listes/members.php +++ b/htdocs/listes/members.php @@ -18,13 +18,13 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: members.php,v 1.11 2004-11-13 14:16:18 x2000habouzit Exp $ + $Id: members.php,v 1.12 2004-11-22 11:15:39 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('listes/members.tpl', AUTH_COOKIE); include('xml-rpc-client.inc.php'); diff --git a/htdocs/listes/moderate.php b/htdocs/listes/moderate.php index a936ec2..ac4b6dc 100644 --- a/htdocs/listes/moderate.php +++ b/htdocs/listes/moderate.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: moderate.php,v 1.20 2004-11-16 20:36:11 x2000habouzit Exp $ + $Id: moderate.php,v 1.21 2004-11-22 11:15:39 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); @@ -28,7 +28,7 @@ if(preg_match('!(?:[a-z0-9]+\.)?polytechnique\.org-(.*)!', $liste,$matches)) { header('Location: ?liste='.$matches[1]); } -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('listes/moderate.tpl', AUTH_MDP); include('xml-rpc-client.inc.php'); diff --git a/htdocs/listes/options.php b/htdocs/listes/options.php index 49b718f..fc363e0 100644 --- a/htdocs/listes/options.php +++ b/htdocs/listes/options.php @@ -18,13 +18,13 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: options.php,v 1.8 2004-11-13 14:16:18 x2000habouzit Exp $ + $Id: options.php,v 1.9 2004-11-22 11:15:39 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('listes/options.tpl', AUTH_MDP); include('xml-rpc-client.inc.php'); diff --git a/htdocs/listes/soptions.php b/htdocs/listes/soptions.php index 6f28666..001aa27 100644 --- a/htdocs/listes/soptions.php +++ b/htdocs/listes/soptions.php @@ -18,13 +18,13 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: soptions.php,v 1.7 2004-11-13 14:16:18 x2000habouzit Exp $ + $Id: soptions.php,v 1.8 2004-11-22 11:15:39 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('listes/soptions.tpl'); include('xml-rpc-client.inc.php'); diff --git a/htdocs/listes/trombi.php b/htdocs/listes/trombi.php index b9df5a0..d1a0192 100644 --- a/htdocs/listes/trombi.php +++ b/htdocs/listes/trombi.php @@ -18,13 +18,13 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: trombi.php,v 1.14 2004-11-13 14:16:18 x2000habouzit Exp $ + $Id: trombi.php,v 1.15 2004-11-22 11:15:39 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('listes/trombi.tpl', AUTH_COOKIE); include('xml-rpc-client.inc.php'); require("trombi.inc.php"); diff --git a/htdocs/login.php b/htdocs/login.php index 4df4f58..96adefe 100644 --- a/htdocs/login.php +++ b/htdocs/login.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: login.php,v 1.16 2004-11-13 14:16:15 x2000habouzit Exp $ + $Id: login.php,v 1.17 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('login.tpl', AUTH_COOKIE); $param=$globals->db->query("SELECT date,naissance FROM auth_user_md5 WHERE user_id={$_SESSION['uid']};"); diff --git a/htdocs/marketing/envoidirect.php b/htdocs/marketing/envoidirect.php index 49f7384..bbafa68 100644 --- a/htdocs/marketing/envoidirect.php +++ b/htdocs/marketing/envoidirect.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: envoidirect.php,v 1.3 2004-08-31 10:03:30 x2000habouzit Exp $ + $Id: envoidirect.php,v 1.4 2004-11-22 11:15:45 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('marketing/envoidirect.tpl'); // effacement des inscrits il y a plus de 8 jours diff --git a/htdocs/marketing/index.php b/htdocs/marketing/index.php index 9816e19..065efd2 100644 --- a/htdocs/marketing/index.php +++ b/htdocs/marketing/index.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: index.php,v 1.5 2004-11-20 19:07:02 x2000chevalier Exp $ + $Id: index.php,v 1.6 2004-11-22 11:15:45 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('marketing/index.tpl'); # Quelques statistiques diff --git a/htdocs/marketing/ins_confirmees.php b/htdocs/marketing/ins_confirmees.php index ed5a133..f2cc3d7 100644 --- a/htdocs/marketing/ins_confirmees.php +++ b/htdocs/marketing/ins_confirmees.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: ins_confirmees.php,v 1.6 2004-11-20 19:07:03 x2000chevalier Exp $ + $Id: ins_confirmees.php,v 1.7 2004-11-22 11:15:45 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('marketing/ins_confirmees.tpl'); if (!isset($_GET["sort"]) || $_GET["sort"] != "promo") $_GET["sort"] = "date_ins"; diff --git a/htdocs/marketing/promo.php b/htdocs/marketing/promo.php index 4df86e7..829db62 100644 --- a/htdocs/marketing/promo.php +++ b/htdocs/marketing/promo.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: promo.php,v 1.4 2004-11-14 16:19:00 x2000habouzit Exp $ + $Id: promo.php,v 1.5 2004-11-22 11:15:45 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('marketing/promo.tpl'); $promo = (integer) (isset($_REQUEST["promo"]) ? $_REQUEST["promo"] : $_SESSION["promo"]); diff --git a/htdocs/marketing/public.php b/htdocs/marketing/public.php index 42139e4..77a8e3a 100644 --- a/htdocs/marketing/public.php +++ b/htdocs/marketing/public.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: public.php,v 1.7 2004-11-18 14:43:27 x2000habouzit Exp $ + $Id: public.php,v 1.8 2004-11-22 11:15:45 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('marketing/public.tpl', AUTH_MDP); if (! isset($_REQUEST["num"])) { exit; } diff --git a/htdocs/marketing/relance.php b/htdocs/marketing/relance.php index 2e5c637..8c37a8a 100644 --- a/htdocs/marketing/relance.php +++ b/htdocs/marketing/relance.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: relance.php,v 1.6 2004-11-22 07:40:17 x2000habouzit Exp $ + $Id: relance.php,v 1.7 2004-11-22 11:15:45 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('marketing/relance.tpl'); diff --git a/htdocs/marketing/utilisateurs_marketing.php b/htdocs/marketing/utilisateurs_marketing.php index fd346a8..ec705d8 100644 --- a/htdocs/marketing/utilisateurs_marketing.php +++ b/htdocs/marketing/utilisateurs_marketing.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: utilisateurs_marketing.php,v 1.12 2004-11-22 07:40:17 x2000habouzit Exp $ + $Id: utilisateurs_marketing.php,v 1.13 2004-11-22 11:15:45 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); $id_actions = array('Mailer'); require("select_user.inc.php"); diff --git a/htdocs/marketing/volontaire.php b/htdocs/marketing/volontaire.php index 4be50f2..67c2c57 100644 --- a/htdocs/marketing/volontaire.php +++ b/htdocs/marketing/volontaire.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: volontaire.php,v 1.6 2004-11-10 13:32:37 x2000chevalier Exp $ + $Id: volontaire.php,v 1.7 2004-11-22 11:15:45 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_admin_page('marketing/volontaire.tpl'); $errors = Array(); diff --git a/htdocs/motdepassemd5.php b/htdocs/motdepassemd5.php index bfdc8a2..42a6cbf 100644 --- a/htdocs/motdepassemd5.php +++ b/htdocs/motdepassemd5.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: motdepassemd5.php,v 1.6 2004-11-13 14:16:15 x2000habouzit Exp $ + $Id: motdepassemd5.php,v 1.7 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); if (!empty($_POST['response2'])) { // la variable $response existe-t-elle ? // OUI, alors changeons le mot de passe diff --git a/htdocs/newsletter/index.php b/htdocs/newsletter/index.php index c3f7691..410aa0a 100644 --- a/htdocs/newsletter/index.php +++ b/htdocs/newsletter/index.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: index.php,v 1.1 2004-10-15 12:57:10 x2000habouzit Exp $ + $Id: index.php,v 1.2 2004-11-22 11:15:53 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('newsletter/index.tpl', AUTH_COOKIE); require("newsletter.inc.php"); diff --git a/htdocs/newsletter/show.php b/htdocs/newsletter/show.php index 3d0f7c6..1d1c9f6 100644 --- a/htdocs/newsletter/show.php +++ b/htdocs/newsletter/show.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: show.php,v 1.4 2004-11-17 12:21:47 x2000habouzit Exp $ + $Id: show.php,v 1.5 2004-11-22 11:15:53 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('newsletter/show.tpl', AUTH_COOKIE, 'newsletter/head.tpl'); require("newsletter.inc.php"); diff --git a/htdocs/newsletter/submit.php b/htdocs/newsletter/submit.php index c7e2b72..d945535 100644 --- a/htdocs/newsletter/submit.php +++ b/htdocs/newsletter/submit.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: submit.php,v 1.7 2004-11-17 18:16:25 x2000habouzit Exp $ + $Id: submit.php,v 1.8 2004-11-22 11:15:53 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('newsletter/submit.tpl', AUTH_COOKIE, 'newsletter/head.tpl'); require("newsletter.inc.php"); diff --git a/htdocs/paiement/cyberpaiement_retour.php b/htdocs/paiement/cyberpaiement_retour.php index 4b7188c..1f825bc 100644 --- a/htdocs/paiement/cyberpaiement_retour.php +++ b/htdocs/paiement/cyberpaiement_retour.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: cyberpaiement_retour.php,v 1.11 2004-11-21 21:48:57 x2000habouzit Exp $ + $Id: cyberpaiement_retour.php,v 1.12 2004-11-22 11:15:55 x2000habouzit Exp $ ***************************************************************************/ -require_once("xorg.common.inc.php"); +require_once("xorg.inc.php"); require("diogenes.hermes.inc.php"); /* sort en affichant une erreur */ diff --git a/htdocs/paiement/index.php b/htdocs/paiement/index.php index dc5a36f..62fa2af 100644 --- a/htdocs/paiement/index.php +++ b/htdocs/paiement/index.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: index.php,v 1.5 2004-11-02 07:59:42 x2000habouzit Exp $ + $Id: index.php,v 1.6 2004-11-22 11:15:55 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('paiment/index.tpl', AUTH_MDP); require_once('profil.func.inc.php'); setlocale(LC_NUMERIC,'fr_FR'); diff --git a/htdocs/pattecassee.php b/htdocs/pattecassee.php index 132f36f..313028d 100644 --- a/htdocs/pattecassee.php +++ b/htdocs/pattecassee.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: pattecassee.php,v 1.10 2004-11-16 20:36:10 x2000habouzit Exp $ + $Id: pattecassee.php,v 1.11 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('pattecassee.tpl',AUTH_COOKIE); function valide_email($str) { diff --git a/htdocs/preferences.php b/htdocs/preferences.php index 0a89031..69a0289 100644 --- a/htdocs/preferences.php +++ b/htdocs/preferences.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: preferences.php,v 1.5 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: preferences.php,v 1.6 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('preferences.tpl', AUTH_COOKIE); $has_cookie = (isset($_COOKIE['ORGaccess']) ? 'cookie' : ''); diff --git a/htdocs/profil.php b/htdocs/profil.php index 043a2cd..88ff93b 100644 --- a/htdocs/profil.php +++ b/htdocs/profil.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: profil.php,v 1.14 2004-11-13 14:16:16 x2000habouzit Exp $ + $Id: profil.php,v 1.15 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('profil.tpl',AUTH_MDP, 'profil.head.tpl'); require_once('tabs.inc.php'); diff --git a/htdocs/recherche.php b/htdocs/recherche.php index 7abdbcf..63f8f69 100644 --- a/htdocs/recherche.php +++ b/htdocs/recherche.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: recherche.php,v 1.1 2004-10-12 16:47:36 x2000habouzit Exp $ + $Id: recherche.php,v 1.2 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('recherche.tpl', AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/recovery.php b/htdocs/recovery.php index 34f977c..96c437f 100644 --- a/htdocs/recovery.php +++ b/htdocs/recovery.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: recovery.php,v 1.9 2004-11-21 23:35:30 x2000habouzit Exp $ + $Id: recovery.php,v 1.10 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('recovery.tpl', AUTH_PUBLIC); $errors = Array(); diff --git a/htdocs/referent.php b/htdocs/referent.php index d36affb..9798945 100644 --- a/htdocs/referent.php +++ b/htdocs/referent.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: referent.php,v 1.9 2004-11-17 21:37:05 x2000habouzit Exp $ + $Id: referent.php,v 1.10 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('referent.tpl',AUTH_COOKIE); $nb_max_resultats_total = 100; diff --git a/htdocs/routage-mail.php b/htdocs/routage-mail.php index 147b492..987edbe 100644 --- a/htdocs/routage-mail.php +++ b/htdocs/routage-mail.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: routage-mail.php,v 1.11 2004-11-17 10:12:44 x2000habouzit Exp $ + $Id: routage-mail.php,v 1.12 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('routage-mail.tpl',AUTH_MDP); require("email.classes.inc.php"); diff --git a/htdocs/rss.php b/htdocs/rss.php index 08d58df..12e3540 100644 --- a/htdocs/rss.php +++ b/htdocs/rss.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: rss.php,v 1.5 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: rss.php,v 1.6 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_nonhtml_page('rss.tpl', AUTH_PUBLIC); $requete="SELECT e.id,e.titre,e.texte FROM evenements AS e WHERE FIND_IN_SET(flags, 'valide') AND peremption >= NOW()"; diff --git a/htdocs/search.php b/htdocs/search.php index a2f2cfb..986a302 100644 --- a/htdocs/search.php +++ b/htdocs/search.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: search.php,v 1.50 2004-11-18 15:17:40 x2000habouzit Exp $ + $Id: search.php,v 1.51 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); require("search.classes.inc.php"); new_skinned_page('search.tpl', AUTH_PUBLIC); diff --git a/htdocs/sendmail.php b/htdocs/sendmail.php index 6482193..2c064f6 100644 --- a/htdocs/sendmail.php +++ b/htdocs/sendmail.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: sendmail.php,v 1.8 2004-11-16 20:36:10 x2000habouzit Exp $ + $Id: sendmail.php,v 1.9 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('sendmail.tpl',AUTH_MDP); diff --git a/htdocs/skins.php b/htdocs/skins.php index 3a3d7e6..f1b8125 100644 --- a/htdocs/skins.php +++ b/htdocs/skins.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: skins.php,v 1.9 2004-11-22 10:42:51 x2000habouzit Exp $ + $Id: skins.php,v 1.10 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('skins.tpl', AUTH_COOKIE); if (isset($_REQUEST['newskin'])) { // formulaire soumis, traitons les données envoyées diff --git a/htdocs/stats/coupure.php b/htdocs/stats/coupure.php index 707954a..bd961f7 100644 --- a/htdocs/stats/coupure.php +++ b/htdocs/stats/coupure.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: coupure.php,v 1.6 2004-08-31 10:03:31 x2000habouzit Exp $ + $Id: coupure.php,v 1.7 2004-11-22 11:15:58 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('stats/coupure.tpl',AUTH_PUBLIC); function serv_to_str($params) { diff --git a/htdocs/stats/graph_promo.php b/htdocs/stats/graph_promo.php index ada5a63..8c4a46e 100644 --- a/htdocs/stats/graph_promo.php +++ b/htdocs/stats/graph_promo.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: graph_promo.php,v 1.5 2004-11-14 16:29:53 x2000habouzit Exp $ + $Id: graph_promo.php,v 1.6 2004-11-22 11:15:58 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('index.tpl',AUTH_COOKIE); diff --git a/htdocs/stats/index.php b/htdocs/stats/index.php index adb1fc9..36d1002 100644 --- a/htdocs/stats/index.php +++ b/htdocs/stats/index.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: index.php,v 1.1 2004-11-09 09:01:12 x2000palatin Exp $ + $Id: index.php,v 1.2 2004-11-22 11:15:58 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("stats/index.tpl",AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/stats/nb_by_promo.php b/htdocs/stats/nb_by_promo.php index 025d4ba..5a0a88c 100644 --- a/htdocs/stats/nb_by_promo.php +++ b/htdocs/stats/nb_by_promo.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: nb_by_promo.php,v 1.6 2004-11-14 16:13:25 x2000habouzit Exp $ + $Id: nb_by_promo.php,v 1.7 2004-11-22 11:15:58 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('stats/nb_by_promo.tpl', AUTH_COOKIE); $result = $globals->db->query("SELECT promo,COUNT(*) diff --git a/htdocs/stats/parselog.php b/htdocs/stats/parselog.php index 059af2c..8bc005c 100644 --- a/htdocs/stats/parselog.php +++ b/htdocs/stats/parselog.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: parselog.php,v 1.4 2004-11-09 13:59:23 x2000palatin Exp $ + $Id: parselog.php,v 1.5 2004-11-22 11:15:58 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("stats/parselog.tpl",AUTH_COOKIE); $page->run(); diff --git a/htdocs/stats/stats_promo.php b/htdocs/stats/stats_promo.php index 3468498..b712e07 100644 --- a/htdocs/stats/stats_promo.php +++ b/htdocs/stats/stats_promo.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: stats_promo.php,v 1.3 2004-08-31 10:03:31 x2000habouzit Exp $ + $Id: stats_promo.php,v 1.4 2004-11-22 11:15:58 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page("stats/stats_promo.tpl", AUTH_COOKIE); $promo = isset($_REQUEST["promo"]) ? intval($_REQUEST["promo"]) : $_SESSION["promo"]; diff --git a/htdocs/tmpPWD.php b/htdocs/tmpPWD.php index e08c64f..5adca38 100644 --- a/htdocs/tmpPWD.php +++ b/htdocs/tmpPWD.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: tmpPWD.php,v 1.4 2004-11-18 14:46:24 x2000habouzit Exp $ + $Id: tmpPWD.php,v 1.5 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); $sql = "DELETE FROM perte_pass WHERE DATE_SUB(NOW(), INTERVAL 380 MINUTE) > created"; $globals->db->query($sql); diff --git a/htdocs/trezo/gere_operations.php b/htdocs/trezo/gere_operations.php index 46bdd75..ca7a4d4 100644 --- a/htdocs/trezo/gere_operations.php +++ b/htdocs/trezo/gere_operations.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: gere_operations.php,v 1.4 2004-08-31 10:03:32 x2000habouzit Exp $ + $Id: gere_operations.php,v 1.5 2004-11-22 11:16:00 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); require("trezo.inc.php"); new_admin_page('trezo/gere_operations.tpl'); diff --git a/htdocs/trezo/index.php b/htdocs/trezo/index.php index 074bc81..3c7e604 100644 --- a/htdocs/trezo/index.php +++ b/htdocs/trezo/index.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: index.php,v 1.3 2004-08-31 10:03:32 x2000habouzit Exp $ + $Id: index.php,v 1.4 2004-11-22 11:16:00 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); require("trezo.inc.php"); new_admin_page('trezo/index.tpl'); diff --git a/htdocs/trombino.php b/htdocs/trombino.php index 3cbdc58..f5993bd 100644 --- a/htdocs/trombino.php +++ b/htdocs/trombino.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: trombino.php,v 1.4 2004-11-12 21:30:58 x2000coic Exp $ + $Id: trombino.php,v 1.5 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('trombino.tpl', AUTH_MDP); require("validations.inc.php"); diff --git a/htdocs/trombipromo.php b/htdocs/trombipromo.php index 6bbcad8..7adffb5 100644 --- a/htdocs/trombipromo.php +++ b/htdocs/trombipromo.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: trombipromo.php,v 1.9 2004-11-13 14:16:16 x2000habouzit Exp $ + $Id: trombipromo.php,v 1.10 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('trombipromo.tpl', AUTH_COOKIE); require("trombi.inc.php"); diff --git a/htdocs/vcard.php b/htdocs/vcard.php index e543fd6..b458076 100644 --- a/htdocs/vcard.php +++ b/htdocs/vcard.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: vcard.php,v 1.15 2004-11-17 11:11:59 x2000habouzit Exp $ + $Id: vcard.php,v 1.16 2004-11-22 11:15:30 x2000habouzit Exp $ ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_nonhtml_page('vcard.tpl', AUTH_COOKIE); require("xorg.misc.inc.php"); diff --git a/htdocs/webservices/manageurs.php b/htdocs/webservices/manageurs.php index 5e6447a..77baa2a 100644 --- a/htdocs/webservices/manageurs.php +++ b/htdocs/webservices/manageurs.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: manageurs.php,v 1.5 2004-11-15 07:11:41 x2000coic Exp $ + $Id: manageurs.php,v 1.6 2004-11-22 11:16:32 x2000habouzit Exp $ ***************************************************************************/ -require_once('auto.prepend.inc.php'); +require_once('xorg.inc.php'); require_once('webservices/manageurs.server.inc.php'); diff --git a/htdocs/x.php b/htdocs/x.php index 00ebd40..cd1eee0 100644 --- a/htdocs/x.php +++ b/htdocs/x.php @@ -19,7 +19,7 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -require("auto.prepend.inc.php"); +require("xorg.inc.php"); new_skinned_page('x.tpl', AUTH_PUBLIC); $page->assign('baseurl',$globals->baseurl); $page->run(); diff --git a/include/auto.prepend.inc.php b/include/auto.prepend.inc.php deleted file mode 100644 index 64ddcbd..0000000 --- a/include/auto.prepend.inc.php +++ /dev/null @@ -1,78 +0,0 @@ -assign('xorg_head', $tpl_head); - $page->assign('xorg_tpl', $tpl_name); -} - -function new_skinned_page($tpl_name, $min_auth, $tpl_head="") { - _new_page(SKINNED, $tpl_name, $tpl_head, $min_auth); -} - -function new_simple_page($tpl_name, $min_auth, $tpl_head="") { - global $page; - _new_page(SKINNED, $tpl_name, $tpl_head, $min_auth); - $page->assign('simple', true); -} - -function new_nonhtml_page($tpl_name, $min_auth) { - _new_page(NO_SKIN, $tpl_name, "", $min_auth, false); -} - -function new_admin_page($tpl_name, $tpl_head="") { - _new_page(SKINNED, $tpl_name, $tpl_head, AUTH_MDP, true); -} - -function new_admin_table_editor($table,$idfield,$idedit=false) { - global $editor; - new_admin_page('table-editor.tpl'); - require_once('xorg.table-editor.inc.php'); - $editor = new XOrgAdminTableEditor($table,$idfield,$idedit); -} - -?> diff --git a/include/xorg.common.inc.php b/include/xorg.inc.php similarity index 73% rename from include/xorg.common.inc.php rename to include/xorg.inc.php index 08e409e..84f9f1c 100644 --- a/include/xorg.common.inc.php +++ b/include/xorg.inc.php @@ -18,9 +18,16 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: xorg.common.inc.php,v 1.11 2004-11-22 10:42:52 x2000habouzit Exp $ + $Id: xorg.inc.php,v 1.1 2004-11-22 11:16:32 x2000habouzit Exp $ ***************************************************************************/ +function microtime_float() +{ + list($usec, $sec) = explode(" ", microtime()); + return ((float)$usec + (float)$sec); +} +$TIME_BEGIN = microtime_float(); + // {{{ defines $i=0; @@ -47,20 +54,11 @@ require_once("xorg/session.inc.php"); $globals = new XorgGlobals; require("xorg.config.inc.php"); -$globals->menu = new XOrgMenu(); // }}} -// {{{ start session + database connection - -session_start(); - -// connect to database -$globals->dbconnect(); -if ($globals->debug) { - $globals->db->trace_on(); -} +// {{{ Build Menu, TODO: move that into appropriates hooks -//}}} +$globals->menu = new XOrgMenu(); $globals->menu->addPrivateEntry(XOM_NO, 10, 'Page d\'accueil', 'login.php'); @@ -104,5 +102,90 @@ $globals->menu->addPublicEntry(XOM_INFOS, 00, 'A propos du site', 'docs/ap $globals->menu->addPublicEntry(XOM_INFOS, 10, 'Nous contacter', 'docs/contacts.php'); $globals->menu->addPublicEntry(XOM_INFOS, 20, 'FAQ', 'docs/faq.php'); +// }}} +// {{{ start session + database connection + +session_start(); + +// connect to database +$globals->dbconnect(); +if ($globals->debug) { + $globals->db->trace_on(); +} + +//}}} + +// {{{ function _new_page() + +function _new_page($type, $tpl_name, $tpl_head, $min_auth, $admin=false) +{ + global $page; + require_once("xorg.page.inc.php"); + if (!empty($admin)) { + $page = new XorgAdmin($tpl_name, $type); + } else switch($min_auth) { + case AUTH_PUBLIC: + $page = new XorgPage($tpl_name, $type); + break; + + case AUTH_COOKIE: + $page = new XorgCookie($tpl_name, $type); + break; + + case AUTH_MDP: + $page = new XorgAuth($tpl_name, $type); + } + + $page->assign('xorg_head', $tpl_head); + $page->assign('xorg_tpl', $tpl_name); +} + +// }}} +// {{{ function new_skinned_page() + +function new_skinned_page($tpl_name, $min_auth, $tpl_head="") +{ + _new_page(SKINNED, $tpl_name, $tpl_head, $min_auth); +} + +// }}} +// {{{ function new_simple_page() + +function new_simple_page($tpl_name, $min_auth, $tpl_head="") +{ + global $page; + _new_page(SKINNED, $tpl_name, $tpl_head, $min_auth); + $page->assign('simple', true); +} + +// }}} +// {{{ function new_nonhtml_page() + +function new_nonhtml_page($tpl_name, $min_auth) +{ + _new_page(NO_SKIN, $tpl_name, "", $min_auth, false); +} + +// }}} +// {{{ function new_admin_page() + +function new_admin_page($tpl_name, $tpl_head="") +{ + _new_page(SKINNED, $tpl_name, $tpl_head, AUTH_MDP, true); +} + +// }}} +// {{{ function new_admin_table_editor() + +function new_admin_table_editor($table, $idfield, $idedit=false) +{ + global $editor; + new_admin_page('table-editor.tpl'); + require_once('xorg.table-editor.inc.php'); + $editor = new XOrgAdminTableEditor($table,$idfield,$idedit); +} + +// }}} + // vim:set et sw=4 sts=4 sws=4 foldmethod=marker: ?> diff --git a/scripts/FormatePrenomNOM.php b/scripts/FormatePrenomNOM.php index a7cefe7..cd65333 100644 --- a/scripts/FormatePrenomNOM.php +++ b/scripts/FormatePrenomNOM.php @@ -19,10 +19,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: FormatePrenomNOM.php,v 1.2 2004-08-31 11:19:51 x2000habouzit Exp $ + $Id: FormatePrenomNOM.php,v 1.3 2004-11-22 11:16:32 x2000habouzit Exp $ ***************************************************************************/ -require("xorg.common.inc.php"); +require("xorg.inc.php"); $result=mysql_query("SELECT user_id,prenom,nom FROM auth_user_md5"); diff --git a/scripts/carva/redirect.php b/scripts/carva/redirect.php index 4a086c8..dd17eaf 100644 --- a/scripts/carva/redirect.php +++ b/scripts/carva/redirect.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: redirect.php,v 1.3 2004-11-21 21:49:26 x2000habouzit Exp $ + $Id: redirect.php,v 1.4 2004-11-22 11:16:33 x2000habouzit Exp $ ***************************************************************************/ -require_once("../../include/xorg.common.inc.php"); +require("../../include/xorg.inc.php"); // on coupe la chaîne REQUEST_URI selon les / et on ne garde que // le premier non vide et éventuellement le second diff --git a/scripts/cron/connect.db.inc.php b/scripts/cron/connect.db.inc.php index 738e43f..be6bbea 100644 --- a/scripts/cron/connect.db.inc.php +++ b/scripts/cron/connect.db.inc.php @@ -18,13 +18,13 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: connect.db.inc.php,v 1.3 2004-11-21 21:53:08 x2000habouzit Exp $ + $Id: connect.db.inc.php,v 1.4 2004-11-22 11:16:33 x2000habouzit Exp $ ***************************************************************************/ ini_set("include_path","/usr/share/php/diogenes:/usr/share/php:../../include"); -require("../../include/xorg.common.inc.php"); -require("../../include/xorg.misc.inc.php"); +require("xorg.inc.php"); +require("xorg.misc.inc.php"); $globals->dbconnect(); ?> diff --git a/scripts/devel/foobar.php b/scripts/devel/foobar.php index d9c175a..2ec4cbc 100644 --- a/scripts/devel/foobar.php +++ b/scripts/devel/foobar.php @@ -18,10 +18,10 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: foobar.php,v 1.3 2004-11-21 16:31:48 x2000habouzit Exp $ + $Id: foobar.php,v 1.4 2004-11-22 11:16:34 x2000habouzit Exp $ ***************************************************************************/ -require('auto.prepend.inc.php'); +require('xorg.inc.php'); // vim:set et sw=4 sts=4 sws=4 foldmethod=marker: