]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Remove tralling whitespace on lines and a gettext replacement that I missed.
authorMike Cochrane <mikec@mikenz.geek.nz>
Tue, 8 Jul 2008 09:51:13 +0000 (05:51 -0400)
committerMike Cochrane <mikec@mikenz.geek.nz>
Tue, 8 Jul 2008 09:51:13 +0000 (05:51 -0400)
darcs-hash:20080708095113-533db-ad63bbde67b6275fb7ae944cc9882adf6f3be517.gz

actions/all.php
actions/allrss.php
actions/finishaddopenid.php
actions/finishopenidlogin.php
actions/finishremotesubscribe.php
actions/foaf.php
actions/imsettings.php
actions/newnotice.php

index 9ca020015b72d0befde809879a45abee3cf12834..6ece53528a45bad582b0852f4c66a1ced4fc7ea7 100644 (file)
@@ -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));
        }
index 64e16ec6cb6e42c26f6f385eb756640ab126373b..e9280024c4886bf09d51b660695ae9970437534f 100644 (file)
@@ -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();
index 49e54a34fc5028332709b18404475c575600b8d9..028dc82e5a218a878adbb7fef8c62736334bd41d 100644 (file)
@@ -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'));
                }
        }
index 6eb45ec8e59bdf77bc874296a8d7a5f1493a7565..36af83840cee34c0963915ebf41ae0699baea3a3 100644 (file)
@@ -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',
index 7d7b6d1468e4e898da5a51beeb08292914669a8f..ba5156a204ff770bb25218e43b4fc190259af739 100644 (file)
@@ -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
index d5ff00a768868abf2be77db1dfd37ca5115c3d18..bcdc077ca5fac33c4f80f9c430f5b1b0d770d557 100644 (file)
@@ -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');
index f4c6a3e3a9cc3c2199f9528393a434805f273bbc..c0fa5014ed507a1b728d30edc2b48e0c0a94e9b3 100644 (file)
@@ -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. ' .
index 961bbb63994ed105d38363fbeaa0141f8c80d3fc..de8e9ec2783d2510ab53bdabaaf41b240aaf20cc 100644 (file)
@@ -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,