X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.profile.php;h=f97016017b7b77b4d5a4a1dec16ef086cb9e052b;hb=e557b0dbd21096d0fdd5c18f62dab460d20c90c3;hp=77909bdbb5dedc9d52ea83c853ad096ae98cb444;hpb=ed92ea696e042eb9b2d0efcc4731fdf89fb17924;p=platal.git
diff --git a/plugins/function.profile.php b/plugins/function.profile.php
index 77909bd..f970160 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);
+ $raw = $params->b('raw', false);
$user = $params->v('user');
+ $profile = $params->v('profile');
+
if (is_int($user) || ctype_digit($user)) {
$user = User::getWithUID($user);
}
- $name = pl_entities($user->directoryName());
- if ($with_sex && $user->isFemale()) {
- $name = '•' . $name;
+ if ($with_dir) {
+ $name = pl_entities($user->directoryName());
+ } else {
+ $name = pl_entities($user->fullName());
}
if ($with_promo) {
- $promo = $user->promo();
+ $promo = $user->category();
if ($promo) {
$name .= ' (' . pl_entities($promo) . ')';
}
}
+ if ($raw) {
+ return $name;
+ }
+
+ if ($with_sex && $user->isFemale()) {
+ $name = '•' . $name;
+ }
if ($with_link) {
- $profile = ($user instanceof Profile) ? $user : $user->profile();
+ if (is_null($profile)) {
+ $profile = $user->profile();
+ }
+
if ($profile) {
$name = '';
}
}
- if ($user->lost) {
+ if ($profile && $profile->isDead()) {
+ $name .= ' †';
+ } else if ($user->lost) {
$name .= '
';
}
if ($with_groupperms && $user instanceof User && $user->group_perms == 'admin' && !empty($name)) {