From 143ba7c95f06868f6a8dc7a4408d4ff04ded4ff0 Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Sun, 22 Jun 2008 23:30:47 +0200 Subject: [PATCH] Uses $page->setTitle() to set the title of the page. Signed-off-by: Florent Bruneau --- bin/search.rebuild_db.php | 2 +- core | 2 +- modules/admin.php | 36 ++++++++++++++++++------------------ modules/auth.php | 2 +- modules/axletter.php | 2 +- modules/carnet.php | 4 ++-- modules/email.php | 6 +++--- modules/events.php | 4 ++-- modules/forums.php | 6 +++--- modules/geoloc.php | 2 +- modules/googleapps.php | 8 ++++---- modules/lists.php | 4 ++-- modules/marketing.php | 2 +- modules/newsletter.php | 8 ++++---- modules/payment.php | 4 ++-- modules/platal.php | 10 +++++----- modules/profile.php | 24 ++++++++++++------------ modules/search.php | 2 +- modules/search/classes.inc.php | 2 +- 19 files changed, 65 insertions(+), 65 deletions(-) diff --git a/bin/search.rebuild_db.php b/bin/search.rebuild_db.php index 3835a9d..c201f21 100755 --- a/bin/search.rebuild_db.php +++ b/bin/search.rebuild_db.php @@ -29,7 +29,7 @@ $globals->debug = 0; // Do not store backtraces XDB::execute('DELETE FROM search_name'); $res = XDB::iterRow('SELECT auth_user_md5.user_id, nom, prenom, nom_usage, profile_nick FROM auth_user_md5 - LEFT JOIN auth_user_quick USING(user_id)'); + LEFT JOIN auth_user_quick USING(user_id)'); $i = 0; $muls = array(1, 1, 1, 0.2); $pub = array(true, true, true, false); diff --git a/core b/core index ba63661..9902e47 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ba63661ce2f38974002c7e4113320e9d06010853 +Subproject commit 9902e47b972f3dc62420773010e433f23991914d diff --git a/modules/admin.php b/modules/admin.php index 5ad1c2f..a5a23c3 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -59,13 +59,13 @@ class AdminModule extends PLModule function handler_default(&$page) { $page->changeTpl('admin/index.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration'); + $page->setTitle('Polytechnique.org - Administration'); } function handler_postfix_delayed(&$page) { $page->changeTpl('admin/postfix_delayed.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Postfix : Retardés'); + $page->setTitle('Polytechnique.org - Administration - Postfix : Retardés'); if (Env::has('del')) { $crc = Env::v('crc'); @@ -90,7 +90,7 @@ class AdminModule extends PLModule function handler_postfix_regexpsbounces(&$page, $new = null) { $page->changeTpl('admin/emails_bounces_re.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Postfix : Regexps Bounces'); + $page->setTitle('Polytechnique.org - Administration - Postfix : Regexps Bounces'); $page->assign('new', $new); if (Post::has('submit')) { @@ -347,14 +347,14 @@ class AdminModule extends PLModule $page->changeTpl('admin/logger-view.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Logs des sessions'); + $page->setTitle('Polytechnique.org - Administration - Logs des sessions'); } function handler_user(&$page, $login = false) { global $globals; $page->changeTpl('admin/utilisateurs.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Edit/Su/Log'); + $page->setTitle('Polytechnique.org - Administration - Edit/Su/Log'); require_once("emails.inc.php"); require_once("user.func.inc.php"); @@ -732,7 +732,7 @@ class AdminModule extends PLModule function handler_homonyms(&$page, $op = 'list', $target = null) { $page->changeTpl('admin/homonymes.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Homonymes'); + $page->setTitle('Polytechnique.org - Administration - Homonymes'); require_once("homonymes.inc.php"); if ($target) { @@ -795,7 +795,7 @@ class AdminModule extends PLModule function handler_ax_xorg(&$page) { $page->changeTpl('admin/ax-xorg.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - AX/X.org'); + $page->setTitle('Polytechnique.org - Administration - AX/X.org'); // liste des différences $res = XDB::query( @@ -823,7 +823,7 @@ class AdminModule extends PLModule function handler_deaths(&$page, $promo = 0, $validate = false) { $page->changeTpl('admin/deces_promo.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Deces'); + $page->setTitle('Polytechnique.org - Administration - Deces'); if (!$promo) $promo = Env::i('promo'); @@ -863,7 +863,7 @@ class AdminModule extends PLModule function handler_dead_but_active(&$page) { $page->changeTpl('admin/dead_but_active.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Décédés'); + $page->setTitle('Polytechnique.org - Administration - Décédés'); $res = XDB::iterator( "SELECT u.promo, u.nom, u.prenom, u.deces, u.matricule_ax, a.alias, DATE(MAX(s.start)) AS last @@ -878,7 +878,7 @@ class AdminModule extends PLModule function handler_synchro_ax(&$page, $user = null, $action = null) { $page->changeTpl('admin/synchro_ax.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Synchro AX'); + $page->setTitle('Polytechnique.org - Administration - Synchro AX'); require_once('synchro_ax.inc.php'); @@ -926,7 +926,7 @@ class AdminModule extends PLModule function handler_validate(&$page, $action = 'list', $id = null) { $page->changeTpl('admin/valider.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Valider une demande'); + $page->setTitle('Polytechnique.org - Administration - Valider une demande'); $page->addCssLink('nl.css'); $page->addJsLink('ajax.js'); require_once("validations.inc.php"); @@ -974,7 +974,7 @@ class AdminModule extends PLModule } function handler_validate_answers(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Réponses automatiques de validation'); + $page->setTitle('Polytechnique.org - Administration - Réponses automatiques de validation'); $page->assign('title', 'Gestion des réponses automatiques'); $table_editor = new PLTableEditor('admin/validate/answers','requests_answers','id'); $table_editor->describe('category','catégorie',true); @@ -983,7 +983,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_skins(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Skins'); + $page->setTitle('Polytechnique.org - Administration - Skins'); $page->assign('title', 'Gestion des skins'); $table_editor = new PLTableEditor('admin/skins','skins','id'); $table_editor->describe('name','nom',true); @@ -996,7 +996,7 @@ class AdminModule extends PLModule } function handler_postfix_blacklist(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Postfix : Blacklist'); + $page->setTitle('Polytechnique.org - Administration - Postfix : Blacklist'); $page->assign('title', 'Blacklist de postfix'); $table_editor = new PLTableEditor('admin/postfix/blacklist','postfix_blacklist','email', true); $table_editor->describe('reject_text','Texte de rejet',true); @@ -1004,14 +1004,14 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_postfix_whitelist(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Postfix : Whitelist'); + $page->setTitle('Polytechnique.org - Administration - Postfix : Whitelist'); $page->assign('title', 'Whitelist de postfix'); $table_editor = new PLTableEditor('admin/postfix/whitelist','postfix_whitelist','email', true); $table_editor->describe('email','email',true); $table_editor->apply($page, $action, $id); } function handler_mx_broken(&$page, $action = 'list', $id = null) { - $page->assign('pl_title', 'Polytechnique.org - Administration - MX Défaillants'); + $page->setTitle('Polytechnique.org - Administration - MX Défaillants'); $page->assign('title', 'MX Défaillant'); $table_editor = new PLTableEditor('admin/mx/broken', 'mx_watch', 'host', true); $table_editor->describe('host', 'Masque', true); @@ -1020,7 +1020,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_logger_actions(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Actions'); + $page->setTitle('Polytechnique.org - Administration - Actions'); $page->assign('title', 'Gestion des actions de logger'); $table_editor = new PLTableEditor('admin/logger/actions','logger.actions','id'); $table_editor->describe('text','intitulé',true); @@ -1028,7 +1028,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_downtime(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Coupures'); + $page->setTitle('Polytechnique.org - Administration - Coupures'); $page->assign('title', 'Gestion des coupures'); $table_editor = new PLTableEditor('admin/downtime','coupures','id'); $table_editor->describe('debut','date',true); diff --git a/modules/auth.php b/modules/auth.php index d6521e1..0b767c3 100644 --- a/modules/auth.php +++ b/modules/auth.php @@ -174,7 +174,7 @@ class AuthModule extends PLModule function handler_admin_authgroupesx(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Auth groupes X'); + $page->setTitle('Polytechnique.org - Administration - Auth groupes X'); $page->assign('title', 'Gestion de l\'authentification centralisée'); $table_editor = new PLTableEditor('admin/auth-groupes-x','groupesx_auth','id'); $table_editor->describe('name','nom',true); diff --git a/modules/axletter.php b/modules/axletter.php index caad25c..fd56ea1 100644 --- a/modules/axletter.php +++ b/modules/axletter.php @@ -53,7 +53,7 @@ class AXLetterModule extends PLModule require_once dirname(__FILE__) . '/axletter/axletter.inc.php'; $page->changeTpl('axletter/index.tpl'); - $page->assign('pl_title','Polytechnique.org - Envois de l\'AX'); + $page->setTitle('Polytechnique.org - Envois de l\'AX'); switch ($action) { case 'in': AXLetter::subscribe(); break; diff --git a/modules/carnet.php b/modules/carnet.php index 44a9336..277e2dc 100644 --- a/modules/carnet.php +++ b/modules/carnet.php @@ -56,7 +56,7 @@ class CarnetModule extends PLModule function handler_index(&$page) { $page->changeTpl('carnet/index.tpl'); - $page->assign('pl_title','Polytechnique.org - Mon carnet'); + $page->setTitle('Polytechnique.org - Mon carnet'); $this->_add_rss_link($page); } @@ -202,7 +202,7 @@ class CarnetModule extends PLModule function handler_contacts(&$page, $action = null, $subaction = null, $ssaction = null) { - $page->assign('pl_title','Polytechnique.org - Mes contacts'); + $page->setTitle('Polytechnique.org - Mes contacts'); $this->_add_rss_link($page); $uid = S::v('uid'); diff --git a/modules/email.php b/modules/email.php index a992963..5b903c5 100644 --- a/modules/email.php +++ b/modules/email.php @@ -47,7 +47,7 @@ class EmailModule extends PLModule require_once 'emails.inc.php'; $page->changeTpl('emails/index.tpl'); - $page->assign('pl_title','Polytechnique.org - Mes emails'); + $page->setTitle('Polytechnique.org - Mes emails'); $uid = S::v('uid'); @@ -98,7 +98,7 @@ class EmailModule extends PLModule global $globals; $page->changeTpl('emails/alias.tpl'); - $page->assign('pl_title','Polytechnique.org - Alias melix.net'); + $page->setTitle('Polytechnique.org - Alias melix.net'); $uid = S::v('uid'); $forlife = S::v('forlife'); @@ -328,7 +328,7 @@ class EmailModule extends PLModule $page->changeTpl('emails/send.tpl'); $page->addJsLink('ajax.js'); - $page->assign('pl_title','Polytechnique.org - Envoyer un email'); + $page->setTitle('Polytechnique.org - Envoyer un email'); // action si on recoit un formulaire if (Post::has('save')) { diff --git a/modules/events.php b/modules/events.php index 5587ac3..cc2e0b0 100644 --- a/modules/events.php +++ b/modules/events.php @@ -327,7 +327,7 @@ class EventsModule extends PLModule function handler_admin_tips(&$page, $action = 'list', $id = null) { - $page->assign('pl_title', 'Polytechnique.org - Administration - Astuces'); + $page->setTitle('Polytechnique.org - Administration - Astuces'); $page->assign('title', 'Gestion des Astuces'); $table_editor = new PLTableEditor('admin/tips', 'tips', 'id'); $table_editor->describe('peremption', 'date de péremption', true); @@ -348,7 +348,7 @@ class EventsModule extends PLModule { $page->changeTpl('events/admin.tpl'); $page->addJsLink('ajax.js'); - $page->assign('pl_title','Polytechnique.org - Administration - Evenements'); + $page->setTitle('Polytechnique.org - Administration - Evenements'); $page->register_modifier('hde', 'html_entity_decode'); $arch = $action == 'archives'; diff --git a/modules/forums.php b/modules/forums.php index 284ce84..4e5d009 100644 --- a/modules/forums.php +++ b/modules/forums.php @@ -59,7 +59,7 @@ class ForumsModule extends PLModule function handler_banana(&$page, $group = null, $action = null, $artid = null) { $page->changeTpl('banana/index.tpl'); - $page->assign('pl_title','Polytechnique.org - Forums & PA'); + $page->setTitle('Polytechnique.org - Forums & PA'); $get = Array(); if (Post::has('updateall')) { @@ -97,7 +97,7 @@ class ForumsModule extends PLModule function handler_forums_bans(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Bannissements des forums'); + $page->setTitle('Polytechnique.org - Administration - Bannissements des forums'); $page->assign('title', 'Gestion des mises au ban'); $table_editor = new PLTableEditor('admin/forums','forums.innd','id_innd'); $table_editor->add_sort_field('priority', true, true); @@ -113,7 +113,7 @@ class ForumsModule extends PLModule static function run_banana(&$page, $params = null) { $page->changeTpl('banana/index.tpl'); - $page->assign('pl_title','Polytechnique.org - Forums & PA'); + $page->setTitle('Polytechnique.org - Forums & PA'); require_once 'banana/forum.inc.php'; run_banana($page, 'ForumsBanana', $params); diff --git a/modules/geoloc.php b/modules/geoloc.php index 08b42fa..9fb091a 100644 --- a/modules/geoloc.php +++ b/modules/geoloc.php @@ -42,7 +42,7 @@ class GeolocModule extends PLModule function handler_admin(&$page, $action = false) { $page->changeTpl('geoloc/admin.tpl'); require_once("geoloc.inc.php"); - $page->assign('pl_title','Polytechnique.org - Administration - Geolocalisation'); + $page->setTitle('Polytechnique.org - Administration - Geolocalisation'); $nb_synchro = 0; diff --git a/modules/googleapps.php b/modules/googleapps.php index eeaffb6..d7871d6 100644 --- a/modules/googleapps.php +++ b/modules/googleapps.php @@ -42,7 +42,7 @@ class GoogleAppsModule extends PLModule require_once("googleapps.inc.php"); $page->changeTpl('googleapps/index.tpl'); $page->addJsLink('motdepasse.js'); - $page->assign('pl_title', 'Polytechnique.org - Compte Google Apps'); + $page->setTitle('Polytechnique.org - Compte Google Apps'); $account = new GoogleAppsAccount(S::v('uid'), S::v('forlife')); @@ -117,7 +117,7 @@ class GoogleAppsModule extends PLModule function handler_admin(&$page, $action = null) { require_once("googleapps.inc.php"); $page->changeTpl('googleapps/admin.tpl'); - $page->assign('pl_title', 'Polytechnique.org - Administration Google Apps'); + $page->setTitle('Polytechnique.org - Administration Google Apps'); $page->assign('googleapps_admin', GoogleAppsAccount::is_administrator(S::v('uid'))); if ($action == 'ack') { @@ -163,7 +163,7 @@ class GoogleAppsModule extends PLModule function handler_admin_job(&$page, $job = null) { require_once("googleapps.inc.php"); $page->changeTpl('googleapps/admin.job.tpl'); - $page->assign('pl_title', 'Polytechnique.org - Administration Google Apps'); + $page->setTitle('Polytechnique.org - Administration Google Apps'); $page->assign('googleapps_admin', GoogleAppsAccount::is_administrator(S::v('uid'))); if ($job) { @@ -183,7 +183,7 @@ class GoogleAppsModule extends PLModule require_once("emails.inc.php"); require_once("googleapps.inc.php"); $page->changeTpl('googleapps/admin.user.tpl'); - $page->assign('pl_title', 'Polytechnique.org - Administration Google Apps'); + $page->setTitle('Polytechnique.org - Administration Google Apps'); $page->assign('googleapps_admin', GoogleAppsAccount::is_administrator(S::v('uid'))); if (!$user && Post::has('login')) { diff --git a/modules/lists.php b/modules/lists.php index 9bdba57..dac625d 100644 --- a/modules/lists.php +++ b/modules/lists.php @@ -94,7 +94,7 @@ class ListsModule extends PLModule $page->changeTpl('lists/index.tpl'); $page->addJsLink('ajax.js'); - $page->assign('pl_title','Polytechnique.org - Listes de diffusion'); + $page->setTitle('Polytechnique.org - Listes de diffusion'); if (Get::has('del')) { @@ -805,7 +805,7 @@ class ListsModule extends PLModule function handler_admin_all(&$page) { $page->changeTpl('lists/admin_all.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Mailing lists'); + $page->setTitle('Polytechnique.org - Administration - Mailing lists'); $client = new MMList(S::v('uid'), S::v('password')); $listes = $client->get_all_lists(); diff --git a/modules/marketing.php b/modules/marketing.php index 8cb7bbe..74ee081 100644 --- a/modules/marketing.php +++ b/modules/marketing.php @@ -40,7 +40,7 @@ class MarketingModule extends PLModule { $page->changeTpl('marketing/index.tpl'); - $page->assign('pl_title','Polytechnique.org - Marketing'); + $page->setTitle('Polytechnique.org - Marketing'); // Quelques statistiques diff --git a/modules/newsletter.php b/modules/newsletter.php index 46cc935..42b31b5 100644 --- a/modules/newsletter.php +++ b/modules/newsletter.php @@ -38,7 +38,7 @@ class NewsletterModule extends PLModule require_once 'newsletter.inc.php'; $page->changeTpl('newsletter/index.tpl'); - $page->assign('pl_title','Polytechnique.org - Lettres mensuelles'); + $page->setTitle('Polytechnique.org - Lettres mensuelles'); switch ($action) { case 'out': Newsletter::unsubscribe(); break; @@ -97,7 +97,7 @@ class NewsletterModule extends PLModule function handler_admin_nl(&$page, $new = false) { $page->changeTpl('newsletter/admin.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Newsletter : liste'); + $page->setTitle('Polytechnique.org - Administration - Newsletter : liste'); require_once("newsletter.inc.php"); if($new) { @@ -111,7 +111,7 @@ class NewsletterModule extends PLModule function handler_admin_nl_edit(&$page, $nid = 'last', $aid = null, $action = 'edit') { $page->changeTpl('newsletter/edit.tpl'); $page->addCssLink('nl.css'); - $page->assign('pl_title','Polytechnique.org - Administration - Newsletter : Edition'); + $page->setTitle('Polytechnique.org - Administration - Newsletter : Edition'); require_once("newsletter.inc.php"); $nl = new NewsLetter($nid); @@ -157,7 +157,7 @@ class NewsletterModule extends PLModule } function handler_admin_nl_cat(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Newsletter : Catégories'); + $page->setTitle('Polytechnique.org - Administration - Newsletter : Catégories'); $page->assign('title', 'Gestion des catégories de la newsletter'); $table_editor = new PLTableEditor('admin/newsletter/categories','newsletter_cat','cid'); $table_editor->describe('titre','intitulé',true); diff --git a/modules/payment.php b/modules/payment.php index 38c34f5..3924071 100644 --- a/modules/payment.php +++ b/modules/payment.php @@ -120,7 +120,7 @@ class PaymentModule extends PLModule } } $page->changeTpl('payment/index.tpl'); - $page->assign('pl_title','Polytechnique.org - Télépaiements'); + $page->setTitle('Polytechnique.org - Télépaiements'); // initialisation $op = Env::v('op', 'select'); @@ -467,7 +467,7 @@ class PaymentModule extends PLModule } function handler_admin(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Paiements'); + $page->setTitle('Polytechnique.org - Administration - Paiements'); $page->assign('title', 'Gestion des télépaiements'); $table_editor = new PLTableEditor('admin/payments','paiement.paiements','id'); $table_editor->add_join_table('paiement.transactions','ref',true); diff --git a/modules/platal.php b/modules/platal.php index 092d63e..f50edef 100644 --- a/modules/platal.php +++ b/modules/platal.php @@ -122,7 +122,7 @@ class PlatalModule extends PLModule function handler_prefs(&$page) { $page->changeTpl('platal/preferences.tpl'); - $page->assign('pl_title','Polytechnique.org - Mes préférences'); + $page->setTitle('Polytechnique.org - Mes préférences'); if (Post::has('mail_fmt')) { $fmt = Post::v('mail_fmt'); @@ -143,7 +143,7 @@ class PlatalModule extends PLModule { $page->changeTpl('platal/webredirect.tpl'); - $page->assign('pl_title','Polytechnique.org - Redirection de page WEB'); + $page->setTitle('Polytechnique.org - Redirection de page WEB'); $log =& S::v('log'); $url = Env::v('url'); @@ -221,13 +221,13 @@ class PlatalModule extends PLModule $page->changeTpl('platal/motdepasse.tpl'); $page->addJsLink('motdepasse.js'); - $page->assign('pl_title','Polytechnique.org - Mon mot de passe'); + $page->setTitle('Polytechnique.org - Mon mot de passe'); } function handler_smtppass(&$page) { $page->changeTpl('platal/acces_smtp.tpl'); - $page->assign('pl_title','Polytechnique.org - Acces SMTP/NNTP'); + $page->setTitle('Polytechnique.org - Acces SMTP/NNTP'); require_once 'wiki.inc.php'; wiki_require_page('Xorg.SMTPSécurisé'); @@ -387,7 +387,7 @@ Adresse de secours : " . Post::v('email') : "")); global $globals; $page->changeTpl('platal/skins.tpl'); - $page->assign('pl_title','Polytechnique.org - Skins'); + $page->setTitle('Polytechnique.org - Skins'); if (Env::has('newskin')) { // formulaire soumis, traitons les données envoyées XDB::execute('UPDATE auth_user_quick diff --git a/modules/profile.php b/modules/profile.php index 031493b..72a6ea0 100644 --- a/modules/profile.php +++ b/modules/profile.php @@ -222,7 +222,7 @@ class ProfileModule extends PLModule } $title = $user['prenom'] . ' ' . ( empty($user['nom_usage']) ? $user['nom'] : $user['nom_usage'] ); - $page->assign('pl_title', $title); + $page->setTitle($title); // photo @@ -329,7 +329,7 @@ class ProfileModule extends PLModule . " la procédure de récupération de mot de passe si un jour tu le perdais"); } - $page->assign('pl_title', 'Polytechnique.org - Mon Profil'); + $page->setTitle('Polytechnique.org - Mon Profil'); } function handler_applis_js(&$page) @@ -560,7 +560,7 @@ class ProfileModule extends PLModule { require_once 'wiki.inc.php'; wiki_require_page('Docs.Emploi'); - $page->assign('pl_title', 'Polytechnique.org - Conseil Pro'); + $page->setTitle('Polytechnique.org - Conseil Pro'); //recuperation des noms de secteurs $res = XDB::iterRow("SELECT id, label FROM emploi_secteur"); @@ -681,7 +681,7 @@ class ProfileModule extends PLModule function handler_xnet(&$page) { $page->changeTpl('profile/groupesx.tpl'); - $page->assign('pl_title', 'Polytechnique.org - Promo, Groupes X, Binets'); + $page->setTitle('Polytechnique.org - Promo, Groupes X, Binets'); $req = XDB::query(' SELECT m.asso_id, a.nom, diminutif, a.logo IS NOT NULL AS has_logo, @@ -711,7 +711,7 @@ class ProfileModule extends PLModule function handler_admin_trombino(&$page, $uid = null, $action = null) { $page->changeTpl('profile/admin_trombino.tpl'); - $page->assign('pl_title','Polytechnique.org - Administration - Trombino'); + $page->setTitle('Polytechnique.org - Administration - Trombino'); $page->assign('uid', $uid); $q = XDB::query( @@ -747,7 +747,7 @@ class ProfileModule extends PLModule $page->assign('forlife', $forlife); } function handler_admin_binets(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Binets'); + $page->setTitle('Polytechnique.org - Administration - Binets'); $page->assign('title', 'Gestion des binets'); $table_editor = new PLTableEditor('admin/binets', 'binets_def', 'id'); $table_editor->add_join_table('binets_ins','binet_id',true); @@ -755,7 +755,7 @@ class ProfileModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_admin_formations(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Formations'); + $page->setTitle('Polytechnique.org - Administration - Formations'); $page->assign('title', 'Gestion des formations'); $table_editor = new PLTableEditor('admin/formations','applis_def','id'); $table_editor->add_join_table('applis_ins','aid',true); @@ -764,21 +764,21 @@ class ProfileModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_admin_sections(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Sections'); + $page->setTitle('Polytechnique.org - Administration - Sections'); $page->assign('title', 'Gestion des sections'); $table_editor = new PLTableEditor('admin/sections','sections','id'); $table_editor->describe('text','intitulé',true); $table_editor->apply($page, $action, $id); } function handler_admin_ss_secteurs(&$page, $action = 'list', $id = null) { - $page->assign('pl_title', 'Polytechnique.org - Administration - Sous-secteurs'); + $page->setTitle('Polytechnique.org - Administration - Sous-secteurs'); $page->assign('title', 'Gestion des sous-secteurs'); $table_editor = new PLTableEditor('admin/ss_secteurs', 'emploi_ss_secteur', 'id', true); $table_editor->describe('label', 'intitulé', true); $table_editor->apply($page, $action, $id); } function handler_admin_fonctions(&$page, $action = 'list', $id = null) { - $page->assign('pl_title', 'Polytechnique.org - Administration - Fonctions'); + $page->setTitle('Polytechnique.org - Administration - Fonctions'); $page->assign('title', 'Gestion des fonctions'); $table_editor = new PLTableEditor('admin/fonctions', 'fonctions_def', 'id', true); $table_editor->describe('fonction_fr', 'intitulé', true); @@ -787,14 +787,14 @@ class ProfileModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_admin_secteurs(&$page, $action = 'list', $id = null) { - $page->assign('pl_title', 'Polytechnique.org - Administration - Secteurs'); + $page->setTitle('Polytechnique.org - Administration - Secteurs'); $page->assign('title', 'Gestion des secteurs'); $table_editor = new PLTableEditor('admin/secteurs', 'emploi_secteur', 'id', true); $table_editor->describe('label', 'intitulé', true); $table_editor->apply($page, $action, $id); } function handler_admin_medals(&$page, $action = 'list', $id = null) { - $page->assign('pl_title','Polytechnique.org - Administration - Distinctions'); + $page->setTitle('Polytechnique.org - Administration - Distinctions'); $page->assign('title', 'Gestion des Distinctions'); $table_editor = new PLTableEditor('admin/medals','profile_medals','id'); $table_editor->describe('text', 'intitulé', true); diff --git a/modules/search.php b/modules/search.php index 7e2dfea..584fd37 100644 --- a/modules/search.php +++ b/modules/search.php @@ -154,7 +154,7 @@ class SearchModule extends PLModule require_once dirname(__FILE__) . '/search/search.inc.php'; $page->changeTpl('search/index.tpl'); - $page->assign('pl_title','Polytechnique.org - Annuaire'); + $page->setTitle('Polytechnique.org - Annuaire'); } function handler_advanced(&$page, $action = null, $subaction = null) diff --git a/modules/search/classes.inc.php b/modules/search/classes.inc.php index db5a414..42ee056 100644 --- a/modules/search/classes.inc.php +++ b/modules/search/classes.inc.php @@ -93,7 +93,7 @@ class ThrowError global $globals; $page =& Platal::page(); $page->changeTpl('search/index.tpl'); - $page->assign('pl_title','Polytechnique.org - Annuaire'); + $page->setTitle('Polytechnique.org - Annuaire'); $page->assign('baseurl', $globals->baseurl); $page->trigError($explain); $page->run(); -- 2.1.4