Another year is about to end... So we have to update these damn copyright information :P

[PHP-P10.git] / BotLoader / BotLoader.class.php

diff --git a/BotLoader/BotLoader.class.php b/BotLoader/BotLoader.class.php
index b13be3657aa2f1676c67283700524d8771edc3d1..0ad3dd44c19b61e3200b08ddca685824a74b1d58 100644 (file)
--- a/BotLoader/BotLoader.class.php
+++ b/BotLoader/BotLoader.class.php
@@ -1,6 +1,6 @@
 <?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 *
@@ -67,9 +67,9 @@ class BotLoader {
        
        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();
@@ -99,10 +99,9 @@ class BotLoader {
                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);
@@ -125,10 +124,9 @@ class BotLoader {
                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);
@@ -147,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));
        }