X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Feditpeopletag.php;h=654fbee3393e8b908bb4bc30b3a3a174d294a4ca;hb=627d84a1e2db2aca5d2ce1272f6e83fb7faa8ad2;hp=9d0548cb944a36733812d03d77015043ee6eec01;hpb=f0d762f1968fa0ac33b39d73cc9c0225c9e8a989;p=quix0rs-gnu-social.git

diff --git a/actions/editpeopletag.php b/actions/editpeopletag.php
index 9d0548cb94..654fbee339 100644
--- a/actions/editpeopletag.php
+++ b/actions/editpeopletag.php
@@ -40,38 +40,41 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @link     http://status.net/
  */
 
-class EditpeopletagAction extends OwnerDesignAction
+class EditpeopletagAction extends Action
 {
     var $msg, $confirm, $confirm_args=array();
 
     function title()
     {
         if ($_SERVER['REQUEST_METHOD'] == 'POST' && $this->boolean('delete')) {
-            // TRANS: Title for edit people tag page after deleting a tag.
-            // TRANS: %s is a tag.
-            return sprintf(_('Delete %s people tag'), $this->peopletag->tag);
+            // TRANS: Title for edit list page after deleting a tag.
+            // TRANS: %s is a list.
+            return sprintf(_('Delete %s list'), $this->peopletag->tag);
         }
-        // TRANS: Title for edit people tag page.
-        // TRANS: %s is a tag.
-        return sprintf(_('Edit people tag %s'), $this->peopletag->tag);
+        // TRANS: Title for edit list page.
+        // TRANS: %s is a list.
+        return sprintf(_('Edit list %s'), $this->peopletag->tag);
     }
 
     /**
      * Prepare to run
      */
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
         if (!common_logged_in()) {
             // TRANS: Error message displayed when trying to perform an action that requires a logged in user.
             $this->clientError(_('Not logged in.'));
-            return false;
         }
 
         $id = $this->arg('id');
-        $tagger_arg = $this->arg('tagger');
+        if (common_config('singleuser', 'enabled')) {
+            $tagger_arg = User::singleUserNickname();
+        } else {
+            $tagger_arg = $this->arg('tagger');
+        }
         $tag_arg = $this->arg('tag');
 
         $tagger = common_canonical_nickname($tagger_arg);
@@ -84,43 +87,38 @@ class EditpeopletagAction extends OwnerDesignAction
         if ($tagger_arg != $tagger || $tag_arg != $tag) {
             $args = array('tagger' => $tagger, 'tag' => $tag);
             common_redirect(common_local_url('editpeopletag', $args), 301);
-            return false;
         }
 
         $user = null;
         if ($id) {
-            $this->peopletag = Profile_list::staticGet('id', $id);
+            $this->peopletag = Profile_list::getKV('id', $id);
             if (!empty($this->peopletag)) {
-                $user = User::staticGet('id', $this->peopletag->tagger);
+                $user = User::getKV('id', $this->peopletag->tagger);
             }
         } else {
             if (!$tagger) {
                 // TRANS: Error message displayed when trying to perform an action that requires a tagging user or ID.
                 $this->clientError(_('No tagger or ID.'), 404);
-                return false;
             }
 
-            $user = User::staticGet('nickname', $tagger);
+            $user = User::getKV('nickname', $tagger);
             $this->peopletag = Profile_list::pkeyGet(array('tagger' => $user->id, 'tag' => $tag));
         }
 
         if (!$this->peopletag) {
-            // TRANS: Client error displayed when referring to a non-exsting people tag.
-            $this->clientError(_('No such people tag.'), 404);
-            return false;
+            // TRANS: Client error displayed when referring to a non-existing list.
+            $this->clientError(_('No such list.'), 404);
         }
 
         if (!$user) {
             // This should not be happening
             // TRANS: Client error displayed when referring to non-local user.
             $this->clientError(_('Not a local user.'), 404);
-            return false;
         }
 
         if ($current->id != $user->id) {
             // TRANS: Client error displayed when reting to edit a tag that was not self-created.
             $this->clientError(_('You must be the creator of the tag to edit it.'), 404);
-            return false;
         }
 
         $this->tagger = $user->getProfile();
@@ -137,7 +135,7 @@ class EditpeopletagAction extends OwnerDesignAction
      *
      * @return void
      */
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -215,8 +213,8 @@ class EditpeopletagAction extends OwnerDesignAction
             $this->element('p', 'instructions', $this->confirm);
         } else {
             $this->element('p', 'instructions',
-                           // TRANS: Form instruction for edit people tag form.
-                           _('Use this form to edit the people tag.'));
+                           // TRANS: Form instruction for edit list form.
+                           _('Use this form to edit the list.'));
         }
     }
 
@@ -260,7 +258,7 @@ class EditpeopletagAction extends OwnerDesignAction
             return;
         } else if (Profile_list::descriptionTooLong($description)) {
             $this->showForm(sprintf(
-                    // TRANS: Client error shown when providing too long a description when editing a people tag.
+                    // TRANS: Client error shown when providing too long a description when editing a list.
                     // TRANS: %d is the maximum number of allowed characters.
                     _m('Description is too long (maximum %d character).',
                       'Description is too long (maximum %d characters).',
@@ -293,8 +291,8 @@ class EditpeopletagAction extends OwnerDesignAction
 
         if (!$result) {
             common_log_db_error($this->group, 'UPDATE', __FILE__);
-            // TRANS: TRANS: Server error displayed when updating a people tag fails.
-            $this->serverError(_('Could not update people tag.'));
+            // TRANS: Server error displayed when updating a list fails.
+            $this->serverError(_('Could not update list.'));
         }
 
         $this->peopletag->query('COMMIT');
@@ -307,9 +305,7 @@ class EditpeopletagAction extends OwnerDesignAction
             // This might take quite a bit of time.
             $this->peopletag->delete();
             // send home.
-            common_redirect(common_local_url('all',
-                                         array('nickname' => $this->tagger->nickname)),
-                            303);
+            common_redirect(common_local_url('all', array('nickname' => $this->tagger->nickname)), 303);
         }
 
         if ($tag != $orig->tag) {
@@ -318,7 +314,7 @@ class EditpeopletagAction extends OwnerDesignAction
                                                    'tag'    => $tag)),
                             303);
         } else {
-            // TRANS: Edit people tag form success message.
+            // TRANS: Edit list form success message.
             $this->showForm(_('Options saved.'));
         }
     }