GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Move common domain-to-network mapping to the plugin module

Browse Source
This commit is contained in:
Evan Prodromou
2011-04-27 14:48:26 -07:00
parent 20e588d212
commit b6bad0232e
3 changed files with 103 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
plugins/DomainStatusNetwork/scripts/proposesite.php
View File

@@ -29,65 +29,13 @@ 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';
function nicknameAvailable($nickname)
{
$sn = Status_network::staticGet('nickname', $nickname);
return !empty($sn);
}
$domain = DomainStatusNetworkPlugin::toDomain($args[0]);
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));
$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";

21
plugins/DomainStatusNetwork/scripts/sitefordomain.php
View File

@@ -30,23 +30,14 @@ END_OF_SITEFORDOMAIN_HELP;
require_once INSTALLDIR.'/scripts/commandline.inc';
$raw = $args[0];
$domain = DomainStatusNetworkPlugin::toDomain($args[0]);
$parts = explode('@', $raw);
$sn = DomainStatusNetworkPlugin::siteForDomain($domain);
if (count($parts) == 1) {
$domain = $parts[0];
} else {
$domain = $parts[1];
if (empty($sn)) {
exit(1);
}
$domain = strtolower(trim($domain));
print $sn->nickname."\n";
exit(0);
$snt = Status_network_tag::withTag('domain='.$domain);
while ($snt->fetch()) {
$sn = Status_network::staticGet('site_id', $snt->site_id);
if (!empty($sn)) {
print $sn->nickname."\n";
}
}