Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x

This commit is contained in:
Brion Vibber 2010-11-19 10:43:20 -08:00
commit 9a590e0843
2 changed files with 75 additions and 4 deletions

View File

@ -53,12 +53,12 @@ class Popularity
{ {
// @fixme there should be a common func for this // @fixme there should be a common func for this
if (common_config('db', 'type') == 'pgsql') { if (common_config('db', 'type') == 'pgsql') {
if (!empty($this->out->tag)) { if (!empty($this->tag)) {
$tag = pg_escape_string($this->out->tag); $tag = pg_escape_string($this->tag);
} }
} else { } else {
if (!empty($this->out->tag)) { if (!empty($this->tag)) {
$tag = mysql_escape_string($this->out->tag); $tag = mysql_escape_string($this->tag);
} }
} }
$weightexpr = common_sql_weight('fave.modified', common_config('popular', 'dropoff')); $weightexpr = common_sql_weight('fave.modified', common_config('popular', 'dropoff'));

71
scripts/deletegroup.php Executable file
View File

@ -0,0 +1,71 @@
#!/usr/bin/env php
<?php
/*
* StatusNet - a distributed open-source microblogging tool
* Copyright (C) 2008, 2009, 2010, 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_DELETEGROUP_HELP
deletegroup.php [options]
deletes a group from the database
-i --id ID of the group
-n --nickname nickname of the group
-y --yes do not wait for confirmation
END_OF_DELETEGROUP_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc';
if (have_option('i', 'id')) {
$id = get_option_value('i', 'id');
$group = User_group::staticGet('id', $id);
if (empty($group)) {
print "Can't find group with ID $id\n";
exit(1);
}
} else if (have_option('n', 'nickname')) {
$nickname = get_option_value('n', 'nickname');
$local = Local_group::staticGet('nickname', $nickname);
if (empty($local)) {
print "Can't find group with nickname '$nickname'\n";
exit(1);
}
$group = User_group::staticGet('id', $local->group_id);
} else {
print "You must provide either an ID or a nickname.\n";
print "\n";
print $helptext;
exit(1);
}
if (!have_option('y', 'yes')) {
print "About to PERMANENTLY delete group '{$group->nickname}' ({$group->id}). Are you sure? [y/N] ";
$response = fgets(STDIN);
if (strtolower(trim($response)) != 'y') {
print "Aborting.\n";
exit(0);
}
}
print "Deleting...";
$group->delete();
print "DONE.\n";