}
}
-class ProfileAppli implements ProfileSetting
+class ProfileEdu implements ProfileSetting
{
+ public function __construct(){}
+
+ static function sortByGradYear($line1, $line2) {
+ $a = (int) $line1['grad_year'];
+ $b = (int) $line2['grad_year'];
+ if ($a == $b) {
+ return 0;
+ }
+ return ($a < $b) ? -1 : 1;
+ }
+
public function value(ProfilePage &$page, $field, $value, &$success)
{
$success = true;
- if (is_null($value)) {
- return $page->values[$field];
+ 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;
+ }
+ } 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;
+ $success = false;
+ }
+ if ($key != $i) {
+ $value[$i] = $edu;
+ unset($value[$key]);
+ }
+ $i++;
+ }
+ usort($value, array("ProfileEdu", "sortByGradYear"));
}
return $value;
}
- public function save(ProfilePage &$page, $field, $new_value)
+ public function save(ProfilePage &$page, $field, $value)
{
- $index = ($field == 'appli1' ? 0 : 1);
- if ($new_value['id'] > 0) {
- XDB::execute("REPLACE INTO applis_ins
- SET uid = {?}, aid = {?}, type = {?}, ordre = {?}",
- S::i('uid'), $new_value['id'], $new_value['type'], $index);
- } else {
- XDB::execute("DELETE FROM applis_ins
- WHERE uid = {?} AND ordre = {?}",
- S::i('uid'), $index);
+ XDB::execute("DELETE FROM profile_education
+ WHERE uid = {?} AND !FIND_IN_SET('primary', flags)",
+ S::i('uid'));
+ 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'],
+ $edu['fieldid'], $edu['grad_year'], $edu['program']);
+ }
}
}
}
class ProfileEmailDirectory implements ProfileSetting
{
- private $email;
-
- public function __construct()
- {
- }
+ public function __construct(){}
+ public function save(ProfilePage &$page, $field, $value){}
public function value(ProfilePage &$page, $field, $value, &$success)
{
- $p = $page;
- global $page;
+ $p = Platal::page();
$success = true;
if (!is_null($value)) {
$email_stripped = strtolower(trim($value));
- if ((!isvalid_email($email_stripped)) && ($email_stripped) && ($p->values['email_directory'] == "new@new.new")) {
- $page->assign('email_error', '1');
- $page->assign('email_directory_error', $email_stripped);
- $page->trigError('Adresse Email invalide');
+ if ((!isvalid_email($email_stripped)) && ($email_stripped) && ($page->values['email_directory'] == "new@example.org")) {
+ $p->assign('email_error', '1');
+ $p->assign('email_directory_error', $email_stripped);
+ $p->trigError('Adresse Email invalide');
$success = false;
} else {
- $page->assign('email_error', '0');
+ $p->assign('email_error', '0');
}
}
return $value;
}
-
- public function save(ProfilePage &$page, $field, $value)
- {
- }
}
class ProfileNetworking implements ProfileSetting
= new ProfilePub();
$this->settings['freetext']
= $this->settings['nationalite']
+ = $this->settings['nationalite2']
+ = $this->settings['nationalite3']
= $this->settings['nick']
= $this->settings['yourself']
= $this->settings['display_name']
= $this->settings['sort_name']
= $this->settings['tooltip_name']
+ = $this->settings['promo_display']
= null;
$this->settings['synchro_ax']
= new ProfileBool();
$this->settings['email_directory_new']
= new ProfileEmailDirectory();
$this->settings['networking'] = new ProfileNetworking();
- $this->settings['tels'] = new ProfilePhones('user', 0);
- $this->settings['appli1']
- = $this->settings['appli2']
- = new ProfileAppli();
+ $this->settings['tels'] = new ProfilePhones('user', 0);
+ $this->settings['edus'] = new ProfileEdu();
$this->watched= array('nom' => true, 'freetext' => true, 'tels' => true,
- 'networking' => true, 'appli1' => true, 'appli2' => true,
- 'nationalite' => true, 'nick' => true);
+ 'networking' => true, 'edus' => true,
+ 'nationalite' => true, 'nationalite2' => true,
+ 'nationalite3' => true, 'nick' => true);
}
protected function _fetchData()
{
// Checkout all data...
- $res = XDB::query("SELECT u.promo, u.promo_sortie, u.nom_usage, u.nationalite, u.naissance,
+ $res = XDB::query("SELECT p.promo_display, e.entry_year AS entry_year, e.grad_year AS grad_year,
+ u.nom_usage, 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,
q.profile_nick as nick, q.profile_from_ax as synchro_ax, u.matricule_ax,
- IF(a1.aid IS NULL, -1, a1.aid) as appli_id1, a1.type as appli_type1,
- IF(a2.aid IS NULL, -1, a2.aid) as appli_id2, a2.type as appli_type2,
n.yourself, n.display AS display_name, n.sort AS sort_name,
n.tooltip AS tooltip_name
FROM auth_user_md5 AS u
- INNER JOIN auth_user_quick AS q ON(u.user_id = q.user_id)
- INNER JOIN profile_names_display AS n ON(n.user_id = u.user_id)
- 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)
- LEFT JOIN applis_ins AS a1 ON(a1.uid = u.user_id and a1.ordre = 0)
- LEFT JOIN applis_ins AS a2 ON(a2.uid = u.user_id and a2.ordre = 1)
+ INNER JOIN auth_user_quick AS q ON (u.user_id = q.user_id)
+ INNER JOIN profile_names_display AS n ON (n.user_id = u.user_id)
+ INNER JOIN profile_display AS p ON (p.uid = 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));
$this->values = $res->fetchOneAssoc();
- // Reformat formation data
- $this->values['appli1'] = array('id' => $this->values['appli_id1'],
- 'type' => $this->values['appli_type1']);
- unset($this->values['appli_id1']);
- unset($this->values['appli_type1']);
- $this->values['appli2'] = array('id' => $this->values['appli_id2'],
- 'type' => $this->values['appli_type2']);
- unset($this->values['appli_id2']);
- unset($this->values['appli_type2']);
-
// Retreive photo informations
$res = XDB::query("SELECT pub
FROM photo
ORDER BY sn.name_type, search_score, search_name",
S::v('uid'));
- // Retreive phones
- $res = XDB::iterator("SELECT t.display_tel AS tel, t.tel_type AS type, t.pub, t.comment
- FROM profile_phones AS t
- WHERE t.uid = {?} AND t.link_type = 'user'
- ORDER BY t.tel_id",
- S::v('uid'));
- $this->values['tels'] = $res->fetchAllAssoc();
+ // Proposes choice for promo_display
+ 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;
+ }
+ }
}
protected function _saveData()
{
- if ($this->changed['nationalite'] || $this->changed['nom'] || $this->changed['prenom']
- || $this->changed['naissance']) {
- XDB::execute("UPDATE auth_user_md5
- SET nationalite = {?}, nom={?}, prenom={?}, naissance={?}
- WHERE user_id = {?}",
- $this->values['nationalite'], $this->values['nom'], $this->values['prenom'],
- preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $this->values['naissance']),
- S::v('uid'));
+ if ($this->changed['nationalite'] || $this->changed['nationalite2'] || $this->changed['nationalite3']
+ || $this->changed['nom'] || $this->changed['prenom'] || $this->changed['naissance']) {
+ if ($this->values['nationalite3'] == "") {
+ $this->values['nationalite3'] = NULL;
+ }
+ if ($this->values['nationalite2'] == "") {
+ $this->values['nationalite2'] = $this->values['nationalite3'];
+ $this->values['nationalite3'] = NULL;
+ }
+ if ($this->values['nationalite'] == "") {
+ $this->values['nationalite'] = $this->values['nationalite2'];
+ $this->values['nationalite2'] = $this->values['nationalite3'];
+ $this->values['nationalite3'] = NULL;
+ }
+
+ XDB::execute("UPDATE auth_user_md5
+ SET nationalite = {?}, nationalite2 = {?}, nationalite3 = {?}, nom={?}, prenom={?}, naissance={?}
+ WHERE user_id = {?}",
+ $this->values['nationalite'], $this->values['nationalite2'], $this->values['nationalite3'],
+ $this->values['nom'], $this->values['prenom'],
+ preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $this->values['naissance']),
+ S::v('uid'));
}
if ($this->changed['nick'] || $this->changed['freetext'] || $this->changed['freetext_pub'] || $this->changed['synchro_ax']) {
XDB::execute("UPDATE auth_user_quick
$this->values['synchro_ax'], S::v('uid'));
}
if ($this->changed['email_directory']) {
- $new_email = ($this->values['email_directory'] == "new@new.new") ?
+ $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);
}
if ($this->changed['yourself'] || $this->changed['sort_name'] ||
$this-> changed['display_name'] || $this->changed['tooltip_name']) {
- XDB::execute("UPDATE profile_names_display AS n
- SET n.yourself = {?},
- n.sort = {?}, ". // SET
- "n.display = {?}, ". // SET
- "n.tooltip = {?} ". // SET
- "WHERE n.user_id = {?}",
- $this->values['yourself'],
- $this->values['sort_name'],
- $this->values['display_name'],
- $this->values['tooltip_name'],
- S::v('uid'));
+ XDB::execute("UPDATE profile_names_display AS n
+ SET n.yourself = {?},
+ n.sort = {?}, ". // SET
+ "n.display = {?}, ". // SET
+ "n.tooltip = {?} ". // SET
+ "WHERE n.user_id = {?}",
+ $this->values['yourself'],
+ $this->values['sort_name'],
+ $this->values['display_name'],
+ $this->values['tooltip_name'],
+ S::v('uid'));
+ }
+ if ($this->changed['promo_display']) {
+ XDB::execute("UPDATE profile_display
+ SET promo_display = {?}
+ WHERE uid = {?}",
+ $this->values['promo_display'], S::v('uid'));
}
}
public function _prepare(PlPage &$page, $id)
{
- require_once "applis.func.inc.php";
+ require_once "education.func.inc.php";
+
+ $res = XDB::iterator("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);
projects / platal.git / blobdiff