X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fadmin.php;h=f6ef19d338ee150195d2fef1f39200c881b6dd1e;hb=91ebb7ff6485f03fcccfdf2142e997e44ee399b2;hp=9b6fe07e1995f1e282616a92316922b7f304e16f;hpb=afada5eb6cf23005f775fbab0d421c27393172f1;p=platal.git diff --git a/modules/admin.php b/modules/admin.php index 9b6fe07..f6ef19d 100644 --- a/modules/admin.php +++ b/modules/admin.php @@ -59,22 +59,22 @@ class AdminModule extends PLModule function handler_default(&$page) { $page->changeTpl('admin/index.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration'); + $page->assign('pl_title','Polytechnique.org - Administration'); } function handler_postfix_delayed(&$page) { $page->changeTpl('admin/postfix_delayed.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Retardés'); + $page->assign('pl_title','Polytechnique.org - 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 mails 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( @@ -90,7 +90,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->assign('pl_title','Polytechnique.org - Administration - Postfix : Regexps Bounces'); $page->assign('new', $new); if (Post::has('submit')) { @@ -347,14 +347,14 @@ class AdminModule extends PLModule $page->changeTpl('admin/logger-view.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Logs des sessions'); + $page->assign('pl_title','Polytechnique.org - 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->assign('pl_title','Polytechnique.org - Administration - Edit/Su/Log'); require_once("emails.inc.php"); require_once("user.func.inc.php"); @@ -380,12 +380,17 @@ class AdminModule extends PLModule } 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); + S::logger()->log("suid_start", "login by ".S::v('forlife')); + $r = XDB::query("SELECT id + FROM aliases + WHERE alias={?}", $login); if($uid = $r->fetchOneCell()) { - start_connexion($uid, true); - pl_redirect(""); + if (!Platal::session()->startSUID($uid)) { + $page->trigError('Impossible d\'effectuer un SUID sur ' . $uid); + } else { + $page->kill("coucou"); + pl_redirect(""); + } } } @@ -419,10 +424,10 @@ class AdminModule extends PLModule case "add_fwd": $email = trim(Env::v('email')); if (!isvalid_email_redirection($email)) { - $page->trig("invalid email $email"); + $page->trigError("Email non valide: $email"); } else { $redirect->add_email($email); - $page->trig("Ajout de $email effectué"); + $page->trigSuccess("Ajout de $email effectué"); } break; @@ -442,7 +447,7 @@ class AdminModule extends PLModule WHERE uid = {?} AND rewrite LIKE CONCAT({?}, '@%')", $mr['user_id'], $val); fix_bestalias($mr['user_id']); - $page->trig($val." a été supprimé"); + $page->trigSuccess($val." a été supprimé"); } break; case "activate_fwd": @@ -475,24 +480,24 @@ class AdminModule extends PLModule $domain = $globals->mail->domain; } if (!preg_match('/[-a-z0-9\.]+/s', $alias)) { - $page->trig("'$alias' n'est pas un alias valide"); + $page->trigError("'$alias' n'est pas un alias valide"); } if ($domain == $globals->mail->alias_dom || $domain == $globals->mail->alias_dom2) { $req = new AliasReq($mr['user_id'], $alias, 'Admin request', false); if ($req->commit()) { - $page->trig("Nouvel alias '$alias@$domain' attribué"); + $page->trigSuccess("Nouvel alias '$alias@$domain' attribué"); } else { - $page->trig("Impossible d'ajouter l'alias '$alias@$domain', il est probablement déjà attribué"); + $page->trigError("Impossible d'ajouter l'alias '$alias@$domain', il est probablement déjà attribué"); } } elseif ($domain == $globals->mail->domain || $domain == $globals->mail->domain2) { if (XDB::execute("INSERT INTO aliases (id,alias,type) VALUES ({?}, {?}, 'alias')", $mr['user_id'], $alias)) { - $page->trig("Nouvel alias '$alias' ajouté"); + $page->trigSuccess("Nouvel alias '$alias' ajouté"); } else { - $page->trig("Impossible d'ajouter l'alias '$alias', il est probablement déjà attribué"); + $page->trigError("Impossible d'ajouter l'alias '$alias', il est probablement déjà attribué"); } } else { - $page->trig("Le domaine '$domain' n'est pas valide"); + $page->trigError("Le domaine '$domain' n'est pas valide"); } break; @@ -510,16 +515,17 @@ class AdminModule extends PLModule 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 = trim(Env::v('commentN')); - $watch = Env::v('watchN'); - $flags = ''; + $naiss = Env::v('naissanceN'); + $deces = Env::v('decesN'); + $perms = Env::v('permsN'); + $prenm = 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 = ''; if ($sexe) { $flags = 'femme'; } @@ -531,11 +537,11 @@ class AdminModule extends PLModule } if ($watch && !$comm) { - $page->trig("Il est nécessaire de mettre un commentaire pour surveiller un compte"); + $page->trigError("Il est nécessaire de mettre un commentaire pour surveiller un compte"); break; } - $watch = 'SELECT naissance, deces, password, perms, + $watch = 'SELECT naissance, deces, password, perms, nom_usage, prenom, nom, flags, promo, comment FROM auth_user_md5 WHERE user_id = ' . $mr['user_id']; @@ -548,6 +554,7 @@ class AdminModule extends PLModule perms = '$perms', prenom = '".addslashes($prenm)."', nom = '".addslashes($nom)."', + nom_usage = '".addslashes($nomusage)."', flags = '$flags', promo = $promo, comment = '".addslashes($comm)."' @@ -564,7 +571,8 @@ class AdminModule extends PLModule $new_fields = $res->fetchOneAssoc(); $mailer = new PlMailer("admin/useredit.mail.tpl"); - $mailer->assign("user", S::v('forlife')); + $mailer->assign("admin", S::v('forlife')); + $mailer->assign("user", $mr['forlife']); $mailer->assign('old', $old_fields); $mailer->assign('new', $new_fields); $mailer->send(); @@ -572,7 +580,7 @@ class AdminModule extends PLModule // update number of subscribers (perms or deceased may have changed) update_NbIns(); - $page->trig("updaté correctement."); + $page->trigSuccess("updaté correctement."); } if (Env::v('nomusageN') != $mr['nom_usage']) { require_once "xorg.misc.inc.php"; @@ -615,7 +623,7 @@ class AdminModule extends PLModule user_clear_all_subs($mr['user_id']); // update number of subscribers (perms or deceased may have changed) update_NbIns(); - $page->trig("'{$mr['user_id']}' a été désinscrit !"); + $page->trigSuccess("'{$mr['user_id']}' a été désinscrit !"); $mailer = new PlMailer("admin/useredit.mail.tpl"); $mailer->assign("admin", S::v('forlife')); $mailer->assign("user", $mr['forlife']); @@ -695,7 +703,7 @@ class AdminModule extends PLModule $action = Env::v('valid_promo') == 'Ajouter des membres' ? 'add' : 'ax'; pl_redirect('admin/promo/' . $action . '/' . Env::i('promo')); } else { - $page->trig('Promo non valide'); + $page->trigError('Promo non valide'); } } @@ -725,7 +733,7 @@ class AdminModule extends PLModule function handler_homonyms(&$page, $op = 'list', $target = null) { $page->changeTpl('admin/homonymes.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Homonymes'); + $page->assign('pl_title','Polytechnique.org - Administration - Homonymes'); require_once("homonymes.inc.php"); if ($target) { @@ -788,7 +796,7 @@ 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->assign('pl_title','Polytechnique.org - Administration - AX/X.org'); // liste des différences $res = XDB::query( @@ -816,7 +824,7 @@ class AdminModule extends PLModule function handler_deaths(&$page, $promo = 0, $validate = false) { $page->changeTpl('admin/deces_promo.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Deces'); + $page->assign('pl_title','Polytechnique.org - Administration - Deces'); if (!$promo) $promo = Env::i('promo'); @@ -856,7 +864,7 @@ class AdminModule extends PLModule function handler_dead_but_active(&$page) { $page->changeTpl('admin/dead_but_active.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Décédés'); + $page->assign('pl_title','Polytechnique.org - Administration - Décédés'); $res = XDB::iterator( "SELECT u.promo, u.nom, u.prenom, u.deces, u.matricule_ax, a.alias, DATE(MAX(s.start)) AS last @@ -871,7 +879,7 @@ class AdminModule extends PLModule function handler_synchro_ax(&$page, $user = null, $action = null) { $page->changeTpl('admin/synchro_ax.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Synchro AX'); + $page->assign('pl_title','Polytechnique.org - Administration - Synchro AX'); require_once('synchro_ax.inc.php'); @@ -919,7 +927,7 @@ class AdminModule extends PLModule function handler_validate(&$page, $action = 'list', $id = null) { $page->changeTpl('admin/valider.tpl'); - $page->assign('xorg_title','Polytechnique.org - Administration - Valider une demande'); + $page->assign('pl_title','Polytechnique.org - Administration - Valider une demande'); $page->addCssLink('nl.css'); $page->addJsLink('ajax.js'); require_once("validations.inc.php"); @@ -941,6 +949,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) @@ -948,9 +958,11 @@ 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); @@ -962,7 +974,7 @@ class AdminModule extends PLModule } function handler_validate_answers(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Réponses automatiques de validation'); + $page->assign('pl_title','Polytechnique.org - 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); @@ -971,7 +983,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_skins(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Skins'); + $page->assign('pl_title','Polytechnique.org - Administration - Skins'); $page->assign('title', 'Gestion des skins'); $table_editor = new PLTableEditor('admin/skins','skins','id'); $table_editor->describe('name','nom',true); @@ -984,7 +996,7 @@ class AdminModule extends PLModule } function handler_postfix_blacklist(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Postfix : Blacklist'); + $page->assign('pl_title','Polytechnique.org - 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); @@ -992,14 +1004,14 @@ 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->assign('pl_title','Polytechnique.org - 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->assign('xorg_title', 'Polytechnique.org - Administration - MX Défaillants'); + $page->assign('pl_title', 'Polytechnique.org - 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); @@ -1008,7 +1020,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_logger_actions(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Actions'); + $page->assign('pl_title','Polytechnique.org - 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); @@ -1016,7 +1028,7 @@ class AdminModule extends PLModule $table_editor->apply($page, $action, $id); } function handler_downtime(&$page, $action = 'list', $id = null) { - $page->assign('xorg_title','Polytechnique.org - Administration - Coupures'); + $page->assign('pl_title','Polytechnique.org - Administration - Coupures'); $page->assign('title', 'Gestion des coupures'); $table_editor = new PLTableEditor('admin/downtime','coupures','id'); $table_editor->describe('debut','date',true); @@ -1060,9 +1072,9 @@ class AdminModule extends PLModule S::assert_xsrf_token(); if (wiki_delete_page($wikipage)) { - $page->trig("La page ".$wikipage." a été supprimée."); + $page->trigSuccess("La page ".$wikipage." a été supprimée."); } else { - $page->trig("Impossible de supprimer la page ".$wikipage."."); + $page->trigError("Impossible de supprimer la page ".$wikipage."."); } } @@ -1074,9 +1086,9 @@ class AdminModule extends PLModule if (is_numeric($changedLinks)) { $s .= $changedLinks.' lien'.(($changedLinks>1)?'s ont été modifiés.':' a été modifié.'); } - $page->trig($s); + $page->trigSuccess($s); } else { - $page->trig("Impossible de déplacer la page ".$wikipage); + $page->trigError("Impossible de déplacer la page ".$wikipage); } } @@ -1226,7 +1238,7 @@ class AdminModule extends PLModule $page->changeTpl('admin/icons.tpl'); $dh = opendir('../htdocs/images/icons'); if (!$dh) { - $page->trig('Dossier des icones introuvables.'); + $page->trigError('Dossier des icones introuvables.'); } $icons = array(); while (($file = readdir($dh)) !== false) {