API plus raisonnable, c'est très mal de surcharger un opérateur pour faire qqchose...

Wrapper pour table-editor
ajout des admin/gerer_*

PS: merci Jeremy pour ce travail fabuleux !!!

diff --git a/htdocs/acces_smtp.php b/htdocs/acces_smtp.php
index ad4060b..b420f80 100644 (file)
--- a/htdocs/acces_smtp.php
+++ b/htdocs/acces_smtp.php
@@ -30,5 +30,5 @@ mysql_free_result($result);
 
 $page->assign('actif', ($smtppass_old != ""));
 
-$page->display(($smtppass_old != "") ? "actif" : "");
+$page->run(($smtppass_old != "") ? "actif" : "");
 ?>

diff --git a/htdocs/acces_wap.php b/htdocs/acces_wap.php
index 3dd282b..8c84adf 100644 (file)
--- a/htdocs/acces_wap.php
+++ b/htdocs/acces_wap.php
@@ -22,7 +22,7 @@ if (isset($_REQUEST['op']) && $_REQUEST['op'] == "valid") {
     mysql_query($sql);
 
     $page->assign('OK',true);
-    $page->display('OK');
+    $page->run('OK');
 } else { // pas de formulaire soumis
     $sql = "SELECT  FIND_IN_SET('actif',flags) AS actif,
                     FIND_IN_SET('useimage',flags) AS useimage,
@@ -41,6 +41,6 @@ if (isset($_REQUEST['op']) && $_REQUEST['op'] == "valid") {
 
     $page->assign('wap', mysql_fetch_assoc($result));
     mysql_free_result($result);
-    $page->display();
+    $page->run();
 }
 ?>

diff --git a/htdocs/admin/ax-xorg.php b/htdocs/admin/ax-xorg.php
index ac2f862..4bb55ac 100644 (file)
--- a/htdocs/admin/ax-xorg.php
+++ b/htdocs/admin/ax-xorg.php
@@ -25,5 +25,5 @@ $sql = "SELECT promo,nom,prenom FROM identification WHERE matricule_ax IS NULL";
 $page->mysql_assign($sql,'plus','nb_plus');
 
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/admin/deces_promo.php b/htdocs/admin/deces_promo.php
index c864a31..9dae21e 100644 (file)
--- a/htdocs/admin/deces_promo.php
+++ b/htdocs/admin/deces_promo.php
@@ -20,5 +20,5 @@ if (isset($_REQUEST["valider"]) && $_REQUEST["valider"] == "Valider") {
 $sql = "SELECT matricule, nom, prenom, deces FROM identification WHERE promo = $promo ORDER BY nom,prenom";
 $page->mysql_assign($sql, 'decedes');
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/admin/gerer_applis.php b/htdocs/admin/gerer_applis.php
new file mode 100644 (file)
index 0000000..1e8ce7f
--- /dev/null
+++ b/htdocs/admin/gerer_applis.php
@@ -0,0 +1,13 @@
+<?php
+require('auto.prepend.inc.php');
+new_admin_table_editor('applis_def','id');
+$editor->add_join_table('applis_ins','aid',true); 
+
+$editor->describe('text','intitulé',true);
+$editor->describe('type','type',true,'set');
+$editor->describe('url','site web',false);
+
+$editor->assign('title', 'Gestion des formations');
+
+$editor->run();
+?>

diff --git a/htdocs/admin/gerer_auth-groupex.php b/htdocs/admin/gerer_auth-groupex.php
new file mode 100644 (file)
index 0000000..587b98c
--- /dev/null
+++ b/htdocs/admin/gerer_auth-groupex.php
@@ -0,0 +1,12 @@
+<?php
+require('auto.prepend.inc.php');
+new_admin_table_editor('groupesx_auth','id');
+
+$editor->describe('name','nom',true);
+$editor->describe('privkey','clé privée',false);
+$editor->describe('datafields','champs renvoyés',true);
+
+$editor->assign('title', 'Gestion de l\'authentification centralisée');
+
+$editor->run();
+?>

diff --git a/htdocs/admin/gerer_binets.php b/htdocs/admin/gerer_binets.php
new file mode 100644 (file)
index 0000000..84931ce
--- /dev/null
+++ b/htdocs/admin/gerer_binets.php
@@ -0,0 +1,11 @@
+<?php
+require('auto.prepend.inc.php');
+new_admin_table_editor('binets_def','id');
+
+$editor->add_join_table('binets_ins','binet_id',true); 
+
+$editor->describe('text','intitulé',true);
+$editor->assign('title', 'Gestion des binets');
+
+$editor->run();
+?>

diff --git a/htdocs/admin/gerer_coupure.php b/htdocs/admin/gerer_coupure.php
new file mode 100644 (file)
index 0000000..76e72df
--- /dev/null
+++ b/htdocs/admin/gerer_coupure.php
@@ -0,0 +1,14 @@
+<?php
+require('auto.prepend.inc.php');
+new_admin_table_editor('coupures','id');
+
+$editor->describe('debut','date',true,'timestamp');
+$editor->describe('duree','durée',false);
+$editor->describe('resume','résumé',true);
+$editor->describe('services','services affectés',true,'set');
+$editor->describe('description','description',false,'textarea');
+
+$editor->assign('title', 'Gestion des coupures');
+
+$editor->run();
+?>

diff --git a/htdocs/admin/gerer_groupesx.php b/htdocs/admin/gerer_groupesx.php
new file mode 100644 (file)
index 0000000..e9b2657
--- /dev/null
+++ b/htdocs/admin/gerer_groupesx.php
@@ -0,0 +1,12 @@
+<?php
+require('auto.prepend.inc.php');
+new_admin_table_editor('groupesx_def','id');
+$editor->add_join_table('groupesx_ins','gid',true); 
+
+$editor->describe('text','intitulé',true);
+$editor->describe('url','site web',false);
+
+$editor->assign('title', 'Gestion des Groupes X');
+
+$editor->run();
+?>

diff --git a/htdocs/admin/gerer_listes.php b/htdocs/admin/gerer_listes.php
new file mode 100644 (file)
index 0000000..dd1e0e6
--- /dev/null
+++ b/htdocs/admin/gerer_listes.php
@@ -0,0 +1,14 @@
+<?php
+require('auto.prepend.inc.php');
+new_admin_table_editor('listes_def','id');
+
+$editor->add_join_table('aliases','id','aliases.type=\'liste\'');
+
+$editor->add_join_field('aliases','alias','alias','','liste',true);
+$editor->describe('topic','topic',true);
+$editor->describe('type','type',true,'set');
+
+$editor->assign('title', 'Gestion des liste des diffusion');
+
+$editor->run();
+?>

diff --git a/htdocs/admin/gerer_paiement.php b/htdocs/admin/gerer_paiement.php
new file mode 100644 (file)
index 0000000..6d85f2b
--- /dev/null
+++ b/htdocs/admin/gerer_paiement.php
@@ -0,0 +1,18 @@
+<?php
+require('auto.prepend.inc.php');
+new_admin_table_editor('paiement.paiements','id');
+
+$editor->add_join_table('paiement.transactions','ref',true);
+
+$editor->describe('text','intitulé',true);
+$editor->describe('url','site web',false);
+$editor->describe('montant_def','montant par défaut',false);
+$editor->describe('montant_min','montant minimum',false);
+$editor->describe('montant_max','montant maximum',false);
+$editor->describe('mail','email contact',true);
+$editor->describe('confirmation','message confirmation',false,'textarea');
+$editor->describe('flags','flags', true, 'set');
+
+$editor->assign('title', 'Gestion des télépaiements');
+$editor->run();
+?>

diff --git a/htdocs/admin/gerer_skins.php b/htdocs/admin/gerer_skins.php
new file mode 100644 (file)
index 0000000..82fe3a4
--- /dev/null
+++ b/htdocs/admin/gerer_skins.php
@@ -0,0 +1,19 @@
+<?php
+require('auto.prepend.inc.php');
+new_admin_table_editor('skins','id');
+$editor->describe('name','nom',true);
+$editor->describe('skin_tpl','nom du template',true);
+$editor->describe('auteur','auteur',false);
+$editor->describe('comment','commentaire',true,'textarea');
+$editor->describe('date','date',false);
+$editor->describe('bgtable','<em>OBSOLETE</strong> bgtable',false);
+$editor->describe('typelogo','<em>OBSOLETE</strong> type logo',false);
+$editor->describe('typeban','<em>OBSOLETE</strong> type ban',false);
+$editor->describe('typelesX','<em>OBSOLETE</strong> type les X',false);
+$editor->describe('type','type',true,'set');
+
+#FIXME enlever les entrées obsoletes
+
+$editor->assign('title', 'Gestion des skins');
+$editor->run(); 
+?>

diff --git a/htdocs/admin/index.php b/htdocs/admin/index.php
index a74573d..d58d1fb 100644 (file)
--- a/htdocs/admin/index.php
+++ b/htdocs/admin/index.php
@@ -2,5 +2,5 @@
 require("auto.prepend.inc.php");
 new_admin_page('admin/index.tpl');
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/admin/newsletter_archi.php b/htdocs/admin/newsletter_archi.php
index d550e11..6c78f78 100644 (file)
--- a/htdocs/admin/newsletter_archi.php
+++ b/htdocs/admin/newsletter_archi.php
@@ -25,5 +25,5 @@ switch ($_REQUEST['action']) {
 
 $sql = "SELECT id,date,titre FROM newsletter ORDER BY date DESC";
 $page->mysql_assign($sql, 'nl_list');
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/admin/newsletter_pattecassee.php b/htdocs/admin/newsletter_pattecassee.php
index c3fd87c..5c60528 100644 (file)
--- a/htdocs/admin/newsletter_pattecassee.php
+++ b/htdocs/admin/newsletter_pattecassee.php
@@ -57,5 +57,5 @@ if (array_key_exists('email', $_GET) && array_key_exists('action', $_GET)) {
     $page->assign('email', $email);
 }
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/admin/newsletter_prep.php b/htdocs/admin/newsletter_prep.php
index e8083f7..06997d7 100644 (file)
--- a/htdocs/admin/newsletter_prep.php
+++ b/htdocs/admin/newsletter_prep.php
@@ -12,7 +12,7 @@ $lock = fopen($lockfile,"r+");
 // prend un lock en écriture
 if (!flock($lock, 2)) {
     $page->assign('erreur','Impossible de prendre un lock sur le fichier de lock, pas de fichier ?');
-    $page->display('errlock');
+    $page->run('errlock');
 }
 
 $contenu = (isset($_REQUEST['contenu']) ? $_REQUEST['contenu'] : "");
@@ -111,6 +111,6 @@ $page->assign('is_lock',$is_lock);
 
 $page->assign('contenu', $contenu);
 $page->assign('sujet', $sujet);
-$page->display();
+$page->run();
 
 ?>

diff --git a/htdocs/admin/postfix_blacklist.php b/htdocs/admin/postfix_blacklist.php
index cb8dfbc..940f8fe 100644 (file)
--- a/htdocs/admin/postfix_blacklist.php
+++ b/htdocs/admin/postfix_blacklist.php
@@ -27,5 +27,5 @@ fclose($fd);
 $page->assign_by_ref('list',$blacklist);
 $page->assign('title','Bannis de polytechnique.org');
 $page->assign('expl','Ne mettre dans les cases que des emails (aucun espace ni commentaire supplémentaire)');
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/admin/postfix_perm.php b/htdocs/admin/postfix_perm.php
index 0936d95..311ac2c 100644 (file)
--- a/htdocs/admin/postfix_perm.php
+++ b/htdocs/admin/postfix_perm.php
@@ -27,5 +27,5 @@ fclose($fd);
 $page->assign_by_ref('list',$blacklist);
 $page->assign('title','Permissions de polytechnique.org');
 $page->assign('expl','On peut placer dans les cases les emails de personnes pouvant diffuser sans restriction.');
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/admin/postfix_retardes.php b/htdocs/admin/postfix_retardes.php
index 8eb7989..8dd6a64 100644 (file)
--- a/htdocs/admin/postfix_retardes.php
+++ b/htdocs/admin/postfix_retardes.php
@@ -21,5 +21,5 @@ fclose($fd);
 $page->assign_by_ref('list',$blacklist);
 $page->assign('title','Mails retardés de polytechnique.org');
 $page->assign('expl','Les envoyeurs ici présents verront leurs mails retardés toutes les heures jusqu\'au délai de 5j (bounce). Placer ici uniquement des emails (pas de commentaires).');
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/admin/utilisateurs.php b/htdocs/admin/utilisateurs.php
index dcc64fd..36615ee 100644 (file)
--- a/htdocs/admin/utilisateurs.php
+++ b/htdocs/admin/utilisateurs.php
@@ -339,5 +339,5 @@ if (!empty($_REQUEST['select'])) {
     } // if(mysql_fetch_row)
 }
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/admin/valider.php b/htdocs/admin/valider.php
index f54e838..b25d198 100644 (file)
--- a/htdocs/admin/valider.php
+++ b/htdocs/admin/valider.php
@@ -18,5 +18,5 @@ array_pop($valids);
 
 $page->assign_by_ref('valids', $valids);
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/alias.php b/htdocs/alias.php
index b0085a8..4c966ac 100644 (file)
--- a/htdocs/alias.php
+++ b/htdocs/alias.php
@@ -28,14 +28,14 @@ if (isset($_REQUEST['alias']) and isset($_REQUEST['raison'])) {
                                 Vérifie qu'elle comporte entre 3 et 20 caractères
                                 et qu'elle ne contient que des lettres non accentuées,
                                 des chiffres ou les caractères - et .");
-        $page->display('error');
+        $page->run('error');
     } else {
         //vérifier que l'alias n'est pas déja pris
         $result = mysql_query("SELECT 1 FROM groupex.aliases WHERE id=12 AND domain LIKE '$alias@melix.net'");
         if (mysql_num_rows($result)>0) {
             $page->assign('error', "L'alias $alias@melix.net a déja été attribué.
                                     Tu ne peux donc pas l'obtenir.");
-            $page->display('error');
+            $page->run('error');
         }
 
         //vérifier que l'alias n'est pas déja en demande
@@ -44,7 +44,7 @@ if (isset($_REQUEST['alias']) and isset($_REQUEST['raison'])) {
             if ($req->type == "alias" and $req->alias == $alias) {
                 $page->assign('error', "L'alias $alias@melix.net a déja été demandé.
                                         Tu ne peux donc pas l'obtenir pour l'instant.");
-                $page->display('error');
+                $page->run('error');
             }
         }
 
@@ -52,9 +52,9 @@ if (isset($_REQUEST['alias']) and isset($_REQUEST['raison'])) {
         $myalias = new AliasReq($_SESSION['uid'], $alias, $raison);
         $myalias->submit();
         $page->assign('success',$alias);
-        $page->display('succes');
+        $page->run('succes');
     }
 }
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/antispam.php b/htdocs/antispam.php
index 9d296d9..54aed84 100644 (file)
--- a/htdocs/antispam.php
+++ b/htdocs/antispam.php
@@ -40,5 +40,5 @@ list($filtre) = mysql_num_rows($result) + intval(mysql_fetch_row($result));
 mysql_free_result($result);
 $page->assign('filtre',$filtre);
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/carva_redirect.php b/htdocs/carva_redirect.php
index 49167af..046df95 100644 (file)
--- a/htdocs/carva_redirect.php
+++ b/htdocs/carva_redirect.php
@@ -31,5 +31,5 @@ mysql_free_result($result);
 $page->assign('carva', $carva);
 $page->assign('alias', $alias);
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/cookie_off.php b/htdocs/cookie_off.php
index 3ebbc72..df7aa71 100644 (file)
--- a/htdocs/cookie_off.php
+++ b/htdocs/cookie_off.php
@@ -12,5 +12,5 @@ if(!identified()) {
     $_SESSION = array();
 }
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/cookie_on.php b/htdocs/cookie_on.php
index 2f356b4..62fa0c4 100644 (file)
--- a/htdocs/cookie_on.php
+++ b/htdocs/cookie_on.php
@@ -10,5 +10,5 @@ $cookie=md5($password);
 setcookie('ORGaccess',$cookie,(time()+25920000),'/','',0);
 $_SESSION['log']->log("cookie_on");
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index 87730df..b62476d 100644 (file)
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -136,9 +136,19 @@ table.tinybicol td.titre, table.bicol td.titre {
     font-weight: bold;
 }
 table.tinybicol td.info, table.bicol td.info {
-      padding: 0.5em;
-      width: 50%;
+    padding: 0.5em;
+    width: 50%;
+}
+table.tinybicol td.action, table.bicol td.action {
+    white-space: nowrap;
+    text-align: right;
+    font-weight: bold;
+    vertical-align: middle;
+}
+table.tinybicol td.action a, table.bicol td.action a {
+    padding: 4px;
 }
+            
 
 /**: IV. :**/
 
@@ -320,4 +330,4 @@ div.long td.rt { width: 65%; }
     vertical-align: top;
 }
 /* vim: set et ts=4 sts=4 sw=4: */
-/* $Id: default.css,v 1.20 2004-02-16 11:06:49 x2000habouzit Exp $ */
+/* $Id: default.css,v 1.21 2004-02-19 19:35:00 x2000habouzit Exp $ */

diff --git a/htdocs/deconnexion.php b/htdocs/deconnexion.php
index 145a31f..e9af56b 100644 (file)
--- a/htdocs/deconnexion.php
+++ b/htdocs/deconnexion.php
@@ -17,5 +17,5 @@ if($has_cookie)
 
 new_skinned_page('deconnexion.tpl', AUTH_PUBLIC);
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/apropos.php b/htdocs/docs/apropos.php
index 3f82214..d1e7f34 100644 (file)
--- a/htdocs/docs/apropos.php
+++ b/htdocs/docs/apropos.php
@@ -2,5 +2,5 @@
 require("auto.prepend.inc.php");
 new_skinned_page('docs/apropos.tpl', AUTH_PUBLIC);
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/charte.php b/htdocs/docs/charte.php
index 7cec49b..d2eae51 100644 (file)
--- a/htdocs/docs/charte.php
+++ b/htdocs/docs/charte.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page('docs/charte.tpl',AUTH_PUBLIC);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/contacts.php b/htdocs/docs/contacts.php
index cdf9d7f..e264f02 100644 (file)
--- a/htdocs/docs/contacts.php
+++ b/htdocs/docs/contacts.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page("docs/contacts.tpl",AUTH_PUBLIC);
-$page->display(isset($_REQUEST['topic']) ? $_REQUEST['topic'] : '');
+$page->run(isset($_REQUEST['topic']) ? $_REQUEST['topic'] : '');
 ?>

diff --git a/htdocs/docs/doc_carva.php b/htdocs/docs/doc_carva.php
index 62c29bf..a4389a4 100644 (file)
--- a/htdocs/docs/doc_carva.php
+++ b/htdocs/docs/doc_carva.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page("docs/doc_carva.tpl",AUTH_COOKIE, true);
-$page->display(isset($_SESSION['alias']) ? 'alias' : '');
+$page->run(isset($_SESSION['alias']) ? 'alias' : '');
 ?>

diff --git a/htdocs/docs/doc_emails.php b/htdocs/docs/doc_emails.php
index 0dd6f8a..6ee32be 100644 (file)
--- a/htdocs/docs/doc_emails.php
+++ b/htdocs/docs/doc_emails.php
@@ -1,8 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page("docs/doc_emails.tpl",AUTH_COOKIE,true);
-$page->display();
-?>
-<?php
-require("footer.inc.php");
+$page->run();
 ?>

diff --git a/htdocs/docs/doc_forums.php b/htdocs/docs/doc_forums.php
index 2094e53..4523483 100644 (file)
--- a/htdocs/docs/doc_forums.php
+++ b/htdocs/docs/doc_forums.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page("docs/doc_forums.tpl",AUTH_COOKIE);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/doc_gratuits.php b/htdocs/docs/doc_gratuits.php
index f9eb2e9..a78005f 100644 (file)
--- a/htdocs/docs/doc_gratuits.php
+++ b/htdocs/docs/doc_gratuits.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page("docs/doc_gratuits.tpl",AUTH_PUBLIC);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/doc_melix.php b/htdocs/docs/doc_melix.php
index abd2c63..9d98343 100644 (file)
--- a/htdocs/docs/doc_melix.php
+++ b/htdocs/docs/doc_melix.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page("docs/doc_melix.tpl",AUTH_PUBLIC);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/doc_nn.php b/htdocs/docs/doc_nn.php
index 09a77d5..f0a7a51 100644 (file)
--- a/htdocs/docs/doc_nn.php
+++ b/htdocs/docs/doc_nn.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page("docs/doc_nn.tpl",AUTH_PUBLIC);
-$page->display(isset($_GET['doc']) ? $_GET['doc'] : "");
+$page->run(isset($_GET['doc']) ? $_GET['doc'] : "");
 ?>

diff --git a/htdocs/docs/doc_nntp.php b/htdocs/docs/doc_nntp.php
index 366ca08..8f32efc 100644 (file)
--- a/htdocs/docs/doc_nntp.php
+++ b/htdocs/docs/doc_nntp.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page("docs/doc_nntp.tpl",AUTH_PUBLIC);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/doc_oe.php b/htdocs/docs/doc_oe.php
index e6993c2..6324040 100644 (file)
--- a/htdocs/docs/doc_oe.php
+++ b/htdocs/docs/doc_oe.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page("docs/doc_oe.tpl",AUTH_PUBLIC);
-$page->display(isset($_GET['doc']) ? $_GET['doc'] : "");
+$page->run(isset($_GET['doc']) ? $_GET['doc'] : "");
 ?>

diff --git a/htdocs/docs/doc_patte_cassee.php b/htdocs/docs/doc_patte_cassee.php
index adf6fdb..99f9fec 100644 (file)
--- a/htdocs/docs/doc_patte_cassee.php
+++ b/htdocs/docs/doc_patte_cassee.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page("docs/doc_patte_cassee.tpl",AUTH_PUBLIC);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/doc_smtp.php b/htdocs/docs/doc_smtp.php
index 92541be..ce0ce97 100644 (file)
--- a/htdocs/docs/doc_smtp.php
+++ b/htdocs/docs/doc_smtp.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page("docs/doc_smtp.tpl",AUTH_PUBLIC);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/doc_ssl.php b/htdocs/docs/doc_ssl.php
index 406bcc6..401debe 100644 (file)
--- a/htdocs/docs/doc_ssl.php
+++ b/htdocs/docs/doc_ssl.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page("docs/doc_ssl.tpl",AUTH_PUBLIC);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/ethique.php b/htdocs/docs/ethique.php
index d705cbe..16e4f65 100644 (file)
--- a/htdocs/docs/ethique.php
+++ b/htdocs/docs/ethique.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page('docs/ethique.tpl',AUTH_PUBLIC);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/faq.php b/htdocs/docs/faq.php
index a7b4688..9c7c1ed 100644 (file)
--- a/htdocs/docs/faq.php
+++ b/htdocs/docs/faq.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page('docs/faq.tpl',AUTH_PUBLIC);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/index.php b/htdocs/docs/index.php
index a4db77c..67832c1 100644 (file)
--- a/htdocs/docs/index.php
+++ b/htdocs/docs/index.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page('docs/index.tpl',AUTH_PUBLIC);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/docs/secu.php b/htdocs/docs/secu.php
index ff33e3d..0f50ae8 100644 (file)
--- a/htdocs/docs/secu.php
+++ b/htdocs/docs/secu.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page('docs/secu.tpl',AUTH_PUBLIC);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/domaineperso.php b/htdocs/domaineperso.php
index 15cac30..2991e55 100644 (file)
--- a/htdocs/domaineperso.php
+++ b/htdocs/domaineperso.php
@@ -12,5 +12,5 @@ $domaines = liste_domaines();
 $page->assign('nb_dom',count($domaines));
 $page->assign_by_ref('domaines',$domaines);
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/dons.php b/htdocs/dons.php
index b3144bf..e89a4e3 100644 (file)
--- a/htdocs/dons.php
+++ b/htdocs/dons.php
@@ -1,5 +1,5 @@
 <?php
 require("auto.prepend.inc.php");
 new_skinned_page('dons.tpl', AUTH_COOKIE);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/emails.php b/htdocs/emails.php
index 0bc5187..ef9501a 100644 (file)
--- a/htdocs/emails.php
+++ b/htdocs/emails.php
@@ -23,5 +23,5 @@ if ($result && list($aliases) = mysql_fetch_row($result))
     $page->assign('melix', substr($aliases,0,-3));
 mysql_free_result($result);
 
-$page->display();
+$page->run();
 ?> 

diff --git a/htdocs/epouse.php b/htdocs/epouse.php
index 7225c88..9749654 100644 (file)
--- a/htdocs/epouse.php
+++ b/htdocs/epouse.php
@@ -32,5 +32,5 @@ if (!empty($_REQUEST['submit']) && ($epouse != $epouse_old)) {
     }
 }
 
-$page->display($flags->hasflag("femme") ? '' : 'not_femme');
+$page->run($flags->hasflag("femme") ? '' : 'not_femme');
 ?>

diff --git a/htdocs/groupex/index.php b/htdocs/groupex/index.php
index b72d437..b2b37f2 100644 (file)
--- a/htdocs/groupex/index.php
+++ b/htdocs/groupex/index.php
@@ -9,5 +9,5 @@ $domaines = liste_domaines();
 $page->assign('nb_dom',count($domaines));
 $page->assign_by_ref('domaines',$domaines);
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/index.php b/htdocs/index.php
index 2cd2ad1..d674943 100644 (file)
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -3,5 +3,5 @@ require("auto.prepend.inc.php");
 new_skinned_page('index.tpl', AUTH_PUBLIC);
 if(logged())
     header("Location: login.php");
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/login.php b/htdocs/login.php
index 6b295f1..2c0f812 100644 (file)
--- a/htdocs/login.php
+++ b/htdocs/login.php
@@ -8,7 +8,7 @@ mysql_free_result($param);
 
 if ($naissance==0)  {
     $page->assign('ask_naissance', true);
-    $page->display('ask-naissance');
+    $page->run('ask-naissance');
     exit;
 }
 
@@ -65,5 +65,5 @@ $page->mysql_assign($sql, 'evenement');
 $page->assign('toto',"");
 $page->assign('tata',"1");
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/mescontacts.php b/htdocs/mescontacts.php
index 1c22a0f..42bea5c 100644 (file)
--- a/htdocs/mescontacts.php
+++ b/htdocs/mescontacts.php
@@ -57,5 +57,5 @@ echo mysql_error();
 
 $page->mysql_assign($sql,'contacts','nb_contacts');
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/mescontacts_ldif.php b/htdocs/mescontacts_ldif.php
index 91d4763..7d3cd98 100644 (file)
--- a/htdocs/mescontacts_ldif.php
+++ b/htdocs/mescontacts_ldif.php
@@ -62,5 +62,5 @@ header("Pragma: ");
 header("Cache-Control: ");
 header("Content-type: text/x-ldif\n");
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/motdepassemd5.php b/htdocs/motdepassemd5.php
index 01b1643..e129c1e 100644 (file)
--- a/htdocs/motdepassemd5.php
+++ b/htdocs/motdepassemd5.php
@@ -8,9 +8,9 @@ if (!empty($_POST['response2']))  {             // la variable $response existe-
     mysql_query($sql);
     $_SESSION['log']->log("passwd","");
     new_skinned_page('motdepassemd5.success.tpl', AUTH_MDP);
-    $page->display();
+    $page->run();
 }
 
 new_skinned_page('motdepassemd5.tpl', AUTH_MDP, true, 'motdepassemd5.head.tpl');
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/newsletter.php b/htdocs/newsletter.php
index 4445f9b..8d4fd83 100644 (file)
--- a/htdocs/newsletter.php
+++ b/htdocs/newsletter.php
@@ -29,5 +29,5 @@ if (($res)&&(list($nl_date, $nl_titre, $nl_text) = mysql_fetch_row($res))) {
 $sql = "SELECT id,date,titre FROM newsletter ORDER BY date DESC";
 $page->mysql_assign($sql, 'nl_list');
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/newsletter_req.php b/htdocs/newsletter_req.php
index a46c60b..47f87e9 100644 (file)
--- a/htdocs/newsletter_req.php
+++ b/htdocs/newsletter_req.php
@@ -44,5 +44,5 @@ if (isset($_POST["action"]) && (($_POST["action"]=="Tester")
     }
 }
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/pattecassee.php b/htdocs/pattecassee.php
index 3e9b799..07028bd 100644 (file)
--- a/htdocs/pattecassee.php
+++ b/htdocs/pattecassee.php
@@ -68,5 +68,5 @@ L'
     }
 }
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/preferences.php b/htdocs/preferences.php
index 5917f26..c03a764 100644 (file)
--- a/htdocs/preferences.php
+++ b/htdocs/preferences.php
@@ -5,5 +5,5 @@ new_skinned_page('preferences.tpl', AUTH_COOKIE);
 $has_cookie = (isset($_COOKIE['ORGaccess']) ? 'cookie' : '');
 $page->assign('has_cookie', $has_cookie);
 
-$page->display($has_cookie);
+$page->run($has_cookie);
 ?>

diff --git a/htdocs/rss.php b/htdocs/rss.php
index 5ecded1..bc3ead9 100644 (file)
--- a/htdocs/rss.php
+++ b/htdocs/rss.php
@@ -13,5 +13,5 @@ $requete.=" ORDER BY (e.promo_min != 0 AND e.promo_max != 0) DESC,  e.peremption
 $page->mysql_assign($requete,'rss');
 
 header("Content-Type: text/xml");
-$page->display();
+$page->run();
 ?> 

diff --git a/htdocs/sendmail.php b/htdocs/sendmail.php
index 0bf48a3..68778f4 100644 (file)
--- a/htdocs/sendmail.php
+++ b/htdocs/sendmail.php
@@ -43,5 +43,5 @@ $sql = "SELECT u.prenom, u.nom, u.promo, u.username
         ORDER BY u.nom, u.prenom";
 $page->mysql_assign($sql, 'contacts','nb_contacts');
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/skins.php b/htdocs/skins.php
index 0347b4d..1b7fe87 100644 (file)
--- a/htdocs/skins.php
+++ b/htdocs/skins.php
@@ -16,5 +16,5 @@ $sql = "SELECT id,skin_tpl,skin_popup,snapshot,name,s.date,comment,auteur,count(
 $page->mysql_assign($sql, 'skins');
 $page->assign('stochaskin',SKIN_STOCHASKIN_ID);
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/stats/coupure.php b/htdocs/stats/coupure.php
index 3bac3eb..886fece 100644 (file)
--- a/htdocs/stats/coupure.php
+++ b/htdocs/stats/coupure.php
@@ -27,5 +27,5 @@ if(($res)&&($cp = mysql_fetch_assoc($res))) {
     $page->mysql_assign($sql, 'coupures');
 }
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/stats/nb_by_promo.php b/htdocs/stats/nb_by_promo.php
index 37623cb..ea6350c 100644 (file)
--- a/htdocs/stats/nb_by_promo.php
+++ b/htdocs/stats/nb_by_promo.php
@@ -15,5 +15,5 @@ $page->assign_by_ref('nbs', $nbpromo);
 $page->assign('min', $min-$min % 10);
 $page->assign('max', $max+10-$max%10);
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/stats/parselog.php b/htdocs/stats/parselog.php
index a6440e9..aac6cf2 100644 (file)
--- a/htdocs/stats/parselog.php
+++ b/htdocs/stats/parselog.php
@@ -2,5 +2,5 @@
 require("auto.prepend.inc.php");
 new_skinned_page("stats/parselog.tpl");
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/stats/stats_promo.php b/htdocs/stats/stats_promo.php
index 3952122..7099eb8 100644 (file)
--- a/htdocs/stats/stats_promo.php
+++ b/htdocs/stats/stats_promo.php
@@ -4,5 +4,5 @@ new_skinned_page("stats/stats_promo.tpl", AUTH_COOKIE);
 
 $promo = isset($_REQUEST["promo"]) ? intval($_REQUEST["promo"]) : $_SESSION["promo"];
 $page->assign('promo',$promo);
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/trezo/gere_operations.php b/htdocs/trezo/gere_operations.php
index 5c09152..73effc4 100644 (file)
--- a/htdocs/trezo/gere_operations.php
+++ b/htdocs/trezo/gere_operations.php
@@ -95,5 +95,5 @@ $sql = "SELECT id,date,label,credit,debit
         ORDER BY date";
 $page->mysql_assign($sql, 'ops');
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/trezo/index.php b/htdocs/trezo/index.php
index 7b98a3a..13204bd 100644 (file)
--- a/htdocs/trezo/index.php
+++ b/htdocs/trezo/index.php
@@ -44,5 +44,5 @@ $sql = "SELECT date,label,credit,debit FROM trezo.operations
         ORDER BY date";
 $page->mysql_assign($sql,'ops');
 
-$page->display();
+$page->run();
 ?>

diff --git a/htdocs/vcard.php b/htdocs/vcard.php
index 0058873..5b9e6d1 100644 (file)
--- a/htdocs/vcard.php
+++ b/htdocs/vcard.php
@@ -106,5 +106,5 @@ header("Cache-Control: ");
 header("Content-type: text/x-vcard\n");
 header("Content-Transfer-Encoding: Quoted-Printable\n");
 
-$page->display();
+$page->run();
 ?>