Changeset 5995

Timestamp:

02/03/12 12:19:37 (4 months ago)

Author:

vain

Message:

• cleanups on variable names
• added two todo tags for intercepting smarty exceptions

File:

• trunk/core/exception.core.php (modified) (8 diffs)

trunk/core/exception.core.php

@@ -102 +102 @@
      * @var string HTML Representation of the Exception Template
      */
-    private static $exception_template_content = '';
+    private static $exception_template = '';
 
     /**
      * @var string HTML Representation of the Exception Development (RAD) Template
      */
-    private static $exception_development_template_content = '';
+    private static $exception_dev_template = '';
 
     /**
@@ -138 +138 @@
         }
 
+        /**
+         * @todo
+         * 1. catch Smarty "Template Syntax" Errors
+         * 2. provide link to templateeditor (file:line) to fix the error
+         */
+        #$smartyError = (false !== stristr($this->message, 'Syntax Error in template')) ? true : false;
+
+        /**
+         * @todo
+         * 1. catch Smarty "Unable to load template file" Errors
+         * 2. provide link to templatefilemanager (module:file)
+         */
+
         echo $this->yellowScreenOfDeath();
-    }
-
-    /**
-     * Method for Conditional Usage (Shortcut/Convenience Method)
-     *
-     * @example
-     * Usage: someFunction() OR throwException();
-     *
-     * @param string $message Exception Message
-     * @param int $code Exception Code
-     */
-    public function throwException($message = null, $code = null)
-    {
-        throw new Clansuite_Exception($message, $code);
     }
 
@@ -195 +194 @@
         if(is_file($exception_template_file) === true)
         {
-            self::$exception_template_content = file_get_contents($exception_template_file);
+            self::$exception_template = file_get_contents($exception_template_file);
         }
     }
@@ -222 +221 @@
         {
             $content = file_get_contents($exception_template_file);
-            self::$exception_development_template_content = $content;
+            self::$exception_dev_template = $content;
             define('RAPIDDEVTPL', true);
         }
@@ -228 +227 @@
         else
         {
-           # propose to create a new rapid development template
-           # link to templateditor
+           # @todo propose to create a new rapid development template via tpleditor
         }
         */
@@ -241 +239 @@
     private static function getExceptionDevelopmentTemplate($placeholders)
     {
-        $original_file_content = self::$exception_development_template_content;
+        $original_file_content = self::$exception_dev_template;
         $replaced_content = '';
 
@@ -307 +305 @@
         # Panel 1 - Exception Message and File
         $errormessage   .= '<div id="panel"';
-        $errormessage   .= 'style="background: none repeat scroll 0 0 #FDF599; border: 1px dotted red; padding: 0 10px 10px;">';
+        $errormessage   .= 'style="background: none repeat scroll 0 0 #FDF599; border: 1px solid #E03937; border-radius: 3px; padding: 0 10px 10px;">';
         $errormessage   .= '<h3>Exception '.$code.'</h3><h4>'.$this->message.'</h4>';
         $errormessage   .= '<strong>File: </strong>'.dirname($this->file).DS;
@@ -350 +348 @@
 
         # HEADING <Additional Information>
-        if(empty(self::$exception_template_content) === false)
+        if(empty(self::$exception_template) === false)
         {
             $errormessage  .= '<tr><td colspan="2"><h3>Additional Information & Solution Suggestion</h3></td></tr>';
-            $errormessage  .= '<tr><td colspan="2">'.self::$exception_template_content.'</td></tr>';
+            $errormessage  .= '<tr><td colspan="2">'.self::$exception_template.'</td></tr>';
 
             # Split