Merge branch 'master' into social-master

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

diff --git a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
index 10208cfbe7376d4263fc6df5de8ea0e2ecaa5eaa..6fc14e68e5736b820055c136025477ad24432e69 100644 (file)
--- a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
+++ b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
@@ -74,7 +74,7 @@ class DomainStatusNetworkPlugin extends Plugin
         }
 
         try {
-            $sn = Status_network::staticGet('nickname', $nickname);
+            $sn = Status_network::getKV('nickname', $nickname);
         } catch (Exception $e) {
             $this->log(LOG_ERR, $e->getMessage());
             return;
@@ -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);
@@ -134,18 +113,18 @@ class DomainStatusNetworkPlugin extends Plugin
 
     static function nicknameAvailable($nickname)
     {
-        $sn = Status_network::staticGet('nickname', $nickname);
+        $sn = Status_network::getKV('nickname', $nickname);
         if (!empty($sn)) {
             return false;
         }
-        $usn = Unavailable_status_network::staticGet('nickname', $nickname);
+        $usn = Unavailable_status_network::getKV('nickname', $nickname);
         if (!empty($usn)) {
             return false;
         }
         return true;
     }
 
-    function onRouterInitialized($m)
+    function onRouterInitialized(URLMapper $m)
     {
         if (common_config('globalapi', 'enabled')) {
             foreach (array('register', 'login', 'recover') as $method) {
@@ -203,7 +182,7 @@ class DomainStatusNetworkPlugin extends Plugin
         $snt = Status_network_tag::withTag('domain='.$domain);
 
         while ($snt->fetch()) {
-            $sn = Status_network::staticGet('site_id', $snt->site_id);
+            $sn = Status_network::getKV('site_id', $snt->site_id);
             if (!empty($sn)) {
                 return $sn;
             }
@@ -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' =>
@@ -235,7 +214,7 @@ class DomainStatusNetworkPlugin extends Plugin
 
         StatusNet::switchSite($sn->nickname);
 
-        $user = User::staticGet('email', $email);
+        $user = User::getKV('email', $email);
 
         return !empty($user);
     }
@@ -317,7 +296,7 @@ class DomainStatusNetworkPlugin extends Plugin
 
         StatusNet::switchSite($sn->nickname);
 
-        $user = User::staticGet('email', $email);
+        $user = User::getKV('email', $email);
         
         if (empty($user)) {
             throw new ClientException(_('No such user.'));