Registry rewritten, exception added #2

[core.git] / inc / classes / exceptions / class_FrameworkException.php

diff --git a/inc/classes/exceptions/class_FrameworkException.php b/inc/classes/exceptions/class_FrameworkException.php
index 4c1c73a979feaf12101865619cd9ee5da1b07653..3b7a3c9f48a163cf979738bbe4bb518326f0fef5 100644 (file)
--- a/inc/classes/exceptions/class_FrameworkException.php
+++ b/inc/classes/exceptions/class_FrameworkException.php
@@ -6,7 +6,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -42,6 +42,9 @@ abstract class FrameworkException extends ReflectionException {
         * @return      void
         */
        public function __construct ($message, $code = 0) {
+               // Make sure everything is assigned properly
+               parent::__construct($message, $code);
+
                // Extract backtrace
                $this->saveBackTrace();
 
@@ -61,11 +64,9 @@ abstract class FrameworkException extends ReflectionException {
                        // End here
                        exit();
                } // END - if
-               // Make sure everything is assigned properly
-               parent::__construct($message, $code);
 
-               // Log it away if DEBUG_ALL is set
-               if (defined('DEBUG_ALL')) {
+               // Should we log exceptions? (bad implementation)
+               if (defined('LOG_EXCEPTIONS')) {
                        // Log the error
                        error_log(sprintf("[%s:] %s (%s)",
                                $this->__toString(),
@@ -122,10 +123,11 @@ abstract class FrameworkException extends ReflectionException {
                                foreach ($dbgInfo['args'] as $debug) {
                                        // Add only non-array elements
                                        if (!is_array($debug)) {
-                                               $info .= $debug.", ";
+                                               $info .= $debug . ', ';
                                        } // END - if
-                               } // END - if
+                               } // END - foreach
 
+                               // Remove last chars (commata, space)
                                $info = substr($info, 0, -2);
                        } // END - if
 
@@ -145,10 +147,13 @@ abstract class FrameworkException extends ReflectionException {
                        } // END - if
 
                        // The message
-                       $dbgMsg .= "\t at <em id=\"debug_id_".$dbgIndex."\">".$dbgIndex."</em> <em id=\"debug_file_".$dbgIndex."\">".$file."</em> (<em id=\"debug_line_".$dbgIndex."\">".$line."</em>) -&gt; ".$dbgInfo['function']."(".$info.")<br />\n";
+                       $dbgMsg .= "\t at <em id=\"debug_id_".$dbgIndex."\">".$dbgIndex."</em> <em id=\"debug_file_".$dbgIndex."\">".$file."</em> (<em id=\"debug_line_".$dbgIndex."\">".$line."</em>) -&gt; ".$dbgInfo['function'].'('.$info.")<br />\n";
                } // END - if
+
+               // Add end-message
                $dbgMsg .= "Debug backtrace end<br />\n";
 
+               // Return full debug message
                return $dbgMsg;
        }