Various fixes on unsubscription

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1232 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/include/user.func.inc.php b/include/user.func.inc.php
index fb7ac34..8cd8954 100644 (file)
--- a/include/user.func.inc.php
+++ b/include/user.func.inc.php
@@ -37,8 +37,8 @@ function user_clear_all_subs($user_id, $really_del=true)
     $alias = $res->fetchOneCell();
 
     if ($really_del) {
-       XDB::execute("DELETE FROM emails WHERE uid={?}", $uid);
-       XDB::execute("DELETE FROM newsletter_ins WHERE user_id={?}", $uid);
+       XDB::execute("DELETE FROM emails WHERE uid={?}", $uid);
+           XDB::execute("DELETE FROM newsletter_ins WHERE user_id={?}", $uid);
     }
 
     XDB::execute("DELETE FROM virtual_redirect WHERE redirect = {?}", $alias.'@'.$globals->mail->domain);
@@ -51,14 +51,14 @@ function user_clear_all_subs($user_id, $really_del=true)
     XDB::execute("DELETE FROM entreprises     WHERE uid={?}", $uid);
     XDB::execute("DELETE FROM langues_ins     WHERE uid={?}", $uid);
     XDB::execute("DELETE FROM mentor_pays     WHERE uid={?}", $uid);
-    XDB::execute("DELETE FROM mentor_secteur  WHERE uid={?}", $uid);
+    XDB::execute("DELETE FROM mentor_secteurs WHERE uid={?}", $uid);
     XDB::execute("DELETE FROM mentor          WHERE uid={?}", $uid);
     XDB::execute("DELETE FROM perte_pass      WHERE uid={?}", $uid);
     XDB::execute("DELETE FROM requests        WHERE user_id={?}", $uid);
     XDB::execute("DELETE FROM user_changes    WHERE user_id={?}", $uid);
     XDB::execute("DELETE FROM watch_sub       WHERE uid={?}", $uid);
 
-    $mmlist = new MMList(S::v('id'), S::v('password'));
+    $mmlist = new MMList(S::v('uid'), S::v('password'));
     $mmlist->kill($alias, $really_del);
 }
 

diff --git a/modules/admin.php b/modules/admin.php
index b3f459f..a70bcd3 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -498,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')

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 683c7a9..ddd6cbb 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -30,7 +30,7 @@
     <meta name="description" content="Les associations polytechniciennes" />
     <meta name="keywords" content="Ecole polytechnique, associations polytechniciennes, groupes X, binets" />
     <link rel="stylesheet" type="text/css" href="css/xnet.css" media="screen" />
-    <link rel="icon" type="image/png" href="images/favicon.png" />
+    <link rel="shortcut icon" type="image/png" href="images/favicon.png" />
 
     <link rel="bookmark" href="http://www.polytechnique.fr/"        title="| École polytechnique" />
     <link rel="bookmark" href="http://www.polytechnique.edu/"       title="| Institutionnal site" />
@@ -188,7 +188,7 @@
               {list_all_my_groups}
               {if !$smarty.session.auth}
               <div>Me connecter :</div>
-              <a class='gp' href="{$smarty.session.loginX}">polytechnicien</a>
+              <a class='gp' href="login">polytechnicien</a>
               {/if}
             </td>
             <td class="right" style="vertical-align: middle">