X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fpluser.php;h=746ec593a955126cd819a8111994c0a2d58339a6;hb=88541046480799a8d92eba186f22e22c0c64efb0;hp=ef9c58fdd5985aa615bd6c43bd0efbb78996c980;hpb=fed2b6d36f59c4542bd8d6fc0a137342c785d06b;p=platal.git diff --git a/classes/pluser.php b/classes/pluser.php index ef9c58f..746ec59 100644 --- a/classes/pluser.php +++ b/classes/pluser.php @@ -1,6 +1,6 @@ !"), while full name is the official full name. protected $display_name = null; protected $full_name = null; - protected $promo = null; // Other important parameters used when sending emails. protected $gender = null; // Acceptable values are GENDER_MALE and GENDER_FEMALE @@ -92,8 +107,8 @@ abstract class PlUser // If the user id was not part of the known values, determines it from // the login. - if (!$this->user_id) { - $this->user_id = $this->getLogin($login); + if (!$this->uid) { + $this->uid = $this->getLogin($login); } // Preloads main properties (assumes the loader will lazily get them @@ -123,7 +138,7 @@ abstract class PlUser */ public function id() { - return $this->user_id; + return $this->uid; } public function login() @@ -131,13 +146,30 @@ abstract class PlUser return $this->hruid; } + public function isMe($other) + { + if (!$other) { + return false; + } else if ($other instanceof PlUser) { + return $other->id() == $this->id(); + } else { + return false; + } + } + public function bestEmail() { - return $this->bestalias; + if (!empty($this->bestalias)) { + return $this->bestalias; + } + return $this->email; } public function forlifeEmail() { - return $this->forlife; + if (!empty($this->forlife)) { + return $this->forlife; + } + return $this->email; } public function displayName() @@ -149,11 +181,6 @@ abstract class PlUser return $this->full_name; } - public function promo() - { - return $this->promo; - } - abstract public function password(); // Fallback value is GENDER_MALE. @@ -195,6 +222,15 @@ abstract class PlUser return property_exists($this, $name) || isset($this->data[$name]); } + public function __unset($name) + { + if (property_exists($this, $name)) { + $this->$name = null; + } else { + unset($this->data[$name]); + } + } + /** * Fills the object properties using the @p associative array; the intended * user case is to fill the object using SQL obtained arrays. @@ -275,7 +311,7 @@ abstract class PlUser public static function getWithUID($uid, $callback = false) { - return User::getWithValues(null, array('user_id' => $uid), $callback); + return User::getWithValues(null, array('uid' => $uid), $callback); } // Same as above, but using the silent callback as default. @@ -291,7 +327,7 @@ abstract class PlUser public static function getSilentWithUID($uid) { - return User::getWithValues($uid, array('User', '_silent_user_callback')); + return User::getWithValues(null, array('uid' => $uid), array('User', '_silent_user_callback')); } /** @@ -314,7 +350,7 @@ abstract class PlUser if (strlen(trim($logins)) == 0) { return null; } - $logins = split("[; ,\r\n\|]+", $logins); + $logins = preg_split("/[; ,\r\n\|]+/", $logins); } if ($logins) { @@ -327,7 +363,7 @@ abstract class PlUser if (($user = User::get($login, $callback))) { $list[$i] = $user->$property(); - } else if (!$strict || User::isForeignEmailAddress($login)) { + } else if (!$strict || (User::isForeignEmailAddress($login) && isvalid_email($login))) { $list[$i] = $login; } } @@ -365,13 +401,57 @@ abstract class PlUser return; } - abstract public static function _default_user_callback($login, $results); + private static function stripBadChars($text) + { + return str_replace(array(' ', "'"), array('-', ''), + strtolower(stripslashes(replace_accent(trim($text))))); + } + + /** Creates a username from a first and last name + * @param $firstname User's firstname + * @param $lasttname User's lastname + * return STRING the corresponding username + */ + public static function makeUserName($firstname, $lastname) + { + return self::stripBadChars($firstname) . '.' . self::stripBadChars($lastname); + } /** - * Determines if the @p login is an email address, and an email address not - * served locally by plat/al. + * Creates a user forlive identifier from: + * @param $firstname User's firstname + * @param $lasttname User's lastname + * @param $category User's promotion or type of account + */ + public static function makeHrid($firstname, $lastname, $category) + { + $cat = self::stripBadChars($category); + if (!cat) { + Platal::page()->kill("$category is not a suitable category."); + } + + return self::makeUserName($firstname, $lastname) . '.' . $cat; + } + + /** Reformats the firstname so that all letters are in lower case, + * except the first letter of each part of the name. */ - abstract public static function isForeignEmailAddress($email); + public static function fixFirstnameCase($firstname) + { + $firstname = strtolower($firstname); + $pieces = explode('-', $firstname); + + foreach ($pieces as $piece) { + $subpieces = explode("'", $piece); + $usubpieces = ''; + + foreach ($subpieces as $subpiece) { + $usubpieces[] = ucwords($subpiece); + } + $upieces[] = implode("'", $usubpieces); + } + return implode('-', $upieces); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: