Makes compilation error debugging easier.

[platal.git] / include / platal.inc.php

diff --git a/include/platal.inc.php b/include/platal.inc.php
index badaef5..d8155f5 100644 (file)
--- a/include/platal.inc.php
+++ b/include/platal.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -43,8 +43,10 @@ function pl_autoload($cls, array $pathes = array())
 
     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;
@@ -89,11 +91,15 @@ function pl_error_handler($errno, $errstr, $errfile, $errline)
 
     $type = isset($errortype[$errno]) ? $errortype[$errno] : $errno;
     $errstr = utf8_encode(htmlentities($errstr));
-    $GLOBALS['pl_errors'][] =
-        "<div class='phperror'>".
-        "<strong>{$type}</strong> <em>$errstr</em><br />".
-        "<tt>$errfile : $errline</tt>".
-        "</div>";
+    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>";
+    }
 }
 
 function pl_clear_errors()