From 7789aa4d47121b5a6073c54e7ab04d4a93eafb09 Mon Sep 17 00:00:00 2001 From: x2000bedo Date: Thu, 2 Sep 2004 23:33:56 +0000 Subject: [PATCH] get rid of username in admin except homonymes.php --- htdocs/admin/evenements.php | 7 ++++--- htdocs/admin/newsletter_pattecassee.php | 16 +++++++++------- htdocs/admin/newsletter_prep.php | 6 +++--- htdocs/admin/postfix_blacklist.php | 4 ++-- htdocs/admin/postfix_perm.php | 4 ++-- htdocs/admin/utilisateurs.php | 6 +++--- templates/admin/evenements.tpl | 6 +++--- templates/admin/newsletter_pattecassee.tpl | 6 +++--- 8 files changed, 29 insertions(+), 26 deletions(-) diff --git a/htdocs/admin/evenements.php b/htdocs/admin/evenements.php index 9c60fb9..c3faaa0 100644 --- a/htdocs/admin/evenements.php +++ b/htdocs/admin/evenements.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: evenements.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: evenements.php,v 1.4 2004-09-02 23:33:56 x2000bedo Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -111,9 +111,10 @@ if ($action != "Editer") { e.promo_min, e.promo_max, e.validation_message, e.validation_user_id, FIND_IN_SET('valide', e.flags) AS fvalide, FIND_IN_SET('archive', e.flags) AS farch, - a.promo, a.nom, a.prenom, a.username + u.promo, u.nom, u.prenom, a.alias AS forlife FROM evenements AS e - INNER JOIN auth_user_md5 AS a ON(e.user_id = a.user_id) + INNER JOIN auth_user_md5 AS u ON(e.user_id = u.user_id) + INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type='a_vie') WHERE ".($arch ? "" : "!")."FIND_IN_SET('archive',e.flags) ORDER BY FIND_IN_SET('valide',e.flags), peremption"; $page->mysql_assign($sql, 'evs'); diff --git a/htdocs/admin/newsletter_pattecassee.php b/htdocs/admin/newsletter_pattecassee.php index 5584195..c561a5d 100644 --- a/htdocs/admin/newsletter_pattecassee.php +++ b/htdocs/admin/newsletter_pattecassee.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: newsletter_pattecassee.php,v 1.4 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: newsletter_pattecassee.php,v 1.5 2004-09-02 23:33:56 x2000bedo Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -42,9 +42,10 @@ if (array_key_exists('email', $_GET) && array_key_exists('action', $_GET)) { $email = valide_email($_GET['email']); // vérifications d'usage $sel = $globals->db->query( - "SELECT a.username + "SELECT a.alias AS forlife FROM emails AS e - INNER JOIN auth_user_md5 AS a ON e.uid = a.user_id + INNER JOIN auth_user_md5 AS u ON e.uid = u.user_id + INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type='a_vie') WHERE e.email='$email'"); $mailer = new TplMailer('templates/mails/pattecasser.nl.tpl'); @@ -58,11 +59,12 @@ if (array_key_exists('email', $_GET) && array_key_exists('action', $_GET)) { } else if (array_key_exists('email', $_POST)) { $email = valide_email($_POST['email']); $sel = $globals->db->query( - "SELECT e.uid, e.panne, a.nom, a.prenom, a.promo, a.username + "SELECT e.uid, e.panne, u.nom, u.prenom, u.promo, a.alias AS forlife FROM emails AS e - INNER JOIN auth_user_md5 AS a ON e.uid = a.user_id + INNER JOIN auth_user_md5 AS u ON e.uid = u.user_id + INNER JOIN aliases AS a ON (u.user_id = a.id AND a.type='a_vie') WHERE e.email = '$email'"); - if (list($puid, $ppanne, $pnom, $pprenom, $ppromo, $pusername) = mysql_fetch_row($sel)) { + if (list($puid, $ppanne, $pnom, $pprenom, $ppromo, $pforlife) = mysql_fetch_row($sel)) { // on écrit dans la base que l'adresse est cassée if ($ppanne == '0000-00-00') $globals->db->query("UPDATE emails SET panne='".date("Y-m-d")."' WHERE email = '$email'"); @@ -70,7 +72,7 @@ if (array_key_exists('email', $_GET) && array_key_exists('action', $_GET)) { $sel = $globals->db->query("SELECT * FROM emails WHERE uid = " . $puid . " AND FIND_IN_SET('active', flags) AND email != '$email'"); $nb_emails = mysql_num_rows($sel); $page->assign('nb_emails', $nb_emails); - $page->assign('username', $pusername); + $page->assign('forlife', $pforlife); $page->assign('prenom', $pprenom); $page->assign('nom', $pnom); $page->assign('promo', $ppromo); diff --git a/htdocs/admin/newsletter_prep.php b/htdocs/admin/newsletter_prep.php index 4b99bfa..85307d2 100644 --- a/htdocs/admin/newsletter_prep.php +++ b/htdocs/admin/newsletter_prep.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: newsletter_prep.php,v 1.3 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: newsletter_prep.php,v 1.4 2004-09-02 23:33:56 x2000bedo Exp $ ***************************************************************************/ require('auto.prepend.inc.php'); @@ -44,7 +44,7 @@ $nb = fscanf($lock, "%d %s",$date, $id_lock); $is_lock = ($nb != 0); $own_lock = false; if($is_lock) { - $own_lock = ($id_lock == $_SESSION['username']); + $own_lock = ($id_lock == $_SESSION['forlife']); } // action si on recoit un formulaire @@ -56,7 +56,7 @@ if (isset($_REQUEST['submit'])) { if($is_lock) { $page->assign('action_msg', 'Verrou déjà pris'); } else { - fputs($lock,time()." ".$_SESSION['username']); + fputs($lock,time()." ".$_SESSION['forlife']); $is_lock = $own_lock = true; } // pas de lock } elseif ($_REQUEST['submit'] == "Relacher quand meme" diff --git a/htdocs/admin/postfix_blacklist.php b/htdocs/admin/postfix_blacklist.php index 0491250..7ce35b7 100644 --- a/htdocs/admin/postfix_blacklist.php +++ b/htdocs/admin/postfix_blacklist.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: postfix_blacklist.php,v 1.5 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: postfix_blacklist.php,v 1.6 2004-09-02 23:33:56 x2000bedo Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -28,7 +28,7 @@ if(isset($_REQUEST['nomligne'])) { $nomligne = $_REQUEST['nomligne']; if (!empty($_REQUEST['del'])) { - exec("/home/web/spam/effacerBlacklist $nomligne {$_SESSION['username']}"); + exec("/home/web/spam/effacerBlacklist $nomligne {$_SESSION['forlife']}"); $page->assign('erreur', "Action: DEL($nomligne)"); } else if (!empty($_REQUEST['add'])) { exec("/home/web/spam/ajouterBlacklist ".$nomligne); diff --git a/htdocs/admin/postfix_perm.php b/htdocs/admin/postfix_perm.php index f4165b4..ec83d06 100644 --- a/htdocs/admin/postfix_perm.php +++ b/htdocs/admin/postfix_perm.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: postfix_perm.php,v 1.5 2004-08-31 10:03:29 x2000habouzit Exp $ + $Id: postfix_perm.php,v 1.6 2004-09-02 23:33:56 x2000bedo Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -28,7 +28,7 @@ if(isset($_REQUEST['nomligne'])) { $nomligne = $_REQUEST['nomligne']; if (!empty($_REQUEST['del'])) { - exec("/home/web/spam/effacerPermissions $nomligne {$_SESSION['username']}"); + exec("/home/web/spam/effacerPermissions $nomligne {$_SESSION['forlife']}"); $page->assign('erreur', "Action: DEL($nomligne)"); } else if (!empty($_REQUEST['add'])) { exec("/home/web/spam/ajouterPermissions '".$nomligne."'"); diff --git a/htdocs/admin/utilisateurs.php b/htdocs/admin/utilisateurs.php index 3beeb5b..b8a98e7 100644 --- a/htdocs/admin/utilisateurs.php +++ b/htdocs/admin/utilisateurs.php @@ -18,7 +18,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: utilisateurs.php,v 1.17 2004-09-02 23:06:11 x2000habouzit Exp $ + $Id: utilisateurs.php,v 1.18 2004-09-02 23:33:56 x2000bedo Exp $ ***************************************************************************/ require("auto.prepend.inc.php"); @@ -107,7 +107,7 @@ foreach($_POST as $key => $val) { $errors[] = "updaté correctement."; // envoi du mail au webmaster $HEADER="From: ADMINISTRATION\nReply-To: webmaster@polytechnique.org\nX-Mailer: PHP/" . phpversion(); - $MESSAGE="Intervention manuelle de l'administrateur login=".$_SESSION['username']." (UID=".$_SESSION['uid'].")\n\nOpérations effectuées\n\n\"".$query."\"\n\nCe rapport a été généré par le script d'administration"; + $MESSAGE="Intervention manuelle de l'administrateur login=".$_SESSION['forlife']." (UID=".$_SESSION['uid'].")\n\nOpérations effectuées\n\n\"".$query."\"\n\nCe rapport a été généré par le script d'administration"; mail("web@polytechnique.org","INTERVENTION ADMIN",$MESSAGE,$HEADER); break; @@ -138,7 +138,7 @@ foreach($_POST as $key => $val) { $errors[] = "'$user_id' a été supprimé !"; $HEADER="From: ADMINISTRATION\nReply-To: webmaster@polytechnique.org\nX-Mailer: PHP/" . phpversion(); - $MESSAGE="Intervention manuelle de l'administrateur login=".$_SESSION['username']." (UID=".$_SESSION['uid'].")\n\nOpérations effectuées\n\n\"".$query."\"\n\nCe rapport a été généré par le script d'administration"; + $MESSAGE="Intervention manuelle de l'administrateur login=".$_SESSION['forlife']." (UID=".$_SESSION['uid'].")\n\nOpérations effectuées\n\n\"".$query."\"\n\nCe rapport a été généré par le script d'administration"; mail("web@polytechnique.org","INTERVENTION ADMIN",$MESSAGE,$HEADER); break; } diff --git a/templates/admin/evenements.tpl b/templates/admin/evenements.tpl index a2a8383..3eb2740 100644 --- a/templates/admin/evenements.tpl +++ b/templates/admin/evenements.tpl @@ -17,7 +17,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: evenements.tpl,v 1.5 2004-08-31 11:25:39 x2000habouzit Exp $ + $Id: evenements.tpl,v 1.6 2004-09-02 23:34:00 x2000bedo Exp $ ***************************************************************************} @@ -42,8 +42,8 @@ diff --git a/templates/admin/newsletter_pattecassee.tpl b/templates/admin/newsletter_pattecassee.tpl index e12f438..ecdf994 100644 --- a/templates/admin/newsletter_pattecassee.tpl +++ b/templates/admin/newsletter_pattecassee.tpl @@ -17,7 +17,7 @@ * Foundation, Inc., * * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * *************************************************************************** - $Id: newsletter_pattecassee.tpl,v 1.3 2004-08-31 11:25:39 x2000habouzit Exp $ + $Id: newsletter_pattecassee.tpl,v 1.4 2004-09-02 23:34:00 x2000bedo Exp $ ***************************************************************************} @@ -38,7 +38,7 @@

{elseif $nb_emails}

- {"$prenom $nom (X$promo)"} + {"$prenom $nom (X$promo)"} a à l'heure actuelle {$nb_emails} adresse(s) email(s) de redirection active(s) en dehors de celle que tu as indiquée. Cela ne veut pas forcément dire qu'il les avait déjà activées @@ -50,7 +50,7 @@

{else}

- Désolé, mais {"$prenom $nom (X$promo)"}, + Désolé, mais {"$prenom $nom (X$promo)"}, n'a actuellement aucune adresse email de redirection active autre que celle que tu viens de rentrer. L'idéal serait de contacter son kessier de promo pour l'en avertir -- 2.1.4

- Posté par {$ev.prenom} {$ev.nom} (X{$ev.promo}) - lui écrire + Posté par {$ev.prenom} {$ev.nom} (X{$ev.promo}) + lui écrire