|| $this->matchWord($ini, $new, $newLen)
|| ($field == 'nom' && $new == 'DE ' . $old);
if (!$success) {
- global $page;
- $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)"));
+ 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)"));
}
return $success ? $value : $current;
}
public function save(ProfilePage &$page, $field, $new_value)
{
- $index = ($field == 'appli1' ? 0 : 1);
+ $index = ($field == 'edu_0' ? 0 : 1);
if ($new_value['id'] > 0) {
XDB::execute("REPLACE INTO applis_ins
SET uid = {?}, aid = {?}, type = {?}, ordre = {?}",
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;
}
$success = true;
foreach($value as $i=>&$network) {
- if(!isset($network['pub'])) {
- $network['pub'] = 'private';
- }
- $network['error'] = false;
- $network['pub'] = $this->pub->value($page, 'pub', $network['pub'], $s);
- $s = true;
- if ($filters[$network['type']] == 'web') {
- $network['address'] = $this->web->value($page, 'address', $network['address'], $s);
- } elseif ($filters[$network['type']] == 'email') {
- $network['address'] = $this->email->value($page, 'address', $network['address'], $s);
- } elseif ($filters[$network['type']] == 'number') {
- $network['address'] = $this->number->value($page, 'address', $network['address'], $s);
- }
- if (!$s) {
- $success = false;
- $network['error'] = true;
+ if (!trim($network['address'])) {
+ unset($value[$i]);
+ } else {
+ if (!isset($network['pub'])) {
+ $network['pub'] = 'private';
+ }
+ $network['error'] = false;
+ $network['pub'] = $this->pub->value($page, 'pub', $network['pub'], $s);
+ $s = true;
+ if ($filters[$network['type']] == 'web') {
+ $network['address'] = $this->web->value($page, 'address', $network['address'], $s);
+ } elseif ($filters[$network['type']] == 'email') {
+ $network['address'] = $this->email->value($page, 'address', $network['address'], $s);
+ } elseif ($filters[$network['type']] == 'number') {
+ $network['address'] = $this->number->value($page, 'address', $network['address'], $s);
+ }
+ if (!$s) {
+ $success = false;
+ $network['error'] = true;
+ }
}
}
return $value;
$this->settings['nom'] = $this->settings['prenom']
= new ProfileNom();
$this->settings['naissance'] = new ProfileDate();
- $this->settings['mobile_pub']
- = $this->settings['freetext_pub']
+ $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['yourself']
= $this->settings['display_name']
= null;
$this->settings['synchro_ax']
= new ProfileBool();
- $this->settings['mobile'] = new ProfileTel();
$this->settings['email_directory']
= new ProfileEmail();
$this->settings['email_directory_new']
= new ProfileEmailDirectory();
$this->settings['networking'] = new ProfileNetworking();
- $this->settings['appli1']
- = $this->settings['appli2']
+ $this->settings['tels'] = new ProfilePhones('user', 0);
+ $this->settings['edu_0']
+ = $this->settings['edu_1']
= new ProfileAppli();
- $this->watched= array('nom' => true, 'freetext' => true, 'mobile' => true,
- 'networking' => true, 'appli1' => true, 'appli2' => true,
- 'nationalite' => true, 'nick' => true);
+ $this->watched= array('nom' => true, 'freetext' => true, 'tels' => true,
+ 'networking' => true, 'edu_0' => true, 'edu_1' => 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 u.promo, u.promo_sortie, 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,
+ IF(a1.aid IS NULL, -1, a1.aid) as edu_id1, a1.type as edu_type1,
+ IF(a2.aid IS NULL, -1, a2.aid) as edu_id2, a2.type as edu_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 telephone AS t ON(u.user_id = t.uid AND link_type = 'user')
+ 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)
$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']);
+ $this->values['edu_0'] = array('id' => $this->values['edu_id1'],
+ 'type' => $this->values['edu_type1']);
+ unset($this->values['edu_id1']);
+ unset($this->values['edu_type1']);
+ $this->values['edu_1'] = array('id' => $this->values['edu_id2'],
+ 'type' => $this->values['edu_type2']);
+ unset($this->values['edu_id2']);
+ unset($this->values['edu_type2']);
// Retreive photo informations
$res = XDB::query("SELECT pub
WHERE sn.user_id = {?}
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();
}
protected function _saveData()
{
- if ($this->changed['nationalite'] || $this->changed['nom'] || $this->changed['prenom']
- || $this->changed['naissance']) {
+ 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 = {?}, nom={?}, prenom={?}, naissance={?}
+ SET nationalite = {?}, nationalite2 = {?}, nationalite3 = {?}, nom={?}, prenom={?}, naissance={?}
WHERE user_id = {?}",
- $this->values['nationalite'], $this->values['nom'], $this->values['prenom'],
+ $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'));
}
$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['mobile'] || $this->changed['mobile_pub']) {
- require_once('profil.func.inc.php');
- $fmt_phone = format_phone_number($this->values['mobile']);
- XDB::execute("DELETE FROM telephone
- WHERE uid = {?} AND link_type = 'user'",
- S::v('uid'));
- if ($fmt_phone != '') {
- XDB::execute("INSERT INTO telephone (uid, link_type, link_id, tel_id, tel_type, search_tel, display_tel, pub)
- VALUES ({?}, 'user', '0', '0', 'mobile', {?}, {?}, {?})",
- S::v('uid'), $fmt_phone, $this->values['mobile'], $this->values['mobile_pub']);
- }
- }
if ($this->changed['nick']) {
require_once('user.func.inc.php');
user_reindex(S::v('uid'));
}
}
- public function _prepare(PlatalPage &$page, $id)
+ public function _prepare(PlPage &$page, $id)
{
require_once "applis.func.inc.php";
projects / platal.git / blobdiff