X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=htdocs%2Fadmin%2Futilisateurs.php;h=044e67ee0f60c3448ae400e4144a719b1f465d63;hb=9b071cf2a6a9e069b7a5b1e10a4d977269211129;hp=4d95057e308ed44f6b3e2f314f20f6f870a12ebc;hpb=d9a33f98749460b66f1d282a29579dce540a459c;p=platal.git

diff --git a/htdocs/admin/utilisateurs.php b/htdocs/admin/utilisateurs.php
index 4d95057..044e67e 100644
--- a/htdocs/admin/utilisateurs.php
+++ b/htdocs/admin/utilisateurs.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  Copyright (C) 2003-2006 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -38,11 +38,11 @@ if (Env::has('user_id')) {
 }
 
 if(Env::has('logs_button') && $login) {
-    header("Location: logger.php?loguser=$login&year=".date('Y')."&month=".date('m'));
+    redirect("logger.php?loguser=$login&year=".date('Y')."&month=".date('m'));
 }
 
 if (Env::has('ax_button') && $login) {
-    header("Location: synchro_ax.php?user=$login");
+    redirect("synchro_ax.php?user=$login");
 }
 
 if(Env::has('suid_button') && $login) {
@@ -51,12 +51,12 @@ if(Env::has('suid_button') && $login) {
     $r = $globals->xdb->query("SELECT id FROM aliases WHERE alias={?}", $login);
     if($uid = $r->fetchOneCell()) {
 	start_connexion($uid,true);
-	header("Location: ../");
+	redirect("../");
     }
 }
 
 if ($login) {
-    $r  = $globals->xdb->query("SELECT  *, a.alias AS forlife
+    $r  = $globals->xdb->query("SELECT  *, a.alias AS forlife, u.flags AS sexe
                                   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();
@@ -86,11 +86,20 @@ if ($login) {
 		if (!empty($val)) {
                     $globals->xdb->execute("DELETE FROM aliases WHERE id={?} AND alias={?}
                             AND type!='a_vie' AND type!='homonyme'", $mr['user_id'], $val);
-                    fix_bestalias($nr['user_id']);
+                    fix_bestalias($mr['user_id']);
                     $page->trig($val." a été supprimé");
                 }
 		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":
 		$globals->xdb->execute("INSERT INTO  aliases (id,alias,type) VALUES  ({?}, {?}, 'alias')",
                         $mr['user_id'], Env::get('email'));
@@ -108,32 +117,34 @@ if ($login) {
 
 	    // Editer un profil
 	    case "u_edit":
-		$pass_md5B = Env::get('newpass_clair') != "********" ? md5(Env::get('newpass_clair')) : Env::get('passw');
-                $naiss = Env::get('naissanceN');
-                $perms = Env::get('permsN');
-                $prenm = Env::get('prenomN');
-                $nom   = Env::get('nomN');
-                $promo = Env::getInt('promoN');
-                $nom   = Env::get('nomN');
-                $comm  = Env::get('commentN');
-
-		$query = "UPDATE auth_user_md5 SET
-			    naissance = '$naiss',
-			    password  = '$pass_md5B',
-			    perms     = '$perms',
-			    prenom    = '".addslashes($prenm)."',
-			    nom       = '".addslashes($nom)."',
-			    promo     = $promo,
-			    comment   = '".addslashes($comm)."'
-			  WHERE user_id = '{$mr['user_id']}'";
-		if ($globals->xdb->execute($query)) {
+            require_once('secure_hash.inc.php');
+            $pass_encrypted = Env::get('newpass_clair') != "********" ? hash_encrypt(Env::get('newpass_clair')) : Env::get('passw');
+            $naiss = Env::get('naissanceN');
+            $perms = Env::get('permsN');
+            $prenm = Env::get('prenomN');
+            $nom   = Env::get('nomN');
+            $promo = Env::getInt('promoN');
+            $sexe  = Env::get('sexeN');
+            $comm  = Env::get('commentN');
+
+            $query = "UPDATE auth_user_md5 SET
+                    naissance = '$naiss',
+                    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 ($globals->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 ADMIN (".Session::get('forlife').")");
+                    $mailer->setSubject("INTERVENTION de ".Session::get('forlife'));
                     $mailer->setTxtBody(preg_replace("/[ \t]+/", ' ', $query));
                     $mailer->send();
 
@@ -143,12 +154,12 @@ if ($login) {
                     require_once('nomusage.inc.php');
                     set_new_usage($mr['user_id'], Env::get('nomusageN'), make_username(Env::get('prenomN'), Env::get('nomusageN')));
                 }
-		$r  = $globals->xdb->query("SELECT  *, a.alias AS forlife
+                $r  = $globals->xdb->query("SELECT  *, a.alias AS forlife, u.flags AS sexe
                                               FROM  auth_user_md5 AS u
                                         INNER JOIN  aliases       AS a ON (u.user_id=a.id)
                                              WHERE  user_id = {?}", $mr['user_id']);
                 $mr = $r->fetchOneAssoc();
-		break;
+                break;
 
             // DELETE FROM auth_user_md5
 	    case "u_kill":
@@ -158,7 +169,7 @@ if ($login) {
 		$mailer = new HermesMailer();
 		$mailer->setFrom("webmaster@polytechnique.org");
 		$mailer->addTo("web@polytechnique.org");
-		$mailer->setSubject("INTERVENTION ADMIN (".Session::get('forlife').")");
+		$mailer->setSubject("INTERVENTION de ".Session::get('forlife'));
 		$mailer->setTxtBody("\nUtilisateur $login effacé");
 		$mailer->send();
 		break;