forked from GNUsocial/gnu-social
Merge branch '0.8.x' into 0.9.x
Conflicts: classes/Profile.php
This commit is contained in:
commit
c5047fd90a
@ -476,4 +476,79 @@ class Profile extends Memcached_DataObject
|
|||||||
$biolimit = self::maxBio();
|
$biolimit = self::maxBio();
|
||||||
return ($biolimit > 0 && !empty($bio) && (mb_strlen($bio) > $biolimit));
|
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;
|
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?
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -427,16 +427,12 @@ class HTMLOutputter extends XMLOutputter
|
|||||||
function autofocus($id)
|
function autofocus($id)
|
||||||
{
|
{
|
||||||
$this->elementStart('script', array('type' => 'text/javascript'));
|
$this->elementStart('script', array('type' => 'text/javascript'));
|
||||||
$this->raw('
|
$this->raw('/*<![CDATA[*/'.
|
||||||
<!--
|
' $(document).ready(function() {'.
|
||||||
$(document).ready(function() {
|
' var el = $("#' . $id . '");'.
|
||||||
var el = $("#' . $id . '");
|
' if (el.length) { el.focus(); }'.
|
||||||
if (el.length) {
|
' });'.
|
||||||
el.focus();
|
' /*]]>*/');
|
||||||
}
|
|
||||||
});
|
|
||||||
-->
|
|
||||||
');
|
|
||||||
$this->elementEnd('script');
|
$this->elementEnd('script');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
68
scripts/deleteuser.php
Normal file
68
scripts/deleteuser.php
Normal file
@ -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
Block a user