Changeset 4578 for trunk/core/frontcontroller.core.php

Timestamp:

08/15/10 18:45:12 (22 months ago)

Author:

vain

Message:

• several changes to copyright, router, bootstrap, frontcontroller and various other files

File:

• trunk/core/frontcontroller.core.php (modified) (6 diffs)

trunk/core/frontcontroller.core.php

@@ -24 +24 @@
     *
     * @license    GNU/GPL v2 or (at your option) any later version, see "/doc/LICENSE".
-    *
     * @author     Jens-André Koch <vain@clansuite.com>
     * @copyright  Jens-André Koch (2005 - onwards)
-    *
     * @link       http://www.clansuite.com
-    * @link       http://gna.org/projects/clansuite
     *
     * @version    SVN: $Id$
@@ -52 +49 @@
 {
     public function __construct(Clansuite_Request_Interface $request, Clansuite_Response_Interface $response);
-    public function processRequest(Clansuite_Router_Interface $router);
+    public function processRequest();
     public function addPreFilter(Clansuite_Filter_Interface $filter);
     public function addPostFilter(Clansuite_Filter_Interface $filter);
@@ -105 +102 @@
            $this->request            = $request;
            $this->response           = $response;
-           $this->dispatcher         = new Clansuite_Dispatcher();
+           $this->dispatcher         = new Clansuite_Dispatcher($request);
            $this->pre_filtermanager  = new Clansuite_Filtermanager();
            $this->post_filtermanager = new Clansuite_Filtermanager();
@@ -111 +108 @@
 
     /**
-     * Method to add a Prefilter
-     * Filter is processed before Controller->Action is executed
+     * Add a Prefilter
+     *
+     * This filter is processed *before* the Controller->Action is executed.
+     *
+     * @param object $filter Object implementing the Clansuite_Filter_Interface.
      */
     public function addPreFilter(Clansuite_Filter_Interface $filter)
@@ -120 +120 @@
 
     /**
-     * Method to add a Postfilter
-     * Filter is processed after Controller->Action was executed
+     * Add a Postfilter
+     *
+     * This filter is processed *after* Controller->Action was executed.
+     *
+     * @param object $filter Object implementing the Clansuite_Filter_Interface.
      */
     public function addPostFilter(Clansuite_Filter_Interface $filter)
@@ -135 +138 @@
      * Calls/executes the apropriate controller and returns a response.
      */
-    public function processRequest(Clansuite_Router_Interface $router)
+    public function processRequest()
     {
-        $route = $router->route();
         $this->pre_filtermanager->processFilters($this->request, $this->response);
+
         $event = Clansuite_EventDispatcher::instantiate();
         $event->triggerEvent('onBeforeDispatcherForward');
-        $this->dispatcher->setFoundRoute($route)->forward();
+
+        $this->dispatcher->forward();
+
         $event->triggerEvent('onAfterDispatcherForward');
+
         $this->post_filtermanager->processFilters($this->request, $this->response);
+
         $this->response->sendResponse();
     }