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

Timestamp:

05/25/06 02:58:10 (6 years ago)

Author:

john

Message:

Major changes to environment added boot.php and Trax class to hold framwork config

Files:

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

trunk/trax/vendor/trax/action_controller.php

@@ -282 +282 @@
 
     /**
-     *  File extension appended to view files
-     *
-     *  Set from a define in {@link environment.php}.  Usually phtml
-     *  @var string
-     */
-    public $views_file_extention = TRAX_VIEWS_EXTENTION;
-
-    /**
      *  Render controllers layout
      *
@@ -375 +367 @@
 
         // Load the routes.
-        require(TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['config']."/routes.php");
+        require(Trax::$config_path."/routes.php");
         $this->router = $router;
         if(is_object($this->router)) {
@@ -410 +402 @@
      *  @uses set_paths()
      *  @uses $url_path
-     *  @uses $views_file_extention
      *  @uses $views_path
      *  @return boolean
@@ -432 +423 @@
         //error_log('browser url='.$browser_url);
         # strip off url prefix, if any
-        if(!is_null(TRAX_URL_PREFIX)) {
-            $browser_url = str_replace(TRAX_URL_PREFIX,"",$browser_url);
+        if(!is_null(Trax::$url_prefix)) {
+            $browser_url = str_replace(Trax::$url_prefix, "", $browser_url);
         }
 
@@ -453 +444 @@
 
         if($this->router->routes_count > 0) {
-            $this->controllers_path = TRAX_ROOT . $GLOBALS['TRAX_INCLUDES']['controllers'];
-            $this->helpers_path = $this->helpers_base_path = TRAX_ROOT . $GLOBALS['TRAX_INCLUDES']['helpers'];
+            $this->controllers_path = Trax::$controllers_path;
+            $this->helpers_path = $this->helpers_base_path = Trax::$helpers_path;
             $this->application_controller_file = $this->controllers_path . "/application.php";
             $this->application_helper_file = $this->helpers_path . "/application_helper.php";
-            $this->layouts_path = TRAX_ROOT . $GLOBALS['TRAX_INCLUDES']['layouts'];
-            $this->views_path = TRAX_ROOT . $GLOBALS['TRAX_INCLUDES']['views'];
+            $this->layouts_path = Trax::$layouts_path;
+            $this->views_path = Trax::$views_path;
 
             $route = $this->router->find_route($browser_url);
@@ -560 +551 @@
      *  @uses Session::unset_var()
      *  @uses $view_file
-     *  @uses $views_file_extention
      *  @uses $views_path
      *  @return boolean true
@@ -598 +588 @@
                     $this->controller_object->views_path = $this->views_path;
                     $this->controller_object->layouts_path = $this->layouts_path;
-                    $GLOBALS['current_controller_path'] = "$this->added_path/$this->controller";
-                    $GLOBALS['current_controller_name'] = $this->controller;
-                    $GLOBALS['current_action_name'] = $this->action;
-                    $GLOBALS['current_controller_object'] =& $this->controller_object;
+                    Trax::$current_controller_path = "$this->added_path/$this->controller";
+                    Trax::$current_controller_name = $this->controller;
+                    Trax::$current_action_name = $this->action;
+                    Trax::$current_controller_object =& $this->controller_object;
                     # Which layout should we use?
                     $layout_file = $this->controller_object->determine_layout();
@@ -611 +601 @@
                             include_once(TRAX_LIB_ROOT."/scaffold_controller.php");
                             $this->controller_object = new ScaffoldController($scaffold);
-                            $GLOBALS['current_controller_object'] =& $this->controller_object;
+                            Trax::$current_controller_object =& $this->controller_object;
                             $render_options['scaffold'] = true;
                             if(!file_exists($layout_file)) {
@@ -667 +657 @@
                         //          .var_export($this->action_params,true));
                         $this->controller_object->$action($this->action_params);
-                    } elseif(file_exists($this->views_path . "/" . $this->action . "." . $this->views_file_extention)) {
+                    } elseif(file_exists($this->views_path . "/" . $this->action . "." . Trax::$views_extension)) {
                         //error_log('views file "'.$this->action.'"');
                         $action = $this->action;
@@ -722 +712 @@
                         if(!$this->controller_object->render_file($layout_file, false, $locals)) {
                             # No layout template so just echo out whatever is in $content_for_layout
-                            echo "HERE";
+                            //echo "HERE";
                             echo $content_for_layout;        
                         }
@@ -991 +981 @@
             $this->view_file = TRAX_LIB_ROOT."/templates/scaffolds/".$action.".phtml";    
         } else {    
-            $this->view_file = $this->views_path . "/" . $action . "." . $this->views_file_extention;
+            $this->view_file = $this->views_path . "/" . $action . "." . Trax::$views_extension;
         }
         //error_log(get_class($this)." - render_action() view_file: $this->view_file");
@@ -1030 +1020 @@
         # Renders a template relative to app/views
         if($use_full_path) {
-            $path = $this->views_path."/".$path.".".$this->views_file_extention;
+            $path = $this->views_path."/".$path.".".Trax::$views_extension;
         } 
 
@@ -1097 +1087 @@
             $file = substr(strrchr($path, "/"), 1);
             $path = substr($path, 0, strripos($path, "/"));
-            $file_with_path = TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['views']."/".$path."/_".$file.".".$this->views_file_extention;
+            $file_with_path = Trax::$views_path."/".$path."/_".$file.".".Trax::$views_extension;
         } else {
             $file = $path;
-            $file_with_path = $this->views_path."/_".$file.".".$this->views_file_extention;
+            $file_with_path = $this->views_path."/_".$file.".".Trax::$views_extension;
         }
         
@@ -1110 +1100 @@
                     $spacer_file = substr(strrchr($spacer_path, "/"), 1);
                     $spacer_path = substr($spacer_path, 0, strripos($spacer_path, "/"));
-                    $spacer_file_with_file = TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['views']."/".$spacer_path."/_".$spacer_file.".".$this->views_file_extention;
+                    $spacer_file_with_file = TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['views']."/".$spacer_path."/_".$spacer_file.".".Trax::$views_extension;
                 } else {
                     $spacer_file = $spacer_path;
-                    $spacer_file_with_file = $this->views_path."/_".$spacer_file.".".$this->views_file_extention;
+                    $spacer_file_with_file = $this->views_path."/_".$spacer_file.".".Trax::$views_extension;
                 }  
                 if(file_exists($spacer_file_with_file)) {
@@ -1170 +1160 @@
 
         # Default settings
-        $layouts_base_path = TRAX_ROOT . $GLOBALS['TRAX_INCLUDES']['layouts'];
-        $default_layout_file = $layouts_base_path . "/application." . $this->views_file_extention;
+        $layouts_base_path = Trax::$layouts_path;
+        $default_layout_file = $layouts_base_path . "/application." . Trax::$views_extension;
         
         if(!$full_path && $layout) {
@@ -1180 +1170 @@
                 $file = substr(strrchr($layout, "/"), 1);
                 $path = substr($layout, 0, strripos($layout, "/"));
-                $layout = $layouts_base_path."/".$path."/".$file.".".$this->views_file_extention;
+                $layout = $layouts_base_path."/".$path."/".$file.".".Trax::$views_extension;
             } else {
                 # Is there a layout for the current controller
-                $layout = $this->layouts_path."/".$layout.".".$this->views_file_extention;
+                $layout = $this->layouts_path."/".$layout.".".Trax::$views_extension;
             }
 
@@ -1261 +1251 @@
         header('status: {$error_code} {$error_heading}'); 
         # check for user's layout for errors
-        if(DEBUG && file_exists(TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['layouts']."/trax_error.".TRAX_VIEWS_EXTENTION)) {
-            include(TRAX_ROOT.$GLOBALS['TRAX_INCLUDES']['layouts']."/trax_error.".TRAX_VIEWS_EXTENTION);
-        } elseif(DEBUG && file_exists(TRAX_LIB_ROOT."/templates/error.phtml")) {
+        if(TRAX_ENV == "development" && file_exists(Trax::$layouts_path."/trax_error.".Trax::$views_extension)) {
+            include(Trax::$layouts_path."/trax_error.".Trax::$views_extension);
+        } elseif(TRAX_ENV == "development" && file_exists(TRAX_LIB_ROOT."/templates/error.phtml")) {
             # use default layout for errors
             include(TRAX_LIB_ROOT."/templates/error.phtml");
-        } elseif(DEBUG) {
+        } elseif(TRAX_ENV == "development") {
             echo "<font face=\"verdana, arial, helvetica, sans-serif\">\n";
             echo "<h1>$error_heading</h1>\n";