<?php
/***************************************************************************
- * Copyright (C) 2003-2010 Polytechnique.org *
+ * Copyright (C) 2003-2014 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* Whatever happen, this function must always returns the function to
* show on the page to the user.
*/
- public function value(ProfilePage &$page, $field, $value, &$success);
+ public function value(ProfilePage $page, $field, $value, &$success);
/** Save the new value for the given field.
*/
- public function save(ProfilePage &$page, $field, $new_value);
+ public function save(ProfilePage $page, $field, $new_value);
/** Get text from the value.
*/
abstract class ProfileNoSave implements ProfileSetting
{
- public function save(ProfilePage &$page, $field, $new_value) { }
+ public function save(ProfilePage $page, $field, $new_value) { }
public function getText($value) {
return $value;
class ProfileSettingWeb extends ProfileNoSave
{
- public function value(ProfilePage &$page, $field, $value, &$success)
+ public function value(ProfilePage $page, $field, $value, &$success)
{
if (is_null($value)) {
return isset($page->values[$field]) ? $page->values[$field] : S::v($field);
class ProfileSettingEmail extends ProfileNoSave
{
- public function value(ProfilePage &$page, $field, $value, &$success)
+ public function value(ProfilePage $page, $field, $value, &$success)
{
if (is_null($value)) {
return isset($page->values[$field]) ? $page->values[$field] : S::v($field);
class ProfileSettingNumber extends ProfileNoSave
{
- public function value(ProfilePage &$page, $field, $value, &$success)
+ public function value(ProfilePage $page, $field, $value, &$success)
{
if (is_null($value)) {
return isset($page->values[$field]) ? $page->values[$field] : S::v($field);
}
}
-
-class ProfileSettingTel extends ProfileNoSave
-{
- public function value(ProfilePage &$page, $field, $value, &$success)
- {
- if (is_null($value)) {
- return isset($page->values[$field]) ? $page->values[$field] : S::v($field);
- }
- require_once('profil.func.inc.php');
- $value = format_phone_number($value);
- if($value == '') {
- $success = true;
- return $value;
- }
- $value = format_display_number($value,$error);
- $success = !$error;
- if (!$success) {
- Platal::page()->trigError('Le préfixe international du numéro de téléphone est inconnu. ');
- }
- return $value;
- }
-}
-
class ProfileSettingPhones implements ProfileSetting
{
- private $tel;
- private $pub;
- protected $link_type;
- protected $link_id;
-
- public function __construct($type, $link_id)
- {
- $this->tel = new ProfileSettingTel();
- $this->pub = new ProfileSettingPub();
- $this->link_type = $type;
- $this->link_id = $link_id;
- }
-
- public function value(ProfilePage &$page, $field, $value, &$success)
+ public function value(ProfilePage $page, $field, $value, &$success)
{
$success = true;
- if (is_null($value)) {
- $value = array();
- $res = XDB::iterator('SELECT display_tel AS tel, tel_type AS type, pub, comment
- FROM profile_phones
- WHERE pid = {?} AND link_type = {?}
- ORDER BY tel_id',
- $page->pid(), $this->link_type);
- if ($res->numRows() > 0) {
- $value = $res->fetchAllAssoc();
- } else {
- $value = array(
- 0 => array(
- 'type' => 'fixed',
- 'tel' => '',
- 'pub' => 'private',
- 'comment' => '',
- )
- );
- }
- }
+ $phones = array();
- foreach ($value as $key=>&$phone) {
- $phone['pub'] = $this->pub->value($page, 'pub', $phone['pub'], $s);
- $phone['tel'] = $this->tel->value($page, 'tel', $phone['tel'], $s);
- if(!isset($phone['type']) || ($phone['type'] != 'fixed' && $phone['type'] != 'mobile' && $phone['type'] != 'fax')) {
- $phone['type'] = 'fixed';
- $s = false;
+ if (is_null($value)) {
+ $it = Phone::iterate(array($page->pid()), array(Phone::LINK_PROFILE), array(0), Visibility::get(Visibility::VIEW_ADMIN));
+ while ($phone = $it->next()) {
+ $success = ($phone->format() && $success);
+ $phones[] = $phone->toFormArray();
}
- if (!$s) {
- $phone['error'] = true;
- $success = false;
+ if (count($phones) == 0) {
+ $phone = new Phone();
+ $phones[] = $phone->toFormArray();
}
- if (!isset($phone['comment'])) {
- $phone['comment'] = '';
+ return $phones;
+ } else {
+ $phones = Phone::formatFormArray($value, $success);
+ if (!$success) {
+ Platal::page()->trigError('Numéro de téléphone invalide');
}
- }
-
- return $value;
- }
-
- private function saveTel($pid, $telid, array &$phone)
- {
- if ($phone['tel'] != '') {
- XDB::execute("INSERT INTO profile_phones (pid, link_type, link_id, tel_id, tel_type,
- search_tel, display_tel, pub, comment)
- VALUES ({?}, {?}, {?}, {?}, {?},
- {?}, {?}, {?}, {?})",
- $pid, $this->link_type, $this->link_id, $telid, $phone['type'],
- format_phone_number($phone['tel']), $phone['tel'], $phone['pub'], $phone['comment']);
+ return $phones;
}
}
- public function save(ProfilePage &$page, $field, $value)
+ public function save(ProfilePage $page, $field, $value)
{
- XDB::execute("DELETE FROM profile_phones
- WHERE pid = {?} AND link_type = {?} AND link_id = {?}",
- $page->pid(), $this->link_type, $this->link_id);
- $this->saveTels($page->pid(), $field, $value);
+ Phone::deletePhones($page->pid(), Phone::LINK_PROFILE, null, S::user()->isMe($page->owner) || S::admin());
+ Phone::savePhones($value, $page->pid(), Phone::LINK_PROFILE);
}
- //Only saves phones without a delete operation
- public function saveTels($pid, $field, $value)
+ public function getText($value)
{
- foreach ($value as $telid=>&$phone) {
- $this->saveTel($pid, $telid, $phone);
- }
- }
-
- public function getText($value) {
- $phones = array();
- foreach ($value as $phone) {
- if ($phone['tel'] != '') {
- $phones[] = 'type : ' . $phone['type'] .', numéro : ' . $phone['tel']
- . ', commentaire : « ' . $phone['comment'] . ' », affichage : ' . $phone['pub'];
- }
- }
- return implode(' ; ' , $phones);
+ return Phone::formArrayToString($value);
}
}
class ProfileSettingPub extends ProfileNoSave
{
- public function value(ProfilePage &$page, $field, $value, &$success)
+ public function value(ProfilePage $page, $field, $value, &$success)
{
$success = true;
if (is_null($value)) {
}
public function getText($value) {
- return $value;
+ static $pubs = array('public' => 'publique', 'ax' => 'annuaire papier', 'private' => 'privé', 'hidden' => 'administrateurs');
+ return $pubs[$value];
}
}
class ProfileSettingBool extends ProfileNoSave
{
- public function value(ProfilePage &$page, $field, $value, &$success)
+ public function value(ProfilePage $page, $field, $value, &$success)
{
$success = true;
if (is_null($value)) {
class ProfileSettingDate extends ProfileNoSave
{
- public function value(ProfilePage &$page, $field, $value, &$success)
+ private $allowEmpty;
+
+ public function __construct($allowEmpty = false)
+ {
+ $this->allowEmpty = $allowEmpty;
+ }
+
+ public function value(ProfilePage $page, $field, $value, &$success)
{
$success = true;
if (is_null($value)) {
$value = preg_replace('/(\d{4})-(\d{2})-(\d{2})/', '\3/\2/\1', @$page->values[$field]);
} else {
+ $value = trim($value);
+ if (empty($value) && $this->allowEmpty) {
+ return null;
+ }
$success = preg_match('@(\d{2})/(\d{2})/(\d{4})@', $value, $matches);
if (!$success) {
Platal::page()->trigError("Les dates doivent être au format jj/mm/aaaa");
- } else {
+ } else {
$day = (int)$matches[1];
$month = (int)$matches[2];
$year = (int)$matches[3];
}
return $value;
}
-}
-abstract class ProfileSettingGeocoding implements ProfileSetting
-{
- protected function geocodeAddress(array &$address, &$success)
+ public static function toSQLDate($value)
{
- require_once 'geocoding.inc.php';
- $success = true;
- if (isset($address['changed']) && $address['changed'] == 1) {
- $gmapsGeocoder = new GMapsGeocoder();
- $address = $gmapsGeocoder->getGeocodedAddress($address);
- if (isset($address['geoloc'])) {
- $success = false;
- }
- } elseif (@$address['changed'] && !@$address['text']) {
- $address = empty_address();
- $address['pub'] = 'private';
- }
- if (isset($address['geoloc_choice']) && ($address['geoloc_choice'] == 0)) {
- $mailer = new PlMailer('geoloc/geoloc.mail.tpl');
- $mailer->assign('text', $address['text']);
- $mailer->assign('geoloc', $address['geoloc']);
- $mailer->send();
- $gmapsGeocoder = new GMapsGeocoder();
- $address = $gmapsGeocoder->stripGeocodingFromAddress($address);
- }
- }
-
- public function getText($value) {
- return $value;
+ return preg_replace('@(\d{2})/(\d{2})/(\d{4})@', '\3-\2-\1', $value);
}
}
-
abstract class ProfilePage implements PlWizardPage
{
protected $wizard;
public $profile = null;
public $owner = null;
- public function __construct(PlWizard &$wiz)
+ public function __construct(PlWizard $wiz)
{
$this->wizard =& $wiz;
$this->profile = $this->wizard->getUserData('profile');
{
}
- protected function saveData()
+ public function saveData()
{
require_once 'notifs.inc.php';
$changedFields = array();
if ($this->changed[$field]) {
if (!is_null($setting)) {
$changedFields[$field] = array(
- str_replace("\n", " - ", $setting->getText($this->orig[$field])),
- str_replace("\n", " - ", $setting->getText($this->values[$field])),
+ preg_replace('/(\r\n|\n|\r)/', ' - ', $setting->getText($this->orig[$field])),
+ preg_replace('/(\r\n|\n|\r)/', ' - ', $setting->getText($this->values[$field])),
);
} else {
$changedFields[$field] = array(
- str_replace("\n", " - ", $this->orig[$field]),
- str_replace("\n", " - ", $this->values[$field]),
+ preg_replace('/(\r\n|\n|\r)/', ' - ', $this->orig[$field]),
+ preg_replace('/(\r\n|\n|\r)/', ' - ', $this->values[$field]),
);
}
if (!is_null($setting)) {
global $platal;
S::logger()->log('profil', $platal->pl_self(2));
- /** If the update was made by a third party and the profile corresponds
- * to a registered user, stores both former and new text.
- * This will be daily sent to the user.
+ /** Stores all profile modifications for active users in order to:
+ * -daily notify the user in case of third party edition,
+ * -display the modification to the secretaries for verification in
+ * case of an edition made by the user.
*/
$owner = $this->profile->owner();
$user = S::user();
- if ($owner->isActive() && $owner->id() != $user->id()) {
+ if ($owner->isActive()) {
foreach ($changedFields as $field => $values) {
- XDB::execute('REPLACE INTO profile_modifications (pid, uid, field, oldText, newText)
- VALUES ({?}, {?}, {?}, {?}, {?})',
- $this->pid(), $user->id(), $field, $values[0], $values[1]);
+ if (in_array($field, Profile::$descriptions)) {
+ XDB::execute('INSERT INTO profile_modifications (pid, uid, field, oldText, newText, type, timestamp)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, NOW())
+ ON DUPLICATE KEY UPDATE uid = VALUES(uid), oldText = IF(VALUES(type) != type, VALUES(oldText), oldText),
+ newText = VALUES(newText), type = VALUES(type), timestamp = NOW()',
+ $this->pid(), $user->id(), Profile::$descriptions[$field], $values[0], $values[1],
+ ($owner->id() == $user->id()) ? 'self' : 'third_party');
+ }
}
}
+ return true;
}
protected function checkChanges()
return $this->profile->hrpid();
}
- protected function _prepare(PlPage &$page, $id)
+ protected function _prepare(PlPage $page, $id)
{
}
- public function prepare(PlPage &$page, $id)
+ public function prepare(PlPage $page, $id)
{
if (count($this->values) == 0) {
$this->fetchData();
}
if ($global_success) {
if ($this->checkChanges()) {
- $this->saveData();
+ /* Save changes atomically to avoid inconsistent state
+ * in case of error.
+ */
+ if (!XDB::runTransaction(array($this, 'saveData'))) {
+ $global_success = false;
+ return PlWizard::CURRENT_PAGE;
+ }
$this->markChange();
}
+ // XXX: removes this code once all merge related issues have been fixed.
+ static $issues = array(0 => array('name', 'promo', 'phone', 'education'), 1 => array('address'), 2 => array('job'));
+ if (isset($issues[Post::i('valid_page')])) {
+ foreach ($issues[Post::i('valid_page')] as $issue) {
+ XDB::execute("UPDATE profile_merge_issues
+ SET issues = REPLACE(issues, {?}, '')
+ WHERE pid = {?}",
+ $issue, $this->pid());
+ }
+ }
return Post::has('next_page') ? PlWizard::NEXT_PAGE : PlWizard::CURRENT_PAGE;
}
- Platal::page()->trigError("Certains champs n'ont pas pu être validés, merci de corriger les informations "
- . "de ton profil et de revalider ta demande.");
+ $text = "Certains champs n'ont pas pu être validés, merci de corriger les informations "
+ . (S::user()->isMe($this->owner) ? "de ton profil et de revalider ta demande."
+ : "du profil et de revalider ta demande.");
+ Platal::page()->trigError($text);
return PlWizard::CURRENT_PAGE;
}
public function success()
{
- return 'Ton profil a bien été mis à jour.';
+ if (S::user()->isMe($this->owner)) {
+ return 'Ton profil a bien été mis à jour.';
+ } else {
+ return 'Le profil a bien été mis à jour.';
+ }
}
}
require_once dirname(__FILE__) . '/groups.inc.php';
require_once dirname(__FILE__) . '/decos.inc.php';
require_once dirname(__FILE__) . '/jobs.inc.php';
-require_once dirname(__FILE__) . '/skills.inc.php';
require_once dirname(__FILE__) . '/mentor.inc.php';
+require_once dirname(__FILE__) . '/deltaten.inc.php';
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
?>
projects / platal.git / blobdiff