X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fprofile.php;h=7af43e9d060723a1e7ac35279363c3bc35c974d1;hb=c52d86d1d876e6def108e1d458604cc9714c252d;hp=a848ca6791c8192f0b0416d4567358d8b13117e3;hpb=111b27363692fc4070acaebd1fb380572f512036;p=platal.git

diff --git a/classes/profile.php b/classes/profile.php
index a848ca6..7af43e9 100644
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2009 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -38,21 +38,23 @@ class Profile
             $from = 'profiles AS p';
             $where = XDB::format('p.hrpid = {?}', $login);
         }
-        $res = XDB::query('SELECT  p.*, pe.entry_year, pe.grad_year,
-                                   pns_f.name AS firstname, pns_l.name AS lastname, pns_n.name AS nickname,
-                                   IF(pns_uf.name IS NULL, pns_f.name, pns_uf.name) AS firstname_usual,
-                                   IF(pns_ul.name IS NULL, pns_l.name, pns_ul.name) AS lastname_usual,
+        $res = XDB::query('SELECT  p.*, p.sex = \'female\' AS sex, pe.entry_year, pe.grad_year,
+                                   pn_f.name AS firstname, pn_l.name AS lastname, pn_n.name AS nickname,
+                                   IF(pn_uf.name IS NULL, pn_f.name, pn_uf.name) AS firstname_usual,
+                                   IF(pn_ul.name IS NULL, pn_l.name, pn_ul.name) AS lastname_usual,
                                    pd.promo AS promo, pd.short_name, pd.directory_name AS full_name
                              FROM  ' . $from . '
                        INNER JOIN  profile_display AS pd ON (pd.pid = p.pid)
                        INNER JOIN  profile_education AS pe ON (pe.uid = p.pid AND FIND_IN_SET(\'primary\', pe.flags))
-                       INNER JOIN  profile_name_search AS pns_f ON (pns_f.pid = p.pid AND pns_f.typeid = ' . self::getNameTypeId('Nom patronymique', true) . ')
-                       INNER JOIN  profile_name_search AS pns_l ON (pns_l.pid = p.pid AND pns_l.typeid = ' . self::getNameTypeId('Prénom', true) . ')
-                        LEFT JOIN  profile_name_search AS pns_uf ON (pns_uf.pid = p.pid AND pns_uf.typeid = ' . self::getNameTypeId('Prénom usuel', true) . ')
-                        LEFT JOIN  profile_name_search AS pns_ul ON (pns_ul.pid = p.pid AND pns_ul.typeid = ' . self::getNameTypeId('Nom usuel', true) . ')
-                        LEFT JOIN  profile_name_search aS pns_n ON (pns_n.pid = p.pid AND pns_n.typeid = ' . self::getNameTypeId('Surnom', true) . ')
-                            WHERE  ' . $where);
+                       INNER JOIN  profile_name AS pn_f ON (pn_f.pid = p.pid AND pn_f.typeid = ' . self::getNameTypeId('lastname', true) . ')
+                       INNER JOIN  profile_name AS pn_l ON (pn_l.pid = p.pid AND pn_l.typeid = ' . self::getNameTypeId('firstname', true) . ')
+                        LEFT JOIN  profile_name AS pn_uf ON (pn_uf.pid = p.pid AND pn_uf.typeid = ' . self::getNameTypeId('lastname_ordinary', true) . ')
+                        LEFT JOIN  profile_name AS pn_ul ON (pn_ul.pid = p.pid AND pn_ul.typeid = ' . self::getNameTypeId('firstname_ordinary', true) . ')
+                        LEFT JOIN  profile_name aS pn_n ON (pn_n.pid = p.pid AND pn_n.typeid = ' . self::getNameTypeId('nickname', true) . ')
+                            WHERE  ' . $where . '
+                         GROUP BY  p.pid');
         if ($res->numRows() != 1) {
+            __autoload('PlUser');
             throw new UserNotFoundException();
         }
         $this->data = $res->fetchOneAssoc();
@@ -110,12 +112,12 @@ class Profile
 
     public function firstName()
     {
-        return $this->first_name;
+        return $this->firstname;
     }
 
     public function lastName()
     {
-        return $this->last_name;
+        return $this->lastname;
     }
 
     public function isFemale()
@@ -162,9 +164,11 @@ class Profile
         } catch (UserNotFoundException $e) {
             /* Let say we can identify a profile using the identifiers of its owner.
              */
-            $user = User::getSilent($login);
-            if ($user && $user->hasProfile()) {
-                return $user->profile();
+            if (!($login instanceof PlUser)) {
+                $user = User::getSilent($login);
+                if ($user && $user->hasProfile()) {
+                    return $user->profile();
+                }
             }
             return null;
         }
@@ -173,8 +177,8 @@ class Profile
     public static function getNameTypeId($type, $for_sql = false)
     {
         if (!S::has('name_types')) {
-            $table = XDB::fetchAllAssoc('name', 'SELECT  id, name
-                                                   FROM  profile_name_search_enum');
+            $table = XDB::fetchAllAssoc('type', 'SELECT  id, type
+                                                   FROM  profile_name_enum');
             S::set('name_types', $table);
         } else {
             $table = S::v('name_types');