From 3cecfc300738f572ccec4626a06163e46a6fa567 Mon Sep 17 00:00:00 2001
From: kremsy <lukas@esc-clan.net>
Date: Sat, 9 Nov 2013 20:17:42 +0100
Subject: [PATCH] begin of playerclass

---
 application/.idea/workspace.xml | 149 +++++++++++++++++++++++---------
 application/core/core.php       |  14 ++-
 2 files changed, 122 insertions(+), 41 deletions(-)

diff --git a/application/.idea/workspace.xml b/application/.idea/workspace.xml
index b3b2d00c..f2d8d094 100644
--- a/application/.idea/workspace.xml
+++ b/application/.idea/workspace.xml
@@ -23,10 +23,57 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="core.php" pinned="false" current="true" current-in-tab="true">
+      <file leaf-file-name="player.php" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/player.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="26" column="23" selection-start="417" selection-end="417" vertical-scroll-proportion="-17.0" vertical-offset="0" max-vertical-offset="11577">
+              <folding>
+                <element signature="e#6#85#0" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="playerHandler.php" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/playerHandler.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="28" column="0" selection-start="507" selection-end="507" vertical-scroll-proportion="-15.038462" vertical-offset="0" max-vertical-offset="1054">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="chat.php" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/core/chat.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="31" column="45" selection-start="452" selection-end="452" vertical-scroll-proportion="0.536643" vertical-offset="73" max-vertical-offset="1547">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="database.php" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/core/database.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="21" column="0" selection-start="264" selection-end="296" vertical-scroll-proportion="-13.730769" vertical-offset="0" max-vertical-offset="6919">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="core.php" pinned="false" current="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/core/core.php">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="117" column="33" selection-start="2501" selection-end="2501" vertical-scroll-proportion="0.6572104" vertical-offset="1433" max-vertical-offset="6647">
+            <state line="38" column="16" selection-start="982" selection-end="982" vertical-scroll-proportion="-8.5" vertical-offset="0" max-vertical-offset="6817">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="chatlog.plugin.php" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/plugins/oldstructure/chatlog.plugin.php">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="40" column="118" selection-start="631" selection-end="741" vertical-scroll-proportion="-20.26923" vertical-offset="153" max-vertical-offset="1547">
               <folding />
             </state>
           </provider>
@@ -55,14 +102,16 @@
         <option value="$PROJECT_DIR$/core/stats.php" />
         <option value="$PROJECT_DIR$/core/chat.php" />
         <option value="$PROJECT_DIR$/core/callbacks.php" />
+        <option value="$PROJECT_DIR$/core/player.php" />
+        <option value="$PROJECT_DIR$/core/playerHandler.php" />
         <option value="$PROJECT_DIR$/core/core.php" />
       </list>
     </option>
   </component>
   <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
   <component name="ProjectFrameBounds">
-    <option name="x" value="618" />
-    <option name="y" value="35" />
+    <option name="x" value="376" />
+    <option name="y" value="13" />
     <option name="width" value="1936" />
     <option name="height" value="1056" />
   </component>
@@ -110,6 +159,24 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
+          <PATH>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="application" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="application" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="plugins" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="oldstructure" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+          </PATH>
           <PATH>
             <PATH_ELEMENT>
               <option name="myItemId" value="application" />
