X-Git-Url: http://git.pk910.de/?p=PHP-P10.git;a=blobdiff_plain;f=Bots%2FPulseBot.class.php;h=b9a5e6a180544e5798a047be20fb0c47bb24329a;hp=74886d3663324c33c2cf71e677b2e8f5e16f896c;hb=811bc0c7a1f583fb624a0f8c3601146e063c5a25;hpb=ad3b387fb5564924ef6cc770a1eac37b526cc446

diff --git a/Bots/PulseBot.class.php b/Bots/PulseBot.class.php
index 74886d3..b9a5e6a 100644
--- a/Bots/PulseBot.class.php
+++ b/Bots/PulseBot.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 *
@@ -48,7 +48,7 @@ class {$_NAME} extends Bot {
 		} else {
 			$this->pulsebot = $old;
 		}
-		BotLoader::registerDB($this, "PulseBot");
+		BotLoader::registerDB($this, "pulsebot");
 		ModCMD::bind($this, BIND_CHANMSG, "recive_privmsg");
 		ModCMD::bind($this, BIND_JOIN, "recive_join");
 		ModCMD::bind($this, BIND_QUIT, "recive_quit");
@@ -90,12 +90,12 @@ class {$_NAME} extends Bot {
 			return $ustats;
 		}
 		$stats = $this->getStats();
-		$users = $stats->TeamStats->Members;
+		$users = $stats->TeamStats->Members->Member;
 		foreach ($users as $user) {
 			if(strtolower($user->MemberName) == strtolower($name)) {
 				$xmlstr = file_get_contents("http://whatpulse.org/api/user.php?UserID=".$user->MemberUserID);
 				$ustats = new SimpleXMLElement($xmlstr);
-				$this->cache["ustats_".strtolower($name)] = $stats;
+				$this->cache["ustats_".strtolower($name)] = $ustats;
 				$this->cache["ustats_".strtolower($name)."_time"] = time();
 				return $ustats;
 			}
@@ -122,7 +122,6 @@ class {$_NAME} extends Bot {
 					$pulseUserName = $exp[1];
 					$stats = $this->getStats();
 					$pulseUser = null;
-					print_r($stats);
 					$users = $stats->TeamStats->Members->Member;
 					foreach ($users as $puser) {
 						if(strtolower($puser->MemberName) == strtolower($pulseUserName)) {
@@ -146,8 +145,8 @@ class {$_NAME} extends Bot {
 					if(!array_key_exists("users", $this->db)) {
 						$this->db['users'] = array();
 					}
-					$this->db['users'][$auth] = $pulseUser->MemberName;
-					$this->uplink->notice($this->pulsebot, $user, "WhatPulse user '".$pulseUserName."' added (Keys: ".$pulseUser->MemberKeys.", Clicks: ".$pulseUser->MemberClicks.").");
+					$this->db['users'][$auth] = strval($pulseUser->MemberName);
+					$this->uplink->notice($this->pulsebot, $user, "WhatPulse user '".$pulseUserName."' added (Keys: ".number_format(floatval($pulseUser->MemberKeys),0,',','.').", Clicks: ".number_format(floatval($pulseUser->MemberClicks),0,',','.').").");
 				}
 				break;
 			case ".deluser":
@@ -183,7 +182,7 @@ class {$_NAME} extends Bot {
 							break;
 						}
 					}
-					$table->add($puser->MemberName, $puser->MemberKeys, $puser->MemberClicks, $puser->MemberMiles, $ircUserName);
+					$table->add($puser->MemberName, number_format(floatval($puser->MemberKeys),0,',','.'), number_format(floatval($puser->MemberClicks),0,',','.'), number_format(floatval($puser->MemberMiles),2,',','.'), $ircUserName);
 				}
 				$lines = $table->end();
 				foreach($lines as $line) {
@@ -221,8 +220,9 @@ class {$_NAME} extends Bot {
 					break;
 				}
 				$ustats = $this->getUserStats($pulseUser->MemberName);
-				$message = "User \002".$pulseUser->MemberName."\002 has \002".$pulseUser->MemberKeys."\002 keys (".$ustats->AvKPS." per second), \002".$pulseUser->MemberClicks."\002 clicks (".$ustats->AvCPS." per second) and ".$pulseUser->MemberMiles." miles.\n";
-				$message .= "Last Pulse: ".$ustats->LastPulse;
+				$message = array();
+				$message[] = "User \002".$pulseUser->MemberName."\002 has \002".number_format(floatval($pulseUser->MemberKeys),0,',','.')."\002 keys (".number_format(floatval($ustats->AvKPS),2,',','.')." per second), \002".number_format(floatval($pulseUser->MemberClicks),0,',','.')."\002 clicks (".number_format(floatval($ustats->AvCPS),2,',','.')." per second) and ".number_format(floatval($pulseUser->MemberMiles),2,',','.')." miles.";
+				$message[] = "Last Pulse: ".$ustats->LastPulse;
 				if(count($exp) > 1) {
 					foreach($message as $line) {
 						$this->uplink->privmsg($this->pulsebot, $channel, $line);
@@ -259,7 +259,7 @@ class {$_NAME} extends Bot {
 		}
 		if($pulseUser) {
 			$this->uplink->mode($this->pulsebot, $channel, "+v ".$user->getNumeric());
-			$this->uplink->privmsg($this->pulsebot, $channel, "WhatPulse User \002".$pulseUser->MemberName."\002 (\002".$pulseUser->MemberKeys."\002 keys and \002".$pulseUser->MemberClicks."\002 clicks) has joined the channel.");
+			$this->uplink->privmsg($this->pulsebot, $channel, "WhatPulse User \002".$pulseUser->MemberName."\002 (\002".number_format(floatval($pulseUser->MemberKeys),0,',','.')."\002 keys and \002".number_format(floatval($pulseUser->MemberClicks),0,',','.')."\002 clicks) has joined the channel.");
 		}
 	}