X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fdeletenotice.php;h=6c350b33ab36e3c45d278f5009f20d1259ef435c;hb=5b78f95e972f9f19ea46607e8b9544b8f7c4207a;hp=e9b4b32549b47719a152acc2331b42e39c8eeed5;hpb=02877224b20f87af304553f739b69544d7ac4cfa;p=quix0rs-gnu-social.git

diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index e9b4b32549..6c350b33ab 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -1,9 +1,12 @@
 <?php
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Class for deleting a notice
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
@@ -15,93 +18,129 @@
  *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Personal
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Sarven Capadisli <csarven@controlyourself.ca>
+ * @copyright 2008 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
 
-require_once(INSTALLDIR.'/lib/deleteaction.php');
+require_once INSTALLDIR.'/lib/deleteaction.php';
 
 class DeletenoticeAction extends DeleteAction
 {
+    var $error = null;
+
     function handle($args)
     {
         parent::handle($args);
-        # XXX: Ajax!
+        // XXX: Ajax!
 
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-            $this->delete_notice();
+            $this->deleteNotice();
         } else if ($_SERVER['REQUEST_METHOD'] == 'GET') {
-            $this->show_form();
+            $this->showForm();
         }
     }
 
-    function get_instructions()
+    /**
+     * Show the page notice
+     *
+     * Shows instructions for the page
+     *
+     * @return void
+     */
+
+    function showPageNotice()
     {
-        return _('You are about to permanently delete a notice.  Once this is done, it cannot be undone.');
+        $instr  = $this->getInstructions();
+        $output = common_markup_to_html($instr);
+
+        $this->elementStart('div', 'instructions');
+        $this->raw($output);
+        $this->elementEnd('div');
     }
 
-    function get_title()
+    function getInstructions()
+    {
+        return _('You are about to permanently delete a notice. ' .
+                 'Once this is done, it cannot be undone.');
+    }
+
+    function title()
     {
         return _('Delete notice');
     }
 
-    function show_form($error=null)
+    /**
+     * Wrapper for showing a page
+     *
+     * Stores an error and shows the page
+     *
+     * @param string $error Error, if any
+     *
+     * @return void
+     */
+
+    function showForm($error = null)
     {
-        $user = common_current_user();
-
-        common_show_header($this->get_title(), array($this, 'show_header'), $error,
-                           array($this, 'show_top'));
-        common_element_start('form', array('id' => 'notice_delete_form',
-                                   'method' => 'post',
-                                   'action' => common_local_url('deletenotice')));
-        common_hidden('token', common_session_token());
-        common_hidden('notice', $this->trimmed('notice'));
-        common_element_start('p');
-        common_element('span', array('id' => 'confirmation_text'), _('Are you sure you want to delete this notice?'));
-
-        common_element('input', array('id' => 'submit_no',
-                          'name' => 'submit',
-                          'type' => 'submit',
-                          'value' => _('No')));
-        common_element('input', array('id' => 'submit_yes',
-                          'name' => 'submit',
-                          'type' => 'submit',
-                          'value' => _('Yes')));
-        common_element_end('p');
-        common_element_end('form');
-        common_show_footer();
+        $this->error = $error;
+        $this->showPage();
     }
 
-    function delete_notice()
+    /**
+     * Insert delete notice form into the content
+     *
+     * @return void
+     */
+
+    function showContent()
     {
-        # CSRF protection
+        $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->element('p', null, _('Are you sure you want to delete this notice?'));
+        $this->submit('form_action-yes', _('Yes'), 'submit form_action-primary', 'yes');
+        $this->submit('form_action-no', _('No'), 'submit form_action-secondary', 'no');
+        $this->elementEnd('fieldset');
+        $this->elementEnd('form');
+    }
+
+    function deleteNotice()
+    {
+        // CSRF protection
         $token = $this->trimmed('token');
+
         if (!$token || $token != common_session_token()) {
-            $this->show_form(_('There was a problem with your session token. Try again, please.'));
+            $this->showForm(_('There was a problem with your session token. ' .
+                              ' Try again, please.'));
             return;
         }
+
+        if ($this->arg('yes')) {
+            $this->notice->delete();
+        }
+
         $url = common_get_returnto();
-        $confirmed = $this->trimmed('submit');
-        if ($confirmed == _('Yes')) {
-            $user = common_current_user();
-            $notice_id = $this->trimmed('notice');
-            $notice = Notice::staticGet($notice_id);
-            $replies = new Reply;
-            $replies->get('notice_id', $notice_id);
-
-            common_dequeue_notice($notice);
-            if (common_config('memcached', 'enabled')) {
-                $notice->blowSubsCache();
-            }
-            $replies->delete();
-            $notice->delete();
+
+        if ($url) {
+            common_set_returnto(null);
         } else {
-            if ($url) {
-                common_set_returnto(null);
-            } else {
-                $url = common_local_url('public');
-            }
+            $url = common_local_url('public');
         }
-        common_redirect($url);
+
+        common_redirect($url, 303);
     }
 }