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

Timestamp:

03/14/06 03:21:43 (6 years ago)

Author:

john

Message:

added render functionality to AR

Files:

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

trunk/trax/vendor/trax/action_controller.php

@@ -203 +203 @@
      */
     private $action_render_performed = false;
+
+    /**
+     *  @todo Document this attribute
+     */
+    private $action_called = false;
 
     /**
@@ -532 +537 @@
         # If controller is loaded then start processing           
         if($this->loaded) {
+            
             include_once($this->controller_file);
             if(class_exists($this->controller_class, false)) {
+                
                 $class = $this->controller_class;
                 $this->controller_object = new $class();
+                
                 if(is_object($this->controller_object)) {
+                    
                     $this->controller_object->controller = $this->controller;
                     $this->controller_object->action = $this->action;
@@ -552 +561 @@
                     // error_log('$GLOBALS[\'current_controller_path\']='
                     //           .$GLOBALS['current_controller_path']);
-                }
-
-                # Which layout should we use?
-                $layout_file = $this->determine_layout();
-                //error_log('layout_file="'.$layout_file.'"');
-                
-                # Check if there is any defined scaffolding to load
-                if(isset($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);
-                        $GLOBALS['current_controller_object'] =& $this->controller_object;
-                        $render_options['scaffold'] = true;
-                        if(!file_exists($layout_file)) {
-                            # the generic scaffold layout
-                            $layout_file = TRAX_LIB_ROOT . "/templates/scaffolds/layout.phtml";
+
+                    # Which layout should we use?
+                    $layout_file = $this->controller_object->determine_layout();
+                    //error_log('layout_file="'.$layout_file.'"');
+                    
+                    # Check if there is any defined scaffolding to load
+                    if(isset($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);
+                            $GLOBALS['current_controller_object'] =& $this->controller_object;
+                            $render_options['scaffold'] = true;
+                            if(!file_exists($layout_file)) {
+                                # the generic scaffold layout
+                                $layout_file = TRAX_LIB_ROOT . "/templates/scaffolds/layout.phtml";
+                            }
                         }
                     }
@@ -626 +635 @@
                     }
                     $this->controller_object->execute_after_filters();
-                
+                    
+                    $this->controller_object->action_called = true;
+                    
                     # Find out if there was a redirect to some other page
                     if(isset($this->controller_object->redirect_to)
@@ -828 +839 @@
      */
     function render($options = array(), $locals = array(), $return_as_string = false) {
+        
+        if($this->render_performed && !$this->action_called) {
+            return true;    
+        }
+        
         if($return_as_string) {
             # start to buffer output
@@ -855 +871 @@
         } 
         
+        $this->render_performed = true;
+
         if($return_as_string) {
             $result = ob_get_contents();
@@ -883 +901 @@
     function render_text($text, $options = array()) {       
         if($options['layout']) {
-            $locals['content_for_layout'] = $text;
-            $layout = $this->determine_layout(false);
-            $this->render($layout, $locals);    
+            $locals['content_for_layout'] = $text;         
+            $layout = $this->determine_layout();
+            $this->render_file($layout, false, $locals);  
         } else {
             echo $text;    
@@ -911 +929 @@
      */    
     function render_action($action, $options = array()) {
-        if($this->action_render_performed) {
+        if($this->render_performed) {
             return true;    
         }
         if($options['layout']) {
-            $this->controller_object->layout = $options['layout'];    
+            $this->layout = $options['layout'];    
         } 
         if($options['scaffold']) {
@@ -923 +941 @@
         }
         #error_log(get_class($this)." - render_action() view_file: $this->view_file");
-        if($this->render_file($this->view_file)) {
-            $this->action_render_performed = true;
-            return true;   
-        } 
-        return false;
+        return $this->render_file($this->view_file);
     }
     
@@ -957 +971 @@
      */
     function render_file($path, $use_full_path = false, $locals = array()) {
+        if($this->render_performed && !$this->action_called) {
+            return true;    
+        }        
+        
         # Renders a template relative to app/views
         if($use_full_path) {
             $path = $this->views_path."/".$path.".".$this->views_file_extention;
         } 
+
         //error_log("render_file() path:$path");
         if(file_exists($path)) {
@@ -978 +997 @@
                 unset($tmp_value);
             }        
-            include($path);  
+            include($path);
+            $this->render_performed = true;  
             return true;      
         }     
@@ -1054 +1074 @@
                     $locals[$file."_counter"] = ${$file."_counter"};
                     unset($tmp_value); 
+                    $this->render_performed = false;
                     $this->render_file($file_with_path, false, $locals);   
                     if($add_spacer && (${$file."_counter"} < count($options['collection']))) { 
+                        $this->render_performed = false;
                         $this->render_file($spacer_file_with_file, false, $locals);      
                     }         
-                }    
+                } 
+                $this->render_performed = true;   
             } else {              
                 $this->render_file($file_with_path, false, $locals);        
-            }           
+            }          
         }
     }
@@ -1076 +1099 @@
     function determine_layout($full_path = true) {
         # I guess you don't want any layout
-        if($this->controller_object->layout == "null") {
+        if($this->layout == "null") {
             //error_log('controller->layout absent');
             return null;
@@ -1082 +1105 @@
         # $layout will be the layout defined in the current controller
         # or try to use the controller name for the layout
-        $layout = (isset($this->controller_object->layout)
-                   && $this->controller_object->layout != '')
-            ? $this->controller_object->layout : $this->controller;
+        $layout = (isset($this->layout)
+                   && $this->layout != '')
+            ? $this->layout : $this->controller;
         
         # Check if a method has been defined to determine the layout at runtime
-        if(method_exists($this->controller_object, $layout)) {
-            $layout = $this->controller_object->$layout();
-        }
-        
+        if(method_exists($this, $layout)) {
+            $layout = $this->$layout();
+        }
+
         # Default settings
         $layouts_base_path = TRAX_ROOT . $GLOBALS['TRAX_INCLUDES']['layouts'];
@@ -1103 +1126 @@
                 $path = substr($layout, 0, strripos($layout, "/"));
                 $layout = $layouts_base_path."/".$path."/".$file.".".$this->views_file_extention;
-            } elseif($this->controller_object->layout != '') {
+            } elseif($this->layout != '') {
                 # Is there a layout for the current controller
-                $layout = $layouts_base_path."/".$layout.".".$this->views_file_extention;                    
+                $layout = $layouts_base_path."/".$this->layout.".".$this->views_file_extention;                    
             } else {
                 # Is there a layout for the current controller