X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fdeletenotice.php;h=ba8e86d0f495b7d4227b32ba1f0820b3cb3f471f;hb=0bb65f8739371bdb0b49f41f14fb284c239dda53;hp=d8bc5d0e0c9206816b3698f87d217bdb3e09f5dc;hpb=1f4edd70cbe28783784c41eda6c93008bbf86a78;p=quix0rs-gnu-social.git

diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index d8bc5d0e0c..ba8e86d0f4 100644
--- a/actions/deletenotice.php
+++ b/actions/deletenotice.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Class for deleting a notice
  *
@@ -20,27 +20,57 @@
  * 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.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
+ * @copyright 2008 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/deleteaction.php';
-
-class DeletenoticeAction extends DeleteAction
+class DeletenoticeAction extends Action
 {
-    var $error = null;
+    var $error        = null;
+    var $user         = null;
+    var $notice       = null;
+    var $profile      = null;
+    var $user_profile = null;
+
+    function prepare($args)
+    {
+        parent::prepare($args);
+
+        $this->user   = common_current_user();
+        $notice_id    = $this->trimmed('notice');
+        $this->notice = Notice::staticGet($notice_id);
+
+        if (!$this->notice) {
+            common_user_error(_('No such notice.'));
+            exit;
+        }
+
+        $this->profile      = $this->notice->getProfile();
+        $this->user_profile = $this->user->getProfile();
+
+        return true;
+    }
 
     function handle($args)
     {
         parent::handle($args);
+
+        if (!common_logged_in()) {
+            common_user_error(_('Not logged in.'));
+            exit;
+        } else if ($this->notice->profile_id != $this->user_profile->id &&
+                   !$this->user->hasRight(Right::DELETEOTHERSNOTICE)) {
+            common_user_error(_('Can\'t delete this notice.'));
+            exit;
+        }
         // XXX: Ajax!
 
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -103,24 +133,18 @@ class DeletenoticeAction extends DeleteAction
 
     function showContent()
     {
-        $this->elementStart('form', array('id' => 'notice_delete_form',
+        $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');
     }
 
@@ -135,31 +159,18 @@ class DeletenoticeAction extends DeleteAction
             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);
     }
 }