Home / Browse / PhpWiki / Mail / Archive

PhpWiki

Email Archive: phpwiki-checkins (read-only)

[phpwiki-checkins] SF.net SVN: phpwiki:[8644] trunk/lib/ErrorManager.php

From: <vargenau@us...> - 2012-12-11 14:49

Revision: 8644
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8644&view=rev
Author:   vargenau
Date:     2012-12-11 14:48:56 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Fix exit

Modified Paths:
--------------
    trunk/lib/ErrorManager.php

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2012-12-11 14:30:38 UTC (rev 8643)
+++ trunk/lib/ErrorManager.php	2012-12-11 14:48:56 UTC (rev 8644)
@@ -330,8 +330,9 @@
         PrintXML($this->_flush_errors());
         if ($this->_fatal_handler)
             $this->_fatal_handler->call($error);
-        if (!$WikiTheme->DUMP_MODE)
-            exit - 1;
+        if (!$WikiTheme->DUMP_MODE) {
+            exit();
+        }
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Thread View

Thread	Author	Date
[phpwiki-checkins] SF.net SVN: phpwiki:[6760] trunk/lib/ErrorManager.php	<vargenau@us...>

[phpwiki-checkins] SF.net SVN: phpwiki:[7180] trunk/lib/ErrorManager.php

From: <vargenau@us...> - 2009-10-05 12:56

Revision: 7180
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7180&view=rev
Author:   vargenau
Date:     2009-10-05 12:56:05 +0000 (Mon, 05 Oct 2009)

Log Message:
-----------
Valid XHTML code; add CSS

Modified Paths:
--------------
    trunk/lib/ErrorManager.php

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2009-10-05 11:58:38 UTC (rev 7179)
+++ trunk/lib/ErrorManager.php	2009-10-05 12:56:05 UTC (rev 7180)
@@ -260,9 +260,20 @@
         // Handle it ourself.
         if ($error->isFatal()) {
             $this->_noCacheHeaders();
-            echo "<html><body><div style=\"font-weight:bold; color:red\">Fatal Error:</div>\n";
+            echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+            echo "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\"\n";
+	    echo "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n";
+            echo "<html>\n";
+            echo "<head>\n";
+            echo "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\" />\n";
+            echo "<title>Fatal Error</title>\n";
+            echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"themes/default/phpwiki.css\" />\n";
+            echo "</head>\n";
+            echo "<body>\n";
+            echo "<div style=\"font-weight:bold; color:red\">Fatal Error:</div>\n";
+
             if (defined('DEBUG') and (DEBUG & _DEBUG_TRACE)) {
-                echo "error_reporting=",error_reporting(),"\n<br>";
+                echo "error_reporting=",error_reporting(),"\n<br />";
                 if (function_exists("debug_backtrace")) // >= 4.3.0
                     $error->printSimpleTrace(debug_backtrace());
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7471] trunk/lib/ErrorManager.php

From: <rurban@us...> - 2010-06-07 10:37

Revision: 7471
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7471&view=rev
Author:   rurban
Date:     2010-06-07 10:37:33 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
use special HtmlElement5.php with php-4 unparsable public static declaration

Modified Paths:
--------------
    trunk/lib/ErrorManager.php

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2010-06-07 10:36:03 UTC (rev 7470)
+++ trunk/lib/ErrorManager.php	2010-06-07 10:37:33 UTC (rev 7471)
@@ -649,7 +649,11 @@
     }
 }
 
