Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x-mobile
This commit is contained in:
Sarven Capadisli
commit
5ebed4d24d
|
|
@ -1,5 +1,5 @@
|
|||
<?php
|
||||
/*
|
||||
/**
|
||||
* StatusNet - the distributed open-source microblogging tool
|
||||
* Copyright (C) 2008, 2009, StatusNet, Inc.
|
||||
*
|
||||
|
|
@ -15,9 +15,26 @@
|
|||
*
|
||||
* 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 Notices
|
||||
* @package StatusNet
|
||||
* @author Brenda Wallace <shiny@cpan.org>
|
||||
* @author Christopher Vollick <psycotica0@gmail.com>
|
||||
* @author CiaranG <ciaran@ciarang.com>
|
||||
* @author Craig Andrews <candrews@integralblue.com>
|
||||
* @author Evan Prodromou <evan@controlezvous.ca>
|
||||
* @author Gina Haeussge <osd@foosel.net>
|
||||
* @author Jeffery To <jeffery.to@gmail.com>
|
||||
* @author Mike Cochrane <mikec@mikenz.geek.nz>
|
||||
* @author Robin Millette <millette@controlyourself.ca>
|
||||
* @author Sarven Capadisli <csarven@controlyourself.ca>
|
||||
* @author Tom Adams <tom@holizz.com>
|
||||
* @license GNU Affero General Public License http://www.gnu.org/licenses/
|
||||
*/
|
||||
|
||||
if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
|
||||
if (!defined('STATUSNET') && !defined('LACONICA')) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
/**
|
||||
* Table Definition for notice
|
||||
|
|
@ -168,11 +185,11 @@ class Notice extends Memcached_DataObject
|
|||
|
||||
if (common_config('site', 'dupelimit') > 0 && !Notice::checkDupes($profile_id, $final)) {
|
||||
common_log(LOG_WARNING, 'Dupe posting by profile #' . $profile_id . '; throttled.');
|
||||
throw new ClientException(_('Too many duplicate messages too quickly;'.
|
||||
throw new ClientException(_('Too many duplicate messages too quickly;'.
|
||||
' take a breather and post again in a few minutes.'));
|
||||
}
|
||||
|
||||
$banned = common_config('profile', 'banned');
|
||||
$banned = common_config('profile', 'banned');
|
||||
|
||||
if ( in_array($profile_id, $banned) || in_array($profile->nickname, $banned)) {
|
||||
common_log(LOG_WARNING, "Attempted post from banned user: $profile->nickname (user id = $profile_id).");
|
||||
|
|
@ -200,12 +217,12 @@ class Notice extends Memcached_DataObject
|
|||
$notice->created = common_sql_now();
|
||||
}
|
||||
|
||||
$notice->content = $final;
|
||||
$notice->rendered = common_render_content($final, $notice);
|
||||
$notice->source = $source;
|
||||
$notice->uri = $uri;
|
||||
$notice->content = $final;
|
||||
$notice->rendered = common_render_content($final, $notice);
|
||||
$notice->source = $source;
|
||||
$notice->uri = $uri;
|
||||
|
||||
$notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final);
|
||||
$notice->reply_to = self::getReplyTo($reply_to, $profile_id, $source, $final);
|
||||
|
||||
if (!empty($notice->reply_to)) {
|
||||
$reply = Notice::staticGet('id', $notice->reply_to);
|
||||
|
|
|
|||
|
|
@ -476,4 +476,79 @@ class Profile extends Memcached_DataObject
|
|||
$biolimit = self::maxBio();
|
||||
return ($biolimit > 0 && !empty($bio) && (mb_strlen($bio) > $biolimit));
|
||||
}
|
||||
|
||||
function delete()
|
||||
{
|
||||
$this->_deleteNotices();
|
||||
$this->_deleteSubscriptions();
|
||||
$this->_deleteMessages();
|
||||
$this->_deleteTags();
|
||||
$this->_deleteBlocks();
|
||||
|
||||
$related = array('Avatar',
|
||||
'Reply',
|
||||
'Group_member',
|
||||
);
|
||||
|
||||
foreach ($related as $cls) {
|
||||
$inst = new $cls();
|
||||
$inst->profile_id = $this->id;
|
||||
$inst->delete();
|
||||
}
|
||||
|
||||
parent::delete();
|
||||
}
|
||||
|
||||
function _deleteNotices()
|
||||
{
|
||||
$notice = new Notice();
|
||||
$notice->profile_id = $this->id;
|
||||
|
||||
if ($notice->find()) {
|
||||
while ($notice->fetch()) {
|
||||
$other = clone($notice);
|
||||
$other->delete();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function _deleteSubscriptions()
|
||||
{
|
||||
$sub = new Subscription();
|
||||
$sub->subscriber = $this->id;
|
||||
$sub->delete();
|
||||
|
||||
$subd = new Subscription();
|
||||
$subd->subscribed = $this->id;
|
||||
$subd->delete();
|
||||
}
|
||||
|
||||
function _deleteMessages()
|
||||
{
|
||||
$msg = new Message();
|
||||
$msg->from_profile = $this->id;
|
||||
$msg->delete();
|
||||
|
||||
$msg = new Message();
|
||||
$msg->to_profile = $this->id;
|
||||
$msg->delete();
|
||||
}
|
||||
|
||||
function _deleteTags()
|
||||
{
|
||||
$tag = new Profile_tag();
|
||||
$tag->tagged = $this->id;
|
||||
$tag->delete();
|
||||
}
|
||||
|
||||
function _deleteBlocks()
|
||||
{
|
||||
$block = new Profile_block();
|
||||
$block->blocked = $this->id;
|
||||
$block->delete();
|
||||
|
||||
$block = new Group_block();
|
||||
$block->blocked = $this->id;
|
||||
$block->delete();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -740,4 +740,48 @@ class User extends Memcached_DataObject
|
|||
}
|
||||
return $result;
|
||||
}
|
||||
|
||||
function delete()
|
||||
{
|
||||
$profile = $this->getProfile();
|
||||
$profile->delete();
|
||||
|
||||
$related = array('Fave',
|
||||
'User_openid',
|
||||
'Confirm_address',
|
||||
'Remember_me',
|
||||
'Foreign_link',
|
||||
'Invitation',
|
||||
);
|
||||
|
||||
if (common_config('inboxes', 'enabled')) {
|
||||
$related[] = 'Notice_inbox';
|
||||
}
|
||||
|
||||
foreach ($related as $cls) {
|
||||
$inst = new $cls();
|
||||
$inst->user_id = $this->id;
|
||||
$inst->delete();
|
||||
}
|
||||
|
||||
$this->_deleteTags();
|
||||
$this->_deleteBlocks();
|
||||
|
||||
parent::delete();
|
||||
}
|
||||
|
||||
function _deleteTags()
|
||||
{
|
||||
$tag = new Profile_tag();
|
||||
$tag->tagger = $this->id;
|
||||
$tag->delete();
|
||||
}
|
||||
|
||||
function _deleteBlocks()
|
||||
{
|
||||
$block = new Profile_block();
|
||||
$block->blocker = $this->id;
|
||||
$block->delete();
|
||||
// XXX delete group block? Reset blocker?
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -120,14 +120,16 @@ class Action extends HTMLOutputter // lawsuit
|
|||
{
|
||||
// XXX: attributes (profile?)
|
||||
$this->elementStart('head');
|
||||
$this->showTitle();
|
||||
$this->showShortcutIcon();
|
||||
$this->showStylesheets();
|
||||
$this->showScripts();
|
||||
$this->showOpenSearch();
|
||||
$this->showFeeds();
|
||||
$this->showDescription();
|
||||
$this->extraHead();
|
||||
if (Event::handle('StartShowHeadElements', array($this))) {
|
||||
$this->showTitle();
|
||||
$this->showShortcutIcon();
|
||||
$this->showStylesheets();
|
||||
$this->showOpenSearch();
|
||||
$this->showFeeds();
|
||||
$this->showDescription();
|
||||
$this->extraHead();
|
||||
Event::handle('EndShowHeadElements', array($this));
|
||||
}
|
||||
$this->elementEnd('head');
|
||||
}
|
||||
|
||||
|
|
@ -352,6 +354,7 @@ class Action extends HTMLOutputter // lawsuit
|
|||
Event::handle('EndShowFooter', array($this));
|
||||
}
|
||||
$this->elementEnd('div');
|
||||
$this->showScripts();
|
||||
$this->elementEnd('body');
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -427,16 +427,12 @@ class HTMLOutputter extends XMLOutputter
|
|||
function autofocus($id)
|
||||
{
|
||||
$this->elementStart('script', array('type' => 'text/javascript'));
|
||||
$this->raw('
|
||||
<!--
|
||||
$(document).ready(function() {
|
||||
var el = $("#' . $id . '");
|
||||
if (el.length) {
|
||||
el.focus();
|
||||
}
|
||||
});
|
||||
-->
|
||||
');
|
||||
$this->raw('/*<![CDATA[*/'.
|
||||
' $(document).ready(function() {'.
|
||||
' var el = $("#' . $id . '");'.
|
||||
' if (el.length) { el.focus(); }'.
|
||||
' });'.
|
||||
' /*]]>*/');
|
||||
$this->elementEnd('script');
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,68 @@
|
|||
#!/usr/bin/env php
|
||||
<?php
|
||||
/*
|
||||
* StatusNet - a distributed open-source microblogging tool
|
||||
* Copyright (C) 2008, 2009, StatusNet, 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/>.
|
||||
*/
|
||||
|
||||
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
|
||||
|
||||
$shortoptions = 'i::n::y';
|
||||
$longoptions = array('id::nickname::yes');
|
||||
|
||||
$helptext = <<<END_OF_DELETEUSER_HELP
|
||||
deleteuser.php [options]
|
||||
deletes a user from the database
|
||||
|
||||
-i --id ID of the user
|
||||
-n --nickname nickname of the user
|
||||
-y --yes do not wait for confirmation
|
||||
|
||||
END_OF_DELETEUSER_HELP;
|
||||
|
||||
require_once INSTALLDIR.'/scripts/commandline.inc';
|
||||
|
||||
if (have_option('i', 'id')) {
|
||||
$id = get_option_value('i', 'id');
|
||||
$user = User::staticGet('id', $id);
|
||||
if (empty($user)) {
|
||||
print "Can't find user with ID $id\n";
|
||||
exit(1);
|
||||
}
|
||||
} else if (have_option('n', 'nickname')) {
|
||||
$nickname = get_option_value('n', 'nickname');
|
||||
$user = User::staticGet('nickname', $nickname);
|
||||
if (empty($user)) {
|
||||
print "Can't find user with nickname '$nickname'\n";
|
||||
exit(1);
|
||||
}
|
||||
} else {
|
||||
print "You must provide either an ID or a nickname.\n";
|
||||
exit(1);
|
||||
}
|
||||
|
||||
if (!have_option('y', 'yes')) {
|
||||
print "About to PERMANENTLY delete user '{$user->nickname}' ({$user->id}). Are you sure? [y/N] ";
|
||||
$response = fgets(STDIN);
|
||||
if (strtolower(trim($response)) != 'y') {
|
||||
print "Aborting.\n";
|
||||
exit(0);
|
||||
}
|
||||
}
|
||||
|
||||
print "Deleting...";
|
||||
$user->delete();
|
||||
print "DONE.\n";
|
||||
Loading…
Reference in New Issue