Replace sectors by job terms in profile and search (job and mentoring).
[platal.git] / classes / profile.php
index a09f3eb..a747063 100644 (file)
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class Profile
+class ProfileVisibility
 {
-    static private $v_values = array('public'  => array('public'),
-                                     'ax'      => array('ax', 'public'),
-                                     'private' => array('private', 'ax', 'public'));
+    static private $v_values = array(self::VIS_PUBLIC  => array(self::VIS_PUBLIC),
+                                     self::VIS_AX      => array(self::VIS_AX, self::VIS_PUBLIC),
+                                     self::VIS_PRIVATE => array(self::VIS_PRIVATE, self::VIS_AX, self::VIS_PUBLIC));
+
+    const VIS_PUBLIC  = 'public';
+    const VIS_AX      = 'ax';
+    const VIS_PRIVATE = 'private';
+
+    private $level;
+
+    public function __construct($level = null)
+    {
+        $this->setLevel($level);
+    }
+
+    public function setLevel($level = self::VIS_PUBLIC)
+    {
+        if ($level != null && $level != self::VIS_PRIVATE && $level != self::VIS_AX && $level != self::VIS_PUBLIC) {
+            Platal::page()->kill("Invalid visibility: " . $level);
+        }
+
+        if (!S::logged()) {
+            $level = self::VIS_PUBLIC;
+        } else if ($level == null) {
+            $level = self::VIS_PRIVATE;
+        }
+
+        if ($this->level == null || $this->level == self::VIS_PRIVATE) {
+            $this->level = $level;
+        } else if ($this->level == self::VIS_AX && $level == self::VIS_PRIVATE) {
+            return;
+        } else {
+            $this->level = self::VIS_PUBLIC;
+        }
+    }
 
-    const VISIBILITY_PUBLIC  = 'public';
-    const VISIBILITY_AX      = 'ax';
-    const VISIBILITY_PRIVATE = 'private';
+    public function level()
+    {
+        if ($this->level == null) {
+            return self::VIS_PUBLIC;
+        } else {
+            return $this->level;
+        }
+    }
+
+    public function levels()
+    {
+        return self::$v_values[$this->level()];
+    }
+
+    public function isVisible($visibility)
+    {
+        return in_array($visibility, $this->levels());
+    }
+}
+
+class Profile
+{
 
     /* name tokens */
     const LASTNAME  = 'lastname';
@@ -60,111 +111,179 @@ 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 FETCH_ADDRESSES    = 0x000001;
-    const FETCH_CORPS        = 0x000002;
-    const FETCH_EDU          = 0x000004;
-    const FETCH_JOBS         = 0x000008;
-    const FETCH_MEDALS       = 0x000010;
-    const FETCH_NETWORKING   = 0x000020;
-    const FETCH_PHONES       = 0x000040;
-    const FETCH_PHOTO        = 0x000080;
-
-    // xor of all FETCH_XYZ
-    const FETCH_ALL          = 0x0000FF;
+    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;
+    const FETCH_EDU            = 0x000004;
+    const FETCH_JOBS           = 0x000008;
+    const FETCH_MEDALS         = 0x000010;
+    const FETCH_NETWORKING     = 0x000020;
+    const FETCH_MENTOR_SECTOR  = 0x000040;
+    const FETCH_MENTOR_COUNTRY = 0x000080;
+    const FETCH_PHONES         = 0x000100;
+    const FETCH_JOB_TERMS      = 0x000200;
+    const FETCH_MENTOR_TERMS   = 0x000400;
+
+    const FETCH_MINIFICHES   = 0x00012D; // FETCH_ADDRESSES | FETCH_EDU | FETCH_JOBS | FETCH_NETWORKING | FETCH_PHONES
+
+    const FETCH_ALL          = 0x0007FF; // OR of FETCH_*
+
+    private $fetched_fields  = 0x000000;
 
     private $pid;
     private $hrpid;
+    private $owner;
+    private $owner_fetched = false;
     private $data = array();
 
     private $visibility = null;
 
+
     private function __construct(array $data)
     {
         $this->data = $data;
         $this->pid = $this->data['pid'];
         $this->hrpid = $this->data['hrpid'];
-        if (!S::logged()) {
-            $this->setVisibilityLevel(self::VISIBILITY_PUBLIC);
-        } else {
-            $this->setVisibilityLevel(self::VISIBILITY_PRIVATE);
-        }
+        $this->visibility = new ProfileVisibility();
     }
 
-    static private $contexts = array();
-
-    /** Returns the best visibility context toward $visibility
-     * @param $visibility A wished visibility level
-     * @return An array of compatible visibilities
-     *
-     * if $visibility is null, the best visibility is returned
-     */
-    static public function getVisibilityContext($visibility = null)
+    public function id()
     {
-        if (array_key_exists($visibility, self::$contexts)) {
-            return self::$contexts[$visibility];
-        }
+        return $this->pid;
+    }
 
-        $asked_vis = $visibility;
+    public function hrid()
+    {
+        return $this->hrpid;
+    }
 
-        if (S::logged()) {
-            $minvis = self::VISIBILITY_PRIVATE;
-        } else {
-            $minvis = self::VISIBILITY_PUBLIC;
-        }
-        if ($visibility == null) {
-            $visibility = $minvis;
+    public function owner()
+    {
+        if ($this->owner == null && !$this->owner_fetched) {
+            $this->owner_fetched = true;
+            $this->owner = User::getSilent($this);
         }
+        return $this->owner;
+    }
 
-        if ($minvis == self::VISIBILITY_PUBLIC) {
-            $visibility = self::VISIBILITY_PUBLIC;
+    public function isActive()
+    {
+        if ($this->owner()) {
+            return $this->owner->isActive();
         }
+        return false;
+    }
 
-        $visibility = self::$v_values[$visibility];
-        self::$contexts[$asked_vis] = $visibility;
+    public function promo()
+    {
+        return $this->promo;
+    }
 
-        return $visibility;
+    public function yearpromo()
+    {
+        return intval(substr($this->promo, 1, 4));
     }
 
-    public function id()
+    /** Check if user is an orange (associated with several promos)
+     */
+    public function isMultiPromo()
     {
-        return $this->pid;
+        return $this->grad_year != $this->entry_year + $this->mainEducationDuration();
     }
 
-    public function hrid()
+    /** Returns an array with all associated promo years.
+     */
+    public function yearspromo()
     {
-        return $this->hrpid;
+        $promos = array();
+        $d = -$this->deltaPromoToGradYear();
+        for ($g = $this->entry_year + $this->mainEducationDuration(); $g <= $this->grad_year; ++$g) {
+            $promos[] = $g + $d;
+        }
+        return $promos;
     }
 
-    public function promo()
+    public function mainEducation()
     {
-        return $this->promo;
+        if (empty($this->promo)) {
+            return null;
+        } else {
+            return $this->promo{0};
+        }
     }
 
-    public function yearpromo()
+    public function mainGrade()
     {
-        return intval(substr($this->promo, 1, 4));
+        switch ($this->mainEducation()) {
+          case 'X':
+            return UserFilter::GRADE_ING;
+          case 'M':
+            return UserFilter::GRADE_MST;
+          case 'D':
+            return UserFilter::GRADE_PHD;
+          default:
+            return null;
+        }
+    }
+
+    public function mainEducationDuration()
+    {
+        switch ($this->mainEducation()) {
+          case 'X':
+            return 3;
+          case 'M':
+            return 2;
+          case 'D':
+            return 3;
+          default:
+            return 0;
+        }
+    }
+
+    /** 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:
@@ -230,6 +349,16 @@ class Profile
         return ($this->deathdate != null);
     }
 
+    public function displayEmail()
+    {
+        $o = $this->owner();
+        if ($o != null) {
+            return $o->bestEmail();
+        } else {
+            return $this->email_directory;
+        }
+    }
+
     public function data()
     {
         $this->first_name;
@@ -252,14 +381,15 @@ class Profile
     public function nationalities()
     {
         $nats = array();
+        $countries = DirEnum::getOptions(DirEnum::COUNTRIES);
         if ($this->nationality1) {
-            $nats[] = $this->nationality1;
+            $nats[$this->nationality1] = $countries[$this->nationality1];
         }
         if ($this->nationality2) {
-            $nats[] = $this->nationality2;
+            $nats[$this->nationality2] = $countries[$this->nationality2];
         }
         if ($this->nationality3) {
-            $nats[] = $this->nationality3;
+            $nats[$this->nationality3] = $countries[$this->nationality3];
         }
         return $nats;
     }
@@ -282,21 +412,53 @@ class Profile
         return property_exists($this, $name) || isset($this->data[$name]);
     }
 
+    public function __unset($name)
+    {
+        if (property_exists($this, $name)) {
+            $this->$name = null;
+        } else {
+            unset($this->data[$name]);
+        }
+    }
+
+
+    /**
+     * Clears a profile.
+     *  *always deletes in: profile_addresses, profile_binets, profile_job,
+     *      profile_langskills, profile_mentor, profile_networking,
+     *      profile_phones, profile_skills, watch_profile
+     *  *always keeps in: profile_corps, profile_display, profile_education,
+     *      profile_medals, profile_name, profile_photos, search_name
+     *  *modifies: profiles
+     */
+    public function clear()
+    {
+        $tables = array(
+            'profile_job', 'profile_langskills', 'profile_mentor',
+            'profile_networking', 'profile_skills', 'watch_profile',
+            'profile_phones', 'profile_addresses', 'profile_binets');
+
+        foreach ($tables as $t) {
+            XDB::execute('DELETE FROM  ' . $t . '
+                                WHERE  pid = {?}',
+                                $this->id());
+        }
+
+        XDB::execute("UPDATE  profiles
+                         SET  cv = NULL, freetext = NULL, freetext_pub = 'private',
+                              medals_pub = 'private', alias_pub = 'private',
+                              email_directory = NULL
+                       WHERE  pid = {?}",
+                     $this->id());
+    }
+
     /** Sets the level of visibility of the profile
      * Sets $this->visibility to a list of valid visibilities.
-     * @param one of the self::VISIBILITY_* values
+     * @param one of the self::VIS_* values
      */
     public function setVisibilityLevel($visibility)
     {
-        if ($visibility != self::VISIBILITY_PRIVATE
-         && $visibility != self::VISIBILITY_AX
-         && $visibility != self::VISIBILITY_PUBLIC) {
-            Platal::page()->kill("Visibility invalide: " . $visibility);
-        }
-        $this->visibility = self::$v_values[$visibility];
-        if ($this->mobile && !in_array($this->mobile_pub, $this->visibility)) {
-            unset($this->data['mobile']);
-        }
+        $this->visibility->setLevel($visibility);
     }
 
     /** Determine whether an item with visibility $visibility can be displayed
@@ -305,16 +467,46 @@ class Profile
      */
     public function isVisible($visibility)
     {
-        return in_array($visibility, $this->visibility);
+        return $this->visibility->isVisible($visibility);
+    }
+
+    /** Stores the list of fields which have already been fetched for this Profile
+     */
+    public function setFetchedFields($fields)
+    {
+        if (($fields | self::FETCH_ALL) != self::FETCH_ALL) {
+            Platal::page()->kill("Invalid fetched fields: $fields");
+        }
+
+        $this->fetched_fields = $fields;
     }
 
-    public static function getCompatibleVisibilities($visibility)
+    private function fetched($field)
     {
-        return self::$v_values[$visibility];
+        if (($fields | self::FETCH_ALL) != self::FETCH_ALL) {
+            Platal::page()->kill("Invalid fetched fields: $fields");
+        }
+
+        return ($this->fetched_fields & $field);
     }
 
-    private function getProfileField($cls)
+    /** If not already done, fetches data for the given field
+     * @param $field One of the Profile::FETCH_*
+     * @return A ProfileField, or null
+     */
+    private function getProfileField($field)
     {
+        if (!array_key_exists($field, ProfileField::$fields)) {
+            Platal::page()->kill("Invalid field: $field");
+        }
+        if ($this->fetched($field)) {
+            return null;
+        } else {
+            $this->fetched_fields = $this->fetched_fields | $field;
+        }
+
+        $cls = ProfileField::$fields[$field];
+
         return ProfileField::getForPID($cls, $this->id(), $this->visibility);
     }
 
@@ -335,24 +527,26 @@ class Profile
         if ($this->addresses != null && $this->jobs != null) {
             $this->jobs->addAddresses($this->addresses);
         }
+        if ($this->jobs != null && $this->jobterms != null) {
+            $this->jobs->addJobTerms($this->jobterms);
+        }
     }
 
     /* Photo
      */
     private $photo = null;
-    public function setPhoto(ProfilePhoto $photo)
-    {
-        $this->photo = $photo;
-    }
-
-    public function getPhoto($fallback = true)
-    {
-        if ($this->photo == null) {
-            $this->setPhoto($this->getProfileField('ProfilePhoto'));
-        }
-
-        if ($this->photo != null) {
-            return $this->photo->pic;
+    public function getPhoto($fallback = true, $data = false)
+    {
+        if ($this->has_photo) {
+            if ($data && ($this->photo == null || $this->photo->mimeType == null)) {
+                $res = XDB::fetchOneAssoc('SELECT  attach, attachmime, x, y
+                                             FROM  profile_photos
+                                            WHERE  pid = {?}', $this->pid);
+                $this->photo = PlImage::fromData($res['attach'], $res['attachmime'], $res['x'], $res['y']);
+            } else if ($this->photo == null) {
+                $this->photo = PlImage::fromData(null, null, $this->photo_width, $this->photo_height);
+            }
+            return $this->photo;
         } else if ($fallback) {
             return PlImage::fromFile(dirname(__FILE__).'/../htdocs/images/none.png',
                                      'image/png');
@@ -369,25 +563,39 @@ class Profile
         $this->consolidateFields();
     }
 
-    public function getAddresses($flags, $limit = null)
+    private function fetchAddresses()
     {
-        if ($this->addresses == null) {
-            $this->setAddresses($this->getProfileField('ProfileAddresses'));
+        if ($this->addresses == null  && !$this->fetched(self::FETCH_ADDRESSES)) {
+            $addr = $this->getProfileField(self::FETCH_ADDRESSES);
+            if ($addr) {
+                $this->setAddresses($addr);
+                $this->fetchPhones();
+            }
         }
+    }
+
+    public function getAddresses($flags, $limit = null)
+    {
+        $this->fetchAddresses();
 
         if ($this->addresses == null) {
-            return PlIteratorUtils::emptyIterator();
+            return array();
         }
         return $this->addresses->get($flags, $limit);
     }
 
+    public function iterAddresses($flags, $limit = null)
+    {
+        return PlIteratorUtils::fromArray($this->getAddresses($flags, $limit), 1, true);
+    }
+
     public function getMainAddress()
     {
-        $it = $this->getAddresses(self::ADDRESS_PERSO | self::ADDRESS_MAIN);
-        if ($it->total() == 0) {
+        $addr = $this->getAddresses(self::ADDRESS_PERSO | self::ADDRESS_MAIN);
+        if (count($addr) == 0) {
             return null;
         } else {
-            return $it->next();
+            return array_pop($addr);
         }
     }
 
@@ -400,14 +608,21 @@ class Profile
         $this->consolidateFields();
     }
 
-    public function getPhones($flags, $limit = null)
+    private function fetchPhones()
     {
-        if ($this->phones == null) {
-            $this->setPhones($this->getProfileField('ProfilePhones'));
+        if ($this->phones == null && !$this->fetched(self::FETCH_PHONES)) {
+            $phones = $this->getProfileField(self::FETCH_PHONES);
+            if (isset($phones)) {
+                $this->setPhones($phones);
+            }
         }
+    }
 
+    public function getPhones($flags, $limit = null)
+    {
+        $this->fetchPhones();
         if ($this->phones == null) {
-            return PlIteratorUtils::emptyIterator();
+            return array();
         }
         return $this->phones->get($flags, $limit);
     }
@@ -422,12 +637,12 @@ class Profile
 
     public function getEducations($flags, $limit = null)
     {
-        if ($this->educations == null) {
-            $this->setEducations($this->getProfileField('ProfileEducation'));
+        if ($this->educations == null && !$this->fetched(self::FETCH_EDU)) {
+            $this->setEducations($this->getProfileField(self::FETCH_EDU));
         }
 
         if ($this->educations == null) {
-            return PlIteratorUtils::emptyIterator();
+            return array();
         }
         return $this->educations->get($flags, $limit);
     }
@@ -447,8 +662,8 @@ class Profile
 
     public function getCorps()
     {
-        if ($this->corps == null) {
-            $this->setCorps($this->getProfileField('ProfileCorps'));
+        if ($this->corps == null && !$this->fetched(self::FETCH_CORPS)) {
+            $this->setCorps($this->getProfileField(self::FETCH_CORPS));
         }
         return $this->corps;
     }
@@ -463,11 +678,14 @@ class Profile
 
     public function getNetworking($flags, $limit = null)
     {
-        if ($this->networks == null) {
-            $this->setNetworking($this->getProfileField('ProfileNetworking'));
+        if ($this->networks == null && !$this->fetched(self::FETCH_NETWORKING)) {
+            $nw = $this->getProfileField(self::FETCH_NETWORKING);
+            if ($nw) {
+                $this->setNetworking($nw);
+            }
         }
         if ($this->networks == null) {
-            return PlIteratorUtils::emptyIterator();
+            return array();
         }
         return $this->networks->get($flags, $limit);
     }
@@ -475,11 +693,11 @@ class Profile
     public function getWebSite()
     {
         $site = $this->getNetworking(self::NETWORKING_WEB, 1);
-        if ($site->total() != 1) {
+        if (count($site) != 1) {
             return null;
         }
-        $site = $site->next();
-        return $site['address'];
+        $site = array_pop($site);
+        return $site;
     }
 
 
@@ -492,14 +710,23 @@ class Profile
         $this->consolidateFields();
     }
 
-    public function getJobs($flags, $limit = null)
+    private function fetchJobs()
     {
-        if ($this->jobs == null) {
-            $this->setJobs($this->getProfileField('ProfileJobs'));
+        if ($this->jobs == null && !$this->fetched(self::FETCH_JOBS)) {
+            $jobs = $this->getProfileField(self::FETCH_JOBS);
+            if ($jobs) {
+                $this->setJobs($jobs);
+                $this->fetchAddresses();
+            }
         }
+    }
+
+    public function getJobs($flags, $limit = null)
+    {
+        $this->fetchJobs();
 
         if ($this->jobs == null) {
-            return PlIteratorUtils::emptyIterator();
+            return array();
         }
         return $this->jobs->get($flags, $limit);
     }
@@ -507,26 +734,111 @@ class Profile
     public function getMainJob()
     {
         $job = $this->getJobs(self::JOBS_MAIN, 1);
-        if ($job->total() != 1) {
+        if (count($job) != 1) {
             return null;
         }
-        return $job->next();
+        return array_pop($job);
+    }
+
+    /** JobTerms
+     */
+    private $jobterms = null;
+    public function setJobTerms(ProfileJobTerms $jobterms)
+    {
+        $this->jobterms = $jobterms;
+        $this->consolidateFields();
+    }
+
+    /* Mentoring
+     */
+    private $mentor_sectors = null;
+    public function setMentoringSectors(ProfileMentoringSectors $sectors)
+    {
+        $this->mentor_sectors = $sectors;
+    }
+
+    public function getMentoringSectors()
+    {
+        if ($this->mentor_sectors == null && !$this->fetched(self::FETCH_MENTOR_SECTOR)) {
+            $this->setMentoringSectors($this->getProfileField(self::FETCH_MENTOR_SECTOR));
+        }
+
+        if ($this->mentor_sectors == null) {
+            return array();
+        } else {
+            return $this->mentor_sectors->sectors;
+        }
+    }
+
+    private $mentor_countries = null;
+    public function setMentoringCountries(ProfileMentoringCountries $countries)
+    {
+        $this->mentor_countries = $countries;
+    }
+
+    public function getMentoringCountries()
+    {
+        if ($this->mentor_countries == null && !$this->fetched(self::FETCH_MENTOR_COUNTRY)) {
+            $this->setMentoringCountries($this->getProfileField(self::FETCH_MENTOR_COUNTRY));
+        }
+
+        if ($this->mentor_countries == null) {
+            return array();
+        } else {
+            return $this->mentor_countries->countries;
+        }
+    }
+
+    /** List of job terms to specify mentoring */
+    private $mentor_terms = null;
+    /**
+     * set job terms to specify mentoring
+     * @param $terms a ProfileMentoringTerms object listing terms only for this profile
+     */
+    public function setMentoringTerms(ProfileMentoringTerms $terms)
+    {
+        $this->mentor_terms = $terms;
     }
+    /**
+     * get all job terms that specify mentoring
+     * @return an array of JobTerms objects
+     */
+    public function getMentoringTerms()
+    {
+        if ($this->mentor_terms == null && !$this->fetched(self::FETCH_MENTOR_TERMS)) {
+            $this->setMentoringTerms($this->getProfileField(self::FETCH_MENTOR_TERMS));
+        }
+
+        if ($this->mentor_terms == null) {
+            return array();
+        } else {
+            return $this->mentor_terms->get();
+        }
+    }
+
 
     /* Binets
      */
     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
@@ -539,8 +851,8 @@ class Profile
 
     public function getMedals()
     {
-        if ($this->medals == null) {
-            $this->setMedals($this->getProfileField('ProfileMedals'));
+        if ($this->medals == null && !$this->fetched(self::FETCH_MEDALS)) {
+            $this->setMedals($this->getProfileField(self::FETCH_MEDALS));
         }
         if ($this->medals == null) {
             return array();
@@ -548,11 +860,6 @@ class Profile
         return $this->medals->medals;
     }
 
-    public function owner()
-    {
-        return User::getSilent($this);
-    }
-
     public function compareNames($firstname, $lastname)
     {
         $_lastname  = mb_strtoupper($this->lastName());
@@ -575,7 +882,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) {
@@ -584,14 +891,24 @@ class Profile
             $order = '';
         }
 
+        $visibility = new ProfileVisibility($visibility);
 
-        $it = XDB::Iterator('SELECT  p.*, p.sex = \'female\' AS sex, pe.entry_year, pe.grad_year, pse.text AS section,
-                                     pn_f.name AS firstname, pn_l.name AS lastname, pn_n.name AS nickname,
+        $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,
+                                     IF ({?}, p.cv, NULL) AS 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 ({?}, pse.text, NULL) AS section,
+                                     pn_f.name AS firstname, pn_l.name AS lastname,
+                                     IF( {?}, pn_n.name, NULL) 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.directory_name, pp.display_tel AS mobile, pp.pub AS mobile_pub,
-                                     ph.attach IS NOT NULL AS has_photo, ph.pub AS photo_pub,
+                                     pd.yourself, pd.promo, pd.short_name, pd.public_name AS full_name,
+                                     pd.directory_name, pd.public_name, pd.private_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,
                                      p.last_change < DATE_SUB(NOW(), INTERVAL 365 DAY) AS is_old,
                                      pm.expertise AS mentor_expertise,
                                      ap.uid AS owner_id
@@ -613,9 +930,17 @@ 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);
+                                     ' . $order,
+                           $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), // CV
+                           $visibility->levels(), // freetext
+                           $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), // section
+                           $visibility->isVisible(ProfileVisibility::VIS_PRIVATE), // nickname
+                           $visibility->levels(), // mobile
+                           $visibility->levels(), // photo
+                           $pids
+                       );
         return new ProfileIterator($it, $pids, $fields, $visibility);
     }
 
@@ -656,7 +981,9 @@ class Profile
     public static function get($login, $fields = 0x0000, $visibility = null)
     {
         if (is_array($login)) {
-            return new Profile($login);
+            $pf = new Profile($login);
+            $pf->setVisibilityLevel($visibility);
+            return $pf;
         }
         $pid = self::getPID($login);
         if (!is_null($pid)) {
@@ -687,7 +1014,7 @@ class Profile
 
     /** Return profiles for the list of pids.
      */
-    public static function getBulkProfilesWithPIDs(array $pids, $fields = self::FETCH_ADDRESSES, $visibility = null)
+    public static function getBulkProfilesWithPIDs(array $pids, $fields = 0x0000, $visibility = null)
     {
         if (count($pids) == 0) {
             return array();
@@ -718,6 +1045,26 @@ class Profile
             || $name == self::DN_SHORT || $name == self::DN_SORT;
     }
 
+    /** Returns the closest "accounts only" name type for $name
+     */
+    public static function getAccountEquivalentName($name)
+    {
+        switch ($name)
+        {
+        case self::DN_DIRECTORY:
+        case self::DN_SORT:
+            return 'directory_name';
+        case self::DN_FULL:
+        case self::DN_PUBLIC:
+            return 'full_name';
+        case self::DN_PRIVATE:
+        case self::DN_SHORT:
+        case self::DN_YOURSELF:
+        default:
+            return 'display_name';
+        }
+    }
+
     public static function getNameTypeId($type, $for_sql = false)
     {
         if (!S::has('name_types')) {
@@ -746,7 +1093,7 @@ class Profile
                                 WHERE  n.pid = {?}",
                               $pid);
 
-        foreach ($keys as $i => $key) {
+        while ($key = $keys->next()) {
             if ($key['name'] == '') {
                 continue;
             }
@@ -766,7 +1113,7 @@ class Profile
 
     /** The school identifier consists of 6 digits. The first 3 represent the
      * promotion entry year. The last 3 indicate the student's rank.
-     * 
+     *
      * Our identifier consists of 8 digits and both half have the same role.
      * This enables us to deal with bigger promotions and with a wider range
      * of promotions.
@@ -820,12 +1167,20 @@ class ProfileIterator implements PlIterator
 {
     private $iterator = null;
     private $fields;
+    private $visibility;
+
+    const FETCH_ALL    = 0x000033F; // FETCH_ADDRESSES | FETCH_CORPS | FETCH_EDU | FETCH_JOBS | FETCH_MEDALS | FETCH_NETWORKING | FETCH_PHONES | FETCH_JOB_TERMS
 
-    public function __construct(PlIterator $it, array $pids, $fields = 0x0000, $visibility = null)
+    public function __construct(PlIterator $it, array $pids, $fields = 0x0000, ProfileVisibility $visibility = null)
     {
         require_once 'profilefields.inc.php';
-        $visibility = Profile::getVisibilityContext($visibility);
+
+        if ($visibility == null) {
+            $visibility = new ProfileVisibility();
+        }
+
         $this->fields = $fields;
+        $this->visibility = $visibility;
 
         $subits = array();
         $callbacks = array();
@@ -834,57 +1189,28 @@ class ProfileIterator implements PlIterator
         $callbacks[0] = PlIteratorUtils::arrayValueCallback('pid');
         $cb = PlIteratorUtils::objectPropertyCallback('pid');
 
-        if ($fields & Profile::FETCH_ADDRESSES) {
-            $callbacks[Profile::FETCH_ADDRESSES] = $cb;
-            $subits[Profile::FETCH_ADDRESSES] = new ProfileFieldIterator('ProfileAddresses', $pids, $visibility);
-        }
-
-        if ($fields & Profile::FETCH_CORPS) {
-            $callbacks[Profile::FETCH_CORPS] = $cb;
-            $subits[Profile::FETCH_CORPS] = new ProfileFieldIterator('ProfileCorps', $pids, $visibility);
-        }
-
-        if ($fields & Profile::FETCH_EDU) {
-            $callbacks[Profile::FETCH_EDU] = $cb;
-            $subits[Profile::FETCH_EDU] = new ProfileFieldIterator('ProfileEducation', $pids, $visibility);
-        }
-
-        if ($fields & Profile::FETCH_JOBS) {
-            $callbacks[Profile::FETCH_JOBS] = $cb;
-            $subits[Profile::FETCH_JOBS] = new ProfileFieldIterator('ProfileJobs', $pids, $visibility);
-        }
-
-        if ($fields & Profile::FETCH_MEDALS) {
-            $callbacks[Profile::FETCH_MEDALS] = $cb;
-            $subits[Profile::FETCH_MEDALS] = new ProfileFieldIterator('ProfileMedals', $pids, $visibility);
-        }
-
-        if ($fields & Profile::FETCH_NETWORKING) {
-            $callbacks[Profile::FETCH_NETWORKING] = $cb;
-            $subits[Profile::FETCH_NETWORKING] = new ProfileFieldIterator('ProfileNetworking', $pids, $visibility);
-        }
-
-        if ($fields & Profile::FETCH_PHONES) {
-            $callbacks[Profile::FETCH_PHONES] = $cb;
-            $subits[Profile::FETCH_PHONES] = new ProfileFieldIterator('ProfilePhones', $pids, $visibility);
-        }
-
-        if ($fields & Profile::FETCH_PHOTO) {
-            $callbacks[Profile::FETCH_PHOTO] = $cb;
-            $subits[Profile::FETCH_PHOTO] = new ProfileFieldIterator('ProfilePhoto', $pids, $visibility);
+        $fields = $fields & self::FETCH_ALL;
+        for ($field = 1; $field < $fields; $field *= 2) {
+            if (($fields & $field) ) {
+                $callbacks[$field] = $cb;
+                $subits[$field] = new ProfileFieldIterator($field, $pids, $visibility);
+            }
         }
 
         $this->iterator = PlIteratorUtils::parallelIterator($subits, $callbacks, 0);
     }
 
-    private function hasData($flag, $vals)
+    private function hasData($field, $vals)
     {
-        return ($this->fields & $flag) && ($vals[$flag] != null);
+        return ($this->fields & $field) && ($vals[$field] != null);
     }
 
     private function fillProfile(array $vals)
     {
         $pf = Profile::get($vals[0]);
+        $pf->setVisibilityLevel($this->visibility->level());
+        $pf->setFetchedFields($this->fields);
+
         if ($this->hasData(Profile::FETCH_PHONES, $vals)) {
             $pf->setPhones($vals[Profile::FETCH_PHONES]);
         }
@@ -894,6 +1220,9 @@ class ProfileIterator implements PlIterator
         if ($this->hasData(Profile::FETCH_JOBS, $vals)) {
             $pf->setJobs($vals[Profile::FETCH_JOBS]);
         }
+        if ($this->hasData(Profile::FETCH_JOB_TERMS, $vals)) {
+            $pf->setJobTerms($vals[Profile::FETCH_JOB_TERMS]);
+        }
 
         if ($this->hasData(Profile::FETCH_CORPS, $vals)) {
             $pf->setCorps($vals[Profile::FETCH_CORPS]);
@@ -907,9 +1236,6 @@ class ProfileIterator implements PlIterator
         if ($this->hasData(Profile::FETCH_NETWORKING, $vals)) {
             $pf->setNetworking($vals[Profile::FETCH_NETWORKING]);
         }
-        if ($this->hasData(Profile::FETCH_PHOTO, $vals)) {
-            $pf->setPhoto($vals[Profile::FETCH_PHOTO]);
-        }
 
         return $pf;
     }