X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fprofile%2Fgeneral.inc.php;h=bfd280d2c3ae9c7ab8664400fce90bbb96e1e49b;hb=66c4bdaf7813c6dd607a275ab9a2ef163d8b0a51;hp=708c2dc93163fb4b2691d327ec891064813f0b43;hpb=09f9ebea09dfc4283294a41d363843fa7ceefb59;p=platal.git diff --git a/modules/profile/general.inc.php b/modules/profile/general.inc.php index 708c2dc..bfd280d 100644 --- a/modules/profile/general.inc.php +++ b/modules/profile/general.inc.php @@ -1,6 +1,6 @@ name_types = DirEnum::getOptions(DirEnum::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} == ' '); @@ -32,8 +38,7 @@ class ProfileSearchNames implements ProfileSetting private function prepareField($value) { - $value = strtoupper(replace_accent($value)); - return preg_replace('/[^A-Z]/', ' ', $value); + return name_to_basename($value); } private function prepare(ProfilePage &$page, $field, $value, $init, &$success) @@ -46,12 +51,33 @@ class ProfileSearchNames implements ProfileSetting || ($field == 'lastname' && $new == 'DE ' . $ini); if (!$success) { $field = strtolower($field); - Platal::page()->trigError("Le " . $field . " que tu as choisi (" . $value . - ") est trop loin de ton " . $field . " initial (" . $init . ")."); + Platal::page()->trigError("Le " . $this->name_types[$field] . " que tu as choisi (" . $value . + ") est trop loin de ton " . $this->name_types[$field] . " initial (" . $init . ")."); } return $success ? $value : $init; } + /* Removes duplicated entries for the fields that do not allow them. */ + private function clean($value) + { + $single_types = XDB::fetchAllAssoc('id', + 'SELECT id, 0 + FROM profile_name_enum + WHERE NOT FIND_IN_SET(\'allow_duplicates\', flags)'); + + foreach ($value as $key => $item) { + if (isset($single_types[$item['typeid']])) { + if ($single_types[$item['typeid']] === true) { + unset($value[$key]); + } else { + $single_types[$item['typeid']] = true; + } + } + } + + return $value; + } + public function value(ProfilePage &$page, $field, $value, &$success) { $success = true; @@ -67,7 +93,7 @@ class ProfileSearchNames implements ProfileSetting 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", - S::v('uid')); + $page->pid()); $sn_types = XDB::iterator("SELECT id, type, name, FIND_IN_SET('has_particle', flags) AS has_particle @@ -81,7 +107,9 @@ class ProfileSearchNames implements ProfileSetting while ($sn_type = $sn_types->next()) { if ($sn_type['id'] == $sn['typeid']) { $value[] = $sn; - $sn = $sn_all->next(); + if ($sn) { + $sn = $sn_all->next(); + } } else { $value[] = array('name' => '', 'particle' => '', @@ -98,15 +126,22 @@ class ProfileSearchNames implements ProfileSetting $value[] = $sn; } while ($sn = $sn_all->next()); } + require_once 'validations.inc.php'; + $namesRequest = ProfileValidate::get_typed_requests($page->pid(), 'usage'); + if (count($namesRequest) > 0) { + Platal::page()->assign('validation', true); + } + $value = $this->clean($value); } else { require_once 'name.func.inc.php'; + $value = $this->clean($value); $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'", - S::i('uid')); + WHERE s.pid = {?} AND (e.type = 'lastname' OR e.type = 'firstname') + ORDER BY e.type = 'firstname'", + $page->pid()); $res = $res->fetchAllAssoc(); $initial = array(); $initial['lastname'] = $res[0]['particle'] . $res[0]['name']; @@ -122,11 +157,18 @@ class ProfileSearchNames implements ProfileSetting } if ($sn['pub']) { if (isset($sn['particle']) && ($sn['particle'] != '')) { + // particle is before first blank list($particle, $name) = explode(' ', $sn['name'], 2); $particle = trim($particle) . ' '; if (!$name) { + // particle is before first quote list($particle, $name) = explode('\'', $sn['name'], 2); $particle = trim($particle); + if (!$name) { + // actually there is no particle + $particle = ''; + $name = $sn['name']; + } } } else { $particle = ''; @@ -152,7 +194,7 @@ class ProfileSearchNames implements ProfileSetting $res = XDB::query("SELECT public_name, private_name FROM profile_display WHERE pid = {?}", - S::v('uid')); + $page->pid()); list($public_name, $private_name) = $res->fetchOneRow(); if ($success) { $sn_types_private = build_types('private'); @@ -169,35 +211,49 @@ class ProfileSearchNames implements ProfileSetting public function save(ProfilePage &$page, $field, $value) { require_once 'name.func.inc.php'; - $sn_old = build_sn_pub(); + require_once 'validations.inc.php'; + + $sn_old = build_sn_pub($page->pid()); 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)", - S::i('uid')); - $has_new = set_alias_names($this->search_names, $sn_old); + $page->pid()); + $has_new = set_alias_names($this->search_names, $sn_old, $page->pid(), $page->owner->id()); // 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 = new NamesReq(S::user(), $page->profile, $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."); + 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); + build_display_names($display_names, $this->search_names, + $page->profile->isFemale(), $this->private_name_end); + set_profile_display($display_names, $page->profile); } } + + public function getText($value) { + $names = array(); + foreach ($value as $name) { + if ($name['name'] != '') { + $names[] = $name['type_name'] . ' : ' . $name['name']; + } + } + return implode(', ' , $names); + } } -class ProfileEdu implements ProfileSetting +class ProfileSettingEdu implements ProfileSetting { - public function __construct(){} + public function __construct() { + } static function sortByGradYear($line1, $line2) { - $a = (int) $line1['grad_year']; - $b = (int) $line2['grad_year']; + $a = (isset($line1['grad_year'])) ? (int) $line1['grad_year'] : 0; + $b = (isset($line2['grad_year'])) ? (int) $line2['grad_year'] : 0; if ($a == $b) { return 0; } @@ -207,31 +263,34 @@ class ProfileEdu implements ProfileSetting public function value(ProfilePage &$page, $field, $value, &$success) { $success = true; - if (is_null($value) || !is_array($value)) { + if (is_null($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 pid = {?} AND !FIND_IN_SET('primary', flags) + ORDER BY id", + $page->pid()); + } else if (!is_array($value)) { + $value = null; } else { $i = 0; foreach ($value as $key=>&$edu) { - if (($edu['grad_year'] < 1921) || ($edu['grad_year'] > (date('Y') + 4))) { - Platal::page()->trigError('L\'année d\'obtention du diplôme est mal renseignée, elle doit être du type : 2004.'); - $edu['error'] = true; + if ($edu['eduid'] < 1 || !isset($edu['degreeid']) || $edu['degreeid'] < 1) { + Platal::page()->trigError('L\'université ou le diplôme d\'une formation manque.'); $success = false; } + if (($edu['grad_year'] < 1921) || ($edu['grad_year'] > (date('Y') + 4))) { + Platal::page()->trigWarning('L\'année d\'obtention du diplôme est mal ou non renseignée, elle doit être du type : 2004.'); + $edu['grad_year'] = null; + $edu['warning'] = true; + } if ($key != $i) { $value[$i] = $edu; unset($value[$key]); } $i++; } - usort($value, array("ProfileEdu", "sortByGradYear")); + usort($value, array("ProfileSettingEdu", "sortByGradYear")); } return $value; } @@ -239,21 +298,37 @@ class ProfileEdu implements ProfileSetting public function save(ProfilePage &$page, $field, $value) { XDB::execute("DELETE FROM profile_education - WHERE uid = {?} AND !FIND_IN_SET('primary', flags)", - S::i('uid')); + WHERE pid = {?} AND !FIND_IN_SET('primary', flags)", + $page->pid()); foreach ($value as $eduid=>&$edu) { if ($edu['eduid'] != '') { + $fieldId = ($edu['fieldid'] == 0) ? null : $edu['fieldid']; XDB::execute("INSERT INTO profile_education - SET id = {?}, uid = {?}, eduid = {?}, degreeid = {?}, + SET id = {?}, pid = {?}, eduid = {?}, degreeid = {?}, fieldid = {?}, grad_year = {?}, program = {?}", - $eduid, S::i('uid'), $edu['eduid'], $edu['degreeid'], - $edu['fieldid'], $edu['grad_year'], $edu['program']); + $eduid, $page->pid(), $edu['eduid'], $edu['degreeid'], + $fieldId, $edu['grad_year'], $edu['program']); } } } + + public function getText($value) { + $schoolsList = DirEnum::getOptions(DirEnum::EDUSCHOOLS); + $degreesList = DirEnum::getOptions(DirEnum::EDUDEGREES); + $fieldsList = DirEnum::getOptions(DirEnum::EDUFIELDS); + $educations = array(); + foreach ($value as $education) { + $educations[] = 'Université : ' . $schoolsList[$education['eduid']] + . ', diplôme : ' . $degreesList[$education['degreeid']] + . ', domaine : ' . $fieldsList[$education['fieldid']] + . ', année d\'obtention : ' . $education['grad_year'] + . ', intitulé : ' . $education['program']; + } + return implode(', ', $educations); + } } -class ProfileEmailDirectory implements ProfileSetting +class ProfileSettingEmailDirectory implements ProfileSetting { public function __construct(){} public function save(ProfilePage &$page, $field, $value){} @@ -276,9 +351,13 @@ class ProfileEmailDirectory implements ProfileSetting } return $value; } + + public function getText($value) { + return $value; + } } -class ProfileNetworking implements ProfileSetting +class ProfileSettingNetworking implements ProfileSetting { private $email; private $pub; @@ -287,34 +366,25 @@ class ProfileNetworking implements ProfileSetting public function __construct() { - $this->email = new ProfileEmail(); - $this->pub = new ProfilePub(); - $this->web = new ProfileWeb(); - $this->number = new ProfileNumber(); + $this->email = new ProfileSettingEmail(); + $this->pub = new ProfileSettingPub(); + $this->web = new ProfileSettingWeb(); + $this->number = new ProfileSettingNumber(); } 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.pub, n.nwid AS type + FROM profile_networking AS n + WHERE n.pid = {?}", + $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, nwid AS type, name + FROM profile_networking_enum;'); $success = true; foreach($value as $i=>&$network) { if (!trim($network['address'])) { @@ -326,11 +396,12 @@ class ProfileNetworking implements ProfileSetting $network['error'] = false; $network['pub'] = $this->pub->value($page, 'pub', $network['pub'], $s); $s = true; - if ($filters[$network['type']] == 'web') { + $network['name'] = $filters[$network['type']]['name']; + if ($filters[$network['type']]['filter'] == 'web') { $network['address'] = $this->web->value($page, 'address', $network['address'], $s); - } elseif ($filters[$network['type']] == 'email') { + } elseif ($filters[$network['type']]['filter'] == 'email') { $network['address'] = $this->email->value($page, 'address', $network['address'], $s); - } elseif ($filters[$network['type']] == 'number') { + } elseif ($filters[$network['type']]['filter'] == 'number') { $network['address'] = $this->number->value($page, 'address', $network['address'], $s); } if (!$s) { @@ -345,21 +416,108 @@ class ProfileNetworking implements ProfileSetting public function save(ProfilePage &$page, $field, $value) { XDB::execute("DELETE FROM profile_networking - WHERE uid = {?}", - S::i('uid')); + WHERE pid = {?}", + $page->pid()); if (!count($value)) { return; } $insert = array(); foreach ($value as $id=>$network) { - XDB::execute("INSERT INTO profile_networking (uid, nwid, network_type, address, pub) + XDB::execute("INSERT INTO profile_networking (pid, id, nwid, address, pub) VALUES ({?}, {?}, {?}, {?}, {?})", - S::i('uid'), $id, $network['type'], $network['address'], $network['pub']); + $page->pid(), $id, $network['type'], $network['address'], $network['pub']); + } + } + + public function getText($value) { + $networkings = array(); + foreach ($value as $network) { + $networkings[] = 'nom : ' . $network['name'] . ', adresse : ' . $network['address'] + . ', affichage : ' . $network['pub']; } + return implode(' ; ' , $networkings); } } -class ProfileGeneral extends ProfilePage +class ProfileSettingPromo implements ProfileSetting +{ + public function __construct(){} + + public function save(ProfilePage &$page, $field, $value) + { + $gradYearNew = $value; + if ($page->profile->mainEducation() == 'X') { + $gradYearNew += $page->profile->mainEducationDuration(); + } + if (($page->profile->mainEducation() != 'X' + && $value == $page->profile->entry_year + $page->profile->mainEducationDuration()) + || ($page->profile->mainEducation() == 'X' && $value == $page->profile->entry_year)) { + XDB::execute('UPDATE profile_display + SET promo = {?} + WHERE pid = {?}', + $page->profile->mainEducation() . strval($value), $page->profile->id()); + XDB::execute('UPDATE profile_education + SET grad_year = {?} + WHERE pid = {?} AND FIND_IN_SET(\'primary\', flags)', + $gradYearNew, $page->profile->id()); + Platal::page()->trigSuccess('Ton statut « orange » a été supprimé.'); + } else { + require_once 'validations.inc.php'; + + $myorange = new OrangeReq(S::user(), $page->profile, $gradYearNew); + $myorange->submit(); + Platal::page()->trigSuccess('Tu pourras changer l\'affichage de ta promotion dès que ta nouvelle promotion aura été validée.'); + } + } + + public function value(ProfilePage &$page, $field, $value, &$success) + { + $entryYear = $page->profile->entry_year; + $gradYear = $page->profile->grad_year; + $yearpromo = $page->profile->grad_year; + if ($page->profile->mainEducation() == 'X') { + $yearpromo -= $page->profile->mainEducationDuration(); + } + $success = true; + if (is_null($value) || $value == $yearpromo) { + if ($gradYear != $entryYear + $page->profile->mainEducationDuration()) { + $promoChoice = array(); + for ($i = $entryYear; $i <= $gradYear - $page->profile->mainEducationDuration(); ++$i) { + if ($page->profile->mainEducation() == 'X') { + $promoChoice[] = $page->profile->mainEducation() . strval($i); + } else { + $promoChoice[] = $page->profile->mainEducation() . strval($i + $page->profile->mainEducationDuration()); + } + } + Platal::page()->assign('promo_choice', $promoChoice); + } + return $yearpromo; + } + + // If this profile belongs to an X, $promoNew needs to be changed to + // the graduation year. + $gradYearNew = $value; + if ($page->profile->mainEducation() == 'X') { + $gradYearNew += $page->profile->mainEducationDuration(); + } + + if ($value < 1000 || $value > 9999) { + Platal::page()->trigError('L\'année de sortie doit être un nombre de quatre chiffres.'); + $success = false; + } elseif ($gradYearNew < $entryYear + $page->profile->mainEducationDuration()) { + Platal::page()->trigError('Trop tôt !'); + $success = false; + } + return intval($value); + } + + public function getText($value) { + return $value; + } +} + + +class ProfilePageGeneral extends ProfilePage { protected $pg_template = 'profile/general.tpl'; @@ -367,127 +525,133 @@ class ProfileGeneral extends ProfilePage { parent::__construct($wiz); $this->settings['search_names'] - = new ProfileSearchNames(); - $this->settings['naissance'] - = new ProfileDate(); + = new ProfileSettingSearchNames(); + $this->settings['birthdate'] = new ProfileSettingDate(); $this->settings['freetext_pub'] = $this->settings['photo_pub'] - = new ProfilePub(); + = new ProfileSettingPub(); $this->settings['freetext'] - = $this->settings['nationalite'] - = $this->settings['nationalite2'] - = $this->settings['nationalite3'] + = $this->settings['nationality1'] + = $this->settings['nationality2'] + = $this->settings['nationality3'] = $this->settings['yourself'] - = $this->settings['promo'] + = $this->settings['promo_display'] = null; $this->settings['email_directory'] - = new ProfileEmail(); + = new ProfileSettingEmail(); $this->settings['email_directory_new'] - = new ProfileEmailDirectory(); - $this->settings['networking'] = new ProfileNetworking(); - $this->settings['tels'] = new ProfilePhones('user', 0); - $this->settings['edus'] = new ProfileEdu(); + = new ProfileSettingEmailDirectory(); + $this->settings['networking'] = new ProfileSettingNetworking(); + $this->settings['tels'] = new ProfileSettingPhones(); + $this->settings['edus'] = new ProfileSettingEdu(); + $this->settings['promo'] = new ProfileSettingPromo(); $this->watched= array('freetext' => true, 'tels' => true, 'networking' => true, 'edus' => true, - 'nationalite' => true, 'nationalite2' => true, - 'nationalite3' => true, 'search_names' => true); + 'nationality1' => true, 'nationality2' => true, + 'nationality3' => true, 'search_names' => true); } protected function _fetchData() { // Checkout all data... - $res = XDB::query("SELECT p.promo, e.entry_year AS entry_year, e.grad_year AS grad_year, - u.nationalite, u.nationalite2, u.nationalite3, u.naissance, - 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, - u.matricule_ax, 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)); + $res = XDB::query("SELECT p.nationality1, p.nationality2, p.nationality3, p.birthdate, + p.email_directory as email_directory, pd.promo AS promo_display, + p.freetext, p.freetext_pub, p.ax_id AS matricule_ax, pd.yourself + FROM profiles AS p + INNER JOIN profile_display AS pd ON (pd.pid = p.pid) + WHERE p.pid = {?}", $this->pid()); $this->values = $res->fetchOneAssoc(); // 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(); - - // 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; - } + if ($this->owner) { + $res = XDB::query("SELECT COUNT(*) + FROM requests + WHERE type = 'photo' AND pid = {?}", + $this->owner->id()); + $this->values['nouvellephoto'] = $res->fetchOneCell(); + } else { + $this->values['nouvellephoto'] = 0; } } 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'] + || $this->changed['email_directory']) { + 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; + } + if ($this->values['nationality1'] == $this->values['nationality2'] + && $this->values['nationality2'] == $this->values['nationality3']) { + $this->values['nationality2'] = NULL; + $this->values['nationality3'] = NULL; + } else if ($this->values['nationality1'] == $this->values['nationality2']) { + $this->values['nationality2'] = $this->values['nationality3']; + $this->values['nationality3'] = NULL; + } else if ($this->values['nationality2'] == $this->values['nationality3'] + || $this->values['nationality1'] == $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']) { - XDB::execute("UPDATE auth_user_quick - SET profile_freetext={?}, profile_freetext_pub={?} - WHERE user_id = {?}", - $this->values['freetext'], $this->values['freetext_pub'], S::v('uid')); - } - if ($this->changed['email_directory']) { $new_email = ($this->values['email_directory'] == "new@example.org") ? $this->values['email_directory_new'] : $this->values['email_directory']; if ($new_email == "") { $new_email = NULL; } - XDB::execute("REPLACE INTO profile_directory (uid, email_directory) - VALUES ({?}, {?})", - S::v('uid'), $new_email); + + XDB::execute("UPDATE profiles + SET nationality1 = {?}, nationality2 = {?}, nationality3 = {?}, birthdate = {?}, + freetext = {?}, freetext_pub = {?}, email_directory = {?} + 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'], $new_email, $this->pid()); } 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']) { - XDB::execute("UPDATE profile_display + if ($this->owner) { + XDB::execute('UPDATE accounts + SET display_name = {?} + WHERE uid = {?}', + $this->values['yourself'], $this->owner->id()); + } + XDB::execute('UPDATE profile_display SET yourself = {?} - WHERE pid = {?}", - $this->values['yourself'], S::v('uid')); + WHERE pid = {?}', $this->values['yourself'], + $this->pid()); } - if ($this->changed['promo']) { - XDB::execute("UPDATE profile_display - SET promo = {?} - WHERE pid = {?}", - $this->values['promo'], S::v('uid')); + if ($this->changed['promo_display']) { + if ($this->values['promo_display']{0} == $this->profile->mainEducation()) { + if (($this->profile->mainEducation() == 'X' + && intval(substr($this->values['promo_display'], 1, 4)) >= $this->profile->entry_year) + || ($this->profile->mainEducation() != 'X' + && intval(substr($this->values['promo_display'], 1, 4)) >= $this->profile->entry_year + $this->profile->mainEducationDuration())) { + XDB::execute('UPDATE profile_display + SET promo = {?} + WHERE pid = {?}', + $this->values['promo_display'], $this->pid()); + } + } } } @@ -495,26 +659,27 @@ 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); - $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.nwid 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 = {?}", - S::v('uid')); + $this->pid()); $res = $res->fetchOneRow(); $page->assign('public_name', $res[0]); $page->assign('private_name', $res[1]); + $page->assign('isFemale', $this->profile->isFemale() ? 1 : 0); } }