From 1bf36cd12647c3d2eb8f9ec2a1f0eaad0b5f7e81 Mon Sep 17 00:00:00 2001 From: =?utf8?q?St=C3=A9phane=20Jacob?= Date: Tue, 2 Mar 2010 19:19:30 +0100 Subject: [PATCH] Renames user_id to uid accordingly to our naming convention. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Stéphane Jacob --- bin/cron/google_apps.php | 14 +++++++------- classes/user.php | 9 +-------- classes/xnetsession.php | 4 ++-- classes/xorgsession.php | 4 ++-- core | 2 +- include/googleapps.inc.php | 2 +- include/massmailer.inc.php | 8 ++++---- include/reminder.inc.php | 10 +++++----- include/validations.inc.php | 38 +++++++++++++++++++++++++++---------- modules/admin.php | 9 ++++----- modules/axletter.php | 8 ++++---- modules/email.php | 7 +++++-- modules/events/feed.inc.php | 2 +- modules/gadgets.php | 12 ++++++------ modules/survey/survey.inc.php | 12 ++++++------ modules/xnetgrp.php | 4 ++-- templates/admin/user.tpl | 10 +++++----- templates/gadgets/ig-events.tpl | 2 +- templates/gadgets/ig-minifiche.tpl | 4 ++-- templates/include/plview.trombi.tpl | 8 ++++---- templates/include/trombi.tpl | 2 +- templates/lists/admin.tpl | 2 +- templates/xnetgrp/form.announce.tpl | 2 +- 23 files changed, 94 insertions(+), 81 deletions(-) diff --git a/bin/cron/google_apps.php b/bin/cron/google_apps.php index 60b8311..307fb7a 100755 --- a/bin/cron/google_apps.php +++ b/bin/cron/google_apps.php @@ -23,9 +23,9 @@ // Updates the gapps_accounts table with Plat/al information. // Cleans-up the job queue, and execute post-queue hooks. -require_once('connect.db.inc.php'); -require_once('plmailer.php'); -require_once('googleapps.inc.php'); +require_once 'connect.db.inc.php'; +require_once 'plmailer.php'; +require_once 'googleapps.inc.php'; if (!$globals->mailstorage->googleapps_domain) { exit; } @@ -44,7 +44,7 @@ while ($account = $res->next()) { $account['id'], $account['g_account_name']); } -/* Emits a warning for GApps accounts without local user_id. */ +/* Emits a warning for GApps accounts without local uid. */ $res = XDB::iterator( "SELECT g.g_account_name FROM gapps_accounts AS g @@ -52,7 +52,7 @@ $res = XDB::iterator( WHERE (g.l_userid IS NULL OR g.l_userid <= 0) AND a.uid IS NULL"); while ($account = $res->next()) { if (!preg_match("/^admin-/", $account['g_account_name'])) { - printf("Warning: GApps account '%s' has no local user_id.\n", $account['g_account_name']); + printf("Warning: GApps account '%s' has no local uid.\n", $account['g_account_name']); } } @@ -71,7 +71,7 @@ while ($nickname = $res->next()) { $nickname['id'], $nickname['g_account_name']); } -/* Emits a warning for nicknames without local user_id. */ +/* Emits a warning for nicknames without local uid. */ $res = XDB::iterator( "SELECT g.g_account_name FROM gapps_nicknames AS g @@ -79,7 +79,7 @@ $res = XDB::iterator( WHERE (g.l_userid IS NULL OR g.l_userid <= 0) AND a.uid IS NULL"); while ($nickname = $res->next()) { if (!preg_match("/^admin-/", $nickname['g_account_name'])) { - printf("Warning: Nickname '%s' has no local user_id.\n", $nickname['g_account_name']); + printf("Warning: Nickname '%s' has no local uid.\n", $nickname['g_account_name']); } } diff --git a/classes/user.php b/classes/user.php index 7db7df4..956f188 100644 --- a/classes/user.php +++ b/classes/user.php @@ -205,7 +205,7 @@ class User extends PlUser && $this->gender !== null && $this->email_format !== null) { return; } - $this->fillFromArray(self::loadMainFieldsFromUIDs(array($this->user_id))->next()); + $this->fillFromArray(self::loadMainFieldsFromUIDs(array($this->uid))->next()); } // Specialization of the fillFromArray method, to implement hacks to enable @@ -214,13 +214,6 @@ class User extends PlUser // stop being used actively. protected function fillFromArray(array $values) { - // It might happen that the 'user_id' field is called uid in some places - // (eg. in sessions), so we hard link uid to user_id to prevent useless - // SQL requests. - if (!isset($values['user_id']) && isset($values['uid'])) { - $values['user_id'] = $values['uid']; - } - // Also, if display_name and full_name are not known, but the user's // surname and last name are, we can construct the former two. if (isset($values['prenom']) && isset($values['nom'])) { diff --git a/classes/xnetsession.php b/classes/xnetsession.php index bf87156..15dda7b 100644 --- a/classes/xnetsession.php +++ b/classes/xnetsession.php @@ -76,7 +76,7 @@ class XnetSession extends XorgSession protected function doAuth($level) { if (S::identified()) { // ok, c'est bon, on n'a rien à faire - return User::getSilentWithValues(null, array('user_id' => S::i('uid'))); + return User::getSilentWithValues(null, array('uid' => S::i('uid'))); } if (!Get::has('auth')) { return null; @@ -87,7 +87,7 @@ class XnetSession extends XorgSession } Get::kill('auth'); S::set('auth', AUTH_MDP); - return User::getSilentWithValues(null, array('user_id' => Get::i('uid'))); + return User::getSilentWithValues(null, array('uid' => Get::i('uid'))); } protected function startSessionAs($user, $level) diff --git a/classes/xorgsession.php b/classes/xorgsession.php index b1241b8..011b6b5 100644 --- a/classes/xorgsession.php +++ b/classes/xorgsession.php @@ -52,7 +52,7 @@ class XorgSession extends PlSession return true; } - /** Check the cookie and set the associated user_id in the auth_by_cookie session variable. + /** Check the cookie and set the associated uid in the auth_by_cookie session variable. */ private function tryCookie() { @@ -270,7 +270,7 @@ class XorgSession extends PlSession public function tokenAuth($login, $token) { - $res = XDB::query('SELECT a.uid AS user_id, a.hruid + $res = XDB::query('SELECT a.uid, a.hruid FROM aliases AS l INNER JOIN accounts AS a ON (l.uid = a.uid AND a.state = \'active\') WHERE a.token = {?} AND l.alias = {?} AND l.type != \'homonyme\'', diff --git a/core b/core index 701c0b6..643ae90 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 701c0b6f4dd6c32acb0508e6d59dce034bdc6a4f +Subproject commit 643ae90bb09f55e0b0853bf5a554829a3042495e diff --git a/include/googleapps.inc.php b/include/googleapps.inc.php index bb78823..f551380 100644 --- a/include/googleapps.inc.php +++ b/include/googleapps.inc.php @@ -23,7 +23,7 @@ function post_queue_u_create($job) { global $globals; - // Retrieves the user parameters (GoogleApps username and user_id). + // Retrieves the user parameters (GoogleApps username and uid). $parameters = json_decode($job['j_parameters'], true); $username = isset($parameters['username']) ? $parameters['username'] : null; if (!($user = User::getSilent($username))) { diff --git a/include/massmailer.inc.php b/include/massmailer.inc.php index a9269bd..f9cc381 100644 --- a/include/massmailer.inc.php +++ b/include/massmailer.inc.php @@ -165,7 +165,7 @@ abstract class MassMailer if (is_null($hash)) { $hash = XDB::fetchOneCell("SELECT hash FROM {$this->_subscriptionTable} - WHERE user_id = {?}", $user->id()); + WHERE uid = {?}", $user->id()); } if (is_null($hash)) { $hash = $this->createHash(array($user->displayName(), $user->fullName(), @@ -173,7 +173,7 @@ abstract class MassMailer rand(), "X.org rulez")); XDB::execute("UPDATE {$this->_subscriptionTable} as ni SET ni.hash = {?} - WHERE ni.user_id != {?}", + WHERE ni.uid != {?}", $hash, $user->id()); } @@ -192,7 +192,7 @@ abstract class MassMailer global $globals; return "SELECT a.uid FROM {$this->_subscriptionTable} AS ni - INNER JOIN accounts AS a ON (ni.user_id = a.uid) + INNER JOIN accounts AS a ON (ni.uid = a.uid) LEFT JOIN email_options AS eo ON (eo.uid = a.uid) LEFT JOIN emails AS e ON (e.uid = a.uid AND e.flags='active') WHERE ni.last < {?} AND ({$this->subscriptionWhere()}) AND @@ -210,7 +210,7 @@ abstract class MassMailer return; } foreach ($users as $user) { - $sent[] = XDB::format('user_id = {?}', $user->id()); + $sent[] = XDB::format('uid = {?}', $user->id()); $this->sendTo($user, $hash); } XDB::execute("UPDATE {$this->_subscriptionTable} diff --git a/include/reminder.inc.php b/include/reminder.inc.php index 346d97e..715d2d5 100644 --- a/include/reminder.inc.php +++ b/include/reminder.inc.php @@ -69,12 +69,12 @@ abstract class Reminder // Updates (or creates) the reminder line for the pair (|user|, |reminder_id|) // using the |status| as status, and the |next_ask| as the delay between now // and the next ask (if any). - private static function UpdateStatus($user_id, $type_id, $status, $next_ask) + private static function UpdateStatus($uid, $type_id, $status, $next_ask) { XDB::execute('REPLACE INTO reminder SET uid = {?}, type_id = {?}, status = {?}, remind_last = NOW(), remind_next = FROM_UNIXTIME({?})', - $user_id, $type_id, $status, + $uid, $type_id, $status, ($next_ask > 0 ? time() + $next_ask * 24 * 60 * 60 : null)); } @@ -153,12 +153,12 @@ abstract class Reminder // Static status update methods ------------------------------------------- - // Marks the candidate reminder as having been accepted for user |user_id|. + // Marks the candidate reminder as having been accepted for user |uid|. // It is intended to be used when a reminder box has been bypassed, and when // it should behave as if the user had clicked on 'yes'. - protected static function MarkCandidateAsAccepted($user_id, $candidate) + protected static function MarkCandidateAsAccepted($uid, $candidate) { - Reminder::UpdateStatus($user_id, $candidate['type_id'], + Reminder::UpdateStatus($uid, $candidate['type_id'], 'yes', $candidate['remind_delay_yes']); } diff --git a/include/validations.inc.php b/include/validations.inc.php index 050318c..9deb2f7 100644 --- a/include/validations.inc.php +++ b/include/validations.inc.php @@ -97,11 +97,14 @@ abstract class Validate public function submit() { if ($this->unique) { - XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?}', $this->user->id(), $this->type); + XDB::execute('DELETE FROM requests + WHERE uid = {?} AND type = {?}', + $this->user->id(), $this->type); } $this->stamp = date('YmdHis'); - XDB::execute('INSERT INTO requests (user_id, type, data, stamp) VALUES ({?}, {?}, {?}, {?})', + XDB::execute('INSERT INTO requests (uid, type, data, stamp) + VALUES ({?}, {?}, {?}, {?})', $this->user->id(), $this->type, $this, $this->stamp); global $globals; @@ -114,8 +117,9 @@ abstract class Validate protected function update() { - XDB::execute('UPDATE requests SET data={?}, stamp=stamp - WHERE user_id={?} AND type={?} AND stamp={?}', + XDB::execute('UPDATE requests + SET data = {?}, stamp = stamp + WHERE uid = {?} AND type = {?} AND stamp = {?}', $this, $this->user->id(), $this->type, $this->stamp); return true; } @@ -131,10 +135,12 @@ abstract class Validate global $globals; if ($this->unique) { - $success = XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?}', + $success = XDB::execute('DELETE FROM requests + WHERE uid = {?} AND type = {?}', $this->user->id(), $this->type); } else { - $success = XDB::execute('DELETE FROM requests WHERE user_id={?} AND type={?} AND stamp={?}', + $success = XDB::execute('DELETE FROM requests + WHERE uid = {?} AND type = {?} AND stamp = {?}', $this->user->id(), $this->type, $this->stamp); } $globals->updateNbValid(); @@ -277,9 +283,15 @@ abstract class Validate static public function get_typed_request($uid, $type, $stamp = -1) { if ($stamp == -1) { - $res = XDB::query('SELECT data FROM requests WHERE user_id={?} and type={?}', $uid, $type); + $res = XDB::query('SELECT data + FROM requests + WHERE uid = {?} and type = {?}', + $uid, $type); } else { - $res = XDB::query('SELECT data, DATE_FORMAT(stamp, "%Y%m%d%H%i%s") FROM requests WHERE user_id={?} AND type={?} and stamp={?}', $uid, $type, $stamp); + $res = XDB::query('SELECT data, DATE_FORMAT(stamp, "%Y%m%d%H%i%s") + FROM requests + WHERE uid = {?} AND type = {?} and stamp = {?}', + $uid, $type, $stamp); } if ($result = $res->fetchOneCell()) { $result = Validate::unserialize($result); @@ -305,7 +317,10 @@ abstract class Validate */ static public function get_typed_requests($uid, $type) { - $res = XDB::iterRow('SELECT data FROM requests WHERE user_id={?} and type={?}', $uid, $type); + $res = XDB::iterRow('SELECT data + FROM requests + WHERE uid = {?} and type = {?}', + $uid, $type); $array = array(); while (list($data) = $res->next()) { $array[] = Validate::unserialize($data); @@ -320,7 +335,10 @@ abstract class Validate */ static public function get_typed_requests_count($uid, $type) { - $res = XDB::query('SELECT COUNT(data) FROM requests WHERE user_id={?} and type={?}', $uid, $type); + $res = XDB::query('SELECT COUNT(data) + FROM requests + WHERE uid = {?} and type = {?}', + $uid, $type); return $res->fetchOneCell(); } diff --git a/modules/admin.php b/modules/admin.php index 6ce598e..5eb630a 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -855,11 +855,10 @@ class AdminModule extends PLModule $res = XDB::iterator( "SELECT a.alias AS homonyme, s.alias AS forlife, IF(h.homonyme_id = s.id, a.expire, NULL) AS expire, - IF(h.homonyme_id = s.id, a.type, NULL) AS type, - ac.uid AS user_id + IF(h.homonyme_id = s.id, a.type, NULL) AS type, ac.uid FROM aliases AS a - LEFT JOIN homonyms AS h ON (h.homonyme_id = a.uid) - INNER JOIN aliases AS s ON (s.uid = h.uid AND s.type='a_vie') + LEFT JOIN homonyms AS h ON (h.homonyme_id = a.uid) + INNER JOIN aliases AS s ON (s.uid = h.uid AND s.type = 'a_vie') INNER JOIN accounts AS ac ON (ac.uid = a.uid) WHERE a.type = 'homonyme' OR a.expire != '' ORDER BY a.alias, forlife"); @@ -867,7 +866,7 @@ class AdminModule extends PLModule while ($tab = $res->next()) { $hnymes[$tab['homonyme']][] = $tab; } - $page->assign_by_ref('hnymes',$hnymes); + $page->assign_by_ref('hnymes', $hnymes); } } diff --git a/modules/axletter.php b/modules/axletter.php index 206fe62..a664705 100644 --- a/modules/axletter.php +++ b/modules/axletter.php @@ -180,7 +180,7 @@ class AXLetterModule extends PLModule . "https://www.polytechnique.org/ax/edit\n" . "-- \n" . "Association Polytechnique.org\n"); - $users = User::getBulkUsersWithUIDs(XDB::fetchColumn('SELECT user_id + $users = User::getBulkUsersWithUIDs(XDB::fetchColumn('SELECT uid FROM axletter_rights')); foreach ($users as $user) { $mailer->addTo($user); @@ -315,13 +315,13 @@ class AXLetterModule extends PLModule } $page->changeTpl('axletter/admin.tpl'); - $page->assign('admins', User::getBulkUsersWithUIDs(XDB::fetchColumn('SELECT user_id + $page->assign('admins', User::getBulkUsersWithUIDs(XDB::fetchColumn('SELECT uid FROM axletter_rights'))); $importer = new CSVImporter('axletter_ins'); - $importer->registerFunction('user_id', 'email vers Id X.org', array($this, 'idFromMail')); + $importer->registerFunction('uid', 'email vers Id X.org', array($this, 'idFromMail')); $importer->forceValue('hash', array($this, 'createHash')); - $importer->apply($page, "admin/axletter", array('user_id', 'email', 'prenom', 'nom', 'promo', 'flag', 'hash')); + $importer->apply($page, "admin/axletter", array('uid', 'email', 'prenom', 'nom', 'promo', 'flag', 'hash')); } function idFromMail($line, $key, $relation = null) diff --git a/modules/email.php b/modules/email.php index 9a77979..0b46793 100644 --- a/modules/email.php +++ b/modules/email.php @@ -592,7 +592,10 @@ class EmailModule extends PLModule if (!empty($hash) || !empty($login)) { $user = User::getSilent($login); if ($user) { - $req = XDB::query("SELECT 1 FROM newsletter_ins WHERE user_id = {?} AND hash = {?}", $user->id(), $hash); + $req = XDB::query('SELECT 1 + FROM newsletter_ins + WHERE uid = {?} AND hash = {?}', + $user->id(), $hash); if ($req->numRows() == 0) { $user = null; } @@ -922,7 +925,7 @@ class EmailModule extends PLModule if ($x = $sel->fetchOneAssoc()) { if ($x['nb_mails'] == 0) { - register_profile_update($x['user_id'], 'broken'); + register_profile_update($x['uid'], 'broken'); } fputcsv($csv, array($x['fullname'], $x['promo'], $alias, join(',', $mails), $x['nb_mails'], diff --git a/modules/events/feed.inc.php b/modules/events/feed.inc.php index afa6396..9e1298c 100644 --- a/modules/events/feed.inc.php +++ b/modules/events/feed.inc.php @@ -53,7 +53,7 @@ class EventFeed extends PlFeed WHERE FIND_IN_SET("valide", e.flags) AND expiration >= NOW()'); $data = array(); while ($e = self::nextEvent($events, $user)) { - $author = User::getWithUID($e['user_id']); + $author = User::getWithUID($e['uid']); $promo = $author->promo(); $e['author'] = $author->fullName() . ($promo ? ' (' . $promo . ')' : ''); $e['link'] = $globals->baseurl . '/events#newsid' . $e['id']; diff --git a/modules/gadgets.php b/modules/gadgets.php index 188dc57..c7eb989 100644 --- a/modules/gadgets.php +++ b/modules/gadgets.php @@ -42,14 +42,14 @@ class GadgetsModule extends PLModule require_once 'gadgets/gadgets.inc.php'; init_igoogle_html('gadgets/ig-events.tpl', AUTH_COOKIE); - $events = XDB::iterator('SELECT SQL_CALC_FOUND_ROWS + $events = XDB::iterator("SELECT SQL_CALC_FOUND_ROWS e.id, e.titre, UNIX_TIMESTAMP(e.creation_date) AS creation_date, - IF(u.nom_usage = "", u.nom, u.nom_usage) AS nom, u.prenom, u.promo, - ev.user_id IS NULL AS nonlu, e.uid - FROM announces AS e + IF(u.nom_usage = '', u.nom, u.nom_usage) AS nom, u.prenom, u.promo, + ev.uid IS NULL AS nonlu, e.uid + FROM announces AS e LEFT JOIN announce_read AS ev ON (e.id = ev.evt_id AND ev.uid = {?}) - WHERE FIND_IN_SET("valide", e.flags) AND expiration >= NOW() - ORDER BY e.creation_date DESC', S::i('uid')); + WHERE FIND_IN_SET('valide', e.flags) AND expiration >= NOW() + ORDER BY e.creation_date DESC", S::i('uid')); $page->assign('event_count', XDB::query("SELECT FOUND_ROWS()")->fetchOneCell()); Platal::load('events', 'feed.inc.php'); diff --git a/modules/survey/survey.inc.php b/modules/survey/survey.inc.php index 5c6a109..6d8a410 100644 --- a/modules/survey/survey.inc.php +++ b/modules/survey/survey.inc.php @@ -190,7 +190,7 @@ class Survey $nbf = count($line); $users = array(); if ($this->isMode(self::MODE_XIDENT)) { // if the mode is non anonymous - $users = User::getBulkUsersWithUIDs(XDB::fetchAllAssoc('vid', 'SELECT v.id AS vid, v.user_id + $users = User::getBulkUsersWithUIDs(XDB::fetchAllAssoc('vid', 'SELECT v.id AS vid, v.uid FROM survey_votes AS v WHERE v.survey_id = {?} ORDER BY vid ASC', @@ -433,8 +433,8 @@ class Survey // {{{ functions vote() and hasVoted() : handles vote to a survey public function vote($uid, $args) { - XDB::execute('INSERT INTO survey_votes - SET survey_id={?}, user_id={?};', $this->id, $uid); // notes the user as having voted + XDB::execute('INSERT INTO survey_votes + SET survey_id = {?}, uid = {?};', $this->id, $uid); // notes the user as having voted $vid = XDB::insertId(); for ($i = 0; $i < count($this->questions); $i++) { $ans = $this->questions[$i]->checkAnswer($args[$i]); @@ -451,9 +451,9 @@ class Survey public function hasVoted($uid) { - $res = XDB::query('SELECT id - FROM survey_votes - WHERE survey_id={?} AND user_id={?};', $this->id, $uid); // checks whether the user has already voted + $res = XDB::query('SELECT id + FROM survey_votes + WHERE survey_id = {?} AND uid = {?};', $this->id, $uid); // checks whether the user has already voted return ($res->numRows() != 0); } // }}} diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 9b1fa04..b3da3d3 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -91,7 +91,7 @@ class XnetGrpModule extends PLModule AND r.announce_id IS NULL ORDER BY a.expiration", S::i('uid'), $globals->asso('id'), S::i('promo'), S::i('promo')); - $index = XDB::iterator("SELECT a.id, a.titre, r.user_id IS NULL AS nonlu + $index = XDB::iterator("SELECT a.id, a.titre, r.uid IS NULL AS nonlu FROM group_announces AS a LEFT JOIN group_announces_read AS r ON (a.id = r.announce_id AND r.uid = {?}) WHERE asso_id = {?} AND expiration >= CURRENT_DATE() @@ -810,7 +810,7 @@ class XnetGrpModule extends PLModule $page->trigError("Le login $login correspond a plusieurs camarades."); return false; } - $uid = $x[0]['user_id']; + $uid = $x[0]['uid']; $sub = false; } else { list($uid, $login) = $res->fetchOneRow(); diff --git a/templates/admin/user.tpl b/templates/admin/user.tpl index 6218663..fb7b8ad 100644 --- a/templates/admin/user.tpl +++ b/templates/admin/user.tpl @@ -25,8 +25,8 @@
{xsrf_token_field}
- - Confirmer la suppression de l'utilisateur {$smarty.request.user_id} ({$mr.prenom} {$mr.nom} - X{$mr.promo})   + + Confirmer la suppression de l'utilisateur {$smarty.request.uid} ({$mr.prenom} {$mr.nom} - X{$mr.promo})  
@@ -309,7 +309,7 @@ $(document).ready(function() { - + @@ -389,7 +389,7 @@ $(document).ready(function() { - + @@ -488,7 +488,7 @@ $(document).ready(function() { - + diff --git a/templates/gadgets/ig-events.tpl b/templates/gadgets/ig-events.tpl index 6437cf2..783e251 100644 --- a/templates/gadgets/ig-events.tpl +++ b/templates/gadgets/ig-events.tpl @@ -31,7 +31,7 @@ {/if} + title="Ajouté le {$ev.creation_date|date_format} par {profile user=$ev.uid link=false sex=false promo=true}"> {tidy} {$ev.titre|nl2br} {/tidy} diff --git a/templates/gadgets/ig-minifiche.tpl b/templates/gadgets/ig-minifiche.tpl index 6f2cabd..0ce6087 100644 --- a/templates/gadgets/ig-minifiche.tpl +++ b/templates/gadgets/ig-minifiche.tpl @@ -43,10 +43,10 @@ {if $smarty.session.auth ge AUTH_COOKIE} {if !$c.wasinscrit && !$c.dcd} {if $show_action eq ajouter} - {* + {* *}{icon name=add title="Ajouter à la liste de mes surveillances"} {else} - {* + {* *}{icon name=cross title="Retirer de la liste de mes surveillances"} {/if} {elseif $c.wasinscrit && !$c.dcd} diff --git a/templates/include/plview.trombi.tpl b/templates/include/plview.trombi.tpl index f4127d3..24c524c 100644 --- a/templates/include/plview.trombi.tpl +++ b/templates/include/plview.trombi.tpl @@ -34,7 +34,7 @@ [ PHOTO ] {if $trombi_with_admin && hasPerm('admin')} - {icon name=wrench title="[admin]"} + {icon name=wrench title="[admin]"} {/if} @@ -42,7 +42,7 @@ [ PHOTO ] {if $trombi_with_admin && hasPerm('admin')} - {icon name=wrench title="[admin]"} + {icon name=wrench title="[admin]"} {/if} @@ -51,7 +51,7 @@ [ PHOTO ] {if $trombi_with_admin && hasPerm('admin')} - {icon name=wrench title="[admin]"} + {icon name=wrench title="[admin]"} {/if} {/if} @@ -83,7 +83,7 @@ [ PHOTO ] {if $trombi_with_admin && hasPerm('admin')} - {icon name=wrench title="[admin]"} + {icon name=wrench title="[admin]"} {/if} diff --git a/templates/include/trombi.tpl b/templates/include/trombi.tpl index e73d6e0..e389a9d 100644 --- a/templates/include/trombi.tpl +++ b/templates/include/trombi.tpl @@ -32,7 +32,7 @@ [ PHOTO ] {if $trombi_admin && hasPerm('admin') && !$urlmainsite} - + {icon name=wrench title="[admin]"} {/if}
diff --git a/templates/lists/admin.tpl b/templates/lists/admin.tpl index cdf6326..df30d58 100644 --- a/templates/lists/admin.tpl +++ b/templates/lists/admin.tpl @@ -69,7 +69,7 @@ emails de marketing. Une fois inscrits à Polytechnique.org, l'inscription à la Camarade :
Action* : diff --git a/templates/xnetgrp/form.announce.tpl b/templates/xnetgrp/form.announce.tpl index ec87c99..1a5eccc 100644 --- a/templates/xnetgrp/form.announce.tpl +++ b/templates/xnetgrp/form.announce.tpl @@ -66,7 +66,7 @@
- Annonce proposée par {profile user=$art.user_id sex=false promo=true groupperms=false} + Annonce proposée par {profile user=$art.uid sex=false promo=true groupperms=false}
-- 2.1.4