Changeset 267 for trunk/trax/vendor

Timestamp:

10/16/06 04:06:51 (6 years ago)

Author:

john

Message:

fixed the include path for lib dir in Trax::initialize()

Files:

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

trunk/trax/vendor/trax/trax.php

@@ -37 +37 @@
     public static 
         $models_path = null,
-        $views_path = null,         
-        $controllers_path = null,    
-        $helpers_path = null,       
-        $layouts_path = null,       
-        $config_path = null,        
-        $environments_path = null,  
-        $lib_path = null,           
-        $app_path = null,           
-        $log_path = null,           
+        $views_path = null,
+        $controllers_path = null,
+        $helpers_path = null,
+        $layouts_path = null,
+        $config_path = null,
+        $environments_path = null,
+        $lib_path = null,
+        $app_path = null,
+        $log_path = null,
         $vendor_path = null,
         $public_path = null,
@@ -55 +55 @@
         $current_action_name = null,
         $current_controller_object = null;
-              
-        
+
     function initialize() {
-       
+
         if(substr(PHP_OS, 0, 3) == 'WIN') {
             # Windows
             self::$path_seperator = ";";
-        }    
-        
-        # Set include paths   
+        }
+
+        # Set include paths
         self::$models_path       = TRAX_ROOT."/app/models";
         self::$views_path        = TRAX_ROOT."/app/views";
@@ -77 +76 @@
         self::$vendor_path       = TRAX_ROOT."/vendor";
         self::$public_path       = TRAX_ROOT."/public"; 
-        
+
         # Set which file to log php errors to for this application
         # As well in your application you can do error_log("whatever") and it will go to this log file.
         ini_set("log_errors", "On");
-        ini_set("error_log", self::$log_path."/".TRAX_ENV.".log"); 
-        
+        ini_set("error_log", self::$log_path."/".TRAX_ENV.".log");
+
         if(TRAX_ENV == "development") {
             # Display errors to browser if in development mode for debugging
@@ -90 +89 @@
             ini_set("display_errors", "Off");
         }
-                
+
         # Set the include_path
         ini_set("include_path",
-                ".".self::$path_seperator.   # current directory
-                TRAX_LIB_ROOT.self::$path_seperator.  # trax libs (vendor/trax or server trax libs)
-                PHP_LIB_ROOT.self::$path_seperator.  # php libs dir (ex: /usr/local/lib/php)
-                TRAX_ROOT.self::$lib_path.self::$path_seperator. # app specific libs extra libs to include
-                ini_get("include_path")); # add on old include_path to end
-        
+            ".".self::$path_seperator.              # current directory
+            TRAX_LIB_ROOT.self::$path_seperator.    # trax libs (vendor/trax or server trax libs)
+            PHP_LIB_ROOT.self::$path_seperator.     # php libs dir (ex: /usr/local/lib/php)
+            self::$lib_path.self::$path_seperator.  # app specific libs extra libs to include
+            ini_get("include_path")                 # tack on the old include_path to the end
+        ); # add on old include_path to end
+
         # Include Trax library files.
         include_once("session.php");
@@ -117 +117 @@
             ActiveRecord::$database_settings = parse_ini_file(self::$config_path."/database.ini", true);
         }
-                   
+
     }
-    
+
     function include_env_config() {
         # Include the application environment specific config file
         if(file_exists(self::$environments_path."/".TRAX_ENV.".php")) {
             include_once(self::$environments_path."/".TRAX_ENV.".php");
-        }             
+        }
     }
 }