Only administrators can delete other privileged users.

[quix0rs-gnu-social.git] / plugins / BlogspamNet / BlogspamNetPlugin.php

diff --git a/plugins/BlogspamNet/BlogspamNetPlugin.php b/plugins/BlogspamNet/BlogspamNetPlugin.php
index 06198e6c54846deb937897bdc65a136c1e58b009..2cab69be30e03672b33dd1aab8926baf0d69fdb7 100644 (file)
--- a/plugins/BlogspamNet/BlogspamNetPlugin.php
+++ b/plugins/BlogspamNet/BlogspamNetPlugin.php
@@ -82,13 +82,19 @@ class BlogspamNetPlugin extends Plugin
         } else {
             common_debug("Blogspamnet results = " . $response);
             if (preg_match('/^ERROR(:(.*))?$/', $response, $match)) {
-                throw new ServerException(sprintf(_m("Error from %1$s: %2$s"), $this->baseUrl, $match[2]), 500);
+                // TRANS: Server exception thrown when blogspam.net returns error status.
+                // TRANS: %1$s is the base URL, %2$s is the error (unknown contents; no period).
+                throw new ServerException(sprintf(_m('Error from %1$s: %2$s'), $this->baseUrl, $match[2]), 500);
             } else if (preg_match('/^SPAM(:(.*))?$/', $response, $match)) {
-                throw new ClientException(sprintf(_m("Spam checker results: %s"), $match[2]), 400);
+                // TRANS: Server exception thrown when blogspam.net returns spam status.
+                // TRANS: Does not end with period because of unknown contents for %s (spam match).
+                throw new ClientException(sprintf(_m('Spam checker results: %s'), $match[2]), 400);
             } else if (preg_match('/^OK$/', $response)) {
                 // don't do anything
             } else {
-                throw new ServerException(sprintf(_m("Unexpected response from %1$s: %2$s"), $this->baseUrl, $response), 500);
+                // TRANS: Server exception thrown when blogspam.net returns an unexpected status.
+                // TRANS: %1$s is the base URL, %2$s is the response (unknown contents; no period).
+                throw new ServerException(sprintf(_m('Unexpected response from %1$s: %2$s'), $this->baseUrl, $response), 500);
             }
         }
         return true;
@@ -137,18 +143,19 @@ class BlogspamNetPlugin extends Plugin
         return '127.0.0.1';
     }
 
-    function userAgent()
+    function version()
     {
-        return 'BlogspamNetPlugin/'.BLOGSPAMNETPLUGIN_VERSION . ' StatusNet/' . STATUSNET_VERSION;
+        return BLOGSPAMNETPLUGIN_VERSION;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'BlogspamNet',
                             'version' => BLOGSPAMNETPLUGIN_VERSION,
                             'author' => 'Evan Prodromou, Brion Vibber',
                             'homepage' => 'http://status.net/wiki/Plugin:BlogspamNet',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('Plugin to check submitted notices with blogspam.net.'));
         return true;
     }