X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.profile.php;h=abfb165f2565eb6a078dfce4b4b4f7634eda8d2a;hb=fd58ac2072e83c7c8ebbe740290288a78bb599aa;hp=77909bdbb5dedc9d52ea83c853ad096ae98cb444;hpb=ba879af870d71163785c12ae4f4e7a070c6e614e;p=platal.git

diff --git a/plugins/function.profile.php b/plugins/function.profile.php
index 77909bd..abfb165 100644
--- a/plugins/function.profile.php
+++ b/plugins/function.profile.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -19,28 +19,38 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-function smarty_function_profile($params, &$smarty)
+function smarty_function_profile($params, $smarty)
 {
     $params = new PlDict($params);
-    $with_promo = $params->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');
     if (is_int($user) || ctype_digit($user)) {
         $user = User::getWithUID($user);
     }
 
-    $name = pl_entities($user->directoryName());
-    if ($with_sex && $user->isFemale()) {
-        $name = '&bull;' . $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 = '&bull;' . $name;
+    }
     if ($with_link) {
         $profile = ($user instanceof Profile) ? $user : $user->profile();
         if ($profile) {