X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FRequireValidatedEmail%2FRequireValidatedEmailPlugin.php;h=99f61dcf02ce5e97d019f9f9cbb54640ee4e5967;hb=51b1bab98ee75ae765d5cfad8b11027ec0b03a90;hp=f3ec381e2da8acbd3d94649aa5f43c24d00eb03c;hpb=7eecd93473352e30e7c745ac6ea5c2f20de6648d;p=quix0rs-gnu-social.git

diff --git a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
index f3ec381e2d..99f61dcf02 100644
--- a/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
+++ b/plugins/RequireValidatedEmail/RequireValidatedEmailPlugin.php
@@ -45,7 +45,8 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @author    Craig Andrews <candrews@integralblue.com>
  * @author    Brion Vibber <brion@status.net>
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009 Free Software Foundation, Inc http://www.fsf.org
+ * @author    Mikael Nordfeldth <mmn@hethane.se>
+ * @copyright 2009-2013 Free Software Foundation, Inc http://www.fsf.org
  * @copyright 2009-2010 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -79,21 +80,7 @@ class RequireValidatedEmailPlugin extends Plugin
      */
     public $disallowLogin = false;
 
-    function onAutoload($cls)
-    {
-        $dir = dirname(__FILE__);
-
-        switch ($cls)
-        {
-        case 'ConfirmfirstemailAction':
-            include_once $dir . '/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
-            return false;
-        default:
-            return true;
-        }
-    }
-
-    function onRouterInitialized($m)
+    function onRouterInitialized(URLMapper $m)
     {
         $m->connect('main/confirmfirst/:code',
                     array('action' => 'confirmfirstemail'));
@@ -110,7 +97,7 @@ class RequireValidatedEmailPlugin extends Plugin
      */
     function onStartNoticeSave($notice)
     {
-        $user = User::staticGet('id', $notice->profile_id);
+        $user = User::getKV('id', $notice->profile_id);
         if (!empty($user)) { // it's a remote notice
             if (!$this->validated($user)) {
                 // TRANS: Client exception thrown when trying to post notices before validating an e-mail address.
@@ -222,11 +209,11 @@ class RequireValidatedEmailPlugin extends Plugin
      *
      * @return boolean hook value
      */
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] =
           array('name' => 'Require Validated Email',
-                'version' => STATUSNET_VERSION,
+                'version' => GNUSOCIAL_VERSION,
                 'author' => 'Craig Andrews, '.
                 'Evan Prodromou, '.
                 'Brion Vibber',
@@ -271,7 +258,7 @@ class RequireValidatedEmailPlugin extends Plugin
     {
         if ($right == Right::CREATEGROUP ||
             ($this->disallowLogin && ($right == Right::WEBLOGIN || $right == Right::API))) {
-            $user = User::staticGet('id', $profile->id);
+            $user = User::getKV('id', $profile->id);
             if ($user && !$this->validated($user)) {
                 $result = false;
                 return false;