From 0f502b8d8656bf9f1340611893dd0e4d736aeea3 Mon Sep 17 00:00:00 2001 From: Mike Cochrane Date: Tue, 8 Jul 2008 05:51:13 -0400 Subject: [PATCH] Remove tralling whitespace on lines and a gettext replacement that I missed. darcs-hash:20080708095113-533db-ad63bbde67b6275fb7ae944cc9882adf6f3be517.gz --- actions/all.php | 14 +++--- actions/allrss.php | 16 +++---- actions/finishaddopenid.php | 16 +++---- actions/finishopenidlogin.php | 2 +- actions/finishremotesubscribe.php | 72 +++++++++++++++---------------- actions/foaf.php | 22 +++++----- actions/imsettings.php | 2 +- actions/newnotice.php | 4 +- 8 files changed, 74 insertions(+), 74 deletions(-) diff --git a/actions/all.php b/actions/all.php index 9ca020015b..6ece53528a 100644 --- a/actions/all.php +++ b/actions/all.php @@ -47,12 +47,12 @@ class AllAction extends StreamAction { common_show_header(sprintf(_("%s and friends"), $profile->nickname), array($this, 'show_header'), $user, array($this, 'show_top')); - + $this->show_notices($profile); - + common_show_footer(); } - + function show_header($user) { common_element('link', array('rel' => 'alternate', 'href' => common_local_url('allrss', array('nickname' => @@ -63,14 +63,14 @@ class AllAction extends StreamAction { function show_top($user) { $cur = common_current_user(); - + if ($cur && $cur->id == $user->id) { common_notice_form('all'); } - + $this->views_menu(); } - + function show_notices($profile) { $notice = DB_DataObject::factory('notice'); @@ -100,7 +100,7 @@ class AllAction extends StreamAction { } common_element_end('ul'); } - + common_pagination($page > 1, $cnt > NOTICES_PER_PAGE, $page, 'all', array('nickname' => $profile->nickname)); } diff --git a/actions/allrss.php b/actions/allrss.php index 64e16ec6cb..e9280024c4 100644 --- a/actions/allrss.php +++ b/actions/allrss.php @@ -30,7 +30,7 @@ class AllrssAction extends Rss10Action { function init() { $nickname = $this->trimmed('nickname'); $this->user = User::staticGet('nickname', $nickname); - + if (!$this->user) { common_user_error(_('No such nickname.')); return false; @@ -38,12 +38,12 @@ class AllrssAction extends Rss10Action { return true; } } - + function get_notices($limit=0) { - + $user = $this->user; $notices = array(); - + $notice = DB_DataObject::factory('notice'); $notice->whereAdd('EXISTS (SELECT subscribed from subscription where subscriber = '.$user->id.' and subscribed = notice.profile_id)', 'OR'); @@ -54,14 +54,14 @@ class AllrssAction extends Rss10Action { $notice->limit(0, $limit); } $notice->find(); - + while ($notice->fetch()) { $notices[] = clone($notice); } - + return $notices; } - + function get_channel() { $user = $this->user; $c = array('url' => common_local_url('allrss', @@ -74,7 +74,7 @@ class AllrssAction extends Rss10Action { 'description' => sprintf(_('Feed for friends of %s'), $user->nickname)); return $c; } - + function get_image() { $user = $this->user; $profile = $user->getProfile(); diff --git a/actions/finishaddopenid.php b/actions/finishaddopenid.php index 49e54a34fc..028dc82e5a 100644 --- a/actions/finishaddopenid.php +++ b/actions/finishaddopenid.php @@ -45,7 +45,7 @@ class FinishaddopenidAction extends Action { // Authentication failed; display the error message. $this->message(sprintf(_('OpenID authentication failed: %s'), $response->message)); } else if ($response->status == Auth_OpenID_SUCCESS) { - + $display = $response->getDisplayIdentifier(); $canonical = ($response->endpoint && $response->endpoint->canonicalID) ? $response->endpoint->canonicalID : $display; @@ -58,7 +58,7 @@ class FinishaddopenidAction extends Action { $cur =& common_current_user(); $other = oid_get_user($canonical); - + if ($other) { if ($other->id == $cur->id) { $this->message(_('You already have this OpenID!')); @@ -69,11 +69,11 @@ class FinishaddopenidAction extends Action { } # start a transaction - + $cur->query('BEGIN'); - + $result = oid_link_user($cur->id, $canonical, $display); - + if (!$result) { $this->message(_('Error connecting user.')); return; @@ -84,13 +84,13 @@ class FinishaddopenidAction extends Action { return; } } - + # success! - + $cur->query('COMMIT'); oid_set_last($display); - + common_redirect(common_local_url('openidsettings')); } } diff --git a/actions/finishopenidlogin.php b/actions/finishopenidlogin.php index 6eb45ec8e5..36af83840c 100644 --- a/actions/finishopenidlogin.php +++ b/actions/finishopenidlogin.php @@ -62,7 +62,7 @@ class FinishopenidloginAction extends Action { } function show_form($error=NULL, $username=NULL) { - common_show_header(_t('OpenID Account Setup'), NULL, $error, + common_show_header(_('OpenID Account Setup'), NULL, $error, array($this, 'show_top')); common_element_start('form', array('method' => 'post', diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php index 7d7b6d1468..ba5156a204 100644 --- a/actions/finishremotesubscribe.php +++ b/actions/finishremotesubscribe.php @@ -22,52 +22,52 @@ if (!defined('LACONICA')) { exit(1); } require_once(INSTALLDIR.'/lib/omb.php'); class FinishremotesubscribeAction extends Action { - + function handle($args) { - + parent::handle($args); if (common_logged_in()) { common_user_error(_('You can use the local subscription!')); return; } - + $omb = $_SESSION['oauth_authorization_request']; - + if (!$omb) { common_user_error(_('Not expecting this response!')); return; } common_debug('stored request: '.print_r($omb,true), __FILE__); - + $req = OAuthRequest::from_request(); $token = $req->get_parameter('oauth_token'); # I think this is the success metric - + if ($token != $omb['token']) { common_user_error(_('Not authorized.')); return; } - + $version = $req->get_parameter('omb_version'); - + if ($version != OMB_VERSION_01) { common_user_error(_('Unknown version of OMB protocol.')); return; } - + $nickname = $req->get_parameter('omb_listener_nickname'); - + if (!$nickname) { common_user_error(_('No nickname provided by remote server.')); return; } $profile_url = $req->get_parameter('omb_listener_profile'); - + if (!$profile_url) { common_user_error(_('No profile URL returned by server.')); return; @@ -79,14 +79,14 @@ class FinishremotesubscribeAction extends Action { } common_debug('listenee: "'.$omb['listenee'].'"', __FILE__); - + $user = User::staticGet('nickname', $omb['listenee']); - + if (!$user) { common_user_error(_('User being listened to doesn\'t exist.')); return; } - + $fullname = $req->get_parameter('omb_listener_fullname'); $homepage = $req->get_parameter('omb_listener_homepage'); $bio = $req->get_parameter('omb_listener_bio'); @@ -94,16 +94,16 @@ class FinishremotesubscribeAction extends Action { $avatar_url = $req->get_parameter('omb_listener_avatar'); list($newtok, $newsecret) = $this->access_token($omb); - + if (!$newtok || !$newsecret) { common_user_error(_('Couldn\'t convert request tokens to access tokens.')); return; } - + # XXX: possible attack point; subscribe and return someone else's profile URI - + $remote = Remote_profile::staticGet('uri', $omb['listener']); - + if ($remote) { $exists = true; $profile = Profile::staticGet($remote->id); @@ -120,7 +120,7 @@ class FinishremotesubscribeAction extends Action { $profile->nickname = $nickname; $profile->profileurl = $profile_url; - + if ($fullname) { $profile->fullname = $fullname; } @@ -133,7 +133,7 @@ class FinishremotesubscribeAction extends Action { if ($location) { $profile->location = $location; } - + if ($exists) { $profile->update($orig_profile); } else { @@ -168,14 +168,14 @@ class FinishremotesubscribeAction extends Action { return; } } - + $sub = new Subscription(); $sub->subscriber = $remote->id; $sub->subscribed = $user->id; $sub->token = $newtok; $sub->secret = $newsecret; $sub->created = DB_DataObject_Cast::dateTime(); # current time - + if (!$sub->insert()) { common_user_error(_('Couldn\'t insert new subscription.')); return; @@ -183,65 +183,65 @@ class FinishremotesubscribeAction extends Action { # Clear the data unset($_SESSION['oauth_authorization_request']); - + # If we show subscriptions in reverse chron order, this should # show up close to the top of the page - + common_redirect(common_local_url('subscribers', array('nickname' => $user->nickname))); } - + function add_avatar($profile, $url) { $temp_filename = tempnam(sys_get_temp_dir(), 'listener_avatar'); copy($url, $temp_filename); return $profile->setOriginal($temp_filename); } - + function access_token($omb) { common_debug('starting request for access token', __FILE__); - + $con = omb_oauth_consumer(); $tok = new OAuthToken($omb['token'], $omb['secret']); common_debug('using request token "'.$tok.'"', __FILE__); - + $url = $omb['access_token_url']; common_debug('using access token url "'.$url.'"', __FILE__); - + # XXX: Is this the right thing to do? Strip off GET params and make them # POST params? Seems wrong to me. - + $parsed = parse_url($url); $params = array(); parse_str($parsed['query'], $params); $req = OAuthRequest::from_consumer_and_token($con, $tok, "POST", $url, $params); - + $req->set_parameter('omb_version', OMB_VERSION_01); - + # XXX: test to see if endpoint accepts this signature method $req->sign_request(omb_hmac_sha1(), $con, $tok); - + # We re-use this tool's fetcher, since it's pretty good common_debug('posting to access token url "'.$req->get_normalized_http_url().'"', __FILE__); common_debug('posting request data "'.$req->to_postdata().'"', __FILE__); - + $fetcher = Auth_Yadis_Yadis::getHTTPFetcher(); $result = $fetcher->post($req->get_normalized_http_url(), $req->to_postdata()); common_debug('got result: "'.print_r($result,TRUE).'"', __FILE__); - + if ($result->status != 200) { return NULL; } parse_str($result->body, $return); - + return array($return['oauth_token'], $return['oauth_token_secret']); } } \ No newline at end of file diff --git a/actions/foaf.php b/actions/foaf.php index d5ff00a768..bcdc077ca5 100644 --- a/actions/foaf.php +++ b/actions/foaf.php @@ -24,14 +24,14 @@ define('LISTENEE', -1); define('BOTH', 0); class FoafAction extends Action { - + function handle($args) { parent::handle($args); $nickname = $this->trimmed('nickname'); - + $user = User::staticGet('nickname', $nickname); - + if (!$user) { common_user_error(_('No such user'), 404); return; @@ -43,7 +43,7 @@ class FoafAction extends Action { common_server_error(_('User has no profile'), 500); return; } - + header('Content-Type: application/rdf+xml'); common_start_xml(); @@ -56,9 +56,9 @@ class FoafAction extends Action { 'xmlns' => 'http://xmlns.com/foaf/0.1/')); # This is the document about the user - + $this->show_ppd('', $user->uri); - + # XXX: might not be a person common_element_start('Person', array('rdf:about' => $user->uri)); @@ -101,7 +101,7 @@ class FoafAction extends Action { } # Get people user is subscribed to - + $person = array(); $sub = new Subscription(); @@ -146,7 +146,7 @@ class FoafAction extends Action { } } } - + common_element_end('Person'); foreach ($person as $uri => $p) { @@ -169,17 +169,17 @@ class FoafAction extends Action { $this->show_ppd($foaf_url, $uri); } } - + common_element_end('rdf:RDF'); } - + function show_ppd($foaf_url, $person_uri) { common_element_start('PersonalProfileDocument', array('rdf:about' => $foaf_url)); common_element('maker', array('rdf:resource' => $person_uri)); common_element('primaryTopic', array('rdf:resource' => $person_uri)); common_element_end('PersonalProfileDocument'); } - + function show_microblogging_account($profile, $service=NULL) { # Their account common_element_start('holdsAccount'); diff --git a/actions/imsettings.php b/actions/imsettings.php index f4c6a3e3a9..c0fa5014ed 100644 --- a/actions/imsettings.php +++ b/actions/imsettings.php @@ -190,7 +190,7 @@ class ImsettingsAction extends SettingsAction { $user->nickname, $jabber); } - + # XXX: I18N $msg = 'A confirmation code was sent to the IM address you added. ' . diff --git a/actions/newnotice.php b/actions/newnotice.php index 961bbb6399..de8e9ec278 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -70,9 +70,9 @@ class NewnoticeAction extends Action { return; } - common_save_replies($notice); + common_save_replies($notice); common_broadcast_notice($notice); - + $returnto = $this->trimmed('returnto'); if ($returnto) { $url = common_local_url($returnto,