some debug code to find a problem with terms

[quix0rs-gnu-social.git] / actions / finishremotesubscribe.php

diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index fa9aa539fd80c6f4491b0fc94f6512cc5adad00e..06fd3f52c43b519fb1f01fc4a3ba571890fa8426 100644 (file)
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -20,7 +20,6 @@
 if (!defined('LACONICA')) { exit(1); }
 
 require_once(INSTALLDIR.'/lib/omb.php');
-require_once('Auth/Yadis/Yadis.php');
 
 class FinishremotesubscribeAction extends Action {
        
@@ -40,6 +39,8 @@ class FinishremotesubscribeAction extends Action {
                        return;
                }
 
+               common_debug('stored request: '.print_r($omb,true), __FILE__);
+               
                $req = OAuthRequest::from_request();
 
                $token = $req->get_parameter('oauth_token');
@@ -77,7 +78,9 @@ class FinishremotesubscribeAction extends Action {
                        return;
                }
 
-               $user = User::staticGet('uri', $omb['listenee']);
+               common_debug('listenee: "'.$omb['listenee'].'"', __FILE__);
+               
+               $user = User::staticGet('nickname', $omb['listenee']);
                
                if (!$user) {
                        common_user_error(_t('User being listened to doesn\'t exist.'));
@@ -136,21 +139,34 @@ class FinishremotesubscribeAction extends Action {
                } else {
                        $profile->created = DB_DataObject_Cast::dateTime(); # current time
                        $id = $profile->insert();
+                       if (!$id) {
+                               common_server_error(_t('Error inserting new profile'));
+                               return;
+                       }
                        $remote->id = $id;
                }
 
                if ($avatar_url) {
-                       $this->add_avatar($profile, $avatar_url);
+                       if (!$this->add_avatar($profile, $avatar_url)) {
+                               common_server_error(_t('Error inserting avatar'));
+                               return;
+                       }
                }
 
-               $remote->postnoticeurl = $omb[OMB_ENDPOINT_POSTNOTICE];
-               $remote->updateprofileurl = $omb[OMB_ENDPOINT_UPDATEPROFILE];
+               $remote->postnoticeurl = $omb['post_notice_url'];
+               $remote->updateprofileurl = $omb['update_profile_url'];
 
                if ($exists) {
-                       $remote->update($orig_remote);
+                       if (!$remote->update($orig_remote)) {
+                               common_server_error(_t('Error updating remote profile'));
+                               return;
+                       }
                } else {
                        $remote->created = DB_DataObject_Cast::dateTime(); # current time
-                       $remote->insert;
+                       if (!$remote->insert()) {
+                               common_server_error(_t('Error inserting remote profile'));
+                               return;
+                       }
                }
                
                $sub = new Subscription();
@@ -171,7 +187,7 @@ class FinishremotesubscribeAction extends Action {
                # If we show subscriptions in reverse chron order, this should
                # show up close to the top of the page
                
-               common_redirect(common_local_url('subscribed', array('nickname' =>
+               common_redirect(common_local_url('subscribers', array('nickname' =>
                                                                                                                         $user->nickname)));
        }
        
@@ -182,11 +198,17 @@ class FinishremotesubscribeAction extends Action {
        }
        
        function access_token($omb) {
+
+               common_debug('starting request for access token', __FILE__);
                
                $con = omb_oauth_consumer();
                $tok = new OAuthToken($omb['token'], $omb['secret']);
 
-               $url = omb_service_uri($omb[OAUTH_ENDPOINT_ACCESS]);
+               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.
@@ -201,13 +223,18 @@ class FinishremotesubscribeAction extends Action {
                
                # XXX: test to see if endpoint accepts this signature method
 
-               $req->sign_request(omb_hmac_sha1(), $con, NULL);
+               $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;