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

[quix0rs-gnu-social.git] / plugins / OpenX / OpenXPlugin.php

diff --git a/plugins/OpenX/OpenXPlugin.php b/plugins/OpenX/OpenXPlugin.php
index 5d3bb2306ca7a880bde6e80932d3301d1c538bbe..1d2b9d53e823be18b5aa64086f12caea2c957b3b 100644 (file)
--- a/plugins/OpenX/OpenXPlugin.php
+++ b/plugins/OpenX/OpenXPlugin.php
@@ -173,32 +173,18 @@ ENDOFSCRIPT;
         return true;
     }
 
-    function onRouterInitialized($m)
+    function onRouterInitialized(URLMapper $m)
     {
-        $m->connect('admin/openx',
+        $m->connect('panel/openx',
                     array('action' => 'openxadminpanel'));
 
         return true;
     }
 
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-
-        switch ($cls)
-        {
-        case 'OpenxadminpanelAction':
-            require_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
-    function onEndAdminPanelNav($menu) {
+    function onEndAdminPanelNav(Menu $menu) {
         if (AdminPanelAction::canAdmin('openx')) {
-            // TRANS: Menu item title/tooltip
-            $menu_title = _m('OpenX configuration');
+            // TRANS: Menu item title.
+            $menu_title = _m('OpenX configuration.');
             // TRANS: Menu item for site administration
             $menu->out->menuItem(common_local_url('openxadminpanel'), _m('OpenX'),
                                  $menu_title, $action_name == 'openxadminpanel', 'nav_openx_admin_panel');
@@ -213,10 +199,10 @@ ENDOFSCRIPT;
      *
      * @return boolean hook value
      */
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'OpenX',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:OpenX',
                             'rawdescription' =>