Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / RSSCloud / RSSCloudPlugin.php

diff --git a/plugins/RSSCloud/RSSCloudPlugin.php b/plugins/RSSCloud/RSSCloudPlugin.php
index 7d9c39a67da139c9fa093b63e4d7898a6ca266e6..15a25c8d22a893d99a2a50f11803ddaa9277b7ba 100644 (file)
--- a/plugins/RSSCloud/RSSCloudPlugin.php
+++ b/plugins/RSSCloud/RSSCloudPlugin.php
@@ -41,8 +41,7 @@ define('RSSCLOUDPLUGIN_VERSION', '0.1');
  * @author   Zach Copley <zach@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
- **/
-
+ */
 class RSSCloudPlugin extends Plugin
 {
     /**
@@ -61,7 +60,6 @@ class RSSCloudPlugin extends Plugin
      *
      * @return void
      */
-
     function onInitializePlugin()
     {
         $this->domain   = common_config('rsscloud', 'domain');
@@ -104,8 +102,7 @@ class RSSCloudPlugin extends Plugin
      *
      * @return boolean hook return
      */
-
-    function onRouterInitialized($m)
+    function onRouterInitialized(URLMapper $m)
     {
         $m->connect('/main/rsscloud/request_notify',
                     array('action' => 'RSSCloudRequestNotify'));
@@ -118,39 +115,6 @@ class RSSCloudPlugin extends Plugin
         return true;
     }
 
-    /**
-     * Automatically load the actions and libraries used by
-     * the RSSCloud plugin
-     *
-     * @param Class $cls the class
-     *
-     * @return boolean hook return
-     *
-     */
-
-    function onAutoload($cls)
-    {
-        switch ($cls)
-        {
-        case 'RSSCloudSubscription':
-            include_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudSubscription.php';
-            return false;
-        case 'RSSCloudNotifier':
-            include_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudNotifier.php';
-            return false;
-        case 'RSSCloudQueueHandler':
-            include_once INSTALLDIR . '/plugins/RSSCloud/RSSCloudQueueHandler.php';
-            return false;
-        case 'RSSCloudRequestNotifyAction':
-        case 'LoggingAggregatorAction':
-            include_once INSTALLDIR . '/plugins/RSSCloud/' .
-              mb_substr($cls, 0, -6) . '.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
     /**
      * Add a <cloud> element to the RSS feed (after the rss <channel>
      * element is started).
@@ -159,7 +123,6 @@ class RSSCloudPlugin extends Plugin
      *
      * @return void
      */
-
     function onStartApiRss($action)
     {
         if (get_class($action) == 'ApiTimelineUserAction') {
@@ -190,7 +153,7 @@ class RSSCloudPlugin extends Plugin
      * @return boolean hook return
      */
 
-    function onStartEnqueueNotice($notice, &$transports)
+    function onStartEnqueueNotice(Notice $notice, array &$transports)
     {
         if ($notice->isLocal()) {
             array_push($transports, 'rsscloud');
@@ -212,7 +175,7 @@ class RSSCloudPlugin extends Plugin
             array(
                 'fields' => array(
                     'subscribed' => array('type' => 'int', 'not null' => true),
-                    'url' => array('type' => 'varchar', 'length' => '255', 'not null' => true),
+                    'url' => array('type' => 'varchar', 'length' => '191', 'not null' => true),
                     'failures' => array('type' => 'int', 'not null' => true, 'default' => 0),
                     'created' => array('type' => 'datetime', 'not null' => true),
                     'modified' => array('type' => 'timestamp', 'not null' => true),
@@ -229,24 +192,24 @@ class RSSCloudPlugin extends Plugin
      *
      * @return boolean hook return
      */
-    function onEndInitializeQueueManager($manager)
+    function onEndInitializeQueueManager(QueueManager $manager)
     {
         $manager->connect('rsscloud', 'RSSCloudQueueHandler');
         return true;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'RSSCloud',
                             'version' => RSSCLOUDPLUGIN_VERSION,
                             'author' => 'Zach Copley',
                             'homepage' => 'http://status.net/wiki/Plugin:RSSCloud',
                             'rawdescription' =>
+                            // TRANS: Plugin description.
                             _m('The RSSCloud plugin enables your StatusNet instance to publish ' .
                                'real-time updates for profile RSS feeds using the ' .
                                '<a href="http://rsscloud.org/">RSSCloud protocol</a>.'));
 
         return true;
     }
-
 }