Kill calls to auth_user... in module profile.

[platal.git] / classes / profile.php

diff --git a/classes/profile.php b/classes/profile.php
index 0f1a796..7af43e9 100644 (file)
--- 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,7 +38,7 @@ class Profile
             $from = 'profiles AS p';
             $where = XDB::format('p.hrpid = {?}', $login);
         }
-        $res = XDB::query('SELECT  p.*, pe.entry_year, pe.grad_year,
+        $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,
@@ -51,7 +51,8 @@ class Profile
                         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);
+                            WHERE  ' . $where . '
+                         GROUP BY  p.pid');
         if ($res->numRows() != 1) {
             __autoload('PlUser');
             throw new UserNotFoundException();
@@ -111,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()