X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=classes%2Fprofile.php;h=4758abb6926f94ba24426c1ac2e8e59adf005e93;hb=e859bdaf82fa2c0c548a65e54a445a469728fd54;hp=1b657c8626e58eb0124ea7f314f8ab65b1f6ea06;hpb=ec8e2c4a6cc7eb5ae0c34a11334a776614053425;p=platal.git

diff --git a/classes/profile.php b/classes/profile.php
index 1b657c8..4758abb 100644
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -82,6 +82,18 @@ class Profile
     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;
+
     private $pid;
     private $hrpid;
     private $data = array();
@@ -95,7 +107,44 @@ class Profile
         $this->hrpid = $this->data['hrpid'];
         if (!S::logged()) {
             $this->setVisibilityLevel(self::VISIBILITY_PUBLIC);
+        } else {
+            $this->setVisibilityLevel(self::VISIBILITY_PRIVATE);
+        }
+    }
+
+    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)
+    {
+        if (array_key_exists($visibility, self::$contexts)) {
+            return self::$contexts[$visibility];
+        }
+
+        $asked_vis = $visibility;
+
+        if (S::logged()) {
+            $minvis = self::VISIBILITY_PRIVATE;
+        } else {
+            $minvis = self::VISIBILITY_PUBLIC;
+        }
+        if ($visibility == null) {
+            $visibility = $minvis;
+        }
+
+        if ($minvis == self::VISIBILITY_PUBLIC) {
+            $visibility = self::VISIBILITY_PUBLIC;
         }
+
+        $visibility = self::$v_values[$visibility];
+        self::$contexts[$asked_vis] = $visibility;
+
+        return $visibility;
     }
 
     public function id()
@@ -254,23 +303,51 @@ class Profile
         return in_array($visibility, $this->visibility);
     }
 
+    public static function getCompatibleVisibilities($visibility)
+    {
+        return self::$v_values[$visibility];
+    }
+
+    private function getProfileField($cls)
+    {
+        return ProfileField::getForPID($cls, $this->id(), $this->visibility);
+    }
+
+    /** Consolidates internal data (addresses, phones, jobs)
+     */
+    private function consolidateFields()
+    {
+        if ($this->phones != null) {
+            if ($this->addresses != null) {
+                $this->addresses->addPhones($this->phones);
+            }
+
+            if ($this->jobs != null) {
+                $this->jobs->addPhones($this->phones);
+            }
+        }
+
+        if ($this->addresses != null && $this->jobs != null) {
+            $this->jobs->addAddresses($this->addresses);
+        }
+    }
+
     /* Photo
      */
