Merge branch 'nightly' of gitorious.org:social/mainline into nightly

[quix0rs-gnu-social.git] / plugins / DomainStatusNetwork / DomainStatusNetworkPlugin.php

diff --git a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
index 3364c8ae5c2b5ecab5213038ea2db588f51389f0..2443139af6b02b0e6df1471674de529f1481bdb6 100644 (file)
--- a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
+++ b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
@@ -66,7 +66,7 @@ class DomainStatusNetworkPlugin extends Plugin
             }
         }
 
-        $nickname = StatusNet::currentSite();
+        $nickname = GNUsocial::currentSite();
 
         if (empty($nickname)) {
             $this->log(LOG_WARNING, "No current site");
@@ -91,27 +91,6 @@ class DomainStatusNetworkPlugin extends Plugin
         }
     }
 
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-
-        switch ($cls)
-        {
-        case 'GlobalregisterAction':
-        case 'GloballoginAction':
-        case 'GlobalrecoverAction':
-            include_once $dir . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            return false;
-        case 'DomainStatusNetworkInstaller':
-        case 'GlobalApiAction':
-        case 'FreeEmail':
-            include_once $dir . '/lib/' . strtolower($cls) . '.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
     static function toDomain($raw)
     {
         $parts = explode('@', $raw);
@@ -145,7 +124,7 @@ class DomainStatusNetworkPlugin extends Plugin
         return true;
     }
 
-    function onRouterInitialized($m)
+    function onRouterInitialized(URLMapper $m)
     {
         if (common_config('globalapi', 'enabled')) {
             foreach (array('register', 'login', 'recover') as $method) {
@@ -211,10 +190,10 @@ class DomainStatusNetworkPlugin extends Plugin
         return null;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'DomainStatusNetwork',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Evan Prodromou',
                             'homepage' => 'http://status.net/wiki/Plugin:DomainStatusNetwork',
                             'rawdescription' =>
@@ -233,7 +212,7 @@ class DomainStatusNetworkPlugin extends Plugin
             return false;
         }
 
-        StatusNet::switchSite($sn->nickname);
+        GNUsocial::switchSite($sn->nickname);
 
         $user = User::getKV('email', $email);
 
@@ -263,7 +242,7 @@ class DomainStatusNetworkPlugin extends Plugin
             Status_network::$wildcard = $config['WILDCARD'];
         }
 
-        StatusNet::switchSite($sn->nickname);
+        GNUsocial::switchSite($sn->nickname);
 
         $confirm = EmailRegistrationPlugin::registerEmail($email);
 
@@ -280,7 +259,7 @@ class DomainStatusNetworkPlugin extends Plugin
             throw new ClientException(_("No such site."));
         }
 
-        StatusNet::switchSite($sn->nickname);
+        GNUsocial::switchSite($sn->nickname);
 
         $user = common_check_user($email, $password);
 
@@ -315,7 +294,7 @@ class DomainStatusNetworkPlugin extends Plugin
             throw new NoSuchUserException(array('email' => $email));
         }
 
-        StatusNet::switchSite($sn->nickname);
+        GNUsocial::switchSite($sn->nickname);
 
         $user = User::getKV('email', $email);