@@ -224,7 +291,7 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="618" y="35" width="1936" height="1056" extended-state="0" />
+    <frame x="376" y="13" width="1936" height="1056" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -283,25 +350,6 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/ManiaControl.sh">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="777" />
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/configs/core.ManiaControl.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="777">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/configs/plugins.ManiaControl.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="11" column="0" selection-start="363" selection-end="363" vertical-scroll-proportion="0.24066924" vertical-offset="0" max-vertical-offset="777">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/configs/database.ManiaControl.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" vertical-offset="0" max-vertical-offset="777">
@@ -323,13 +371,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/database.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="68" column="14" selection-start="1719" selection-end="1721" vertical-scroll-proportion="1.4407989" vertical-offset="146" max-vertical-offset="6919">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/core/commands.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="20" column="33" selection-start="0" selection-end="21192" vertical-scroll-proportion="0.4122682" vertical-offset="51" max-vertical-offset="11730">
@@ -365,13 +406,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/core/chat.php">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="31" column="45" selection-start="452" selection-end="452" vertical-scroll-proportion="-15.5" vertical-offset="124" max-vertical-offset="1547">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/core/callbacks.php">
       <provider selected="true" editor-type-id="text-editor">
         <state line="42" column="16" selection-start="0" selection-end="5670" vertical-scroll-proportion="0.24113475" vertical-offset="510" max-vertical-offset="3349">
@@ -386,9 +420,46 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/core/database.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="21" column="0" selection-start="264" selection-end="296" vertical-scroll-proportion="-13.730769" vertical-offset="0" max-vertical-offset="6919">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/plugins/oldstructure/chatlog.plugin.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="40" column="118" selection-start="631" selection-end="741" vertical-scroll-proportion="-20.26923" vertical-offset="153" max-vertical-offset="1547">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/player.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="26" column="23" selection-start="417" selection-end="417" vertical-scroll-proportion="-17.0" vertical-offset="0" max-vertical-offset="11577">
+          <folding>
+            <element signature="e#6#85#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/playerHandler.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="28" column="0" selection-start="507" selection-end="507" vertical-scroll-proportion="-15.038462" vertical-offset="0" max-vertical-offset="1054">
+          <folding />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/core/core.php">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="117" column="33" selection-start="2501" selection-end="2501" vertical-scroll-proportion="0.6572104" vertical-offset="1433" max-vertical-offset="6647">
+        <state line="38" column="16" selection-start="982" selection-end="982" vertical-scroll-proportion="-8.5" vertical-offset="0" max-vertical-offset="6817">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/core/chat.php">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="31" column="45" selection-start="452" selection-end="452" vertical-scroll-proportion="0.536643" vertical-offset="73" max-vertical-offset="1547">
           <folding />
         </state>
       </provider>
diff --git a/application/core/core.php b/application/core/core.php
index 1b8598dc..4ed6fa73 100644
--- a/application/core/core.php
+++ b/application/core/core.php
@@ -14,6 +14,9 @@ require_once __DIR__ . '/server.php';
 require_once __DIR__ . '/stats.php';
 require_once __DIR__ . '/tools.php';
 require_once __DIR__ . '/pluginHandler.php';
+require_once __DIR__ . '/plugin.php';
+require_once __DIR__ . '/playerHandler.php';
+require_once __DIR__ . '/player.php';
 require_once __DIR__ . '/manialinkIdHandler.php';
 list($endiantest) = array_values(unpack('L1L', pack('V', 1)));
 if ($endiantest == 1) {
@@ -72,7 +75,7 @@ class ManiaControl {
 	/**
 	 * Private properties
 	 */
-	private $plugins = array();
+	//private $plugins = array();
 
 	private $shutdownRequested = false;
 
@@ -99,6 +102,9 @@ class ManiaControl {
 		// Load authentication
 		$this->authentication = new Authentication($this);
 
+        // Load playerHandler
+        $this->playerHandler = new PlayerHandler($this);
+
         // Load manialinkidHandler
         $this->manialinkIdHandler = new ManialinkIdHandler();
 
@@ -115,7 +121,7 @@ class ManiaControl {
 		$this->callbacks->registerCallbackHandler(Callbacks::CB_MP_ENDMAP, $this, 'handleEndMap');
 
         // Set ManiaControl version
-        $this->version = VERSION;
+        $this->version = self::VERSION;
 	}
 
 	/**
@@ -301,6 +307,10 @@ class ManiaControl {
 				}
 			}
 		}
+
+        $this->client->query('GetPlayerList', 300, 0, 2);
+        $this->playerHandler->addPlayerList($this->client->getResponse());
+
 	}
 
 	/**