From fd8f77de8bc10d40395990e3f8e96e0b4a186b46 Mon Sep 17 00:00:00 2001 From: x2000habouzit Date: Thu, 13 Jul 2006 23:06:19 +0000 Subject: [PATCH] returns null is implicit, so don't make it explicit, it's a lot of useless code. ================================================================================ classes/Platal.php | 2 -- modules/banana.php | 5 ----- modules/carnet.php | 15 ++------------- modules/core.php | 2 -- modules/email.php | 17 ++++------------- modules/events.php | 10 ---------- modules/geoloc.php | 8 -------- modules/marketing.php | 14 -------------- modules/payment.php | 4 ---- modules/platal.php | 22 +--------------------- modules/profile.php | 33 +++++++++------------------------ modules/register.php | 6 ------ modules/search.php | 4 ---- modules/stats.php | 6 ------ modules/trezo.php | 4 ---- modules/xnet.php | 10 ---------- ================================================================================ 16 files changed, 16 insertions(+), 146 deletions(-) git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@477 839d8a87-29fc-0310-9880-83ba4fa771e5 --- classes/Platal.php | 2 -- modules/banana.php | 5 ----- modules/carnet.php | 15 ++------------- modules/core.php | 2 -- modules/email.php | 17 ++++------------- modules/events.php | 10 ---------- modules/geoloc.php | 8 -------- modules/marketing.php | 14 -------------- modules/payment.php | 4 ---- modules/platal.php | 22 +--------------------- modules/profile.php | 33 +++++++++------------------------ modules/register.php | 6 ------ modules/search.php | 4 ---- modules/stats.php | 6 ------ modules/trezo.php | 4 ---- modules/xnet.php | 10 ---------- 16 files changed, 16 insertions(+), 146 deletions(-) diff --git a/classes/Platal.php b/classes/Platal.php index 750680f..a2048d3 100644 --- a/classes/Platal.php +++ b/classes/Platal.php @@ -19,8 +19,6 @@ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * ***************************************************************************/ -define('PL_OK', 0); -define('PL_NEEDLOGIN', 1); define('PL_FORBIDDEN', 403); define('PL_NOT_FOUND', 404); diff --git a/modules/banana.php b/modules/banana.php index 578f37f..3be2ced 100644 --- a/modules/banana.php +++ b/modules/banana.php @@ -95,8 +95,6 @@ class BananaModule extends PLModule (Post::getBool('bananaupdate') ? 'automaj' : '') ); } - - return PL_OK; } function handler_subscription(&$page) @@ -110,7 +108,6 @@ class BananaModule extends PLModule passthru('echo ' . escapeshellarg(base64_decode(strtr($face, '.:', '+/'))) . '| uncompface -X ' . '| convert -transparent white xbm:- gif:-'); - return PL_OK; } function run_banana(&$page, $params = null) @@ -124,8 +121,6 @@ class BananaModule extends PLModule $res = PlatalBanana::run($params); $page->assign_by_ref('banana', $banana); $page->assign('banana_res', $res); - - return PL_OK; } } diff --git a/modules/carnet.php b/modules/carnet.php index 4710ae4..286c0d5 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -38,8 +38,9 @@ class CarnetModule extends PLModule function _add_rss_link(&$page) { - if (!Session::has('core_rss_hash')) + if (!Session::has('core_rss_hash')) { return; + } $page->assign('xorg_rss', array('title' => 'Polytechnique.org :: Carnet', 'href' => '/carnet/rss/'.Session::get('forlife') @@ -52,8 +53,6 @@ class CarnetModule extends PLModule $page->changeTpl('carnet/index.tpl'); $page->assign('xorg_title','Polytechnique.org - Mon carnet'); $this->_add_rss_link($page); - - return PL_OK; } function handler_panel(&$page) @@ -75,8 +74,6 @@ class CarnetModule extends PLModule $page->assign('notifs', $notifs); $page->assign('today', date('Y-m-d')); $this->_add_rss_link($page); - - return PL_OK; } function _handler_notifs_promos(&$page, &$watch, $action, $arg) @@ -154,8 +151,6 @@ class CarnetModule extends PLModule } $page->assign_by_ref('watch', $watch); - - return PL_OK; } function _get_list($offset, $limit) { @@ -296,8 +291,6 @@ class CarnetModule extends PLModule $page->assign_by_ref('citer', $globals->xdb->iterator($sql)); } - - return PL_OK; } function handler_pdf(&$page, $arg0 = null, $arg1 = null) @@ -340,8 +333,6 @@ class CarnetModule extends PLModule $uid = init_rss('carnet/rss.tpl', $user, $hash); $notifs = new Notifs($uid, false); $page->assign('notifs', $notifs); - - return PL_OK; } function handler_ical(&$page, $user = null, $hash = null, $all = null) @@ -388,8 +379,6 @@ class CarnetModule extends PLModule } header('Content-Type: text/calendar; charset=utf-8'); - - return PL_OK; } } diff --git a/modules/core.php b/modules/core.php index 820fb60..ed55458 100644 --- a/modules/core.php +++ b/modules/core.php @@ -42,14 +42,12 @@ class CoreModule extends PLModule { header('HTTP/1.0 403 Forbidden'); $page->changeTpl('403.tpl'); - return PL_OK; } function handler_404(&$page) { header('HTTP/1.0 404 Not Found'); $page->changeTpl('404.tpl'); - return PL_OK; } function handler_purge_cache(&$page) diff --git a/modules/email.php b/modules/email.php index 3310f67..881b2c0 100644 --- a/modules/email.php +++ b/modules/email.php @@ -75,7 +75,6 @@ class EmailModule extends PLModule AND alias LIKE '%@{$globals->mail->alias_dom}'", $forlife.'@'.$globals->mail->domain, $forlife.'@'.$globals->mail->domain2); $page->assign('melix', $res->fetchOneCell()); - return PL_OK; } function handler_alias(&$page, $action = null, $value = null) @@ -133,7 +132,7 @@ class EmailModule extends PLModule 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 ."); - return PL_OK; + return; } else { //vérifier que l'alias n'est pas déja pris $res = $globals->xdb->query('SELECT COUNT(*) FROM virtual WHERE alias={?}', @@ -141,7 +140,7 @@ class EmailModule extends PLModule if ($res->fetchOneCell() > 0) { $page->trig("L'alias $alias@{$globals->mail->alias_dom} a déja été attribué. Tu ne peux donc pas l'obtenir."); - return PL_OK; + return; } //vérifier que l'alias n'est pas déja en demande @@ -150,7 +149,7 @@ class EmailModule extends PLModule if ($req->type == "alias" and $req->alias == $alias) { $page->trig("L'alias $alias@{$globals->mail->alias_dom} a déja été demandé. Tu ne peux donc pas l'obtenir pour l'instant."); - return PL_OK; + return ; } } @@ -158,7 +157,7 @@ class EmailModule extends PLModule $myalias = new AliasReq($uid, $alias, $raison, $public); $myalias->submit(); $page->assign('success',$alias); - return PL_OK; + return; } } elseif ($action == 'set' @@ -176,8 +175,6 @@ class EmailModule extends PLModule } $page->assign('mail_public', ($visibility == 'public')); - - return PL_OK; } function handler_redirect(&$page, $action = null, $email = null) @@ -229,8 +226,6 @@ class EmailModule extends PLModule ORDER BY !FIND_IN_SET('usage',flags), LENGTH(alias)", $uid); $page->assign('alias', $res->fetchAllAssoc()); $page->assign('emails',$redirect->emails); - - return PL_OK; } function handler_antispam(&$page) @@ -244,8 +239,6 @@ class EmailModule extends PLModule $bogo->change(Session::getInt('uid'), Env::getInt('statut_filtre')); } $page->assign('filtre',$bogo->level()); - - return PL_OK; } function handler_send(&$page) @@ -299,8 +292,6 @@ class EmailModule extends PLModule WHERE c.uid = {?} ORDER BY u.nom, u.prenom", Session::getInt('uid')); $page->assign('contacts', $res->fetchAllAssoc()); - - return PL_OK; } function handler_broken(&$page, $warn = null, $email = null) diff --git a/modules/events.php b/modules/events.php index 789b651..4e0ca1e 100644 --- a/modules/events.php +++ b/modules/events.php @@ -143,8 +143,6 @@ class EventsModule extends PLModule $globals->xdb->iterator($sql, Session::getInt('uid'), $promo, $promo) ); - - return PL_OK; } function handler_ev_submit(&$page) @@ -195,8 +193,6 @@ class EventsModule extends PLModule $select .= "> $day / $month / $year\n"; } $page->assign('select',$select); - - return PL_OK; } function handler_nl(&$page, $action = null) @@ -214,8 +210,6 @@ class EventsModule extends PLModule $page->assign('nls', get_nl_state()); $page->assign_by_ref('nl_list', get_nl_list()); - - return PL_OK; } function handler_nl_show(&$page, $nid = 'last') @@ -232,8 +226,6 @@ class EventsModule extends PLModule Session::get('bestalias'), Session::get('femme'), Session::get('mail_fmt') != 'text'); } - - return PL_OK; } function handler_nl_submit(&$page) @@ -252,8 +244,6 @@ class EventsModule extends PLModule $art->submit(); $page->assign('submited', true); } - - return PL_OK; } } diff --git a/modules/geoloc.php b/modules/geoloc.php index db56da2..bd9ea59 100644 --- a/modules/geoloc.php +++ b/modules/geoloc.php @@ -69,8 +69,6 @@ class GeolocModule extends PLModule } $page->assign('use_map', $globals->geoloc->use_map()); - - return PL_OK; } function handler_icon(&$page) @@ -117,8 +115,6 @@ class GeolocModule extends PLModule header('Content-type: text/xml'); $page->assign('querystring', $this->_make_qs()); - - return PL_OK; } function handler_city(&$page) @@ -149,8 +145,6 @@ class GeolocModule extends PLModule GROUP BY u.user_id LIMIT 11", $id); $page->assign('users', $users); - - return PL_OK; } function handler_data(&$page) @@ -178,8 +172,6 @@ class GeolocModule extends PLModule $page->assign('countries', $countries); $page->assign('cities', $cities); - - return PL_OK; } } diff --git a/modules/marketing.php b/modules/marketing.php index 2947472..6543e97 100644 --- a/modules/marketing.php +++ b/modules/marketing.php @@ -75,8 +75,6 @@ class MarketingModule extends PLModule $res = $globals->xdb->query("SELECT count(*) FROM register_mstats WHERE TO_DAYS(NOW()) - TO_DAYS(success) <= 7"); $page->assign('nbInsMarkOK', $res->fetchOneCell()); - - return PL_OK; } function handler_private(&$page, $uid = null, @@ -162,8 +160,6 @@ class MarketingModule extends PLModule $page->assign('pending', $pending); $page->assign('relance', $relance); } - - return PL_OK; } function handler_promo(&$page, $promo = null) @@ -186,8 +182,6 @@ class MarketingModule extends PLModule GROUP BY u.user_id ORDER BY nom, prenom"; $page->assign('nonins', $globals->xdb->iterator($sql, $promo)); - - return PL_OK; } function handler_public(&$page, $uid = null) @@ -232,8 +226,6 @@ class MarketingModule extends PLModule } } } - - return PL_OK; } function handler_week(&$page, $sorting = 'per_promo') @@ -250,8 +242,6 @@ class MarketingModule extends PLModule WHERE u.date_ins > ".date("Ymd000000", strtotime ('1 week ago'))." ORDER BY u.$sort DESC"; $page->assign('ins', $globals->xdb->iterator($sql)); - - return PL_OK; } function handler_volontaire(&$page, $promo = null) @@ -278,8 +268,6 @@ class MarketingModule extends PLModule ORDER BY a.nom"; $page->assign('addr', $globals->xdb->iterator($sql, $promo)); } - - return PL_OK; } function handler_relance(&$page) @@ -309,8 +297,6 @@ class MarketingModule extends PLModule WHERE hash!='INSCRIT' ORDER BY date DESC"; $page->assign('relance', $globals->xdb->iterator($sql)); - - return PL_OK; } } diff --git a/modules/payment.php b/modules/payment.php index 02933d1..8a761b1 100644 --- a/modules/payment.php +++ b/modules/payment.php @@ -128,8 +128,6 @@ class PaymentModule extends PLModule $page->assign('evtlink', $pay->event()); $page->assign('prefix',$globals->money->mpay_tprefix); - - return PL_OK; } function handler_cyber_return(&$page, $uid = null) @@ -317,8 +315,6 @@ class PaymentModule extends PLModule $page->assign('texte', $conf_text); $page->assign('erreur', $erreur); - - return PL_OK; } } diff --git a/modules/platal.php b/modules/platal.php index e4dd6c7..9e2f0f2 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -66,8 +66,6 @@ class PlatalModule extends PLModule if (logged()) { redirect("events"); } - - return PL_OK; } function handler_cacert(&$page) @@ -129,8 +127,6 @@ class PlatalModule extends PLModule } $page->assign('prefs', $globals->hook->prefs()); - - return PL_OK; } function handler_webredir(&$page) @@ -165,8 +161,6 @@ class PlatalModule extends PLModule WHERE user_id = {?}', Session::getInt('uid')); $page->assign('carva', $res->fetchOneCell()); - - return PL_OK; } function handler_prefs_rss(&$page) @@ -181,8 +175,6 @@ class PlatalModule extends PLModule $this->__set_rss_state(true); $page->trig("Ton Fil RSS est activé."); } - - return PL_OK; } function handler_password(&$page) @@ -213,8 +205,6 @@ class PlatalModule extends PLModule $page->changeTpl('motdepasse.tpl'); $page->addJsLink('javascript/motdepasse.js'); $page->assign('xorg_title','Polytechnique.org - Mon mot de passe'); - - return PL_OK; } function handler_smtppass(&$page) @@ -246,8 +236,6 @@ class PlatalModule extends PLModule FROM auth_user_md5 WHERE user_id = {?}", $uid); $page->assign('actif', $res->fetchOneCell()); - - return PL_OK; } function handler_recovery(&$page) @@ -257,7 +245,7 @@ class PlatalModule extends PLModule $page->changeTpl('recovery.tpl'); if (!Env::has('login') || !Env::has('birth')) { - return PL_OK; + return; } if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::get('birth'))) { @@ -311,8 +299,6 @@ Mail envoy } else { $page->trig('Pas de résultat correspondant aux champs entrés dans notre base de données.'); } - - return PL_OK; } function handler_tmpPWD(&$page, $certif = null) @@ -343,8 +329,6 @@ Mail envoy $page->changeTpl('motdepasse.tpl'); $page->addJsLink('javascript/motdepasse.js'); } - - return PL_OK; } function handler_skin(&$page) @@ -372,7 +356,6 @@ Mail envoy WHERE skin_tpl != '' AND ext != '' GROUP BY id ORDER BY s.date DESC"; $page->assign_by_ref('skins', $globals->xdb->iterator($sql)); - return PL_OK; } function handler_exit(&$page, $level = null) @@ -417,7 +400,6 @@ Mail envoy } else { $page->changeTpl('exit.tpl'); } - return PL_OK; } function handler_rss(&$page, $user = null, $hash = null) @@ -436,8 +418,6 @@ Mail envoy WHERE u.user_id = {?} AND FIND_IN_SET(e.flags, "valide") AND peremption >= NOW()', $uid); $page->assign('rss', $rss); - - return PL_OK; } } diff --git a/modules/profile.php b/modules/profile.php index b86cbdc..fb92fd9 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -156,8 +156,6 @@ class ProfileModule extends PLModule Session::getInt('uid')); $page->assign('submited', $sql->fetchOneCell()); $page->assign('has_trombi_x', file_exists($trombi_x)); - - return PL_OK; } function handler_profile(&$page, $x = null) @@ -239,8 +237,6 @@ class ProfileModule extends PLModule $page->assign('virtualalias', $res->fetchOneCell()); $page->addJsLink('javascript/close_on_esc.js'); - - return PL_OK; } function handler_p_edit(&$page, $opened_tab = 'general') @@ -288,7 +284,7 @@ class ProfileModule extends PLModule if (!ereg('[0-3][0-9][0-1][0-9][1][9]([0-9]{2})', Env::get('birth'))) { $page->assign('etat_naissance', 'query'); $page->trig('Date de naissance incorrecte ou incohérente.'); - return PL_OK; + return; } //sinon @@ -300,11 +296,11 @@ class ProfileModule extends PLModule WHERE user_id={?}", $birth, Session::getInt('uid')); $page->assign('etat_naissance', 'ok'); - return PL_OK; + return; } $page->assign('etat_naissance', 'query'); - return PL_OK; // on affiche le formulaire pour naissance + return; // on affiche le formulaire pour naissance } //doit-on faire un update ? @@ -316,7 +312,7 @@ class ProfileModule extends PLModule require_once "profil/assign_{$opened_tab}.inc.php"; $page->assign('onglet', $opened_tab); $page->assign('onglet_tpl', "profil/$opened_tab.tpl"); - return PL_OK; + return; } $date=date("Y-m-j");//nouvelle date de mise a jour @@ -353,7 +349,7 @@ class ProfileModule extends PLModule $page->assign('onglet', $opened_tab); $page->assign('onglet_tpl', "profil/$opened_tab.tpl"); - return PL_OK; + return; } function handler_p_orange(&$page) @@ -375,7 +371,7 @@ class ProfileModule extends PLModule $page->assign('promo', $promo); if (!Env::has('promo_sortie')) { - return PL_OK; + return; } $promo_sortie = Env::getInt('promo_sortie'); @@ -406,8 +402,6 @@ class ProfileModule extends PLModule $page->assign('myorange', $myorange); } } - - return PL_OK; } function handler_referent(&$page, $x = null) @@ -475,7 +469,6 @@ class ProfileModule extends PLModule $page->assign('pays', $res->fetchColumn()); $page->addJsLink('javascript/close_on_esc.js'); - return PL_OK; } function handler_ref_search(&$page) @@ -529,7 +522,7 @@ class ProfileModule extends PLModule $page->assign('mentors_number', $res->fetchOneCell()); if (!Env::has('Chercher')) { - return PL_OK; + return; } // On vient d'un formulaire @@ -567,7 +560,7 @@ class ProfileModule extends PLModule if ($res->total() == 0) { $page->assign('recherche_trop_large', true); - return PL_OK; + return; } $nb_max_res_total = 100; @@ -590,8 +583,6 @@ class ProfileModule extends PLModule $page->assign('nb_pages_total', intval($res->total() / $nb_max_res_ppage) + 1); } - - return PL_OK; } function handler_p_usage(&$page) @@ -634,8 +625,6 @@ class ProfileModule extends PLModule $page->assign('myusage', $myusage); } } - - return PL_OK; } function handler_trombi(&$page, $promo = null) @@ -646,7 +635,7 @@ class ProfileModule extends PLModule $page->assign('xorg_title', 'Polytechnique.org - Trombi Promo'); if (is_null($promo)) { - return PL_OK; + return; } $this->promo = $promo = intval($promo); @@ -661,8 +650,6 @@ class ProfileModule extends PLModule } else { $page->trig('Promotion incorrecte (saisir au format YYYY). Recommence.'); } - - return PL_OK; } function format_adr($params, &$smarty) @@ -717,8 +704,6 @@ class ProfileModule extends PLModule header("Cache-Control: "); header("Content-type: text/x-vcard\n"); header("Content-Transfer-Encoding: Quoted-Printable\n"); - - return PL_OK; } } diff --git a/modules/register.php b/modules/register.php index ea29516..a8ee89d 100644 --- a/modules/register.php +++ b/modules/register.php @@ -153,8 +153,6 @@ class RegisterModule extends PLModule if (isset($err)) { $page->trig($err); } - - return PL_OK; } function handler_end_old(&$page) @@ -275,8 +273,6 @@ class RegisterModule extends PLModule redirect($globals->baseurl.'/register/success'); $page->assign('uid', $uid); - - return PL_OK; } function handler_success(&$page) @@ -304,8 +300,6 @@ class RegisterModule extends PLModule } $page->addJsLink('javascript/motdepasse.js'); - - return PL_OK; } } diff --git a/modules/search.php b/modules/search.php index dd1fc3a..aab1117 100644 --- a/modules/search.php +++ b/modules/search.php @@ -184,8 +184,6 @@ class SearchModule extends PLModule } $page->register_modifier('display_lines', 'display_lines'); - - return PL_OK; } function handler_advanced(&$page, $mode = null) @@ -229,8 +227,6 @@ class SearchModule extends PLModule } $page->register_modifier('display_lines', 'display_lines'); - - return PL_OK; } } diff --git a/modules/stats.php b/modules/stats.php index fbfb2b4..1143932 100644 --- a/modules/stats.php +++ b/modules/stats.php @@ -50,14 +50,12 @@ class StatsModule extends PLModule function handler_stats(&$page) { $page->changeTpl('stats/index.tpl'); - return PL_OK; } function handler_evolution(&$page, $jours = 365) { $page->changeTpl('stats/evolution_inscrits.tpl'); $page->assign('jours', $jours); - return PL_OK; } function handler_graph_evo(&$page, $jours = 365) @@ -274,8 +272,6 @@ EOF2; $page->assign('min', $min-$min % 10); $page->assign('max', $max+10-$max%10); $page->assign('promo', $promo); - - return PL_OK; } function handler_coupures(&$page, $cp_id = null) @@ -302,8 +298,6 @@ EOF2; FROM coupures where debut > '$beginning_date' order by debut desc"; $page->assign('coupures', $globals->xdb->iterator($sql)); } - - return PL_OK; } } diff --git a/modules/trezo.php b/modules/trezo.php index 806882d..b0fd027 100644 --- a/modules/trezo.php +++ b/modules/trezo.php @@ -67,8 +67,6 @@ class TrezoModule extends PLModule "SELECT date, label, credit, debit FROM money_trezo WHERE date >= {?} and date <= {?} order by date", $from_date, $to_date)); - - return PL_OK; } function handler_operation(&$page) @@ -143,8 +141,6 @@ class TrezoModule extends PLModule "SELECT id, date, label, credit, debit FROM money_trezo WHERE date >= {?} and date <= {?} ORDER BY date", $from_date, $to_date)); - - return PL_OK; } } diff --git a/modules/xnet.php b/modules/xnet.php index 02a985c..84bb0d2 100644 --- a/modules/xnet.php +++ b/modules/xnet.php @@ -41,7 +41,6 @@ class XnetModule extends PLModule function handler_index(&$page) { $page->changeTpl('xnet/index.tpl'); - return PL_OK; } function handler_exit(&$page) @@ -49,49 +48,42 @@ class XnetModule extends PLModule XnetSession::destroy(); $page->changeTpl('xnet/deconnexion.tpl'); $page->useMenu(); - return PL_OK; } function handler_about(&$page) { $page->changeTpl('xnet/apropos.tpl'); $page->useMenu(); - return PL_OK; } function handler_article12(&$page) { $page->changeTpl('xnet/article12.tpl'); $page->useMenu(); - return PL_OK; } function handler_article16(&$page) { $page->changeTpl('xnet/article16.tpl'); $page->useMenu(); - return PL_OK; } function handler_creategpx(&$page) { $page->changeTpl('xnet/creation-groupex.tpl'); $page->useMenu(); - return PL_OK; } function handler_services(&$page) { $page->changeTpl('xnet/services.tpl'); $page->useMenu(); - return PL_OK; } function handler_manuel(&$page) { $page->changeTpl('xnet/manuel.tpl'); $page->useMenu(); - return PL_OK; } function handler_plan(&$page) @@ -135,8 +127,6 @@ class XnetModule extends PLModule WHERE FIND_IN_SET("Institutions", cat) ORDER BY diminutif'); $page->assign('inst', $res); - - return PL_OK; } } -- 2.1.4