X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fprofile.php;h=fec4cfc64af6da761eedfc64cefd110fb5bb5457;hb=34de4b2043533a45ae47ba9a2a0d73c9a2ff2f89;hp=4b0f30f3c16f0aefae46109ba42027fa6c3b499b;hpb=ddbebe4c0ce0da3d659050707559a02757aeaeee;p=platal.git

diff --git a/classes/profile.php b/classes/profile.php
index 4b0f30f..fec4cfc 100644
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -111,27 +111,40 @@ class Profile
             self::FIRSTNAME => array(self::VN_ORDINARY, self::VN_INI, self::VN_OTHER)
         );
 
-    const ADDRESS_MAIN       = 0x000001;
-    const ADDRESS_PERSO      = 0x000002;
-    const ADDRESS_PRO        = 0x000004;
-    const ADDRESS_ALL        = 0x000006;
-    const ADDRESS_POSTAL     = 0x000008;
-
-    const EDUCATION_MAIN     = 0x000010;
-    const EDUCATION_EXTRA    = 0x000020;
-    const EDUCATION_ALL      = 0x000040;
-    const EDUCATION_FINISHED = 0x000080;
-    const EDUCATION_CURRENT  = 0x000100;
-
-    const JOBS_MAIN          = 0x001000;
-    const JOBS_ALL           = 0x002000;
-    const JOBS_FINISHED      = 0x004000;
-    const JOBS_CURRENT       = 0x008000;
-
-    const NETWORKING_ALL     = 0x000000;
-    const NETWORKING_WEB     = 0x010000;
-    const NETWORKING_IM      = 0x020000;
-    const NETWORKING_SOCIAL  = 0x040000;
+    const ADDRESS_MAIN       = 0x00000001;
+    const ADDRESS_PERSO      = 0x00000002;
+    const ADDRESS_PRO        = 0x00000004;
+    const ADDRESS_ALL        = 0x00000006;
+    const ADDRESS_POSTAL     = 0x00000008;
+
+    const EDUCATION_MAIN     = 0x00000010;
+    const EDUCATION_EXTRA    = 0x00000020;
+    const EDUCATION_ALL      = 0x00000040;
+    const EDUCATION_FINISHED = 0x00000080;
+    const EDUCATION_CURRENT  = 0x00000100;
+
+    const JOBS_MAIN          = 0x00001000;
+    const JOBS_ALL           = 0x00002000;
+    const JOBS_FINISHED      = 0x00004000;
+    const JOBS_CURRENT       = 0x00008000;
+
+    const NETWORKING_ALL     = 0x00070000;
+    const NETWORKING_WEB     = 0x00010000;
+    const NETWORKING_IM      = 0x00020000;
+    const NETWORKING_SOCIAL  = 0x00040000;
+
+    const PHONE_LINK_JOB     = 0x00100000;
+    const PHONE_LINK_ADDRESS = 0x00200000;
+    const PHONE_LINK_PROFILE = 0x00400000;
+    const PHONE_LINK_COMPANY = 0x00800000;
+    const PHONE_LINK_ANY     = 0x00F00000;
+
+    const PHONE_TYPE_FAX     = 0x01000000;
+    const PHONE_TYPE_FIXED   = 0x02000000;
+    const PHONE_TYPE_MOBILE  = 0x04000000;
+    const PHONE_TYPE_ANY     = 0x07000000;
+
+    const PHONE_ANY          = 0x07F00000;
 
     const FETCH_ADDRESSES      = 0x000001;
     const FETCH_CORPS          = 0x000002;
@@ -195,6 +208,25 @@ class Profile
         return intval(substr($this->promo, 1, 4));
     }
 
+    /** Check if user is an orange (associated with several promos)
+     */
+    public function isMultiPromo()
+    {
+        return $this->grad_year != $this->entry_year + $this->mainEducationDuration();
+    }
+
+    /** Returns an array with all associated promo years.
+     */
+    public function yearspromo()
+    {
+        $promos = array();
+        $d = -$this->deltaPromoToGradYear();
+        for ($g = $this->entry_year + $this->mainEducationDuration(); $g <= $this->grad_year; ++$g) {
+            $promos[] = $g + $d;
+        }
+        return $promos;
+    }
+
     public function mainEducation()
     {
         if (empty($this->promo)) {
@@ -232,6 +264,18 @@ class Profile
         }
     }
 
+    /** Number of years between the promotion year until the
+     * graduation year. In standard schools it's 0, but for
+     * Polytechnique the promo year is the entry year.
+     */
+    public function deltaPromoToGradYear()
+    {
+        if ($this->mainEducation() == 'X') {
+            return $this->mainEducationDuration();
+        }
+        return 0;
+    }
+
     /** Print a name with the given formatting:
      * %s = • for women
      * %f = firstname
@@ -735,7 +779,7 @@ class Profile
     private static function fetchProfileData(array $pids, $respect_order = true, $fields = 0x0000, $visibility = null)
     {
         if (count($pids) == 0) {
-            return array();
+            return null;
         }
 
         if ($respect_order) {
@@ -756,7 +800,7 @@ class Profile
                                      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,
-                                     pd.promo AS promo, pd.short_name, pd.directory_name AS full_name,
+                                     pd.yourself, pd.promo, pd.short_name, pd.directory_name AS full_name,
                                      pd.directory_name, IF(pp.pub IN {?}, pp.display_tel, NULL) AS mobile,
                                      (ph.pub IN {?} AND ph.attach IS NOT NULL) AS has_photo,
                                      ph.x AS photo_width, ph.y AS photo_height,