-require_once(dirname(__FILE__).'/HtmlElement.php');
+if (check_php_version(5,2)) {
+    require_once(dirname(__FILE__).'/HtmlElement5.php');
+} else {
+    require_once(dirname(__FILE__).'/HtmlElement.php');
+}
 
 if (!isset($GLOBALS['ErrorManager'])) {
     $GLOBALS['ErrorManager'] = new ErrorManager;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[7788] trunk/lib/ErrorManager.php

From: <vargenau@us...> - 2010-12-20 12:47

Revision: 7788
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7788&view=rev
Author:   vargenau
Date:     2010-12-20 12:47:06 +0000 (Mon, 20 Dec 2010)

Log Message:
-----------
No h4 for errors

Modified Paths:
--------------
    trunk/lib/ErrorManager.php

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2010-12-20 12:37:25 UTC (rev 7787)
+++ trunk/lib/ErrorManager.php	2010-12-20 12:47:06 UTC (rev 7788)
@@ -130,8 +130,8 @@
         if ($worst_err->isNotice())
             return $flushed;
         $class = $worst_err->getHtmlClass();
-        $html = HTML::div(array('style' => 'border: none', 'class' => $class),
-                          HTML::h4(array('class' => 'errors'),
+        $html = HTML::div(array('class' => $class),
+                          HTML::div(array('class' => 'errors'),
                                    "PHP " . $worst_err->getDescription()));
         $html->pushContent($flushed);
         return $html;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8452] trunk/lib/ErrorManager.php

From: <vargenau@us...> - 2012-11-14 16:42

Revision: 8452
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8452&view=rev
Author:   vargenau
Date:     2012-11-14 16:42:43 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
elseif

Modified Paths:
--------------
    trunk/lib/ErrorManager.php

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2012-11-14 16:41:08 UTC (rev 8451)
+++ trunk/lib/ErrorManager.php	2012-11-14 16:42:43 UTC (rev 8452)
@@ -286,7 +286,7 @@
                 $error->printSimpleTrace(debug_backtrace());
             }
             $this->_die($error);
-        } else if (($error->errno & error_reporting()) != 0) {
+        } elseif (($error->errno & error_reporting()) != 0) {
             if (($error->errno & $this->_postpone_mask) != 0) {
                 if ((function_exists('isa') and isa($error, 'PhpErrorOnce'))
                     or (!function_exists('isa') and

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8506] trunk/lib/ErrorManager.php

From: <vargenau@us...> - 2012-11-21 10:15

Revision: 8506
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8506&view=rev
Author:   vargenau
Date:     2012-11-21 10:15:22 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Temporary hack to have errors displayed on dev machines.

Modified Paths:
--------------
    trunk/lib/ErrorManager.php

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2012-11-20 20:51:46 UTC (rev 8505)
+++ trunk/lib/ErrorManager.php	2012-11-21 10:15:22 UTC (rev 8506)
@@ -385,6 +385,11 @@
  */
 function ErrorManager_errorHandler($errno, $errstr, $errfile, $errline)
 {
+    // TODO: Temporary hack to have errors displayed on dev machines.
+    if (defined('DEBUG') and DEBUG and $errno < 2048) {
+        print "<br/>PhpWiki Warning: ($errno, $errstr, $errfile, $errline)";
+    }
+
     if (!isset($GLOBALS['ErrorManager'])) {
         $GLOBALS['ErrorManager'] = new ErrorManager;
     }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8644] trunk/lib/ErrorManager.php

From: <vargenau@us...> - 2012-12-11 14:49

Revision: 8644
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8644&view=rev
Author:   vargenau
Date:     2012-12-11 14:48:56 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Fix exit

Modified Paths:
--------------
    trunk/lib/ErrorManager.php

Modified: trunk/lib/ErrorManager.php
===================================================================
--- trunk/lib/ErrorManager.php	2012-12-11 14:30:38 UTC (rev 8643)
+++ trunk/lib/ErrorManager.php	2012-12-11 14:48:56 UTC (rev 8644)
@@ -330,8 +330,9 @@
         PrintXML($this->_flush_errors());
         if ($this->_fatal_handler)
             $this->_fatal_handler->call($error);
-        if (!$WikiTheme->DUMP_MODE)
-            exit - 1;
+        if (!$WikiTheme->DUMP_MODE) {
+            exit();
+        }
     }
 
     /**

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.