Added notice deletion http://laconi.ca/PITS/00045

Removes selected notice and any replies that reference it.
Attempts to de-queue anything pending.

This patch does not archive notices.

darcs-hash:20080716032045-982e4-a0b5d37ecfa84796f1681dda54110094ad1424c6.gz

diff --git a/actions/deletenotice.php b/actions/deletenotice.php
new file mode 100644 (file)
index 0000000..06c1bf2
--- /dev/null
+++ b/actions/deletenotice.php
@@ -0,0 +1,92 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+require_once(INSTALLDIR.'/lib/deleteaction.php');
+
+class DeletenoticeAction extends DeleteAction {
+       function handle($args) {
+               parent::handle($args);
+               # XXX: Ajax!
+
+               if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+                       $this->delete_notice();
+                } else if ($_SERVER['REQUEST_METHOD'] == 'GET') {
+                        $this->show_form();
+               }
+       }
+
+        function get_instructions() {
+                return _('You are about to permanently delete a notice.  Once this is done, it cannot be undone.');
+        }
+
+       function get_title() {
+               return _('Delete notice');
+       }
+
+       function show_form($error=NULL) {
+                $user = common_current_user();
+
+               common_show_header($this->get_title(), array($this, 'show_header'), array($q, $error),
+                                                  array($this, 'show_top'));
+                common_element_start('form', array('id' => 'notice_delete_form',
+                                                                          'method' => 'post',
+                                                                          'action' => common_local_url('deletenotice')));
+                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();
+       }
+
+        function delete_notice() {
+                $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);
+                        $replies->delete();
+                        $notice->delete(); 
+                }
+                else {
+                    if ($url) {
+                            common_set_returnto(NULL);
+                    } else {
+                            $url = common_local_url('public');
+                    }
+                }
+                common_redirect($url);
+        }
+}

