X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=5f3ba1927bbe2be1e73190dc5ae37fd1b518f418;hb=01f78cbb9740f7278fb0eee65d2758cb39fc85f7;hp=3d073182a96d041d1d1f02a67e8fdcb234302f1b;hpb=864957c1022d432cb0351e47d5286e181183de9e;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index 3d07318..5f3ba19 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -27,7 +27,6 @@ class AdminModule extends PLModule 'phpinfo' => $this->make_hook('phpinfo', AUTH_MDP, 'admin'), 'get_rights' => $this->make_hook('get_rights', AUTH_MDP, 'admin'), 'admin' => $this->make_hook('default', AUTH_MDP, 'admin'), - 'admin/ax-xorg' => $this->make_hook('ax_xorg', 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'), @@ -133,7 +132,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, @@ -175,6 +175,7 @@ class AdminModule extends PLModule function _getMonths($year) { // give a 'no filter' option + $months = array(); $months[0] = "----"; if ($year) { @@ -207,6 +208,7 @@ class AdminModule extends PLModule function _getYears() { // give a 'no filter' option + $years = array(); $years[0] = "----"; // retrieve available years @@ -237,7 +239,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) { @@ -375,8 +377,10 @@ class AdminModule extends PLModule } // Loads the user identity using the environment. - $user = User::get($login); - if (!$user) { + if ($login) { + $user = User::get($login); + } + if (empty($user)) { return; } @@ -392,11 +396,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 { @@ -434,8 +438,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; } @@ -458,17 +462,43 @@ class AdminModule extends PLModule } } 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())); $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,8 +629,8 @@ class AdminModule extends PLModule // }}} - $page->addJsLink('ui.core.js'); - $page->addJsLink('ui.tabs.js'); + $page->addJsLink('jquery.ui.core.js'); + $page->addJsLink('jquery.ui.tabs.js'); // Displays last login and last host information. $res = XDB::query("SELECT start, host @@ -652,10 +682,11 @@ 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; } @@ -668,7 +699,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."); return false; } $infos['hrid'] = $hrid; @@ -698,7 +729,6 @@ class AdminModule extends PLModule $page->changeTpl('admin/add_accounts.tpl'); if (Env::has('add_type') && Env::has('people')) { - require_once 'directory.enums.inc.php'; $lines = explode("\n", Env::t('people')); $separator = Env::t('separator'); $promotion = Env::i('promotion'); @@ -711,7 +741,6 @@ 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]; @@ -736,52 +765,65 @@ class AdminModule extends PLModule } 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, $promotion, 6)) { + $sex = self::formatSex($page, $infos[3], $line); + if (!is_null($sex)) { + $name = $infos[1] . ' ' . $infos[0]; + $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']); + 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'); + } } } } 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)) { + 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); + $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 = {?}', @@ -790,11 +832,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 @@ -855,12 +898,11 @@ 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 AS user_id + 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') + 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') INNER JOIN accounts AS ac ON (ac.uid = a.uid) WHERE a.type = 'homonyme' OR a.expire != '' ORDER BY a.alias, forlife"); @@ -868,7 +910,7 @@ class AdminModule extends PLModule while ($tab = $res->next()) { $hnymes[$tab['homonyme']][] = $tab; } - $page->assign_by_ref('hnymes',$hnymes); + $page->assign_by_ref('hnymes', $hnymes); } } @@ -888,29 +930,29 @@ 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 || empty($val)) { continue; } XDB::execute('UPDATE profiles SET deathdate = {?}, deathdate_rec = NOW() - WHERE hrpid = {?}', $val, $pid); + WHERE pid = {?}', $val, $pid); $page->trigSuccess('Ajout du décès de ' . $name . ' le ' . $val . '.'); if($death == '0000-00-00' || empty($death)) { - // TODO: FIX THIS DEPRECATED CALL - require_once('user.func.inc.php'); - user_clear_all_subs($uid, false); // by default, dead ppl do not loose their email + $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 = {?} @@ -938,7 +980,7 @@ class AdminModule extends PLModule function handler_validate(&$page, $action = 'list', $id = null) { - $page->changeTpl('admin/valider.tpl'); + $page->changeTpl('admin/validation.tpl'); $page->setTitle('Administration - Valider une demande'); $page->addCssLink('nl.css'); $page->addJsLink('ajax.js'); @@ -965,7 +1007,9 @@ class AdminModule extends PLModule $page->assign('categories', $categories = explode(',', str_replace("'", '', substr($a['Type'], 5, -1)))); $hidden = array(); - $res = XDB::query('SELECT hidden_requests FROM requests_hidden WHERE user_id = {?}', S::v('uid')); + $res = XDB::query('SELECT hidden_requests + FROM requests_hidden + WHERE uid = {?}', S::v('uid')); $hide_requests = $res->fetchOneCell(); if (Post::has('hide')) { $hide = array(); @@ -975,7 +1019,8 @@ class AdminModule extends PLModule $hide[] = $cat; } $hide_requests = join(',', $hide); - XDB::query('REPLACE INTO requests_hidden (user_id, hidden_requests) VALUES({?}, {?})', + XDB::query('REPLACE INTO requests_hidden (uid, hidden_requests) + VALUES ({?}, {?})', S::v('uid'), $hide_requests); } elseif ($hide_requests) { foreach (explode(',', $hide_requests) as $hide_type) @@ -1379,8 +1424,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);