From: Roland Häder Date: Mon, 3 Aug 2009 23:17:55 +0000 (+0000) Subject: Commented out debug lines added X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2a80c9474b0a0923b80cd2f18e4558f63d73e2f8;p=core.git Commented out debug lines added --- diff --git a/inc/classes/main/controller/class_BaseController.php b/inc/classes/main/controller/class_BaseController.php index 95827c5e..9e1c43e0 100644 --- a/inc/classes/main/controller/class_BaseController.php +++ b/inc/classes/main/controller/class_BaseController.php @@ -61,26 +61,31 @@ class BaseController extends BaseFrameworkSystem implements Registerable { * @return void */ protected function initFilterChain ($filterChain) { + //* DEBUG: */ $this->debugOutput('CONTROLLER: ' . $filterChain . ' init: START'); $this->filterChains[$filterChain] = ObjectFactory::createObjectByConfiguredName('filter_chain_class'); + //* DEBUG: */ $this->debugOutput('CONTROLLER: ' . $filterChain . ' init: FINISHED'); } /** - * Adds a filter to a given filter group + * Adds a filter to a given filter chain * - * @param $filterGroup Group of the filter + * @param $filterChain Chain of the filter * @param $filterInstance An instance of a filter * @return void * @throws InvalidFilterChainException If the filter chain is invalid */ - protected function addFilter ($filterGroup, Filterable $filterInstance) { + protected function addFilter ($filterChain, Filterable $filterInstance) { + //* DEBUG: */ $this->debugOutput('CONTROLLER: ' . $filterChain . ',' . $filterInstance->__toString(). ' add: START'); + // Test if the filter is there - if (!isset($this->filterChains[$filterGroup])) { + if (!isset($this->filterChains[$filterChain])) { // Throw an exception here - throw new InvalidFilterChainException(array($this, $filterGroup), self::EXCEPTION_FILTER_CHAIN_INVALID); + throw new InvalidFilterChainException(array($this, $filterChain), self::EXCEPTION_FILTER_CHAIN_INVALID); } // END - if // Add the filter - $this->filterChains[$filterGroup]->addFilter($filterInstance); + $this->filterChains[$filterChain]->addFilter($filterInstance); + //* DEBUG: */ $this->debugOutput('CONTROLLER: ' . $filterChain . ',' . $filterInstance->__toString(). ' add: FINISH'); } /** @@ -106,23 +111,23 @@ class BaseController extends BaseFrameworkSystem implements Registerable { } /** - * Executes given filter chain group + * Executes given filter chain chain * - * @param $filterGroup Group of the filter to execute + * @param $filterChain Chain of the filter to execute * @param $requestInstance An instance of a request class * @param $responseInstance An instance of a response class * @return void * @throws InvalidFilterChainException If the filter chain is invalid */ - protected function executeFilters ($filterGroup, Requestable $requestInstance, Responseable $responseInstance) { + protected function executeFilters ($filterChain, Requestable $requestInstance, Responseable $responseInstance) { // Test if the filter is there - if (!isset($this->filterChains[$filterGroup])) { + if (!isset($this->filterChains[$filterChain])) { // Throw an exception here - throw new InvalidFilterChainException(array($this, $filterGroup), self::EXCEPTION_FILTER_CHAIN_INVALID); + throw new InvalidFilterChainException(array($this, $filterChain), self::EXCEPTION_FILTER_CHAIN_INVALID); } // END - if // Run all filters - $this->filterChains[$filterGroup]->processFilters($requestInstance, $responseInstance); + $this->filterChains[$filterChain]->processFilters($requestInstance, $responseInstance); } /**