Allows account deletion (Closes #1197).

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/modules/admin.php b/modules/admin.php
index ceb2da6..bde2161 100644 (file)
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -381,6 +381,7 @@ class AdminModule extends PLModule
             $user = User::get($login);
         }
         if (empty($user)) {
+            $page->assign('user', false);
             return;
         }
 
@@ -408,6 +409,15 @@ class AdminModule extends PLModule
             }
         }
 
+        // Handles account deletion.
+        if (Post::has('account_deletion_confirmation')) {
+            $uid = $user->id();
+            $name = $user->fullName();
+            $user->profile()->clear();
+            $user->clear(true);
+            $page->trigSuccess("L'utilisateur $name ($uid) a bien été supprimé.");
+        }
+
         // Account Form {{{
         $to_update = array();
         if (Post::has('disable_weak_access')) {

diff --git a/templates/admin/user.tpl b/templates/admin/user.tpl
index 7db27fa..b743779 100644 (file)
--- a/templates/admin/user.tpl
+++ b/templates/admin/user.tpl
@@ -21,13 +21,13 @@
 {**************************************************************************}
 
 
-{if $smarty.post.u_kill_conf}
-<form method="post" action="admin/user">
+{if t($smarty.post.delete_account)}
+<form method="post" action="admin/user/{$user->login()}">
   {xsrf_token_field}
   <div class="center">
     <input type="hidden" name="uid" value="{$smarty.request.uid}" />
-    Confirmer la suppression de l'utilisateur {$smarty.request.uid} ({$user->fullName()})&nbsp;&nbsp;
-    <input type="submit" name="u_kill" value="continuer" />
+    Confirmer la suppression de l'utilisateur {$user->fullName()} (uid&nbsp;: {$smarty.request.uid}).<br />
+    <input type="submit" name="account_deletion_confirmation" value="Confirmer" />
   </div>
 </form>
 {elseif $user}
@@ -230,6 +230,7 @@ $(document).ready(function() {
         <input type="submit" name="update_account" value="Mettre à jour" onclick="return hashResponse('new_plain_password', false, false);" />
         <input type="submit" name="su_account" value="Prendre l'identité" />
         <input type="submit" name="log_account" value="Consulter les logs" />
+        <input type="submit" name="delete_account" value="Supprimer le compte" />
       </td>
     </tr>
   </table>
@@ -525,7 +526,8 @@ $(document).ready(function() {
     </tr>
     <tr>
       <td class="center">
-        <input type="text" name="login" size="40" maxlength="255" value="{$smarty.request.login|default:$user->hruid}" />
+        <input type="text" name="login" size="40" maxlength="255"
+               value="{if t($smarty.request.login)}{$smarty.request.login}{/if}" />
       </td>
     </tr>
     <tr>