Skip to content

EASY Fix: Enable Wildcard Subdomains w/ Just 2 Characters #232

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeromyjclark wants to merge 2 commits into
base: master
Choose a base branch
from
Open

EASY Fix: Enable Wildcard Subdomains w/ Just 2 Characters #232

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58e0257
Enable Wildcard Subdomains With 2 Characters
jeromyjclark Jul 14, 2014
7edf4d7
Update controller.ext.php
jeromyjclark Jul 15, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions modules/sub_domains/code/controller.ext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,19 +243,25 @@ static function CheckErrorDocument($error)
return in_array($error, $errordocs);
}

static function IsValidDomainName($a)
static function IsValidDomainName($a)
{
if (stristr($a, '.')) {
$part = explode(".", $a);
foreach ($part as $check) {
if (!preg_match('/^[a-z\d][a-z\d-]{0,62}$/i', $check) || preg_match('/-$/', $check)) {
return false;
}
$currentuser = ctrl_users::GetUserDetail();

if (stristr($a, '.')) {
$part = explode(".", $a);
foreach ($part as $check) {
if (($currentuser['subdomainquota'] < 0) && (preg_match('/^[\*a-z\d][a-z\d-]{0,62}$/i', $check)) && (!preg_match('/-$/', $check))) {
return true;
}
elseif (($currentuser['subdomainquota'] > 0) && (preg_match('/^[a-z\d][a-z\d-]{0,62}$/i', $check)) && (!preg_match('/-$/', $check))) {
return true;
} else {
return false;
}
} else {
return false;
}
return true;
} else {
return false;
}
}

static function IsValidEmail($email)
Expand Down