Merge branch 'master' of /var/www/mublog

Conflicts:

	actions/api.php
	actions/deletenotice.php
	actions/recoverpassword.php
	actions/remotesubscribe.php
	actions/tag.php
	actions/tagrss.php
	actions/twitapiaccount.php
	actions/twitapiusers.php
	classes/Notice.php
	classes/User.php
	lib/common.php
	lib/language.php
	lib/subs.php
	lib/twitterapi.php
	lib/util.php
	scripts/inbox_users.php
	scripts/update_translations.php

Merged development trunk into laconica head. woohoo!

1 files changed, 149 insertions, 85 deletions

diff --git a/actions/deletenotice.php b/actions/deletenotice.php
index 9a5261eed..efef95441 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,87 +18,148 @@
  *
  * 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); }
-
-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'), $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();
-	}
-
-	function delete_notice() {
-		# 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.'));
-			return;
-		}
-		$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();
-		} else {
-			if ($url) {
-				common_set_returnto(NULL);
-			} else {
-				$url = common_local_url('public');
-			}
-		}
-		common_redirect($url);
-	}
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/deleteaction.php';
+
+class DeletenoticeAction extends DeleteAction
+{
+    var $error = null;
+
+    function handle($args)
+    {
+        parent::handle($args);
+        // XXX: Ajax!
+
+        if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+            $this->deleteNotice();
+        } else if ($_SERVER['REQUEST_METHOD'] == 'GET') {
+            $this->showForm();
+        }
+    }
+
+    /**
+     * Show the page notice
+     *
+     * Shows instructions for the page
+     *
+     * @return void
+     */
+
+    function showPageNotice()
+    {
+        $instr  = $this->getInstructions();
+        $output = common_markup_to_html($instr);
+
+        $this->elementStart('div', 'instructions');
+        $this->raw($output);
+        $this->elementEnd('div');
+    }
+
+    function getInstructions()
+    {
+        return _('You are about to permanently delete a notice. ' .
+            'Once this is done, it cannot be undone.');
+    }
+
+    function title()
+    {
+        return _('Delete notice');
+    }
+
+    /**
+     * Wrapper for showing a page
+     *
+     * Stores an error and shows the page
+     *
+     * @param string $error Error, if any
+     *
+     * @return void
+     */
+
+    function showForm($error = null)
+    {
+        $this->error = $error;
+        $this->showPage();
+    }
+
+    /**
+     * Insert delete notice form into the content
+     *
+     * @return void
+     */
+
+    function showContent()
+    {
+        $this->elementStart('form', array('id' => 'notice_delete_form',
+                                   'method' => 'post',
+                                   'action' => common_local_url('deletenotice')));
+        $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->elementEnd('form');
+    }
+
+    function deleteNotice()
+    {
+        // CSRF protection
+        $token = $this->trimmed('token');
+
+        if (!$token || $token != common_session_token()) {
+            $this->showForm(_('There was a problem with your session token. ' .
+                ' 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();
+            $this->notice->delete();
+
+        } else {
+
+            if ($url) {
+                common_set_returnto(null);
+            } else {
+                $url = common_local_url('public');
+            }
+        }
+        common_redirect($url);
+    }
 }