X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=ef9fa0e02ed687aa4e64a7ccd6374cb6b6c2455b;hb=84fc72ffb0ef96311a18e668c2d427e8642753d5;hp=c47ccfac25eb30f470b89da7af3417b4b0f5abf1;hpb=1517a52d31182fb1d6fb64b1239ae7555d3c2038;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index c47ccfa..9534e99 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'), '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'), @@ -36,12 +38,17 @@ class AdminModule extends PLModule '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'), ); } @@ -51,25 +58,36 @@ class AdminModule extends PLModule exit; } + function handler_get_rights(&$page, $level) + { + if (S::suid()) { + $page->kill('Déjà en SUID'); + } + $user =& S::user(); + Platal::session()->startSUID($user, $level); + + pl_redirect('/'); + } + function handler_default(&$page) { $page->changeTpl('admin/index.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration'); + $page->setTitle('Administration'); } function handler_postfix_delayed(&$page) { $page->changeTpl('admin/postfix_delayed.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Retardés'); + $page->setTitle('Administration - Postfix : Retardés'); if (Env::has('del')) { $crc = Env::v('crc'); XDB::execute("UPDATE postfix_mailseen SET release = 'del' WHERE crc = {?}", $crc); - $page->trig($crc." verra tous ses mails 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->trig($crc." a le droit de passer !"); + $page->trigSuccess($crc." a le droit de passer !"); } $sql = XDB::iterator( @@ -85,7 +103,7 @@ class AdminModule extends PLModule function handler_postfix_regexpsbounces(&$page, $new = null) { $page->changeTpl('admin/emails_bounces_re.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Regexps Bounces'); + $page->setTitle('Administration - Postfix : Regexps Bounces'); $page->assign('new', $new); if (Post::has('submit')) { @@ -258,7 +276,7 @@ class AdminModule extends PLModule $page->assign('session', $a = $res->fetchOneAssoc()); - $res = XDB::iterator('SELECT a.text, e.data, UNIX_TIMESTAMP(e.stamp) AS stamp + $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 WHERE e.session={?}', $arg); @@ -308,7 +326,7 @@ class AdminModule extends PLModule // get the requested sessions $where = $this->_makeWhere($year, $month, $day, $loguid); - $select = "SELECT s.id, UNIX_TIMESTAMP(s.start) as start, s.uid, + $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') @@ -336,215 +354,414 @@ 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 annuée et/ou un utilisateur"); } } - $page->changeTpl('logger-view.tpl'); + $page->changeTpl('admin/logger-view.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Logs des sessions'); + $page->setTitle('Administration - Logs des sessions'); } function handler_user(&$page, $login = false) { + global $globals; $page->changeTpl('admin/utilisateurs.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Edit/Su/Log'); + $page->setTitle('Administration - Edit/Su/Log'); require_once("emails.inc.php"); - require_once("user.func.inc.php"); - if (S::has('suid')) { - $page->kill("déjà en SUID !!!"); + if (S::suid()) { + $page->kill("Déjà en SUID !!!"); } - if (Env::has('user_id')) { - $login = get_user_login(Env::i('user_id')); - if (empty($login)) { - $login = Env::i('user_id'); - } - } elseif (Env::has('login')) { - $login = get_user_login(Env::v('login')); + // Loads the user identity using the environment. + if ($login) { + $user = User::get($login); + } else if (Env::has('user_id')) { + $user = User::get(Env::i('user_id')); + } else if (Env::has('login')) { + $user = User::get(Env::v('login')); } - if(Env::has('logs_button') && $login) { - pl_redirect("admin/logger?login=$login&year=".date('Y')."&month=".date('m')); + if ($user) { + $login = $user->login(); + $registered = ($user->forlifeEmail() != null); + } else { + return; } - if (Env::has('ax_button') && $login) { - pl_redirect("admin/synchro_ax/$login"); + // Handles specific requests (AX sync, su, ...). + if(Env::has('logs_button') && $registered) { + pl_redirect("admin/logger?loguser=$login&year=".date('Y')."&month=".date('m')); } - if(Env::has('suid_button') && $login) { - $_SESSION['log']->log("suid_start", "login by ".S::v('forlife')); - $_SESSION['suid'] = $_SESSION; - $r = XDB::query("SELECT id FROM aliases WHERE alias={?}", $login); - if($uid = $r->fetchOneCell()) { - start_connexion($uid,true); - pl_redirect(""); - } + if (Env::has('ax_button') && $registered) { + pl_redirect("admin/synchro_ax/" . $user->login()); } - if ($login) { - if (is_numeric($login)) { - $r = XDB::query("SELECT *, a.alias AS forlife, u.flags AS sexe, - (year(naissance) > promo - 15 or year(naissance) < promo - 25) AS naiss_err - FROM auth_user_md5 AS u - LEFT JOIN aliases AS a ON (a.id = u.user_id AND type= 'a_vie') - WHERE u.user_id = {?}", $login); + if(Env::has('suid_button') && $registered) { + if (!Platal::session()->startSUID($user)) { + $page->trigError('Impossible d\'effectuer un SUID sur ' . $user->id()); } else { - $r = XDB::query("SELECT *, a.alias AS forlife, u.flags AS sexe, - (year(naissance) > promo - 15 or year(naissance) < promo - 25) AS naiss_err - FROM auth_user_md5 AS u - INNER JOIN aliases AS a ON ( a.id = u.user_id AND a.alias={?} AND type!='homonyme' )", $login); - } - $mr = $r->fetchOneAssoc(); - - if (!is_numeric($login)) { //user has a forlife - $redirect = new Redirect($mr['user_id']); + pl_redirect(""); } + } - // Check if there was a submission - foreach($_POST as $key => $val) { - switch ($key) { - case "add_fwd": - $email = trim(Env::v('email')); - if (!isvalid_email_redirection($email)) { - $page->trig("invalid email $email"); + // Fetches user data. + $userinfo_query = "SELECT *, FIND_IN_SET('watch', flags) AS watch, FIND_IN_SET('femme', flags) AS sexe, + (year(naissance) > promo - 15 or year(naissance) < promo - 25) AS naiss_err + FROM auth_user_md5 + WHERE user_id = {?}"; + $mr = XDB::query($userinfo_query, $user->id())->fetchOneAssoc(); + $redirect = ($registered ? new Redirect($user) : null); + + // Processes admin requests, if any. + foreach($_POST as $key => $val) { + S::assert_xsrf_token(); + + switch ($key) { + // Email redirection actions. + case "add_fwd": + $email = trim(Env::v('email')); + if (!isvalid_email_redirection($email)) { + $page->trigError("Email non valide: $email"); + } else { + $redirect->add_email($email); + $page->trigSuccess("Ajout de $email effectué"); + } + break; + + case "del_fwd": + if (!empty($val)) { + $redirect->delete_email($val); + } + break; + + case "activate_fwd": + if (!empty($val)) { + $redirect->modify_one_email($val, true); + } + break; + case "deactivate_fwd": + if (!empty($val)) { + $redirect->modify_one_email($val, false); + } + break; + case "disable_fwd": + $redirect->disable(); + break; + case "enable_fwd": + $redirect->enable(); + break; + case "clean_fwd": + if (!empty($val)) { + $redirect->clean_errors($val); + } + break; + + // Alias actions. + case "add_alias": + global $globals; + + // Splits new alias in user and fqdn. + $alias = trim(Env::v('email')); + if (strpos($alias, '@') !== false) { + list($alias, $domain) = explode('@', $alias); + } else { + $domain = $globals->mail->domain; + } + + // Checks for alias' user validity. + if (!preg_match('/[-a-z0-9\.]+/s', $alias)) { + $page->trigError("'$alias' n'est pas un alias valide"); + } + + // Eventually adds the alias to the right domain. + if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) { + $req = new AliasReq($user, $alias, 'Admin request', false); + if ($req->commit()) { + $page->trigSuccess("Nouvel alias '$alias@$domain' attribué"); + } else { + $page->trigError("Impossible d'ajouter l'alias '$alias@$domain', il est probablement déjà attribué"); + } + } elseif ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) { + $res = XDB::execute("INSERT INTO aliases (id,alias,type) VALUES ({?}, {?}, 'alias')", + $user->id(), $alias); + if ($res) { + $page->trigSuccess("Nouvel alias '$alias' ajouté"); } else { - $redirect->add_email($email); - $page->trig("Ajout de $email effectué"); + $page->trigError("Impossible d'ajouter l'alias '$alias', il est probablement déjà attribué"); } + } else { + $page->trigError("Le domaine '$domain' n'est pas valide"); + } + break; + + case "del_alias": + if (!empty($val)) { + XDB::execute("DELETE FROM aliases + WHERE id = {?} AND alias = {?} AND + type NOT IN ('a_vie', 'homonyme')", + $user->id(), $val); + XDB::execute("UPDATE emails + SET rewrite = '' + WHERE uid = {?} AND rewrite LIKE CONCAT({?}, '@%')", + $user->id(), $val); + fix_bestalias($user); + $page->trigSuccess("L'alias '$val' a été supprimé"); + } + break; + + case "best": + XDB::execute("UPDATE aliases + SET flags = TRIM(BOTH ',' FROM REPLACE(CONCAT(',', flags, ','), ',bestalias,', ',')) + WHERE id = {?}", $user->id()); + XDB::execute("UPDATE aliases + SET flags = CONCAT_WS(',', IF(flags = '', NULL, flags), 'bestalias') + WHERE id = {?} AND alias = {?}", $user->id(), $val); + + // As having a non-null bestalias value is critical in + // plat/al's code, we do an a posteriori check on the + // validity of the bestalias. + fix_bestalias($user); + break; + + // Profile edition. + case "u_edit": + // Loads new values from environment. + $pass_encrypted = Env::v('newpass_clair') != "********" ? sha1(Env::v('newpass_clair')) : Env::v('passw'); + $naiss = Env::v('naissanceN'); + $deces = Env::v('decesN'); + $perms = Env::v('permsN'); + $prenom = Env::v('prenomN'); + $nom = Env::v('nomN'); + $nomusage = Env::v('nomusageN'); + $promo = Env::i('promoN'); + $sexe = Env::v('sexeN'); + $comm = trim(Env::v('commentN')); + $watch = Env::v('watchN'); + + $flags = ($sexe ? 'femme' : ''); + if ($watch) { + $flags .= ($flags ? ',watch' : 'watch'); + } + if ($watch && !$comm) { + $page->trigError("Il est nécessaire de mettre un commentaire pour surveiller un compte"); break; + } + + // Fetches fields to watch for changes. + $watch_query = "SELECT naissance, deces, password, perms, nom_usage, + prenom, nom, flags, promo, comment + FROM auth_user_md5 + WHERE user_id = {?}"; + $old_fields = XDB::query($watch_query, $user->id())->fetchOneAssoc(); + + // If user was newly banned, we need to ensure her php session + // is killed. This hack is ugly (and largely overkill); it should + // however suits our needs. + if ($perms == 'disabled' && $old_fields['perms'] != 'disabled') { + kill_sessions(); + } + + // Updates the user profile with the new values. + $res = XDB::execute("UPDATE auth_user_md5 + SET naissance = {?}, deces = {?}, password = {?}, + perms = {?}, prenom = {?}, nom = {?}, nom_usage = {?}, + flags = {?}, promo = {?}, comment = {?} + WHERE user_id = {?}", + $naiss, $deces, $pass_encrypted, + $perms, $prenom, $nom, $nomusage, + $flags, $promo, $comm, $user->id()); + if ($res) { + require_once("user.func.inc.php"); + user_reindex($user->id()); + $new_fields = XDB::query($watch_query, $user->id())->fetchOneAssoc(); + + $mailer = new PlMailer("admin/useredit.mail.tpl"); + $mailer->assign("admin", S::user()->login()); + $mailer->assign("user", $user->login()); + $mailer->assign('old', $old_fields); + $mailer->assign('new', $new_fields); + $mailer->send(); - case "del_fwd": - if (!empty($val)) { - $redirect->delete_email($val); + $globals->updateNbIns(); + $page->trigSuccess("Update was successful."); + } else { + $page->trigError("Update failed, please double check your values."); + } + + // Checks for changes, and updates other tables of plat/al. + if (Env::v('nomusageN') != $mr['nom_usage']) { + set_new_usage($user->id(), Env::v('nomusageN'), make_username(Env::v('prenomN'), Env::v('nomusageN'))); + } + if (Env::v('decesN') != $mr['deces']) { + require_once 'notifs.inc.php'; + register_watch_op($user->id(), WATCH_DEATH, $mr['deces']); + user_clear_all_subs($user->id(), false); + } + + // Eventually updates the Google Apps account. + if ($globals->mailstorage->googleapps_domain) { + // If the user did choose to use synchronized passwords, + // and the password was changed, updates the Google Apps + // password as well. + if (Env::v('newpass_clair') != "********") { + require_once 'googleapps.inc.php'; + $account = new GoogleAppsAccount($user); + if ($account->active() && $account->sync_password) { + $account->set_password($pass_encrypted); + } } - break; - case "del_alias": - if (!empty($val)) { - XDB::execute("DELETE FROM aliases - WHERE id={?} AND alias={?} - AND type!='a_vie' AND type!='homonyme'", $mr['user_id'], $val); - XDB::execute("UPDATE emails - SET rewrite = '' - WHERE uid = {?} AND rewrite LIKE CONCAT({?}, '@%')", - $mr['user_id'], $val); - fix_bestalias($mr['user_id']); - $page->trig($val." a été supprimé"); + // If the update did disable the user account, disables + // the Google Apps account as well. + if ($new_fields['perms'] == 'disabled' && $new_fields['perms'] != $old_fields['perms']) { + require_once 'googleapps.inc.php'; + $account = new GoogleAppsAccount($user); + $account->suspend(); } - break; - case "activate_fwd": - if (!empty($val)) { - $redirect->modify_one_email($val, true); - } - break; - case "deactivate_fwd": - if (!empty($val)) { - $redirect->modify_one_email($val, false); - } - break; - case "add_alias": - XDB::execute("INSERT INTO aliases (id,alias,type) VALUES ({?}, {?}, 'alias')", - $mr['user_id'], Env::v('email')); - break; + } - case "best": - // 'bestalias' is the first bit of the set : 1 - // 255 is the max for flags (8 sets max) - XDB::execute("UPDATE aliases SET flags= flags & (255 - 1) WHERE id={?}", $mr['user_id']); - XDB::execute("UPDATE aliases - SET flags= flags | 1 - WHERE id={?} AND alias={?}", $mr['user_id'], $val); - break; + // Reloads the user profile, to ensure the latest version will + // be served to the administrator. + $mr = XDB::query($userinfo_query, $user->id())->fetchOneAssoc(); - // Editer un profil - case "u_edit": - require_once('secure_hash.inc.php'); - $pass_encrypted = Env::v('newpass_clair') != "********" ? hash_encrypt(Env::v('newpass_clair')) : Env::v('passw'); - $naiss = Env::v('naissanceN'); - $deces = Env::v('decesN'); - $perms = Env::v('permsN'); - $prenm = Env::v('prenomN'); - $nom = Env::v('nomN'); - $promo = Env::i('promoN'); - $sexe = Env::v('sexeN'); - $comm = Env::v('commentN'); - - $query = "UPDATE auth_user_md5 SET - naissance = '$naiss', - deces = '$deces', - password = '$pass_encrypted', - perms = '$perms', - prenom = '".addslashes($prenm)."', - nom = '".addslashes($nom)."', - flags = '$sexe', - promo = $promo, - comment = '".addslashes($comm)."' - WHERE user_id = '{$mr['user_id']}'"; - if (XDB::execute($query)) { - user_reindex($mr['user_id']); - - require_once("diogenes/diogenes.hermes.inc.php"); - $mailer = new HermesMailer(); - $mailer->setFrom("webmaster@polytechnique.org"); - $mailer->addTo("web@polytechnique.org"); - $mailer->setSubject("INTERVENTION de ".S::v('forlife')); - $mailer->setTxtBody(preg_replace("/[ \t]+/", ' ', $query)); - $mailer->send(); - - $page->trig("updaté correctement."); - } - if (Env::v('nomusageN') != $mr['nom_usage']) { - set_new_usage($mr['user_id'], Env::v('nomusageN'), make_username(Env::v('prenomN'), Env::v('nomusageN'))); - } - $r = XDB::query("SELECT *, a.alias AS forlife, u.flags AS sexe - FROM auth_user_md5 AS u - LEFT JOIN aliases AS a ON (a.id = u.user_id AND type= 'a_vie') - WHERE u.user_id = {?}", $mr['user_id']); - $mr = $r->fetchOneAssoc(); - break; + break; - // DELETE FROM auth_user_md5 - case "u_kill": - user_clear_all_subs($mr['user_id']); - $page->trig("'{$mr['user_id']}' a été désinscrit !"); - require_once("diogenes/diogenes.hermes.inc.php"); - $mailer = new HermesMailer(); - $mailer->setFrom("webmaster@polytechnique.org"); - $mailer->addTo("web@polytechnique.org"); - $mailer->setSubject("INTERVENTION de ".S::v('forlife')); - $mailer->setTxtBody("\nUtilisateur $login effacé"); - $mailer->send(); - break; - } + // User re-registration. + case "u_kill": + user_clear_all_subs($user->id()); + $globals->updateNbIns(); + $page->trigSuccess("'" . $user->id() . "' a été désinscrit !"); + + $mailer = new PlMailer("admin/useredit.mail.tpl"); + $mailer->assign("admin", S::user()->login()); + $mailer->assign("user", $user->login()); + $mailer->assign("deletion", true); + $mailer->send(); + break; + + // Forum ban update. + case "b_edit": + XDB::execute("DELETE FROM forums.innd WHERE uid = {?}", $user->id()); + if (Env::v('write_perm') != "" || Env::v('read_perm') != "" || Env::v('commentaire') != "" ) { + XDB::execute("INSERT INTO forums.innd + SET ipmin = '0', ipmax = '4294967295', + write_perm = {?}, read_perm = {?}, + comment = {?}, priority = '200', uid = {?}", + Env::v('write_perm'), Env::v('read_perm'), Env::v('comment'), $user->id()); + } + break; } + } - $res = XDB::query("SELECT UNIX_TIMESTAMP(start), host - FROM logger.sessions - WHERE uid={?} AND suid=0 - ORDER BY start DESC - LIMIT 1", $mr['user_id']); - list($lastlogin,$host) = $res->fetchOneRow(); - $page->assign('lastlogin', $lastlogin); - $page->assign('host', $host); - - $page->assign('aliases', XDB::iterator( - "SELECT alias, type='a_vie' AS for_life,FIND_IN_SET('bestalias',flags) AS best,expire - FROM aliases - WHERE id = {?} AND type!='homonyme' - ORDER BY type!= 'a_vie'", $mr["user_id"])); - if ($mr['perms'] != 'pending') { - $page->assign('emails',$redirect->emails); + // Displays last login and last host information. + $res = XDB::query("SELECT start, host + FROM logger.sessions + WHERE uid = {?} AND suid = 0 + ORDER BY start DESC + LIMIT 1", $user->id()); + list($lastlogin,$host) = $res->fetchOneRow(); + $page->assign('lastlogin', $lastlogin); + $page->assign('host', $host); + + // Display active aliases. + $page->assign('virtuals', XDB::iterator( + "SELECT alias + FROM virtual + INNER JOIN virtual_redirect USING (vid) + WHERE type = 'user' AND (redirect = {?} OR redirect = {?})", + $user->forlifeEmail(), + // TODO: remove this über-ugly hack. The issue is that you need + // to remove all @m4x.org addresses in virtual_redirect first. + $user->login() . '@' . $globals->mail->domain2)); + + $page->assign('aliases', XDB::iterator( + "SELECT alias, type='a_vie' AS for_life,FIND_IN_SET('bestalias',flags) AS best,expire + FROM aliases + WHERE id = {?} AND type != 'homonyme' + ORDER BY type != 'a_vie'", $user->id())); + + // Displays email redirection and the general profile. + if ($registered && $redirect) { + $page->assign('emails', $redirect->emails); + } + + $page->assign('mr', $mr); + $page->assign('user', $user); + + // Displays forum bans. + $res = XDB::query("SELECT write_perm, read_perm, comment + FROM forums.innd + WHERE uid = {?}", $user->id()); + $bans = $res->fetchOneAssoc(); + $page->assign('bans', $bans); + } + + function getHruid($line, $key) + { + var_dump($line); + if (!isset($line['nom']) || !isset($line['prenom']) || !isset($line['promo'])) { + return null; + } + return make_forlife($line['prenom'], $line['nom'], $line['promo']); + } + + function getMatricule($line, $key) + { + $mat = $line['matricule']; + $year = intval(substr($mat, 0, 3)); + $rang = intval(substr($mat, 3, 3)); + if ($year > 200) { $year /= 10; }; + if ($year < 96) { + return null; + } else { + return sprintf('%04u%04u', 1900+$year, $rang); + } + } + + function handler_promo(&$page, $action = null, $promo = null) + { + if (Env::has('promo')) { + if(Env::i('promo') > 1900 && Env::i('promo') < 2050) { + $action = Env::v('valid_promo') == 'Ajouter des membres' ? 'add' : 'ax'; + pl_redirect('admin/promo/' . $action . '/' . Env::i('promo')); + } else { + $page->trigError('Promotion non valide.'); } + } - $page->assign('mr',$mr); + $page->changeTpl('admin/promo.tpl'); + if ($promo > 1900 && $promo < 2050 && ($action == 'add' || $action == 'ax')) { + $page->assign('promo', $promo); + } else { + return; + } + + $importer = new CSVImporter('auth_user_md5', 'matricule'); + $importer->registerFunction('matricule', 'matricule Ecole vers X.org', array($this, 'getMatricule')); + switch ($action) { + case 'add': + $fields = array('hruid', 'nom', 'nom_ini', 'prenom', 'naissance_ini', + 'prenom_ini', 'promo', 'promo_sortie', 'flags', + 'matricule', 'matricule_ax', 'perms'); + $importer->forceValue('hruid', array($this, 'getHruid')); + $importer->forceValue('promo', $promo); + $importer->forceValue('promo_sortie', $promo + 3); + break; + case 'ax': + $fields = array('matricule', 'matricule_ax'); + break; } + $importer->apply($page, "admin/promo/$action/$promo", $fields); } - function handler_homonyms(&$page, $op = 'list', $target = null) { + + function handler_homonyms(&$page, $op = 'list', $target = null) + { $page->changeTpl('admin/homonymes.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Homonymes'); + $page->setTitle('Administration - Homonymes'); require_once("homonymes.inc.php"); if ($target) { @@ -558,25 +775,31 @@ class AdminModule extends PLModule } } - $page->assign('op',$op); - $page->assign('target',$target); + $page->assign('op', $op); + $page->assign('target', $target); // on a un $target valide, on prepare les mails if ($target) { - // on examine l'op a effectuer switch ($op) { case 'mail': - send_warning_homonyme($prenom, $nom, $forlife, $loginbis); - switch_bestalias($target, $loginbis); + S::assert_xsrf_token(); + + send_warning_homonyme($prenom, $nom, $forlife, $loginbis); + switch_bestalias($target, $loginbis); $op = 'list'; + $page->trigSuccess('Email envoyé à ' . $forlife . '.'); break; + case 'correct': - switch_bestalias($target, $loginbis); + S::assert_xsrf_token(); + + switch_bestalias($target, $loginbis); XDB::execute("UPDATE aliases SET type='homonyme',expire=NOW() WHERE alias={?}", $loginbis); XDB::execute("REPLACE INTO homonymes (homonyme_id,user_id) VALUES({?},{?})", $target, $target); - send_robot_homonyme($prenom, $nom, $forlife, $loginbis); + send_robot_homonyme($prenom, $nom, $forlife, $loginbis); $op = 'list'; + $page->trigSuccess('Email envoyé à ' . $forlife . ', alias supprimé.'); break; } } @@ -603,9 +826,9 @@ class AdminModule extends PLModule function handler_ax_xorg(&$page) { $page->changeTpl('admin/ax-xorg.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - AX/X.org'); + $page->setTitle('Administration - AX/X.org'); - // liste des différences + // liste des différences $res = XDB::query( 'SELECT u.promo,u.nom AS nom,u.prenom AS prenom,ia.nom AS nomax,ia.prenom AS prenomax,u.matricule AS mat,ia.matricule_ax AS matax FROM auth_user_md5 AS u @@ -616,7 +839,7 @@ class AdminModule extends PLModule ORDER BY u.promo,u.nom,u.prenom'); $page->assign('diffs', $res->fetchAllAssoc()); - // gens à l'ax mais pas chez nous + // gens à l'ax mais pas chez nous $res = XDB::query( 'SELECT ia.promo,ia.nom,ia.nom_patro,ia.prenom FROM identification_ax as ia @@ -624,14 +847,14 @@ class AdminModule extends PLModule WHERE u.nom IS NULL'); $page->assign('mank', $res->fetchAllAssoc()); - // gens chez nous et pas à l'ax + // gens chez nous et pas à l'ax $res = XDB::query('SELECT promo,nom,prenom FROM auth_user_md5 WHERE matricule_ax IS NULL'); $page->assign('plus', $res->fetchAllAssoc()); } function handler_deaths(&$page, $promo = 0, $validate = false) { $page->changeTpl('admin/deces_promo.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Deces'); + $page->setTitle('Administration - Deces'); if (!$promo) $promo = Env::i('promo'); @@ -643,86 +866,103 @@ class AdminModule extends PLModule $page->assign('promo',$promo); if ($validate) { - $new_deces = array(); + 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); - if($val == $deces || empty($val)) continue; - XDB::execute('UPDATE auth_user_md5 SET deces={?} WHERE matricule = {?}', $val, $mat); - $new_deces[] = array('name' => "$prenom $nom", 'date' => "$val"); - if($deces=='0000-00-00' or empty($deces)) { - require_once('notifs.inc.php'); - register_watch_op($uid, WATCH_DEATH, $val); - require_once('user.func.inc.php'); - user_clear_all_subs($uid, false); // by default, dead ppl do not loose their email - } + 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); + require_once('user.func.inc.php'); + user_clear_all_subs($uid, false); // by default, dead ppl do not loose their email + } } - $page->assign('new_deces',$new_deces); } $res = XDB::iterator('SELECT matricule, nom, prenom, deces FROM auth_user_md5 WHERE promo = {?} ORDER BY nom,prenom', $promo); $page->assign('decedes', $res); } - function handler_synchro_ax(&$page, $user = null, $action = null) { + function handler_dead_but_active(&$page) { + $page->changeTpl('admin/dead_but_active.tpl'); + $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"); + $page->assign('dead', $res); + } + + function handler_synchro_ax(&$page, $login = null, $action = null) { $page->changeTpl('admin/synchro_ax.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Synchro AX'); + $page->setTitle('Administration - Synchro AX'); + // Checks for synchronization requirements. require_once('synchro_ax.inc.php'); - if (is_ax_key_missing()) { $page->assign('no_private_key', true); $page->run(); } - require_once('user.func.inc.php'); - - if ($user) - $login = get_user_forlife($user); - - if (Env::has('user')) { - $login = get_user_forlife(Env::v('user')); - if ($login === false) { - return; - } + // Determines user identity using environment. + if ($login) { + $user = User::get($login); + } else if (Env::has('user')) { + $user = User::get(Env::v('user')); + } else if (Env::has('mat')) { + $res = XDB::query("SELECT user_id FROM auth_user_md5 WHERE matricule = {?}", Env::i('mat')); + $user = User::get($res->fetchOneCell()); + } else { + return; } - if (Env::has('mat')) { - $res = XDB::query( - "SELECT alias - FROM aliases AS a - INNER JOIN auth_user_md5 AS u ON (a.id=u.user_id AND a.type='a_vie') - WHERE matricule={?}", Env::i('mat')); - $login = $res->fetchOneCell(); + // Finally synchronizes the AX and plat/al information. + if ($action == 'import') { + ax_synchronize($user->login(), S::v('uid')); } - if ($login) { - if ($action == 'import') { - ax_synchronize($login, S::v('uid')); - } - // get details from user, but looking only info that can be seen by ax - $user = get_user_details($login, S::v('uid'), 'ax'); - $userax= get_user_ax($user['matricule_ax']); - require_once 'profil.func.inc.php'; - $diff = diff_user_details($userax, $user, 'ax'); + require_once 'profil.func.inc.php'; + $userxorg = get_user_details($user->login(), S::v('uid'), 'ax'); + $userax = get_user_ax($userxorg['matricule_ax']); + $diff = diff_user_details($userax, $userxorg, 'ax'); - $page->assign('x', $user); - $page->assign('diff', $diff); - } + $page->assign('x', $userxorg); + $page->assign('diff', $diff); } - function handler_validate(&$page, $action = 'list', $id = null) { + function handler_validate(&$page, $action = 'list', $id = null) + { $page->changeTpl('admin/valider.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Valider une demande'); + $page->setTitle('Administration - Valider une demande'); + $page->addCssLink('nl.css'); + $page->addJsLink('ajax.js'); require_once("validations.inc.php"); + if ($action == 'edit' and !is_null($id)) { $page->assign('preview_id', $id); } if(Env::has('uid') && Env::has('type') && Env::has('stamp')) { + S::assert_xsrf_token(); + $req = Validate::get_typed_request(Env::v('uid'), Env::v('type'), Env::v('stamp')); - if($req) { $req->handle_formu(); } + if ($req) { + $req->handle_formu(); + } else { + $page->trigWarning('La validation a déjà été effectuée.'); + } } $r = XDB::iterator('SHOW COLUMNS FROM requests_answers'); @@ -730,6 +970,8 @@ 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')); + $hide_requests = $res->fetchOneCell(); if (Post::has('hide')) { $hide = array(); foreach ($categories as $cat) @@ -737,26 +979,33 @@ class AdminModule extends PLModule $hidden[$cat] = 1; $hide[] = $cat; } - setcookie('hide_requests', join(',',$hide), time()+(count($hide)?25920000:(-3600)), '/', '', 0); - } elseif (Env::has('hide_requests')) { - foreach (explode(',',Env::v('hide_requests')) as $hide_type) + $hide_requests = join(',', $hide); + XDB::query('REPLACE INTO requests_hidden (user_id, hidden_requests) VALUES({?}, {?})', + S::v('uid'), $hide_requests); + } elseif ($hide_requests) { + foreach (explode(',', $hide_requests) as $hide_type) $hidden[$hide_type] = true; } $page->assign('hide_requests', $hidden); + // Update the count of item to validate here... useful in development configuration + // 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()); } + function handler_validate_answers(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Réponses automatiques de validation'); - $page->assign('title', 'Gestion des réponses automatiques'); + $page->setTitle('Administration - Réponses automatiques de validation'); + $page->assign('title', 'Gestion des réponses automatiques'); $table_editor = new PLTableEditor('admin/validate/answers','requests_answers','id'); - $table_editor->describe('category','catégorie',true); + $table_editor->describe('category','catégorie',true); $table_editor->describe('title','titre',true); $table_editor->describe('answer','texte',false); $table_editor->apply($page, $action, $id); } function handler_skins(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Skins'); + $page->setTitle('Administration - Skins'); $page->assign('title', 'Gestion des skins'); $table_editor = new PLTableEditor('admin/skins','skins','id'); $table_editor->describe('name','nom',true); @@ -767,8 +1016,9 @@ class AdminModule extends PLModule $table_editor->describe('ext','extension du screenshot',false); $table_editor->apply($page, $action, $id); } + function handler_postfix_blacklist(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Blacklist'); + $page->setTitle('Administration - Postfix : Blacklist'); $page->assign('title', 'Blacklist de postfix'); $table_editor = new PLTableEditor('admin/postfix/blacklist','postfix_blacklist','email', true); $table_editor->describe('reject_text','Texte de rejet',true); @@ -776,72 +1026,248 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_postfix_whitelist(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Whitelist'); + $page->setTitle('Administration - Postfix : Whitelist'); $page->assign('title', 'Whitelist de postfix'); $table_editor = new PLTableEditor('admin/postfix/whitelist','postfix_whitelist','email', true); $table_editor->describe('email','email',true); $table_editor->apply($page, $action, $id); } + function handler_mx_broken(&$page, $action = 'list', $id = null) { + $page->setTitle('Administration - MX Défaillants'); + $page->assign('title', 'MX Défaillant'); + $table_editor = new PLTableEditor('admin/mx/broken', 'mx_watch', 'host', true); + $table_editor->describe('host', 'Masque', true); + $table_editor->describe('state', 'Niveau', true); + $table_editor->describe('text', 'Description du problème', false); + $table_editor->apply($page, $action, $id); + } function handler_logger_actions(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Actions'); + $page->setTitle('Administration - Actions'); $page->assign('title', 'Gestion des actions de logger'); $table_editor = new PLTableEditor('admin/logger/actions','logger.actions','id'); - $table_editor->describe('text','intitulé',true); + $table_editor->describe('text','intitulé',true); $table_editor->describe('description','description',true); $table_editor->apply($page, $action, $id); } function handler_downtime(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Coupures'); + $page->setTitle('Administration - Coupures'); $page->assign('title', 'Gestion des coupures'); $table_editor = new PLTableEditor('admin/downtime','coupures','id'); $table_editor->describe('debut','date',true); - $table_editor->describe('duree','durée',false); - $table_editor->describe('resume','résumé',true); - $table_editor->describe('services','services affectés',true); + $table_editor->describe('duree','durée',false); + $table_editor->describe('resume','résumé',true); + $table_editor->describe('services','services affectés',true); $table_editor->describe('description','description',false); $table_editor->apply($page, $action, $id); } - function handler_wiki(&$page, $action='list') { - require_once 'wiki.inc.php'; + + function handler_wiki(&$page, $action = 'list', $wikipage = null, $wikipage2 = null) + { + if (S::hasAuthToken()) { + $page->setRssLink('Changement Récents', + '/Site/AllRecentChanges?action=rss&user=' . S::v('hruid') . '&hash=' . S::v('token')); + } // update wiki perms if ($action == 'update') { + S::assert_xsrf_token(); + $perms_read = Post::v('read'); - $perms_edot = Post::v('edit'); + $perms_edit = Post::v('edit'); if ($perms_read || $perms_edit) { - foreach ($_POST as $wiki_page => $val) if ($val == 'on') { - $wiki_page = str_replace('_', '/', $wiki_page); - if (!$perms_read || !$perms_edit) - list($perms0, $perms1) = wiki_get_perms($wiki_page); - if ($perms_read) - $perms0 = $perms_read; - if ($perms_edit) - $perms1 = $perms_edit; - wiki_set_perms($wiki_page, $perms0, $perms1); + foreach ($_POST as $wiki_page => $val) { + if ($val == 'on') { + $wp = new PlWikiPage(str_replace(array('_', '/'), '.', $wiki_page)); + if ($wp->setPerms($perms_read ? $perms_read : $wp->readPerms(), + $perms_edit ? $perms_edit : $wp->writePerms())) { + $page->trigSuccess("Permission de la page $wiki_page mises à jour"); + } else { + $page->trigError("Impossible de mettre les permissions de la page $wiki_page à jour"); + } + } + } + } + } else if ($action != 'list' && !empty($wikipage)) { + $wp = new PlWikiPage($wikipage); + S::assert_xsrf_token(); + + if ($action == 'delete') { + if ($wp->delete()) { + $page->trigSuccess("La page ".$wikipage." a été supprimée."); + } else { + $page->trigError("Impossible de supprimer la page ".$wikipage."."); + } + } else if ($action == 'rename' && !empty($wikipage2) && $wikipage != $wikipage2) { + if ($changedLinks = $wp->rename($wikipage2)) { + $s = 'La page '.$wikipage.' a été déplacée en '.$wikipage2.'.'; + if (is_numeric($changedLinks)) { + $s .= $changedLinks.' lien'.(($changedLinks>1)?'s ont été modifiés.':' a été modifié.'); + } + $page->trigSuccess($s); + } else { + $page->trigError("Impossible de déplacer la page ".$wikipage); } } } - $perms = wiki_perms_options(); + $perms = PlWikiPage::permOptions(); // list wiki pages and their perms - $wiki_pages = array(); - $dir = wiki_work_dir(); - if (is_dir($dir)) { - if ($dh = opendir($dir)) { - while (($file = readdir($dh)) !== false) if (substr($file,0,1) >= 'A' && substr($file,0,1) <= 'Z') { - list($read,$edit) = wiki_get_perms($file); - $wiki_pages[$file] = array('read' => $perms[$read], 'edit' => $perms[$edit]); - } - closedir($dh); + $wiki_pages = PlWikiPage::listPages(); + ksort($wiki_pages); + $wiki_tree = array(); + foreach ($wiki_pages as $file => $desc) { + list($cat, $name) = explode('.', $file); + if (!isset($wiki_tree[$cat])) { + $wiki_tree[$cat] = array(); } + $wiki_tree[$cat][$name] = $desc; } - ksort($wiki_pages); $page->changeTpl('admin/wiki.tpl'); - $page->assign('wiki_pages', $wiki_pages); + $page->addJsLink('jquery.js'); + $page->assign('wiki_pages', $wiki_tree); $page->assign('perms_opts', $perms); } + + function handler_ipwatch(&$page, $action = 'list', $ip = null) + { + $page->changeTpl('admin/ipwatcher.tpl'); + + $states = array('safe' => 'Ne pas surveiller', + 'unsafe' => 'Surveiller les inscriptions', + 'dangerous' => 'Surveiller tous les accès', + 'ban' => 'Bannir cette adresse'); + $page->assign('states', $states); + + switch (Post::v('action')) { + case 'create': + if (trim(Post::v('ipN')) != '') { + S::assert_xsrf_token(); + Xdb::execute('INSERT IGNORE INTO ip_watch (ip, mask, state, detection, last, uid, description) + VALUES ({?}, {?}, {?}, CURDATE(), NOW(), {?}, {?})', + ip_to_uint(trim(Post::v('ipN'))), ip_to_uint(trim(Post::v('maskN'))), + Post::v('stateN'), S::i('uid'), Post::v('descriptionN')); + }; + break; + + case 'edit': + S::assert_xsrf_token(); + Xdb::execute('UPDATE ip_watch + SET state = {?}, last = NOW(), uid = {?}, description = {?}, mask = {?} + WHERE ip = {?}', Post::v('stateN'), S::i('uid'), Post::v('descriptionN'), + ip_to_uint(Post::v('maskN')), ip_to_uint(Post::v('ipN'))); + break; + + default: + if ($action == 'delete' && !is_null($ip)) { + S::assert_xsrf_token(); + Xdb::execute('DELETE FROM ip_watch WHERE ip = {?}', ip_to_uint($ip)); + } + } + if ($action != 'create' && $action != 'edit') { + $action = 'list'; + } + $page->assign('action', $action); + + if ($action == 'list') { + $sql = "SELECT w.ip, IF(s.ip IS NULL, + 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, u.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 auth_user_md5 AS u ON (u.user_id = s.uid) + GROUP BY w.ip, u.hruid + ORDER BY w.state, w.ip, u.hruid"; + $it = Xdb::iterRow($sql); + + $table = array(); + $props = array(); + while (list($ip, $host, $mask, $date, $state, $hruid) = $it->next()) { + $ip = uint_to_ip($ip); + $mask = uint_to_ip($mask); + if (count($props) == 0 || $props['ip'] != $ip) { + if (count($props) > 0) { + $table[] = $props; + } + $props = array('ip' => $ip, + 'mask' => $mask, + 'host' => $host, + 'detection' => $date, + 'state' => $state, + 'users' => array($hruid)); + } else { + $props['users'][] = $hruid; + } + } + if (count($props) > 0) { + $table[] = $props; + } + $page->assign('table', $table); + } elseif ($action == 'edit') { + $sql = "SELECT w.detection, w.state, w.last, w.description, w.mask, + u1.hruid AS edit, u2.hruid AS hruid, s.host + FROM ip_watch AS w + LEFT JOIN auth_user_md5 AS u1 ON (u1.user_id = w.uid) + LEFT JOIN logger.sessions AS s ON (w.ip = s.ip) + LEFT JOIN auth_user_md5 AS u2 ON (u2.user_id = s.uid) + WHERE w.ip = {?} + GROUP BY u2.hruid + ORDER BY u2.hruid"; + $it = Xdb::iterRow($sql, ip_to_uint($ip)); + + $props = array(); + while (list($detection, $state, $last, $description, $mask, $edit, $hruid, $host) = $it->next()) { + if (count($props) == 0) { + $props = array('ip' => $ip, + 'mask' => uint_to_ip($mask), + 'host' => $host, + 'detection' => $detection, + 'state' => $state, + 'last' => $last, + 'description' => $description, + 'edit' => $edit, + 'users' => array($hruid)); + } else { + $props['users'][] = $hruid; + } + } + $page->assign('ip', $props); + } + } + + function handler_icons(&$page) + { + $page->changeTpl('admin/icons.tpl'); + $dh = opendir('../htdocs/images/icons'); + if (!$dh) { + $page->trigError('Dossier des icones introuvables.'); + } + $icons = array(); + while (($file = readdir($dh)) !== false) { + if (strlen($file) > 4 && substr($file,-4) == '.gif') { + array_push($icons, substr($file, 0, -4)); + } + } + sort($icons); + $page->assign('icons', $icons); + } + + function handler_accounts(&$page) + { + $page->changeTpl('admin/accounts.tpl'); + $page->assign('disabled', XDB::iterator('SELECT u.nom, u.prenom, u.promo, u.comment, u.hruid + FROM auth_user_md5 AS u + WHERE perms = \'disabled\' + ORDER BY nom, prenom')); + $page->assign('admins', XDB::iterator('SELECT u.nom, u.prenom, u.promo, u.hruid + FROM auth_user_md5 AS u + WHERE perms = \'admin\' + ORDER BY nom, prenom')); + } } +// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8: ?>