Merge branch 'master' of ssh://git.pk910.de:16110/PHP-P10

[PHP-P10.git] / main.php

diff --git a/main.php b/main.php
index 2df531ee8ceb579b5ac3564bdabf98bc848492ae..35a257b8171ecd64d67867fdd8c751524281372d 100644 (file)
--- a/main.php
+++ b/main.php
@@ -1,12 +1,12 @@
 <?php
 /******************************* PHP-P10 v2 *****************************
- * Copyright (C) 2011  Philipp Kreil (pk910)                            *
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)                       *
  *                                                                      *
  * This program is free software: you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
  * the Free Software Foundation, either version 3 of the License, or    *
  * (at your option) any later version.                                  *
- *                                                                      * 
+ *                                                                      *
  * This program is distributed in the hope that it will be useful,      *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  *                                                                      *
  ************************************************************************
- * 
+ *
  *  main.php
  *
  * initial php file
@@ -29,12 +29,38 @@ require_once("Uplink/Uplink.class.php");
 require_once("ModCMD/ModCMD.class.php");
 require_once("BotLoader/BotLoader.class.php");
 require_once("Tools/timer.inc.php");
+require_once("Tools/Table.class.php");
 
 if(function_exists("pcntl_signal")) {
        pcntl_signal(SIGINT, 'shutdown');
        pcntl_signal(SIGTERM, 'shutdown');
 }
 
+function myErrorHandler($errorcode, $errortext, $errorfile, $errorline)
+{
+    switch ($errorcode) {
+    case E_USER_ERROR:
+        echo $errorcode.': '.$errortext.' in '.$errorfile.' Line '.$errorline;
+        break;
+
+    case E_USER_WARNING:
+        echo $errorcode.': '.$errortext.' in '.$errorfile.' Line '.$errorline;
+        break;
+
+    case E_USER_NOTICE:
+        echo $errorcode.': '.$errortext.' in '.$errorfile.' Line '.$errorline;
+        break;
+        
+    default:
+        echo $errorcode.': '.$errortext.' in '.$errorfile.' Line '.$errorline;
+        break;
+    }
+    
+    return true;
+}
+
+$error_handler = set_error_handler("myErrorHandler");
+
 //basicly here is nothing, yet :D
 $uplink = new Uplink();
 require_once("config.inc.php");
@@ -62,7 +88,7 @@ while(true) {
        $botloader->loop();
        timer_loop();
        if(function_exists("pcntl_signal_dispatch"))
-               pcntl_signal_dispatch();
+       pcntl_signal_dispatch();
 }
 
 ?>
\ No newline at end of file