From: x2000habouzit Date: Sat, 13 Nov 2004 14:16:15 +0000 (+0000) Subject: get rid of stupid popup thing X-Git-Tag: xorg/old~959 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=ad99902e16f0cd1479b3ba6dfb0ef324fbee668f;p=platal.git get rid of stupid popup thing --- diff --git a/htdocs/admin/evenements.php b/htdocs/admin/evenements.php index c3faaa0..9f6c1ed 100644 --- a/htdocs/admin/evenements.php +++ b/htdocs/admin/evenements.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: evenements.php,v 1.4 2004-09-02 23:33:56 x2000bedo Exp $ + $Id: evenements.php,v 1.5 2004-11-13 14:16:16 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_admin_page('admin/evenements.tpl', true); +new_admin_page('admin/evenements.tpl'); $arch = isset($_REQUEST['arch']) ? $_REQUEST['arch'] : 0; diff --git a/htdocs/admin/homonymes.php b/htdocs/admin/homonymes.php index 371ac4a..c5c0d7c 100644 --- a/htdocs/admin/homonymes.php +++ b/htdocs/admin/homonymes.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: homonymes.php,v 1.5 2004-11-01 17:27:03 x2002marichez Exp $ + $Id: homonymes.php,v 1.6 2004-11-13 14:16:16 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_admin_page('admin/homonymes.tpl',true); +new_admin_page('admin/homonymes.tpl'); require("diogenes.mailer.inc.php"); $op = isset($_REQUEST['op']) ? $_REQUEST['op'] : 'list'; diff --git a/htdocs/admin/newsletter_edit.php b/htdocs/admin/newsletter_edit.php index 84c9766..806d03a 100644 --- a/htdocs/admin/newsletter_edit.php +++ b/htdocs/admin/newsletter_edit.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: newsletter_edit.php,v 1.5 2004-10-20 15:09:57 x2000habouzit Exp $ + $Id: newsletter_edit.php,v 1.6 2004-11-13 14:16:16 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_admin_page('admin/newsletter_edit.tpl', false, 'newsletter/head.tpl'); +new_admin_page('admin/newsletter_edit.tpl', 'newsletter/head.tpl'); require("newsletter.inc.php"); $nid = empty($_GET['nid']) ? 'last' : $_GET['nid']; diff --git a/htdocs/admin/utilisateurs.php b/htdocs/admin/utilisateurs.php index 88fe6d6..893d4b6 100644 --- a/htdocs/admin/utilisateurs.php +++ b/htdocs/admin/utilisateurs.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: utilisateurs.php,v 1.25 2004-10-25 19:36:11 x2000habouzit Exp $ + $Id: utilisateurs.php,v 1.26 2004-11-13 14:16:16 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_admin_page('admin/utilisateurs.tpl', true); +new_admin_page('admin/utilisateurs.tpl'); require("email.classes.inc.php"); /* diff --git a/htdocs/admin/valider.php b/htdocs/admin/valider.php index 1acb6e7..6e16b8a 100644 --- a/htdocs/admin/valider.php +++ b/htdocs/admin/valider.php @@ -18,12 +18,12 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: valider.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: valider.php,v 1.4 2004-11-13 14:16:16 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); require("validations.inc.php"); -new_admin_page('admin/valider.tpl',true); +new_admin_page('admin/valider.tpl'); if(isset($_REQUEST["uid"]) and isset($_REQUEST["type"]) and isset($_REQUEST["stamp"])) { diff --git a/htdocs/advanced_search.php b/htdocs/advanced_search.php index 25f7ba3..e7e087a 100644 --- a/htdocs/advanced_search.php +++ b/htdocs/advanced_search.php @@ -18,12 +18,12 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: advanced_search.php,v 1.29 2004-11-13 11:54:28 x2000habouzit Exp $ + $Id: advanced_search.php,v 1.30 2004-11-13 14:16:15 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); require("search.classes.inc.php"); -new_skinned_page('search.tpl', AUTH_COOKIE,true); +new_skinned_page('search.tpl', AUTH_COOKIE); $page->assign('advanced',1); $page->assign('public_directory',0); require_once("applis.func.inc.php"); diff --git a/htdocs/banana/article.php b/htdocs/banana/article.php index cff7f97..1f3e270 100644 --- a/htdocs/banana/article.php +++ b/htdocs/banana/article.php @@ -8,7 +8,7 @@ ********************************************************************************/ require('auto.prepend.inc.php'); -new_skinned_page('banana.tpl', AUTH_COOKIE, true, 'banana.head.tpl'); +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 cff7f97..1f3e270 100644 --- a/htdocs/banana/disconnect.php +++ b/htdocs/banana/disconnect.php @@ -8,7 +8,7 @@ ********************************************************************************/ require('auto.prepend.inc.php'); -new_skinned_page('banana.tpl', AUTH_COOKIE, true, 'banana.head.tpl'); +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 cff7f97..1f3e270 100644 --- a/htdocs/banana/index.php +++ b/htdocs/banana/index.php @@ -8,7 +8,7 @@ ********************************************************************************/ require('auto.prepend.inc.php'); -new_skinned_page('banana.tpl', AUTH_COOKIE, true, 'banana.head.tpl'); +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 cff7f97..1f3e270 100644 --- a/htdocs/banana/post.php +++ b/htdocs/banana/post.php @@ -8,7 +8,7 @@ ********************************************************************************/ require('auto.prepend.inc.php'); -new_skinned_page('banana.tpl', AUTH_COOKIE, true, 'banana.head.tpl'); +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 cff7f97..1f3e270 100644 --- a/htdocs/banana/subscribe.php +++ b/htdocs/banana/subscribe.php @@ -8,7 +8,7 @@ ********************************************************************************/ require('auto.prepend.inc.php'); -new_skinned_page('banana.tpl', AUTH_COOKIE, true, 'banana.head.tpl'); +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 cff7f97..1f3e270 100644 --- a/htdocs/banana/thread.php +++ b/htdocs/banana/thread.php @@ -8,7 +8,7 @@ ********************************************************************************/ require('auto.prepend.inc.php'); -new_skinned_page('banana.tpl', AUTH_COOKIE, true, 'banana.head.tpl'); +new_skinned_page('banana.tpl', AUTH_COOKIE, 'banana.head.tpl'); $page->caching = false; require('hack.inc.php'); diff --git a/htdocs/carnet/mescontacts.php b/htdocs/carnet/mescontacts.php index 6e7d704..e9a486a 100644 --- a/htdocs/carnet/mescontacts.php +++ b/htdocs/carnet/mescontacts.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: mescontacts.php,v 1.1 2004-11-04 15:33:27 x2000habouzit Exp $ + $Id: mescontacts.php,v 1.2 2004-11-13 14:16:17 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_skinned_page("carnet/mescontacts.tpl",AUTH_COOKIE,true); +new_skinned_page("carnet/mescontacts.tpl",AUTH_COOKIE); require("applis.func.inc.php"); // si l'utilisateur demande le retrait de qqun de sa liste diff --git a/htdocs/carnet/panel.php b/htdocs/carnet/panel.php index 56ac082..010db71 100644 --- a/htdocs/carnet/panel.php +++ b/htdocs/carnet/panel.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: panel.php,v 1.2 2004-11-06 22:34:16 x2000habouzit Exp $ + $Id: panel.php,v 1.3 2004-11-13 14:16:17 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_skinned_page('carnet/panel.tpl', AUTH_COOKIE, true); +new_skinned_page('carnet/panel.tpl', AUTH_COOKIE); require('notifs.inc.php'); if(isset($_GET['read'])) { diff --git a/htdocs/docs/doc_carva.php b/htdocs/docs/doc_carva.php index 8def9b3..9233ecc 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.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: doc_carva.php,v 1.4 2004-11-13 14:16:17 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_skinned_page("docs/doc_carva.tpl",AUTH_COOKIE, true); +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 62b1672..68f57e7 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.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: doc_emails.php,v 1.4 2004-11-13 14:16:17 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_skinned_page("docs/doc_emails.tpl",AUTH_COOKIE,true); +new_skinned_page("docs/doc_emails.tpl",AUTH_COOKIE); $page->run(); ?> diff --git a/htdocs/fiche.php b/htdocs/fiche.php index 91b88c5..659d841 100644 --- a/htdocs/fiche.php +++ b/htdocs/fiche.php @@ -18,12 +18,12 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: fiche.php,v 1.19 2004-11-02 07:13:08 x2000habouzit Exp $ + $Id: fiche.php,v 1.20 2004-11-13 14:16:15 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_simple_page('fiche.tpl',AUTH_COOKIE, true); +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 0a79f15..f62e1a3 100644 --- a/htdocs/fiche_referent.php +++ b/htdocs/fiche_referent.php @@ -18,12 +18,12 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: fiche_referent.php,v 1.9 2004-09-19 10:41:05 x2000coic Exp $ + $Id: fiche_referent.php,v 1.10 2004-11-13 14:16:15 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_simple_page('fiche_referent.tpl',AUTH_COOKIE, false); +new_simple_page('fiche_referent.tpl',AUTH_COOKIE); //$isnetscape = !empty($_SESSION['skin_compatible']); diff --git a/htdocs/inscription/index.php b/htdocs/inscription/index.php index bf5525e..a685779 100644 --- a/htdocs/inscription/index.php +++ b/htdocs/inscription/index.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: index.php,v 1.1 2004-09-05 22:25:44 x2000habouzit Exp $ + $Id: index.php,v 1.2 2004-11-13 14:16:18 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_skinned_page('inscription/index.tpl', AUTH_PUBLIC, true); +new_skinned_page('inscription/index.tpl', AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/inscription/step1.php b/htdocs/inscription/step1.php index d7cc103..09cea12 100644 --- a/htdocs/inscription/step1.php +++ b/htdocs/inscription/step1.php @@ -18,14 +18,14 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: step1.php,v 1.1 2004-09-05 22:25:44 x2000habouzit Exp $ + $Id: step1.php,v 1.2 2004-11-13 14:16:18 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); $erreur = Array(); -new_skinned_page('inscription/step1.tpl', AUTH_PUBLIC, true); +new_skinned_page('inscription/step1.tpl', AUTH_PUBLIC); $page->run(); ?> diff --git a/htdocs/inscription/step2.php b/htdocs/inscription/step2.php index 43bf0b6..5280b74 100644 --- a/htdocs/inscription/step2.php +++ b/htdocs/inscription/step2.php @@ -18,13 +18,13 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: step2.php,v 1.1 2004-09-05 22:25:44 x2000habouzit Exp $ + $Id: step2.php,v 1.2 2004-11-13 14:16:18 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); require("identification.inc.php"); -new_skinned_page('inscription/step2.tpl', AUTH_PUBLIC, true); +new_skinned_page('inscription/step2.tpl', AUTH_PUBLIC); require("applis.func.inc.php"); diff --git a/htdocs/listes/admin.php b/htdocs/listes/admin.php index 9026137..2f52623 100644 --- a/htdocs/listes/admin.php +++ b/htdocs/listes/admin.php @@ -18,14 +18,14 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: admin.php,v 1.11 2004-11-10 10:59:09 x2000habouzit Exp $ + $Id: admin.php,v 1.12 2004-11-13 14:16:18 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); require("auto.prepend.inc.php"); -new_skinned_page('listes/admin.tpl', AUTH_MDP, true); +new_skinned_page('listes/admin.tpl', AUTH_MDP); include('xml-rpc-client.inc.php'); $err = Array(); diff --git a/htdocs/listes/check.php b/htdocs/listes/check.php index 78edf5a..787b7ab 100644 --- a/htdocs/listes/check.php +++ b/htdocs/listes/check.php @@ -18,14 +18,14 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: check.php,v 1.5 2004-11-10 10:59:09 x2000habouzit Exp $ + $Id: check.php,v 1.6 2004-11-13 14:16:18 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); require("auto.prepend.inc.php"); -new_admin_page('listes/check.tpl', true); +new_admin_page('listes/check.tpl'); include('xml-rpc-client.inc.php'); $client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); diff --git a/htdocs/listes/members.php b/htdocs/listes/members.php index a0c5f7e..f3d4bb0 100644 --- a/htdocs/listes/members.php +++ b/htdocs/listes/members.php @@ -18,14 +18,14 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: members.php,v 1.10 2004-11-10 10:59:09 x2000habouzit Exp $ + $Id: members.php,v 1.11 2004-11-13 14:16:18 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); require("auto.prepend.inc.php"); -new_skinned_page('listes/members.tpl', AUTH_COOKIE, true); +new_skinned_page('listes/members.tpl', AUTH_COOKIE); include('xml-rpc-client.inc.php'); $client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); diff --git a/htdocs/listes/moderate.php b/htdocs/listes/moderate.php index 033cd5e..5cc7105 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.18 2004-11-10 10:59:09 x2000habouzit Exp $ + $Id: moderate.php,v 1.19 2004-11-13 14:16:18 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); @@ -29,7 +29,7 @@ if(preg_match('!(?:[a-z0-9]+\.)?polytechnique\.org-(.*)!', $liste,$matches)) { } require("auto.prepend.inc.php"); -new_skinned_page('listes/moderate.tpl', AUTH_MDP, true); +new_skinned_page('listes/moderate.tpl', AUTH_MDP); include('xml-rpc-client.inc.php'); $client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); diff --git a/htdocs/listes/options.php b/htdocs/listes/options.php index e6f8434..49b718f 100644 --- a/htdocs/listes/options.php +++ b/htdocs/listes/options.php @@ -18,14 +18,14 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: options.php,v 1.7 2004-11-10 10:59:09 x2000habouzit Exp $ + $Id: options.php,v 1.8 2004-11-13 14:16:18 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); require("auto.prepend.inc.php"); -new_skinned_page('listes/options.tpl', AUTH_MDP, true); +new_skinned_page('listes/options.tpl', AUTH_MDP); include('xml-rpc-client.inc.php'); $client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); diff --git a/htdocs/listes/soptions.php b/htdocs/listes/soptions.php index 18c2f7e..6f28666 100644 --- a/htdocs/listes/soptions.php +++ b/htdocs/listes/soptions.php @@ -18,14 +18,14 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: soptions.php,v 1.6 2004-11-10 10:59:09 x2000habouzit Exp $ + $Id: soptions.php,v 1.7 2004-11-13 14:16:18 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); require("auto.prepend.inc.php"); -new_admin_page('listes/soptions.tpl', true); +new_admin_page('listes/soptions.tpl'); include('xml-rpc-client.inc.php'); $client = new xmlrpc_client("http://{$_SESSION['uid']}:{$_SESSION['password']}@localhost:4949/polytechnique.org"); diff --git a/htdocs/listes/trombi.php b/htdocs/listes/trombi.php index 1b5b722..b9df5a0 100644 --- a/htdocs/listes/trombi.php +++ b/htdocs/listes/trombi.php @@ -18,14 +18,14 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: trombi.php,v 1.13 2004-11-10 10:59:09 x2000habouzit Exp $ + $Id: trombi.php,v 1.14 2004-11-13 14:16:18 x2000habouzit Exp $ ***************************************************************************/ if(empty($_REQUEST['liste'])) header('Location: index.php'); $liste = strtolower($_REQUEST['liste']); require("auto.prepend.inc.php"); -new_skinned_page('listes/trombi.tpl', AUTH_COOKIE, true); +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 e17b115..4df4f58 100644 --- a/htdocs/login.php +++ b/htdocs/login.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: login.php,v 1.15 2004-11-01 09:15:34 x2000chevalier Exp $ + $Id: login.php,v 1.16 2004-11-13 14:16:15 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_skinned_page('login.tpl', AUTH_COOKIE, true); +new_skinned_page('login.tpl', AUTH_COOKIE); $param=$globals->db->query("SELECT date,naissance FROM auth_user_md5 WHERE user_id={$_SESSION['uid']};"); list($date,$naissance) = mysql_fetch_row($param); diff --git a/htdocs/marketing/ins_confirmees.php b/htdocs/marketing/ins_confirmees.php index 95986d3..9282d00 100644 --- a/htdocs/marketing/ins_confirmees.php +++ b/htdocs/marketing/ins_confirmees.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: ins_confirmees.php,v 1.4 2004-10-12 16:11:49 x2000habouzit Exp $ + $Id: ins_confirmees.php,v 1.5 2004-11-13 14:16:21 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_admin_page('marketing/ins_confirmees.tpl',true); +new_admin_page('marketing/ins_confirmees.tpl'); if (!isset($_GET["sort"]) || $_GET["sort"] != "promo") $_GET["sort"] = "date_ins"; diff --git a/htdocs/motdepassemd5.php b/htdocs/motdepassemd5.php index 0d1ed2e..bfdc8a2 100644 --- a/htdocs/motdepassemd5.php +++ b/htdocs/motdepassemd5.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: motdepassemd5.php,v 1.5 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: motdepassemd5.php,v 1.6 2004-11-13 14:16:15 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -33,6 +33,6 @@ if (!empty($_POST['response2'])) { // la variable $response existe- $page->run(); } -new_skinned_page('motdepassemd5.tpl', AUTH_MDP, true, 'motdepassemd5.head.tpl'); +new_skinned_page('motdepassemd5.tpl', AUTH_MDP, 'motdepassemd5.head.tpl'); $page->run(); ?> diff --git a/htdocs/newsletter/show.php b/htdocs/newsletter/show.php index 9b7ca0a..01268de 100644 --- a/htdocs/newsletter/show.php +++ b/htdocs/newsletter/show.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: show.php,v 1.2 2004-10-18 07:06:49 x2000habouzit Exp $ + $Id: show.php,v 1.3 2004-11-13 14:16:24 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_skinned_page('newsletter/show.tpl', AUTH_COOKIE, false, 'newsletter/head.tpl'); +new_skinned_page('newsletter/show.tpl', AUTH_COOKIE, 'newsletter/head.tpl'); require("newsletter.inc.php"); $nid = empty($_GET['nid']) ? 'last' : $_GET['nid']; diff --git a/htdocs/newsletter/submit.php b/htdocs/newsletter/submit.php index 8b3a6c7..ceea318 100644 --- a/htdocs/newsletter/submit.php +++ b/htdocs/newsletter/submit.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: submit.php,v 1.3 2004-10-16 18:17:50 x2000habouzit Exp $ + $Id: submit.php,v 1.4 2004-11-13 14:16:24 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_skinned_page('newsletter/submit.tpl', AUTH_COOKIE, false, 'newsletter/head.tpl'); +new_skinned_page('newsletter/submit.tpl', AUTH_COOKIE, 'newsletter/head.tpl'); require("newsletter.inc.php"); if(isset($_POST['see'])) { diff --git a/htdocs/profil.php b/htdocs/profil.php index f1ff09f..043a2cd 100644 --- a/htdocs/profil.php +++ b/htdocs/profil.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: profil.php,v 1.13 2004-11-06 17:37:21 x2000habouzit Exp $ + $Id: profil.php,v 1.14 2004-11-13 14:16:16 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_skinned_page('profil.tpl',AUTH_MDP, true, 'profil.head.tpl'); +new_skinned_page('profil.tpl',AUTH_MDP, 'profil.head.tpl'); require_once('tabs.inc.php'); require_once('profil.func.inc.php'); diff --git a/htdocs/referent.php b/htdocs/referent.php index 74950cb..e70f4df 100644 --- a/htdocs/referent.php +++ b/htdocs/referent.php @@ -18,12 +18,12 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: referent.php,v 1.7 2004-09-03 00:20:28 x2000habouzit Exp $ + $Id: referent.php,v 1.8 2004-11-13 14:16:16 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_skinned_page('referent.tpl',AUTH_COOKIE, true); +new_skinned_page('referent.tpl',AUTH_COOKIE); $nb_max_resultats_total = 100; $nb_max_resultats_par_page = 10; diff --git a/htdocs/search.php b/htdocs/search.php index 2776883..d1512ad 100644 --- a/htdocs/search.php +++ b/htdocs/search.php @@ -18,15 +18,15 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: search.php,v 1.48 2004-11-13 11:54:28 x2000habouzit Exp $ + $Id: search.php,v 1.49 2004-11-13 14:16:16 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); require("search.classes.inc.php"); -new_skinned_page('search.tpl', AUTH_PUBLIC, true); +new_skinned_page('search.tpl', AUTH_PUBLIC); if(logged()) { - new_skinned_page('search.tpl', AUTH_COOKIE, true); + new_skinned_page('search.tpl', AUTH_COOKIE); } $page->assign('advanced',0); diff --git a/htdocs/sendmail.php b/htdocs/sendmail.php index 5106b28..f91c124 100644 --- a/htdocs/sendmail.php +++ b/htdocs/sendmail.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: sendmail.php,v 1.6 2004-09-02 21:22:18 x2000habouzit Exp $ + $Id: sendmail.php,v 1.7 2004-11-13 14:16:16 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_skinned_page('sendmail.tpl',AUTH_MDP,true); +new_skinned_page('sendmail.tpl',AUTH_MDP); // action si on recoit un formulaire diff --git a/htdocs/tmpPWD.php b/htdocs/tmpPWD.php index f5f7e4a..71fd2c7 100644 --- a/htdocs/tmpPWD.php +++ b/htdocs/tmpPWD.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: tmpPWD.php,v 1.2 2004-08-31 10:03:28 x2000habouzit Exp $ + $Id: tmpPWD.php,v 1.3 2004-11-13 14:16:16 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -45,7 +45,7 @@ if ($ligne = mysql_fetch_array($result)) { $page->run(); } else { - new_skinned_page('motdepassemd5.tpl', AUTH_PUBLIC, true,'motdepassemd5.head.tpl'); + new_skinned_page('motdepassemd5.tpl', AUTH_PUBLIC, 'motdepassemd5.head.tpl'); $page->run(); } } diff --git a/htdocs/trombipromo.php b/htdocs/trombipromo.php index 6b3ae8c..6bbcad8 100644 --- a/htdocs/trombipromo.php +++ b/htdocs/trombipromo.php @@ -18,11 +18,11 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: trombipromo.php,v 1.8 2004-11-02 07:48:40 x2000habouzit Exp $ + $Id: trombipromo.php,v 1.9 2004-11-13 14:16:16 x2000habouzit Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); -new_skinned_page('trombipromo.tpl', AUTH_COOKIE, true); +new_skinned_page('trombipromo.tpl', AUTH_COOKIE); require("trombi.inc.php"); function getList($offset,$limit) { diff --git a/include/auto.prepend.inc.php b/include/auto.prepend.inc.php index ce03e5e..a274c79 100644 --- a/include/auto.prepend.inc.php +++ b/include/auto.prepend.inc.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: auto.prepend.inc.php,v 1.27 2004-10-08 16:59:09 x2000habouzit Exp $ + $Id: auto.prepend.inc.php,v 1.28 2004-11-13 14:16:27 x2000habouzit Exp $ ***************************************************************************/ function microtime_float() @@ -31,7 +31,7 @@ $TIME_BEGIN = microtime_float(); require("config.xorg.inc.php") ; require_once("xorg.common.inc.php"); -function _new_page($type, $tpl_name, $tpl_head, $min_auth, $popup=false, $admin=false) { +function _new_page($type, $tpl_name, $tpl_head, $min_auth, $admin=false) { global $page; require_once("xorg.page.inc.php"); if(!empty($admin)) { @@ -49,17 +49,15 @@ function _new_page($type, $tpl_name, $tpl_head, $min_auth, $popup=false, $admin= $page->assign('xorg_head', $tpl_head); $page->assign('xorg_tpl', $tpl_name); - if($popup) - $page->assign('popup_enable', true); } -function new_skinned_page($tpl_name, $min_auth, $popup=false, $tpl_head="") { - _new_page(SKINNED, $tpl_name, $tpl_head, $min_auth, $popup); +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, $popup=false, $tpl_head="") { +function new_simple_page($tpl_name, $min_auth, $tpl_head="") { global $page; - _new_page(SKINNED, $tpl_name, $tpl_head, $min_auth, $popup); + _new_page(SKINNED, $tpl_name, $tpl_head, $min_auth); $page->assign('simple', true); } @@ -67,8 +65,8 @@ function new_nonhtml_page($tpl_name, $min_auth) { _new_page(NO_SKIN, $tpl_name, "", $min_auth, false); } -function new_admin_page($tpl_name, $popup=false, $tpl_head="") { - _new_page(SKINNED, $tpl_name, $tpl_head, AUTH_MDP, $popup, true); +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) { diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl index d12179f..5831bf0 100644 --- a/templates/skin/common.header.tpl +++ b/templates/skin/common.header.tpl @@ -17,7 +17,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: common.header.tpl,v 1.13 2004-10-12 19:58:11 x2000habouzit Exp $ + $Id: common.header.tpl,v 1.14 2004-11-13 14:16:32 x2000habouzit Exp $ ***************************************************************************} @@ -47,8 +47,6 @@ {/if} -{if $popup_enable} -{/if} {* vim:set et sw=2 sts=2 sws=2: *}