[+FEAT] Improved error printing.patch

diff --git a/app/Mage.php b/app/Mage.php
index 3dafad03a4a49d429354cbffb953c1cd04e384ac..47afd6b15daa2df1aac7a3bf257d1c6bc269a06f 100644
--- a/app/Mage.php
+++ b/app/Mage.php
@@ -895,7 +895,7 @@ final class Mage
             }
 
             print $e->getMessage() . "\n\n";
-            print $e->getTraceAsString();
+            print getExceptionTraceAsString($e);
             print '</pre>';
         } else {
 
diff --git a/app/code/local/Mage/Core/functions.php b/app/code/local/Mage/Core/functions.php
new file mode 100644
index 0000000000000000000000000000000000000000..775b2554df50e8f8d94c9042ea79529d412d097e
--- /dev/null
+++ b/app/code/local/Mage/Core/functions.php
@@ -0,0 +1,416 @@
+<?php
+/**
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_Core
+ * @copyright   Copyright (c) 2012 Magento Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+
+/**
+ * Disable magic quotes in runtime if needed
+ *
+ * @link http://us3.php.net/manual/en/security.magicquotes.disabling.php
+ */
+if (get_magic_quotes_gpc()) {
+    function mageUndoMagicQuotes($array, $topLevel=true) {
+        $newArray = array();
+        foreach($array as $key => $value) {
+            if (!$topLevel) {
+                $newKey = stripslashes($key);
+                if ($newKey!==$key) {
+                    unset($array[$key]);
+                }
+                $key = $newKey;
+            }
+            $newArray[$key] = is_array($value) ? mageUndoMagicQuotes($value, false) : stripslashes($value);
+        }
+        return $newArray;
+    }
+    $_GET = mageUndoMagicQuotes($_GET);
+    $_POST = mageUndoMagicQuotes($_POST);
+    $_COOKIE = mageUndoMagicQuotes($_COOKIE);
+    $_REQUEST = mageUndoMagicQuotes($_REQUEST);
+}
+
+/**
+ * Class autoload
+ *
+ * @todo change to spl_autoload_register
+ * @deprecated
+ * @param string $class
+ */
+function __autoload($class)
+{
+    if (defined('COMPILER_INCLUDE_PATH')) {
+        $classFile = $class.'.php';
+    } else {
+        $classFile = uc_words($class, DIRECTORY_SEPARATOR).'.php';
+    }
+
+    include($classFile);
+}
+
+/**
+ * Object destructor
+ *
+ * @param mixed $object
+ */
+function destruct($object)
+{
+    if (is_array($object)) {
+        foreach ($object as $obj) {
+            destruct($obj);
+        }
+    }
+    unset($object);
+}
+
+/**
+ * Translator function
+ *
+ * @deprecated 1.3
+ * @param string $text the text to translate
+ * @param mixed optional parameters to use in sprintf
+ */
+function __()
+{
+    return Mage::app()->getTranslator()->translate(func_get_args());
+}
+
+/**
+ * Tiny function to enhance functionality of ucwords
+ *
+ * Will capitalize first letters and convert separators if needed
+ *
+ * @param string $str
+ * @param string $destSep
+ * @param string $srcSep
+ * @return string
+ */
+function uc_words($str, $destSep='_', $srcSep='_')
+{
+    return str_replace(' ', $destSep, ucwords(str_replace($srcSep, ' ', $str)));
+}
+
+/**
+ * Simple sql format date
+ *
+ * @param string $format
+ * @return string
+ */
+function now($dayOnly=false)
+{
+    return date($dayOnly ? 'Y-m-d' : 'Y-m-d H:i:s');
+}
+
+/**
+ * Check whether sql date is empty
+ *
+ * @param string $date
+ * @return boolean
+ */
+function is_empty_date($date)
+{
+    return preg_replace('#[ 0:-]#', '', $date)==='';
+}
+
+function mageFindClassFile($class)
+{
+    if (defined('COMPILER_INCLUDE_PATH')) {
+        $classFile = $class.'.php';
+    } else {
+        $classFile = uc_words($class, DIRECTORY_SEPARATOR).'.php';
+    }
+    $found = false;
+    foreach (explode(PS, get_include_path()) as $path) {
+        $fileName = $path.DS.$classFile;
+        if (file_exists($fileName)) {
+            $found = $fileName;
+            break;
+        }
+    }
+    return $found;
+}
+
+/**
+ * Custom error handler
+ *
+ * @param integer $errno
+ * @param string $errstr
+ * @param string $errfile
+ * @param integer $errline
+ */
+function mageCoreErrorHandler($errno, $errstr, $errfile, $errline){
+    if (strpos($errstr, 'DateTimeZone::__construct')!==false) {
+        // there's no way to distinguish between caught system exceptions and warnings
+        return false;
+    }
+
+    $errno = $errno & error_reporting();
+    if ($errno == 0) {
+        return false;
+    }
+    if (!defined('E_STRICT')) {
+        define('E_STRICT', 2048);
+    }
+    if (!defined('E_RECOVERABLE_ERROR')) {
+        define('E_RECOVERABLE_ERROR', 4096);
+    }
+    if (!defined('E_DEPRECATED')) {
+        define('E_DEPRECATED', 8192);
+    }
+
+    // PEAR specific message handling
+    if (stripos($errfile.$errstr, 'pear') !== false) {
+         // ignore strict and deprecated notices
+        if (($errno == E_STRICT) || ($errno == E_DEPRECATED)) {
+            return true;
+        }
+        // ignore attempts to read system files when open_basedir is set
+        if ($errno == E_WARNING && stripos($errstr, 'open_basedir') !== false) {
+            return true;
+        }
+    }
+
+    $errorMessage = '';
+
+    switch($errno){
+        case E_ERROR:
+            $errorMessage .= "Error";
+            break;
+        case E_WARNING:
+            $errorMessage .= "Warning";
+            break;
+        case E_PARSE:
+            $errorMessage .= "Parse Error";
+            break;
+        case E_NOTICE:
+            $errorMessage .= "Notice";
+            break;
+        case E_CORE_ERROR:
+            $errorMessage .= "Core Error";
+            break;
+        case E_CORE_WARNING:
+            $errorMessage .= "Core Warning";
+            break;
+        case E_COMPILE_ERROR:
+            $errorMessage .= "Compile Error";
+            break;
+        case E_COMPILE_WARNING:
+            $errorMessage .= "Compile Warning";
+            break;
+        case E_USER_ERROR:
+            $errorMessage .= "User Error";
+            break;
+        case E_USER_WARNING:
+            $errorMessage .= "User Warning";
+            break;
+        case E_USER_NOTICE:
+            $errorMessage .= "User Notice";
+            break;
+        case E_STRICT:
+            $errorMessage .= "Strict Notice";
+            break;
+        case E_RECOVERABLE_ERROR:
+            $errorMessage .= "Recoverable Error";
+            break;
+        case E_DEPRECATED:
+            $errorMessage .= "Deprecated functionality";
+            break;
+        default:
+            $errorMessage .= "Unknown error ($errno)";
+            break;
+    }
+
+    $errorMessage .= ": {$errstr}  in {$errfile} on line {$errline}";
+    if (Mage::getIsDeveloperMode()) {
+        throw new Exception($errorMessage);
+    } else {
+        Mage::log($errorMessage, Zend_Log::ERR);
+    }
+}
+
+function mageDebugBacktrace($return=false, $html=true, $showFirst=false)
+{
+    $d = debug_backtrace();
+    $out = '';
+    if ($html) $out .= "<pre>";
+    foreach ($d as $i=>$r) {
+        if (!$showFirst && $i==0) {
+            continue;
+        }
+        // sometimes there is undefined index 'file'
+        @$out .= "[$i] {$r['file']}:{$r['line']}\n";
+    }
+    if ($html) $out .= "</pre>";
+    if ($return) {
+        return $out;
+    } else {
+        echo $out;
+    }
+}
+
+function mageSendErrorHeader()
+{
+    return;
+    if (!isset($_SERVER['SCRIPT_NAME'])) {
+        return;
+    }
+    $action = Mage::app()->getRequest()->getBasePath()."bugreport.php";
+    echo '<form id="error_report" method="post" style="display:none" action="'.$action.'"><textarea name="error">';
+}
+
+function mageSendErrorFooter()
+{
+    return;
+    if (!isset($_SERVER['SCRIPT_NAME'])) {
+        return;
+    }
+    echo '</textarea></form><script type="text/javascript">document.getElementById("error_report").submit()</script>';
+    exit;
+}
+
+function mageDelTree($path) {
+    if (is_dir($path)) {
+        $entries = scandir($path);
+        foreach ($entries as $entry) {
+            if ($entry != '.' && $entry != '..') {
+                mageDelTree($path.DS.$entry);
+            }
+        }
+        @rmdir($path);
+    } else {
+        @unlink($path);
+    }
+}
+
+function mageParseCsv($string, $delimiter=",", $enclosure='"', $escape='\\')
+{
+    $elements = explode($delimiter, $string);
+    for ($i = 0; $i < count($elements); $i++) {
+        $nquotes = substr_count($elements[$i], $enclosure);
+        if ($nquotes %2 == 1) {
+            for ($j = $i+1; $j < count($elements); $j++) {
+                if (substr_count($elements[$j], $enclosure) > 0) {
+                    // Put the quoted string's pieces back together again
+                    array_splice($elements, $i, $j-$i+1,
+                        implode($delimiter, array_slice($elements, $i, $j-$i+1)));
+                    break;
+                }
+            }
+        }
+        if ($nquotes > 0) {
+            // Remove first and last quotes, then merge pairs of quotes
+            $qstr =& $elements[$i];
+            $qstr = substr_replace($qstr, '', strpos($qstr, $enclosure), 1);
+            $qstr = substr_replace($qstr, '', strrpos($qstr, $enclosure), 1);
+            $qstr = str_replace($enclosure.$enclosure, $enclosure, $qstr);
+        }
+    }
+    return $elements;
+}
+
+function is_dir_writeable($dir)
+{
+    if (is_dir($dir) && is_writable($dir)) {
+        if (stripos(PHP_OS, 'win') === 0) {
+            $dir    = ltrim($dir, DIRECTORY_SEPARATOR);
+            $file   = $dir . DIRECTORY_SEPARATOR . uniqid(mt_rand()).'.tmp';
+            $exist  = file_exists($file);
+            $fp     = @fopen($file, 'a');
+            if ($fp === false) {
+                return false;
+            }
+            fclose($fp);
+            if (!$exist) {
+                unlink($file);
+            }
+        }
+        return true;
+    }
+    return false;
+}
+
+if ( !function_exists('sys_get_temp_dir') ) {
+    // Based on http://www.phpit.net/
+    // article/creating-zip-tar-archives-dynamically-php/2/
+    function sys_get_temp_dir()
+    {
+        // Try to get from environment variable
+        if ( !empty($_ENV['TMP']) ) {
+            return realpath( $_ENV['TMP'] );
+        } else if ( !empty($_ENV['TMPDIR']) ) {
+            return realpath( $_ENV['TMPDIR'] );
+        } else if ( !empty($_ENV['TEMP']) ) {
+            return realpath( $_ENV['TEMP'] );
+        } else {
+            // Try to use system's temporary directory
+            // as random name shouldn't exist
+            $temp_file = tempnam( md5(uniqid(rand(), TRUE)), '' );
+            if ( $temp_file ) {
+                $temp_dir = realpath( dirname($temp_file) );
+                unlink( $temp_file );
+                return $temp_dir;
+            } else {
+                return FALSE;
+            }
+        }
+    }
+}
+
+
+function getExceptionTraceAsString($exception) {
+    $rtn = "";
+    $count = 0;
+    foreach ($exception->getTrace() as $frame) {
+        $args = "";
+        if (isset($frame['args'])) {
+            $args = array();
+            foreach ($frame['args'] as $arg) {
+                if (is_string($arg)) {
+                    $args[] = "'" . $arg . "'";
+                } elseif (is_array($arg)) {
+                    $args[] = "Array";
+                } elseif (is_null($arg)) {
+                    $args[] = 'NULL';
+                } elseif (is_bool($arg)) {
+                    $args[] = ($arg) ? "true" : "false";
+                } elseif (is_object($arg)) {
+                    $args[] = get_class($arg);
+                } elseif (is_resource($arg)) {
+                    $args[] = get_resource_type($arg);
+                } else {
+                    $args[] = $arg;
+                }
+            }
+            $args = join(", ", $args);
+        }
+        $rtn .= sprintf( "#%s %s(%s): %s%s(%s)\n",
+            $count,
+            isset($frame['file']) ? $frame['file'] : '',
+            isset($frame['line']) ? $frame['line'] : '',
+            isset($frame['class']) ? $frame['class'] . '->' : '',
+            isset($frame['function']) ? $frame['function'] : '',
+            $args );
+        $count++;
+    }
+    return $rtn;
+}
\ No newline at end of file