diff options
| -rw-r--r-- | actions/deletenotice.php | 50 | ||||
| -rw-r--r-- | actions/newmessage.php | 116 | ||||
| -rw-r--r-- | actions/replies.php | 2 | ||||
| -rw-r--r-- | classes/Notice.php | 36 | ||||
| -rw-r--r-- | lib/util.php | 21 | ||||
| -rw-r--r-- | scripts/decache.php | 59 |
6 files changed, 163 insertions, 121 deletions
diff --git a/actions/deletenotice.php b/actions/deletenotice.php index efef95441..d4b8e50e5 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -71,7 +71,7 @@ class DeletenoticeAction extends DeleteAction function getInstructions() { return _('You are about to permanently delete a notice. ' . - 'Once this is done, it cannot be undone.'); + 'Once this is done, it cannot be undone.'); } function title() @@ -104,22 +104,15 @@ class DeletenoticeAction extends DeleteAction function showContent() { $this->elementStart('form', array('id' => 'notice_delete_form', - 'method' => 'post', - 'action' => common_local_url('deletenotice'))); + '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'))); + _('Are you sure you want to delete this notice?')); + $this->submit('yes', _('Yes')); + $this->submit('no', _('No')); $this->elementEnd('p'); $this->elementEnd('form'); } @@ -131,35 +124,22 @@ class DeletenoticeAction extends DeleteAction if (!$token || $token != common_session_token()) { $this->showForm(_('There was a problem with your session token. ' . - ' Try again, please.')); + ' 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(); + 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); } } diff --git a/actions/newmessage.php b/actions/newmessage.php index aa94f8c4f..609577db5 100644 --- a/actions/newmessage.php +++ b/actions/newmessage.php @@ -2,7 +2,7 @@ /** * Laconica, the distributed open-source microblogging tool * - * Handler for posting new notices + * Handler for posting new messages * * PHP version 5 * @@ -28,9 +28,9 @@ * @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); } /** @@ -47,13 +47,17 @@ if (!defined('LACONICA')) { class NewmessageAction extends Action { - + /** * Error message, if any */ var $msg = null; + var $content = null; + var $to = null; + var $other = null; + /** * Title of the page * @@ -61,12 +65,12 @@ class NewmessageAction extends Action * * @return string page title */ - + function title() { return _('New message'); } - + /** * Handle input, produce output * @@ -74,7 +78,7 @@ class NewmessageAction extends Action * * @return void */ - + function handle($args) { parent::handle($args); @@ -88,62 +92,80 @@ class NewmessageAction extends Action } } - function saveNewMessage() + function prepare($args) { + parent::prepare($args); + $user = common_current_user(); - assert($user); // XXX: maybe an error instead... + $this->content = $this->trimmed('content'); + $this->to = $this->trimmed('to'); + + if ($this->to) { + + $this->other = User::staticGet('id', $this->to); + + if (!$this->other) { + $this->clientError(_('No such user'), 404); + return false; + } + + if (!$user->mutuallySubscribed($this->other)) { + $this->clientError(_('You can\'t send a message to this user.'), 404); + return false; + } + } + + return true; + } + + function saveNewMessage() + { // 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; } - - $content = $this->trimmed('content'); - $to = $this->trimmed('to'); - - if (!$content) { + + $user = common_current_user(); + assert($user); // XXX: maybe an error instead... + + if (!$this->content) { $this->showForm(_('No content!')); return; } else { - $content_shortened = common_shorten_links($content); + $content_shortened = common_shorten_links($this->content); if (mb_strlen($content_shortened) > 140) { - common_debug("Content = '$content_shortened'", __FILE__); - common_debug("mb_strlen(\$content) = " . - mb_strlen($content_shortened), - __FILE__); $this->showForm(_('That\'s too long. ' . 'Max message size is 140 chars.')); return; } } - $other = User::staticGet('id', $to); - - if (!$other) { + if (!$this->other) { $this->showForm(_('No recipient specified.')); return; - } else if (!$user->mutuallySubscribed($other)) { + } else if (!$user->mutuallySubscribed($this->other)) { $this->clientError(_('You can\'t send a message to this user.'), 404); return; - } else if ($user->id == $other->id) { + } else if ($user->id == $this->other->id) { $this->clientError(_('Don\'t send a message to yourself; ' . 'just say it to yourself quietly instead.'), 403); return; } - - $message = Message::saveNew($user->id, $other->id, $content, 'web'); - + + $message = Message::saveNew($user->id, $this->other->id, $this->content, 'web'); + if (is_string($message)) { $this->showForm($message); return; } - $this->notify($user, $other, $message); + $this->notify($user, $this->other, $message); $url = common_local_url('outbox', array('nickname' => $user->nickname)); @@ -152,31 +174,29 @@ class NewmessageAction extends Action function showForm($msg = null) { - $content = $this->trimmed('content'); - $user = common_current_user(); + $this->msg = $msg; - $to = $this->trimmed('to'); - - $other = User::staticGet('id', $to); + $this->showPage(); + } - if (!$other) { - $this->clientError(_('No such user'), 404); - return; + function showPageNotice() + { + if ($this->msg) { + $this->element('p', 'error', $this->msg); } - - if (!$user->mutuallySubscribed($other)) { - $this->clientError(_('You can\'t send a message to this user.'), 404); - return; - } - - $this->msg = $msg; - - $this->showPage(); } - + function notify($from, $to, $message) { mail_notify_message($message, $from, $to); // XXX: Jabber, SMS notifications... probably queued } + + // Do nothing (override) + + function showNoticeForm() + { + $message_form = new MessageForm($this); + $message_form->show(); + } } diff --git a/actions/replies.php b/actions/replies.php index 5777d17fd..9ec373a96 100644 --- a/actions/replies.php +++ b/actions/replies.php @@ -116,7 +116,7 @@ class RepliesAction extends Action return sprintf(_("Replies to %s"), $this->user->nickname); } else { return sprintf(_("Replies to %s, page %d"), - $profile->nickname, + $this->user->nickname, $this->page); } } diff --git a/classes/Notice.php b/classes/Notice.php index 4a06c9258..c597137fe 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -63,8 +63,24 @@ class Notice extends Memcached_DataObject { $this->blowCaches(true); $this->blowFavesCache(true); - $this->blowInboxes(); - return parent::delete(); + $this->blowSubsCache(true); + + $this->query('BEGIN'); + $related = array('Reply', + 'Fave', + 'Notice_tag', + 'Group_inbox', + 'Queue_item'); + if (common_config('inboxes', 'enabled')) { + $related[] = 'Notice_inbox'; + } + foreach ($related as $cls) { + $inst = new $cls(); + $inst->notice_id = $this->id; + $inst->delete(); + } + $result = parent::delete(); + $this->query('COMMIT'); } function saveTags() @@ -568,22 +584,6 @@ class Notice extends Memcached_DataObject return; } - # Delete from inboxes if we're deleted. - - function blowInboxes() - { - - $enabled = common_config('inboxes', 'enabled'); - - if ($enabled === true || $enabled === 'transitional') { - $inbox = new Notice_inbox(); - $inbox->notice_id = $this->id; - $inbox->delete(); - } - - return; - } - function saveGroups() { $enabled = common_config('inboxes', 'enabled'); diff --git a/lib/util.php b/lib/util.php index 723b2f250..a80c62287 100644 --- a/lib/util.php +++ b/lib/util.php @@ -903,9 +903,9 @@ function common_fancy_url($action, $args=null) case 'grouplogo': return common_path('group/'.$args['nickname'].'/logo'); case 'usergroups': - return common_path($args['nickname'].'/groups'); + return common_path($args['nickname'].'/groups' . (($args) ? ('?' . http_build_query($args)) : '')); case 'groups': - return common_path('group'); + return common_path('group' . (($args) ? ('?' . http_build_query($args)) : '')); default: return common_simple_url($action, $args); } @@ -1140,23 +1140,6 @@ 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_ERR, '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; diff --git a/scripts/decache.php b/scripts/decache.php new file mode 100644 index 000000000..b18eaa2cd --- /dev/null +++ b/scripts/decache.php @@ -0,0 +1,59 @@ +#!/usr/bin/env php +<?php +/* + * Laconica - a distributed open-source microblogging tool + * Copyright (C) 2009, Control Yourself, 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/>. + */ + +# Abort if called from a web server +if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { + print "This script must be run from the command line\n"; + exit(1); +} + +ini_set("max_execution_time", "0"); +ini_set("max_input_time", "0"); +set_time_limit(0); +mb_internal_encoding('UTF-8'); + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); +define('LACONICA', true); + +require_once(INSTALLDIR . '/lib/common.php'); + +if ($argc < 3 || $argc > 4) { + print "USAGE: decache.php <table> <id> [<column>]\n"; + print "Clears the cache for the object in table <table> with id <id>.\n\n"; + print "If <column> is specified, use that instead of 'id'\n"; + exit(1); +} + +$table = $argv[1]; +$id = $argv[2]; +if ($argc > 3) { + $column = $argv[3]; +} else { + $colum = 'id'; +} + +$object = Memcached_DataObject::staticGet($table, $column, $id); + +if (!$object) { + print "No such '$table' with $column = '$id'.\n"; + exit(1); +} + +$result = $object->decache(); |