some kind of miracle : it seems to work

diff --git a/htdocs/admin/utilisateurs.php b/htdocs/admin/utilisateurs.php
index 87d2595..85ab031 100644 (file)
--- 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("<b>Failed:</b> $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é !<BR>");
                 $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 (file)
--- 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}
-<script language="javascript" type="text/javascript" src="md5.js"></script>
+<script type="text/javascript" src="md5.js"></script>
 <style type="text/css" media="screen,print">
   <!-- 
   p.succes {font-weight: bold;}
@@ -18,17 +18,17 @@
   -->
 </style>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">
 <!--
 function doAddUser() {
-    document.add.hashpass.value = MD5(document.add.password.value);
-    document.add.password.value = "";
-    document.add.submit();
+    document.forms.add.hashpass.value = MD5(document.forms.add.password.value);
+    document.forms.add.password.value = "";
+    document.forms.add.submit();
 }
 function doEditUser() {
-    document.edit.hashpass.value = MD5(document.edit.password.value);
-    document.edit.password.value = "";
-    document.edit.submit();
+    document.forms.edit.hashpass.value = MD5(document.forms.edit.password.value);
+    document.forms.edit.password.value = "";
+    document.forms.edit.submit();
 }
 // -->
 </script>

diff --git a/templates/admin/utilisateurs.tpl b/templates/admin/utilisateurs.tpl
index b5143d4..5823b22 100644 (file)
--- 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}
 <p class="erreur">
@@ -14,7 +14,7 @@ Attention, d
 
 {if $smarty.post.u_kill_conf}
 <div class="center">
-  <form name="yes" method="post" action="{$smarty.server.PHP_SELF}">
+  <form id="yes" method="post" action="{$smarty.server.PHP_SELF}">
     <input type="hidden" name="login" value="{$smarty.request.login}" />
     Confirmer la suppression de {$smarty.request.login}&nbsp;&nbsp;
     <input type="submit" name="u_kill" value="continuer" />
@@ -24,7 +24,7 @@ Attention, d
 
 {/dynamic}
 
-<form name="add" method="post" action="{$smarty.server.PHP_SELF}">
+<form id="add" method="post" action="{$smarty.server.PHP_SELF}">
   <table class="tinybicol" cellspacing="0" cellpadding="3">
     <tr>
       <th>
@@ -41,24 +41,23 @@ Attention, d
         <input type="hidden" name="hashpass" value="" /> 
         <input type="submit" name="select" value=" edit " /> &nbsp;&nbsp;
         <input type="submit" name="suid_button" value=" su " />  &nbsp;&nbsp;
-        <input type="submit" name="logs_button" value=" logs " /> 
+        <input type="submit" name="logs_button" value=" logs " />
       </td>
     </tr>
   </table>
 </form>
 
 {dynamic on="0`$smarty.request.select`"}
-<table cellspacing="0" cellpadding="0" class="admin">
-  <p class="smaller">
-  Derniére connexion le <strong>{$lastlogin|date_format:"%d %B %Y, %T"}</strong>
-  depuis <strong>{$mr.host}</strong>
-  </p>
-  <form name="edit" method="post" action="{$smarty.server.PHP_SELF}">
+<p class="smaller">
+Derniére connexion le <strong>{$lastlogin|date_format:"%d %B %Y, %T"}</strong>
+depuis <strong>{$mr.host}</strong>
+</p>
+<form id="edit" method="post" action="{$smarty.server.PHP_SELF}">
+  <table cellspacing="0" cellpadding="0" class="admin">
     <tr> 
       <th class="login">
         Login
       </th>
-      <input type="hidden" name="hashpass" value="" />
       <th class="password"> 
         Password
       </th>
@@ -69,11 +68,11 @@ Attention, d
     <tr> 
       <td class="login"> 
         <input type="hidden" name="hashpass" value="" />
-        <input type="text" name="login" size=20 maxlength=50 value="{$mr.username}" />
+        <input type="text" name="login" size="20" maxlength="50" value="{$mr.username}" />
       </td>
       <td class="password"> 
-        <input type="text" name="newpass_clair" size=10 maxlength=10 value="********" />
-        <input type="hidden" name="passw" size=32 maxlength=32 value="{$mr.password}" />
+        <input type="text" name="newpass_clair" size="10" maxlength="10" value="********" />
+        <input type="hidden" name="passw" size="32" maxlength="32" value="{$mr.password}" />
       </td>
       <td class="perms"> 
         <select name="permsN">
@@ -88,13 +87,13 @@ Attention, d
       </td>
       <td class="login"> 
         <select name="homonyme">
-        {if $mr.loginbis && ($mr.loginbis neq $mr.username)}
+          {if $mr.loginbis && ($mr.loginbis neq $mr.username)}
           <option value="1" selected="selected"> OUI </option>
           <option value="0"> NON </option>
-        {else}
+          {else}
           <option value="1"> OUI </option>
           <option value="0" selected="selected"> NON </option>
-        {/if}
+          {/if}
         </select>
         /* pour homonymes */
       </td>
@@ -107,7 +106,7 @@ Attention, d
         then prenom.nom=
       </td>
       <td class="login">
-        <input type="text" name="loginbis" size=24 maxlength=255 value="{$mr.loginbis}" />
+        <input type="text" name="loginbis" size="24" maxlength="255" value="{$mr.loginbis}" />
       </td>
       <th class="action">
         Action
@@ -117,8 +116,8 @@ Attention, d
       <th>UID</th>
       <td>
         {$mr.user_id}
