From 3fcc6512620126a3fd0cf484e7fe5dc4c91d8286 Mon Sep 17 00:00:00 2001
From: Pauli Jokela <pauli.jokela@didstopia.com>
Date: Fri, 16 Dec 2016 21:44:07 +0200
Subject: [PATCH 1/2] Error fixing and code cleanup

---
 .DS_Store            | Bin 0 -> 6148 bytes
 html/playerXp.html   |  42 ------------
 html/playerlist.html |  20 +-----
 index.html           |   1 -
 js/console.js        |   2 +-
 js/playerXp.js       | 149 -------------------------------------------
 js/rconService.js    |   6 ++
 7 files changed, 9 insertions(+), 211 deletions(-)
 create mode 100644 .DS_Store
 delete mode 100644 html/playerXp.html
 delete mode 100644 js/playerXp.js

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..dee0e3ef6901846f5ae79a82155c4009b8f6a42b
GIT binary patch
literal 6148
zcmeH~u?oUK42Bc!P;lw!c#99<8yrQSpfBJc2qF~}o$t~8lgnatmLh*3`7XJJw*Sy;
zL`3_?aVye^NDDX0#=^uD`9jWee-5|tave{|t!B2U@Eo;HCi}5XPys4H1*iZOpaL^e
zAkOi2HKS+Zqfh}VFb@Un`;g$q94wXo=|J!i0Blfp!`f#FFj)c2!BU9|Ok;Y`XjLCW
ztnTe#itBQ)RMvLU7(O)atTx5Kw6=>TBrwem1}Z=WCJHQT-r4!Thku*@CoN2=02TN%
z1+>`>yB;qUXY0r7S^W@ITNgO!mm|FW1R$}acnx>MezFCagQXG`7=Hv@1_mndQw3g)
C!VpCO

literal 0
HcmV?d00001

diff --git a/html/playerXp.html b/html/playerXp.html
deleted file mode 100644
index 53bb2d4..0000000
--- a/html/playerXp.html
+++ /dev/null
@@ -1,42 +0,0 @@
-
-<div ng-controller="PlayerXpController" id="PlayerXpController">
-
-	<div class="row">
-		<div class="col-md-12">
-			<h2>
-				Statistics for player: <a href="#/{{address}}/player/{{userid}}/">{{userid}}</a>
-			</h2>
-		</div>
-	</div>
-
-	<div class="row">
-		<div class="col-md-12">
-			<h3>Xp Income Sources</h3>
-			<h5>Where has this user got their Xp from</h5>
-			<div class="panel">
-				<nvd3 options="Sources.Options" data="Sources.Data"></nvd3>
-			</div>
-		</div>
-	</div>
-
-	<div class="row">
-		<div class="col-md-12">
-			<h3>Xp Outgoing Sources</h3>
-			<h5>Where has this user spent their Xp</h5>
-			<div class="panel">
-				<nvd3 flex options="Outgoings.Options" data="Outgoings.Data"></nvd3>
-			</div>
-		</div>
-	</div>
-	
-	<div class="row">
-		<div class="col-md-12">
-					<h3>Xp Over Time</h3>
-					<h5>How much XP has this user got over time</h5>
-			<div class="panel">
-				<nvd3 flex options="OverTime.Options" data="OverTime.Data"></nvd3>
-			</div>
-		</div>
-	</div>
-
-</div>
\ No newline at end of file
diff --git a/html/playerlist.html b/html/playerlist.html
index d80d469..297abea 100644
--- a/html/playerlist.html
+++ b/html/playerlist.html
@@ -18,10 +18,8 @@
 							<th>Actions</th>
 
 							<th ng-click="Order( 'DisplayName' )" ng-class="SortClass( 'DisplayName' )">Username</th>
-							<th class="text-right" ng-click="Order( 'SteamID' )" ng-class="SortClass( 'SteamID' )">Steamid</th>
-							<th class="text-right" ng-click="Order( 'VoiationLevel' )" ng-class="SortClass( 'VoiationLevel' )">Voilation</th>
-							<th class="text-right" ng-click="Order( 'CurrentLevel' )" ng-class="SortClass( 'CurrentLevel' )">Level</th>
-							<th class="text-right" ng-click="Order( 'UnspentXp' )" ng-class="SortClass( 'UnspentXp' )">XP</th>
+							<th class="text-right" ng-click="Order( 'SteamID' )" ng-class="SortClass( 'SteamID' )">Steam ID</th>
+							<th class="text-right" ng-click="Order( 'VoiationLevel' )" ng-class="SortClass( 'VoiationLevel' )">Violation Level</th>
 							<th class="text-right" ng-click="Order( 'Address' )" ng-class="SortClass( 'Address' )">Address</th>
 							<th class="text-right" ng-click="Order( 'Ping' )" ng-class="SortClass( 'Ping' )">Ping</th>
 							<th class="text-right" ng-click="Order( 'ConnectedSeconds' )" ng-class="SortClass( 'ConnectedSeconds' )">Duration</th>
