Changeset 4578 for trunk/core/viewhelper/smarty/function.load_module.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/viewhelper/smarty/function.load_module.php (modified) (6 diffs)

trunk/core/viewhelper/smarty/function.load_module.php

@@ -37 +37 @@
     /*if($params['name'] == 'news')
     {
-        clansuite_xdebug::firebug($params);
+        Clansuite_Debug::firebug($params);
     }*/
 
     # Init incomming Variables
-    $module    = isset( $params['name'] ) ? (string) mb_strtolower($params['name']) : '';
-    $submodule    = isset( $params['sub'] ) ? (string) mb_strtolower($params['sub'])  : '';
-    $action = isset( $params['action'] ) ? (string) $params['action'] : '';
-    $items  = isset( $params['items'] )  ? (int) $params['items']  : null;
+    $module = isset($params['name']) ? (string) mb_strtolower($params['name']) : '';
+    $submodule = isset($params['sub']) ? (string) mb_strtolower($params['sub']) : '';
+    $action = isset($params['action']) ? (string) $params['action'] : '';
+    $items = isset($params['items']) ? (int) $params['items'] : null;
 
     # WATCH it, this resets the incomming parameters array
@@ -51 +51 @@
     $module_classname = 'clansuite_module_';
     # Construct the variable module_name
-    if (isset($submodule) and mb_strlen($submodule) > 0)
+    if(isset($submodule) and mb_strlen($submodule) > 0)
     {
         # like "clansuite_module_admin_menu"
-        $module_classname .= $module . '_'. $submodule;
+        $module_classname .= $module . '_' . $submodule;
     }
     else
@@ -65 +65 @@
 
     # Load class, if not already loaded
-    if (class_exists($module_classname, false) == false)
+    if(class_exists($module_classname, false) == false)
     {
         # Check if class was loaded
-        if( Clansuite_Loader::loadModul($module_classname) == false)
+        if(Clansuite_Loader::loadModul($module_classname) == false)
         {
-            return '<br/>Module missing or misspelled: <strong>'. $module_classname.'</strong>';
+            return '<br/>Module missing or misspelled: <strong>' . $module_classname . '</strong>';
         }
     }
 
     # Instantiate Class
-    $controller = new $module_classname;
+    $controller = new $module_classname(
+                Clansuite_CMS::getInjector()->instantiate('Clansuite_HttpRequest'),
+                Clansuite_CMS::getInjector()->instantiate('Clansuite_HttpResponse')
+    );
     $controller->setView($smarty);
     $controller->initModel($module);
@@ -82 +85 @@
      * Get the Ouptut of the Object->Method Call
      */
-    if( method_exists( $controller, $action ) )
+    if(method_exists($controller, $action))
     {
         # exceptional handling of parameters and output for adminmenu
-        if ( $module_classname == 'clansuite_module_menu_admin' )
+        if($module_classname == 'clansuite_module_menu_admin')
         {
             $parameters = array();
 
             # Build a Parameter Array from Parameter String like: param|param|etc
-            if( empty($params['params']) )
+            if(empty($params['params']))
             {
                 $parameters = null;
@@ -102 +105 @@
         }
 
-        # fast call
+        # call
         $controller->$action($items);
-
-        #Clansuite_Loader::callClassMethod($controller, $action, $items);
 
         /**
@@ -116 +117 @@
          * wich is defined by $smarty->template_dir.
          * the order of detection is also determined by that array.
-         * @see $smarty->template_dir, clansuite_xdebug::printr($smarty->template_dir);
+         * @see $smarty->template_dir, Clansuite_Debug::printr($smarty->template_dir);
          */
-
-        if($smarty->templateExists($module.DS.$action.'.tpl'))
+        if($smarty->templateExists($module . DS . $action . '.tpl'))
         {
             # $smarty->template_dir[s]..\news\widget_news.tpl
-            return $smarty->fetch($module.DS.$action.'.tpl');
+            return $smarty->fetch($module . DS . $action . '.tpl');
         }
-        elseif($smarty->templateExists($module.DS.'view'.DS.$action.'.tpl'))
+        elseif($smarty->templateExists($module . DS . 'view' . DS . $action . '.tpl'))
         {
             # $smarty->template_dir[s]..\news\view\widget_news.tpl
-            return $smarty->fetch($module.DS.'view'.DS.$action.'.tpl');
+            return $smarty->fetch($module . DS . 'view' . DS . $action . '.tpl');
         }
         else
         {
-            return $smarty->trigger_error('Error! Failed to load Widget-Template for <br /> '.$module_classname.' -> '.$action.'('.$items.')');
+            return $smarty->trigger_error('Error! Failed to load Widget-Template for <br /> ' . $module_classname . ' -> ' . $action . '(' . $items . ')');
         }
     }
     else
     {
-        return $smarty->trigger_error('Error! Failed to load Widget: <br /> '.$module_classname.' -> '.$action.'('.$items.')');
+        return $smarty->trigger_error('Error! Failed to load Widget: <br /> ' . $module_classname . ' -> ' . $action . '(' . $items . ')');
     }
 }