From 667402bfc053e5cfe9ad6fdbcbe9df2045cfb9fe Mon Sep 17 00:00:00 2001
From: Jordy <sleeubusjordy@hotmail.com>
Date: Sun, 11 Sep 2016 22:41:54 +0200
Subject: [PATCH] - Removed the statistics system. - Removed an unused event
 handler.

---
 c_core.lua       |  34 +--------
 meta.xml         |   3 +-
 s_core.lua       |   4 +-
 s_settings.lua   |  33 ++-------
 s_statistics.lua | 187 -----------------------------------------------
 5 files changed, 11 insertions(+), 250 deletions(-)
 delete mode 100644 s_statistics.lua

diff --git a/c_core.lua b/c_core.lua
index 30cd64a..8d7590f 100644
--- a/c_core.lua
+++ b/c_core.lua
@@ -113,7 +113,7 @@ function Core.onSettingsReceived(lSettingsTable)
 	end
 	
 	if(Core.g_SettingsTable["enablecredits"]["value"]) then
-		outputChatBox("#3A85D6[Anti-Bounce]: #ffffffv2.4.0 has been created by #368DEBArezu #ffffffand #368DEB"
+		outputChatBox("#3A85D6[Anti-Bounce]: #ffffffv2.5.0 has been created by #368DEBArezu #ffffffand #368DEB"
 			.."MegaDreams#ffffff.",255,255,255,true)
 	end
 	
@@ -129,14 +129,8 @@ function Core.onSettingsReceived(lSettingsTable)
 	
 	Core.g_LastCheck = getRealTime().timestamp
 	
-	if(Core.g_SettingsTable["enableplayerstats"]["value"] == true) then
-		Core.updateUsageInfo()
-		setTimer(Core.updateUsageInfo,180000,0)
-	end
-	
 	addCommandHandler("bouncedebug",Core.toggleDebug)
 	
-	addEventHandler("onClientVehicleCollision",Core.g_Root,Core.onVehicleCollision)
 	addEventHandler("onClientPreRender",Core.g_Root,Core.onPreRender)
 	addEventHandler("onClientRender",Core.g_Root,Core.onDebugRender)
 	triggerEvent("onAntiBouncedLoaded",Core.g_Root)
@@ -144,20 +138,6 @@ end
 addEvent("onSettingsReceived",true)
 addEventHandler("onSettingsReceived",Core.g_ResourceRoot,Core.onSettingsReceived)
 
-function Core.updateUsageInfo()
-	if not (Core.g_bABEnabled) then
-		Core.g_UsageTable["time_disabled"] = Core.g_UsageTable["time_disabled"] + (getRealTime().timestamp - Core.g_LastCheck)
-	else
-		Core.g_UsageTable["time_enabled"] = Core.g_UsageTable["time_enabled"] + (getRealTime().timestamp - Core.g_LastCheck)
-	end
-
-	Core.g_LastCheck = getRealTime().timestamp
-	
-	Core.g_UsageTable["uuid"] = Preferences:generateUniqueId()
-	Core.g_UsageTable["code"] = sha256(getPlayerSerial())
-	setElementData(localPlayer,"ab.player.usage",Core.g_UsageTable,true)
-end
-
 function Core:toggleBounce()
 	Core.g_bABEnabled = not Core.g_bABEnabled
 	
@@ -168,17 +148,7 @@ function Core:toggleBounce()
 			outputChatBox(Core.g_SettingsTable["togglemessage"]["value"]:gsub("%%1",Core.g_SettingsTable["disabledmessage"]["value"]),255,255,255,true)
 		end
 	end
-	
-	if(Core.g_SettingsTable["enableplayerstats"]["value"] == true) then
-		if(Core.g_bABEnabled) then
-			Core.g_UsageTable["time_disabled"] = Core.g_UsageTable["time_disabled"] + (getRealTime().timestamp - Core.g_LastCheck)
-		else
-			Core.g_UsageTable["time_enabled"] = Core.g_UsageTable["time_enabled"] + (getRealTime().timestamp - Core.g_LastCheck)
-		end
 
-		Core.g_LastCheck = getRealTime().timestamp
-	end
-	
 	Preferences:updatePreferences()
 	triggerEvent("onAntiBounceToggled",Core.g_Root,Core.g_bABEnabled)
 end
@@ -224,7 +194,7 @@ function Core:onDebugRender()
 		return
 	end
 	
-	dxDrawText("== Anti-Bounce (v2.4.0) Debug ==", Core.g_ScreenW-conv(250), Core.g_ScreenH-conv(165), 0, 0, 
+	dxDrawText("== Anti-Bounce (v2.5.0) Debug ==", Core.g_ScreenW-conv(250), Core.g_ScreenH-conv(165), 0, 0, 
 		tocolor(255, 255, 255, 255), conv(1), "default","left","top",false,false,false,true)
 	
 	if(Core.g_bABEnabled) then
diff --git a/meta.xml b/meta.xml
index 40255ab..dc4b3ff 100644
--- a/meta.xml
+++ b/meta.xml
@@ -1,5 +1,5 @@
 <meta>
-	<info author="Arezu and MegaDreams" name="Anti-Bounce" version="2.4.0" description="Anti-Bounce" type="misc" />
+	<info author="Arezu and MegaDreams" name="Anti-Bounce" version="2.5.0" description="Anti-Bounce" type="misc" />
 	
 	<script src="c_core.lua" type="client" cache="false" />
 	<script src="c_preferences.lua" type="client" cache="false" />
@@ -8,7 +8,6 @@
 	<script src="s_core.lua" type="server" />
 	<script src="s_settings.lua" type="server" />
 	<script src="s_updater.lua" type="server" />
-	<script src="s_statistics.lua" type="server" />
 	
 	<oop>true</oop>
 </meta>
\ No newline at end of file
diff --git a/s_core.lua b/s_core.lua
index 111f386..20121a5 100644
--- a/s_core.lua
+++ b/s_core.lua
@@ -41,7 +41,7 @@ Core.g_Root = getRootElement()
 Core.g_ThisResource = Resource:getThis()
 Core.g_ResourceRoot = Core.g_ThisResource:getRootElement()
 
-Core.VERSION = 240
+Core.VERSION = 250
 
 ----------------------
 -- Functions/Events
@@ -50,7 +50,5 @@ Core.VERSION = 240
 function Core:onResourceStart()
 	Settings:loadSettings()
 	Updater:setup()
-	
-	Statistics:setup()
 end
 addEventHandler("onResourceStart",Core.g_ResourceRoot,Core.onResourceStart)
\ No newline at end of file
diff --git a/s_settings.lua b/s_settings.lua
index 904d4e6..dc7dbc9 100644
--- a/s_settings.lua
+++ b/s_settings.lua
@@ -120,14 +120,17 @@ Settings.g_SettingsTable = {
 	["enablestats"] = {
 		["value"] = true,
 		["value_type"] = 0,
+		["removed"] = true
 	},
 	["enablesettingstats"] = {
 		["value"] = true,
 		["value_type"] = 0,
+		["removed"] = true
 	},
 	["enableplayerstats"] = {
 		["value"] = true,
 		["value_type"] = 0,
+		["removed"] = true
 	},
 }
 
@@ -152,6 +155,10 @@ function Settings:loadSettings()
 		
 		if(Settings.g_SettingsTable[lNodeName] ~= nil) then
 			if(Settings.g_SettingsTable[lNodeName]["value"] ~= nil) then
+				if(Settings.g_SettingsTable[lNodeName]["removed"]) then
+					outputDebugString("[Anti-Bounce]: Setting '"..lNodeName.."' has been removed. Please remove it from your configuration.",0,58,133,214)
+				end
+				
 				local lValue = lNode:getValue()
 				
 				if(lValue ~= false and lValue ~= "") then
@@ -346,32 +353,6 @@ function Settings:createConfigurationFile()
 		Default: ]]..tostring(Settings.g_SettingsTable["updatechecktimer"]["value"])..[[ 
 	-->
 	<updatechecktimer>]]..tostring(Settings.g_SettingsTable["updatechecktimer"]["value"])..[[</updatechecktimer>
-	
-	<!-- 
-		 Allows various statistics to be send to our database. This allows us to get a good idea about the usage of the Anti-Bounce
-		 and on what it runs. This allows us to improve the Anti-Bounce on the right moments. This information is sent anonymously
-		 with the use of an unique ID we cannot link to any server at all.
-		 
-		 true = enabled, false = disabled, Default: ]]..tostring(Settings.g_SettingsTable["enablestats"]["value"])..[[ 
-	-->
-	<enablestats>]]..tostring(Settings.g_SettingsTable["enablestats"]["value"])..[[</enablestats>
-	
-	<!-- 
-		 When enabled this allows some of your settings to be sent when collecting statistics.
-		 
-		 true = enabled, false = disabled, Default: ]]..tostring(Settings.g_SettingsTable["enablesettingstats"]["value"])..[[ 
-	-->
-	<enablesettingstats>]]..tostring(Settings.g_SettingsTable["enablesettingstats"]["value"])..[[</enablesettingstats>
-		
-	<!-- 
-		 When enabled this allows some data of the usage of the Anti-Bounce to be sent when collecting statistics.
-		 This one is the most important one when it comes to giving us an idea on how to improve our script.
-		 This information is sent anonymously with the usage of an unique ID instead of an IP or serial. We cannot
-		 trace this unique ID back to the player him or herself.
-		 
-		 true = enabled, false = disabled, Default: ]]..tostring(Settings.g_SettingsTable["enableplayerstats"]["value"])..[[ 
-	-->
-	<enableplayerstats>]]..tostring(Settings.g_SettingsTable["enableplayerstats"]["value"])..[[</enableplayerstats>
 </config>]])
 	
 	lConfigFile:close()
