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 57ec8624e912e340e931b5294dcc6f4db7956dd0..35a257b8171ecd64d67867fdd8c751524281372d 100644 (file)
--- a/main.php
+++ b/main.php
@@ -1,12 +1,10 @@
 <?php
-/********************************* PHP-P10 ******************************
- *    P10 uplink class by pk910   (c)2011 pk910                         *
- ************************************************************************
- *                          Version 2 (OOP)                             *
+/******************************* PHP-P10 v2 *****************************
+ * Copyright (C) 2011-2012  Philipp Kreil (pk910)                       *
  *                                                                      *
- * PHP-P10 is free software; you can redistribute it and/or modify      *
+ * 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 2 of the License, or    *
+ * 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,      *
@@ -15,11 +13,10 @@
  * GNU General Public License for more details.                         *
  *                                                                      *
  * You should have received a copy of the GNU General Public License    *
- * along with PHP-P10; if not, write to the Free Software Foundation,   *
- * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA.       *
+ * along with this program. If not, see <http://www.gnu.org/licenses/>. *
  *                                                                      *
  ************************************************************************
- * 
+ *
  *  main.php
  *
  * initial php file
@@ -32,17 +29,41 @@ 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();
-$uplink->setUplinkHost("192.168.2.103", 4401);
-$uplink->setUplinkServer(5, "PHP.TestNet", "very_weak_password", "Test Server");
-$uplink->setValidateServer("test.localhost", "very_weak_password");
+require_once("config.inc.php");
 
 $uplink->setEventHandler(ModCMD::getEventHandler());
 
@@ -52,13 +73,10 @@ $botloader = new BotLoader($uplink);
 $botloader->loadBots();
 BotLoader::load("ModManager", "ModManager.class.php");
 
-function shutdown($signal) {
+function shutdown($signal = 0) {
        global $botloader;
        global $uplink;
-       if($signal == SIGINT) $type="SIGINT";
-       else if($signal == SIGTERM) $type="SIGTERM";
-       else $type = $signal;
-       echo "\n\nrecived shutdown instruction... ".$type."\n";
+       echo "\n\nrecived shutdown instruction...\n";
        $botloader->unloadBots();
        $botloader->save();
        $uplink->shutdown();
@@ -70,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