openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit bbbd9d96f5354682f920dbaa3e79e364580b1dd3
parent b46c63381e4592eaad5208a5aa04b859c9844bf8
Author: dankert <devnull@localhost>
Date:   Thu,  3 May 2007 00:10:10 +0200

Namen der aktuellen Subaction pro Action speichern und bei Bedarf benutzen (wenn keine Subaction ausgew?hlt)

Diffstat:
do.php | 29+++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/do.php b/do.php @@ -99,12 +99,13 @@ if ( !is_array( $conf ) ) break; } } - - $langDefaultFile = OR_LANGUAGE_DIR.$conf['i18n']['complete_from'].'.ini.'.PHP_EXT; - if ( file_exists( $langDefaultFile ) ) - { - $conf['language'] = array_merge( parse_ini_file( $langDefaultFile ),$conf['language']); - } + +// Deaktiviert, da alle Sprachdateien vollstaendig sein sollen. +// $langDefaultFile = OR_LANGUAGE_DIR.$conf['i18n']['complete_from'].'.ini.'.PHP_EXT; +// if ( file_exists( $langDefaultFile ) ) +// { +// $conf['language'] = array_merge( parse_ini_file( $langDefaultFile ),$conf['language']); +// } if ( !isset($conf['language']) ) @@ -172,8 +173,9 @@ if ( !empty( $REQ[REQ_PARAM_SUBACTION] ) ) $subaction = $REQ[REQ_PARAM_SUBACTION]; else { - if ( in_array($action,array('page','file','link','folder'))) - $subaction = Session::getSubaction(); + $sl = Session::getSubaction(); + if ( is_array($sl) && isset($sl[$action]) ) + $subaction = $sl[$action]; else $subaction = ''; } @@ -201,8 +203,15 @@ if ( !isset($do->actionConfig[$subaction]) ) Logger::trace("controller is calling subaction '$subaction'"); -if ( in_array($action,array('page','file','link','folder')) ) - Session::setSubaction( $subaction ); +if ( isset($do->actionConfig[$subaction]['menu']) ) +{ + $sl = Session::getSubaction(); +// Html::debug($sl,'SL'); + if ( !is_array($sl)) + $sl = array(); + $sl[$action] = $subaction; + Session::setSubaction( $sl ); +} $do->subActionName = $subaction;