X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fuser.php;h=eb112ca37f4effd17d6e48eccf3e03aa862bbd90;hb=8d6bf46f063e347e1102ef786ba0f83ffa2146a4;hp=a6da9bc88a509db1a4b9b493b0742b2b3febae77;hpb=a1cec8694f46c786d38564105711d78abc39c187;p=platal.git

diff --git a/classes/user.php b/classes/user.php
index a6da9bc..eb112ca 100644
--- a/classes/user.php
+++ b/classes/user.php
@@ -109,9 +109,10 @@ class User extends PlUser
     // Implementation of the data loader.
     protected function loadMainFields()
     {
-        if ($this->hruid !== null && $this->forlife !== null &&
-            $this->bestalias !== null && $this->display_name !== null &&
-            $this->full_name !== null && $this->promo !== null && $this->perms !== null) {
+        if ($this->hruid !== null && $this->forlife !== null
+            && $this->bestalias !== null && $this->display_name !== null
+            && $this->full_name !== null && $this->promo !== null && $this->perms !== null
+            && $this->gender !== null && $this->email_format !== null) {
             return;
         }
 
@@ -119,10 +120,13 @@ class User extends PlUser
         $res = XDB::query("SELECT  u.hruid, u.promo,
                                    CONCAT(af.alias, '@{$globals->mail->domain}') AS forlife,
                                    CONCAT(ab.alias, '@{$globals->mail->domain}') AS bestalias,
-                                   CONCAT(u.prenom, ' ', u.nom) AS full_name,
+                                   CONCAT(u.prenom, ' ', IF(u.nom_usage <> '', u.nom_usage, u.nom)) AS full_name,
                                    IF(u.prenom != '', u.prenom, u.nom) AS display_name,
+                                   FIND_IN_SET('femme', u.flags) AS gender,
+                                   q.core_mail_fmt AS email_format,
                                    u.perms
                              FROM  auth_user_md5 AS u
+                        LEFT JOIN  auth_user_quick AS q ON (q.user_id = u.user_id)
                         LEFT JOIN  aliases AS af ON (af.id = u.user_id AND af.type = 'a_vie')
                         LEFT JOIN  aliases AS ab ON (ab.id = u.user_id AND FIND_IN_SET('bestalias', ab.flags))
                             WHERE  u.user_id = {?}", $this->user_id);
@@ -131,6 +135,8 @@ class User extends PlUser
 
     // Specialization of the fillFromArray method, to implement hacks to enable
     // lazy loading of user's main properties from the session.
+    // TODO(vzanotti): remove the conversion hacks once the old codebase will
+    // stop being used actively.
     protected function fillFromArray(array $values)
     {
         // It might happen that the 'user_id' field is called uid in some places
@@ -151,6 +157,18 @@ class User extends PlUser
             }
         }
 
+        // We also need to convert the gender (usually named "femme"), and the
+        // email format parameter (valued "texte" instead of "text").
+        if (isset($values['femme'])) {
+            $values['gender'] = (bool) $values['femme'];
+        }
+        if (isset($values['mail_fmt'])) {
+            $values['email_format'] = $values['mail_fmt'];
+        }
+        if (isset($values['email_format'])) {
+            $values['email_format'] = ($values['email_format'] ? self::FORMAT_HTML : self::FORMAT_TEXT);
+        }
+
         parent::fillFromArray($values);
     }