openrat-cms

commit 7dc82441b11860ae12cc248c0e0a484cc2e08440
parent 84e2b1d76408656fbde4c549d56a791fe82e0443
Author: Jan Dankert <devnull@localhost>
Date:   Fri, 10 Nov 2017 22:38:30 +0100

Datenbank-Default-Id aus neuer Einstellung lesen.

Diffstat:
action/LoginAction.class.php
 | 
10
++++------

1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/action/LoginAction.class.php b/action/LoginAction.class.php
@@ -1863,12 +1863,11 @@ class LoginAction extends Action
 	 */
 	function passwordView()
 	{
-		global $conf;
-		
 		// TODO: Attribut "Password" abfragen
-		foreach( $conf['database'] as $dbname=>$dbconf )
+		foreach( config('database') as $dbname=>$dbconf )
 		{
-			if	( is_array($dbconf) && $dbconf['enabled'] )
+		    $dbconf = $dbconf + config('database-default','defaults');
+			if	( $dbconf['enabled'] )
 				$dbids[$dbname] = $dbconf['description'];
 		}
 
@@ -1880,8 +1879,7 @@ class LoginAction extends Action
 		if	( is_object($db) )
 			$this->setTemplateVar('actdbid',$db->id);
 		else
-			$this->setTemplateVar('actdbid',$conf['database']['default']);
-		
+			$this->setTemplateVar('actdbid',config('database-default','default-id'));		
 	}