openrat-cms

commit 6bd1e81a0c1609d8b3b3f660e8c68470d89607c8
parent 21c214deaf7b5f90d7f2430e6686b46297a1ed26
Author: dankert <devnull@localhost>
Date:   Thu, 24 Sep 2009 00:45:59 +0200

Umstellung, um in der init()-Methode der Action bereits auf die Action-Konfiguration zugreifen zu können.

Diffstat:
do.php
 | 
25
+++++++++++++------------

1 file changed, 13 insertions(+), 12 deletions(-)
diff --git a/do.php b/do.php
@@ -223,25 +223,27 @@ require( OR_ACTIONCLASSES_DIR.'/'.$actionClassName.'.class.php' );
 
 // Erzeugen der Action-Klasse
 $do = new $actionClassName;
-$do->init();
-$do->actionClassName = $actionClassName; 
-$do->actionName      = $action;
-
-	
 $do->actionConfig = $conf['action'][$actionClassName];
+$do->actionClassName = $actionClassName; 
+$do->actionName      = $action;
 
 if	( $subaction == '' )
 	$subaction = $do->actionConfig['default']['goto'];
+	
+$do->subActionName   = $subaction;
+
+$do->init();
+
 
 if	( !isset($do->actionConfig[$subaction]) )
 {
-	Logger::warn( "Action $action has no configured method named $subaction");
+	Logger::warn( "Action $action has no configured method named $subaction");
 	Http::serverError("Action '$action' has no accessable method '$subaction'.");
-	exit;
+	exit;
 }
-	
-$subactionConfig = $do->actionConfig[$subaction];
-//Logger::trace("controller is calling subaction '$subaction'");
+	
+$subactionConfig = $do->actionConfig[$subaction];
+//Logger::trace("controller is calling subaction '$subaction'");
 
 // Eine Subaktion ohne "guest=true" verlangt einen angemeldeten Benutzer.
 if	( !isset($subactionConfig['guest']) || !$subactionConfig['guest'] )
@@ -259,7 +261,7 @@ if	( isset($do->actionConfig['admin']) && $do->actionConfig['admin'] )
 		exit;
 	}
 
-
+
 // Aktuelle Subaction in Sitzung merken
 if	( isset($do->actionConfig[$subaction]['menu']) || isset($do->actionConfig[$subaction]['direct']) )
 {
@@ -270,7 +272,6 @@ if	( isset($do->actionConfig[$subaction]['menu']) || isset($do->actionConfig[$su
 	Session::setSubaction( $sl );
 }
 
-$do->subActionName = $subaction;
 
 // Alias-Methode aufrufen.
 if	( isset($do->actionConfig[$do->subActionName]['alias']) )