From: x2000habouzit Date: Thu, 26 Aug 2004 09:11:16 +0000 (+0000) Subject: some kind of miracle : it seems to work X-Git-Tag: xorg/old~1698 X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=49a8fc376a536196d5af35ffdb26023089ff45b9;p=platal.git some kind of miracle : it seems to work --- diff --git a/htdocs/admin/utilisateurs.php b/htdocs/admin/utilisateurs.php index 87d2595..85ab031 100644 --- a/htdocs/admin/utilisateurs.php +++ b/htdocs/admin/utilisateurs.php @@ -4,7 +4,7 @@ new_admin_page('admin/utilisateurs.tpl', true, 'admin/utilisateurs.head.tpl'); require("xorg.misc.inc.php"); $assignates = Array( - 'add_email', 'email', 'fwd', 'hashpass', 'homonyme', + 'add_email', 'email', 'fwd', 'alias', 'hashpass', 'homonyme', 'login', 'loginbis', 'matricule', 'naissanceN', 'newpass_clair', 'nomN', 'num', 'oldlogin', 'olduid', 'passw', 'password1', 'perms', 'permsN', 'prenomN', 'promoN', 'remove_email', 'select', 'suid_button', 'user_id', 'u_edit', @@ -32,7 +32,7 @@ if(isset($_REQUEST['logs_button'])) { if(isset($_REQUEST['suid_button']) and isset($_REQUEST['login']) and !isset($_SESSION['suid']) // pas de su imbriqués ) { - $res = @mysql_query( "SELECT user_id,prenom,nom,promo,perms FROM auth_user_md5 WHERE username='{$_REQUEST['login']}'",$conn); + $res = @$globals->db->query( "SELECT user_id,prenom,nom,promo,perms FROM auth_user_md5 WHERE username='{$_REQUEST['login']}'"); if(@mysql_num_rows($res) != 0) { list($uid,$prenom,$nom,$promo,$perms)=mysql_fetch_row($res); // on déplace le log de l'admin dans slog, et on crée un log de suid en log @@ -66,14 +66,14 @@ foreach($_POST as $key => $val) { my_error("invalid email"); break; } - mysql_query("INSERT INTO emails (uid,num,email,flags) VALUES ($user_id,$num,'$email','active')",$conn); + $globals->db->query("INSERT INTO emails (uid,num,email,flags) VALUES ($user_id,$num,'$email','active')"); my_msg("Ajout de $email effectué"); break; // supprime un email case "remove_email": - mysql_query("delete from emails where uid=$user_id and email = '$email'",$conn); + $globals->db->query("delete from emails where uid=$user_id and email = '$email'"); my_msg("Suppression de $email effectué"); break; @@ -107,7 +107,7 @@ foreach($_POST as $key => $val) { alias='$alias' WHERE user_id=$olduid"; - mysql_query($query,$conn); + $globals->db->query($query); if (mysql_errno($conn) != 0) { my_error("Failed: $query"); break; @@ -127,28 +127,28 @@ foreach($_POST as $key => $val) { // DELETE FROM auth_user_md5 case "u_kill": - $result=mysql_query("select user_id from auth_user_md5 where username='$login'",$conn); + $result=$globals->db->query("select user_id from auth_user_md5 where username='$login'"); if(list($user_id) = mysql_fetch_row($result)) { $query = "DELETE FROM auth_user_md5 WHERE username='$login'"; - mysql_query($query,$conn); - mysql_query("delete from emails where uid=$user_id",$conn); - mysql_query("delete from binets_ins where user_id=$user_id",$conn); - mysql_query("delete from groupesx_ins where guid=$user_id",$conn); - mysql_query("delete from photo where uid=$user_id",$conn); - mysql_query("delete from perte_pass where uid=$user_id",$conn); - mysql_query("delete from user_changes where user_id=$user_id",$conn); - mysql_query("delete from aliases where id=$user_id and type in ('login','epouse','alias')",$conn); - mysql_query("delete from listes_ins where idu=$user_id",$conn); - mysql_query("delete from listes_mod where idu=$user_id",$conn); - mysql_query("delete from forums_abo where uid=$user_id",$conn); - mysql_query("delete from applis_ins where uid=$user_id",$conn); - mysql_query("delete from contacts where uid=$user_id",$conn); - mysql_query("delete from contacts where contact=$user_id",$conn); + $globals->db->query($query); + $globals->db->query("delete from emails where uid=$user_id"); + $globals->db->query("delete from binets_ins where user_id=$user_id"); + $globals->db->query("delete from groupesx_ins where guid=$user_id"); + $globals->db->query("delete from photo where uid=$user_id"); + $globals->db->query("delete from perte_pass where uid=$user_id"); + $globals->db->query("delete from user_changes where user_id=$user_id"); + $globals->db->query("delete from aliases where id=$user_id and type in ('login','epouse','alias')"); + $globals->db->query("delete from listes_ins where idu=$user_id"); + $globals->db->query("delete from listes_mod where idu=$user_id"); + $globals->db->query("delete from forums_abo where uid=$user_id"); + $globals->db->query("delete from applis_ins where uid=$user_id"); + $globals->db->query("delete from contacts where uid=$user_id"); + $globals->db->query("delete from contacts where contact=$user_id"); // on purge les entrees dans logger - $res=mysql_query("select id from logger.sessions where uid=$user_id",$conn); + $res=$globals->db->query("select id from logger.sessions where uid=$user_id"); while (list($session_id)=mysql_fetch_row($res)) - mysql_query("delete from logger.events where session=$session_id",$conn); - mysql_query("delete from logger.sessions where uid=$user_id",$conn); + $globals->db->query("delete from logger.events where session=$session_id"); + $globals->db->query("delete from logger.sessions where uid=$user_id"); my_msg(" \"$login\" a été supprimé !
"); $HEADER="From: ADMINISTRATION\nReply-To: webmaster@polytechnique.org\nX-Mailer: PHP/" . phpversion(); @@ -171,10 +171,10 @@ if (!empty($_REQUEST['select'])) { $numeric_login = true; $looking_field = 'user_id'; } - $r=mysql_query("select * from auth_user_md5 where $looking_field='$login' order by username",$conn); + $r=$globals->db->query("select * from auth_user_md5 where $looking_field='$login' order by username"); if ($mr=mysql_fetch_assoc($r)){ if ($numeric_login) $login = $mr['username']; - $param=mysql_query("SELECT UNIX_TIMESTAMP(MAX(start)) FROM logger.sessions WHERE uid={$mr['user_id']} AND suid=0 GROUP BY uid'",$conn); + $param=$globals->db->query("SELECT UNIX_TIMESTAMP(MAX(start)) FROM logger.sessions WHERE uid={$mr['user_id']} AND suid=0 GROUP BY uid"); list($lastlogin) = mysql_fetch_row($param); mysql_free_result($param); @@ -185,7 +185,7 @@ if (!empty($_REQUEST['select'])) { $sql = "SELECT email, num, flags, panne FROM emails WHERE num != 0 AND uid = {$mr['user_id']} order by num"; - $result=mysql_query($sql,$conn); + $result=$globals->db->query($sql); $xorgmails = Array(); $email_panne = ""; while($l = mysql_fetch_assoc($result)) { diff --git a/templates/admin/utilisateurs.head.tpl b/templates/admin/utilisateurs.head.tpl index 3575779..08c029a 100644 --- a/templates/admin/utilisateurs.head.tpl +++ b/templates/admin/utilisateurs.head.tpl @@ -1,7 +1,7 @@ -{* $Id: utilisateurs.head.tpl,v 1.1 2004-02-11 20:00:38 x2000habouzit Exp $ *} +{* $Id: utilisateurs.head.tpl,v 1.2 2004-08-26 09:11:17 x2000habouzit Exp $ *} {literal} - + - diff --git a/templates/admin/utilisateurs.tpl b/templates/admin/utilisateurs.tpl index b5143d4..5823b22 100644 --- a/templates/admin/utilisateurs.tpl +++ b/templates/admin/utilisateurs.tpl @@ -1,4 +1,4 @@ -{* $Id: utilisateurs.tpl,v 1.4 2004-08-25 21:31:14 x2000habouzit Exp $ *} +{* $Id: utilisateurs.tpl,v 1.5 2004-08-26 09:11:17 x2000habouzit Exp $ *} {if $smarty.session.suid}

@@ -14,7 +14,7 @@ Attention, d {if $smarty.post.u_kill_conf}

-
+ Confirmer la suppression de {$smarty.request.login}   @@ -24,7 +24,7 @@ Attention, d {/dynamic} - +
@@ -41,24 +41,23 @@ Attention, d       - +
{dynamic on="0`$smarty.request.select`"} - -

- Derniére connexion le {$lastlogin|date_format:"%d %B %Y, %T"} - depuis {$mr.host} -

- +

+Derniére connexion le {$lastlogin|date_format:"%d %B %Y, %T"} +depuis {$mr.host} +

+ +
- @@ -69,11 +68,11 @@ Attention, d @@ -107,7 +106,7 @@ Attention, d then prenom.nom= @@ -140,7 +139,7 @@ Attention, d Date de naissance {foreach item=mail from=$xorgmails} - - - - - - - + + + + + {/foreach} - - - - - - - - - - + + + + +
Password
- - + + Action @@ -117,8 +116,8 @@ Attention, d UID {$mr.user_id} - - + + @@ -132,7 +131,7 @@ Attention, d {$mr.matricule} - +
- +   @@ -151,7 +150,7 @@ Attention, d Promo - +   @@ -162,7 +161,7 @@ Attention, d Nom - + [Voir fiche] @@ -173,7 +172,7 @@ Attention, d Prénom - + [Trombino] @@ -184,48 +183,44 @@ Attention, d Alias e-mail - @m4x.org + @m4x.org  
- e-mail forward {$mail.num} ({$mail.flags}) - - - - - - - - -
+ e-mail forward {$mail.num} ({$mail.flags}) + + + + + + + + +
- Ajouter un email - - - - - -
+ Ajouter un email + + + + + + + + +