openrat-cms

commit 032e49a54fd2d64eb1b9dbf275e39e69ac5ce62a
parent 3b1fcabe32e97041001b0b054584485ed0043adf
Author: Jan Dankert <devnull@localhost>
Date:   Thu, 21 Dec 2017 00:06:46 +0100

Fix: Laden der Default-Konfiguration und neues Trennzeichen zwischen den Ebenen.

Diffstat:
modules/cms-core/action/ConfigurationAction.class.php
 | 
39
+++++++++++++++++++++++----------------

1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/modules/cms-core/action/ConfigurationAction.class.php b/modules/cms-core/action/ConfigurationAction.class.php
@@ -48,7 +48,8 @@ class ConfigurationAction extends Action
 	 */
 	function showView()
 	{
-		require_once('./util/config-default.php');
+	    $conf = array();
+		require_once( OR_MODULES_DIR.'/util/config-default.php');
 		$conf_default = $conf;
 		
 		$conf_cms = Session::getConfig();
@@ -85,9 +86,9 @@ class ConfigurationAction extends Action
 		foreach( $extensions as $id=>$extensionName )
 			$conf_cms['system']['interpreter'][ 'extension' ][$extensionName] = 'loaded';
 		
-		$flatDefaultConfig = flattenArray('',$conf_default);
-		$flatCMSConfig     = flattenArray('',Session::getConfig());
-		$flatConfig        = flattenArray('',$conf_cms);
+		$flatDefaultConfig = $this->flattenArray('',$conf_default);
+		$flatCMSConfig     = $this->flattenArray('',Session::getConfig());
+		$flatConfig        = $this->flattenArray('',$conf_cms);
 		
 		$config = array();
 		foreach( $flatConfig as $key=>$val )
@@ -96,21 +97,27 @@ class ConfigurationAction extends Action
 		}
 		$this->setTemplateVar('config',$config );
 	}
-}
 
+    private function flattenArray( $prefix,$arr )
+    {
+        $new = array();
+        foreach( $arr as $key=>$val)
+        {
+            if	( is_array($val) )
+            {
+
+                $splitter = "\xC2\xA0"."\xC2\xBB"."\xC2\xA0"; // NBSP+RDQUO+NBSP as UTF-8
+                $new += $this->flattenArray($prefix.$key.$splitter,$val);
+            }
+            else
+                $new[$prefix.$key] = $key=='password'?'*******************':$val;
+        }
+        return $new;
+    }
 
-function flattenArray( $prefix,$arr )
-{
-	$new = array();
-	foreach( $arr as $key=>$val)
-	{
-		if	( is_array($val) )
-			$new += flattenArray($prefix.$key.'.',$val);
-		else
-			$new[$prefix.$key] = $key=='password'?'*******************':$val;
-	}
-	return $new;
 }
 
 
+
+
 ?> 
\ No newline at end of file