X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=d4fb1ede37c4567be98a14f5832d7c3cd066934d;hb=12262f1306059765d8625a6752364679c8625d31;hp=f0e7208f5551dd1287e017fd6ee7591eece83619;hpb=93d42b4fcc6f055a428c9b63e386ac62c918d08a;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index f0e7208..d4fb1ed 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -1,6 +1,6 @@ $this->make_hook('phpinfo', AUTH_MDP, 'admin'), - 'get_rights' => $this->make_hook('get_rights', AUTH_MDP, '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'), @@ -41,14 +42,16 @@ class AdminModule extends PLModule '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'), + '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/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'), + 'admin/jobs' => $this->make_hook('jobs', AUTH_MDP, 'admin,edit_directory'), + 'admin/profile' => $this->make_hook('profile', AUTH_MDP, 'admin,edit_directory') ); } @@ -58,15 +61,39 @@ class AdminModule extends PLModule exit; } - function handler_get_rights(&$page, $level) + function handler_get_rights(&$page) { if (S::suid()) { $page->kill('Déjà en SUID'); } - $user =& S::user(); - Platal::session()->startSUID($user, $level); + S::assert_xsrf_token(); + $level = Post::s('account_type'); + if ($level != 'admin') { + $user = User::getSilentWithUID(S::user()->id()); + $user->is_admin = false; + $types = DirEnum::getOptions(DirEnum::ACCOUNTTYPES); + if (!empty($types[$level])) { + $user->setPerms($types[$level]); + } + S::set('suid_startpage', $_SERVER['HTTP_REFERER']); + Platal::session()->startSUID($user); + } + if (!empty($_SERVER['HTTP_REFERER'])) { + http_redirect($_SERVER['HTTP_REFERER']); + } else { + pl_redirect('/'); + } + } - pl_redirect('/'); + function handler_set_skin(&$page) + { + S::assert_xsrf_token(); + S::set('skin', Post::s('change_skin')); + if (!empty($_SERVER['HTTP_REFERER'])) { + http_redirect($_SERVER['HTTP_REFERER']); + } else { + pl_redirect('/'); + } } function handler_default(&$page) @@ -132,7 +159,8 @@ class AdminModule extends PLModule function _getDays($year, $month) { // give a 'no filter' option - $months[0] = "----"; + $days = array(); + $days[0] = "----"; if ($year && $month) { $day_max = Array(-1, 31, checkdate(2, 29, $year) ? 29 : 28 , 31, @@ -174,6 +202,7 @@ class AdminModule extends PLModule function _getMonths($year) { // give a 'no filter' option + $months = array(); $months[0] = "----"; if ($year) { @@ -206,6 +235,7 @@ class AdminModule extends PLModule function _getYears() { // give a 'no filter' option + $years = array(); $years[0] = "----"; // retrieve available years @@ -236,7 +266,7 @@ class AdminModule extends PLModule $where = array(); if ($uid) - array_push($where, "uid='$uid'"); + array_push($where, "s.uid='$uid'"); // we were given at least a year if ($year) { @@ -268,10 +298,10 @@ class AdminModule extends PLModule if ($action == 'session') { // we are viewing a session - $res = XDB::query("SELECT ls.*, a.alias AS username, sa.alias AS suer + $res = XDB::query("SELECT ls.*, a.hruid AS username, sa.hruid AS suer FROM log_sessions AS ls - LEFT JOIN aliases AS a ON (a.uid = ls.uid AND a.type='a_vie') - LEFT JOIN aliases AS sa ON (sa.uid = ls.suid AND sa.type='a_vie') + INNER JOIN accounts AS a ON (a.uid = ls.uid) + LEFT JOIN accounts AS sa ON (sa.uid = ls.suid) WHERE ls.id = {?}", $arg); $page->assign('session', $a = $res->fetchOneAssoc()); @@ -287,9 +317,12 @@ class AdminModule extends PLModule } else { $loguser = $action == 'user' ? $arg : Env::v('loguser'); - $res = XDB::query('SELECT uid FROM aliases WHERE alias={?}', - $loguser); - $loguid = $res->fetchOneCell(); + if ($loguser) { + $user = User::get($loguser); + $loguid = $user->id(); + } else { + $loguid = null; + } if ($loguid) { $year = Env::i('year'); @@ -327,9 +360,9 @@ class AdminModule extends PLModule // get the requested sessions $where = $this->_makeWhere($year, $month, $day, $loguid); $select = "SELECT s.id, s.start, s.uid, - a.alias as username + a.hruid as username FROM log_sessions AS s - LEFT JOIN aliases AS a ON (a.uid = s.uid AND a.type='a_vie') + INNER JOIN accounts AS a ON (a.uid = s.uid) $where ORDER BY start DESC"; $res = XDB::iterator($select); @@ -354,7 +387,7 @@ class AdminModule extends PLModule } $page->assign_by_ref('sessions', $sessions); } else { - $page->assign('msg_nofilters', "Sélectionner une annuée et/ou un utilisateur"); + $page->assign('msg_nofilters', "Sélectionner une année et/ou un utilisateur"); } } @@ -374,11 +407,14 @@ class AdminModule extends PLModule } // Loads the user identity using the environment. - $user = User::get($login); - if (!$user) { - return; + if ($login) { + $user = User::get($login); + } + if (empty($user)) { + pl_redirect('admin/accounts'); } + $listClient = new MMList(S::user()); $login = $user->login(); $registered = ($user->state != 'pending'); @@ -391,11 +427,11 @@ class AdminModule extends PLModule } // Handles specific requests (AX sync, su, ...). - if(Post::has('logs_account')) { + if(Post::has('log_account')) { pl_redirect("admin/logger?loguser=$login&year=".date('Y')."&month=".date('m')); } - if(Post::has('su_button') && $registered) { + if(Post::has('su_account') && $registered) { if (!Platal::session()->startSUID($user)) { $page->trigError('Impossible d\'effectuer un SUID sur ' . $user->login()); } else { @@ -403,29 +439,56 @@ class AdminModule extends PLModule } } + // Handles account deletion. + if (Post::has('account_deletion_confirmation')) { + $uid = $user->id(); + $name = $user->fullName(); + $profile = $user->profile(); + if ($profile && Post::b('clear_profile')) { + $user->profile()->clear(); + } + $user->clear(true); + $page->trigSuccess("L'utilisateur $name ($uid) a bien été désinscrit."); + if (Post::b('erase_account')) { + XDB::execute('DELETE FROM accounts + WHERE uid = {?}', + $uid); + $page->trigSuccess("L'utilisateur $name ($uid) a été supprimé de la base de données"); + } + } + // 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'); @@ -433,8 +496,8 @@ class AdminModule extends PLModule if (Post::i('token_access', 0) != ($user->token_access ? 1 : 0)) { $to_update['token'] = Post::i('token_access') ? rand_url_id(16) : null; } - if (Post::i('skin', 0) != $user->skin) { - $to_update['skin'] = Post::i('skin', 0); + if (Post::i('skin') != $user->skin) { + $to_update['skin'] = Post::i('skin'); if ($to_update['skin'] == 0) { $to_update['skin'] = null; } @@ -455,19 +518,49 @@ class AdminModule extends PLModule if (Post::t('comment') != $user->comment) { $to_update['comment'] = Post::blank('comment') ? null : Post::t('comment'); } + if (!$user->checkPerms(User::PERM_MAIL) && Post::t('email') != $user->forlifeEmail()) { + $to_update['email'] = Post::t('email'); + $listClient->change_user_email($user->forlifeEmail(), Post::t('email')); + } } 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) . ' - WHERE uid = ' . XDB::format('{?}', $user->id())); + XDB::rawExecute('UPDATE accounts + 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(); } // }}} @@ -599,7 +692,9 @@ class AdminModule extends PLModule $page->addJsLink('jquery.ui.core.js'); + $page->addJsLink('jquery.ui.widget.js'); $page->addJsLink('jquery.ui.tabs.js'); + $page->addJsLink('password.js'); // Displays last login and last host information. $res = XDB::query("SELECT start, host @@ -611,6 +706,9 @@ class AdminModule extends PLModule $page->assign('lastlogin', $lastlogin); $page->assign('host', $host); + // Display mailing lists + $page->assign('mlists', $listClient->get_all_user_lists($user->forlifeEmail())); + // Display active aliases. $page->assign('virtuals', $user->emailAliases()); $page->assign('aliases', XDB::iterator("SELECT alias, type='a_vie' AS for_life, @@ -634,6 +732,7 @@ class AdminModule extends PLModule } $page->assign('user', $user); + $page->assign('hasProfile', $user->hasProfile()); // Displays forum bans. $res = XDB::query("SELECT write_perm, read_perm, comment @@ -651,14 +750,15 @@ class AdminModule extends PLModule return null; } - private static function formatNewUser($infosLine, $separator, $promo, $size) + private static function formatNewUser(&$page, $infosLine, $separator, $promo, $size) { $infos = explode($separator, $infosLine); - if (sizeof($infos) != $size) { + if (sizeof($infos) > $size || sizeof($infos) < 2) { + $page->trigError("La ligne $infosLine n'a pas été ajoutée."); return false; } - array_map('trim', $infos); + $infos = array_map('trim', $infos); $hrid = self::getHrid($infos[1], $infos[0], $promo); $res1 = XDB::query('SELECT COUNT(*) FROM accounts @@ -667,7 +767,7 @@ class AdminModule extends PLModule FROM profiles WHERE hrpid = {?}', $hrid); if (is_null($hrid) || $res1->fetchOneCell() > 0 || $res2->fetchOneCell() > 0) { - $page->trigError("La ligne $line n'a pas été ajoutée."); + $page->trigError("La ligne $infosLine n'a pas été ajoutée: une entrée similaire existe déjà"); return false; } $infos['hrid'] = $hrid; @@ -689,7 +789,9 @@ class AdminModule extends PLModule private static function formatBirthDate($birthDate) { - return date("Y-m-d", strtotime($birthDate)); + // strtotime believes dd/mm/yyyy to be an US date (i.e mm/dd/yyyy), and + // dd-mm-yyyy to be a normal date (i.e dd-mm-yyyy)... + return date("Y-m-d", strtotime(str_replace('/', '-', $birthDate))); } function handler_add_accounts(&$page, $action = null, $promo = null) @@ -709,77 +811,108 @@ class AdminModule extends PLModule $eduSchools = array_flip($eduSchools); $eduDegrees = DirEnum::getOptions(DirEnum::EDUDEGREES); $eduDegrees = array_flip($eduDegrees); - var_dump($eduDegrees); switch (Env::t('edu_type')) { case 'X': $degreeid = $eduDegrees[Profile::DEGREE_X]; $entry_year = $promotion; $grad_year = $promotion + 3; $promo = 'X' . $promotion; + $hrpromo = $promotion; break; case 'M': $degreeid = $eduDegrees[Profile::DEGREE_M]; $grad_year = $promotion; $entry_year = $promotion - 2; $promo = 'M' . $promotion; + $hrpromo = $promo; + $type = 'master'; break; case 'D': $degreeid = $eduDegrees[Profile::DEGREE_D]; $grad_year = $promotion; $entry_year = $promotion - 3; $promo = 'D' . $promotion; + $hrpromo = $promo; + $type = 'phd'; break; default: $page->killError("La formation n'est pas reconnue:" . Env::t('edu_type') . '.'); } + XDB::startTransaction(); foreach ($lines as $line) { - if (($infos = self::formatNewUser($line, $separator, $promotion, 6)) - && ($sex = self::formatSex($page, $infos[3], $line))) { - $name = $infos[1] . ' ' . $infos[0]; - $birthDate = self::formatBirthDate($infos[2]); - $xorgId = Profile::getXorgId($infos[4]); - - XDB::execute('INSERT INTO profiles (hrpid, xorg_id, ax_id, birthdate_ref, sex) - VALUES ({?}, {?}, {?}, {?})', - $infos['hrid'], $xorgId, $infos[5], $birthDate, $sex); - $pid = XDB::insertId(); - XDB::execute('INSERT INTO profile_name (pid, name, typeid) - VALUES ({?}, {?}, {?})', - $pid, $infos[0], $nameTypes['name_ini']); - XDB::execute('INSERT INTO profile_name (pid, name, typeid) - VALUES ({?}, {?}, {?})', - $pid, $infos[1], $nameTypes['firstname_ini']); - 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); - 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) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?})', - $infos['hrid'], $type, 0, 'active', $name, $infos[1], $sex); - $uid = XDB::insertId(); - XDB::execute('INSERT INTO account_profiles (uid, pid, perms) - VALUES ({?}, {?}, {?})', - $uid, $pid, 'owner'); + if ($infos = self::formatNewUser($page, $line, $separator, $hrpromo, 6)) { + $sex = self::formatSex($page, $infos[3], $line); + if (!is_null($sex)) { + $fullName = $infos[1] . ' ' . $infos[0]; + $directoryName = $infos[0] . ' ' . $infos[1]; + $birthDate = self::formatBirthDate($infos[2]); + $xorgId = Profile::getXorgId($infos[4]); + if (is_null($xorgId)) { + $page->trigError("La ligne $line n'a pas été ajoutée car le matricule École est mal renseigné."); + continue; + } + + XDB::execute('INSERT INTO profiles (hrpid, xorg_id, ax_id, birthdate_ref, sex) + VALUES ({?}, {?}, {?}, {?}, {?})', + $infos['hrid'], $xorgId, $infos[5], $birthDate, $sex); + $pid = XDB::insertId(); + XDB::execute('INSERT INTO profile_name (pid, name, typeid) + VALUES ({?}, {?}, {?}), + ({?}, {?}, {?}), + ({?}, {?}, {?}), + ({?}, {?}, {?})', + $pid, $infos[0], $nameTypes['name_ini'], + $pid, $infos[0], $nameTypes['lastname'], + $pid, $infos[1], $nameTypes['firstname_ini'], + $pid, $infos[1], $nameTypes['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); + 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, directory_name, display_name, sex) + VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', + $infos['hrid'], $type, 0, 'pending', $fullName, $directoryName, $infos[1], $sex); + $uid = XDB::insertId(); + XDB::execute('INSERT INTO account_profiles (uid, pid, perms) + VALUES ({?}, {?}, {?})', + $uid, $pid, 'owner'); + Profile::rebuildSearchTokens($pid, false); + } } } + XDB::commit(); } else if (Env::t('add_type') == 'account') { $type = Env::t('type'); + $newAccounts = array(); foreach ($lines as $line) { - if (($infos = self::formatNewUser($line, $separator, $type, 4)) - && ($sex = self::formatSex(&$page, $infos[3], $line))) { - XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, email, full_name, display_name, sex) - VALUES ({?}, {?}, {?}, {?}, {?}, {?}, {?}, {?})', - $infos['hrid'], $type, 0, 'active', $infos[2], $infos[1] . ' ' . $infos[0], $infos[1], $sex); + 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]; + XDB::execute('INSERT INTO accounts (hruid, type, is_admin, state, + email, full_name, directory_name, + display_name, sex) + VALUES ({?}, {?}, {?}, {?}, + {?}, {?}, {?}, {?}, {?})', + $infos['hrid'], $type, 0, 'pending', + $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 ($infos = self::formatNewUser($line, $separator, $promotion, 3)) { + if ($infos = self::formatNewUser($page, $line, $separator, $promotion, 3)) { XDB::execute('UPDATE profiles SET ax_id = {?} WHERE hrpid = {?}', @@ -788,11 +921,12 @@ class AdminModule extends PLModule } } - if ($page->nb_errs == 0) { + $errors = $page->nb_errs(); + if ($errors == 0) { $page->trigSuccess("L'opération a été effectuée avec succès."); } else { - $page->trigSuccess("L'opération a été effectuée avec succès, sauf pour les " - . $page->nb_errs . 'erreurs signalées ci-dessus.'); + $page->trigSuccess('L\'opération a été effectuée avec succès, sauf pour ' + . (($errors == 1) ? 'l\'erreur signalée' : "les $errors erreurs signalées") . ' ci-dessus.'); } } else if (Env::has('add_type')) { $res = XDB::query('SELECT type @@ -841,8 +975,8 @@ class AdminModule extends PLModule XDB::execute("UPDATE aliases SET type = 'homonyme', expire=NOW() WHERE alias = {?}", $loginbis); - XDB::execute("REPLACE INTO homonyms (homonyme_id, uid) - VALUES ({?}, {?})", $target, $target); + XDB::execute('INSERT IGNORE INTO homonyms (homonyme_id, uid) + VALUES ({?}, {?})', $target, $target); send_robot_homonyme($user, $loginbis); $op = 'list'; $page->trigSuccess('Email envoyé à ' . $user->forlifeEmail() . ', alias supprimé.'); @@ -853,8 +987,8 @@ class AdminModule extends PLModule if ($op == 'list') { $res = XDB::iterator( "SELECT a.alias AS homonyme, s.alias AS forlife, - IF(h.homonyme_id = s.id, a.expire, NULL) AS expire, - IF(h.homonyme_id = s.id, a.type, NULL) AS type, ac.uid + IF(h.homonyme_id = s.uid, a.expire, NULL) AS expire, + IF(h.homonyme_id = s.uid, a.type, NULL) AS type, ac.uid FROM aliases AS a LEFT JOIN homonyms AS h ON (h.homonyme_id = a.uid) INNER JOIN aliases AS s ON (s.uid = h.uid AND s.type = 'a_vie') @@ -885,21 +1019,25 @@ class AdminModule extends PLModule 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); @@ -907,12 +1045,12 @@ class AdminModule extends PLModule } } - $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) @@ -937,13 +1075,12 @@ class AdminModule extends PLModule { $page->changeTpl('admin/validation.tpl'); $page->setTitle('Administration - Valider une demande'); - $page->addCssLink('nl.css'); - $page->addJsLink('ajax.js'); - require_once("validations.inc.php"); - + $page->addCssLink('nl.css'); - 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')) { @@ -974,8 +1111,9 @@ class AdminModule extends PLModule $hide[] = $cat; } $hide_requests = join(',', $hide); - XDB::query('REPLACE INTO requests_hidden (uid, hidden_requests) - VALUES ({?}, {?})', + XDB::query('INSERT INTO requests_hidden (uid, hidden_requests) + VALUES ({?}, {?}) + ON DUPLICATE KEY UPDATE hidden_requests = VALUES(hidden_requests)', S::v('uid'), $hide_requests); } elseif ($hide_requests) { foreach (explode(',', $hide_requests) as $hide_type) @@ -987,7 +1125,8 @@ class AdminModule extends PLModule // 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()); + $page->assign('isAdmin', S::admin()); } function handler_validate_answers(&$page, $action = 'list', $id = null) @@ -1068,7 +1207,42 @@ class AdminModule extends PLModule $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::s('sex'); + $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'); @@ -1082,7 +1256,7 @@ class AdminModule extends PLModule { 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 @@ -1271,7 +1445,7 @@ class AdminModule extends PLModule $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, @@ -1290,9 +1464,9 @@ class AdminModule extends PLModule $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) { @@ -1306,68 +1480,43 @@ class AdminModule extends PLModule } 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::deleteAddresses(null, Address::LINK_COMPANY, $id); if (Env::has('change')) { - XDB::execute('UPDATE profile_job - SET jobid = {?} - WHERE jobid = {?}', - Env::i('newJobId'), $id); - - $page->trigSuccess("L'entreprise a bien été remplacée."); + if (Env::has('newJobId') && Env::i('newJobId') > 0) { + 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 { + $page->trigError("L'entreprise n'a pas été remplacée car l'identifiant fourni n'est pas valide."); + } } 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 = {?} WHERE id = {?}', 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']); + (Env::t('NAF_code') == 0 ? null : Env::t('NAF_code')), + (Env::i('AX_code') == 0 ? null : Env::t('AX_code')), + (Env::i('holdingId') == 0 ? null : Env::t('holdingId')), $id); + + $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' => $id, 'type' => Address::LINK_COMPANY, 'text' => Env::t('address'))); + $phone->save(); + $fax->save(); + $address->save(); $page->trigSuccess("L'entreprise a bien été mise à jour."); } @@ -1379,8 +1528,8 @@ class AdminModule extends PLModule 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); @@ -1392,6 +1541,37 @@ class AdminModule extends PLModule } } } + + function handler_profile(&$page) + { + $page->changeTpl('admin/profile.tpl'); + + if (Post::has('checked')) { + S::assert_xsrf_token(); + $res = XDB::iterator('SELECT DISTINCT(pm.pid), pd.public_name + FROM profile_modifications AS pm + INNER JOIN profile_display AS pd ON (pm.pid = pd.pid) + WHERE pm.type = \'self\''); + + while ($profile = $res->next()) { + if (Post::has('checked_' . $profile['pid'])) { + XDB::execute('DELETE FROM profile_modifications + WHERE type = \'self\' AND pid = {?}', $profile['pid']); + + $page->trigSuccess('Profil de ' . $profile['public_name'] . ' vérifié.'); + } + } + } + + $res = XDB::iterator('SELECT p.hrpid, pm.pid, pd.directory_name, GROUP_CONCAT(pm.field SEPARATOR \', \') AS field + FROM profile_modifications AS pm + INNER JOIN profiles AS p ON (pm.pid = p.pid) + INNER JOIN profile_display AS pd ON (pm.pid = pd.pid) + WHERE pm.type = \'self\' + GROUP BY pd.directory_name + ORDER BY pd.directory_name'); + $page->assign('updates', $res); + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: