Normalize execution guards on OStatus php files; mostly helps cut down on annoying...

[quix0rs-gnu-social.git] / plugins / OStatus / actions / pushcallback.php

diff --git a/plugins/OStatus/actions/pushcallback.php b/plugins/OStatus/actions/pushcallback.php
index 6c69787455df7dde3c2e88aa2aed66066eee7048..9b83d43c4ddd7528fc41aedc5c728895c3b4a65b 100644 (file)
--- a/plugins/OStatus/actions/pushcallback.php
+++ b/plugins/OStatus/actions/pushcallback.php
@@ -22,8 +22,9 @@
  * @maintainer Brion Vibber <brion@status.net>
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
-
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 class PushCallbackAction extends Action
 {
@@ -46,13 +47,13 @@ class PushCallbackAction extends Action
         $feedid = $this->arg('feed');
         common_log(LOG_INFO, "POST for feed id $feedid");
         if (!$feedid) {
-            throw new ServerException('Empty or invalid feed id.', 400);
+            throw new ServerException(_m('Empty or invalid feed id.'), 400);
         }
 
         $feedsub = FeedSub::staticGet('id', $feedid);
         if (!$feedsub) {
-            // @todo i18n FIXME: added i18n and use sprintf when using parameters.
-            throw new ServerException('Unknown PuSH feed id ' . $feedid, 400);
+            // TRANS: Server exception. %s is a feed ID.
+            throw new ServerException(sprintf(_m('Unknown PuSH feed id %s'),$feedid), 400);
         }
 
         $hmac = '';
@@ -82,32 +83,34 @@ class PushCallbackAction extends Action
         $challenge = $this->arg('hub_challenge');
         $lease_seconds = $this->arg('hub_lease_seconds');
         $verify_token = $this->arg('hub_verify_token');
+        common_log(LOG_INFO, __METHOD__ . ": sub verification mode: $mode topic: $topic challenge: $challenge lease_seconds: $lease_seconds verify_token: $verify_token");
 
         if ($mode != 'subscribe' && $mode != 'unsubscribe') {
-            throw new ClientException("Bad hub.mode $mode", 404);
+            // TRANS: Client exception. %s is an invalid value for hub.mode.
+            throw new ClientException(sprintf(_m('Bad hub.mode "$s".',$mode)), 404);
         }
 
         $feedsub = FeedSub::staticGet('uri', $topic);
         if (!$feedsub) {
-            // @todo i18n FIXME: added i18n and use sprintf when using parameters.
-            throw new ClientException("Bad hub.topic feed $topic.", 404);
+            // TRANS: Client exception. %s is an invalid feed name.
+            throw new ClientException(sprintf(_m('Bad hub.topic feed "%s".'),$topic), 404);
         }
 
         if ($feedsub->verify_token !== $verify_token) {
-            // @todo i18n FIXME: added i18n and use sprintf when using parameters.
-            throw new ClientException("Bad hub.verify_token $token for $topic.", 404);
+            // TRANS: Client exception. %1$s the invalid token, %2$s is the topic for which the invalid token was given.
+            throw new ClientException(sprintf(_m('Bad hub.verify_token %1$s for %2$s.'),$token,$topic), 404);
         }
 
         if ($mode == 'subscribe') {
             // We may get re-sub requests legitimately.
             if ($feedsub->sub_state != 'subscribe' && $feedsub->sub_state != 'active') {
-                // @todo i18n FIXME: added i18n and use sprintf when using parameters.
-                throw new ClientException("Unexpected subscribe request for $topic.", 404);
+                // TRANS: Client exception. %s is an invalid topic.
+                throw new ClientException(sprintf(_m('Unexpected subscribe request for %s.'),$topic), 404);
             }
         } else {
             if ($feedsub->sub_state != 'unsubscribe') {
-                // @todo i18n FIXME: added i18n and use sprintf when using parameters.
-                throw new ClientException("Unexpected unsubscribe request for $topic.", 404);
+                // TRANS: Client exception. %s is an invalid topic.
+                throw new ClientException(sprintf(_m('Unexpected unsubscribe request for %s.'),$topic), 404);
             }
         }