Changeset 201 for trunk/trax/vendor/trax/trax_generator.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/trax_generator.php (modified) (12 diffs)

trunk/trax/vendor/trax/trax_generator.php

@@ -136 +136 @@
 
     /**
-     *  Value of the view files extension (usually '.phtml')
-     *  @var string
-     */
-    public $view_file_extention = TRAX_VIEWS_EXTENTION;
-
-    /**
      *  Constructor for the TraxGenerator object
      *
@@ -147 +141 @@
      *  subdirectories of the Trax work area and the template files
      *  used to generate application files
-     *  @uses $GLOBALS['TRAX_INCLUDES']
-     *  @global string[] $GLOBALS['TRAX_INCLUDES'] Array of paths to
-     *                                             various Trax directories
+     *
      *  @uses controller_path
      *  @uses controller_template_file
@@ -162 +154 @@
      */
     function __construct() {
-        $this->view_path =
-               TRAX_ROOT . $GLOBALS['TRAX_INCLUDES']['views'];
-        $this->controller_path =
-               TRAX_ROOT . $GLOBALS['TRAX_INCLUDES']['controllers'];
-        $this->helper_path =
-               TRAX_ROOT . $GLOBALS['TRAX_INCLUDES']['helpers'];
-        $this->model_path =
-               TRAX_ROOT . $GLOBALS['TRAX_INCLUDES']['models'];
-        $this->layouts_path =
-               TRAX_ROOT . $GLOBALS['TRAX_INCLUDES']['layouts'];
+        $this->view_path = Trax::$views_path;
+        $this->controller_path = Trax::$controllers_path;
+        $this->helper_path = Trax::$helpers_path;
+        $this->model_path = Trax::$models_path;
+        $this->layouts_path = Trax::$layouts_path;
         $this->controller_template_file =
                TRAX_LIB_ROOT . "/templates/controller.php";
@@ -573 +560 @@
             echo $e->getMessage()."\n";
             echo "for database '"
-                . $GLOBALS['TRAX_DB_SETTINGS'][TRAX_MODE]['database']
+                . Trax::$database_settings[TRAX_ENV]['database']
                 . "' on host '"
-                . $GLOBALS['TRAX_DB_SETTINGS'][TRAX_MODE]['hostspec']
+                . Trax::$database_settings[TRAX_ENV]['hostspec']
                 . "' as user '"
-                . $GLOBALS['TRAX_DB_SETTINGS'][TRAX_MODE]['username']
+                . Trax::$database_settings[TRAX_ENV]['username']
                 . "'\nDid you configure file "
-                . TRAX_ROOT . $GLOBALS['TRAX_INCLUDES']['config']
+                . Trax::$config_path
                 . "/database.ini correctly?\n";
             die();
@@ -631 +618 @@
                 
         # Generate the index.phtml view
-        $view_file = "$this->view_path/index.".$this->view_file_extention;
+        $view_file = "$this->view_path/index.".Trax::$views_extension;
         ob_start();    
         include("$this->scaffold_template_path/view_index.phtml");
@@ -647 +634 @@
                
         # Generate the add.phtml view
-        $view_file = "$this->view_path/add.".$this->view_file_extention;
+        $view_file = "$this->view_path/add.".Trax::$views_extension;
         ob_start();    
         include("$this->scaffold_template_path/view_add.phtml");
@@ -663 +650 @@
         
         # Generate the edit.phtml view
-        $view_file = "$this->view_path/edit.".$this->view_file_extention;
+        $view_file = "$this->view_path/edit.".Trax::$views_extension;
         ob_start();    
         include("$this->scaffold_template_path/view_edit.phtml");
@@ -679 +666 @@
         
         # Generate the show.phtml view
-        $view_file = "$this->view_path/show.".$this->view_file_extention;
+        $view_file = "$this->view_path/show.".Trax::$views_extension;
         ob_start();    
         include("$this->scaffold_template_path/view_show.phtml");
@@ -695 +682 @@
                
         # Generate the partial containing the form elments from the database
-        $view_file = "$this->view_path/_form.".$this->view_file_extention;
+        $view_file = "$this->view_path/_form.".Trax::$views_extension;
         ob_start();    
         require "$this->scaffold_template_path/form_scaffolding.phtml";
@@ -711 +698 @@
         
         # Generate the layout for the scaffolding
-        $layout_file = $this->layouts_path."/"
-            . $this->layout_filename."."
-            . $this->view_file_extention;
+        $layout_file = $this->layouts_path."/".$this->layout_filename.".".Trax::$views_extension;
         if(!file_exists($this->layouts_path)) {
             mkdir($this->layouts_path);        
@@ -839 +824 @@
      *  @uses controller_class        Must be set before call.
      *                                Not changed during call.
-     *  @uses view_file_extension     Must be set before call.
-     *                                Not changed during call.
      *  @uses view_path               Must be set before call.
      *                                Not changed during call.
@@ -848 +831 @@
      */
     function create_view($view, $controller) {
-        $view_file = "$this->view_path/".$view.".".$this->view_file_extention;
+        $view_file = "$this->view_path/".$view.".".Trax::$views_extension;
         if(!file_exists($view_file)) {
             if(file_exists($this->view_template_file)) {