Merge branch 'master' into testing

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

diff --git a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
index a923ac4c30fd352ad64583f1ec6052f321c73f64..10208cfbe7376d4263fc6df5de8ea0e2ecaa5eaa 100644 (file)
--- a/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
+++ b/plugins/DomainStatusNetwork/DomainStatusNetworkPlugin.php
@@ -103,9 +103,8 @@ class DomainStatusNetworkPlugin extends Plugin
             include_once $dir . '/actions/' . strtolower(mb_substr($cls, 0, -6)) . '.php';
             return false;
         case 'DomainStatusNetworkInstaller':
-            include_once $dir . '/lib/' . strtolower($cls) . '.php';
-            return false;
         case 'GlobalApiAction':
+        case 'FreeEmail':
             include_once $dir . '/lib/' . strtolower($cls) . '.php';
             return false;
         default:
@@ -241,10 +240,14 @@ class DomainStatusNetworkPlugin extends Plugin
         return !empty($user);
     }
 
-    static function registerEmail($email, $sendWelcome, $template)
+    static function registerEmail($email)
     {
         $domain = self::toDomain($email);
 
+        if (FreeEmail::isFree($domain)) {
+            throw new ClientException(_("Use your work email."));
+        }
+
         $sn = self::siteForDomain($domain);
 
         if (empty($sn)) {