X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=6334aa1dbd463a20aba8de06084bfef30d5b9c90;hb=5660032ac785d410f90e3f5b0d6948dc90b0cfea;hp=1dcde365f55581fbf531ddbafabafa73744425a4;hpb=be638e733bce413df4324d985297d9a4d94dcbca;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index 1dcde36..6334aa1 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -24,32 +24,33 @@ class AdminModule extends PLModule function handlers() { return array( - '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'), - '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'), + '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'), + '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/synchro_ax' => $this->make_hook('synchro_ax', AUTH_MDP, 'admin'), - 'admin/user' => $this->make_hook('user', AUTH_MDP, 'admin'), - 'admin/promo' => $this->make_hook('promo', AUTH_MDP, 'admin'), - 'admin/validate' => $this->make_hook('validate', AUTH_MDP, 'admin'), - '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/types' => $this->make_hook('account_types', 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/synchro_ax' => $this->make_hook('synchro_ax', AUTH_MDP, 'admin'), + 'admin/user' => $this->make_hook('user', AUTH_MDP, 'admin'), + 'admin/promo' => $this->make_hook('promo', AUTH_MDP, 'admin'), + 'admin/validate' => $this->make_hook('validate', AUTH_MDP, 'admin'), + '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/types' => $this->make_hook('account_types', AUTH_MDP, 'admin'), + 'admin/jobs' => $this->make_hook('jobs', AUTH_MDP, 'admin'), ); } @@ -84,20 +85,20 @@ class AdminModule extends PLModule if (Env::has('del')) { $crc = Env::v('crc'); XDB::execute("UPDATE postfix_mailseen SET release = 'del' WHERE crc = {?}", $crc); - $page->trigSuccess($crc." verra tous ses emails supprimés !"); + $page->trigSuccess($crc . " verra tous ses emails supprimés !"); } elseif (Env::has('ok')) { $crc = Env::v('crc'); XDB::execute("UPDATE postfix_mailseen SET release = 'ok' WHERE crc = {?}", $crc); - $page->trigSuccess($crc." a le droit de passer !"); + $page->trigSuccess($crc . " a le droit de passer !"); } $sql = XDB::iterator( "SELECT crc, nb, update_time, create_time, - FIND_IN_SET('del', release) AS del, - FIND_IN_SET('ok', release) AS ok - FROM postfix_mailseen + FIND_IN_SET('del', p.release) AS del, + FIND_IN_SET('ok', p.release) AS ok + FROM postfix_mailseen AS p WHERE nb >= 30 - ORDER BY release != ''"); + ORDER BY p.release != ''"); $page->assign_by_ref('mails', $sql); } @@ -142,7 +143,7 @@ class AdminModule extends PLModule MONTH(MAX(start)), MONTH(MIN(start)), DAYOFMONTH(MAX(start)), DAYOFMONTH(MIN(start)) - FROM logger.sessions"); + FROM #logger#.sessions"); list($ymax, $ymin, $mmax, $mmin, $dmax, $dmin) = $res->fetchOneRow(); if (($year < $ymin) || ($year == $ymin && $month < $mmin)) { @@ -180,7 +181,7 @@ class AdminModule extends PLModule if ($year) { $res = XDB::query("SELECT YEAR (MAX(start)), YEAR (MIN(start)), MONTH(MAX(start)), MONTH(MIN(start)) - FROM logger.sessions"); + FROM #logger#.sessions"); list($ymax, $ymin, $mmax, $mmin) = $res->fetchOneRow(); if (($year < $ymin) || ($year > $ymax)) { @@ -210,7 +211,7 @@ class AdminModule extends PLModule $years[0] = "----"; // retrieve available years - $res = XDB::query("select YEAR(MAX(start)), YEAR(MIN(start)) FROM logger.sessions"); + $res = XDB::query("select YEAR(MAX(start)), YEAR(MIN(start)) FROM #logger#.sessions"); list($max, $min) = $res->fetchOneRow(); for($i = intval($min); $i<=$max; $i++) { @@ -270,16 +271,16 @@ class AdminModule extends PLModule // we are viewing a session $res = XDB::query("SELECT ls.*, a.alias AS username, sa.alias AS suer - FROM logger.sessions AS ls - LEFT JOIN aliases AS a ON (a.id = ls.uid AND a.type='a_vie') - LEFT JOIN aliases AS sa ON (sa.id = ls.suid AND sa.type='a_vie') + FROM #logger#.sessions AS ls + LEFT JOIN #x4dat#.aliases AS a ON (a.id = ls.uid AND a.type='a_vie') + LEFT JOIN #x4dat#.aliases AS sa ON (sa.id = ls.suid AND sa.type='a_vie') WHERE ls.id = {?}", $arg); $page->assign('session', $a = $res->fetchOneAssoc()); $res = XDB::iterator('SELECT a.text, e.data, e.stamp - FROM logger.events AS e - LEFT JOIN logger.actions AS a ON e.action=a.id + FROM #logger#.events AS e + LEFT JOIN #logger#.actions AS a ON e.action=a.id WHERE e.session={?}', $arg); while ($myarr = $res->next()) { $page->append('events', $myarr); @@ -329,8 +330,8 @@ class AdminModule extends PLModule $where = $this->_makeWhere($year, $month, $day, $loguid); $select = "SELECT s.id, s.start, s.uid, a.alias as username - FROM logger.sessions AS s - LEFT JOIN aliases AS a ON (a.id = s.uid AND a.type='a_vie') + FROM #logger#.sessions AS s + LEFT JOIN #x4dat#.aliases AS a ON (a.id = s.uid AND a.type='a_vie') $where ORDER BY start DESC"; $res = XDB::iterator($select); @@ -344,9 +345,9 @@ class AdminModule extends PLModule // attach events $sql = "SELECT s.id, a.text - FROM logger.sessions AS s - LEFT JOIN logger.events AS e ON(e.session=s.id) - INNER JOIN logger.actions AS a ON(a.id=e.action) + FROM #logger#.sessions AS s + LEFT JOIN #logger#.events AS e ON(e.session=s.id) + INNER JOIN #logger#.actions AS a ON(a.id=e.action) $where"; $res = XDB::iterator($sql); @@ -367,15 +368,19 @@ class AdminModule extends PLModule function handler_user(&$page, $login = false) { global $globals; - $page->changeTpl('admin/utilisateurs.tpl'); + $page->changeTpl('admin/user.tpl'); $page->setTitle('Administration - Compte'); if (S::suid()) { - $page->kill("Déjà en SUID !!!"); + $page->kill("Déjà en SUID !!!"); } // Loads the user identity using the environment. $user = User::get($login); + if (!$user) { + return; + } + $login = $user->login(); $registered = ($user->state != 'pending'); @@ -418,6 +423,11 @@ class AdminModule extends PLModule } 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('weak_password')) { $to_update['weak_password'] = Post::s('weak_password'); @@ -449,6 +459,8 @@ 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. $set = array(); foreach ($to_update as $k => $value) { $set[] = XDB::format($k . ' = {?}', $value); @@ -584,10 +596,9 @@ class AdminModule extends PLModule $page->addJsLink('ui.core.js'); $page->addJsLink('ui.tabs.js'); - // Displays last login and last host information. $res = XDB::query("SELECT start, host - FROM logger.sessions + FROM #logger#.sessions WHERE uid = {?} AND suid = 0 ORDER BY start DESC LIMIT 1", $user->id()); @@ -614,7 +625,6 @@ class AdminModule extends PLModule $page->assign('emails', $redirect->emails); } - $page->assign('mr', $mr); $page->assign('user', $user); // Displays forum bans. @@ -625,16 +635,19 @@ class AdminModule extends PLModule $page->assign('bans', $bans); } - function getHruid($line, $key) + function getHruid($line, $key, $relation) { - var_dump($line); - if (!isset($line['nom']) || !isset($line['prenom']) || !isset($line['promo'])) { - return null; + $prenom = CSVImporter::getValue($line, 'prenom', $relation['prenom']); + $nom = CSVImporter::getValue($line, 'nom', $relation['nom']); + $promo = CSVImporter::getValue($line, 'promo', $relation['promo']); + + if ($prenom != 'NULL' && $nom != 'NULL' && $promo != 'NULL') { + return make_forlife($prenom, $nom, $promo); } - return make_forlife($line['prenom'], $line['nom'], $line['promo']); + return null; } - function getMatricule($line, $key) + function getMatricule($line, $key, $relation) { $mat = $line['matricule']; $year = intval(substr($mat, 0, 3)); @@ -756,37 +769,44 @@ class AdminModule extends PLModule $page->changeTpl('admin/deces_promo.tpl'); $page->setTitle('Administration - Deces'); - if (!$promo) - $promo = Env::i('promo'); - if (Env::has('sub10')) $promo -= 10; - if (Env::has('sub01')) $promo -= 1; - if (Env::has('add01')) $promo += 1; - if (Env::has('add10')) $promo += 10; - - $page->assign('promo',$promo); + if (!$promo) { + $promo = Env::t('promo', 'X1923'); + } + $page->assign('promo', $promo); + if (!$promo) { + return; + } if ($validate) { S::assert_xsrf_token(); - $res = XDB::iterRow("SELECT user_id,matricule,nom,prenom,deces FROM auth_user_md5 WHERE promo = {?}", $promo); - while (list($uid,$mat,$nom,$prenom,$deces) = $res->next()) { - $val = Env::v($mat); + $res = XDB::iterRow('SELECT p.hrpid, 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)) { continue; } - XDB::execute('UPDATE auth_user_md5 SET deces={?} WHERE matricule = {?}', $val, $mat); - $page->trigSuccess('Ajout du décès de ' . $prenom . " " . $nom . ' le ' . $val . '.'); - if($deces == '0000-00-00' || empty($deces)) { - require_once('notifs.inc.php'); - register_watch_op($uid, WATCH_DEATH, $val); + 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)) { + // 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 } } } - $res = XDB::iterator('SELECT matricule, nom, prenom, deces FROM auth_user_md5 WHERE promo = {?} ORDER BY nom,prenom', $promo); + $res = XDB::iterator('SELECT p.hrpid, 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); } @@ -796,12 +816,15 @@ class AdminModule extends PLModule $page->setTitle('Administration - Décédés'); $res = XDB::iterator( - "SELECT u.promo, u.nom, u.prenom, u.deces, u.matricule_ax, u.hruid, DATE(MAX(s.start)) AS last - FROM auth_user_md5 AS u - LEFT JOIN logger.sessions AS s ON (s.uid = u.user_id AND suid = 0) - WHERE perms IN ('admin', 'user') AND deces <> 0 - GROUP BY u.user_id - ORDER BY u.promo, u.nom"); + "SELECT a.hruid, pd.promo, p.ax_id, pd.directory_name, p.deathdate, DATE(MAX(s.start)) AS last + FROM #x4dat#.accounts AS a + INNER JOIN #x4dat#.account_profiles AS ap ON (ap.uid = a.uid AND FIND_IN_SET('owner', ap.perms)) + INNER JOIN #x4dat#.profiles AS p ON (p.pid = ap.pid) + INNER JOIN #x4dat#.profile_display AS pd ON (pd.pid = p.pid) + LEFT JOIN #logger#.sessions AS s ON (s.uid = a.uid AND suid = 0) + WHERE a.state = 'active' AND p.deathdate IS NOT NULL + GROUP BY a.uid + ORDER BY pd.promo, pd.sort_name"); $page->assign('dead', $res); } @@ -918,7 +941,7 @@ class AdminModule extends PLModule { $page->setTitle('Administration - Actions'); $page->assign('title', 'Gestion des actions de logger'); - $table_editor = new PLTableEditor('admin/logger/actions','logger.actions','id'); + $table_editor = new PLTableEditor('admin/logger/actions','#logger#.actions','id'); $table_editor->describe('text','intitulé',true); $table_editor->describe('description','description',true); $table_editor->apply($page, $action, $id); @@ -1060,10 +1083,10 @@ class AdminModule extends PLModule IF(w.ip = s2.ip, s2.host, s2.forward_host), IF(w.ip = s.ip, s.host, s.forward_host)), w.mask, w.detection, w.state, a.hruid - FROM ip_watch AS w - LEFT JOIN logger.sessions AS s ON (s.ip = w.ip) - LEFT JOIN logger.sessions AS s2 ON (s2.forward_ip = w.ip) - LEFT JOIN accounts AS a ON (a.uid = s.uid) + FROM #x4dat#.ip_watch AS w + LEFT JOIN #logger#.sessions AS s ON (s.ip = w.ip) + LEFT JOIN #logger#.sessions AS s2 ON (s2.forward_ip = w.ip) + LEFT JOIN #x4dat#.accounts AS a ON (a.uid = s.uid) GROUP BY w.ip, a.hruid ORDER BY w.state, w.ip, a.hruid"; $it = Xdb::iterRow($sql); @@ -1094,10 +1117,10 @@ class AdminModule extends PLModule } elseif ($action == 'edit') { $sql = "SELECT w.detection, w.state, w.last, w.description, w.mask, a1.hruid AS edit, a2.hruid AS hruid, s.host - FROM ip_watch AS w - LEFT JOIN accounts AS a1 ON (a1.uid = w.uid) - LEFT JOIN logger.sessions AS s ON (w.ip = s.ip) - LEFT JOIN accounts AS a2 ON (a2.uid = s.uid) + FROM #x4dat#.ip_watch AS w + LEFT JOIN #x4dat#.accounts AS a1 ON (a1.uid = w.uid) + LEFT JOIN #logger#.sessions AS s ON (w.ip = s.ip) + LEFT JOIN #x4dat#.accounts AS a2 ON (a2.uid = s.uid) WHERE w.ip = {?} GROUP BY a2.hruid ORDER BY a2.hruid"; @@ -1153,6 +1176,114 @@ class AdminModule extends PLModule WHERE a.is_admin ORDER BY a.hruid')); } + + function handler_jobs(&$page, $id = -1) + { + $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('% ', {?}, '%')", + Env::t('job'), Env::t('job')); + + if ($res->numRows() <= 20) { + $page->assign('jobs', $res->fetchAllAssoc()); + } else { + $page->trigError("Il y a trop d'entreprises correspondant à ton choix. Affine-le !"); + } + + $page->assign('askedJob', Env::v('job')); + return; + } + + 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 uid = {?} 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); + + 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."); + } 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 (uid, 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']); + + $page->trigSuccess("L'entreprise a bien été mise à jour."); + } + } + + if (!Env::has('change') && $id != -1) { + $res = XDB::query("SELECT e.id, e.name, e.acronym, e.url, e.email, e.NAF_code, e.AX_code, + h.id AS holdingId, h.name AS holdingName, h.acronym AS holdingAcronym, + 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.uid = e.id AND link_type = 'hq' AND tel_id = 0) + LEFT JOIN profile_phones AS f ON (f.uid = e.id AND link_type = 'hq' AND tel_id = 1) + LEFT JOIN profile_addresses AS a ON (a.jobid = e.id AND a.type = 'hq') + WHERE e.id = {?}", + $id); + + if ($res->numRows() == 0) { + $page->trigError('Auncune entreprise ne correspond à cet identifiant.'); + } else { + $page->assign('selectedJob', $res->fetchOneAssoc()); + } + } + } } // vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: