Merge branch 'master' of gitorious.org:statusnet/mainline into testing
This commit is contained in:
commit
4a71753f20
@ -72,8 +72,10 @@ class BlogspamNetPlugin extends Plugin
|
|||||||
common_debug("Blogspamnet args = " . print_r($args, TRUE));
|
common_debug("Blogspamnet args = " . print_r($args, TRUE));
|
||||||
$requestBody = xmlrpc_encode_request('testComment', array($args));
|
$requestBody = xmlrpc_encode_request('testComment', array($args));
|
||||||
|
|
||||||
$request = HTTPClient::start();
|
$request = new HTTPClient($this->baseUrl, HTTPClient::METHOD_POST);
|
||||||
$httpResponse = $request->post($this->baseUrl, array('Content-Type: text/xml'), $requestBody);
|
$request->setHeader('Content-Type', 'text/xml');
|
||||||
|
$request->setBody($requestBody);
|
||||||
|
$httpResponse = $request->send();
|
||||||
|
|
||||||
$response = xmlrpc_decode($httpResponse->getBody());
|
$response = xmlrpc_decode($httpResponse->getBody());
|
||||||
if (xmlrpc_is_fault($response)) {
|
if (xmlrpc_is_fault($response)) {
|
||||||
@ -118,7 +120,7 @@ class BlogspamNetPlugin extends Plugin
|
|||||||
$args['site'] = common_root_url();
|
$args['site'] = common_root_url();
|
||||||
$args['version'] = $this->userAgent();
|
$args['version'] = $this->userAgent();
|
||||||
|
|
||||||
$args['options'] = "max-size=140,min-size=0,min-words=0,exclude=bayasian";
|
$args['options'] = "max-size=" . common_config('site','textlimit') . ",min-size=0,min-words=0,exclude=bayasian";
|
||||||
|
|
||||||
return $args;
|
return $args;
|
||||||
}
|
}
|
||||||
|
@ -94,11 +94,11 @@ function updateAvatars($user)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$orig = clone($avatar);
|
$orig_url = $avatar->url;
|
||||||
|
|
||||||
$avatar->url = Avatar::url($avatar->filename);
|
$avatar->url = Avatar::url($avatar->filename);
|
||||||
|
|
||||||
if ($avatar->url != $orig->url) {
|
if ($avatar->url != $orig_url) {
|
||||||
$sql =
|
$sql =
|
||||||
"UPDATE avatar SET url = '" . $avatar->url . "' ".
|
"UPDATE avatar SET url = '" . $avatar->url . "' ".
|
||||||
"WHERE profile_id = " . $avatar->profile_id . " ".
|
"WHERE profile_id = " . $avatar->profile_id . " ".
|
||||||
|
99
scripts/updateavatarurl_group.php
Normal file
99
scripts/updateavatarurl_group.php
Normal file
@ -0,0 +1,99 @@
|
|||||||
|
#!/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:a';
|
||||||
|
$longoptions = array('id=', 'nickname=', 'all');
|
||||||
|
|
||||||
|
$helptext = <<<END_OF_UPDATEAVATARURL_HELP
|
||||||
|
updateavatarurl_group.php [options]
|
||||||
|
update the URLs of all group avatars in the system
|
||||||
|
|
||||||
|
-i --id ID of group to update
|
||||||
|
-n --nickname nickname of the group to update
|
||||||
|
-a --all update all
|
||||||
|
|
||||||
|
END_OF_UPDATEAVATARURL_HELP;
|
||||||
|
|
||||||
|
require_once INSTALLDIR.'/scripts/commandline.inc';
|
||||||
|
|
||||||
|
try {
|
||||||
|
$user = null;
|
||||||
|
|
||||||
|
if (have_option('i', 'id')) {
|
||||||
|
$id = get_option_value('i', 'id');
|
||||||
|
$group = User_group::staticGet('id', $id);
|
||||||
|
if (empty($group)) {
|
||||||
|
throw new Exception("Can't find group with id '$id'.");
|
||||||
|
}
|
||||||
|
updateGroupAvatars($group);
|
||||||
|
} else if (have_option('n', 'nickname')) {
|
||||||
|
$nickname = get_option_value('n', 'nickname');
|
||||||
|
$group = User_group::staticGet('nickname', $nickname);
|
||||||
|
if (empty($group)) {
|
||||||
|
throw new Exception("Can't find group with nickname '$nickname'");
|
||||||
|
}
|
||||||
|
updateGroupAvatars($group);
|
||||||
|
} else if (have_option('a', 'all')) {
|
||||||
|
$group = new User_group();
|
||||||
|
if ($group->find()) {
|
||||||
|
while ($group->fetch()) {
|
||||||
|
updateGroupAvatars($group);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
show_help();
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
} catch (Exception $e) {
|
||||||
|
print $e->getMessage()."\n";
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateGroupAvatars($group)
|
||||||
|
{
|
||||||
|
if (!have_option('q', 'quiet')) {
|
||||||
|
print "Updating avatars for group '".$group->nickname."' (".$group->id.")...";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (empty($group->original_logo)) {
|
||||||
|
print "(none found)...";
|
||||||
|
} else {
|
||||||
|
// Using clone here was screwing up the group->find() iteration
|
||||||
|
$orig = User_group::staticGet('id', $group->id);
|
||||||
|
|
||||||
|
$group->original_logo = Avatar::url(basename($group->original_logo));
|
||||||
|
$group->homepage_logo = Avatar::url(basename($group->homepage_logo));
|
||||||
|
$group->stream_logo = Avatar::url(basename($group->stream_logo));
|
||||||
|
$group->mini_logo = Avatar::url(basename($group->mini_logo));
|
||||||
|
|
||||||
|
if (!$group->update($orig)) {
|
||||||
|
throw new Exception("Can't update avatars for group " . $group->nickname . ".");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (have_option('v', 'verbose')) {
|
||||||
|
print "DONE.";
|
||||||
|
}
|
||||||
|
if (!have_option('q', 'quiet') || have_option('v', 'verbose')) {
|
||||||
|
print "\n";
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user