Merge branch 'master' of gitorious.org:statusnet/mainline
This commit is contained in:
commit
674b0ddaac
|
@ -862,7 +862,14 @@ function common_xml_safe_str($str)
|
||||||
function common_tag_link($tag)
|
function common_tag_link($tag)
|
||||||
{
|
{
|
||||||
$canonical = common_canonical_tag($tag);
|
$canonical = common_canonical_tag($tag);
|
||||||
|
if (common_config('singleuser', 'enabled')) {
|
||||||
|
// regular TagAction isn't set up in 1user mode
|
||||||
|
$url = common_local_url('showstream',
|
||||||
|
array('nickname' => common_config('singleuser', 'nickname'),
|
||||||
|
'tag' => $canonical));
|
||||||
|
} else {
|
||||||
$url = common_local_url('tag', array('tag' => $canonical));
|
$url = common_local_url('tag', array('tag' => $canonical));
|
||||||
|
}
|
||||||
$xs = new XMLStringer();
|
$xs = new XMLStringer();
|
||||||
$xs->elementStart('span', 'tag');
|
$xs->elementStart('span', 'tag');
|
||||||
$xs->element('a', array('href' => $url,
|
$xs->element('a', array('href' => $url,
|
||||||
|
|
|
@ -458,7 +458,7 @@ class GeonamesPlugin extends Plugin
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!$result->isOk()) {
|
if (!$result->isOk()) {
|
||||||
throw new Exception("HTTP error code " . $result->code);
|
throw new Exception("HTTP error code " . $result->getStatus());
|
||||||
}
|
}
|
||||||
|
|
||||||
$body = $result->getBody();
|
$body = $result->getBody();
|
||||||
|
|
|
@ -234,24 +234,6 @@ class MobileProfilePlugin extends WAP20Plugin
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function onStartShowHeadElements($action)
|
|
||||||
{
|
|
||||||
// @fixme nothing appears to set a serveMobile on any action,
|
|
||||||
// so this is useless and spews errors. Is this supposed to be
|
|
||||||
// checking $this?
|
|
||||||
//if (!$action->serveMobile) {
|
|
||||||
// return true;
|
|
||||||
//}
|
|
||||||
|
|
||||||
$action->showTitle();
|
|
||||||
$action->showShortcutIcon();
|
|
||||||
$action->showStylesheets();
|
|
||||||
$action->showFeeds();
|
|
||||||
$action->showDescription();
|
|
||||||
$action->extraHead();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
function onStartShowStatusNetStyles($action)
|
function onStartShowStatusNetStyles($action)
|
||||||
{
|
{
|
||||||
if (!$this->serveMobile) {
|
if (!$this->serveMobile) {
|
||||||
|
|
116
scripts/strip_geo.php
Executable file
116
scripts/strip_geo.php
Executable file
|
@ -0,0 +1,116 @@
|
||||||
|
#!/usr/bin/env php
|
||||||
|
<?php
|
||||||
|
/*
|
||||||
|
* StatusNet - a distributed open-source microblogging tool
|
||||||
|
* Copyright (C) 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', 'dry-run');
|
||||||
|
|
||||||
|
$helptext = <<<END_OF_HELP
|
||||||
|
strip_geo.php [options]
|
||||||
|
Removes geolocation info from the given user's notices.
|
||||||
|
|
||||||
|
-i --id ID of the user (may be a remote profile)
|
||||||
|
-n --nickname nickname of the user
|
||||||
|
-y --yes do not wait for confirmation
|
||||||
|
--dry-run list affected notices without deleting
|
||||||
|
|
||||||
|
END_OF_HELP;
|
||||||
|
|
||||||
|
require_once INSTALLDIR.'/scripts/commandline.inc';
|
||||||
|
|
||||||
|
if (have_option('i', 'id')) {
|
||||||
|
$id = get_option_value('i', 'id');
|
||||||
|
$profile = Profile::staticGet('id', $id);
|
||||||
|
if (empty($profile)) {
|
||||||
|
print "Can't find local or remote profile 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 local user with nickname '$nickname'\n";
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
$profile = $user->getProfile();
|
||||||
|
} else {
|
||||||
|
print "You must provide either an ID or a nickname.\n\n";
|
||||||
|
show_help();
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!have_option('y', 'yes') && !have_option('--dry-run')) {
|
||||||
|
print "About to PERMANENTLY remove geolocation data from user '{$profile->nickname}' ({$profile->id})'s notices. Are you sure? [y/N] ";
|
||||||
|
$response = fgets(STDIN);
|
||||||
|
if (strtolower(trim($response)) != 'y') {
|
||||||
|
print "Aborting.\n";
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// @fixme for a very prolific poster this could be too many.
|
||||||
|
print "Finding notices with geolocation data...";
|
||||||
|
$notice = new Notice();
|
||||||
|
$notice->profile_id = $profile->id;
|
||||||
|
$notice->whereAdd("lat != ''");
|
||||||
|
$notice->find();
|
||||||
|
|
||||||
|
if ($notice->N) {
|
||||||
|
print " $notice->N found.\n";
|
||||||
|
while ($notice->fetch()) {
|
||||||
|
print "notice id $notice->id ";
|
||||||
|
if (have_option('v') || have_option('--verbose')) {
|
||||||
|
print "({$notice->lat},{$notice->lon}) ";
|
||||||
|
if ($notice->location_ns) {
|
||||||
|
print "ns {$notice->location_ns} id {$notice->location_id} ";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (have_option('--dry-run')) {
|
||||||
|
// sucka
|
||||||
|
echo "(skipped)";
|
||||||
|
} else {
|
||||||
|
// note: setting fields to null and calling update() doesn't save the nulled fields
|
||||||
|
$orig = clone($notice);
|
||||||
|
$update = clone($notice);
|
||||||
|
|
||||||
|
// In theory we could hit a chunk of notices at once in the UPDATE,
|
||||||
|
// but we're going to have to decache them individually anyway and
|
||||||
|
// it doesn't hurt to make sure we don't hold up replication with
|
||||||
|
// what might be a very slow single UPDATE.
|
||||||
|
$query = sprintf('UPDATE notice ' .
|
||||||
|
'SET lat=NULL,lon=NULL,location_ns=NULL,location_id=NULL ' .
|
||||||
|
'WHERE id=%d', $notice->id);
|
||||||
|
$ok = $update->query($query);
|
||||||
|
if ($ok) {
|
||||||
|
// And now we decache him manually, as query() doesn't know what we're doing...
|
||||||
|
$orig->blow();
|
||||||
|
echo "(removed)";
|
||||||
|
} else {
|
||||||
|
echo "(failed?)";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
print "\n";
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
print " none found.\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
print "DONE.\n";
|
Loading…
Reference in New Issue
Block a user