debugging for addopenid problem

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

diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index 1ec842f2647e01c5f462dcf5c471b3219890940a..aca5f04fed11bf92b06f4c6c4e1121b95ce7a076 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 {
        
@@ -140,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();