X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fdeletenotice.php;h=e733f9650ad12eb2e75960f3bdec0df9054a5019;hb=adc5901d21be286ff3459f2cd2bf4373625ac5e5;hp=efef95441d2b970b2ea49f6d39d05948dcd0cf6d;hpb=a7c85bebd5be9ea019a8c80d74730d7eb28d4651;p=quix0rs-gnu-social.git

diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index efef95441d..e733f9650a 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -71,7 +71,7 @@ class DeletenoticeAction extends DeleteAction
     function getInstructions()
     {
         return _('You are about to permanently delete a notice. ' .
-            'Once this is done, it cannot be undone.');
+                 'Once this is done, it cannot be undone.');
     }
 
     function title()
@@ -103,24 +103,18 @@ class DeletenoticeAction extends DeleteAction
 
     function showContent()
     {
-        $this->elementStart('form', array('id' => 'notice_delete_form',
-                                   'method' => 'post',
-                                   'action' => common_local_url('deletenotice')));
+        $this->elementStart('form', array('id' => 'form_notice_delete',
+                                          'class' => 'form_settings',
+                                          'method' => 'post',
+                                          'action' => common_local_url('deletenotice')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Delete notice'));
         $this->hidden('token', common_session_token());
         $this->hidden('notice', $this->trimmed('notice'));
-        $this->elementStart('p');
-        $this->element('span', array('id' => 'confirmation_text'),
-            _('Are you sure you want to delete this notice?'));
-
-        $this->element('input', array('id' => 'submit_no',
-                          'name' => 'submit',
-                          'type' => 'submit',
-                          'value' => _('No')));
-        $this->element('input', array('id' => 'submit_yes',
-                          'name' => 'submit',
-                          'type' => 'submit',
-                          'value' => _('Yes')));
-        $this->elementEnd('p');
+        $this->element('p', null, _('Are you sure you want to delete this notice?'));
+        $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not delete this notice"));
+        $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this notice'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
@@ -131,35 +125,22 @@ class DeletenoticeAction extends DeleteAction
 
         if (!$token || $token != common_session_token()) {
             $this->showForm(_('There was a problem with your session token. ' .
-                ' Try again, please.'));
+                              ' Try again, please.'));
             return;
         }
 
-        $url       = common_get_returnto();
-        $confirmed = $this->trimmed('submit');
-
-        if ($confirmed == _('Yes')) {
-
-            $replies = new Reply;
-            $replies->get('notice_id', $this->notice->id);
-
-            common_dequeue_notice($this->notice);
-
-            if (common_config('memcached', 'enabled')) {
-                $notice->blowSubsCache();
-            }
-
-            $replies->delete();
+        if ($this->arg('yes')) {
             $this->notice->delete();
+        }
 
-        } else {
+        $url = common_get_returnto();
 
-            if ($url) {
-                common_set_returnto(null);
-            } else {
-                $url = common_local_url('public');
-            }
+        if ($url) {
+            common_set_returnto(null);
+        } else {
+            $url = common_local_url('public');
         }
-        common_redirect($url);
+
+        common_redirect($url, 303);
     }
 }