Merge branch '1.0.x' into testing

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

diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index 3cec9523cdff1fd3c1376592121e8cf21f52dacb..e5c0803495f46c11ad80e9355e735e0a76af088c 100644 (file)
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -45,7 +45,6 @@ require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
  */
 class UpdateprofileAction extends Action
 {
-
     /**
      * For initializing members of the class.
      *
@@ -55,12 +54,16 @@ class UpdateprofileAction extends Action
      */
     function prepare($argarray)
     {
+        StatusNet::setApi(true); // Send smaller error pages
+
         parent::prepare($argarray);
         $license      = $_POST['omb_listenee_license'];
         $site_license = common_config('license', 'url');
         if (!common_compatible_license($license, $site_license)) {
-            $this->clientError(sprintf(_('Listenee stream license ‘%s’ is not '.
-                                         'compatible with site license ‘%s’.'),
+            // TRANS: Client error displayed when trying to update profile with an incompatible license.
+            // TRANS: %1$s is the license incompatible with site license %2$s.
+            $this->clientError(sprintf(_('Listenee stream license "%1$s" is not '.
+                                         'compatible with site license "%2$s".'),
                                        $license, $site_license));
             return false;
         }
@@ -75,6 +78,14 @@ class UpdateprofileAction extends Action
             $srv = new OMB_Service_Provider(null, omb_oauth_datastore(),
                                             omb_oauth_server());
             $srv->handleUpdateProfile();
+        } catch (OMB_RemoteServiceException $rse) {
+            $msg = $rse->getMessage();
+            if (preg_match('/Revoked accesstoken/', $msg) ||
+                preg_match('/No subscriber/', $msg)) {
+                $this->clientError($msg, 403);
+            } else {
+                $this->clientError($msg);
+            }
         } catch (Exception $e) {
             $this->serverError($e->getMessage());
             return;