diff --git a/s_statistics.lua b/s_statistics.lua
deleted file mode 100644
index f611194..0000000
--- a/s_statistics.lua
+++ /dev/null
@@ -1,187 +0,0 @@
------------------ Anti-Bounce ----------------------
--- * The MIT License (MIT)
--- * 
--- * Copyright (c) 2016 Aleksi "Arezu" Lindeman and Jordy "Megadreams" Sleeubus
--- * 
--- * Permission is hereby granted, free of charge, to any person obtaining a copy
--- * of this software and associated documentation files (the "Software"), to deal
--- * in the Software without restriction, including without limitation the rights
--- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
--- * copies of the Software, and to permit persons to whom the Software is
--- * furnished to do so, subject to the following conditions:
--- * 
--- * The above copyright notice and this permission notice shall be included in all
--- * copies or substantial portions of the Software.
--- * 
--- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
--- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
--- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
--- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
--- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
--- * SOFTWARE.
----------------------------------------------------
-
---[[------------------
-* We highly discourage
-* directly editing the
-* scripts. Please use
-* the customization
-* possibilities.
---------------------]]
-
-----------------------
--- Variables
-----------------------
-
-Statistics = {}
-Statistics = setmetatable({},{__index = Statistics})
-
-Statistics.g_bDoubleSent = false
-Statistics.g_bDataSent = false
-
-----------------------
--- Functions/Events
-----------------------
-
-function Statistics:setup()
-	if(Settings.g_SettingsTable["enablestats"]["value"] == false) then
-		return
-	end
-	
-	Statistics:sendServerStatistics()
-	
-	if(Settings.g_SettingsTable["enableplayerstats"]["value"] == true) then
-		setTimer(Statistics.sendPlayerData,900000,0)
-	end
-end
-
-function Statistics:sendServerStatistics()
-	local lStatisticData = {
-		["uuid"] = Statistics:generateUniqueId(),
-		["data"] = {
-			["version"] = Core.VERSION,
-			["mta-version-data"] = getVersion(),
-			["fps-limit"] = getFPSLimit()
-		}
-	}
-	
-	if(Settings.g_SettingsTable["enablesettingstats"]["value"] == true) then
-		lStatisticData["settings"] = {
-			["enablecredits"] = Settings.g_SettingsTable["enablecredits"],
-			["defaultstate"] = Settings.g_SettingsTable["defaultstate"],
-			["bouncecommands"] = Settings.g_SettingsTable["bouncecommands"],
-			["bouncebind"] = Settings.g_SettingsTable["bouncebind"],
-			["checkupdates"] = Settings.g_SettingsTable["checkupdates"],
-			["updatechecktimer"] = Settings.g_SettingsTable["updatechecktimer"],
-			["enableplayerstats"] = Settings.g_SettingsTable["enableplayerstats"]
-		}
-	end
-	
-	fetchRemote("http://ultimateairgamers.com/mta/anti-bounce/stats.php?type=server&uuid="..lStatisticData["uuid"], 
-		Statistics.onServerDataSent, tostring(toJSON(lStatisticData):gsub(" ","")), false)
-end
-
-function Statistics.sendPlayerData()
-	local lStatisticData = {
-		["uuid"] = Statistics:generateUniqueId(),
-		["data"] = {}
-	}
-	
-	for _,lPlayer in pairs(getElementsByType("player")) do
-		local lUsageData = getElementData(lPlayer,"ab.player.usage")
-		if(lUsageData ~= nil and lUsageData ~= false) then
-			if(type(lUsageData) == "table") then
-				local lPlayerUUID = lUsageData["uuid"]
-				lUsageData["uuid"] = nil
-				lUsageData["signed_code"] = sha256(getPlayerSerial(lPlayer))
-				lStatisticData["data"][lPlayerUUID] = lUsageData
-			end
-		end
-	end
-	
-	fetchRemote("http://ultimateairgamers.com/mta/anti-bounce/stats.php?type=playerdata&uuid="..lStatisticData["uuid"], Statistics.onPlayerDataSent, 
-		tostring(toJSON(lStatisticData):gsub(" ","")), false)
-end
-
-function Statistics.onPlayerDataSent(lResponseData, lErrno)
-    if lErrno == 0 then
-		if(lResponseData == "server_blacklisted") then
-			return
-		end
-		
-		if(lResponseData == "invalid_uuid") then
-			if(File.exists("uuid.json")) then
-				File.delete("uuid.json")
-			end
-
-			return
-		end
-		
-		if(lResponseData == "maintenance") then
-			return
-		end
-		
-		triggerClientEvent("onUsageResetRequest",Core.g_ResourceRoot)
-	end
-end
-
-function Statistics.onServerDataSent(lResponseData, lErrno)
-    if lErrno == 0 then
-		if(lResponseData == "server_blacklisted") then
-			Utils:outputMessageToAdmins("#3A85D6[Anti-Bounce]: #ffffffYour server appears to be on the statistic system' blacklist.",255,255,255,true)
-			return
-		end
-		
-		if(lResponseData == "invalid_uuid") then
-			if(Statistics.g_bDoubleSent == false) then
-				Statistics.g_bDoubleSent = true
-				
-				if(File.exists("uuid.json")) then
-					File.delete("uuid.json")
-				end
-				Statistics:sendServerStatistics()
-				
-				return
-			end
-		end
-		
-		if(lResponseData == "maintenance") then
-			Utils:outputMessageToAdmins("#3A85D6[Anti-Bounce]: #ffffffThe statistics service is currently having maintenance. We'll try to sent "
-				.."the data again in an hour.",255,255,255,true)
-			setTimer(Statistics.sendServerStatistics,3600000,1)
-			return
-		end
-		
-		Statistics.g_bDataSent = true
-	end
-end
-
-function Statistics:generateUniqueId()
-	if(File.exists("uuid.json")) then
-		local lSuccess,lRet = pcall(Statistics.readUniqueId)
-		
-		if(lSuccess) then
-			return lRet
-		end
-		
-		File.delete("uuid.json")
-	end
-	
-	local lHash = md5(tostring(getServerPort() + getTickCount() / math.random() * math.random(math.random(9999) * math.random(9999)))):lower()
-	local lUUID = lHash:sub(0,8).."-"..lHash:sub(9,12).."-"..lHash:sub(13,16).."-"..lHash:sub(16,19).."-"..lHash:sub(20,31)
-	
-	local lFile = File.new("uuid.json")
-	lFile:write(toJSON({["uuid"] = lUUID}))
-	lFile:destroy()
-	
-	return lUUID
-end
-
-function Statistics.readUniqueId()
-	local lFile = File.create("uuid.json")
-	local lData = fromJSON(lFile:read(lFile:getSize()))
-	lFile:destroy()
-	
-	return lData['uuid']
-end