function pl_autoload($cls, array $pathes = array())
{
$cls = strtolower($cls);
+ if (starts_with($cls, 'xdb')) {
+ $cls = 'xdb';
+ } else if (starts_with($cls, 'pldbtable')) {
+ $cls = 'pldbtableentry';
+ }
$basepath = dirname(dirname(dirname(__FILE__)));
array_unshift($pathes, 'core/classes', 'classes');
foreach ($pathes as $path) {
- if (@include_once "$basepath/$path/$cls.php") {
- return true;
+ if (file_exists("$basepath/$path/$cls.php")) {
+ if (include_once "$basepath/$path/$cls.php") {
+ return true;
+ }
}
}
return false;
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:$errfile\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;
-function pl_clear_errors()
-{
- unset($GLOBALS['pl_errors']);
+ pl_autoload('PlBacktrace');
+ if (!isset(PlBacktrace::$bt['PHP Errors'])) {
+ new PlBacktrace('PHP 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
return html_entity_decode($text, $mode, 'UTF-8');
}
+function pl_flatten_aux(array &$dest, array $src)
+{
+ foreach ($src as $val) {
+ if (is_array($val)) {
+ pl_flatten_aux($dest, $val);
+ } else {
+ $dest[] = $val;
+ }
+ }
+}
+
+function pl_flatten(array $array)
+{
+ $res = array();
+ pl_flatten_aux($res, $array);
+ return $res;
+}
+
/**
* Returns the path of a static content, including, when appropriate, the
* version number. This is used to avoid cross-version cache issues, by ensuiring