Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/plugins/DomainStatusNetwork/scripts/proposesite.php b/plugins/DomainStatusNetwork/scripts/proposesite.php
old mode 100644 (file)
new mode 100755 (executable)
index 345128d..28741a5
--- a/plugins/DomainStatusNetwork/scripts/proposesite.php
+++ b/plugins/DomainStatusNetwork/scripts/proposesite.php
@@ -28,66 +28,14 @@ Prints site information for the domain given
 
 END_OF_SITEFORDOMAIN_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
-require_once INSTALLDIR.'/plugins/EmailRegistration/extlib/effectiveTLDs.inc.php';
-require_once INSTALLDIR.'/plugins/EmailRegistration/extlib/regDomain.inc.php';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
-function nicknameAvailable($nickname)
-{
-    $sn = Status_network::staticGet('nickname', $nickname);
-    return !empty($sn);
-}
-
-function nicknameForDomain($domain)
-{
-    global $tldTree;
-
-    $registered = getRegisteredDomain($domain, $tldTree);
-
-    $parts = explode('.', $registered);
-
-    $base = $parts[0];
-
-    if (nicknameAvailable($base)) {
-        return $base;
-    }
-
-    $domainish = str_replace('.', '-', $registered);
-
-    if (nicknameAvailable($domainish)) {
-        return $domainish;
-    }
-
-    $i = 1;
-
-    // We don't need to keep doing this forever
-
-    while ($i < 1024) {
-        $candidate = $domainish.'-'.$i;
-        if (nicknameAvailable($candidate)) {
-            return $candidate;
-        }
-    }
-
-    return null;
-}
-
-$raw = $args[0];
-
-$parts = explode('@', $raw);
-
-if (count($parts) == 1) {
-    $domain = $parts[0];
-} else {
-    $domain = $parts[1];
-}
-
-$domain = strtolower(trim($domain));
+$domain   = DomainStatusNetworkPlugin::toDomain($args[0]);
 
-$nickname = nicknameForDomain($domain);
+$nickname = DomainStatusNetworkPlugin::nicknameForDomain($domain);
 
 if (empty($nickname)) {
-    throw ClientException("No candidate found.");
+    throw new ClientException('No candidate found.');
 } else {
     print $nickname;
     print "\n";