fixed a bug

Author: thexkey

lua/sqlify/sql_banmanagement.lua

@@ -9,7 +9,7 @@ function ULib.addBan( steamid, time, reason, name, admin )
 	-- No SteamID / Time, stop the script
 	if steamid == nil then return end
 	if time == nil then return end
-	print("DBG1: "..steamid) 
+
 	-- No Name!? Insert a false one
 	if (name == nil) then
 		if SQL_NoSteamName == true then
@@ -27,7 +27,7 @@ function ULib.addBan( steamid, time, reason, name, admin )
 
 	--Setup Admin Information
 	local AdminName = "CONSOLE";
-	local AdminSteam = "0";
+	local AdminSteam = "CONSOLE";
 	if admin != nil && admin:IsPlayer() then
 		AdminName = admin:Nick()
 		AdminSteam = admin:SteamID()
@@ -36,8 +36,8 @@ function ULib.addBan( steamid, time, reason, name, admin )
 	--Are they already banned?
 	local BanStatus = ULX_DB:prepare("SELECT BanID, ban_len FROM ba_bans WHERE steamid = ? LIMIT 1;")
 	local SteamID64 = util.SteamIDTo64(steamid)
-	print("DBG2: "..steamid)
-	print("DBG3: "..SteamID64)
+	print(steamid)
+	print(SteamID64)
 	BanStatus:setString( 1, SteamID64 )
 	function BanStatus.onSuccess()
 		local data = BanStatus:getData()
@@ -92,7 +92,7 @@ function SQL_InsertBan(steamid, name, BanLength, AdminName, AdminSteam, reason)
 	AddBanQuery:setNumber( 9, 0) -- unban_time, will be unset.
 	AddBanQuery:setString( 10, "") -- unban reason, will be unset.
 	AddBanQuery:setNumber( 11, SQL_SERVERID ) -- server ID
-	print("DBG4: "..steamid)
+	print(steamid)
 	function AddBanQuery.onSuccess()
 		print("[ULX SQLify] - Ban Added!");
 		if name == nil then
@@ -116,7 +116,7 @@ function SQL_InsertBan(steamid, name, BanLength, AdminName, AdminSteam, reason)
 	AddBanQuery:start()
 
 	-- Regardless of outcome Kick player From Server
-	RunConsoleCommand('kickid',steamid,"You've been banned from the server ");
+	RunConsoleCommand('kickid',steamid,"You've been banned from the server - Reason: ".. SQL_Escape(reason));
 end
 
 function SQL_ModifyBan(name, BanLength, reason, time, AdminName, steamid)
@@ -130,7 +130,6 @@ function SQL_ModifyBan(name, BanLength, reason, time, AdminName, steamid)
 	UpdateBanQuery:setNumber( 2, BanLength )
 	UpdateBanQuery:setString( 3, SQL_Escape(reason) )
 	local SteamID64 = util.SteamIDTo64(steamid)
-	print("DBG5: "..steamid)
 	UpdateBanQuery:setString( 4, SteamID64 )
 	function UpdateBanQuery.onSuccess()
 		print("[ULX SQLify] - Ban Modified!");
@@ -191,7 +190,6 @@ function ULib.refreshBans()
 	function BanList:onSuccess( data )
 		for i = 1, #data do
 			local LeL = util.SteamIDFrom64(data[i]['steamid'])
-			
 			if data[i]['name'] != nil then
 				table.insert( ULib.bans, tonumber(LeL) )ULib.bans[LeL] = { unban = tonumber(data[i]['ban_len']), admin = data[i]['a_name'], reason = data[i]['reason'], name = data[i]['name'], time = tonumber(data[i]['ban_time']), modified_admin = data[i]['a_name'], modified_time = tonumber(data[i]['ban_time']) }
 			else

lua/sqlify/sql_convert.lua

@@ -4,7 +4,7 @@
 include('sqlify/sql_config.lua')
 ------------------
 local Bans = 0;
