X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FDomainStatusNetwork%2FDomainStatusNetworkPlugin.php;h=24ca6c90b0c319e8c0c9b5fbc2a23aa4e2acb596;hb=2c5cba28b6a8e13a58fe7584835340aa9779b146;hp=10208cfbe7376d4263fc6df5de8ea0e2ecaa5eaa;hpb=83a8cac9611872dcb40aa0fa00df3af9e4e4f3ea;p=quix0rs-gnu-social.git diff --git a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php index 10208cfbe7..24ca6c90b0 100644 --- 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"); @@ -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,11 +113,11 @@ 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; } @@ -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,12 +190,12 @@ 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', + 'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/DomainStatusNetwork', 'rawdescription' => // TRANS: Plugin description. _m('A plugin that maps a single status_network to an email domain.')); @@ -233,9 +212,9 @@ class DomainStatusNetworkPlugin extends Plugin return false; } - StatusNet::switchSite($sn->nickname); + GNUsocial::switchSite($sn->nickname); - $user = User::staticGet('email', $email); + $user = User::getKV('email', $email); return !empty($user); } @@ -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,9 +294,9 @@ class DomainStatusNetworkPlugin extends Plugin throw new NoSuchUserException(array('email' => $email)); } - StatusNet::switchSite($sn->nickname); + GNUsocial::switchSite($sn->nickname); - $user = User::staticGet('email', $email); + $user = User::getKV('email', $email); if (empty($user)) { throw new ClientException(_('No such user.'));