+    private $photo = null;
+    public function setPhoto(ProfilePhoto $photo)
+    {
+        $this->photo = $photo;
+    }
+
     public function getPhoto($fallback = true)
     {
-        $cond = '';
-        if ($this->visibility) {
-            $cond = XDB::format(' AND pub IN {?}', $this->visibility);
-        }
-        $res = XDB::query("SELECT  *
-                             FROM  profile_photos
-                            WHERE  attachmime IN ('jpeg', 'png')
-                                   " . $cond . ' AND  pid = {?}',
-                          $this->id());
-        if ($res->numRows() > 0) {
-            $photo = $res->fetchOneAssoc();
-            return PlImage::fromData($photo['attach'], 'image/' . $photo['attachmime'],
-                                     $photo['x'], $photo['y']);
+        if ($this->photo == null) {
+            $this->setPhoto($this->getProfileField('ProfilePhoto'));
+        }
+
+        if ($this->photo != null) {
+            return $this->photo->pic;
         } else if ($fallback) {
             return PlImage::fromFile(dirname(__FILE__).'/../htdocs/images/none.png',
                                      'image/png');
@@ -280,47 +357,23 @@ class Profile
 
     /* Addresses
      */
+    private $addresses = null;
+    public function setAddresses(ProfileAddresses $addr)
+    {
+        $this->addresses = $addr;
+        $this->consolidateFields();
+    }
+
     public function getAddresses($flags, $limit = null)
     {
-        $where = XDB::format('pa.pid = {?}', $this->id());
-        if ($flags & self::ADDRESS_MAIN) {
-            $where .= ' AND FIND_IN_SET(\'current\', pa.flags)';
-        }
-        if ($flags & self::ADDRESS_POSTAL) {
-            $where .= ' AND FIND_IN_SET(\'mail\', pa.flags)';
-        }
-        if ($this->visibility) {
-            $where .= XDB::format(' AND pa.pub IN {?}', $this->visibility);
-        }
-        $type = array();
-        if ($flags & self::ADDRESS_PRO) {
-            $type[] = 'job';
-        }
-        if ($flags & self::ADDRESS_PERSO) {
-            $type[] = 'home';
-        }
-        if (count($type) > 0) {
-            $where .= XDB::format(' AND pa.type IN {?}', $type);
-        }
-        $limit = is_null($limit) ? '' : XDB::format('LIMIT {?}', (int)$limit);
-        return XDB::iterator('SELECT  pa.text, pa.postalCode, pa.type, pa.latitude, pa.longitude,
-                                      gl.name AS locality, gas.name AS subAdministrativeArea,
-                                      ga.name AS administrativeArea, gc.countryFR AS country,
-                                      ppfix.display_tel AS fixed_tel, ppfax.display_tel AS fax_tel,
-                                      FIND_IN_SET(\'current\', pa.flags) AS current,
-                                      FIND_IN_SET(\'temporary\', pa.flags) AS temporary,
-                                      FIND_IN_SET(\'secondary\', pa.flags) AS secondary,
-                                      FIND_IN_SET(\'mail\', pa.flags) AS mail, pa.type
-                                FROM  profile_addresses AS pa
-                           LEFT JOIN  geoloc_localities AS gl ON (gl.id = pa.localityId)
-                           LEFT JOIN  geoloc_administrativeareas AS ga ON (ga.id = pa.administrativeAreaId)
-                           LEFT JOIN  geoloc_administrativeareas AS gas ON (gas.id = pa.subAdministrativeAreaId)
-                           LEFT JOIN  geoloc_countries AS gc ON (gc.iso_3166_1_a2 = pa.countryId)
-                           LEFT JOIN  profile_phones AS ppfix ON (ppfix.link_type = \'address\' AND ppfix.pid = pa.pid AND ppfix.link_id = pa.id AND ppfix.tel_type = \'fixed\')
-                           LEFT JOIN  profile_phones AS ppfax ON (ppfax.link_type = \'address\' AND ppfax.pid = pa.pid AND ppfax.link_id = pa.id AND ppfax.tel_type = \'fax\')
-                               WHERE  ' . $where . '
-                            ORDER BY  pa.id
-                                      ' . $limit);
+        if ($this->addresses == null) {
+            $this->setAddresses($this->getProfileField('ProfileAddresses'));
+        }
+
+        if ($this->addresses == null) {
+            return PlIteratorUtils::emptyIterator();
+        }
+        return $this->addresses->get($flags, $limit);
     }
 
     public function getMainAddress()
@@ -336,31 +389,22 @@ class Profile
 
     /* Educations
      */
+    private $educations = null;
+    public function setEducations(ProfileEducation $edu)
+    {
+        $this->educations = $edu;
+    }
+
     public function getEducations($flags, $limit = null)
     {
-        $where = XDB::format('pe.pid = {?}', $this->id());
-        if ($flags & self::EDUCATION_MAIN) {
-            $where .= ' AND FIND_IN_SET(\'primary\', pe.flags)';
-        } else if ($flags & self::EDUCATION_EXTRA) {
-            $where .= ' AND NOT FIND_IN_SET(\'primary\', pe.flags)';
-        } else if ($flags & self::EDUCATION_FINISHED) {
-            $where .= ' AND pe.grad_year <= YEAR(CURDATE())';
-        } else if ($flags & self::EDUCATION_CURRENT) {
-            $where .= ' AND pe.grad_year > YEAR(CURDATE())';
-        }
-        $limit = is_null($limit) ? '' : XDB::format('LIMIT {?}', (int)$limit);
-        return XDB::iterator('SELECT  pe.entry_year, pe.grad_year, pe.program,
-                                      pee.name AS school, pee.abbreviation AS school_short, pee.url AS school_url, gc.countryFR AS country,
-                                      pede.degree, pede.abbreviation AS degree_short, pede.level AS degree_level, pefe.field,
-                                      FIND_IN_SET(\'primary\', pe.flags) AS prim
-                                FROM  profile_education AS pe
-                          INNER JOIN  profile_education_enum AS pee ON (pe.eduid = pee.id)
-                           LEFT JOIN  geoloc_countries AS gc ON (gc.iso_3166_1_a2 = pee.country)
-                          INNER JOIN  profile_education_degree_enum AS pede ON (pe.degreeid = pede.id)
-                           LEFT JOIN  profile_education_field_enum AS pefe ON (pe.fieldid = pefe.id)
-                               WHERE  ' . $where . '
-                            ORDER BY  NOT FIND_IN_SET(\'primary\', pe.flags), pe.entry_year, pe.id
-                                      ' . $limit);
+        if ($this->educations == null) {
+            $this->setEducations($this->getProfileField('ProfileEducation'));
+        }
+
+        if ($this->educations == null) {
+            return PlIteratorUtils::emptyIterator();
+        }
+        return $this->educations->get($flags, $limit);
     }
 
     public function getExtraEducations($limit = null)
@@ -371,25 +415,21 @@ class Profile
 
     /** Networking
      */
+    private $networks = null;
+    public function setNetworking(ProfileNetworking $nw)
+    {
+        $this->networks = $nw;
+    }
 
     public function getNetworking($flags, $limit = null)
     {
-        $where = XDB::format('pn.pid = {?}', $this->id());
-        if ($flags & self::NETWORKING_WEB) {
-            $where .= ' AND pn.network_type = 0'; // XXX hardcoded reference to web site index
+        if ($this->networks == null) {
+            $this->setNetworking($this->getProfileField('ProfileNetworking'));
         }
-        if ($this->visibility) {
-            $where .= XDB::format(' AND pn.pub IN {?}', $this->visibility);
+        if ($this->networks == null) {
+            return PlIteratorUtils::emptyIterator();
         }
-        $limit = is_null($limit) ? '' : XDB::format('LIMIT {?}', (int)$limit);
-        return XDB::iterator('SELECT  pne.name, pne.icon,
-                                      IF (LENGTH(pne.link) > 0, REPLACE(pne.link, \'%s\', pn.address),
-                                                                pn.address) AS address
-                                FROM  profile_networking AS pn
-                          INNER JOIN  profile_networking_enum AS pne ON (pn.network_type = pne.network_type)
-                               WHERE  ' . $where . '
-                            ORDER BY  pn.network_type, pn.nwid
-                                      ' . $limit);
+        return $this->networks->get($flags, $limit);
     }
 
     public function getWebSite()
@@ -405,32 +445,26 @@ class Profile
 
     /** Jobs
      */
+    private $jobs = null;
+    public function setJobs(ProfileJobs $jobs)
+    {
+        $this->jobs = $jobs;
+        $this->consolidateFields();
+    }
 
     public function getJobs($flags, $limit = null)
     {
-        $where = XDB::format('pj.pid = {?}', $this->id());
-        $cond  = 'TRUE';
-        if ($this->visibility) {
-            $where .= XDB::format(' AND pj.pub IN {?}', $this->visibility);
-            $cond  = XDB::format('pj.email_pub IN {?}', $this->visibility);
-        }
-        $limit = is_null($limit) ? '' : XDB::format('LIMIT {?}', (int)$limit);
-        return XDB::iterator('SELECT  pje.name, pje.acronym, pje.url, pje.email, pje.NAF_code,
-                                      pj.description, pj.url AS user_site,
-                                      IF (' . $cond . ', pj.email, NULL) AS user_email,
-                                      pjse.name AS sector, pjsse.name AS subsector,
-                                      pjssse.name AS subsubsector
-                                FROM  profile_job AS pj
-                          INNER JOIN  profile_job_enum AS pje ON (pje.id = pj.jobid)
-                           LEFT JOIN  profile_job_sector_enum AS pjse ON (pjse.id = pj.sectorid)
-                           LEFT JOIN  profile_job_subsector_enum AS pjsse ON (pjsse.id = pj.subsectorid)
-                           LEFT JOIN  profile_job_subsubsector_enum AS pjssse ON (pjssse.id = pj.subsubsectorid)
-                               WHERE  ' . $where . '
-                            ORDER BY  pj.id
-                                      ' . $limit);
-    }
-
-    public function getMailJob()
+        if ($this->jobs == null) {
+            $this->setJobs($this->getProfileField('ProfileJobs'));
+        }
+
+        if ($this->jobs == null) {
+            return PlIteratorUtils::emptyIterator();
+        }
+        return $this->jobs->get($flags, $limit);
+    }
+
+    public function getMainJob()
     {
         $job = $this->getJobs(self::JOBS_MAIN, 1);
         if ($job->total() != 1) {
@@ -447,7 +481,32 @@ class Profile
                                    FROM  profile_binets
                                   WHERE  pid = {?}', $this->id());
     }
+    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());
+    }
 
+    /* Medals
+     */
+    private $medals = null;
+    public function setMedals(ProfileMedals $medals)
+    {
+        $this->medals = $medals;
+    }
+
+    public function getMedals()
+    {
+        if ($this->medals == null) {
+            $this->setMedals($this->getProfileField('ProfileMedals'));
+        }
+        if ($this->medals == null) {
+            return array();
+        }
+        return $this->medals->medals;
+    }
 
     public function owner()
     {
@@ -473,7 +532,7 @@ class Profile
         return ($isOk && ($maxlen > 2 || $maxlen == strlen($_lastname)));
     }
 
-    private static function fetchProfileData(array $pids, $respect_order = true)
+    private static function fetchProfileData(array $pids, $respect_order = true, $fields = 0x0000, $visibility = null)
     {
         if (count($pids) == 0) {
             return array();
@@ -485,31 +544,37 @@ class Profile
             $order = '';
         }
 
-        return XDB::Iterator('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_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,
-                                      p.last_change < DATE_SUB(NOW(), INTERVAL 365 DAY) AS is_old,
-                                      ap.uid AS owner_id
-                                FROM  profiles AS p
-                          INNER JOIN  profile_display AS pd ON (pd.pid = p.pid)
-                          INNER JOIN  profile_education AS pe ON (pe.pid = p.pid AND FIND_IN_SET(\'primary\', pe.flags))
-                          INNER JOIN  profile_name AS pn_f ON (pn_f.pid = p.pid AND pn_f.typeid = {?})
-                          INNER JOIN  profile_name AS pn_l ON (pn_l.pid = p.pid AND pn_l.typeid = {?})
-                           LEFT JOIN  profile_name AS pn_uf ON (pn_uf.pid = p.pid AND pn_uf.typeid = {?})
-                           LEFT JOIN  profile_name AS pn_ul ON (pn_ul.pid = p.pid AND pn_ul.typeid = {?})
-                           LEFT JOIN  profile_name AS pn_n ON (pn_n.pid = p.pid AND pn_n.typeid = {?})
-                           LEFT JOIN  profile_phones AS pp ON (pp.pid = p.pid AND pp.link_type = \'user\' AND tel_type = \'mobile\')
-                           LEFT JOIN  profile_photos AS ph ON (ph.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 {?}
-                            GROUP BY  p.pid
-                                   ' . $order, self::getNameTypeId('firstname'),
-                            self::getNameTypeId('lastname'), self::getNameTypeId('firstname_ordinary'),
-                            self::getNameTypeId('lastname_ordinary'), self::getNameTypeId('nickname'), $pids);
+
+        $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,
+                                     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,
+                                     p.last_change < DATE_SUB(NOW(), INTERVAL 365 DAY) AS is_old,
+                                     ap.uid AS owner_id
+                               FROM  profiles AS p
+                         INNER JOIN  profile_display AS pd ON (pd.pid = p.pid)
+                         INNER JOIN  profile_education AS pe ON (pe.pid = p.pid AND FIND_IN_SET(\'primary\', pe.flags))
+                          LEFT JOIN  profile_section_enum AS pse ON (pse.id = p.section)
+                         INNER JOIN  profile_name AS pn_f ON (pn_f.pid = p.pid
+                                                              AND pn_f.typeid = ' . self::getNameTypeId('firstname', true) . ')
+                         INNER JOIN  profile_name AS pn_l ON (pn_l.pid = p.pid
+                                                              AND pn_l.typeid = ' . self::getNameTypeId('lastname', true) . ')
+                          LEFT JOIN  profile_name AS pn_uf ON (pn_uf.pid = p.pid
+                                                               AND pn_uf.typeid = ' . self::getNameTypeId('firstname_ordinary', true) . ')
+                          LEFT JOIN  profile_name AS pn_ul ON (pn_ul.pid = p.pid
+                                                               AND pn_ul.typeid = ' . self::getNameTypeId('lastname_ordinary', true) . ')
+                          LEFT JOIN  profile_name AS pn_n ON (pn_n.pid = p.pid
+                                                              AND pn_n.typeid = ' . self::getNameTypeId('nickname', true) . ')
+                          LEFT JOIN  profile_phones AS pp ON (pp.pid = p.pid AND pp.link_type = \'user\' AND tel_type = \'mobile\')
+                          LEFT JOIN  profile_photos AS ph ON (ph.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) . '
+                           GROUP BY  p.pid
+                                  ' . $order);
+        return new ProfileIterator($it, $pids, $fields, $visibility);
     }
 
     public static function getPID($login)
@@ -540,20 +605,20 @@ class Profile
         return XDB::fetchAllAssoc('uid', 'SELECT  ap.uid, ap.pid
                                             FROM  account_profiles AS ap
                                            WHERE  FIND_IN_SET(\'owner\', ap.perms)
-                                                  AND ap.uid IN {?}
-                                               ' . $order, $uids);
+                                                  AND ap.uid IN ' . XDB::formatArray($uids) .'
+                                               ' . $order);
     }
 
     /** Return the profile associated with the given login.
      */
-    public static function get($login)
+    public static function get($login, $fields = 0x0000, $visibility = null)
     {
         if (is_array($login)) {
             return new Profile($login);
         }
         $pid = self::getPID($login);
         if (!is_null($pid)) {
-            $it = self::iterOverPIDs(array($pid), false);
+            $it = self::iterOverPIDs(array($pid), false, $fields, $visibility);
             return $it->next();
         } else {
             /* Let say we can identify a profile using the identifiers of its owner.
@@ -568,24 +633,24 @@ class Profile
         }
     }
 
-    public static function iterOverUIDs($uids, $respect_order = true)
+    public static function iterOverUIDs($uids, $respect_order = true, $fields = 0x0000, $visibility = null)
     {
-        return self::iterOverPIDs(self::getPIDsFromUIDs($uids), $respect_order);
+        return self::iterOverPIDs(self::getPIDsFromUIDs($uids), $respect_order, $fields, $visibility);
     }
 
-    public static function iterOverPIDs($pids, $respect_order = true)
+    public static function iterOverPIDs($pids, $respect_order = true, $fields = 0x0000, $visibility = null)
     {
-        return new ProfileIterator(self::fetchProfileData($pids, $respect_order));
+        return self::fetchProfileData($pids, $respect_order, $fields, $visibility);
     }
 
     /** Return profiles for the list of pids.
      */
-    public static function getBulkProfilesWithPIDs(array $pids)
+    public static function getBulkProfilesWithPIDs(array $pids, $fields = self::FETCH_ADDRESSES, $visibility = null)
     {
         if (count($pids) == 0) {
             return array();
         }
-        $it = self::iterOverPIDs($pids);
+        $it = self::iterOverPIDs($pids, true, $fields, $visibility);
         $profiles = array();
         while ($p = $it->next()) {
             $profiles[$p->id()] = $p;
@@ -595,12 +660,12 @@ class Profile
 
     /** Return profiles for uids.
      */
-    public static function getBulkProfilesWithUIDS(array $uids)
+    public static function getBulkProfilesWithUIDS(array $uids, $fields = 0x000, $visibility = null)
     {
         if (count($uids) == 0) {
             return array();
         }
-        return self::getBulkProfilesWithPIDs(self::getPIDsFromUIDs($uids));
+        return self::getBulkProfilesWithPIDs(self::getPIDsFromUIDs($uids), $fields, $visibility);
     }
 
     public static function isDisplayName($name)
@@ -611,16 +676,20 @@ class Profile
             || $name == self::DN_SHORT || $name == self::DN_SORT;
     }
 
-    public static function getNameTypeId($type)
+    public static function getNameTypeId($type, $for_sql = false)
     {
         if (!S::has('name_types')) {
-            $table = new PlDict(XDB::fetchAllAssoc('type', 'SELECT  id, type
-                                                              FROM  profile_name_enum'));
+            $table = XDB::fetchAllAssoc('type', 'SELECT  id, type
+                                                   FROM  profile_name_enum');
             S::set('name_types', $table);
         } else {
             $table = S::v('name_types');
         }
-        return $table->i($type);
+        if ($for_sql) {
+            return XDB::escape($table[$type]);
+        } else {
+            return $table[$type];
+        }
     }
 
     public static function rebuildSearchTokens($pid)
@@ -702,41 +771,129 @@ class Profile
     }
 }
 
+
 /** Iterator over a set of Profiles
- * @param an XDB::Iterator obtained from a Profile::fetchProfileData
  */
 class ProfileIterator implements PlIterator
 {
-    private $dbiter;
+    private $iterator = null;
+    private $fields;
+
+    public function __construct(PlIterator $it, array $pids, $fields = 0x0000, $visibility = null)
+    {
+        require_once 'profilefields.inc.php';
+        $visibility = Profile::getVisibilityContext($visibility);
+        $this->fields = $fields;
+
+        $subits = array();
+        $callbacks = array();
+
+        $subits[0] = $it;
+        $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);
+        }
 
-    public function __construct($dbiter)
+        $this->iterator = PlIteratorUtils::parallelIterator($subits, $callbacks, 0);
+    }
+
+    private function hasData($flag, $vals)
     {
-        $this->dbiter = $dbiter;
+        return ($this->fields & $flag) && ($vals[$flag] != null);
     }
 
-    public function next()
+    private function fillProfile(array $vals)
     {
-        $data = $this->dbiter->next();
-        if ($data == null) {
-            return null;
-        } else {
-            return Profile::get($data);
+        $pf = Profile::get($vals[0]);
+        if ($this->hasData(Profile::FETCH_PHONES, $vals)) {
+            $pf->setPhones($vals[Profile::FETCH_PHONES]);
         }
+        if ($this->hasData(Profile::FETCH_ADDRESSES, $vals)) {
+            $pf->setAddresses($vals[Profile::FETCH_ADDRESSES]);
+        }
+        if ($this->hasData(Profile::FETCH_JOBS, $vals)) {
+            $pf->setJobs($vals[Profile::FETCH_JOBS]);
+        }
+
+        if ($this->hasData(Profile::FETCH_CORPS, $vals)) {
+            $pf->setCorps($vals[Profile::FETCH_CORPS]);
+        }
+        if ($this->hasData(Profile::FETCH_EDU, $vals)) {
+            $pf->setEducations($vals[Profile::FETCH_EDU]);
+        }
+        if ($this->hasData(Profile::FETCH_MEDALS, $vals)) {
+            $pf->setMedals($vals[Profile::FETCH_MEDALS]);
+        }
+        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;
     }
 
-    public function total()
+    public function next()
     {
-        return $this->dbiter->total();
+        $vals = $this->iterator->next();
+        if ($vals == null) {
+            return null;
+        }
+        return $this->fillProfile($vals);
     }
 
     public function first()
     {
-        return $this->dbiter->first();
+        return $this->iterator->first();
     }
 
     public function last()
     {
-        return $this->dbiter->last();
+        return $this->iterator->last();
+    }
+
+    public function total()
+    {
+        return $this->iterator->total();
     }
 }