@@ -35,12 +33,6 @@
 							    	<span class="glyphicon glyphicon-cog"></span> <span class="caret"></span>
 							  	</button>
 							  	<ul class="dropdown-menu">
-							  		<li>
-								    	<a href="#/{{address}}/player/{{line.SteamID}}/xp">
-											<span class="glyphicon glyphicon-education"></span>
-											XP Info
-										</a>
-								    </li>
 								    <li>
 								    	<a href="http://www.steamcommunity.com/profiles/{{line.SteamID}}" target="_blank">
 											<span class="glyphicon glyphicon-info-sign"></span>
@@ -70,14 +62,6 @@
 							{{line.VoiationLevel}}
 						</td>
 
-						<td class="text-right">
-							{{line.CurrentLevel}}
-						</td>
-
-						<td class="text-right">
-							<a href="#/{{address}}/player/{{line.SteamID}}/xp">{{line.UnspentXp}}</a>
-						</td>
-
 						<td class="text-right">
 							{{line.Address}}
 						</td>
diff --git a/index.html b/index.html
index c1c4fad..b18b5c8 100644
--- a/index.html
+++ b/index.html
@@ -81,7 +81,6 @@
     <script src="js/console.js"></script>
     <script src="js/playerlist.js"></script>
     <script src="js/playerInfo.js"></script>
-    <script src="js/playerXp.js"></script>
     <script src="js/chat.js"></script>
 	
   </body>
diff --git a/js/console.js b/js/console.js
index 699bafc..af065a3 100644
--- a/js/console.js
+++ b/js/console.js
@@ -114,7 +114,7 @@ function ConsoleController( $scope, rconService, $timeout )
 	}
 
 	//
-	// Calls console.tail - which returns the last 256 entries from the console.
+	// Calls console.tail - which returns the last 128 entries from the console.
 	// This is then added to the console
 	//
 	$scope.GetHistory = function ()
