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

don't include specialsettings or default-vhost-content to ssl-redirects, fixes #1136

Browse Source 
Signed-off-by: Michael Kaufmann (d00p) <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann (d00p)
2013-04-04 10:29:28 +02:00
parent 3d79564fd2
commit 551c1616f5
3 changed files with 33 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -812,21 +812,18 @@ class apache
$vhost_content.= $this->getStats($domain);
}
$vhost_content.= $this->getLogfiles($domain);
}
if($domain['specialsettings'] != '')
{
$vhost_content.= $domain['specialsettings'] . "\n";
}
if ($domain['specialsettings'] != '') {
$vhost_content.= $domain['specialsettings'] . "\n";
}
if($ipandport['default_vhostconf_domain'] != '')
{
$vhost_content.= $ipandport['default_vhostconf_domain'] . "\n";
}
if ($ipandport['default_vhostconf_domain'] != '') {
$vhost_content.= $ipandport['default_vhostconf_domain'] . "\n";
}
if($this->settings['system']['default_vhostconf'] != '')
{
$vhost_content.= $this->settings['system']['default_vhostconf'] . "\n";
if ($this->settings['system']['default_vhostconf'] != '') {
$vhost_content.= $this->settings['system']['default_vhostconf'] . "\n";
}
}
$vhost_content.= '</VirtualHost>' . "\n";