From 1b40806492dea3d3d13bf3f0a1c0c038a96d0b5a Mon Sep 17 00:00:00 2001 From: Pascal Corpet Date: Fri, 4 Apr 2008 15:02:49 +0200 Subject: [PATCH] change welcome message and use 'yourself' name --- include/xorg/session.inc.php | 7 +++++-- templates/events/index.tpl | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/xorg/session.inc.php b/include/xorg/session.inc.php index 62f5d30..70821f1 100644 --- a/include/xorg/session.inc.php +++ b/include/xorg/session.inc.php @@ -239,15 +239,18 @@ function try_cookie() function start_connexion ($uid, $identified) { $res = XDB::query(" - SELECT u.user_id AS uid, prenom, prenom_ini, nom, nom_ini, nom_usage, perms, promo, promo_sortie, + SELECT u.user_id AS uid, nom_usage, perms, promo, promo_sortie, matricule, password, FIND_IN_SET('femme', u.flags) AS femme, a.alias AS forlife, a2.alias AS bestalias, q.core_mail_fmt AS mail_fmt, UNIX_TIMESTAMP(q.banana_last) AS banana_last, q.watch_last, q.core_rss_hash, - FIND_IN_SET('watch', u.flags) AS watch_account, q.last_version + FIND_IN_SET('watch', u.flags) AS watch_account, q.last_version, + nd.display AS display_name, nd.yourself AS yourself_name, + nd.first_name AS prenom, nd.last_name AS nom FROM auth_user_md5 AS u INNER JOIN auth_user_quick AS q USING(user_id) INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type='a_vie') INNER JOIN aliases AS a2 ON (u.user_id = a2.id AND FIND_IN_SET('bestalias',a2.flags)) + INNER JOIN profile_names_display AS nd ON (u.user_id = nd.user_id) WHERE u.user_id = {?} AND u.perms IN('admin','user')", $uid); $sess = $res->fetchOneAssoc(); $res = XDB::query("SELECT UNIX_TIMESTAMP(s.start) AS lastlogin, s.host diff --git a/templates/events/index.tpl b/templates/events/index.tpl index 9ecbe18..3f63968 100644 --- a/templates/events/index.tpl +++ b/templates/events/index.tpl @@ -27,7 +27,7 @@ {else}

-Bienvenue {$smarty.session.prenom}{if $birthday} +Bienvenue {$smarty.session.yourself_name}{if $birthday}  et joyeux anniversaire de la part de toute l'équipe ! {else}, {/if} -- 2.1.4