Changeset 107 for trunk/trax/vendor/trax/action_controller.php

Timestamp:

01/02/06 22:19:42 (6 years ago)

Author:

john

Message:

more bug fixes for scaffolding and added input filtering

Files:

• trunk/trax/vendor/trax/action_controller.php (modified) (5 diffs)

trunk/trax/vendor/trax/action_controller.php

@@ -34 +34 @@
         $layouts_path,
         $url_path,
-        $layout_file,
         $default_layout_file,
         $helper_file,
@@ -192 +191 @@
 
                 # Which layout should we use?
-                $this->layout_file = $this->determine_layout();
+                $layout_file = $this->determine_layout();
 
                 # Check if there is any defined scaffolding to load
@@ -199 +198 @@
                     if(file_exists(TRAX_LIB_ROOT."/scaffold_controller.php")) {
                         include_once(TRAX_LIB_ROOT."/scaffold_controller.php");
-                        $GLOBALS['current_controller_object'] = $this->controller_object = new ScaffoldController($scaffold, $this->controller, $this->action);
+                        $GLOBALS['current_controller_object'] = $this->controller_object = new ScaffoldController($scaffold);
                         if($this->action) {
                             $this->view_file = TRAX_LIB_ROOT . "/templates/scaffolds/".$this->action.".phtml";
@@ -205 +204 @@
                             $this->view_file = TRAX_LIB_ROOT . "/templates/scaffolds/index.phtml";
                         }
-                        if(!file_exists($this->layout_file)) {
+                        if(!file_exists($layout_file)) {
                             # the generic scaffold layout
-                            $this->layout_file = TRAX_LIB_ROOT . "/templates/scaffolds/layout.phtml";
+                            $layout_file = TRAX_LIB_ROOT . "/templates/scaffolds/layout.phtml";
                         }
                     }
@@ -291 +290 @@
                     ob_end_clean();
 
-                    if(file_exists($this->layout_file) && $render_layout !== false) {
+                    if(file_exists($layout_file) && $render_layout !== false) {
                         # render the layout
-                        include($this->layout_file);
+                        include($layout_file);
                     } else {
                         # Can't find any layout so throw an exception