diff --git a/js/playerXp.js b/js/playerXp.js
deleted file mode 100644
index 042e3de..0000000
--- a/js/playerXp.js
+++ /dev/null
@@ -1,149 +0,0 @@
-
-app.controller( 'PlayerXpController', PlayerXpController );
-
-
-
-function PlayerXpController( $scope, rconService, $routeParams )
-{
-	$scope.userid = $routeParams.userid;
-
-	$scope.Sources =
-	{
-		Options: {
-			chart: {
-				type: "pieChart",
-				height: 400,
-				x: function ( d ) { return d.key; },
-				y: function ( d ) { return d.value; },
-				showLabels : false
-			}
-		}
-	};
-
-	$scope.Outgoings =
-	{
-		Options: {
-			chart: {
-				type: "pieChart",
-				height: 400,
-				x: function ( d ) { return d.key; },
-				y: function ( d ) { return d.value; },
-				showLabels: false
-			}
-		}
-	};
-
-	$scope.OverTime =
-		{
-			Options: {
-				chart: {
-					type: "multiBarChart",
-					height: 700,
-					stacked: true,
-					x: function ( d ) { return d[0]; },
-					y: function ( d ) { return Math.round( d[1] * 10 ) / 10; },
-					showLabels: false,
-					xAxis: { showMaxMin: false, tickFormat: function ( d ) { return d3.time.format( '%d %b %H%p' )( new Date( d ) ) } },
-					yAxis: { tickFormat: function ( d ) { return d3.format( ',.2f' )( d ); } },
-					clipEdge: true,
-					useInteractiveGuideline: true,
-					defined: function(d) { return d[0] != null }
-				}
-			}
-		}
-
-	$scope.Refresh = function ()
-	{
-		rconService.Request( "xp.history " + $scope.userid, $scope, function ( msg )
-		{
-			$scope.History = JSON.parse( msg.Message );
-
-			$scope.Sources.Data = Enumerable.From( $scope.History )
-				.Where( function ( x ) { return x.Amount > 0; } )
-				.GroupBy( "$.Type", null,
-                 function ( key, g )
-                 {
-                 	return {
-                 		key: key,
-                 		value: g.Sum( "$.Amount" )
-                 	}
-                 } )
-				.ToArray();
-
-			$scope.Outgoings.Data = Enumerable.From( $scope.History )
-				.Where( function ( x ) { return x.Amount < 0; } )
-				.GroupBy( "$.Type", null,
-                 function ( key, g )
-                 {
-                 	return {
-                 		key: key,
-                 		value: -1 * g.Sum( "$.Amount" )
-                 	}
-                 } )
-				.ToArray();
-
-			var Hour = 60 * 60;
-
-			$scope.OverTime.Data = FixMissingData( Enumerable.From( $scope.History )
-				.Where( function ( x ) { return x.Amount > 0; } )
-				.GroupBy( "$.Type", null,
-                 function ( key, g )
-                 {
-                 	return {
-                 		key: key,
-                 		values: g.GroupBy( function ( x ) { return Math.round( x.Date / Hour ) * Hour; }, null, function ( key, g )
-                 		{
-                 			return [key * 1000, g.Sum( "$.Amount" )];
-                 		} )
-						.ToArray()
-                 	}
-                 } )
-				.ToArray(), Hour * 1000 );
-
-			console.log( $scope.OverTime.Data );
-		} );
-	}
-
-	rconService.InstallService( $scope, $scope.Refresh )
-}
-
-
-// Fix missing gaps in a range
-function FixMissingData( data, series )
-{
-	// Get the range
-	var min = Enumerable.From( data ).Min( function ( x ) { return Enumerable.From( x.values ).Min( "$[0]" ); } )
-	var max = Enumerable.From( data ).Max( function ( x ) { return Enumerable.From( x.values ).Max( "$[0]" ); } )
-
-	// Fucking Javascript You Cunt
-	data.forEach( function ( d )
-	{
-		var expected = min;
-		var newData = [];
-
-		d.values.forEach( function ( d )
-		{
-			while ( d[0] != expected && expected <= max )
-			{
-				newData.push( [expected, 0.0] );
-				expected += series;
-			}
-
-			if ( d[0] == expected )
-			{
-				newData.push( d );
-				expected += series;
-			}
-		} );
-
-		while ( expected <= max )
-		{
-			newData.push( [expected, 0.0] );
-			expected += series;
-		}
-
-		d.values = newData;
-	} );
-
-	return data;
-}
\ No newline at end of file
diff --git a/js/rconService.js b/js/rconService.js
index 15853fb..aaff497 100644
--- a/js/rconService.js
+++ b/js/rconService.js
@@ -52,6 +52,12 @@ function RconService()
 		if ( identifier == null )
 			identifier = -1;
 
+		if ( s.Socket == null )
+			return;
+		
+		if ( !s.IsConnected )
+			return;
+
 		var packet =
 			{
 				Identifier: identifier,

From 740216d64b168bc1d43f25214e0c2372c15b2e52 Mon Sep 17 00:00:00 2001
From: Pauli Jokela <pauli.jokela@didstopia.com>
Date: Fri, 16 Dec 2016 21:44:30 +0200
Subject: [PATCH 2/2] Cleanup

---
 .DS_Store  | Bin 6148 -> 0 bytes
 .gitignore |   2 ++
 2 files changed, 2 insertions(+)
 delete mode 100644 .DS_Store
 create mode 100644 .gitignore

diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index dee0e3ef6901846f5ae79a82155c4009b8f6a42b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeH~u?oUK42Bc!P;lw!c#99<8yrQSpfBJc2qF~}o$t~8lgnatmLh*3`7XJJw*Sy;
zL`3_?aVye^NDDX0#=^uD`9jWee-5|tave{|t!B2U@Eo;HCi}5XPys4H1*iZOpaL^e
zAkOi2HKS+Zqfh}VFb@Un`;g$q94wXo=|J!i0Blfp!`f#FFj)c2!BU9|Ok;Y`XjLCW
ztnTe#itBQ)RMvLU7(O)atTx5Kw6=>TBrwem1}Z=WCJHQT-r4!Thku*@CoN2=02TN%
z1+>`>yB;qUXY0r7S^W@ITNgO!mm|FW1R$}acnx>MezFCagQXG`7=Hv@1_mndQw3g)
C!VpCO

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..fafff2e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.DS_Store
+Thumbs.db