projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Commented out debug lines added
[core.git]
/
inc
/
classes
/
main
/
controller
/
class_BaseController.php
diff --git
a/inc/classes/main/controller/class_BaseController.php
b/inc/classes/main/controller/class_BaseController.php
index 95827c5e89eeb3ce87638972f9994ff6433e8471..9e1c43e0b419c51f9a2744df22a6a50c552972ef 100644
(file)
--- 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) {
* @return void
*/
protected function initFilterChain ($filterChain) {
+ //* DEBUG: */ $this->debugOutput('CONTROLLER: ' . $filterChain . ' init: START');
$this->filterChains[$filterChain] = ObjectFactory::createObjectByConfiguredName('filter_chain_class');
$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 $filter
Group Group
of the filter
+ * @param $filter
Chain Chain
of the filter
* @param $filterInstance An instance of a filter
* @return void
* @throws InvalidFilterChainException If the filter chain is invalid
*/
* @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
// Test if the filter is there
- if (!isset($this->filterChains[$filter
Group
])) {
+ if (!isset($this->filterChains[$filter
Chain
])) {
// Throw an exception here
// Throw an exception here
- throw new InvalidFilterChainException(array($this, $filter
Group
), self::EXCEPTION_FILTER_CHAIN_INVALID);
+ throw new InvalidFilterChainException(array($this, $filter
Chain
), self::EXCEPTION_FILTER_CHAIN_INVALID);
} // END - if
// Add the filter
} // 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 $filter
Group Group
of the filter to execute
+ * @param $filter
Chain 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
*/
* @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 ($filter
Group
, Requestable $requestInstance, Responseable $responseInstance) {
+ protected function executeFilters ($filter
Chain
, Requestable $requestInstance, Responseable $responseInstance) {
// Test if the filter is there
// Test if the filter is there
- if (!isset($this->filterChains[$filter
Group
])) {
+ if (!isset($this->filterChains[$filter
Chain
])) {
// Throw an exception here
// Throw an exception here
- throw new InvalidFilterChainException(array($this, $filter
Group
), self::EXCEPTION_FILTER_CHAIN_INVALID);
+ throw new InvalidFilterChainException(array($this, $filter
Chain
), self::EXCEPTION_FILTER_CHAIN_INVALID);
} // END - if
// Run all filters
} // END - if
// Run all filters
- $this->filterChains[$filter
Group
]->processFilters($requestInstance, $responseInstance);
+ $this->filterChains[$filter
Chain
]->processFilters($requestInstance, $responseInstance);
}
/**
}
/**