<?php
/***************************************************************************
- * Copyright (C) 2003-2010 Polytechnique.org *
+ * Copyright (C) 2003-2011 Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
public function save(ProfilePage &$page, $field, $value)
{
- Phone::deletePhones($page->pid(), Phone::LINK_PROFILE);
+ Phone::deletePhones($page->pid(), Phone::LINK_PROFILE, null, S::user()->isMe($page->owner) || S::admin());
Phone::savePhones($value, $page->pid(), Phone::LINK_PROFILE);
}
}
public function getText($value) {
- return $value;
+ static $pubs = array('public' => 'publique', 'ax' => 'annuaire AX', 'private' => 'privé');
+ return $pubs[$value];
}
}
$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];
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]);
+ 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;
// 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 ($issue as $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 = {?}",