#592: User can unsubscribe from a group

[platal.git] / modules / admin.php

diff --git a/modules/admin.php b/modules/admin.php
index c47ccfa..a70bcd3 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -258,7 +258,7 @@ class AdminModule extends PLModule
 
             $page->assign('session', $a = $res->fetchOneAssoc());
 
-            $res = XDB::iterator('SELECT  a.text, e.data, UNIX_TIMESTAMP(e.stamp) AS stamp
+            $res = XDB::iterator('SELECT  a.text, e.data, e.stamp
                                     FROM  logger.events  AS e
                                LEFT JOIN  logger.actions AS a ON e.action=a.id
                                    WHERE  e.session={?}', $arg);
@@ -308,7 +308,7 @@ class AdminModule extends PLModule
 
                 // get the requested sessions
                 $where  = $this->_makeWhere($year, $month, $day, $loguid);
-                $select = "SELECT  s.id, UNIX_TIMESTAMP(s.start) as start, s.uid,
+                $select = "SELECT  s.id, s.start, s.uid,
                                    a.alias as username
                              FROM  logger.sessions AS s
                         LEFT JOIN  aliases         AS a  ON (a.id = s.uid AND a.type='a_vie')
@@ -366,7 +366,7 @@ class AdminModule extends PLModule
         }
 
         if(Env::has('logs_button') && $login) {
-            pl_redirect("admin/logger?login=$login&year=".date('Y')."&month=".date('m'));
+            pl_redirect("admin/logger?loguser=$login&year=".date('Y')."&month=".date('m'));
         }
 
         if (Env::has('ax_button') && $login) {
@@ -486,8 +486,7 @@ class AdminModule extends PLModule
                     if (XDB::execute($query)) {
                             user_reindex($mr['user_id']);
 
-                            require_once("diogenes/diogenes.hermes.inc.php");
-                            $mailer = new HermesMailer();
+                            $mailer = new PlMailer();
                             $mailer->setFrom("webmaster@polytechnique.org");
                             $mailer->addTo("web@polytechnique.org");
                             $mailer->setSubject("INTERVENTION de ".S::v('forlife'));
@@ -499,6 +498,9 @@ class AdminModule extends PLModule
                         if (Env::v('nomusageN') != $mr['nom_usage']) {
                             set_new_usage($mr['user_id'], Env::v('nomusageN'), make_username(Env::v('prenomN'), Env::v('nomusageN')));
                         }
+                        if (Env::v('decesN') != $mr['deces']) {
+                            user_clear_all_subs($mr['user_id'], false);
+                        }
                         $r = XDB::query("SELECT *, a.alias AS forlife, u.flags AS sexe
                                            FROM auth_user_md5 AS u
                                       LEFT JOIN aliases       AS a ON (a.id = u.user_id AND type= 'a_vie')
@@ -510,8 +512,7 @@ class AdminModule extends PLModule
                     case "u_kill":
                         user_clear_all_subs($mr['user_id']);
                         $page->trig("'{$mr['user_id']}' a été désinscrit !");
-                        require_once("diogenes/diogenes.hermes.inc.php");
-                        $mailer = new HermesMailer();
+                        $mailer = new PlMailer();
                         $mailer->setFrom("webmaster@polytechnique.org");
                         $mailer->addTo("web@polytechnique.org");
                         $mailer->setSubject("INTERVENTION de ".S::v('forlife'));
@@ -521,11 +522,11 @@ class AdminModule extends PLModule
                 }
             }
 
-            $res = XDB::query("SELECT  UNIX_TIMESTAMP(start), host
-                                           FROM  logger.sessions
-                                          WHERE  uid={?} AND suid=0
-                                       ORDER BY  start DESC
-                                          LIMIT  1", $mr['user_id']);
+            $res = XDB::query("SELECT  start, host
+                                 FROM  logger.sessions
+                                WHERE  uid={?} AND suid=0
+                             ORDER BY  start DESC
+                                LIMIT  1", $mr['user_id']);
             list($lastlogin,$host) = $res->fetchOneRow();
             $page->assign('lastlogin', $lastlogin);
             $page->assign('host', $host);
@@ -567,15 +568,15 @@ class AdminModule extends PLModule
             // on examine l'op a effectuer
             switch ($op) {
                 case 'mail':
-                   send_warning_homonyme($prenom, $nom, $forlife, $loginbis);
-                   switch_bestalias($target, $loginbis);
+                send_warning_homonyme($prenom, $nom, $forlife, $loginbis);
+                switch_bestalias($target, $loginbis);
                     $op = 'list';
                     break;
                 case 'correct':
-                   switch_bestalias($target, $loginbis);
+                switch_bestalias($target, $loginbis);
                     XDB::execute("UPDATE aliases SET type='homonyme',expire=NOW() WHERE alias={?}", $loginbis);
                     XDB::execute("REPLACE INTO homonymes (homonyme_id,user_id) VALUES({?},{?})", $target, $target);
-                   send_robot_homonyme($prenom, $nom, $forlife, $loginbis);
+                send_robot_homonyme($prenom, $nom, $forlife, $loginbis);
                     $op = 'list';
                     break;
             }
@@ -647,15 +648,15 @@ class AdminModule extends PLModule
             $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);
-                   require_once('user.func.inc.php');
-                   user_clear_all_subs($uid, false);   // by default, dead ppl do not loose their email
-               }
+            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);
+                require_once('user.func.inc.php');
+                user_clear_all_subs($uid, false);   // by default, dead ppl do not loose their email
+            }
             }
             $page->assign('new_deces',$new_deces);
         }