From 047c87d1cc55b71310e7e37110718e62f8f3fd17 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Tue, 20 Jan 2009 22:20:17 -0800 Subject: [PATCH] Converted DeleteAction and DeletenoticeAction to new uiredesign zeitgeist --- actions/deletenotice.php | 122 +++++++++++++++++++++++++++++---------- lib/deleteaction.php | 72 +++++++++++++---------- 2 files changed, 130 insertions(+), 64 deletions(-) diff --git a/actions/deletenotice.php b/actions/deletenotice.php index bae0eac1b4..efef95441d 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -1,9 +1,12 @@ . + * + * @category Personal + * @package Laconica + * @author Evan Prodromou + * @author Sarven Capadisli + * @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) - { - $user = common_current_user(); + /** + * Wrapper for showing a page + * + * Stores an error and shows the page + * + * @param string $error Error, if any + * + * @return void + */ - common_show_header($this->get_title(), array($this, 'show_header'), $error, - array($this, 'show_top')); + 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('span', array('id' => 'confirmation_text'), + _('Are you sure you want to delete this notice?')); $this->element('input', array('id' => 'submit_no', 'name' => 'submit', @@ -69,33 +122,38 @@ class DeletenoticeAction extends DeleteAction 'value' => _('Yes'))); $this->elementEnd('p'); $this->elementEnd('form'); - common_show_footer(); } - function delete_notice() + function deleteNotice() { - # CSRF protection + // 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; } - $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); + $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(); - $notice->delete(); + $this->notice->delete(); + } else { + if ($url) { common_set_returnto(null); } else { diff --git a/lib/deleteaction.php b/lib/deleteaction.php index 9e89c0a549..91c6487a98 100644 --- a/lib/deleteaction.php +++ b/lib/deleteaction.php @@ -1,9 +1,12 @@ . + * + * @category Personal + * @package Laconica + * @author Evan Prodromou + * @author Sarven Capadisli + * @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); +} class DeleteAction extends Action { + var $user = null; + var $notice = null; + var $profile = null; + var $user_profile = null; - function handle($args) + function prepare($args) { - parent::handle($args); - $user = common_current_user(); - $notice_id = $this->trimmed('notice'); - $notice = Notice::staticGet($notice_id); - if (!$notice) { + 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; } - $profile = $notice->getProfile(); - $user_profile = $user->getProfile(); + $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 ($notice->profile_id != $user_profile->id) { + } else if ($this->notice->profile_id != $this->user_profile->id) { common_user_error(_('Can\'t delete this notice.')); exit; } } - function show_top($arr=null) - { - $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() - { - return; - } }