Changeset 314 for trunk/trax/vendor

Timestamp:

07/07/09 23:13:43 (3 years ago)

Author:

john

Message:

updates

Location:

trunk/trax/vendor/trax

Files:

• action_controller.php (modified) (1 diff)
• trax.php (modified) (1 diff)

trunk/trax/vendor/trax/action_controller.php

@@ -1448 +1448 @@
         $trace = $exception->getTraceAsString();
         header("HTTP/1.0 {$error_code} {$error_heading}");
-        # check for user's layout for errors
-        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(TRAX_ENV == "development") {
-            echo "<font face=\"verdana, arial, helvetica, sans-serif\">\n";
-            echo "<h1>$error_heading</h1>\n";
-            echo "<p>$error_message</p>\n";
-            if($trace) {
-                echo "<pre style=\"background-color: #eee;padding:10px;font-size: 11px;\">";
-                echo "<code>$trace</code></pre>\n";
+        # check for user's layout for errors 
+        if(TRAX_ENV == "development" || Trax::$show_trax_errors) {
+            if(file_exists(Trax::$layouts_path."/trax_error.".Trax::$views_extension)) {
+                include(Trax::$layouts_path."/trax_error.".Trax::$views_extension);
+            } elseif(file_exists(TRAX_LIB_ROOT."/templates/error.phtml")) {
+                # use default layout for errors
+                include(TRAX_LIB_ROOT."/templates/error.phtml");
+            } else {
+                echo "<font face=\"verdana, arial, helvetica, sans-serif\">\n";
+                echo "<h1>$error_heading</h1>\n";
+                echo "<p>$error_message</p>\n";
+                if($trace) {
+                    echo "<pre style=\"background-color: #eee;padding:10px;font-size: 11px;\">";
+                    echo "<code>$trace</code></pre>\n";
+                }
+                echo "</font>\n";                
             }
-            echo "</font>\n";
         } else {
             echo "<font face=\"verdana, arial, helvetica, sans-serif\">\n";
             echo "<h2>Application Error</h2>Trax application failed to start properly";
-            echo "</font>\n";
+            echo "</font>\n";            
         }
     }

trunk/trax/vendor/trax/trax.php

@@ -67 +67 @@
         $session_lifetime = "0",
         $session_maxlifetime_minutes = "20",
-        $version = null;
+        $version = null,
+        $show_trax_errors = false;
 
     function initialize() {