Move table photo into profile_photos, rename uid to pid.
[platal.git] / modules / profile / general.inc.php
index 8008778..5e70adc 100644 (file)
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2008 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
-class ProfileNom implements ProfileSetting
+class ProfileSearchNames implements ProfileSetting
 {
-    private function matchWord($old, $new, $newLen) {
+    private $private_name_end;
+    private $search_names;
+
+    private function matchWord($old, $new, $newLen)
+    {
         return ($i = strpos($old, $new)) !== false
             && ($i == 0 || $old{$i-1} == ' ')
             && ($i + $newLen == strlen($old) || $old{$i + $newLen} == ' ');
@@ -29,44 +33,171 @@ class ProfileNom implements ProfileSetting
 
     private function prepareField($value)
     {
-        $value = strtoupper(replace_accent($value));
+        $value = mb_strtoupper($value);
         return preg_replace('/[^A-Z]/', ' ', $value);
     }
 
-    public function value(ProfilePage &$page, $field, $value, &$success)
+    private function prepare(ProfilePage &$page, $field, $value, $init, &$success)
     {
         $success = true;
-        $current = S::v($field);
-        $init    = S::v($field . '_ini');
-        if (is_null($value)) {
-            return $current;
-        }
-        if ($value == $current || $value == $init) {
-            return $value;
-        }
-        $ini = $this->prepareField($init);
-        $old = $this->prepareField($current);
-        $new = $this->prepareField($value);
-        $newLen = strlen($new);
-        $success = $this->matchWord($old, $new, $newLen)
-                || $this->matchWord($ini, $new, $newLen)
-                || ($field == 'nom' && $new == 'DE ' . $old);
+        $ini     = $this->prepareField($init);
+        $new     = $this->prepareField($value);
+        $newLen  = strlen($new);
+        $success = $this->matchWord($ini, $new, $newLen)
+                   || ($field == 'lastname' && $new == 'DE ' . $ini);
         if (!$success) {
-            Platal::page()->trigError("Le $field que tu as choisi ($value) est trop loin de ton $field initial ($init)"
-                                    . (($init == $current)? "" : " et de ton prénom précédent ($current)"));
+            $field = strtolower($field);
+            Platal::page()->trigError("Le " . $field . " que tu as choisi (" . $value .
+                                      ") est trop loin de ton " . $field . " initial (" . $init . ").");
         }
-        return $success ? $value : $current;
+        return $success ? $value : $init;
     }
 
-    public function save(ProfilePage &$page, $field, $new_value)
+    public function value(ProfilePage &$page, $field, $value, &$success)
     {
-        $_SESSION[$field] = $new_value;
+        $success     = true;
+        $success_tmp = true;
+
+        if (is_null($value)) {
+            $sn_all = XDB::iterator("SELECT  CONCAT(sn.particle, sn.name) AS name,
+                                             sn.particle, sn.typeid, e.type, e.name AS type_name,
+                                             FIND_IN_SET('has_particle', e.flags) AS has_particle,
+                                             FIND_IN_SET('always_displayed', e.flags) AS always_displayed,
+                                             FIND_IN_SET('public', e.flags) AS pub
+                                       FROM  profile_name      AS sn
+                                 INNER JOIN  profile_name_enum AS e  ON (e.id = sn.typeid)
+                                      WHERE  sn.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)
+                                   ORDER BY  NOT FIND_IN_SET('always_displayed', e.flags), e.id, sn.name",
+                                     $page->pid());
+
+            $sn_types = XDB::iterator("SELECT  id, type, name,
+                                               FIND_IN_SET('has_particle', flags) AS has_particle
+                                         FROM  profile_name_enum
+                                        WHERE  NOT FIND_IN_SET('not_displayed', flags)
+                                               AND FIND_IN_SET('always_displayed', flags)
+                                     ORDER BY  id");
+
+            $value = array();
+            $sn = $sn_all->next();
+            while ($sn_type = $sn_types->next()) {
+                if ($sn_type['id'] == $sn['typeid']) {
+                    $value[] = $sn;
+                    if ($sn) {
+                        $sn = $sn_all->next();
+                    }
+                } else {
+                    $value[] = array('name'             => '',
+                                     'particle'         => '',
+                                     'typeid'           => $sn_type['id'],
+                                     'type'             => $sn_type['type'],
+                                     'type_name'        => $sn_type['name'],
+                                     'has_particle'     => $sn_type['has_particle'],
+                                     'always_displayed' => 1,
+                                     'pub'              => 1);
+                }
+            }
+            if ($sn) {
+                do {
+                    $value[] = $sn;
+                } while ($sn = $sn_all->next());
+            }
+        } else {
+            require_once 'name.func.inc.php';
+
+            $res = XDB::query("SELECT  s.particle, s.name
+                                 FROM  profile_name      AS s
+                           INNER JOIN  profile_name_enum AS e ON (e.id = s.typeid)
+                                WHERE  s.pid = {?} AND e.type LIKE '%ini'
+                             ORDER BY  e.type = 'firstname_ini'",
+                             $page->pid());
+            $res = $res->fetchAllAssoc();
+            $initial = array();
+            $initial['lastname'] = $res[0]['particle'] . $res[0]['name'];
+            $initial['firstname'] = $res[1]['name'];
+            $sn_types = build_types();
+            $this->search_names = array();
+            foreach ($value as &$sn) {
+                $sn['name'] = trim($sn['name']);
+                if ($sn['type'] == 'firstname' || $sn['type'] == 'lastname') {
+                    $sn['name'] = $this->prepare($page, $sn['type'], $sn['name'],
+                                                 $initial[$sn['type']], $success_tmp);
+                    $success = $success && $success_tmp;
+                }
+                if ($sn['pub']) {
+                    if (isset($sn['particle']) && ($sn['particle'] != '')) {
+                        list($particle, $name) = explode(' ', $sn['name'], 2);
+                        $particle = trim($particle) . ' ';
+                        if (!$name) {
+                            list($particle, $name) = explode('\'', $sn['name'], 2);
+                            $particle = trim($particle);
+                        }
+                    } else {
+                        $particle = '';
+                        $name     = $sn['name'];
+                    }
+                }
+                if ($sn['name'] != '') {
+                    if ($sn['pub']) {
+                        $this->search_names[$sn['typeid']] = array('fullname' => $sn['name'],
+                                                                   'name'     => $name,
+                                                                   'particle' => $particle,
+                                                                   'pub'      => $sn['pub']);
+                    } else {
+                        if (isset($this->search_names[$sn['typeid']])) {
+                            $this->search_names[$sn['typeid']][] = $sn['name'];
+                        } else {
+                            $this->search_names[$sn['typeid']] = array('fullname' => $sn['name']);
+                        }
+                        $sn['type_name'] = $sn_types[$sn['typeid']];
+                    }
+                }
+            }
+            $res = XDB::query("SELECT  public_name, private_name
+                                 FROM  profile_display
+                                WHERE  pid = {?}",
+                              S::v('uid'));
+            list($public_name, $private_name) = $res->fetchOneRow();
+            if ($success) {
+                $sn_types_private       = build_types('private');
+                $this->private_name_end = build_private_name($this->search_names, $sn_types_private);
+                $private_name           = $public_name . $this->private_name_end;
+            }
+            Platal::page()->assign('public_name', $public_name);
+            Platal::page()->assign('private_name', $private_name);
+        }
+
+        return $value;
+    }
+
+    public function save(ProfilePage &$page, $field, $value)
+    {
+        require_once 'name.func.inc.php';
+        $sn_old = build_sn_pub();
+        XDB::execute("DELETE FROM  s
+                            USING  profile_name      AS s
+                       INNER JOIN  profile_name_enum AS e ON (s.typeid = e.id)
+                            WHERE  s.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)",
+                     $page->pid());
+        $has_new = set_alias_names($this->search_names, $sn_old);
+
+        // Only requires validation if modification in public names
+        if ($has_new) {
+            $new_names = new NamesReq(S::user(), $this->search_names, $this->private_name_end);
+            $new_names->submit();
+            Platal::page()->trigWarning("La demande de modification de tes noms a bien été prise en compte." .
+                                        " Tu recevras un email dès que ces changements auront été effectués.");
+        } else {
+            $display_names = array();
+            build_display_names($display_names, $this->search_names, $this->private_name_end);
+            set_profile_display($display_names);
+        }
     }
 }
 
 class ProfileEdu implements ProfileSetting
 {
-    public function __construct(){}
+    public function __construct() {
+    }
 
     static function sortByGradYear($line1, $line2) {
         $a = (int) $line1['grad_year'];
@@ -82,14 +213,11 @@ class ProfileEdu implements ProfileSetting
         $success = true;
         if (is_null($value) || !is_array($value)) {
             $value = array();
-            $res = XDB::iterator("SELECT  eduid, degreeid, fieldid, grad_year, program
-                                    FROM  profile_education
-                                   WHERE  uid = {?} AND !FIND_IN_SET('primary', flags)
-                                ORDER BY  id",
-                                 S::v('uid'));
-            while($edu = $res->next()) {
-                $value[] = $edu;
-            }
+            $value = XDB::fetchAllAssoc("SELECT  eduid, degreeid, fieldid, grad_year, program
+                                           FROM  profile_education
+                                          WHERE  uid = {?} AND !FIND_IN_SET('primary', flags)
+                                       ORDER BY  id",
+                                        $page->pid());
         } else {
             $i = 0;
             foreach ($value as $key=>&$edu) {
@@ -113,13 +241,13 @@ class ProfileEdu implements ProfileSetting
     {
         XDB::execute("DELETE FROM  profile_education
                             WHERE  uid = {?} AND !FIND_IN_SET('primary', flags)",
-                     S::i('uid'));
+                     $page->pid());
         foreach ($value as $eduid=>&$edu) {
             if ($edu['eduid'] != '') {
                 XDB::execute("INSERT INTO  profile_education
                                       SET  id = {?}, uid = {?}, eduid = {?}, degreeid = {?},
                                            fieldid = {?}, grad_year = {?}, program = {?}",
-                             $eduid, S::i('uid'), $edu['eduid'], $edu['degreeid'],
+                             $eduid, $page->pid(), $edu['eduid'], $edu['degreeid'],
                              $edu['fieldid'], $edu['grad_year'], $edu['program']);
             }
         }
@@ -169,25 +297,17 @@ class ProfileNetworking implements ProfileSetting
     public function value(ProfilePage &$page, $field, $value, &$success)
     {
         if (is_null($value)) {
-            $value = array();
-            $res = XDB::iterator("SELECT  n.address, n.network_type AS type, n.pub, m.name
-                                    FROM  profile_networking AS n
-                              INNER JOIN  profile_networking_enum AS m ON (n.network_type = m.network_type)
-                                   WHERE  n.uid = {?}",
-                                 S::i('uid'));
-            while($network = $res->next()) {
-                $value[] = $network;
-            }
+            $value = XDB::fetchAllAssoc("SELECT  n.address, n.network_type AS type, n.pub, m.name
+                                           FROM  profile_networking AS n
+                                     INNER JOIN  profile_networking_enum AS m ON (n.network_type = m.network_type)
+                                          WHERE  n.uid = {?}",
+                                         $page->pid());
         }
         if (!is_array($value)) {
             $value = array();
         }
-        $res = XDB::iterator("SELECT  filter, network_type AS type
-                                FROM  profile_networking_enum;");
-        $filters = array();
-        while($filter = $res->next()) {
-            $filters[$filter['type']] = $filter['filter'];
-        }
+        $filters = XDB::fetchAllAssoc('type', 'SELECT  filter, network_type AS type
+                                                 FROM  profile_networking_enum;');
         $success = true;
         foreach($value as $i=>&$network) {
             if (!trim($network['address'])) {
@@ -219,7 +339,7 @@ class ProfileNetworking implements ProfileSetting
     {
         XDB::execute("DELETE FROM profile_networking
                             WHERE uid = {?}",
-                     S::i('uid'));
+                     $page->pid());
         if (!count($value)) {
             return;
         }
@@ -227,7 +347,7 @@ class ProfileNetworking implements ProfileSetting
         foreach ($value as $id=>$network) {
             XDB::execute("INSERT INTO  profile_networking (uid, nwid, network_type, address, pub)
                                VALUES  ({?}, {?}, {?}, {?}, {?})",
-                         S::i('uid'), $id, $network['type'], $network['address'], $network['pub']);
+                         $page->pid(), $id, $network['type'], $network['address'], $network['pub']);
         }
     }
 }
@@ -239,24 +359,19 @@ class ProfileGeneral extends ProfilePage
     public function __construct(PlWizard &$wiz)
     {
         parent::__construct($wiz);
-        $this->settings['naissance'] = new ProfileDate();
+        $this->settings['search_names']
+                                  = new ProfileSearchNames();
+        $this->settings['birthdate'] = new ProfileDate();
         $this->settings['freetext_pub']
                                   = $this->settings['photo_pub']
                                   = new ProfilePub();
         $this->settings['freetext']
-                                  = $this->settings['nationalite']
-                                  = $this->settings['nationalite2']
-                                  = $this->settings['nationalite3']
-                                  = $this->settings['nick']
+                                  = $this->settings['nationality1']
+                                  = $this->settings['nationality2']
+                                  = $this->settings['nationality3']
                                   = $this->settings['yourself']
-                                  = $this->settings['display_name']
-                                  = $this->settings['sort_name']
-                                  = $this->settings['tooltip_name']
-                                  = $this->settings['promo_display']
-                                  = $this->settings['search_names']
+                                  = $this->settings['promo']
                                   = null;
-        $this->settings['synchro_ax']
-                                  = new ProfileBool();
         $this->settings['email_directory']
                                   = new ProfileEmail();
         $this->settings['email_directory_new']
@@ -266,78 +381,46 @@ class ProfileGeneral extends ProfilePage
         $this->settings['edus']   = new ProfileEdu();
         $this->watched= array('freetext' => true, 'tels' => true,
                               'networking' => true, 'edus' => true,
-                              'nationalite' => true, 'nationalite2' => true,
-                              'nationalite3' => true);
+                              'nationality1' => true, 'nationality2' => true,
+                              'nationality3' => true, 'search_names' => true);
     }
 
     protected function _fetchData()
     {
         // Checkout all data...
-        $res = XDB::query("SELECT  p.promo AS promo_display, e.entry_year AS entry_year, e.grad_year AS grad_year,
-                                   u.nationalite, u.nationalite2, u.nationalite3, u.naissance,
+        $res = XDB::query("SELECT  p.promo, e.entry_year AS entry_year, e.grad_year AS grad_year,
+                                   pr.nationality1, pr.nationality2, pr.nationality3, pr.birthdate,
                                    t.display_tel as mobile, t.pub as mobile_pub,
                                    d.email_directory as email_directory,
-                                   q.profile_freetext as freetext, q.profile_freetext_pub as freetext_pub,
-                                   q.profile_from_ax as synchro_ax, u.matricule_ax,
-                                   p.public_name, p.private_name, p.yourself
-                             FROM  auth_user_md5         AS u
-                       INNER JOIN  auth_user_quick       AS q ON (u.user_id = q.user_id)
-                       INNER JOIN  profile_display       AS p ON (p.pid = u.user_id)
-                       INNER JOIN  profile_education     AS e ON (e.uid = u.user_id AND FIND_IN_SET('primary', e.flags))
-                        LEFT JOIN  profile_phones        AS t ON (u.user_id = t.uid AND link_type = 'user')
-                        LEFT JOIN  profile_directory     AS d ON (d.uid = u.user_id)
-                            WHERE  u.user_id = {?}", S::v('uid', -1));
+                                   pr.freetext, pr.freetext_pub, pr.ax_id AS matricule_ax, p.yourself
+                             FROM  profiles              AS pr
+                       INNER JOIN  profile_display       AS p ON (p.pid = pr.pid)
+                       INNER JOIN  profile_education     AS e ON (e.uid = pr.pid AND FIND_IN_SET('primary', e.flags))
+                        LEFT JOIN  profile_phones        AS t ON (t.uid = pr.pid AND link_type = 'user')
+                        LEFT JOIN  profile_directory     AS d ON (d.uid = pr.pid)
+                            WHERE  pr.pid = {?}", $this->pid());
         $this->values = $res->fetchOneAssoc();
+        if ($this->owner) {
+            $this->values['yourself'] = $this->owner->displayName();
+        }
 
         // Retreive photo informations
         $res = XDB::query("SELECT  pub
-                             FROM  photo
-                            WHERE  uid = {?}", S::v('uid'));
+                             FROM  profile_photos
+                            WHERE  pid = {?}", $this->pid());
         $this->values['photo_pub'] = $res->fetchOneCell();
 
-        $res = XDB::query("SELECT  COUNT(*)
-                             FROM  requests
-                            WHERE  type='photo' AND user_id = {?}",
-                          S::v('uid'));
-        $this->values['nouvellephoto'] = $res->fetchOneCell();
-
-        // Retreive search names info
-        $sn_all = XDB::iterator("SELECT  IF(sn.particle = '', sn.name, CONCAT(sn.particle, ' ', sn.name)) AS name,
-                                         sn.particle, sn.typeid, e.name AS type,
-                                         FIND_IN_SET('has_particle', e.flags) AS has_particle,
-                                         FIND_IN_SET('always_displayed', e.flags) AS always_displayed,
-                                         FIND_IN_SET('public', e.flags) AS pub
-                                   FROM  profile_name_search      AS sn
-                             INNER JOIN  profile_name_search_enum AS e  ON (e.id = sn.typeid)
-                                  WHERE  sn.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)
-                               ORDER BY  NOT FIND_IN_SET('always_displayed', e.flags), e.id, sn.name",
-                                S::v('uid'));
-
-        $sn_types = XDB::iterator("SELECT  id, name, FIND_IN_SET('has_particle', flags) AS has_particle
-                                     FROM  profile_name_search_enum
-                                    WHERE  NOT FIND_IN_SET('not_displayed', flags)
-                                           AND FIND_IN_SET('always_displayed', flags)
-                                 ORDER BY  id");
-
-        $this->values['search_names'] = array();
-        $sn = $sn_all->next();
-        while ($sn_type = $sn_types->next()) {
-            if ($sn_type['id'] == $sn['typeid']) {
-                $this->values['search_names'][] = $sn;
-                $sn = $sn_all->next();
-            } else {
-                $this->values['search_names'][] = array('typeid' => $sn_type['id'],
-                                                        'type'   => $sn_type['name'],
-                                                        'pub'    => 1,
-                                                        'has_particle'     => $sn_type['has_particle'],
-                                                        'always_displayed' => 1);
-            }
+        if ($this->owner) {
+            $res = XDB::query("SELECT  COUNT(*)
+                                 FROM  requests
+                                WHERE  type='photo' AND user_id = {?}",
+                              $this->owner->id());
+            $this->values['nouvellephoto'] = $res->fetchOneCell();
+        } else {
+            $this->values['nouvellephoto'] = 0;
         }
-        do {
-            $this->values['search_names'][] = $sn;
-        } while ($sn = $sn_all->next());
 
-        // Proposes choice for promo_display
+        // Proposes choice for promotion
         if ($this->values['entry_year'] != $this->values['grad_year'] - 3) {
             for ($i = $this->values['entry_year']; $i < $this->values['grad_year'] - 2; $i++) {
                 $this->values['promo_choice'][] = "X" . $i;
@@ -347,34 +430,28 @@ class ProfileGeneral extends ProfilePage
 
     protected function _saveData()
     {
-        if ($this->changed['nationalite'] || $this->changed['nationalite2'] || $this->changed['nationalite3']
-            || $this->changed['naissance']) {
-            if ($this->values['nationalite3'] == "") {
-                $this->values['nationalite3'] = NULL;
+        if ($this->changed['nationality1'] || $this->changed['nationality2'] || $this->changed['nationality3']
+            || $this->changed['birthdate'] || $this->changed['freetext'] || $this->changed['freetext_pub']) {
+            if ($this->values['nationality3'] == "") {
+                $this->values['nationality3'] = NULL;
             }
-            if ($this->values['nationalite2'] == "") {
-                $this->values['nationalite2'] = $this->values['nationalite3'];
-                $this->values['nationalite3'] = NULL;
+            if ($this->values['nationality2'] == "") {
+                $this->values['nationality2'] = $this->values['nationality3'];
+                $this->values['nationality3'] = NULL;
             }
-            if ($this->values['nationalite'] == "") {
-                $this->values['nationalite']  = $this->values['nationalite2'];
-                $this->values['nationalite2'] = $this->values['nationalite3'];
-                $this->values['nationalite3'] = NULL;
+            if ($this->values['nationality1'] == "") {
+                $this->values['nationality1']  = $this->values['nationality2'];
+                $this->values['nationality2'] = $this->values['nationality3'];
+                $this->values['nationality3'] = NULL;
             }
 
-            XDB::execute("UPDATE  auth_user_md5
-                             SET  nationalite = {?}, nationalite2 = {?}, nationalite3 = {?}, naissance={?}
-                           WHERE  user_id = {?}",
-                         $this->values['nationalite'], $this->values['nationalite2'], $this->values['nationalite3'],
-                         preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $this->values['naissance']),
-                         S::v('uid'));
-        }
-        if ($this->changed['freetext'] || $this->changed['freetext_pub'] || $this->changed['synchro_ax']) {
-            XDB::execute("UPDATE  auth_user_quick
-                             SET  profile_freetext={?}, profile_freetext_pub={?}, profile_from_ax = {?}
-                           WHERE  user_id = {?}",
-                         $this->values['freetext'], $this->values['freetext_pub'],
-                         $this->values['synchro_ax'], S::v('uid'));
+            XDB::execute("UPDATE  profiles
+                             SET  nationality1 = {?}, nationality2 = {?}, nationality3 = {?}, birthdate = {?},
+                                  freetext = {?}, freetext_pub = {?}
+                           WHERE  pid = {?}",
+                          $this->values['nationality1'], $this->values['nationality2'], $this->values['nationality3'],
+                          preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $this->values['birthdate']),
+                          $this->values['freetext'], $this->values['freetext_pub'], $this->pid());
         }
         if ($this->changed['email_directory']) {
             $new_email = ($this->values['email_directory'] == "new@example.org") ?
@@ -384,80 +461,24 @@ class ProfileGeneral extends ProfilePage
             }
             XDB::execute("REPLACE INTO  profile_directory (uid, email_directory)
                                 VALUES  ({?}, {?})",
-                         S::v('uid'), $new_email);
+                         $this->pid(), $new_email);
         }
         if ($this->changed['photo_pub']) {
-            XDB::execute("UPDATE  photo
+            XDB::execute("UPDATE  profile_photos
                              SET  pub = {?}
-                           WHERE  uid = {?}",
-                         $this->values['photo_pub'], S::v('uid'));
+                           WHERE  pid = {?}",
+                         $this->values['photo_pub'], $this->pid());
         }
-
-       if ($this->changed['yourself'] || $this->changed['search_names']) {
-            if ($this->changed['search_names']) {
-                XDB::execute("DELETE FROM  s
-                                    USING  profile_name_search      AS s
-                               INNER JOIN  profile_name_search_enum AS e ON (s.typeid = e.id)
-                                    WHERE  s.pid = {?} AND NOT FIND_IN_SET('not_displayed', e.flags)",
-                             S::i('uid'));
-                $search_names = array();
-                foreach ($this->values['search_names'] as $sn) {
-                    if ($sn['name'] != '') {
-                        if ($sn['particle']) {
-                            list($particle, $name) = explode(' ', $sn['name'], 2);
-                            if (!$name) {
-                                list($particle, $name) = explode('\'', $sn['name'], 2);
-                            }
-                        } else {
-                            $particle = '';
-                            $name     = $sn['name'];
-                        }
-                        $particle   = trim($particle);
-                        $name       = trim($name);
-                        $sn['name'] = trim($sn['name']);
-                        XDB::execute("INSERT INTO  profile_name_search (particle, name, typeid, pid)
-                                           VALUES  ({?}, {?}, {?}, {?})",
-                                     $particle, $name, $sn['typeid'], S::i('uid'));
-                        if (!isset($search_names[$sn['typeid']])) {
-                            $search_names[$sn['typeid']] = array($sn['name'], $name);
-                        } else {
-                            $search_names[$sn['typeid']] = array_merge($search_names[$sn['typeid']], array($name));
-                        }
-                    }
-                }
-
-                require_once 'name.func.inc.php';
-                $sn_types_public  = build_types('public');
-                $sn_types_private = build_types('private');
-                $full_name      = build_full_name($search_names, $sn_types_public);
-                $directory_name = build_directory_name($search_names, $sn_types_public, $full_name);
-                $short_name     = short_name($search_names, $sn_types_public);
-                $sort_name      = short_name($search_names, $sn_types_public);
-                $this->values['public_name']  = build_public_name($search_names, $sn_types_public, $full_name);
-                $this->values['private_name'] = $public_name . build_private_name($search_names, $sn_types_private);
-                XDB::execute("UPDATE  profile_display
-                                 SET  yourself = {?}, public_name = {?}, private_name = {?},
-                                      directory_name = {?}, short_name = {?}, sort_name = {?}
-                               WHERE  pid = {?}",
-                             $this->values['yourself'], $this->values['public_name'],
-                             $this->values['private_name'], $directory_name, $short_name,
-                             $sort_name, S::v('uid'));
-                /*if ($this->changed['search_names']) {
-                    require_once('user.func.inc.php');
-                    user_reindex(S::v('uid'));
-                }*/
-            } else {
-                XDB::execute("UPDATE  profile_display
-                                 SET  yourself = {?}
-                               WHERE  pid = {?}",
-                             $this->values['yourself'], S::v('uid'));
-            }
+        if ($this->changed['yourself']) {
+            XDB::execute('UPDATE  accounts
+                             SET  display_name = {?}
+                           WHERE  pid = {?}', $this->pid());
         }
-        if ($this->changed['promo_display']) {
+        if ($this->changed['promo']) {
             XDB::execute("UPDATE  profile_display
                              SET  promo = {?}
                            WHERE  pid = {?}",
-                         $this->values['promo_display'], S::v('uid'));
+                         $this->values['promo'], $this->pid());
         }
     }
 
@@ -465,18 +486,26 @@ class ProfileGeneral extends ProfilePage
     {
         require_once "education.func.inc.php";
 
-        $res = XDB::iterator("SELECT  id, field
-                                FROM  profile_education_field_enum
-                            ORDER BY  field");
+        $res = XDB::query("SELECT  id, field
+                             FROM  profile_education_field_enum
+                         ORDER BY  field");
         $page->assign('edu_fields', $res->fetchAllAssoc());
 
         require_once "emails.combobox.inc.php";
-        fill_email_combobox($page);
+        fill_email_combobox($page, $this->owner, $this->profile);
 
-        $res = XDB::iterator("SELECT  nw.network_type AS type, nw.name
-                                FROM  profile_networking_enum AS nw
-                            ORDER BY  name");
+        $res = XDB::query("SELECT  nw.network_type AS type, nw.name
+                             FROM  profile_networking_enum AS nw
+                         ORDER BY  name");
         $page->assign('network_list', $res->fetchAllAssoc());
+
+        $res = XDB::query("SELECT  public_name, private_name
+                             FROM  profile_display
+                            WHERE  pid = {?}",
+                          $this->pid());
+        $res = $res->fetchOneRow();
+        $page->assign('public_name', $res[0]);
+        $page->assign('private_name', $res[1]);
     }
 }