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

[quix0rs-gnu-social.git] / plugins / AccountManager / AccountManagerPlugin.php

diff --git a/plugins/AccountManager/AccountManagerPlugin.php b/plugins/AccountManager/AccountManagerPlugin.php
index 3b399af8c8fdf11ac73c9ecf19e52fdca8af624c..24a95395a3d79ffbd3cabd0f4940c18c9abd0277 100644 (file)
--- a/plugins/AccountManager/AccountManagerPlugin.php
+++ b/plugins/AccountManager/AccountManagerPlugin.php
@@ -40,26 +40,13 @@ class AccountManagerPlugin extends Plugin
         parent::__construct();
     }
 
-    function onAutoload($cls)
-    {
-        switch ($cls)
-        {
-         case 'AccountManagementControlDocumentAction':
-            require_once(INSTALLDIR.'/plugins/AccountManager/AccountManagementControlDocumentAction.php');
-            return false;
-         case 'AccountManagementSessionStatusAction':
-            require_once(INSTALLDIR.'/plugins/AccountManager/AccountManagementSessionStatusAction.php');
-            return false;
-        }
-    }
-
     /**
      * Hook for RouterInitialized event.
      *
-     * @param Net_URL_Mapper $m path-to-action mapper
+     * @param URLMapper $m path-to-action mapper
      * @return boolean hook return
      */
-    function onRouterInitialized($m)
+    public function onRouterInitialized(URLMapper $m)
     {
         // Discovery actions
         $m->connect('main/amcd.json',
@@ -70,11 +57,11 @@ class AccountManagerPlugin extends Plugin
     }
 
     function onStartHostMetaLinks(&$links) {
-        $links[] = array('rel' => AccountManagerPlugin::AM_REL,
-                              'href' =>  common_local_url('AccountManagementControlDocument'));
+        $links[] = new XML_XRD_Element_Link(AccountManagerPlugin::AM_REL,
+                        common_local_url('AccountManagementControlDocument'));
     }
 
-    function onStartShowHTML($action)
+    function onStartShowHTML(Action $action)
     {
         //Account management discovery link
         header('Link: <'.common_local_url('AccountManagementControlDocument').'>; rel="'. AccountManagerPlugin::AM_REL.'"; type="application/json"');
@@ -100,10 +87,10 @@ class AccountManagerPlugin extends Plugin
         }
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'AccountManager',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:AccountManager',
                             'rawdescription' =>