diff --git a/actions/showstream.php b/actions/showstream.php
index c05e30c39255aab606fdb571d1634d6743268006..59d4385c6d261440e8f97ff5e0f13b6dfdc0e7f1 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -363,6 +363,10 @@ class ShowstreamAction extends StreamAction {
 
        function show_notice($notice) {
                $profile = $notice->getProfile();
+                if (common_logged_in()) {
+                    $user = common_current_user();
+                    $user_profile = $user->getProfile();
+                }
                # XXX: RDFa
                common_element_start('li', array('class' => 'notice_single',
                                                                                 'id' => 'notice-' . $notice->id));
@@ -400,6 +404,12 @@ class ShowstreamAction extends StreamAction {
                common_raw('→');
                common_element_end('a');
                common_element_end('p');
+                if ($notice->profile_id == $user_profile->id) {
+                        $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
+                        common_element('a', array('class' => 'deletenotice',
+                                                                            'href' => $deleteurl),
+                                                    _('delete'));
+                }
                common_element_end('li');
        }
 }
\ No newline at end of file

diff --git a/lib/deleteaction.php b/lib/deleteaction.php
new file mode 100644 (file)
index 0000000..5d7a324
--- /dev/null
+++ b/lib/deleteaction.php
@@ -0,0 +1,61 @@
+<?php
+/*
+ * Laconica - a distributed open-source microblogging tool
+ * Copyright (C) 2008, Controlez-Vous, Inc.
+ *
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * 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/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
+
+class DeleteAction extends Action {
+
+       function handle($args) {
+               parent::handle($args);
+                $user = common_current_user();
+                $notice_id = $this->trimmed('notice');
+                $notice = Notice::staticGet($notice_id);
+                $profile = $notice->getProfile();
+                $user_profile = $user->getProfile();
+
+                if (!common_logged_in()) {
+                    common_user_error(_('Not logged in.'));
+                } else if ($notice->profile_id != $user_profile->id) {
+                    common_user_error(_('Can\'t delete this notice.'));
+                }
+       }
+
+       function show_top($arr=NULL) {
+               if ($arr) {
+                       $error = $arr[1];
+               }
+               if ($error) {
+                       common_element('p', 'error', $error);
+               } else {
+                       $instr = $this->get_instructions();
+                       $output = common_markup_to_html($instr);
+                       common_element_start('div', 'instructions');
+                       common_raw($output);
+                       common_element_end('div');
+               }
+       }
+
+       function get_title() {
+               return NULL;
+       }
+
+       function show_header($arr) {
+               return;
+       }
+}

diff --git a/lib/stream.php b/lib/stream.php
index fefd77a46176316526a39bce60db051d33e61353..490a2739b3561c2f31b13d8a00090f59769b9f05 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -27,6 +27,7 @@ class StreamAction extends Action {
 
        function handle($args) {
                parent::handle($args);
+                common_set_returnto($this->self_url());
        }
 
        function views_menu() {
@@ -62,6 +63,11 @@ class StreamAction extends Action {
        function show_notice($notice) {
                global $config;
                $profile = $notice->getProfile();
+                if (common_logged_in()) {
+                    $user = common_current_user();
+                    $user_profile = $user->getProfile();
+                }
+
                # XXX: RDFa
                common_element_start('li', array('class' => 'notice_single',
                                                                                  'id' => 'notice-' . $notice->id));
@@ -112,6 +118,12 @@ class StreamAction extends Action {
                common_raw('→');
                common_element_end('a');
                common_element_end('p');
+                if ($notice->profile_id == $user_profile->id) {
+                        $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
+                        common_element('a', array('class' => 'deletenotice',
+                                                                            'href' => $deleteurl),
+                                                    _('delete'));
+                }
                common_element_end('li');
        }
 }

diff --git a/lib/util.php b/lib/util.php
index a049ea600fd03e1fdf2318541c6a829c7992e5f3..6d409f9436de14e633d7db4cdbb4277343ac3a10 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -751,6 +751,12 @@ function common_fancy_url($action, $args=NULL) {
                }
         case 'shownotice':
                return common_path('notice/'.$args['notice']);
+        case 'deletenotice':
+                if ($args && $args['notice']) {
+                        return common_path('deletenotice/'.$args['notice']);
+                } else {
+                        return common_path('deletenotice/');
+                }
         case 'xrds':
         case 'foaf':
                return common_path($args['nickname'].'/'.$action);
@@ -965,6 +971,22 @@ function common_enqueue_notice($notice) {
        return $result;
 }
 
+function common_dequeue_notice($notice) {
+        $qi = Queue_Item::staticGet($notice->id);
+        if ($qi) {
+                $result = $qi->delete();
+               if (!$result) {
+                   $last_error = &PEAR::getStaticProperty('DB_DataObject','lastError');
+                    common_log(LOG_ERROR, 'DB error deleting queue item: ' . $last_error->message);
+                    return false;
+                }
+                common_log(LOG_DEBUG, 'complete dequeueing notice ID = ' . $notice->id);
+                return $result;
+        } else {
+            return false;
+        }
+}
+
 function common_real_broadcast($notice, $remote=false) {
        $success = true;
        if (!$remote) {

diff --git a/theme/default/display.css b/theme/default/display.css
index 5ba7edc25ee9d99b8af3f79b50a54c79234286ee..efc94331d80e1f403666dff0ce410b9c15a9ffda 100644 (file)
--- a/theme/default/display.css
+++ b/theme/default/display.css
@@ -348,6 +348,24 @@ dl.statistics {
        margin: 0;
        padding: 0;
        }       
+#notice_delete_form #confirmation_text {
+        display: block;
+       font-size: 14px;
+       font-weight: bold;
+       }
+input#submit_yes, input#submit_no {
+       margin: 18px 0;
+       padding: 8px;
+       font-weight: bold;
+       color: #fff6d5;
+       background-color: #F60;
+       cursor: pointer;
+       border: 0;
+       width: auto;
+       }
+input#submit_yes:hover, input#submit_no:hover {
+       background-color: #701238;
+       }
 .avatar {
        float: left;
        margin: 0 10px 0 0;

diff --git a/theme/stoica/display.css b/theme/stoica/display.css
index d21c7cc246497daf9e8cbab1e6a623ffdb1ca51e..60d4770699e7e3739b568784b1a730550eb25dde 100644 (file)
--- a/theme/stoica/display.css
+++ b/theme/stoica/display.css
@@ -235,6 +235,24 @@ p#branding a {
        margin: 0;
        padding: 0;
        }
+#notice_delete_form #confirmation_text {
+        display: block;
+       font-size: 14px;
+       font-weight: bold;
+       }
+input#submit_yes, input#submit_no {
+       margin: 18px 10px 0px 0px;
+       padding: 4px;
+       font-weight: bold;
+       color: #FCFFF5;
+       background-color: #C15D42;
+       cursor: pointer;
+       border: 0;
+       width: 40px;
+       }
+input#submit_yes:hover, input#submit_no:hover {
+       background-color: #904632;
+       }
 .avatar.stream {
        float: left;
        margin: 0 10px 0 0;