Message to end-user on why FeedSub failed.

diff --git a/plugins/OStatus/classes/FeedSub.php b/plugins/OStatus/classes/FeedSub.php
index 7bbd6b5694e2c509ed01cd232c894c41d99f1821..3972d74eaa47c84c5fb3589c6a39daec1ad08974 100644 (file)
--- a/plugins/OStatus/classes/FeedSub.php
+++ b/plugins/OStatus/classes/FeedSub.php
@@ -393,6 +393,8 @@ class FeedSub extends Managed_DataObject
      */
     protected function doSubscribe($mode)
     {
+        $msg = null;    // carries descriptive error message to enduser (no remote data strings!)
+
         $orig = clone($this);
         if ($mode == 'subscribe') {
             $this->secret = common_random_hexstr(32);
@@ -435,6 +437,7 @@ class FeedSub extends Managed_DataObject
                 return;
             } else if ($status >= 200 && $status < 300) {
                 common_log(LOG_ERR, __METHOD__ . ": sub req returned unexpected HTTP $status: " . $response->getBody());
+                $msg = sprintf(_m("Unexpected HTTP status: %d"), $status);
             } else if ($status == 422) {
                 // Error code regarding something wrong in the data (it seems
                 // that we're talking to a PuSH hub at least, so let's check
@@ -455,7 +458,7 @@ class FeedSub extends Managed_DataObject
             // Throw the Exception again.
             throw $e;
         }
-        throw new ServerException("{$mode} request failed.");
+        throw new ServerException("{$mode} request failed" . (!is_null($msg) ? " ($msg)" : '.'));
     }
 
     /**