X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fprofile.php;h=53d91009079eb8da4c965e4ca36959cedbd50ff8;hb=b270577e919c58455a3629a4d9d61bd38ea49e11;hp=96cc71e14ecc67484a54c0454d4a6e6c2f320963;hpb=564e2b2ae7ed134190d60ebc4447f476c4b024dd;p=platal.git

diff --git a/classes/profile.php b/classes/profile.php
index 96cc71e..53d9100 100644
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -195,6 +195,29 @@ class Profile
         return intval(substr($this->promo, 1, 4));
     }
 
+    public function mainEducation()
+    {
+        if (empty($this->promo)) {
+            return null;
+        } else {
+            return $this->promo{0};
+        }
+    }
+
+    public function mainEducationDuration()
+    {
+        switch ($this->mainEducation()) {
+          case 'X':
+            return 3;
+          case 'M':
+            return 2;
+          case 'D':
+            return 3;
+          default:
+            return 0;
+        }
+    }
+
     /** Print a name with the given formatting:
      * %s = • for women
      * %f = firstname
@@ -428,7 +451,10 @@ class Profile
     public function getAddresses($flags, $limit = null)
     {
         if ($this->addresses == null  && !$this->fetched(self::FETCH_ADDRESSES)) {
-            $this->setAddresses($this->getProfileField(self::FETCH_ADDRESSES));
+            $addr = $this->getProfileField(self::FETCH_ADDRESSES);
+            if ($addr) {
+                $this->setAddresses($addr);
+            }
         }
 
         if ($this->addresses == null) {
@@ -525,7 +551,10 @@ class Profile
     public function getNetworking($flags, $limit = null)
     {
         if ($this->networks == null && !$this->fetched(self::FETCH_NETWORKING)) {
-            $this->setNetworking($this->getProfileField(self::FETCH_NETWORKING));
+            $nw = $this->getProfileField(self::FETCH_NETWORKING);
+            if ($nw) {
+                $this->setNetworking($nw);
+            }
         }
         if ($this->networks == null) {
             return array();
@@ -540,7 +569,7 @@ class Profile
             return null;
         }
         $site = array_pop($site);
-        return $site['address'];
+        return $site;
     }
 
 
@@ -556,7 +585,10 @@ class Profile
     public function getJobs($flags, $limit = null)
     {
         if ($this->jobs == null && !$this->fetched(self::FETCH_JOBS)) {
-            $this->setJobs($this->getProfileField(self::FETCH_JOBS));
+            $jobs = $this->getProfileField(self::FETCH_JOBS);
+            if ($jobs) {
+                $this->setJobs($jobs);
+            }
         }
 
         if ($this->jobs == null) {
@@ -618,16 +650,24 @@ class Profile
      */
     public function getBinets()
     {
-        return XDB::fetchColumn('SELECT  binet_id
-                                   FROM  profile_binets
-                                  WHERE  pid = {?}', $this->id());
+        if ($this->visibility->isVisible(ProfileVisibility::VIS_PRIVATE)) {
+            return XDB::fetchColumn('SELECT  binet_id
+                                       FROM  profile_binets
+                                      WHERE  pid = {?}', $this->id());
+        } else {
+            return array();
+        }
     }
     public function getBinetsNames()
     {
-        return XDB::fetchColumn('SELECT  text
-                                   FROM  profile_binets AS pb
-                              LEFT JOIN  profile_binet_enum AS pbe ON (pbe.id = pb.binet_id)
-                                  WHERE  pb.pid = {?}', $this->id());
+        if ($this->visibility->isVisible(ProfileVisibility::VIS_PRIVATE)) {
+            return XDB::fetchColumn('SELECT  text
+                                       FROM  profile_binets AS pb
+                                  LEFT JOIN  profile_binet_enum AS pbe ON (pbe.id = pb.binet_id)
+                                      WHERE  pb.pid = {?}', $this->id());
+        } else {
+            return array();
+        }
     }
 
     /* Medals
@@ -682,7 +722,13 @@ class Profile
 
         $visibility = new ProfileVisibility($visibility);
 
-        $it = XDB::Iterator('SELECT  p.*, p.sex = \'female\' AS sex, pe.entry_year, pe.grad_year, pse.text AS section,
+        $it = XDB::Iterator('SELECT  p.pid, p.hrpid, p.xorg_id, p.ax_id, p.birthdate, p.birthdate_ref,
+                                     p.next_birthday, p.deathdate, p.deathdate_rec, p.sex = \'female\' AS sex,
+                                     p.cv, p.medals_pub, p.alias_pub, p.email_directory, p.last_change,
+                                     p.nationality1, p.nationality2, p.nationality3,
+                                     IF (p.freetext_pub IN {?}, p.freetext, NULL) AS freetext,
+                                     pe.entry_year, pe.grad_year,
+                                     IF ({?} IN {?}, pse.text, NULL) AS section,
                                      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_ordinary,
                                      IF(pn_ul.name IS NULL, pn_l.name, pn_ul.name) AS lastname_ordinary,
@@ -711,9 +757,14 @@ class Profile
                           LEFT JOIN  profile_photos AS ph ON (ph.pid = p.pid)
                           LEFT JOIN  profile_mentor AS pm ON (pm.pid = p.pid)
                           LEFT JOIN  account_profiles AS ap ON (ap.pid = p.pid AND FIND_IN_SET(\'owner\', ap.perms))
-                              WHERE  p.pid IN ' . XDB::formatArray($pids) . '
+                              WHERE  p.pid IN {?}
                            GROUP BY  p.pid
-                                  ' . $order, $visibility->levels(), $visibility->levels());
+                                     ' . $order,
+                           $visibility->levels(),
+                           ProfileVisibility::VIS_PRIVATE, $visibility->levels(),
+                           $visibility->levels(), $visibility->levels(),
+                           $pids
+                       );
         return new ProfileIterator($it, $pids, $fields, $visibility);
     }