bugfix

fixes wrong iteration in config reader
bareos · Mar 10, 2015 · 3c6b1bc · 3c6b1bc
1 parent 1e768e3
commit 3c6b1bc
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/config/autoload/global.php b/config/autoload/global.php
@@ -54,12 +54,7 @@ function read_db_config($config, $file)
 
 	foreach($config as $instance) {
 
-		if(array_key_exists('enabled', $instance) && isset($instance['enabled']) && strtolower($instance['enabled']) == "no") {
-
-			next($config);
-
-                }
-		else {
+		if(array_key_exists('enabled', $instance) && isset($instance['enabled']) && strtolower($instance['enabled']) == "yes") {
 
 			if(array_key_exists('dbaddress', $instance) && isset($instance['dbaddress'])) {
 				$arr['adapters'][key($config)] = array();
@@ -132,7 +127,9 @@ function read_db_config($config, $file)
                         }
 
 		}
+
 		next($config);
+
 	}
 
 	return $arr;
@@ -146,12 +143,7 @@ function read_dir_config($config, $file)
 
 	foreach($config as $instance) {
 
-                if(array_key_exists('enabled', $instance) && isset($instance['enabled']) && strtolower($instance['enabled']) == "no") {
-
-                        next($config);
-
-                }
-                else {
+                if(array_key_exists('enabled', $instance) && isset($instance['enabled']) && strtolower($instance['enabled']) == "yes") {
 
 			if(array_key_exists('diraddress', $instance) && isset($instance['diraddress'])) {
 				$arr[key($config)] = array();
@@ -232,7 +224,9 @@ function read_dir_config($config, $file)
                         }
 
 		}
+
 		next($config);
+
 	}
 
 	return $arr;