- Improved IP address loop.

Till Brehm · Till Brehm · commit 3de838ddf26c · 2014-03-05T10:26:55.000+01:00
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
@@ -670,7 +670,7 @@ public function configure_apache()
 			}
 		}
 		
-		$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
@@ -535,7 +535,7 @@ public function configure_apache()
 			}
 		}
 		
-		$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
@@ -685,7 +685,7 @@ public function configure_apache()
 			}
 		}
 		
-		$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
@@ -1276,7 +1276,7 @@ public function configure_apache() {
 			}
 		}
 		
-		$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);

Original file line number	Diff line number	Diff line change
`@@ -670,7 +670,7 @@ public function configure_apache()`
`670`	`670`	`}`
`671`	`671`	`}`
`672`	`672`
`673`		`- $tpl->setLoop('ip_adresses',$ip_addresses);`
	`673`	`+ if(count($ip_addresses) > 0) $tpl->setLoop('ip_adresses',$ip_addresses);`
`674`	`674`
`675`	`675`	`wf($vhost_conf_dir.'/ispconfig.conf', $tpl->grab());`
`676`	`676`	`unset($tpl);`
Original file line number	Diff line number	Diff line change
`@@ -535,7 +535,7 @@ public function configure_apache()`
`535`	`535`	`}`
`536`	`536`	`}`
`537`	`537`
`538`		`- $tpl->setLoop('ip_adresses',$ip_addresses);`
	`538`	`+ if(count($ip_addresses) > 0) $tpl->setLoop('ip_adresses',$ip_addresses);`
`539`	`539`
`540`	`540`	`wf($conf['apache']['vhost_conf_dir'].'/000-ispconfig.conf', $tpl->grab());`
`541`	`541`	`unset($tpl);`
Original file line number	Diff line number	Diff line change
`@@ -685,7 +685,7 @@ public function configure_apache()`
`685`	`685`	`}`
`686`	`686`	`}`
`687`	`687`
`688`		`- $tpl->setLoop('ip_adresses',$ip_addresses);`
	`688`	`+ if(count($ip_addresses) > 0) $tpl->setLoop('ip_adresses',$ip_addresses);`
`689`	`689`
`690`	`690`	`wf($vhost_conf_dir.'/ispconfig.conf', $tpl->grab());`
`691`	`691`	`unset($tpl);`
Original file line number	Diff line number	Diff line change
`@@ -1276,7 +1276,7 @@ public function configure_apache() {`
`1276`	`1276`	`}`
`1277`	`1277`	`}`
`1278`	`1278`
`1279`		`- $tpl->setLoop('ip_adresses',$ip_addresses);`
	`1279`	`+ if(count($ip_addresses) > 0) $tpl->setLoop('ip_adresses',$ip_addresses);`
`1280`	`1280`
`1281`	`1281`	`wf($vhost_conf_dir.'/ispconfig.conf', $tpl->grab());`
`1282`	`1282`	`unset($tpl);`