Changeset 4578 for trunk/core/modulecontroller.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/modulecontroller.core.php (modified) (11 diffs)

trunk/core/modulecontroller.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$
@@ -38 +35 @@
 {
     die('Clansuite not loaded. Direct Access forbidden.');
-}
-
-/**
- * Interface for all modules
- *
- * Force classes implementing the interface to define this (must have) methods!
- *
- * @category    Clansuite
- * @package     Core
- * @subpackage  Module
- */
-interface Clansuite_Module_Interface
-{
-    # always needed is the main initializeModule() method
-    function initializeModule(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response);
 }
 
@@ -89 +71 @@
 
     /**
+     * @var object The Http_Request Object
+     */
+    public $request = null;
+
+    /**
      * @var array The Module Configuration Array
      */
     public $moduleconfig = null;
+
+    public function __construct(Clansuite_HttpRequest $request, Clansuite_HttpResponse $response)
+    {
+        $this->request = $request;
+        $this->response = $response;
+    }
 
     /**
@@ -109 +102 @@
         if($modulename === null)
         {
-            $modulename = Clansuite_Dispatcher::getModuleName();
+            $modulename = Clansuite_HttpRequest::getRoute()->getModuleName();
         }
 
@@ -282 +275 @@
     {
         # check if the requesttype is xmlhttprequest (ajax) is incomming, then we will return data in json format
-        if(self::getHttpRequest()->isxhr() === true)
+        if(self::getHttpRequest()->isAjax() === true)
         {
             $this->setRenderEngine('json');
@@ -361 +354 @@
     private function constructTemplateName()
     {
-        $template = Clansuite_Dispatcher::getActionName() . '.tpl';
+        $template = Clansuite_TargetRoute::getActionName() . '.tpl';
         $this->setTemplate($template);
     }
@@ -419 +412 @@
         }
 
-        $response = $this->getHttpResponse();        
-
-        # Debug - Layout Template and Content Template
-        # Clansuite_Debug::firebug('Layout/Wrapper Template: ' . $view->getLayoutTemplate() . '<br />');
-        # Clansuite_Debug::firebug('Template Name: ' .$this->getTemplateName() . '<br />');
-
-        #  Set Content on the Response Object
-        $response->setContent($this->getView()->render($this->getTemplateName()));
+        # get the templatename
+        $templatename = $this->getTemplateName();
+
+        # get the view
+        $this->view = $this->getView();
+
+        # Debug display of Layout Template and Content Template
+        Clansuite_Debug::firebug('Layout/Wrapper Template: ' . $this->view->getLayoutTemplate() . '<br />');
+        Clansuite_Debug::firebug('Template Name: ' . $templatename . '<br />');
+
+        # render the content / template
+        $content = $this->view->render($templatename);
+
+        # push content to the response object
+        $this->response->setContent($content);
+
+        unset($content, $templatename);
     }
 
@@ -494 +496 @@
         $referer = self::getHttpRequest()->getReferer();
 
-        if(empty($referer) == false)
+        if(empty($referer) === false)
         {
             $this->redirect($referer);
@@ -500 +502 @@
         else
         {
-            $this->redirect( WWW_ROOT . Clansuite_Module_Controller_Resolver::getModuleName() );
+            $this->redirect( WWW_ROOT . Clansuite_HttpRequest::getRoute()->getModuleName() );
         }
     }
@@ -557 +559 @@
     public function getHttpRequest()
     {
-        return self::getInjector()->instantiate('Clansuite_HttpRequest');
+        return $this->request;
     }
 
@@ -567 +569 @@
     public function getHttpResponse()
     {
-        return self::getInjector()->instantiate('Clansuite_HttpResponse');
+        return $this->response;
     }
 }