From 176b9eef6d002b8ae7fc00062658e3a0008007b0 Mon Sep 17 00:00:00 2001
From: kremsy <lukas@esc-clan.net>
Date: Fri, 3 Jan 2014 19:14:07 +0100
Subject: [PATCH] some changes

---
 application/core/Players/PlayerDetailed.php   |  6 +++++
 application/core/Players/PlayerManager.php    |  3 ++-
 .../core/Statistics/StatisticCollector.php    |  3 +++
 .../core/Statistics/StatisticManager.php      | 26 +++++++++++--------
 4 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/application/core/Players/PlayerDetailed.php b/application/core/Players/PlayerDetailed.php
index ff881778..8c8110bf 100644
--- a/application/core/Players/PlayerDetailed.php
+++ b/application/core/Players/PlayerDetailed.php
@@ -8,8 +8,10 @@ use FML\Controls\Quad;
 use FML\Controls\Quads\Quad_Icons64x64_1;
 use FML\ManiaLink;
 use FML\Script\Script;
+use ManiaControl\Formatter;
 use ManiaControl\ManiaControl;
 use ManiaControl\Manialinks\ManialinkManager;
+use ManiaControl\Statistics\StatisticManager;
 
 /**
  * Player Detailed Page
@@ -225,6 +227,10 @@ class PlayerDetailed {
 			$statProperties = $stat[0];
 			$value = $stat[1];
 
+			if($statProperties->type == StatisticManager::STAT_TYPE_TIME){
+				$value = Formatter::formatTimeH($value);
+			}
+
 			$label = new Label_Text();
 			$frame->add($label);
 			$label->setPosition(-$this->width / 2 + 70, $y);
diff --git a/application/core/Players/PlayerManager.php b/application/core/Players/PlayerManager.php
index 10bc3458..f859c909 100644
--- a/application/core/Players/PlayerManager.php
+++ b/application/core/Players/PlayerManager.php
@@ -10,6 +10,7 @@ use ManiaControl\Callbacks\CallbackListener;
 use ManiaControl\Callbacks\CallbackManager;
 use ManiaControl\Formatter;
 use ManiaControl\ManiaControl;
+use ManiaControl\Statistics\StatisticManager;
 
 /**
  * Class managing players
@@ -66,7 +67,7 @@ class PlayerManager implements CallbackListener {
 
 		// Define player stats
 		$this->maniaControl->statisticManager->defineStatMetaData(self::STAT_JOIN_COUNT);
-		$this->maniaControl->statisticManager->defineStatMetaData(self::STAT_PLAYTIME);
+		$this->maniaControl->statisticManager->defineStatMetaData(self::STAT_PLAYTIME, StatisticManager::STAT_TYPE_TIME);
 	}
 
 	/**
diff --git a/application/core/Statistics/StatisticCollector.php b/application/core/Statistics/StatisticCollector.php
index 395f97ac..a6cea06e 100644
--- a/application/core/Statistics/StatisticCollector.php
+++ b/application/core/Statistics/StatisticCollector.php
@@ -30,6 +30,9 @@ class StatisticCollector implements CallbackListener {
 	const STAT_ON_DEATH                  = 'Deaths';
 	const STAT_ON_PLAYER_REQUEST_RESPAWN = 'Respawns';
 	const STAT_ON_KILL                   = 'Kills';
+
+	const SPECIAL_STAT_KILL_DEATH_RATIO = 'Kill / Death';
+
 	/**
 	 * Private Properties
 	 */
diff --git a/application/core/Statistics/StatisticManager.php b/application/core/Statistics/StatisticManager.php
index 1b74523c..3637fce3 100644
--- a/application/core/Statistics/StatisticManager.php
+++ b/application/core/Statistics/StatisticManager.php
@@ -21,7 +21,8 @@ class StatisticManager {
 	const TABLE_STATMETADATA = 'mc_statmetadata';
 	const TABLE_STATISTICS   = 'mc_statistics';
 
-	const STAT_TYPE_INT = '0';
+	const STAT_TYPE_INT  = '0';
+	const STAT_TYPE_TIME = '1';
 
 	/**
 	 * Public Properties
@@ -59,8 +60,8 @@ class StatisticManager {
 	 */
 	public function getStatisticData($statName, $playerId, $serverLogin = false) {
 		$serverId = 0; //Temporary
-		$mysqli = $this->maniaControl->database->mysqli;
-		$statId = $this->getStatId($statName);
+		$mysqli   = $this->maniaControl->database->mysqli;
+		$statId   = $this->getStatId($statName);
 
 		if($statId == null) {
 			return -1;
@@ -146,7 +147,7 @@ class StatisticManager {
 	 */
 	public function insertStat($statName, $player, $serverLogin = '', $value, $statType = self::STAT_TYPE_INT) {
 		$serverId = 0; //Temporary
-		$statId = $this->getStatId($statName);
+		$statId   = $this->getStatId($statName);
 
 		if($player == null) {
 			return false;
@@ -207,29 +208,32 @@ class StatisticManager {
 		return $this->insertStat($statName, $player, $serverLogin, 1);
 	}
 
+
 	/**
 	 * Defines a Stat
 	 *
-	 * @param string $statName
-	 * @param string $statDescription
+	 * @param        $statName
 	 * @param string $type
+	 * @param string $statDescription
 	 * @return bool
 	 */
-	public function defineStatMetaData($statName, $statDescription = '', $type = self::STAT_TYPE_INT) {
+	public function defineStatMetaData($statName, $type = self::STAT_TYPE_INT, $statDescription = '') {
 		$mysqli    = $this->maniaControl->database->mysqli;
-		$query     = "INSERT IGNORE INTO `" . self::TABLE_STATMETADATA . "` (
+		$query     = "INSERT INTO `" . self::TABLE_STATMETADATA . "` (
 					`name`,
 					`type`,
 					`description`
 				) VALUES (
 					?, ?, ?
-				);";
+				) ON DUPLICATE KEY UPDATE
+				`type` = VALUES(`type`),
+				`description` = VALUES(`description`);";
 		$statement = $mysqli->prepare($query);
 		if($mysqli->error) {
 			trigger_error($mysqli->error);
 			return false;
 		}
-		$statement->bind_param('sss', $statName, $type, $statDescription);
+		$statement->bind_param('sis', $statName, $type, $statDescription);
 		$statement->execute();
 		if($statement->error) {
 			trigger_error($statement->error);
@@ -253,7 +257,7 @@ class StatisticManager {
 		$query  = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_STATMETADATA . "` (
 				`index` int(11) NOT NULL AUTO_INCREMENT,
 				`name` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
-				`type` varchar(100) COLLATE utf8_unicode_ci NOT NULL,
+				`type` int(5) NOT NULL,
 				`description` varchar(150) COLLATE utf8_unicode_ci,
 				PRIMARY KEY (`index`),
 				UNIQUE KEY `name` (`name`)