define('PL_FORBIDDEN', 403);
define('PL_NOT_FOUND', 404);
define('PL_WIKI', 500);
+define('PL_JSON', 501);
abstract class PlHook
{
try {
$page->assign('platal', $this);
- switch ($this->call_hook($page)) {
+ $res = $this->call_hook($page);
+ switch ($res) {
case PL_FORBIDDEN:
$this->mods['core']->handler_403($page);
break;
}
$page->assign('platal', $this);
- $page->run();
+ if ($res == PL_JSON) {
+ $page->runJSon();
+ } else {
+ $page->run();
+ }
}
public function error403()
if (!$globals->debug) {
error_reporting(0);
$this->display($skin);
+ pl_print_errors(true);
exit;
}
protected function jsonDisplay()
{
pl_content_headers("text/javascript");
- if (!empty($GLOBALS['pl_errors'])) {
- $this->jsonAssign('pl_errors', join("\n", $GLOBALS['pl_errors']));
- $GLOBALS['pl_errors'] = array();
+ if (!empty(PlBacktrace::$bt)) {
+ $this->jsonAssign('pl_backtraces', PlBacktrace::$bt);
}
array_walk_recursive($this->_jsonVars, "escape_XDB");
$jsonbegin = Env::v('jsonBegin');
exit;
}
// }}}
+
+ public function runJSon()
+ {
+ pl_content_headers("text/javascript");
+ if (!empty(PlBacktrace::$bt)) {
+ $this->jsonAssign('pl_backtraces', PlBacktrace::$bt);
+ }
+ echo json_encode($this->_jsonVars);
+ exit;
+ }
+
// {{{ function jsonAssign
public function jsonAssign($var, $value)
{
function pl_error_handler($errno, $errstr, $errfile, $errline)
{
+
static $errortype;
if (!error_reporting())
return;
return;
}
}
-
$type = isset($errortype[$errno]) ? $errortype[$errno] : $errno;
- $errstr = utf8_encode(htmlentities($errstr));
- if (php_sapi_name() == 'cli') {
- $GLOBALS['pl_errors'] = "$type: $errstr\n $errfile:$errline\n";
- } else {
- $GLOBALS['pl_errors'][] =
- "<div class='phperror'>".
- "<strong>{$type}</strong> <em>$errstr</em><br />".
- "<tt>$errfile : $errline</tt>".
- "</div>";
+ $error = strpos($type, 'Warning') !== false || strpos($type, 'Error') !==false;
+ if (!isset(PlBacktrace::$bt['PHP Errors'])) {
+ new PlBacktrace('PHP Errors');
}
-}
-
-function pl_clear_errors()
-{
- unset($GLOBALS['pl_errors']);
+ PlBacktrace::$bt['PHP Errors']->newEvent("$type: $errstr",
+ 0, $error ? $errstr : null,
+ array(array('file' => $errfile,
+ 'line' => $errline)));
}
function pl_dump_env()
echo "</pre></div>";
}
-function pl_print_errors()
+function pl_print_errors($html = false)
{
- if (!empty($GLOBALS['pl_errors'])) {
- print join("\n", $GLOBALS['pl_errors']);
+ if (!isset(PlBacktrace::$bt['PHP Errors'])) {
+ return;
+ }
+ foreach (PlBacktrace::$bt['PHP Errors']->traces as $trace) {
+ if ($html) {
+ echo "<pre>";
+ }
+ print "{$trace['action']}\n";
+ print " {$trace['data'][0]['file']}: {$trace['data'][0]['line']}\n";
+ if ($html) {
+ echo "</pre>";
+ }
}
}
set_error_handler('pl_error_handler', E_ALL | E_STRICT);
-register_shutdown_function('pl_print_errors');
+if (php_sapi_name() == 'cli') {
+ register_shutdown_function('pl_print_errors');
+}
//register_shutdown_function('pl_dump_env');
/** Check if the string is utf8