From 2295bbec9ea1e279316b8a45b6b05c6d71a6fc3d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 4 Oct 2010 14:22:32 -0700 Subject: [PATCH 1/3] Extra debug helper line in push callback --- plugins/OStatus/actions/pushcallback.php | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/OStatus/actions/pushcallback.php b/plugins/OStatus/actions/pushcallback.php index 701a39c163..6eec1ad16e 100644 --- a/plugins/OStatus/actions/pushcallback.php +++ b/plugins/OStatus/actions/pushcallback.php @@ -81,6 +81,7 @@ class PushCallbackAction extends Action $challenge = $this->arg('hub_challenge'); $lease_seconds = $this->arg('hub_lease_seconds'); $verify_token = $this->arg('hub_verify_token'); + common_log(LOG_INFO, __METHOD__ . ": sub verification mode: $mode topic: $topic challenge: $challenge lease_seconds: $lease_seconds verify_token: $verify_token"); if ($mode != 'subscribe' && $mode != 'unsubscribe') { // TRANS: Client exception. %s is an invalid value for hub.mode. From d6b3d7fb1a7a3dca701dfe5cf95a832b3eb055f9 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 4 Oct 2010 14:24:04 -0700 Subject: [PATCH 2/3] Fix unescaped dollar signs in double-quoted strings due to localization updates (%1$s etc) --- classes/Fave.php | 2 +- classes/Notice.php | 2 +- classes/Subscription.php | 2 +- lib/mail.php | 6 +++--- lib/usernoprofileexception.php | 2 +- plugins/Facebook/facebookhome.php | 2 +- plugins/Mapstraction/allmap.php | 2 +- plugins/OStatus/OStatusPlugin.php | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/classes/Fave.php b/classes/Fave.php index 059b339cd2..9922ae45c5 100644 --- a/classes/Fave.php +++ b/classes/Fave.php @@ -148,7 +148,7 @@ class Fave extends Memcached_DataObject $act->title = _("Favor"); // TRANS: Ntofication given when a user marks a notice as favorite. // TRANS: %1$s is a user nickname or full name, %2$s is a notice URI. - $act->content = sprintf(_("%1$s marked notice %2$s as a favorite."), + $act->content = sprintf(_('%1$s marked notice %2$s as a favorite.'), $profile->getBestName(), $notice->uri); diff --git a/classes/Notice.php b/classes/Notice.php index e268544b50..60989f9bac 100644 --- a/classes/Notice.php +++ b/classes/Notice.php @@ -1117,7 +1117,7 @@ class Notice extends Memcached_DataObject common_log_db_error($reply, 'INSERT', __FILE__); // TRANS: Server exception thrown when a reply cannot be saved. // TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user. - throw new ServerException(sprintf(_("Could not save reply for %1$d, %2$d."), $this->id, $mentioned->id)); + throw new ServerException(sprintf(_('Could not save reply for %1$d, %2$d.'), $this->id, $mentioned->id)); } else { $replied[$mentioned->id] = 1; self::blow('reply:stream:%d', $mentioned->id); diff --git a/classes/Subscription.php b/classes/Subscription.php index b4dbd84c98..e9ad2a5a20 100644 --- a/classes/Subscription.php +++ b/classes/Subscription.php @@ -255,7 +255,7 @@ class Subscription extends Memcached_DataObject $act->title = _("Follow"); // TRANS: Notification given when one person starts following another. // TRANS: %1$s is the subscriber, %2$s is the subscribed. - $act->content = sprintf(_("%1$s is now following %2$s."), + $act->content = sprintf(_('%1$s is now following %2$s.'), $subscriber->getBestName(), $subscribed->getBestName()); diff --git a/lib/mail.php b/lib/mail.php index ab5742e33d..a3b3e05b82 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -252,14 +252,14 @@ function mail_subscribe_notify_profile($listenee, $other) // TRANS: Main body of new-subscriber notification e-mail $body = sprintf(_('%1$s is now listening to your notices on %2$s.'."\n\n". - "\t".'%3$s'."\n\n". + "\t".'%3\$s'."\n\n". '%4$s'. '%5$s'. '%6$s'. - "\n".'Faithfully yours,'."\n".'%7$s.'."\n\n". + "\n".'Faithfully yours,'."\n".'%7\$s.'."\n\n". "----\n". "Change your email address or ". - "notification options at ".'%8$s' ."\n"), + "notification options at ".'%8\$s' ."\n"), $long_name, common_config('site', 'name'), $other->profileurl, diff --git a/lib/usernoprofileexception.php b/lib/usernoprofileexception.php index e0186fef97..954d31b0d1 100644 --- a/lib/usernoprofileexception.php +++ b/lib/usernoprofileexception.php @@ -57,7 +57,7 @@ class UserNoProfileException extends ServerException // TRANS: Exception text shown when no profile can be found for a user. // TRANS: %1$s is a user nickname, $2$d is a user ID (number). - $message = sprintf(_("User %1$s (%2$d) has no profile record."), + $message = sprintf(_('User %1$s (%2$d) has no profile record.'), $user->nickname, $user->id); parent::__construct($message); diff --git a/plugins/Facebook/facebookhome.php b/plugins/Facebook/facebookhome.php index 6090f988c5..8b8b974458 100644 --- a/plugins/Facebook/facebookhome.php +++ b/plugins/Facebook/facebookhome.php @@ -150,7 +150,7 @@ class FacebookhomeAction extends FacebookAction // over and over.. // TRANS: Page title. // TRANS: %1$s is a user nickname, %2$s is a page number. - return sprintf(_m("%1$s and friends, page %2$d"), $this->user->nickname, $this->page); + return sprintf(_m('%1$s and friends, page %2$d'), $this->user->nickname, $this->page); } else { // TRANS: Page title. // TRANS: %s is a user nickname diff --git a/plugins/Mapstraction/allmap.php b/plugins/Mapstraction/allmap.php index fa05ccc7ae..6e2e1d1228 100644 --- a/plugins/Mapstraction/allmap.php +++ b/plugins/Mapstraction/allmap.php @@ -77,7 +77,7 @@ class AllmapAction extends MapAction // @todo CHECKME: does this even happen? May not be needed. // TRANS: Page title. // TRANS: %1$s is a user nickname, %2$d is a page number. - return sprintf(_m("%1$s friends map, page %2$d"), + return sprintf(_m('%1$s friends map, page %2$d'), $base, $this->page); } diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php index dcf1b36078..3cd29aff71 100644 --- a/plugins/OStatus/OStatusPlugin.php +++ b/plugins/OStatus/OStatusPlugin.php @@ -655,7 +655,7 @@ class OStatusPlugin extends Plugin $act->title = _m("Join"); // TRANS: Success message for subscribe to group attempt through OStatus. // TRANS: %1$s is the member name, %2$s is the subscribed group's name. - $act->content = sprintf(_m("%1$s has joined group %2$s."), + $act->content = sprintf(_m('%1$s has joined group %2$s.'), $member->getBestName(), $oprofile->getBestName()); @@ -707,7 +707,7 @@ class OStatusPlugin extends Plugin $act->title = _m("Leave"); // TRANS: Success message for unsubscribe from group attempt through OStatus. // TRANS: %1$s is the member name, %2$s is the unsubscribed group's name. - $act->content = sprintf(_m("%1$s has left group %2$s."), + $act->content = sprintf(_m('%1$s has left group %2$s.'), $member->getBestName(), $oprofile->getBestName()); From c6e8fbebefe7182b9584501d55bc0b32ce7b53a1 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Mon, 4 Oct 2010 15:13:27 -0700 Subject: [PATCH 3/3] scripts/fixup_group_uri.php to fill in empty user_group.uri entries; needed before changing domain names on sites that are hosting groups for remote users --- scripts/fixup_group_uri.php | 102 ++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 scripts/fixup_group_uri.php diff --git a/scripts/fixup_group_uri.php b/scripts/fixup_group_uri.php new file mode 100644 index 0000000000..90938dac3e --- /dev/null +++ b/scripts/fixup_group_uri.php @@ -0,0 +1,102 @@ +#!/usr/bin/env php +. + */ + +define('INSTALLDIR', realpath(dirname(__FILE__) . '/..')); + +$shortoptions = 'i:n:a'; +$longoptions = array('id=', 'nickname=', 'all', 'dry-run'); + +$helptext = <<whereAdd('uri IS NULL'); + if ($group->find()) { + while ($group->fetch()) { + updateGroupUri($group); + } + } + } else { + show_help(); + exit(1); + } +} catch (Exception $e) { + print $e->getMessage()."\n"; + exit(1); +} + +function updateGroupUri($group) +{ + if (!have_option('q', 'quiet')) { + print "Updating URI for group '".$group->nickname."' (".$group->id.")..."; + } + + if (empty($group->uri)) { + // Using clone here was screwing up the group->find() iteration + $orig = User_group::staticGet('id', $group->id); + + $group->uri = $group->getUri(); + if (have_option('dry_run')) { + echo " would have set $group->uri "; + } else { + if (!$group->update($orig)) { + throw new Exception("Can't update uri for group " . $group->nickname . "."); + } + echo " set $group->uri "; + } + } else { + print " already set, keeping $group->uri "; + } + + if (have_option('v', 'verbose')) { + print "DONE."; + } + if (!have_option('q', 'quiet') || have_option('v', 'verbose')) { + print "\n"; + } +}