'admin/ipwatch' => $this->make_hook('ipwatch', AUTH_MDP, 'admin'),
'admin/icons' => $this->make_hook('icons', AUTH_MDP, 'admin'),
'admin/accounts' => $this->make_hook('accounts', AUTH_MDP, 'admin'),
+ 'admin/account/watch' => $this->make_hook('account_watch', AUTH_MDP, 'admin'),
'admin/account/types' => $this->make_hook('account_types', AUTH_MDP, 'admin'),
'admin/jobs' => $this->make_hook('jobs', AUTH_MDP, 'admin'),
);
$user = User::get($login);
}
if (empty($user)) {
- return;
+ pl_redirect('admin/accounts');
}
$login = $user->login();
}
}
+ // Handles account deletion.
+ if (Post::has('account_deletion_confirmation')) {
+ $uid = $user->id();
+ $name = $user->fullName();
+ $user->profile()->clear();
+ $user->clear(true);
+ $page->trigSuccess("L'utilisateur $name ($uid) a bien été supprimé.");
+ }
+
// Account Form {{{
$to_update = array();
if (Post::has('disable_weak_access')) {
$to_update['weak_password'] = null;
} else if (Post::has('update_account')) {
- if (Post::s('full_name') != $user->fullName()) {
- // XXX: Update profile if a profile is associated
- $to_update['full_name'] = Post::s('full_name');
- }
- if (Post::s('display_name') != $user->displayName()) {
- // XXX: Update profile if a profile is associated
- $to_update['display_name'] = Post::s('display_name');
+ if (!$user->hasProfile()) {
+ if (Post::s('full_name') != $user->fullName()) {
+ $to_update['full_name'] = Post::s('full_name');
+ }
+ if (Post::s('display_name') != $user->displayName()) {
+ $to_update['display_name'] = Post::s('display_name');
+ }
+ if (Post::s('directory_name') != $user->directoryName()) {
+ $to_update['directory_name'] = Post::s('directory_name');
+ }
}
if (Post::s('sex') != ($user->isFemale() ? 'female' : 'male')) {
$to_update['sex'] = Post::s('sex');
+ if ($user->hasProfile()) {
+ XDB::execute('UPDATE profiles
+ SET sex = {?}
+ WHERE pid = {?}',
+ Post::s('sex'), $user->profile()->id());
+ }
}
- if (!Post::blank('hashpass')) {
- $to_update['password'] = Post::s('hashpass');
- // TODO: Propagate the password update to GoogleApps, when required. Eg:
- // $account = new GoogleAppsAccount($user);
- // if ($account->active() && $account->sync_password) {
- // $account->set_password($pass_encrypted);
- // }
+ if (!Post::blank('pwhash')) {
+ $to_update['password'] = Post::s('pwhash');
+ require_once 'googleapps.inc.php';
+ $account = new GoogleAppsAccount($user);
+ if ($account->active() && $account->sync_password) {
+ $account->set_password(Post::s('pwhash'));
+ }
}
if (!Post::blank('weak_password')) {
$to_update['weak_password'] = Post::s('weak_password');
}
}
if (!empty($to_update)) {
- // TODO: fetch the initial values of the fields, and eventually send
- // a summary of the changes to an admin.
+ $res = XDB::query('SELECT *
+ FROM accounts
+ WHERE uid = {?}', $user->id());
+ $oldValues = $res->fetchAllAssoc();
+ $oldValues = $oldValues[0];
+
$set = array();
+ $diff = array();
foreach ($to_update as $k => $value) {
- $set[] = XDB::format($k . ' = {?}', $value);
+ $value = XDB::format('{?}', $value);
+ $set[] = $k . ' = ' . $value;
+ $diff[$k] = array($oldValues[$k], trim($value, "'"));
+ unset($oldValues[$k]);
}
XDB::execute('UPDATE accounts
- SET ' . implode(', ', $set) . '
+ SET ' . implode(', ', $set) . '
WHERE uid = ' . XDB::format('{?}', $user->id()));
$page->trigSuccess('Données du compte mise à jour avec succès');
$user = User::getWithUID($user->id());
+
+ /* Formats the $diff and send it to the site administrators. The rules are the folowing:
+ * -formats: password, token, weak_password
+ */
+ foreach (array('password', 'token', 'weak_password') as $key) {
+ if (isset($diff[$key])) {
+ $diff[$key] = array('old value', 'new value');
+ } else {
+ $oldValues[$key] = 'old value';
+ }
+ }
+
+ $mail = new PlMailer('admin/useredit.mail.tpl');
+ $mail->assign('admin', S::user()->hruid);
+ $mail->assign('hruid', $user->hruid);
+ $mail->assign('diff', $diff);
+ $mail->assign('oldValues', $oldValues);
+ $mail->send();
}
// }}}
$page->addJsLink('jquery.ui.core.js');
$page->addJsLink('jquery.ui.tabs.js');
+ $page->addJsLink('password.js');
// Displays last login and last host information.
$res = XDB::query("SELECT start, host
}
$page->assign('user', $user);
+ $page->assign('hasProfile', $user->hasProfile());
// Displays forum bans.
$res = XDB::query("SELECT write_perm, read_perm, comment
if ($infos = self::formatNewUser($page, $line, $separator, $promotion, 6)) {
$sex = self::formatSex($page, $infos[3], $line);
if (!is_null($sex)) {
- $name = $infos[1] . ' ' . $infos[0];
+ $fullName = $infos[1] . ' ' . $infos[0];
+ $directoryName = $infos[0] . ' ' . $infos[1];
$birthDate = self::formatBirthDate($infos[2]);
$xorgId = Profile::getXorgId($infos[4]);
if (is_null($xorgId)) {
XDB::execute('INSERT INTO profile_display (pid, yourself, public_name, private_name,
directory_name, short_name, sort_name, promo)
VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
- $pid, $infos[1], $name, $name, $name, $name, $infos[0] . ' ' . $infos[1], $promo);
+ $pid, $infos[1], $fullName, $fullName, $directoryName, $fullName, $directoryName, $promo);
XDB::execute('INSERT INTO profile_education (pid, eduid, degreeid, entry_year, grad_year, flags)
VALUES ({?}, {?}, {?}, {?}, {?}, {?})',
$pid, $eduSchools[Profile::EDU_X], $degreeid, $entry_year, $grad_year, 'primary');
- XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, full_name, display_name, sex)
+ XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, full_name, directory_name, display_name, sex)
VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})',
- $infos['hrid'], $type, 0, 'active', $name, $infos[1], $sex);
+ $infos['hrid'], $type, 0, 'active', $fullName, $directoryName, $infos[1], $sex);
$uid = XDB::insertId();
XDB::execute('INSERT INTO account_profiles (uid, pid, perms)
VALUES ({?}, {?}, {?})',
}
} else if (Env::t('add_type') == 'account') {
$type = Env::t('type');
+ $newAccounts = array();
foreach ($lines as $line) {
if ($infos = self::formatNewUser($page, $line, $separator, $type, 4)) {
$sex = self::formatSex($page, $infos[3], $line);
if (!is_null($sex)) {
- XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, email, full_name, display_name, sex)
+ $fullName = $infos[1] . ' ' . $infos[0];
+ $directoryName = $infos[0] . ' ' . $infos[1];
+ XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, email, full_name, directory_name, display_name, sex)
VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
- $infos['hrid'], $type, 0, 'active', $infos[2], $infos[1] . ' ' . $infos[0], $infos[1], $sex);
+ $infos['hrid'], $type, 0, 'active', $infos[2], $fullName, $directoryName, $infos[1], $sex);
+ $newAccounts[$infos['hrid']] = $infos[1] . ' ' . $infos[0];
}
}
}
+ if (!empty($newAccounts)) {
+ $page->assign('newAccounts', $newAccounts);
+ }
} else if (Env::t('add_type') == 'ax_id') {
$type = 'x';
foreach ($lines as $line) {
if ($validate) {
S::assert_xsrf_token();
- $res = XDB::iterRow('SELECT p.hrpid, pd.directory_name, p.deathdate
+ $res = XDB::iterRow('SELECT p.pid, pd.directory_name, p.deathdate
FROM profiles AS p
INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
WHERE pd.promo = {?}', $promo);
while (list($pid, $name, $death) = $res->next()) {
- $val = Env::v($pid);
- if($val == $deces || empty($val)) {
+ $val = Env::v('death_' . $pid);
+ if ($val == $death) {
continue;
}
+ if (empty($val)) {
+ $val = null;
+ }
XDB::execute('UPDATE profiles
SET deathdate = {?}, deathdate_rec = NOW()
- WHERE hrpid = {?}', $val, $pid);
- $page->trigSuccess('Ajout du décès de ' . $name . ' le ' . $val . '.');
- if($death == '0000-00-00' || empty($death)) {
+ WHERE pid = {?}', $val, $pid);
+
+ $page->trigSuccess('Édition du décès de ' . $name . ' (' . ($val ? $val : 'ressuscité') . ').');
+ if ($val && ($death == '0000-00-00' || empty($death))) {
$profile = Profile::get($pid);
$profile->clear();
$profile->owner()->clear(false);
}
}
- $res = XDB::iterator('SELECT p.hrpid, pd.directory_name, p.deathdate
+ $res = XDB::iterator('SELECT p.pid, pd.directory_name, p.deathdate
FROM profiles AS p
INNER JOIN profile_display AS pd ON (p.pid = pd.pid)
WHERE pd.promo = {?}
ORDER BY pd.sort_name', $promo);
- $page->assign('decedes', $res);
+ $page->assign('profileList', $res);
}
function handler_dead_but_active(&$page)
{
$page->changeTpl('admin/validation.tpl');
$page->setTitle('Administration - Valider une demande');
- $page->addCssLink('nl.css');
+ $page->addCssLink('nl.css');
$page->addJsLink('ajax.js');
- require_once("validations.inc.php");
-
- if ($action == 'edit' and !is_null($id)) {
+ if ($action == 'edit' && !is_null($id)) {
$page->assign('preview_id', $id);
+ } else {
+ $page->assign('preview_id', null);
}
if(Env::has('uid') && Env::has('type') && Env::has('stamp')) {
// where several copies of the site use the same DB, but not the same "dynamic configuration"
global $globals;
$globals->updateNbValid();
- $page->assign('vit', new ValidateIterator());
+ $page->assign('vit', Validate::iterate());
}
function handler_validate_answers(&$page, $action = 'list', $id = null)
$table_editor->apply($page, $action, $id);
}
- function handler_account_types(&$page, $action = 'list', $id = null)
+ function handler_accounts(PlPage $page)
+ {
+ $page->changeTpl('admin/accounts.tpl');
+ $page->setTitle('Administration - Comptes');
+ $page->addJsLink('password.js');
+
+ if (Post::has('create_account')) {
+ S::assert_xsrf_token();
+ $firstname = Post::t('firstname');
+ $lastname = strtoupper(Post::t('lastname'));
+ $sex = Post::b('sex') ? User::GENDER_FEMALE : User::GENDER_MALE;
+ $email = Post::t('email');
+ $type = Post::s('type');
+ $login = PlUser::makeHrid($firstname, $lastname, $type);
+ if (!isvalid_email($email)) {
+ $page->trigError("Invalid email address: $email");
+ } else if (strlen(Post::s('pwhash')) != 40) {
+ $page->trigError("Invalid password hash");
+ } else {
+ $full_name = $firstname . ' ' . $lastname;
+ $directory_name = $lastname . ' ' . $firstname;
+ XDB::execute("INSERT INTO accounts (hruid, type, state, password,
+ registration_date, email, full_name,
+ display_name, sex, directory_name)
+ VALUES ({?}, {?}, 'active', {?}, NOW(), {?}, {?}, {?}, {?}, {?})",
+ $login, $type, Post::s('pwhash'), $email, $full_name, $full_name, $sex,
+ $directory_name);
+ }
+ }
+
+ $uf = new UserFilter(new UFC_AccountType('ax', 'school', 'fx'));
+ $page->assign('users', $uf->iterUsers());
+
+ }
+
+ function handler_account_types(&$page, $action = 'list', $id = null)
{
$page->setTitle('Administration - Types de comptes');
$page->assign('title', 'Gestion des types de comptes');
{
if (S::hasAuthToken()) {
$page->setRssLink('Changement Récents',
- '/Site/AllRecentChanges?action=rss&user=' . S::v('hruid') . '&hash=' . S::v('token'));
+ '/Site/AllRecentChanges?action=rss&user=' . S::v('hruid') . '&hash=' . S::user()->token);
}
// update wiki perms
$page->assign('icons', $icons);
}
- function handler_accounts(&$page)
+ function handler_account_watch(&$page)
{
$page->changeTpl('admin/accounts.tpl');
$page->assign('disabled', XDB::iterator('SELECT a.hruid, FIND_IN_SET(\'watch\', a.flags) AS watch,
$page->changeTpl('admin/jobs.tpl');
if (Env::has('search')) {
- $res = XDB::query("SELECT e.id, e.name, e.acronym
- FROM profile_job_enum AS e
- WHERE e.name LIKE CONCAT('% ', {?}, '%') OR e.acronym LIKE CONCAT('% ', {?}, '%')",
+ $res = XDB::query("SELECT id, name, acronym
+ FROM profile_job_enum
+ WHERE name LIKE CONCAT('%', {?}, '%') OR acronym LIKE CONCAT('%', {?}, '%')",
Env::t('job'), Env::t('job'));
if ($res->numRows() <= 20) {
}
if (Env::has('edit')) {
- // TODO: use address and phone classes to update profile_job_enum and profile_phones once they are done.
-
S::assert_xsrf_token();
$selectedJob = Env::has('selectedJob');
- XDB::execute("DELETE FROM profile_phones
- WHERE pid = {?} AND link_type = 'hq'",
- $id);
- XDB::execute("DELETE FROM profile_addresses
- WHERE jobid = {?} AND type = 'hq'",
- $id);
- XDB::execute('DELETE FROM profile_job_enum
- WHERE id = {?}',
- $id);
-
+ Phone::deletePhones(0, Phone::LINK_COMPANY, $id);
+ Address::delete(null, Address::LINK_COMPANY, $id);
if (Env::has('change')) {
XDB::execute('UPDATE profile_job
SET jobid = {?}
WHERE jobid = {?}',
Env::i('newJobId'), $id);
+ XDB::execute('DELETE FROM profile_job_enum
+ WHERE id = {?}',
+ $id);
$page->trigSuccess("L'entreprise a bien été remplacée.");
} else {
- require_once 'profil.func.inc.php';
- require_once 'geocoding.inc.php';
-
- $display_tel = format_display_number(Env::v('tel'), $error_tel);
- $display_fax = format_display_number(Env::v('fax'), $error_fax);
- $gmapsGeocoder = new GMapsGeocoder();
- $address = array('text' => Env::t('address'));
- $address = $gmapsGeocoder->getGeocodedAddress($address);
- Geocoder::getAreaId($address, 'administrativeArea');
- Geocoder::getAreaId($address, 'subAdministrativeArea');
- Geocoder::getAreaId($address, 'locality');
-
XDB::execute('UPDATE profile_job_enum
SET name = {?}, acronym = {?}, url = {?}, email = {?},
NAF_code = {?}, AX_code = {?}, holdingid = {?}
Env::t('name'), Env::t('acronym'), Env::t('url'), Env::t('email'),
Env::t('NAF_code'), Env::i('AX_code'), Env::i('holdingId'), $id);
- XDB::execute("INSERT INTO profile_phones (pid, link_type, link_id, tel_id, tel_type,
- search_tel, display_tel, pub)
- VALUES ({?}, 'hq', 0, 0, 'fixed', {?}, {?}, 'public'),
- ({?}, 'hq', 0, 1, 'fax', {?}, {?}, 'public')",
- $id, format_phone_number(Env::v('tel')), $display_tel,
- $id, format_phone_number(Env::v('fax')), $display_fax);
-
- XDB::execute("INSERT INTO profile_addresses (jobid, type, id, accuracy,
- text, postalText, postalCode, localityId,
- subAdministrativeAreaId, administrativeAreaId,
- countryId, latitude, longitude, updateTime,
- north, south, east, west)
- VALUES ({?}, 'hq', 0, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?},
- {?}, {?}, FROM_UNIXTIME({?}), {?}, {?}, {?}, {?})",
- $id, $address['accuracy'], $address['text'], $address['postalText'],
- $address['postalCode'], $address['localityId'],
- $address['subAdministrativeAreaId'], $address['administrativeAreaId'],
- $address['countryId'], $address['latitude'], $address['longitude'],
- $address['updateTime'], $address['north'], $address['south'],
- $address['east'], $address['west']);
+ $phone = new Phone(array('display' => Env::v('tel'), 'link_id' => $id, 'id' => 0, 'type' => 'fixed',
+ 'link_type' => Phone::LINK_COMPANY, 'pub' => 'public'));
+ $fax = new Phone(array('display' => Env::v('fax'), 'link_id' => $id, 'id' => 1, 'type' => 'fax',
+ 'link_type' => Phone::LINK_COMPANY, 'pub' => 'public'));
+ $address = new Address(array('jobid' => $jobid, 'type' => Address::LINK_COMPANY, 'text' => Env::t('address')));
+ $phone->save();
+ $fax->save();
+ $address->save();
$page->trigSuccess("L'entreprise a bien été mise à jour.");
}
t.display_tel AS tel, f.display_tel AS fax, a.text AS address
FROM profile_job_enum AS e
LEFT JOIN profile_job_enum AS h ON (e.holdingid = h.id)
- LEFT JOIN profile_phones AS t ON (t.pid = e.id AND link_type = 'hq' AND tel_id = 0)
- LEFT JOIN profile_phones AS f ON (f.pid = e.id AND link_type = 'hq' AND tel_id = 1)
+ LEFT JOIN profile_phones AS t ON (t.pid = e.id AND t.link_type = 'hq' AND t.tel_id = 0)
+ LEFT JOIN profile_phones AS f ON (f.pid = e.id AND f.link_type = 'hq' AND f.tel_id = 1)
LEFT JOIN profile_addresses AS a ON (a.jobid = e.id AND a.type = 'hq')
WHERE e.id = {?}",
$id);
projects / platal.git / blobdiff