Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / actions / deleteuser.php

diff --git a/actions/deleteuser.php b/actions/deleteuser.php
index 02ded68b3181223d9474b5675f5b6b956867ff8e..fd0beb80acd0b8b9b6d00e7bd64ea3d1bd5d846a 100644 (file)
--- a/actions/deleteuser.php
+++ b/actions/deleteuser.php
@@ -40,7 +40,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://status.net/
  */
-
 class DeleteuserAction extends ProfileFormAction
 {
     var $user = null;
@@ -52,8 +51,7 @@ class DeleteuserAction extends ProfileFormAction
      *
      * @return boolean success flag
      */
-
-    function prepare($args)
+    function prepare(array $args=array())
     {
         if (!parent::prepare($args)) {
             return false;
@@ -64,15 +62,15 @@ class DeleteuserAction extends ProfileFormAction
         assert(!empty($cur)); // checked by parent
 
         if (!$cur->hasRight(Right::DELETEUSER)) {
+            // TRANS: Client error displayed when trying to delete a user without having the right to delete users.
             $this->clientError(_('You cannot delete users.'));
-            return false;
         }
 
-        $this->user = User::staticGet('id', $this->profile->id);
+        $this->user = User::getKV('id', $this->profile->id);
 
         if (empty($this->user)) {
+            // TRANS: Client error displayed when trying to delete a non-local user.
             $this->clientError(_('You can only delete local users.'));
-            return false;
         }
 
         return true;
@@ -87,8 +85,7 @@ class DeleteuserAction extends ProfileFormAction
      *
      * @return void
      */
-
-    function handle($args)
+    function handle(array $args=array())
     {
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             if ($this->arg('no')) {
@@ -104,10 +101,13 @@ class DeleteuserAction extends ProfileFormAction
 
     function showContent() {
         $this->areYouSureForm();
+        $block = new AccountProfileBlock($this, $this->profile);
+        $block->show();        
     }
 
     function title() {
-        return _('Delete user');
+        // TRANS: Title of delete user page.
+        return _m('TITLE','Delete user');
     }
 
     function showNoticeForm() {
@@ -130,9 +130,11 @@ class DeleteuserAction extends ProfileFormAction
                                            'action' => common_local_url('deleteuser')));
         $this->elementStart('fieldset');
         $this->hidden('token', common_session_token());
+        // TRANS: Fieldset legend on delete user page.
         $this->element('legend', _('Delete user'));
         if (Event::handle('StartDeleteUserForm', array($this, $this->user))) {
             $this->element('p', null,
+                           // TRANS: Information text to request if a user is certain that the described action has to be performed.
                            _('Are you sure you want to delete this user? '.
                              'This will clear all data about the user from the '.
                              'database, without a backup.'));
@@ -153,14 +155,14 @@ class DeleteuserAction extends ProfileFormAction
                       'submit form_action-primary',
                       'no',
                       // TRANS: Submit button title for 'No' when deleting a user.
-                      _('Do not block this user'));
+                      _('Do not delete this user.'));
         $this->submit('form_action-yes',
                       // TRANS: Button label on the delete user form.
                       _m('BUTTON','Yes'),
                       'submit form_action-secondary',
                       'yes',
                       // TRANS: Submit button title for 'Yes' when deleting a user.
-                      _('Delete this user'));
+                      _('Delete this user.'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
@@ -170,7 +172,6 @@ class DeleteuserAction extends ProfileFormAction
      *
      * @return void
      */
-
     function handlePost()
     {
         if (Event::handle('StartDeleteUser', array($this, $this->user))) {