X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fuser.php;h=7afd1a0a981920d45bb847ff6909bdde55a6a742;hb=a959b199b8f4790bf311c4e9c4b96b4ffb494eeb;hp=8b9e1418c23df78404909ef44aeed795fd3444ca;hpb=ced003168bf3b75a29313c727fe28d65cb03057c;p=platal.git

diff --git a/classes/user.php b/classes/user.php
index 8b9e141..7afd1a0 100644
--- a/classes/user.php
+++ b/classes/user.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -21,11 +21,23 @@
 
 class User extends PlUser
 {
+    // Additional fields (non core)
+    protected $promo = null;
+
+    public function promo()
+    {
+        return $this->promo;
+    }
+
     // Implementation of the login to uid method.
     protected function getLogin($login)
     {
         global $globals;
 
+        if (!$login) {
+            throw new UserNotFoundException();
+        }
+
         // If $data is an integer, fetches directly the result.
         if (is_numeric($login)) {
             $res = XDB::query("SELECT user_id FROM auth_user_md5 WHERE user_id = {?}", $login);
@@ -212,7 +224,7 @@ class User extends PlUser
     public static function _default_user_callback($login, $results)
     {
         $result_count = count($results);
-        if ($result_count == 0 || !S::has_perms()) {
+        if ($result_count == 0 || !S::admin()) {
             Platal::page()->trigError("Il n'y a pas d'utilisateur avec l'identifiant : $login");
         } else {
             Platal::page()->trigError("Il y a $result_count utilisateurs avec cet identifiant : " . join(', ', $results));