X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=actions%2Fupdateprofile.php;h=e5c0803495f46c11ad80e9355e735e0a76af088c;hb=9d0ccbff01c1d861d152e30feeb2094f5a2742b4;hp=4ff4f41c0de2e7a20e36148a1f56f05e007a2b1b;hpb=8548e1185deac0a289e16ea48a64f323c3bec679;p=quix0rs-gnu-social.git

diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index 4ff4f41c0d..e5c0803495 100644
--- 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,13 +54,17 @@ 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’.'),
-                                       $license, $site_license);
+            // 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;
         }
         return true;
@@ -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;