-        <input type="hidden" name="olduid" size=6 maxlength=6 value="{$mr.user_id}" />
-        <input type="hidden" name="oldlogin" size=100 maxlength=100 value="{$mr.username}" />
+        <input type="hidden" name="olduid" size="6" maxlength="6" value="{$mr.user_id}" />
+        <input type="hidden" name="oldlogin" size="100" maxlength="100" value="{$mr.username}" />
       </td>
       <td class="action">
         <input type="submit" name="u_kill_conf" value="DELETE" />
@@ -132,7 +131,7 @@ Attention, d
         {$mr.matricule}
       </td>
       <td class="action"> 
-        <input onClick="doEditUser(); return true;" type="submit" name="u_edit" value="UPDATE" />
+        <input onclick="doEditUser(); return true;" type="submit" name="u_edit" value="UPDATE" />
       </td>
     </tr>
     <tr> 
@@ -140,7 +139,7 @@ Attention, d
         Date de naissance
       </th>
       <td class="detail"> 
-        <input type="text" name="naissanceN" size=10 maxlength=10 value="{$mr.naissance}" />
+        <input type="text" name="naissanceN" size="10" maxlength="10" value="{$mr.naissance}" />
       </td>
       <td class="action">
         &nbsp;
@@ -151,7 +150,7 @@ Attention, d
         Promo
       </th>
       <td class="detail"> 
-        <input type="text" name="promoN" size=4 maxlength=4 value="{$mr.promo}" />
+        <input type="text" name="promoN" size="4" maxlength="4" value="{$mr.promo}" />
       </td>
       <td class="action">
         &nbsp;
@@ -162,7 +161,7 @@ Attention, d
         Nom
       </th>
       <td class="detail">
-        <input type="text" name="nomN" size=20 maxlength=255 value="{$mr.nom}" />
+        <input type="text" name="nomN" size="20" maxlength="255" value="{$mr.nom}" />
       </td>
       <td class="action">
         <a href="javascript:x()" onclick="popWin('{"x.php?x=`$mr.username`"|url}')">[Voir fiche]</a>
@@ -173,7 +172,7 @@ Attention, d
         Prénom
       </th>
       <td class="detail">
-        <input type="text" name="prenomN" size=20 maxlength=30 value="{$mr.prenom}" />
+        <input type="text" name="prenomN" size="20" maxlength="30" value="{$mr.prenom}" />
       </td>
       <td class="action">
         <a href="admin_trombino.php?uid={$mr.user_id}">[Trombino]</a>
@@ -184,48 +183,44 @@ Attention, d
         Alias e-mail
       </th>
       <td class="alias"> 
-        <input type="text" name="alias" size=20 maxlength=255 value="{$mr.alias}" />@m4x.org
+        <input type="text" name="alias" size="20" maxlength="255" value="{$mr.alias}" />@m4x.org
       </td>
       <td class="action">
         &nbsp;
       </td>
     </tr>
     {foreach item=mail from=$xorgmails}
-    <form name="remove" method="post" action="{$smarty.server.PHP_SELF}">
-      <tr> 
-        <th class="detail"> 
-          e-mail forward {$mail.num} ({$mail.flags})
-        </th>
-        <td class="detail"> 
-          <input type="text" name="fwd" size=29 maxlength=255 value="{$mail.email}" />
-        </td>
-        <td class="action"> 
-          <input type="hidden" name="user_id" value="{$mr.user_id}" />
-          <input type="hidden" name="login" value="{$mr.username}" />
-          <input type="hidden" name="email" value="{$mail.email}" />
-          <input type="hidden" name="select" value="edit" />
-          <input type="submit" name="remove_email" value="Supprimer" />
-        </td>
-      </tr>
-    </form>
+    <tr> 
+      <th class="detail"> 
+        e-mail forward {$mail.num} ({$mail.flags})
+      </th>
+      <td class="detail"> 
+        <input type="text" name="fwd" size="29" maxlength="255" value="{$mail.email}" />
+      </td>
+      <td class="action"> 
+        <input type="hidden" name="user_id" value="{$mr.user_id}" />
+        <input type="hidden" name="login" value="{$mr.username}" />
+        <input type="hidden" name="email" value="{$mail.email}" />
+        <input type="hidden" name="select" value="edit" />
+        <input type="submit" name="remove_email" value="Supprimer" />
+      </td>
+    </tr>
     {/foreach}
-    <form name="add" method="post" action="{$smarty.server.PHP_SELF}">
-      <input type="hidden" name="user_id" value="{$mr.user_id}" />
-      <input type="hidden" name="login" value="{$mr.username}" />
-      <input type="hidden" name="select" value="edit" />
-      <input type="hidden" name="num" value="{$next_num}" />
-      <tr> 
-        <th class="detail">
-          Ajouter un email
-        </td>
-        <td class="detail"> 
-          <input type="text" name="email" size=29 maxlength=60 value="" />
-        </td>
-        <td class="action">
-          <input type="submit" name="add_email" value="Ajouter" />
-        </td>
-      </tr>
-    </form>
+    <tr> 
+      <th class="detail">
+        Ajouter un email
+      </th>
+      <td class="detail"> 
+        <input type="text" name="email" size="29" maxlength="60" value="" />
+      </td>
+      <td class="action">
+        <input type="hidden" name="user_id" value="{$mr.user_id}" />
+        <input type="hidden" name="login" value="{$mr.username}" />
+        <input type="hidden" name="select" value="edit" />
+        <input type="hidden" name="num" value="{$next_num}" />
+        <input type="submit" name="add_email" value="Ajouter" />
+      </td>
+    </tr>
   </table>
 </form>
 <p class="erreur">