...
|
...
|
@@ -12,9 +12,9 @@ class Application{
|
12
|
12
|
public $controllersDirecotry; // subdirectory/namespace part added to controller class
|
13
|
13
|
public $viewsDirecotry; // subdirectory to search for the view files
|
14
|
14
|
public $applicationDirectory; // subdirectory/namespace part of the application
|
15
|
|
- //public $Controller; //Active controller
|
16
|
|
- //public $Module; //Active module
|
17
|
|
- //public $Action; //Active action
|
|
15
|
+ public $controller; //Active controller
|
|
16
|
+ public $module; //Active module
|
|
17
|
+ public $action; //Active action
|
18
|
18
|
|
19
|
19
|
public function __construct($config){
|
20
|
20
|
//set L3 application config
|
...
|
...
|
@@ -160,8 +160,8 @@ class Application{
|
160
|
160
|
$this->handle404($this->request);
|
161
|
161
|
}
|
162
|
162
|
|
163
|
|
- $this->module = (isset($controllerAction['module'])?$controllerAction['module']:"");
|
164
|
|
- $this->controller = $controllerAction['controller'];
|
|
163
|
+ $this->module = $module;
|
|
164
|
+ $this->controller = $controller;
|
165
|
165
|
$this->action = $controller_action;
|
166
|
166
|
// prepare args and start the action
|
167
|
167
|
if(!isset($reflection)){
|
...
|
...
|
@@ -271,7 +271,7 @@ class Application{
|
271
|
271
|
if($action = $this->router->match($this->request)){
|
272
|
272
|
// routing match found decide what to do next...
|
273
|
273
|
// BeforeAction event
|
274
|
|
- $this->BeforeAction();
|
|
274
|
+ $this->beforeAction();
|
275
|
275
|
|
276
|
276
|
// function -> call it...
|
277
|
277
|
if(is_callable($action)){
|