Fixed #6893

Null configuration settings are now written as <tag></tag> instead of <tag /> for consistency

2 files changed, 14 insertions, 8 deletions

diff --git a/src/etc/inc/xmlparse.inc b/src/etc/inc/xmlparse.inc
index 837d858..84a1424 100644
--- a/src/etc/inc/xmlparse.inc
+++ b/src/etc/inc/xmlparse.inc
@@ -258,7 +258,7 @@ function dump_xml_config_sub($arr, $indent) {
 					if (is_array($cval)) {
 						if (empty($cval)) {
 							$xmlconfig .= str_repeat("\t", $indent);
-							$xmlconfig .= "<$ent/>\n";
+							$xmlconfig .= "<$ent></$ent>\n";
 						} else {
 							$xmlconfig .= str_repeat("\t", $indent);
 							$xmlconfig .= "<$ent>\n";
@@ -272,7 +272,7 @@ function dump_xml_config_sub($arr, $indent) {
 						}
 						$xmlconfig .= str_repeat("\t", $indent);
 						if ((is_bool($cval) && $cval == true) || ($cval === "")) {
-							$xmlconfig .= "<$ent/>\n";
+							$xmlconfig .= "<$ent></$ent>\n";
 						} else if ((substr($ent, 0, 5) == "descr") ||
 						    (substr($ent, 0, 6) == "detail") ||
 						    (substr($ent, 0, 12) == "login_banner") ||
@@ -289,7 +289,7 @@ function dump_xml_config_sub($arr, $indent) {
 				}
 			} else if (empty($val)) {
 				$xmlconfig .= str_repeat("\t", $indent);
-				$xmlconfig .= "<$ent/>\n";
+				$xmlconfig .= "<$ent></$ent>\n";
 			} else {
 				/* it's an array */
 				$xmlconfig .= str_repeat("\t", $indent);
@@ -301,7 +301,7 @@ function dump_xml_config_sub($arr, $indent) {
 		} else {
 			if ((is_bool($val) && ($val == true)) || ($val === "")) {
 				$xmlconfig .= str_repeat("\t", $indent);
-				$xmlconfig .= "<$ent/>\n";
+				$xmlconfig .= "<$ent></$ent>\n";
 			} else if (!is_bool($val)) {
 				$xmlconfig .= str_repeat("\t", $indent);
 				if ((substr($ent, 0, 5) == "descr") ||
diff --git a/src/etc/inc/xmlreader.inc b/src/etc/inc/xmlreader.inc
index 15a8dbb..684f7bc 100644
--- a/src/etc/inc/xmlreader.inc
+++ b/src/etc/inc/xmlreader.inc
@@ -219,7 +219,8 @@ function dump_xml_config_sub(& $writer, $arr) {
 				foreach ($val as $cval) {
 					if (is_array($cval)) {
 						if (empty($cval)) {
-							$writer->writeElement($ent);
+							$writer->startElement($ent);
+							$writer->endElement();
 						} else {
 							$writer->startElement($ent);
 							dump_xml_config_sub($writer, $cval);
@@ -230,14 +231,16 @@ function dump_xml_config_sub(& $writer, $arr) {
 							continue;
 						}
 						if ((is_bool($val) && ($val == true)) || ($val === "")) {
-							$writer->writeElement($ent);
+							$writer->startElement($ent);
+							$writer->endElement();
 						} else if (!is_bool($val)) {
 							$writer->writeElement($ent, $cval);
 						}
 					}
 				}
 			} else if (empty($val)) {
-				$writer->writeElement($ent);
+				$writer->startElement($ent);
+				$writer->endElement();
 			} else {
 				/* it's an array */
 				$writer->startElement($ent);
@@ -246,7 +249,8 @@ function dump_xml_config_sub(& $writer, $arr) {
 			}
 		} else {
 			if ((is_bool($val) && ($val == true)) || ($val === "")) {
-				$writer->writeElement($ent);
+				$writer->startElement($ent);
+				$writer->endElement();
 			} else if (!is_bool($val)) {
 				$writer->writeElement($ent, $val);
 			}
@@ -263,6 +267,8 @@ function dump_xml_config($arr, $rootobj) {
 			$listtags[$tag] = $tag;
 		}
 	}
+
+
 	return dump_xml_config_raw($arr, $rootobj);
 }