maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

- add possibility to add a subdomain of another domain as "full"-domain in admin-interface, fixes #329

Browse Source
This commit is contained in:
Michael Kaufmann (d00p)
2010-08-06 05:43:28 +00:00
parent ee7177bdec
commit ed9235d341
11 changed files with 165 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/jobs/cron_tasks.inc.http.10.apache.php
View File

@@ -600,8 +600,15 @@ class apache
protected function getVhostFilename($domain, $ssl_vhost = false)
{
if((int)$domain['parentdomainid'] == 0)
{
if((int)$domain['parentdomainid'] == 0
&& ((int)$domain['ismainbutsubto'] == 0
|| domainMainToSubExists($domain['ismainbutsubto']) == false)
) {
$vhost_no = '22';
}
elseif((int)$domain['parentdomainid'] == 0
&& (int)$domain['ismainbutsubto'] > 0
) {
$vhost_no = '21';
}
else

15
scripts/jobs/cron_tasks.inc.http.20.lighttpd.php
View File

@@ -278,8 +278,19 @@ class lighttpd
$_pos = strrpos($_tmp_path, '/');
$_inc_path = substr($_tmp_path, $_pos+1);
if((int)$domain['parentdomainid'] == 0)
{
if((int)$domain['parentdomainid'] == 0
&& ((int)$domain['ismainbutsubto'] == 0
|| domainMainToSubExists($domain['ismainbutsubto']) == false)
) {
$vhost_no = '52';
if($ssl == '1')
{
$vhost_no = '62';
}
}
elseif((int)$domain['parentdomainid'] == 0
&& (int)$domain['ismainbutsubto'] > 0
) {
$vhost_no = '51';
if($ssl == '1')
{