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

Timestamp:

12/05/05 00:20:32 (6 years ago)

Author:

john

Message:

fixed flash stuff

Files:

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

trunk/trax/vendor/trax/action_controller.php

@@ -1 +1 @@
 <?
-# $Id: action_controller.php 55 2005-11-11 22:38:37Z john $
+# $Id$
 #
 # Copyright (c) 2005 John Peterson
@@ -91 +91 @@
             $browser_url = str_replace(TRAX_URL_PREFIX,"",$browser_url);
         }
-        
+
         # strip leading slash
         $browser_url = substr($browser_url,1);
@@ -181 +181 @@
                 $class = $this->controller_class;
                 $this->controller_object = new $class();
-   
+
                 $layout = $this->controller_object->layout;
                 # Call class method to set the layout dynamically at runtime
-                if(method_exists($this->controller_object, $layout)) {                    
-                    $layout = $this->controller_object->$layout();        
-                }
-                                        
+                if(method_exists($this->controller_object, $layout)) {
+                    $layout = $this->controller_object->$layout();
+                }
+
                 # Check if there is any defined scaffolding to load
-                if($this->controller_object->scaffold) {                      
-                    $scaffold = $this->controller_object->scaffold;                           
-                    if(file_exists(TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['lib']."/scaffold_controller.php")) {
-                        include_once(TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['lib']."/scaffold_controller.php");
-                        $this->controller_object = new ScaffoldController($scaffold, $this->controller, $this->action);                         
+                if($this->controller_object->scaffold) {
+                    $scaffold = $this->controller_object->scaffold;
+                    if(file_exists(TRAX_LIB_ROOT."/scaffold_controller.php")) {
+                        include_once(TRAX_LIB_ROOT."/scaffold_controller.php");
+                        $this->controller_object = new ScaffoldController($scaffold, $this->controller, $this->action);
                         if($this->action) {
-                            $this->view_file = TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['lib'] . "/templates/scaffolds/".$this->action.".phtml";    
+                            $this->view_file = TRAX_LIB_ROOT . "/templates/scaffolds/".$this->action.".phtml";
                         } else {
-                            $this->view_file = TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['lib'] . "/templates/scaffolds/index.phtml";            
+                            $this->view_file = TRAX_LIB_ROOT . "/templates/scaffolds/index.phtml";
                         }
                         if($layout == "") {
                             # the generic scaffold layout
-                            $this->layout_file = TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['lib'] . "/templates/scaffolds/layout.phtml";
-                        }                                        
+                            $this->layout_file = TRAX_LIB_ROOT . "/templates/scaffolds/layout.phtml";
+                        }
                     }
                 }
-                
             }
 
@@ -257 +256 @@
                         } else {
                             $this->view_file = $this->views_path . "/" . "index" . "." . $this->views_file_extention;
-                        }                    
+                        }
                     }
-                                        
+
                     if(file_exists($this->view_file)) {
                         # grab view html
@@ -265 +264 @@
                     } else {
                         $this->raise("No view file found $action ($this->view_file).", "Unknown view", "404");
-                    }     
-                    
+                    }
+
                     # Grab all the html from the view to put into the layout
                     $content_for_layout .= ob_get_contents();
                     ob_end_clean();
 
-                    if(!$this->layout_file) {                       
+                    if(!$this->layout_file) {
                         $this->layout_file = $this->layouts_path . "/" . $layout . "." . $this->views_file_extention;
-                    }    
-                    
+                    }
+
                     if(file_exists($this->layout_file)) {
                         # render user defined layout
@@ -286 +285 @@
                         # No layout template so just echo out whatever is in $content_for_layout
                         echo $content_for_layout;
-                    }                                   
+                    }
                 }
             } else {
@@ -296 +295 @@
 
         if(!$this->keep_flash) {
-            # Nuke the flash array
-            Session::
-            unset($_SESSION['flash']);
+            # Nuke the flash
+            Session::unset_var('flash');
         }
 
@@ -307 +305 @@
         if(is_array($this->url_path)) {
             foreach($this->url_path as $path) {
-                if(file_exists($this->controllers_path . "/$path")) {
+                if(file_exists($this->controllers_path . "/$path")) {
                     $this->controllers_path .= "/$path";
                     $this->helpers_path .= "/$path";
@@ -332 +330 @@
                 $filter_function = $this->controller_object->before_filter;
                 $this->controller_object->$filter_function();
-            }                
+            }
         }
     }
@@ -339 +337 @@
         if (is_array($filter_function_name)) {
             if(count($this->before_filter) > 0) {
-                $this->before_filter = array_merge($this->before_filter, $filter_function_name);        
+                $this->before_filter = array_merge($this->before_filter, $filter_function_name);
             } else {
                 $this->before_filter = $filter_function_name;
@@ -346 +344 @@
             $this->before_filter = array($this->before_filter, $filter_function_name);
         } else {
-            $this->before_filter = $filter_function_name;      
+            $this->before_filter = $filter_function_name;
         }
     }
@@ -361 +359 @@
                 $filter_function = $this->controller_object->after_filter;
                 $this->controller_object->$filter_function();
-            }                
+            }
         }
     }
@@ -368 +366 @@
         if (is_array($filter_function_name)) {
             if(count($this->after_filter) > 0) {
-                $this->after_filter = array_merge($this->after_filter, $filter_function_name);        
+                $this->after_filter = array_merge($this->after_filter, $filter_function_name);
             } else {
                 $this->after_filter = $filter_function_name;
-            }            
+            }
         } elseif($this->after_filter != "") {
             $this->after_filter = array($this->after_filter, $filter_function_name);
         } else {
-            $this->after_filter = $filter_function_name;      
+            $this->after_filter = $filter_function_name;
         }
     }
@@ -405 +403 @@
     }
 
-    function raise($error_message, $error_heading, $error_code = "404") {       
-        throw new ActionControllerError("Error Message: ".$error_message, $error_heading, $error_code);        
+    function raise($error_message, $error_heading, $error_code = "404") {
+        throw new ActionControllerError("Error Message: ".$error_message, $error_heading, $error_code);
     }
 
@@ -414 +412 @@
         $error_message = $exception->error_message;
         $trace = $exception->getTraceAsString();
-        header("HTTP/1.0 {$error_code} {$error_heading}");        
+        header("HTTP/1.0 {$error_code} {$error_heading}");
         # check for user's layout for errors
         if(DEBUG && file_exists(TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['layouts']."/error.phtml")) {