Merge pull request #720 from PiBa-NL/haproxy_1.5.3_extra

5 files changed, 25 insertions, 8 deletions

diff --git a/config/haproxy-devel/haproxy.inc b/config/haproxy-devel/haproxy.inc
index e239ab8c..07086bd5 100644
--- a/config/haproxy-devel/haproxy.inc
+++ b/config/haproxy-devel/haproxy.inc
@@ -362,8 +362,6 @@ EOD;
 	fclose($fd);
 	exec("chmod a+rx /usr/local/etc/rc.d/haproxy.sh");
 
-
-
 	$static_output .= "HAProxy, update configuration\n";
 	update_output_window($static_output);
 	
@@ -418,7 +416,7 @@ EOD;
 	}
 	
 	/* XML update to: pkg v1.3 and 'pool' changed to 'backend_serverpool' because 'pool' was added to listtags() in xmlparse.inc */
-	if (is_array($config['installedpackages']['haproxy']['ha_backends']['item'][0]['pool'])) {
+	if (is_arrayset($config,'installedpackages','haproxy','ha_backends','item',0,'pool')) {
 		$static_output .= "HAProxy, Do XML upgrade, change to backend_serverpool from pool array\n";
 		update_output_window($static_output);
 	
@@ -431,7 +429,8 @@ EOD;
 		$writeconfigupdate = true;
 	}
 	//also move setting for existing 2.0 installations as only the new variable is used 
-	if (isset($config['installedpackages']['haproxy']['ha_backends']['item'][0]['pool'])) {
+	if (is_arrayset($config,'installedpackages','haproxy','ha_backends','item',0) &&
+		isset($config['installedpackages']['haproxy']['ha_backends']['item'][0]['pool'])) {
 		$static_output .= "HAProxy, Do XML upgrade, change to backend_serverpool from pool\n";
 		update_output_window($static_output);
 		foreach($config['installedpackages']['haproxy']['ha_backends']['item'] as &$frontend)
@@ -443,7 +442,7 @@ EOD;
 		$writeconfigupdate = true;
 	}
 	// update config to "haproxy-devel 1.5-dev19 pkg v0.5"
-	if(is_array($config['installedpackages']['haproxy']['ha_backends']['item'])) {
+	if(is_arrayset($config,'installedpackages','haproxy','ha_backends','item')) {
 		$static_output .= "HAProxy, Do XML upgrade, update frontend options\n";
 		update_output_window($static_output);
 		foreach ($config['installedpackages']['haproxy']['ha_backends']['item'] as &$bind) {
diff --git a/config/haproxy-devel/haproxy_utils.inc b/config/haproxy-devel/haproxy_utils.inc
index 8fb89eab..08906bb0 100644
--- a/config/haproxy-devel/haproxy_utils.inc
+++ b/config/haproxy-devel/haproxy_utils.inc
@@ -44,6 +44,24 @@ if(!function_exists('ifset')){
 	};
 }
 
+if(!function_exists('is_arrayset')){
+	function is_arrayset(&$array, $items){
+		if (!isset($array))
+			return false;
+		$item = $array;
+		$arg = func_get_args();
+		for($i = 1; $i < count($arg); $i++) {
+
+			$itemindex = $arg[$i];
+			if (!isset($item[$itemindex]) || !is_array($item[$itemindex]))
+				return false;
+			$item = $item[$itemindex];
+
+		}
+		return true;
+	}
+}
+
 function haproxy_compareByName($a, $b) {
 	return strcasecmp($a['name'], $b['name']);
 }
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 2b064795..262000ed 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -129,7 +129,7 @@
 				Supports acl's for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.5.3 pkg v 0.11</version>
+		<version>1.5.3 pkg v 0.12</version>
 		<status>Release</status>
 		<required_version>2.2</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index a8eb0de3..202da303 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -166,7 +166,7 @@
 				Supports acl's for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.5.3 pkg v 0.11</version>
+		<version>1.5.3 pkg v 0.12</version>
 		<status>Release</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index e2b68a08..276f40e7 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -153,7 +153,7 @@
 				Supports acl's for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
 		<category>Services</category>
-		<version>1.5.3 pkg v 0.11</version>
+		<version>1.5.3 pkg v 0.12</version>
 		<status>Release</status>
 		<required_version>2.1</required_version>
 		<config_file>https://packages.pfsense.org/packages/config/haproxy-devel/haproxy.xml</config_file>