Use File->getID()

[quix0rs-gnu-social.git] / plugins / EmailRegistration / EmailRegistrationPlugin.php

diff --git a/plugins/EmailRegistration/EmailRegistrationPlugin.php b/plugins/EmailRegistration/EmailRegistrationPlugin.php
index 2f1116ba0cdaad4a4e8b89a6edc9e4a9de12d6cf..378cb6acd1b8a3a7769aa192b0f81a3b042273ca 100644 (file)
--- a/plugins/EmailRegistration/EmailRegistrationPlugin.php
+++ b/plugins/EmailRegistration/EmailRegistrationPlugin.php
@@ -49,24 +49,6 @@ class EmailRegistrationPlugin extends Plugin
 {
     const CONFIRMTYPE = 'register';
 
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-
-        switch ($cls)
-        {
-        case 'EmailregisterAction':
-            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            return false;
-        case 'EmailRegistrationForm':
-        case 'ConfirmRegistrationForm':
-            include_once $dir . '/' . strtolower($cls) . '.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
     function onArgsInitialize(&$args)
     {
         if (array_key_exists('action', $args) && $args['action'] == 'register') {
@@ -124,9 +106,9 @@ class EmailRegistrationPlugin extends Plugin
             throw new ClientException(_m('Not a valid email address.'));
         }
 
-        $confirm = Confirm_address::getAddress($email, self::CONFIRMTYPE);
-
-        if (empty($confirm)) {
+        try {
+            $confirm = Confirm_address::getByAddress($email, self::CONFIRMTYPE);
+        } catch (NoResultException $e) {
             $confirm = Confirm_address::saveNew(null, $email, 'register');
         }
 
@@ -190,12 +172,12 @@ class EmailRegistrationPlugin extends Plugin
         return true;
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'EmailRegistration',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Evan Prodromou',
-                            'homepage' => 'http://status.net/wiki/Plugin:EmailRegistration',
+                            'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/EmailRegistration',
                             'rawdescription' =>
                             // TRANS: Plugin description.
                             _m('Use email only for registration.'));