X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=inline;f=plugins%2Ffunction.profile.php;h=516f019f2b48fe4f750fe517b552c26c76428988;hb=5ae3e9a9b7e095956904a2bedbc0845af88434f0;hp=340e9adccb049f41624269b022e188725ab34e3a;hpb=0073747ac81cc9cff9e43847eb008f0e815255f0;p=platal.git
diff --git a/plugins/function.profile.php b/plugins/function.profile.php
index 340e9ad..516f019 100644
--- a/plugins/function.profile.php
+++ b/plugins/function.profile.php
@@ -1,6 +1,6 @@
b('promo', false);
+ $with_promo = $params->b('promo', false) || $params->b('cat', false);
$with_sex = $params->b('sex', true);
$with_link = $params->b('link', true);
+ $with_dir = $params->b('directory', true);
$with_groupperms = $params->b('groupperms', true);
$user = $params->v('user');
if (is_int($user) || ctype_digit($user)) {
$user = User::getWithUID($user);
}
- $name = pl_entities($user->fullName());
+ if ($with_dir) {
+ $name = pl_entities($user->directoryName());
+ } else {
+ $name = pl_entities($user->fullName());
+ }
if ($with_sex && $user->isFemale()) {
$name = '•' . $name;
}
if ($with_promo) {
- $promo = $user->promo();
+ $promo = $user->category();
if ($promo) {
$name .= ' (' . pl_entities($promo) . ')';
}
@@ -47,7 +52,10 @@ function smarty_function_profile($params, &$smarty)
$name = '';
}
}
- if ($with_groupperms && $user instanceof User && $user->group_perms == 'admin') {
+ if ($user->lost) {
+ $name .= ' ';
+ }
+ if ($with_groupperms && $user instanceof User && $user->group_perms == 'admin' && !empty($name)) {
$name = '' . $name . '';
}
return $name;