-
+--[[
 function SQL_ConvertBan(steamid, name, BanLength, Time, AdminName, AdminSteam, Reason, MAdmin, MTime)
 	--Insert Ban
 	-- local AddBanQuery = ULX_DB:query("INSERT INTO bans VALUES ('','"..steamid.."','"..SQL_Escape(name).."','"..BanLength.."','"..Time.."','"..SQL_Escape(AdminName).."','"..AdminSteam.."','"..SQL_Escape(Reason).."','"..SQL_SERVERID.."','"..MAdmin.."','"..MTime.."');");
@@ -48,3 +48,6 @@ function SQL_Convert()
 end
 
 SQL_Convert();
+]]
+
+--todo: fix this

lua/sqlify/sql_generic.lua

@@ -25,5 +25,6 @@ function SQL_ComIDtoSteamID(cid)
   local a = steam64 % 2 == 0 and 0 or 1
   local b = math.abs(6561197960265728 - steam64 - a) / 2
   local sid = "STEAM_0:" .. a .. ":" .. (a == 1 and b -1 or b)
+  print("sid:"..sid)
   return sid
 end

lua/sqlify/sql_serverheartbeat.lua

@@ -33,18 +33,18 @@ function SQL_QueryDatabaseForServer()
 		-- Query The Database to see if server exists and retrieve the Server's ID
 		if (#data == 0) then
 			-- If Database does not have IP and port create a new row and populate it accordingly
-			print("[ULX GB] - Server not present, creating...");
+			print("[ULX SQLify] - Server not present, creating...");
 			SQL_InsertNewServer()
 		elseif (#data == 1) then
 			-- There should be only one entry
 			SQL_SERVERID = tonumber(row['ServerID']);
 			SQL_UpdateServerName();
-			print("[ULX GB] - ServerID Set To: ".. SQL_SERVERID);
+			print("[ULX SQLify] - ServerID Set To: ".. SQL_SERVERID);
 		else
-			print("[ULX GB] (UpdateName) - Error: Multiple entries found for IPAddress "..IPAddress.." and Port "..HostPort)
+			print("[ULX SQLify] (UpdateName) - Error: Multiple entries found for IPAddress "..IPAddress.." and Port "..HostPort)
 		end
 	end
-	HeartbeatQuery.onError = function(db, err) print('[ULX GB] (HeartbeatQuery) - Error: ', err) end
+	HeartbeatQuery.onError = function(db, err) print('[ULX SQLify] (HeartbeatQuery) - Error: ', err) end
 	HeartbeatQuery:start()
 
 end
@@ -58,9 +58,9 @@ function SQL_UpdateServerName()
   UpdateName:setString( 1, HostName )
   UpdateName:setNumber( 2, SQL_SERVERID )
 	function UpdateName:onSuccess()
-		print("[ULX GB] - Updated HostName Successfully!");
+		print("[ULX SQLify] - Updated HostName Successfully!");
 	end
-	function UpdateName:onError( err, sql ) print('[ULX GB] (UpdateName) - Error: ', err) end
+	function UpdateName:onError( err, sql ) print('[ULX SQLify] (UpdateName) - Error: ', err) end
 	UpdateName:start()
 
 end
@@ -77,11 +77,11 @@ function SQL_InsertNewServer()
   NewServer:setString( 2, HostPort )
   NewServer:setString( 3, HostName )
   function NewServer:onSuccess( data )
-		print("[ULX GB] - Inserted New Server!");
+		print("[ULX SQLify] - Inserted New Server!");
 		SQL_QueryDatabaseForServer()
 	end
 	function NewServer:onError(err)
-		print('[ULX GB] (NewServer) - Error: ', err);
+		print('[ULX SQLify] (NewServer) - Error: ', err);
 		SQL_QueryDatabaseForServer()
 	end
 

lua/sqlify/sql_utimesync.lua

@@ -0,0 +1 @@
+-- not implemented yet