@@ -106,18 +106,54 @@ class Application{

             }

         }*/

+        $field_pattern ='^{(?<field>[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)}$';

+

         if(is_array($controllerAction)){

             //$this->IncludeControler($ControllerAction['controller']);

+            if(isset($controllerAction['module'])){

+                if(\preg_match($field_pattern, $controllerAction['module'], $match) ){

+                    $module = $this->router->parsedParameters[$match['field']];

+                }

+                else{

+                    $module = $controllerAction['module']."\\";

+                }

+            }

+            else{

+                $module = "";

+            }

+

+            

+            if(\preg_match($field_pattern, $controllerAction['controller'], $match) ){

+                $controller = $this->router->parsedParameters[$match['field']];

+            }

+            else{

+                $controller = $controllerAction['controller'];

+            }

+            

+

             $controller_class = "\\".$this->applicationDirectory."\\"

-                .(isset($controllerAction['module'])?$controllerAction['module']."\\":"")

+                .$module

                 .$this->controllersDirecotry."\\"

-                .$controllerAction['controller'];

+                .$controller;

             $controller_object = new $controller_class;

-            $controller_action = $controllerAction['action'];

+

+            if(\preg_match($field_pattern, $controllerAction['action'], $match) ){

+                $controller_action = $this->router->parsedParameters[$match['field']];

+            }

+            else{

+                $controller_action = $controllerAction['action'];

+            }

+            

         }

         //fire the action

         if(isset($controller_object) && isset($controller_action)){

+            

+            // method not found - 404

+            if(!method_exists($controller_object,$controller_action)){

+                $this->handle404($this->request);

+            }

+

             $this->module = (isset($controllerAction['module'])?$controllerAction['module']:"");

             $this->controller = $controllerAction['controller'];

             $this->action = $controller_action;

@@ -185,6 +221,14 @@ class Application{

         $this->response->send();

     }

+    public function handle404($request){

+        echo "Resource not found!<br>".PHP_EOL;

+        echo "<pre>";

+        var_dump($request);

+        echo "</pre>";

+        throw new \Exception("Not implemented!");

+    }

+

     public function beforeAction(){

         if(!empty($this->router->routeInfo->beforeAction)){

             foreach($this->router->routeInfo->beforeAction as $event_handler){

@@ -265,8 +309,7 @@ class Application{

         }

         // routing path not found -> generate 404 response

         else{

-            echo "Routing not found!<br>".PHP_EOL;

-            throw new \Exception("Not implemented!");

+            $this->handle404($this->request);

         }

     }