X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=BotLoader%2FBotLoader.class.php;h=0ad3dd44c19b61e3200b08ddca685824a74b1d58;hp=b5dc87b252cd482c934e5cf7581a0f91dc1d8e66;hb=811bc0c7a1f583fb624a0f8c3601146e063c5a25;hpb=74fcc85514c9bd0a4a8dfbd909d9555a9f1ee5b8

diff --git a/BotLoader/BotLoader.class.php b/BotLoader/BotLoader.class.php
index b5dc87b..0ad3dd4 100644
--- a/BotLoader/BotLoader.class.php
+++ b/BotLoader/BotLoader.class.php
@@ -1,22 +1,19 @@
 <?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,      *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of       *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        *
  * 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/>. *
  *                                                                      *
  ************************************************************************
  * 
@@ -64,14 +61,15 @@ class BotLoader {
 	}
 	
 	public function save() {
+		$this->saxdb->setSection("BotLoader", $this->botdb);
 		$this->saxdb->writeDB("php_p10.db");
 	}
 	
 	public function autosave() {
 		foreach($this->loadedBots as $name => $bot) {
-			if(array_key_exists(strtolower($name), $this->botDatabases)) {
+			if($bot->getDBSection()) {
 				$db = $bot->writeDB();
-				$this->saxdb->setSection($this->botDatabases[strtolower($name)],$db);
+				$this->saxdb->setSection($bot->getDBSection(),$db);
 			}
 		}
 		$this->save();
@@ -94,16 +92,16 @@ class BotLoader {
 		if(!array_key_exists($name, $this->botdb["bots"])) {
 			$this->botdb["bots"][$name] = $botfile;
 		}
+		return true;
 	}
 	
 	private function unloadBot($name, $delete = true) {
 		if(!(array_key_exists(strtolower($name), $this->loadedBots))) return false;
 		//unload bot
 		$bot = $this->loadedBots[strtolower($name)];
-		if(array_key_exists(strtolower($name), $this->botDatabases)) {
+		if($bot->getDBSection()) {
 			$db = $bot->writeDB();
-			$this->saxdb->setSection($this->botDatabases[strtolower($name)],$db);
-			unset($this->botDatabases[strtolower($name)]);
+			$this->saxdb->setSection($bot->getDBSection(),$db);
 		}
 		ModCMD::unbindBot($bot);
 		$bot->unload(false);
@@ -111,16 +109,24 @@ class BotLoader {
 		if(array_key_exists($name, $this->botdb["bots"]) && $delete) {
 			unset($this->botdb["bots"][$name]);
 		}
+		return true;
 	}
 	
 	private function rehashBot($name) {
 		if(!(array_key_exists(strtolower($name), $this->loadedBots))) return false;
+		$botfile = null;
+		foreach($this->botdb["bots"] as $botname => $file) {
+			if(strtolower($botname) == strtolower($name)) {
+				$botfile = $file;
+				break;
+			}
+		}
+		if(!$botfile) break;
 		//rehash bot
 		$bot = $this->loadedBots[strtolower($name)];
-		if(array_key_exists(strtolower($name), $this->botDatabases)) {
+		if($bot->getDBSection()) {
 			$db = $bot->writeDB();
-			$this->saxdb->setSection($this->botDatabases[strtolower($name)],$db);
-			unset($this->botDatabases[strtolower($name)]);
+			$this->saxdb->setSection($bot->getDBSection(),$db);
 		}
 		ModCMD::unbindBot($bot);
 		$data = $bot->unload(true);
@@ -130,6 +136,7 @@ class BotLoader {
 		if(!$bot) return false;
 		$bot->load($this->uplink, $data);
 		$this->loadedBots[strtolower($name)] = $bot;
+		return true;
 	}
 	
 	private function listLoadedBots() {
@@ -138,18 +145,7 @@ class BotLoader {
 	
 	private function addDBsection($bot, $section) {
 		if(!is_a($bot, "Bot")) return false;
-		$name = null;
-		foreach($this->loadedBots as $botname => $cbot) {
-			if($cbot === $bot) {
-				$name = $botname;
-				break;
-			}
-		}
-		if($name == null) return false;
-		if(array_key_exists(strtolower($name), $this->botDatabases)) {
-			return false;
-		}
-		$this->botDatabases[strtolower($name)] = $section;
+		$bot->setDBSection($section);
 		$bot->readDB($this->saxdb->getSection($section));
 	}