diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..dee0e3e
Binary files /dev/null and b/.DS_Store differ
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 @@
-
-
-
-
-
-
-
-
Xp Income Sources
-
Where has this user got their Xp from
-
-
-
-
-
-
-
-
-
Xp Outgoing Sources
-
Where has this user spent their Xp
-
-
-
-
-
-
-
-
-
Xp Over Time
-
How much XP has this user got over time
-
-
-
-
-
-
-
Actions |
Username |
- Steamid |
- Voilation |
- Level |
- XP |
+ Steam ID |
+ Violation Level |
Address |
Ping |
Duration |
@@ -35,12 +33,6 @@
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,