From 3de838ddf26c62a1f676c7cd9dc48de44bde54f9 Mon Sep 17 00:00:00 2001 From: Till Brehm Date: Wed, 5 Mar 2014 10:26:55 +0100 Subject: [PATCH] - Improved IP address loop. --- install/dist/lib/fedora.lib.php | 2 +- install/dist/lib/gentoo.lib.php | 2 +- install/dist/lib/opensuse.lib.php | 2 +- install/lib/installer_base.lib.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php index 8311de95d..95f3fec3a 100644 --- a/install/dist/lib/fedora.lib.php +++ b/install/dist/lib/fedora.lib.php @@ -670,7 +670,7 @@ class installer_dist extends installer_base { } } - $tpl->setLoop('ip_adresses',$ip_addresses); + if(count($ip_addresses) > 0) $tpl->setLoop('ip_adresses',$ip_addresses); wf($vhost_conf_dir.'/ispconfig.conf', $tpl->grab()); unset($tpl); diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php index 0aaf682b4..d4e5bee26 100644 --- a/install/dist/lib/gentoo.lib.php +++ b/install/dist/lib/gentoo.lib.php @@ -535,7 +535,7 @@ class installer extends installer_base } } - $tpl->setLoop('ip_adresses',$ip_addresses); + if(count($ip_addresses) > 0) $tpl->setLoop('ip_adresses',$ip_addresses); wf($conf['apache']['vhost_conf_dir'].'/000-ispconfig.conf', $tpl->grab()); unset($tpl); diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php index a7dad5af5..d4cb7cf01 100644 --- a/install/dist/lib/opensuse.lib.php +++ b/install/dist/lib/opensuse.lib.php @@ -685,7 +685,7 @@ class installer_dist extends installer_base { } } - $tpl->setLoop('ip_adresses',$ip_addresses); + if(count($ip_addresses) > 0) $tpl->setLoop('ip_adresses',$ip_addresses); wf($vhost_conf_dir.'/ispconfig.conf', $tpl->grab()); unset($tpl); diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php index e3d0c1a78..507a5d034 100644 --- a/install/lib/installer_base.lib.php +++ b/install/lib/installer_base.lib.php @@ -1276,7 +1276,7 @@ class installer_base { } } - $tpl->setLoop('ip_adresses',$ip_addresses); + if(count($ip_addresses) > 0) $tpl->setLoop('ip_adresses',$ip_addresses); wf($vhost_conf_dir.'/ispconfig.conf', $tpl->grab()); unset($tpl); -- GitLab