<?php
+$sysdebug_dbquery = forge_get_config('sysdebug_dbquery');
$sysdebug_ignored = forge_get_config('sysdebug_ignored');
if (!isset($ffErrors))
$ffErrors = array();
// error handler function
function ffErrorHandler($errno, $errstr, $errfile, $errline)
{
- global $ffErrors, $sysdebug_ignored;
+ global $ffErrors, $sysdebug_ignored, $sysdebug__aborted;
+
+ if ($sysdebug__aborted) {
+ /* inside the exception handler, ignore everything */
+ return true;
+ }
if (!$sysdebug_ignored && error_reporting() == 0)
/* prepended @ to statement => ignore */
if (forge_get_config('sysdebug_backtraces'))
$msg .= "\n" .
- '<pre style="font-weight:normal; font-size:90%; color:#000066;">' .
+ '<pre style="font-weight:normal; font-size:90%; color:#000066; line-height:100%;">' .
htmlentities(debug_string_backtrace()) . "</pre>";
-
+
$ffErrors[] = array('type' => $type, 'message' => $msg);
/* Don't execute PHP internal error handler */
return true;
function ffOutputHandler($buffer) {
- global $ffErrors, $gfcommon, $sysDTDs;
+ global $ffErrors, $sysdebug_enable, $sysdebug__aborted,
+ $sysdebug_lazymode_on, $sysdebug_doframe, $gfcommon,
+ $sysDTDs, $sysXMLNSs, $HTML;
+
+ if ($sysdebug__aborted) {
+ /* called from exception handler, discard */
+ $p = strrpos($buffer, "\r\n");
+ return (($p === false) ? "" : substr($buffer, $p + 2));
+ }
+
+ if (!getenv('SERVER_SOFTWARE')) {
+ return $buffer;
+ }
+
+ /* in case we’re aborted */
+ if (!$sysdebug_enable)
+ return $buffer;
- if (! getenv ('SERVER_SOFTWARE')) {
- return $buffer ;
+ /* if content-type != text/html* assume abortion */
+ if ($sysdebug_lazymode_on) {
+ $thdr = 'content-type:';
+ $tstr = 'content-type: text/html';
+ foreach (headers_list() as $h) {
+ if (strncasecmp($h, $thdr, strlen($thdr)))
+ continue;
+ if (strncasecmp($h, $tstr, strlen($tstr)))
+ /* application/something, maybe */
+ return $buffer;
+ }
}
/* stop calling ffErrorHandler */
$dtdpath = $gfcommon . 'include/';
// this is, sadly, necessary (especially in ff-plugin-mediawiki)
- $pre_tag = "<pre style=\"margin:0; padding:0; border:0;\">";
+ $pre_tag = "<pre style=\"margin:0; padding:0; border:0; line-height:125%;\">";
- $divstring = "\n\n" . '<script language="JavaScript" type="text/javascript">/* <![CDATA[ */
+ $divstring = "\n\n" . '<script language="JavaScript" type="text/javascript">//<![CDATA[
function toggle_ffErrors() {
var errorsblock = document.getElementById("ffErrorsBlock");
+ var errorsgroup = document.getElementById("ffErrors");
if (errorsblock.style.display == "none") {
errorsblock.style.display = "block";
+ errorsgroup.style.right = "10px";
} else {
errorsblock.style.display = "none";
+ errorsgroup.style.right = "300px";
}
- }' . "\n/* ]]> */</script>\n<div id=\"ffErrors\">\n" .
+ }' . "\n//]]></script>\n<div id=\"ffErrors\">\n" .
'<a href="javascript:toggle_ffErrors();">Click to toggle</a>' .
"\n<div id=\"ffErrorsBlock\">";
+ $doctype = util_ifsetor($HTML->doctype);
+ if (!$doctype) {
+ $doctype = 'transitional';
+ }
+
+ if ($sysdebug_doframe) {
+ $initial = '<?xml version="1.0" encoding="utf-8"?>' .
+ $sysDTDs[$doctype]['doctype'] .
+ '<html xml:lang="en" ' . $sysXMLNSs .
+ "><head><title>AJAX frame</title></head><body>\n";
+ $bufferstrip = strlen($initial);
+ $buffer = $initial . $buffer . '</body></html>';
+ }
+
/* cut off </body></html> (hopefully only) at the end */
$buffer = rtrim($buffer); /* spaces, newlines, etc. */
+ $bufend = array(false, substr($buffer, -100));
if (substr($buffer, -strlen("</html>")) != "</html>") {
+ $bufend[0] = true;
$ffErrors[] = array('type' => "error",
'message' => htmlentities("does not end with </html> tag"));
$buffer = str_ireplace("</html>", "", $buffer);
$buffer = substr($buffer, 0, -strlen("</html>"));
$buffer = rtrim($buffer); /* spaces, newlines, etc. */
if (substr($buffer, -strlen("</body>")) != "</body>") {
+ $bufend[0] = true;
$ffErrors[] = array('type' => "error",
'message' => htmlentities("does not end with </body> tag"));
$buffer = str_ireplace("</body>", "", $buffer);
$buffer = substr($buffer, 0, -strlen("</body>"));
$buffer = rtrim($buffer); /* spaces, newlines, etc. */
+ if ($bufend[0]) {
+ $ffErrors[] = array('type' => "info",
+ 'message' => "The output has ended thus: " .
+ htmlentities($bufend[1]));
+ }
+
/* append errors, if any */
$has_div = false;
foreach ($ffErrors as $msg) {
2 => array("pipe", "w"),
);
$xmlstarlet = proc_open("xmlstarlet val -d " .
- escapeshellarg($dtdpath . $sysDTDs['transitional']['dtdfile']) .
- " -", $dspec, $pipes);
+ escapeshellarg($dtdpath . $sysDTDs[$doctype]['dtdfile']) .
+ " -e -", $dspec, $pipes);
$rv = 0;
if (is_resource($xmlstarlet)) {
fwrite($pipes[0], $cbuf);
fclose($pipes[1]);
fclose($pipes[2]);
$rv = proc_close($xmlstarlet);
+ /* work around Debian #627158 */
+ $serr = join("\n", preg_grep(
+ '/^-:[0-9]*: Entity'." 'nbsp' ".'not defined$/',
+ explode("\n", $serr), PREG_GREP_INVERT));
} else
$valck[] = array(
'msg' => "could not run xmlstarlet"
/* append XHTML source code, if validation failed */
if ($appsrc) {
if (!$sysdebug_akelos || $vbuf == $sbuf[1])
- $vbuf = "<ol><li>" . $pre_tag . join("</pre></li>\n<li>" . $pre_tag, explode("\n", htmlentities(rtrim($cbuf)))) . "</pre></li></ol>";
+ $vbuf = "<ol><li>" . $pre_tag . join(" </pre></li>\n<li>" . $pre_tag, explode("\n", htmlentities(rtrim($cbuf)))) . " </pre></li></ol>";
else
$vbuf = $pre_tag . htmlentities(rtrim($sbuf[0])) . "</pre>" . $vbuf;
$valck[] = array(
$buffer .= $divstring;
$has_div = true;
}
+ if (!isset($msg['type']) || !$msg['type']) {
+ $msg['type'] = 'unknown';
+ }
$buffer .= "\n <div class=\"" . $msg['type'] . '">' . $msg['msg'];
if (isset($msg['extra']))
$buffer .= "\n <div style=\"font-weight:normal; font-size:90%; color:#333333;\">" .
/* return final buffer */
if ($has_div)
$buffer .= "\n</div></div>";
- return ($buffer . "\n</body></html>\n");
+ if ($sysdebug_doframe) {
+ return substr($buffer, $bufferstrip);
+ } else {
+ return $buffer . "\n</body></html>\n";
+ }
+}
+
+function ffExceptionHandler($e) {
+ global $sysdebug__aborted;
+
+ /* drop output buffers and error handler */
+ $sysdebug__aborted = true;
+ while (ob_get_length() > 0 && ob_end_clean()) {
+ /* loop */ ;
+ }
+ restore_error_handler();
+
+ /* issue exception information */
+ header('HTTP/1.0 500 Exception not handled');
+ header('Content-type: text/plain');
+ echo "\r\nUncaught exception:\n" . str_replace("\r", "",
+ $e->getMessage() . "\n\nBacktrace:\n" . $e->getTraceAsString()) .
+ "\n";
+ exit(1);
}
+
if (forge_get_config('sysdebug_phphandler')) {
// set to the user defined error handler
set_error_handler("ffErrorHandler");
}
+set_exception_handler("ffExceptionHandler");
+
+$sysdebug_lazymode_on = false;
+$sysdebug_doframe = false;
+$sysdebug__aborted = false;
ob_start("ffOutputHandler", 0, false);
+
+function sysdebug_ajaxbody($enable=true) {
+ global $sysdebug_doframe;
+
+ $sysdebug_doframe = $enable;
+}
+
+function sysdebug_off($hdr=false, $replace=true, $resp=false) {
+ global $sysdebug_enable;
+
+ if ($sysdebug_enable) {
+ $sysdebug_enable = false;
+ $buf = ob_get_flush();
+
+ if ($buf === false) {
+ $buf = "";
+ }
+ } else {
+ $buf = false;
+ }
+
+ if ($hdr !== false) {
+ if ($resp === false) {
+ header($hdr, $replace);
+ } else {
+ header($hdr, $replace, $resp);
+ }
+ }
+
+ return $buf;
+}
+
+function sysdebug_lazymode($enable) {
+ global $sysdebug_lazymode_on;
+
+ $sysdebug_lazymode_on = $enable ? true : false;
+}
+
+function ffDebug($type,$intro,$pretext) {
+ global $ffErrors;
+
+ if (!$type) {
+ $type = 'debug';
+ }
+ $text = "";
+ if ($intro) {
+ $text .= htmlentities($intro);
+ }
+ if ($pretext) {
+ $text .= '<pre style="font-weight:normal; font-size:90%; color:#000066;">' .
+ htmlentities($pretext) . "</pre>";
+ }
+
+ $ffErrors[] = array(
+ 'type' => $type,
+ 'message' => $text,
+ );
+}