From c9110c6c4f4d15c76c3353353bd91c48f9bb51d3 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Sun, 23 Jul 2006 11:11:38 +0000 Subject: [PATCH] remove old not to be used functions (gassign and trig_run) git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@576 839d8a87-29fc-0310-9880-83ba4fa771e5 --- include/platal/page.inc.php | 22 ---------------------- include/profil/assign_deco.inc.php | 6 +++--- include/search/classes.inc.php | 3 ++- modules/platal.php | 9 +++++++-- modules/xnetgrp.php | 6 ++++-- modules/xnetlists.php | 34 +++++++++++++++++++--------------- 6 files changed, 35 insertions(+), 45 deletions(-) diff --git a/include/platal/page.inc.php b/include/platal/page.inc.php index 83f26a1..114322a 100644 --- a/include/platal/page.inc.php +++ b/include/platal/page.inc.php @@ -22,8 +22,6 @@ require_once 'smarty/libs/Smarty.class.php'; require_once 'platal/smarty.plugins.inc.php'; -// {{{ class PlatalPage - class PlatalPage extends Smarty { // {{{ properties @@ -177,15 +175,6 @@ class PlatalPage extends Smarty } // }}} - // {{{ function trig() - - function trig_run($msg) - { - $this->trig($msg); - $this->run(); - } - - // }}} // {{{ function fail() function fail($msg) @@ -228,18 +217,7 @@ class PlatalPage extends Smarty } // }}} - // {{{ function gassign - - function gassign($varname) - { - global $$varname; - $this->assign($varname, $$varname); - } - - // }}} } -// }}} - // vim:set et sw=4 sts=4 sws=4 foldmethod=marker: ?> diff --git a/include/profil/assign_deco.inc.php b/include/profil/assign_deco.inc.php index 97b8cae..2b485a4 100644 --- a/include/profil/assign_deco.inc.php +++ b/include/profil/assign_deco.inc.php @@ -35,9 +35,9 @@ while ($tmp = $res->next()) { $trad = Array('ordre' => 'Ordres ...', 'croix' => 'Croix ...', 'militaire' => 'Médailles militaires ...', 'honneur' => 'Médailles d\'honneur', 'resistance' => 'Médailles de la résistance ...', 'prix' => 'Prix ...'); -$page->gassign('grades'); -$page->gassign('medals'); -$page->gassign('trad'); +$page->assign('grades', $grades); +$page->assign('medals', $medals); +$page->assign('trad', $trad); $page->assign('medals_pub', $medals_pub); $page->assign('medal_list', $mlist); diff --git a/include/search/classes.inc.php b/include/search/classes.inc.php index 5359e59..3a7ef89 100644 --- a/include/search/classes.inc.php +++ b/include/search/classes.inc.php @@ -100,7 +100,8 @@ class ThrowError function ThrowError($explain) { global $page; - $page->trig_run('Erreur : '.$explain); + $page->trig('Erreur : '.$explain); + $page->run(); } } diff --git a/modules/platal.php b/modules/platal.php index 3aaf937..b5dfe4a 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -233,9 +233,14 @@ class PlatalModule extends PLModule } if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::get('birth'))) { - $page->trig_run('Date de naissance incorrecte ou incohérente'); + $page->trig('Date de naissance incorrecte ou incohérente'); + return; } - $birth = sprintf('%s-%s-%s', substr(Env::get('birth'),4,4), substr(Env::get('birth'),2,2), substr(Env::get('birth'),0,2)); + + $birth = sprintf('%s-%s-%s', + substr(Env::get('birth'), 4, 4), + substr(Env::get('birth'), 2, 2), + substr(Env::get('birth'), 0, 2)); $mailorg = strtok(Env::get('login'), '@'); diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index bb52952..95b356f 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -140,7 +140,8 @@ class XnetGrpModule extends PLModule if (Post::has('submit')) { if (S::has_perms()) { if (Post::get('mail_domain') && (strstr(Post::get('mail_domain'), '.') === false)) { - $page->trig_run("le domaine doit être un FQDN (aucune modif effectuée) !!!"); + $page->trig("le domaine doit être un FQDN (aucune modif effectuée) !!!"); + return; } XDB::execute( "UPDATE groupex.asso @@ -355,7 +356,8 @@ class XnetGrpModule extends PLModule $u, $globals->asso('id')); $n = $res->fetchOneCell(); if ($n) { - $page->trig_run("$prenom $nom est déjà membre du groupe !"); + $page->trig("$prenom $nom est déjà membre du groupe !"); + return; } elseif (Env::has('accept')) { diff --git a/modules/xnetlists.php b/modules/xnetlists.php index c32b934..a534a5b 100644 --- a/modules/xnetlists.php +++ b/modules/xnetlists.php @@ -122,28 +122,32 @@ class XnetListsModule extends ListsModule } if (!Post::has('liste')) { - $page->trig_run('champs «addresse souhaitée» vide'); + $page->trig('champs «addresse souhaitée» vide'); + return; } $liste = Post::get('liste'); if (!preg_match("/^[a-zA-Z0-9\-]*$/", $liste)) { - $page->trig_run('le nom de la liste ne doit contenir que des lettres, chiffres et tirets'); + $page->trig('le nom de la liste ne doit contenir que des lettres, chiffres et tirets'); + return; } $new = $liste.'@'.$globals->asso('mail_domain'); $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); $n = $res->fetchOneCell(); - if($n) { - $page->trig_run('cet alias est déjà pris'); + if ($n) { + $page->trig('cet alias est déjà pris'); + return; } - if(!Post::get('desc')) { - $page->trig_run('le sujet est vide'); + if (!Post::get('desc')) { + $page->trig('le sujet est vide'); + return; } - require_once('platal/xmlrpc-client.inc.php'); - require_once('lists.inc.php'); + require_once 'platal/xmlrpc-client.inc.php'; + require_once 'lists.inc.php'; $ret = $this->client->create_list( $liste, Post::get('desc'), Post::get('advertise'), Post::get('modlevel'), Post::get('inslevel'), @@ -201,11 +205,11 @@ class XnetListsModule extends ListsModule $not_in_group_ext = array(); $ann = XDB::iterator( - "SELECT IF(m.origine='X',IF(u.nom_usage<>'', u.nom_usage, u.nom) ,m.nom) AS nom, - IF(m.origine='X',u.prenom,m.prenom) AS prenom, - IF(m.origine='X',u.promo,'extérieur') AS promo, - IF(m.origine='X',CONCAT(a.alias, '@polytechnique.org'),m.email) AS email, - IF(m.origine='X',FIND_IN_SET('femme', u.flags),0) AS femme, + "SELECT if (m.origine='X',if (u.nom_usage<>'', u.nom_usage, u.nom) ,m.nom) AS nom, + if (m.origine='X',u.prenom,m.prenom) AS prenom, + if (m.origine='X',u.promo,'extérieur') AS promo, + if (m.origine='X',CONCAT(a.alias, '@polytechnique.org'),m.email) AS email, + if (m.origine='X',FIND_IN_SET('femme', u.flags),0) AS femme, m.perms='admin' AS admin, m.origine='X' AS x FROM groupex.membres AS m @@ -240,7 +244,7 @@ class XnetListsModule extends ListsModule $mbox = $add; $dom = 'm4x.org'; } - if($dom == 'polytechnique.org' || $dom == 'm4x.org') { + if ($dom == 'polytechnique.org' || $dom == 'm4x.org') { $res = XDB::query( "SELECT a.alias, b.alias FROM x4dat.aliases AS a @@ -309,7 +313,7 @@ class XnetListsModule extends ListsModule $new = $liste.'@'.$globals->asso('mail_domain'); $res = XDB::query('SELECT COUNT(*) FROM x4dat.virtual WHERE alias={?}', $new); $n = $res->fetchOneCell(); - if($n) { + if ($n) { $page->trig('cet alias est déjà pris'); return; } -- 2.1.4