$qstring = file_get_contents($file);
if (!$qstring) {
if ($sysdebug_dbquery) {
- ffDebug("warning",
+ ffDebug("database",
"aborted call of db_query_from_file():",
"Cannot read file: " . $file .
"\n\n" . debug_string_backtrace());
} else if ($sysdebug_dberrors) {
- ffDebug("warning", "db_query_from_file() aborted (" .
- "Cannot read file: " . $file . ")", false);
+ ffDebug("database", "db_query_from_file() aborted (" .
+ "Cannot read file: " . $file . ")");
} else {
error_log("db_query_from_file(): Cannot read file: " . $file);
}
$qstring, debug_string_backtrace());
}
} else if ($sysdebug_dbquery || $sysdebug_dberrors) {
- ffDebug("warning", "db_query_from_file() failed (" .
+ ffDebug("database", "db_query_from_file() failed (" .
db_error($dbserver) . "), SQL: " . $qstring,
$sysdebug_dbquery ? debug_string_backtrace() : false);
} else {
debug_string_backtrace());
}
} else if ($sysdebug_dbquery) {
- ffDebug("warning", "failed call of db_query_params():",
+ ffDebug("database", "failed call of db_query_params():",
db_error($dbserver) . "\n\n" . debug_string_backtrace());
} else if ($sysdebug_dberrors) {
- ffDebug("warning", "db_query_params() failed (" .
+ ffDebug("database", "db_query_params() failed (" .
db_error($dbserver) . "), SQL: " . $qstring,
print_r(array("params" => $params), 1));
} else {
<?php
+// initialise globals used by the debugging code
$sysdebug_dberrors = forge_get_config('sysdebug_dberrors');
$sysdebug_dbquery = forge_get_config('sysdebug_dbquery');
$sysdebug_ignored = forge_get_config('sysdebug_ignored');
-if (!isset($ffErrors))
+if (!isset($ffErrors)) {
$ffErrors = array();
+}
// error handler function
-function ffErrorHandler($errno, $errstr, $errfile, $errline)
-{
+function ffErrorHandler($errno, $errstr, $errfile, $errline) {
global $ffErrors, $sysdebug_ignored, $sysdebug__aborted;
if ($sysdebug__aborted) {
return true;
}
- if (!$sysdebug_ignored && error_reporting() == 0)
+ if (!$sysdebug_ignored && error_reporting() == 0) {
/* prepended @ to statement => ignore */
return false;
+ }
$msg = "[$errno] $errstr ($errfile at $errline)";
- // Display messages only once.
+ // display messages only once
foreach ($ffErrors as $m) {
- if ($m['message'] == $msg)
+ if ($m['message'] == $msg) {
return true;
+ }
}
switch ($errno) {
- case E_USER_ERROR:
- case E_ERROR:
- $type = 'error';
- break;
-
- case E_USER_WARNING:
- case E_WARNING:
- $type = 'warning';
- break;
-
- case E_USER_NOTICE:
- case E_NOTICE:
- $type = 'notice';
- break;
-
- case E_STRICT:
- case E_USER_DEPRECATED:
- case E_DEPRECATED:
- $type = "strict";
- break;
-
- default:
- $type = 'unknown';
- break;
+ case E_USER_ERROR:
+ case E_ERROR:
+ $type = 'error';
+ break;
+
+ case E_USER_WARNING:
+ case E_WARNING:
+ $type = 'warning';
+ break;
+
+ case E_USER_NOTICE:
+ case E_NOTICE:
+ $type = 'notice';
+ break;
+
+ case E_STRICT:
+ case E_USER_DEPRECATED:
+ case E_DEPRECATED:
+ $type = "strict";
+ break;
+
+ default:
+ $type = 'unknown';
+ break;
}
- if (forge_get_config('sysdebug_backtraces'))
+ if (forge_get_config('sysdebug_backtraces')) {
$msg .= "\n" .
'<pre style="font-weight:normal; font-size:90%; color:#000066; line-height:100%;">' .
htmlentities(debug_string_backtrace()) . "</pre>";
+ }
- $ffErrors[] = array('type' => $type, 'message' => $msg);
+ $ffErrors[] = array(
+ 'type' => $type,
+ 'message' => $msg,
+ );
/* Don't execute PHP internal error handler */
return true;
}
-
+// output buffer finaliser function
function ffOutputHandler($buffer) {
global $ffErrors, $sysdebug_enable, $sysdebug__aborted,
$sysdebug_lazymode_on, $sysdebug_doframe, $gfcommon,
}
/* in case we’re aborted */
- if (!$sysdebug_enable)
+ if (!$sysdebug_enable) {
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)))
+ if (strncasecmp($h, $thdr, strlen($thdr))) {
continue;
- if (strncasecmp($h, $tstr, strlen($tstr)))
+ }
+ if (strncasecmp($h, $tstr, strlen($tstr))) {
/* application/something, maybe */
return $buffer;
+ }
}
}
'<a href="javascript:toggle_ffErrors();">Click to toggle</a>' .
"\n<div id=\"ffErrorsBlock\">";
- $doctype = util_ifsetor($HTML->doctype);
- if (!$doctype) {
+ if (!($doctype = util_ifsetor($HTML->doctype))) {
$doctype = 'transitional';
}
$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"));
+ $ffErrors[] = array(
+ 'type' => "error",
+ 'message' => htmlentities("does not end with </html> tag"),
+ );
$buffer = str_ireplace("</html>", "", $buffer);
- } else
+ } else {
$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"));
+ $ffErrors[] = array(
+ 'type' => "error",
+ 'message' => htmlentities("does not end with </body> tag"),
+ );
$buffer = str_ireplace("</body>", "", $buffer);
- } else
+ } else {
$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]));
+ $ffErrors[] = array(
+ 'type' => "info",
+ 'message' => "The output has ended thus: " .
+ htmlentities($bufend[1]),
+ );
}
/* append errors, if any */
/* generate buffer for checking */
$cbuf = str_ireplace('http://www.w3.org/TR/xhtml1/DTD/',
'file://' . $dtdpath, $buffer);
- if ($has_div)
+ if ($has_div) {
$cbuf .= "\n</div></div>";
+ }
$cbuf .= "\n</body></html>\n";
/* now check XHTML validity… two means */
$serr = join("\n", preg_grep(
'/^-:[0-9]*: Entity'." 'nbsp' ".'not defined$/',
explode("\n", $serr), PREG_GREP_INVERT));
- } else
+ } else {
$valck[] = array(
- 'msg' => "could not run xmlstarlet"
+ 'msg' => "could not run xmlstarlet",
);
+ }
if ($rv) {
$valck[] = array(
'msg' => "xmlstarlet found that this document is not valid (errorlevel $rv)!",
- 'extra' => $pre_tag . htmlspecialchars(trim($serr .
+ 'extra' => $pre_tag .
+ htmlspecialchars(trim($serr .
"\n\n" . $sout)) . "</pre>",
- 'type' => "error"
+ 'type' => "error",
);
$appsrc = true;
}
$valck[] = array(
'msg' => "Akelos XHTML Validator found some errors on this document!",
'extra' => $errs,
- 'type' => "error"
+ 'type' => "error",
);
$appsrc = true;
}
/* 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>";
- else
- $vbuf = $pre_tag . htmlentities(rtrim($sbuf[0])) . "</pre>" . $vbuf;
+ 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>";
+ } else {
+ $vbuf = $pre_tag . htmlentities(rtrim($sbuf[0])) .
+ "</pre>" . $vbuf;
+ }
$valck[] = array(
'msg' => "Since XHTML validation failed, here’s the checked document for you to look at:",
'extra' => $vbuf,
- 'type' => 'normal'
+ 'type' => 'normal',
);
}
if (!isset($msg['type']) || !$msg['type']) {
$msg['type'] = 'unknown';
}
- $buffer .= "\n <div class=\"" . $msg['type'] . '">' . $msg['msg'];
- if (isset($msg['extra']))
+ $buffer .= "\n <div class=\"" . $msg['type'] . '">' .
+ $msg['msg'];
+ if (isset($msg['extra'])) {
$buffer .= "\n <div style=\"font-weight:normal; font-size:90%; color:#333333;\">" .
$msg['extra'] . "</div>\n ";
+ }
$buffer .= "</div>";
}
/* return final buffer */
- if ($has_div)
+ if ($has_div) {
$buffer .= "\n</div></div>";
+ }
if ($sysdebug_doframe) {
return substr($buffer, $bufferstrip);
} else {
}
}
+// exception handler function
function ffExceptionHandler($e) {
global $sysdebug__aborted;
}
function sysdebug_off($hdr=false, $replace=true, $resp=false) {
- global $sysdebug_enable;
+ global $ffErrors, $sysdebug_enable;
if ($sysdebug_enable) {
$sysdebug_enable = false;
- $buf = ob_get_flush();
+ $buf = @ob_get_flush();
if ($buf === false) {
$buf = "";
}
+
+ /* if we had any old errors, log them */
+ $olderrors = "";
+ foreach ($ffErrors as $msg) {
+ $olderrors .= "\n(" . $msg['type'] . ") " .
+ $msg['message'];
+ }
+ if ($olderrors) {
+ if (!forge_get_config('sysdebug_backtraces')) {
+ $olderrors .= "\n" . debug_string_backtrace();
+ }
+ $olderrors = rtrim($olderrors);
+ $pfx = "";
+ foreach (explode("\n",
+ "sysdebug_off: previous errors found:" . $olderrors)
+ as $olderrorline) {
+ error_log($pfx . $olderrorline);
+ /* followup lines get indented */
+ $pfx = ">>> ";
+ }
+ }
} else {
$buf = false;
}
$sysdebug_lazymode_on = $enable ? true : false;
}
-function ffDebug($type,$intro,$pretext) {
+function ffDebug($type, $intro, $pretext=false) {
global $ffErrors;
if (!$type) {
projects / fusionforge / fusionforge.git / commitdiff