Changeset 1127

Timestamp:

06/04/2008 09:25:43 AM (2 years ago)

Author:

DotMG

Message:

refs #772

Avoiding LetterSaladOutput when using key files errors or debug. Usages are:

• if file debug present: output is full of debug information, ugly page layout
• if file errors present: PHP notices, warnings, errors will appear.
• if no file called debug nor errors present: for production use, PHP notices will not show.

Files:

• trunk/wikka.php (modified) (4 diffs)

trunk/wikka.php

@@ -63 +63 @@
  * code.
  */
-$errors = (file_exists('errors')) ? TRUE : FALSE;
+$track_errors = (file_exists('errors')) ? TRUE : FALSE;
+ob_start();                                                     // need to pick up tracing messages
 /**
  * Interpret debugging and development/production modes.
  */
-if ($debug)
-{
-        ob_start();                                                     // need to pick up tracing messages
+if ($debug || $track_errors)
+{
         error_reporting(E_ALL);                         // always on for debug mode
 }
 else
 {
-        if ($errors)
-        {
-                ob_start();
-                error_reporting(E_ALL);                         // development mode
-        }
-        else
-        {
-                error_reporting(E_ALL ^ E_NOTICE);      // production mode
-        }
+        error_reporting(E_ALL ^ E_NOTICE);      // production mode
 }
 // -------------------- END DEBUGGING AND ERROR REPORTING ---------------------
@@ -998 +990 @@
 //     - Compatibility library loaded
 if ($debug) echo "roll...<br/>\n";
+$debug_info = '';
 if (!$debug)
 {
-        ob_end_clean(); // in case there was a previous buffer left from debug mode!
+        $debug_info = ob_get_contents();
+        @ob_end_clean();        // in case there was a previous buffer left from debug mode!
         ob_start();             // start buffering output
 }
@@ -1022 +1016 @@
         //output result // @@@ use paragraph
         echo '<div class="smallprint">'.sprintf(PAGE_GENERATION_TIME, $totaltime)."</div>\n";   // @@@ should be paragraph
+        if ($track_errors)
+        {
+                echo '<p class="debuginfo">'.$debug_info.'</p>'."\n";
+        }
         echo "</body>\n</html>";
 }
@@ -1069 +1067 @@
  */
 //header('Content-Length: '.$page_length);
-ob_end_clean();
+@ob_end_clean();
 
 /**