function handlers()
{
return array(
- 'phpinfo' => $this->make_hook('phpinfo', AUTH_MDP, 'admin'),
+ 'phpinfo' => $this->make_hook('phpinfo', AUTH_PASSWD, 'admin'),
'get_rights' => $this->make_hook('get_rights', AUTH_COOKIE, 'admin'),
'set_skin' => $this->make_hook('set_skin', AUTH_COOKIE, 'admin'),
- 'admin' => $this->make_hook('default', AUTH_MDP, 'admin'),
- 'admin/dead-but-active' => $this->make_hook('dead_but_active', AUTH_MDP, 'admin'),
- 'admin/deaths' => $this->make_hook('deaths', AUTH_MDP, 'admin'),
- 'admin/downtime' => $this->make_hook('downtime', AUTH_MDP, 'admin'),
- 'admin/homonyms' => $this->make_hook('homonyms', AUTH_MDP, 'admin'),
- 'admin/logger' => $this->make_hook('logger', AUTH_MDP, 'admin'),
- 'admin/logger/actions' => $this->make_hook('logger_actions', AUTH_MDP, 'admin'),
- 'admin/postfix/blacklist' => $this->make_hook('postfix_blacklist', AUTH_MDP, 'admin'),
- 'admin/postfix/delayed' => $this->make_hook('postfix_delayed', AUTH_MDP, 'admin'),
- 'admin/postfix/regexp_bounces' => $this->make_hook('postfix_regexpsbounces', AUTH_MDP, 'admin'),
- 'admin/postfix/whitelist' => $this->make_hook('postfix_whitelist', AUTH_MDP, 'admin'),
- 'admin/mx/broken' => $this->make_hook('mx_broken', AUTH_MDP, 'admin'),
- 'admin/skins' => $this->make_hook('skins', AUTH_MDP, 'admin'),
- 'admin/user' => $this->make_hook('user', AUTH_MDP, 'admin'),
- 'admin/add_accounts' => $this->make_hook('add_accounts', AUTH_MDP, 'admin'),
- 'admin/validate' => $this->make_hook('validate', AUTH_MDP, 'admin,edit_directory'),
- 'admin/validate/answers' => $this->make_hook('validate_answers', AUTH_MDP, 'admin'),
- 'admin/wiki' => $this->make_hook('wiki', AUTH_MDP, 'admin'),
- 'admin/ipwatch' => $this->make_hook('ipwatch', AUTH_MDP, 'admin'),
- 'admin/icons' => $this->make_hook('icons', AUTH_MDP, 'admin'),
- 'admin/geocoding' => $this->make_hook('geocoding', 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/xnet_without_group' => $this->make_hook('xnet_without_group', AUTH_MDP, 'admin'),
- 'admin/jobs' => $this->make_hook('jobs', AUTH_MDP, 'admin,edit_directory'),
- 'admin/profile' => $this->make_hook('profile', AUTH_MDP, 'admin,edit_directory'),
- 'admin/phd' => $this->make_hook('phd', AUTH_MDP, 'admin'),
- 'admin/add_secondary_edu' => $this->make_hook('add_secondary_edu', AUTH_MDP, 'admin')
+ 'admin' => $this->make_hook('default', AUTH_PASSWD, 'admin'),
+ 'admin/dead-but-active' => $this->make_hook('dead_but_active', AUTH_PASSWD, 'admin'),
+ 'admin/deaths' => $this->make_hook('deaths', AUTH_PASSWD, 'admin'),
+ 'admin/downtime' => $this->make_hook('downtime', AUTH_PASSWD, 'admin'),
+ 'admin/homonyms' => $this->make_hook('homonyms', AUTH_PASSWD, 'admin'),
+ 'admin/logger' => $this->make_hook('logger', AUTH_PASSWD, 'admin'),
+ 'admin/logger/actions' => $this->make_hook('logger_actions', AUTH_PASSWD, 'admin'),
+ 'admin/postfix/blacklist' => $this->make_hook('postfix_blacklist', AUTH_PASSWD, 'admin'),
+ 'admin/postfix/delayed' => $this->make_hook('postfix_delayed', AUTH_PASSWD, 'admin'),
+ 'admin/postfix/regexp_bounces' => $this->make_hook('postfix_regexpsbounces', AUTH_PASSWD, 'admin'),
+ 'admin/postfix/whitelist' => $this->make_hook('postfix_whitelist', AUTH_PASSWD, 'admin'),
+ 'admin/mx/broken' => $this->make_hook('mx_broken', AUTH_PASSWD, 'admin'),
+ 'admin/skins' => $this->make_hook('skins', AUTH_PASSWD, 'admin'),
+ 'admin/user' => $this->make_hook('user', AUTH_PASSWD, 'admin'),
+ 'admin/add_accounts' => $this->make_hook('add_accounts', AUTH_PASSWD, 'admin'),
+ 'admin/validate' => $this->make_hook('validate', AUTH_PASSWD, 'admin,edit_directory'),
+ 'admin/validate/answers' => $this->make_hook('validate_answers', AUTH_PASSWD, 'admin'),
+ 'admin/wiki' => $this->make_hook('wiki', AUTH_PASSWD, 'admin'),
+ 'admin/ipwatch' => $this->make_hook('ipwatch', AUTH_PASSWD, 'admin'),
+ 'admin/icons' => $this->make_hook('icons', AUTH_PASSWD, 'admin'),
+ 'admin/geocoding' => $this->make_hook('geocoding', AUTH_PASSWD, 'admin'),
+ 'admin/accounts' => $this->make_hook('accounts', AUTH_PASSWD, 'admin'),
+ 'admin/account/watch' => $this->make_hook('account_watch', AUTH_PASSWD, 'admin'),
+ 'admin/account/types' => $this->make_hook('account_types', AUTH_PASSWD, 'admin'),
+ 'admin/xnet_without_group' => $this->make_hook('xnet_without_group', AUTH_PASSWD, 'admin'),
+ 'admin/jobs' => $this->make_hook('jobs', AUTH_PASSWD, 'admin,edit_directory'),
+ 'admin/profile' => $this->make_hook('profile', AUTH_PASSWD, 'admin,edit_directory'),
+ 'admin/phd' => $this->make_hook('phd', AUTH_PASSWD, 'admin'),
+ 'admin/add_secondary_edu' => $this->make_hook('add_secondary_edu', AUTH_PASSWD, 'admin')
);
}
$to_update['weak_password'] = null;
} else if (Post::has('update_account')) {
if (!$user->hasProfile()) {
+ require_once 'name.func.inc.php';
$name_update = false;
- if (Post::s('lastname') != $user->lastname) {
- $to_update['lastname'] = Post::s('lastname');
+ $lastname = capitalize_name(Post::t('lastname'));
+ $firstname = capitalize_name(Post::t('firstname'));
+ if ($lastname != $user->lastname) {
+ $to_update['lastname'] = $lastname;
$name_update = true;
}
- if (Post::s('type') != 'virtual' && Post::s('firstname') != $user->firstname) {
- $to_update['firstname'] = Post::s('firstname');
+ if (Post::s('type') != 'virtual' && $firstname != $user->firstname) {
+ $to_update['firstname'] = $firstname;
$name_update = true;
}
if ($name_update) {
- if (Post::s('type') != 'virtual') {
- $to_update['full_name'] = Post::s('firstname') . ' ' . Post::s('lastname');
- $to_update['directory_name'] = mb_strtoupper(Post::s('lastname')) . ' ' . Post::s('firstname');
- } else {
- $to_update['full_name'] = Post::s('lastname');
- $to_update['directory_name'] = mb_strtoupper(Post::s('lastname'));
+ if (Post::s('type') == 'virtual') {
+ $firstname = '';
}
+ $to_update['full_name'] = build_full_name($firstname, $lastname);
+ $to_update['directory_name'] = build_directory_name($firstname, $lastname);
+ $to_update['sort_name'] = build_sort_name($firstname, $lastname);
}
if (Post::s('display_name') != $user->displayName()) {
$to_update['display_name'] = Post::s('display_name');
if (Post::t('comment') != $user->comment) {
$to_update['comment'] = Post::blank('comment') ? null : Post::t('comment');
}
- if (require_email_update($user, Post::t('email'))) {
- $to_update['email'] = Post::t('email');
- $listClient->change_user_email($user->forlifeEmail(), Post::t('email'));
- update_alias_user($user->forlifeEmail(), Post::t('email'));
+ $new_email = strtolower(Post::t('email'));
+ if (require_email_update($user, $new_email)) {
+ $to_update['email'] = $new_email;
+ $listClient->change_user_email($user->forlifeEmail(), $new_email);
+ update_alias_user($user->forlifeEmail(), $new_email);
}
}
if (!empty($to_update)) {
$redirect = ($registered ? new Redirect($user) : null);
if (Post::has('add_fwd')) {
$email = Post::t('email');
- if (!isvalid_email_redirection($email)) {
+ if (!isvalid_email_redirection($email, $user)) {
$page->trigError("Email non valide: $email");
} else {
$redirect->add_email($email);
function handler_add_accounts($page, $action = null, $promo = null)
{
+ require_once 'name.func.inc.php';
$page->changeTpl('admin/add_accounts.tpl');
if (Env::has('add_type') && Env::has('people')) {
+ static $titles = array('male' => 'M', 'female' => 'MLLE');
$lines = explode("\n", Env::t('people'));
$separator = Env::t('separator');
$promotion = Env::i('promotion');
default:
$page->killError("La formation n'est pas reconnue : " . Env::t('edu_type') . '.');
}
+ $best_domain = XDB::fetchOneCell('SELECT id
+ FROM email_virtual_domains
+ WHERE name = {?}',
+ User::$sub_mail_domains[$type] . Platal::globals()->mail->domain);
XDB::startTransaction();
foreach ($lines as $line) {
if ($infos = self::formatNewUser($page, $line, $separator, $hrpromo, 6)) {
$sex = self::formatSex($page, $infos[3], $line);
+ $lastname = capitalize_name($infos[0]);
+ $firstname = capitalize_name($infos[1]);
if (!is_null($sex)) {
- $fullName = $infos[1] . ' ' . $infos[0];
- $directoryName = $infos[0] . ' ' . $infos[1];
+ $fullName = build_full_name($firstname, $lastname);
+ $directoryName = build_directory_name($firstname, $lastname);
+ $sortName = build_sort_name($firstname, $lastname);
$birthDate = self::formatBirthDate($infos[2]);
if ($type == 'x') {
$xorgId = Profile::getXorgId($infos[4]);
continue;
}
- XDB::execute('INSERT INTO profiles (hrpid, xorg_id, ax_id, birthdate_ref, sex)
- VALUES ({?}, {?}, {?}, {?}, {?})',
- $infos['hrid'], $xorgId, (isset($infos[5]) ? $infos[5] : null), $birthDate, $sex);
+ XDB::execute('INSERT INTO profiles (hrpid, xorg_id, ax_id, birthdate_ref, sex, title)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?})',
+ $infos['hrid'], $xorgId, (isset($infos[5]) ? $infos[5] : null),
+ $birthDate, $sex, $titles[$sex]);
$pid = XDB::insertId();
XDB::execute('INSERT INTO profile_public_names (pid, lastname_initial, lastname_main, firstname_initial, firstname_main)
VALUES ({?}, {?}, {?}, {?}, {?})',
- $pid, $infos[0], $infos[0], $infos[1], $infos[1]);
+ $pid, $lastname, $lastname, $firstname, $firstname);
XDB::execute('INSERT INTO profile_display (pid, yourself, public_name, private_name,
directory_name, short_name, sort_name, promo)
VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
- $pid, $infos[1], $fullName, $fullName, $directoryName, $fullName, $directoryName, $promo);
+ $pid, $firstname, $fullName, $fullName, $directoryName, $fullName, $sortName, $promo);
XDB::execute('INSERT INTO profile_education (id, pid, eduid, degreeid, entry_year, grad_year, promo_year, flags)
VALUES (100, {?}, {?}, {?}, {?}, {?}, {?}, \'primary\')',
$pid, $eduSchools[Profile::EDU_X], $degreeid, $entry_year, $grad_year, $promotion);
XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, full_name, directory_name,
- display_name, lastname, firstname, sex)
- VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
- $infos['hrid'], $type, 0, 'pending', $fullName, $directoryName,
- $infos[1], $infos[0], $infos[1], $sex);
+ display_name, sort_name, lastname, firstname, sex, best_domain)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ $infos['hrid'], $type, 0, 'pending', $fullName, $directoryName, $sortName,
+ $firstname, $lastname, $firstname, $sex, $best_domain);
$uid = XDB::insertId();
XDB::execute('INSERT INTO account_profiles (uid, pid, perms)
VALUES ({?}, {?}, {?})',
if ($infos = self::formatNewUser($page, $line, $separator, $type, 4)) {
$sex = self::formatSex($page, $infos[3], $line);
if (!is_null($sex)) {
- $fullName = $infos[1] . ' ' . $infos[0];
- $directoryName = $infos[0] . ' ' . $infos[1];
+ $lastname = capitalize_name($infos[0]);
+ $firstname = capitalize_name($infos[1]);
+ $fullName = build_full_name($firstname, $lastname);
+ $directoryName = build_directory_name($firstname, $lastname);
+ $sortName = build_sort_name($firstname, $lastname);
XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, email, full_name, directory_name,
- display_name, lastname, firstname, sex)
- VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
+ sort_name, display_name, lastname, firstname, sex)
+ VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})',
$infos['hrid'], $type, 0, 'pending', $infos[2], $fullName, $directoryName,
- $infos[1], $infos[0], $infos[1], $sex);
- $newAccounts[$infos['hrid']] = $infos[1] . ' ' . $infos[0];
+ $sortName ,$firstname, $lastname, $firstname, $sex);
+ $newAccounts[$infos['hrid']] = $fullName;
}
}
}
XDB::execute('INSERT INTO profile_education (id, pid, eduid, degreeid, entry_year, grad_year, promo_year, flags)
SELECT ' . $select . '
FROM profile_education
- WHERE pid = {?}',
+ WHERE pid = {?}
+ GROUP BY pid',
$pid);
}
XDB::commit();