remove getMixed, make get be v, getInt be i, and getBool be b.

[platal.git] / htdocs / admin / deces_promo.php

diff --git a/htdocs/admin/deces_promo.php b/htdocs/admin/deces_promo.php
index b9eecc8..1a0a098 100644 (file)
--- a/htdocs/admin/deces_promo.php
+++ b/htdocs/admin/deces_promo.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   *
@@ -23,7 +23,7 @@ require_once("xorg.inc.php");
 new_admin_page('admin/deces_promo.tpl');
 $page->assign('xorg_title','Polytechnique.org - Administration - Deces');
 
-$promo = Env::getInt('promo');
+$promo = Env::i('promo');
 if (Env::has('sub10')) $promo -= 10;
 if (Env::has('sub01')) $promo -=  1;
 if (Env::has('add01')) $promo +=  1;
@@ -31,12 +31,14 @@ if (Env::has('add10')) $promo += 10;
 
 $page->assign('promo',$promo);
 
-if (Env::get('valider') == "Valider") {
-    $res = $globals->xdb->iterRow("SELECT user_id,matricule,deces FROM auth_user_md5 WHERE promo = {?}", $promo);
-    while (list($uid,$mat,$deces) = $res->next()) {
-        $val = Env::get($mat);
-       if($val == $deces) continue;
-       $globals->xdb->execute('UPDATE auth_user_md5 SET deces={?} WHERE matricule = {?}', $val, $mat);
+if (Env::v('valider') == "Valider") {
+    $new_deces = array();
+    $res = XDB::iterRow("SELECT user_id,matricule,nom,prenom,deces FROM auth_user_md5 WHERE promo = {?}", $promo);
+    while (list($uid,$mat,$nom,$prenom,$deces) = $res->next()) {
+        $val = Env::v($mat);
+       if($val == $deces || empty($val)) continue;
+       XDB::execute('UPDATE auth_user_md5 SET deces={?} WHERE matricule = {?}', $val, $mat);
+       $new_deces[] = array('name' => "$prenom $nom", 'date' => "$val");
        if($deces=='0000-00-00' or empty($deces)) {
            require_once('notifs.inc.php');
            register_watch_op($uid, WATCH_DEATH, $val);
@@ -44,9 +46,10 @@ if (Env::get('valider') == "Valider") {
            user_clear_all_subs($uid, false);   // by default, dead ppl do not loose their email
        }
     }
+    $page->assign('new_deces',$new_deces);
 }
 
-$res = $globals->xdb->iterator('SELECT matricule, nom, prenom, deces FROM auth_user_md5 WHERE promo = {?} ORDER BY nom,prenom', $promo);
+$res = XDB::iterator('SELECT matricule, nom, prenom, deces FROM auth_user_md5 WHERE promo = {?} ORDER BY nom,prenom', $promo);
 $page->assign('decedes', $res);
 
 $page->run();