Merge pull request #8 from Bara20/patch-1

Fixed compile errors with sm1.7

Author: sarabveer

game_upload/addons/sourcemod/scripting/sourcebans.sp

@@ -101,7 +101,7 @@ new Handle:CvarHostIp;
 new Handle:CvarPort;
 
 /* Database handle */
-new Handle:Database;
+new Handle:hDatabase;
 new Handle:SQLiteDB;
 
 /* Menu file globals */
@@ -321,7 +321,7 @@ public OnMapEnd()
 
 public Action:OnClientPreAdminCheck(client)
 {
-	if(!Database)
+	if(!hDatabase)
 		return Plugin_Continue;
 
 	if(GetUserAdmin(client) != INVALID_ADMIN_ID)
@@ -364,7 +364,7 @@ public Native_CheckBans(Handle:plugin, numParams)
 	decl String:sAuth[64];
 	GetNativeString(2, sAuth, sizeof(sAuth));
 	/* Do not check bots nor check player with lan steamid. */
-	if(sAuth[0] == 'B' || sAuth[9] == 'L' || Database == INVALID_HANDLE)
+	if(sAuth[0] == 'B' || sAuth[9] == 'L' || hDatabase == INVALID_HANDLE)
 	{
 		PlayerStatus[client] = true;
 		return;
@@ -376,15 +376,15 @@ public Native_CheckBans(Handle:plugin, numParams)
 #if defined DEBUG
 	LogToFile(logFile, "Checking ban for: %s", sAuth);
 #endif
-	SQL_TQuery(Database, VerifyBan, sQuery, GetClientUserId(client), DBPrio_High);
+	SQL_TQuery(hDatabase, VerifyBan, sQuery, GetClientUserId(client), DBPrio_High);
 
 	FormatEx(sQuery, sizeof(sQuery),  "SELECT * FROM %s_bans WHERE ip='%s' AND RemoveType IS NULL", DatabasePrefix, sIP);
 	new Handle:datapack = CreateDataPack();
 	WritePackCell(datapack, GetClientUserId(client));
 	WritePackString(datapack, sAuth);
 	WritePackString(datapack, sIP);
 	ResetPack(datapack);
-	SQL_TQuery(Database, SQL_CheckIP, sQuery, datapack);
+	SQL_TQuery(hDatabase, SQL_CheckIP, sQuery, datapack);
 }
 
 public SQL_CheckIP(Handle:owner, Handle:hndl, const String:error[], any:datapack)
@@ -428,14 +428,14 @@ public OnRebuildAdminCache(AdminCachePart:part)
 		case AdminCache_Admins:
 			loadAdmins = true;
 	}
-	if(Database == INVALID_HANDLE) {
+	if(hDatabase == INVALID_HANDLE) {
 		if(!g_bConnecting) {
 			g_bConnecting = true;
 			SQL_TConnect(GotDatabase,"sourcebans");
 		}
 	}
 	else {
-		GotDatabase(Database,Database,"",0);
+		GotDatabase(hDatabase,hDatabase,"",0);
 	}
 }
 
@@ -608,7 +608,7 @@ public Action:CommandBanIp(client, args)
 	FormatEx(Query, sizeof(Query), "SELECT bid FROM %s_bans WHERE type = 1 AND ip     = '%s' AND (length = 0 OR ends > UNIX_TIMESTAMP()) AND RemoveType IS NULL",
 																	DatabasePrefix, arg);
 
-	SQL_TQuery(Database, SelectBanIpCallback,  Query, dataPack, DBPrio_High);
+	SQL_TQuery(hDatabase, SelectBanIpCallback,  Query, dataPack, DBPrio_High);
 	return Plugin_Handled;
 }
 
@@ -657,7 +657,7 @@ public Action:CommandUnban(client, args)
 	} else {
 		Format(query, sizeof(query), "SELECT bid FROM %s_bans WHERE (type = 1 AND ip     = '%s') AND (length = '0' OR ends > UNIX_TIMESTAMP()) AND RemoveType IS NULL", DatabasePrefix, arg);
 	}
-	SQL_TQuery(Database, SelectUnbanCallback, query, dataPack);
+	SQL_TQuery(hDatabase, SelectUnbanCallback, query, dataPack);
 	return Plugin_Handled;
 }
 
@@ -730,7 +730,7 @@ public Action:CommandAddBan(client, args)
 	FormatEx(Query, sizeof(Query), "SELECT bid FROM %s_bans WHERE type = 0 AND authid = '%s' AND (length = 0 OR ends > UNIX_TIMESTAMP()) AND RemoveType IS NULL",
 																	DatabasePrefix, authid);
 
-	SQL_TQuery(Database, SelectAddbanCallback, Query, dataPack, DBPrio_High);
+	SQL_TQuery(hDatabase, SelectAddbanCallback, Query, dataPack, DBPrio_High);
 	return Plugin_Handled;
 }
 
@@ -1033,11 +1033,11 @@ public GotDatabase(Handle:owner, Handle:hndl, const String:error[], any:data)
 		return;
 	}
 
-	Database = hndl;
+	hDatabase = hndl;
 
 	decl String:query[1024];
 	FormatEx(query, sizeof(query), "SET NAMES \"UTF8\"");
-	SQL_TQuery(Database, ErrorCheckCallback, query);
+	SQL_TQuery(hDatabase, ErrorCheckCallback, query);
 
 	InsertServerInfo();
 
@@ -1046,7 +1046,7 @@ public GotDatabase(Handle:owner, Handle:hndl, const String:error[], any:data)
 	if(loadOverrides)
 	{
 		Format(query, 1024, "SELECT type, name, flags FROM %s_overrides", DatabasePrefix);
-		SQL_TQuery(Database, OverridesDone, query);
+		SQL_TQuery(hDatabase, OverridesDone, query);
 		loadOverrides = false;
 	}
 
@@ -1055,7 +1055,7 @@ public GotDatabase(Handle:owner, Handle:hndl, const String:error[], any:data)
 		FormatEx(query,1024,"SELECT name, flags, immunity, groups_immune   \
 					FROM %s_srvgroups ORDER BY id",DatabasePrefix);
 		curLoading++;
-		SQL_TQuery(Database,GroupsDone,query);
+		SQL_TQuery(hDatabase,GroupsDone,query);
 
 #if defined DEBUG
 	LogToFile(logFile, "Fetching Group List");
@@ -1089,7 +1089,7 @@ public GotDatabase(Handle:owner, Handle:hndl, const String:error[], any:data)
 					DatabasePrefix, DatabasePrefix,DatabasePrefix, queryLastLogin, serverID, DatabasePrefix, serverID);
 		}
 		curLoading++;
-		SQL_TQuery(Database,AdminsDone,query);
+		SQL_TQuery(hDatabase,AdminsDone,query);
 
 #if defined DEBUG
         LogToFile(logFile, "Fetching Admin List");
@@ -1295,18 +1295,18 @@ stock bool:IsValidClient(client)
 	return true;
 }
 
-CheckForBanEvasion(client, any:sAuth[])
+CheckForBanEvasion(client, const String:sAuth[])
 {
 	/* Do not check bots nor check player with lan steamid. */
-	if(sAuth[0] == 'B' || sAuth[9] == 'L' || Database == INVALID_HANDLE)
+	if(sAuth[0] == 'B' || sAuth[9] == 'L' || hDatabase == INVALID_HANDLE)
 	{
 		return;
 	}
 
 	decl String:sQuery[1024], String:sIP[32];
 	GetClientIP(client, sIP, sizeof(sIP));
 	FormatEx(sQuery, sizeof(sQuery), "SELECT bid FROM %s_bans WHERE ((type = 0 AND authid REGEXP '^STEAM_[0-9]:%s$') OR (type = 1 AND ip = '%s')) AND (length = '0' OR ends > UNIX_TIMESTAMP()) AND RemoveType IS NULL", DatabasePrefix, sAuth[8], sIP);
-	SQL_TQuery(Database, VerifyBan2, sQuery, GetClientUserId(client), DBPrio_High);
+	SQL_TQuery(hDatabase, VerifyBan2, sQuery, GetClientUserId(client), DBPrio_High);
 }
 
 public VerifyBan2(Handle:owner, Handle:hndl, const String:error[], any:userid)
@@ -1335,7 +1335,7 @@ public VerifyBan2(Handle:owner, Handle:hndl, const String:error[], any:userid)
 		decl String:Name[128];
 		decl String:Query[512];
 
-		SQL_EscapeString(Database, clientName, Name, sizeof(Name));
+		SQL_EscapeString(hDatabase, clientName, Name, sizeof(Name));
 		if(serverID == -1 )
 		{
 			FormatEx(Query, sizeof(Query), "INSERT INTO %s_banlog (sid ,time ,name ,bid) VALUES  \
@@ -1351,7 +1351,7 @@ public VerifyBan2(Handle:owner, Handle:hndl, const String:error[], any:userid)
 				DatabasePrefix, serverID, Name, DatabasePrefix, clientAuth[8], clientIp);
 		}
 
-		SQL_TQuery(Database, ErrorCheckCallback, Query, client, DBPrio_High);
+		SQL_TQuery(hDatabase, ErrorCheckCallback, Query, client, DBPrio_High);
 		if(!StrEqual(clientAuth, g_sOwnerSteamID[client], false))
 		{
 
@@ -1376,7 +1376,7 @@ public SelectBanIpCallback(Handle:owner, Handle:hndl, const String:error[], any:
 	ReadPackString(data, ip,        sizeof(ip));
 	ReadPackString(data, adminAuth, sizeof(adminAuth));
 	ReadPackString(data, adminIp,   sizeof(adminIp));
-	SQL_EscapeString(Database, reason, banReason, sizeof(banReason));
+	SQL_EscapeString(hDatabase, reason, banReason, sizeof(banReason));
 
 	if(error[0])
 	{
@@ -1408,7 +1408,7 @@ public SelectBanIpCallback(Handle:owner, Handle:hndl, const String:error[], any:
 						DatabasePrefix, ip, (minutes*60), (minutes*60), banReason, DatabasePrefix, adminAuth, adminAuth[8], adminIp, serverID);
 	}
 
-	SQL_TQuery(Database, InsertBanIpCallback, Query, data, DBPrio_High);
+	SQL_TQuery(hDatabase, InsertBanIpCallback, Query, data, DBPrio_High);
 }
 
 public InsertBanIpCallback(Handle:owner, Handle:hndl, const String:error[], any:data)
@@ -1459,7 +1459,7 @@ public SelectUnbanCallback(Handle:owner, Handle:hndl, const String:error[], any:
 	ReadPackString(data, reason, sizeof(reason));
 	ReadPackString(data, arg, sizeof(arg));
 	ReadPackString(data, adminAuth, sizeof(adminAuth));
-	SQL_EscapeString(Database, reason, unbanReason, sizeof(unbanReason));
+	SQL_EscapeString(hDatabase, reason, unbanReason, sizeof(unbanReason));
 
 	// If error is not an empty string the query failed
 	if(error[0] != '\0')
@@ -1494,7 +1494,7 @@ public SelectUnbanCallback(Handle:owner, Handle:hndl, const String:error[], any:
 		Format(query, sizeof(query), "UPDATE %s_bans SET RemovedBy = (SELECT aid FROM %s_admins WHERE authid = '%s' OR authid REGEXP '^STEAM_[0-9]:%s$'), RemoveType = 'U', RemovedOn = UNIX_TIMESTAMP(), ureason = '%s' WHERE bid = %d",
 																	DatabasePrefix, DatabasePrefix, adminAuth, adminAuth[8], unbanReason, bid);
 
-		SQL_TQuery(Database, InsertUnbanCallback, query, data);
+		SQL_TQuery(hDatabase, InsertUnbanCallback, query, data);
 	}
 	return;
 }
@@ -1545,7 +1545,7 @@ public SelectAddbanCallback(Handle:owner, Handle:hndl, const String:error[], any
 	ReadPackString(data, authid,    sizeof(authid));
 	ReadPackString(data, adminAuth, sizeof(adminAuth));
 	ReadPackString(data, adminIp,   sizeof(adminIp));
-	SQL_EscapeString(Database, reason, banReason, sizeof(banReason));
+	SQL_EscapeString(hDatabase, reason, banReason, sizeof(banReason));
 
 	if(error[0])
 	{
@@ -1577,7 +1577,7 @@ public SelectAddbanCallback(Handle:owner, Handle:hndl, const String:error[], any
 						DatabasePrefix, authid, (minutes*60), (minutes*60), banReason, DatabasePrefix, adminAuth, adminAuth[8], adminIp, serverID);
 	}
 
-	SQL_TQuery(Database, InsertAddbanCallback, Query, data, DBPrio_High);
+	SQL_TQuery(hDatabase, InsertAddbanCallback, Query, data, DBPrio_High);
 }
 
 public InsertAddbanCallback(Handle:owner, Handle:hndl, const String:error[], any:data)
@@ -1674,7 +1674,7 @@ public ProcessQueueCallback(Handle:owner, Handle:hndl, const String:error[], any
 			new Handle:authPack = CreateDataPack();
 			WritePackString(authPack, auth);
 			ResetPack(authPack);
-			SQL_TQuery(Database, AddedFromSQLiteCallback, query, authPack);
+			SQL_TQuery(hDatabase, AddedFromSQLiteCallback, query, authPack);
 		} else {
 			// The ban is no longer valid and should be deleted from the queue
 			FormatEx(query, sizeof(query), "DELETE FROM queue WHERE steam_id = '%s'", auth);
@@ -1721,7 +1721,7 @@ public ServerInfoCallback(Handle:owner, Handle:hndl, const String:error[], any:d
 		decl String:desc[64], String:query[200];
 		GetGameFolderName(desc, sizeof(desc));
 		FormatEx(query, sizeof(query), "INSERT INTO %s_servers (ip, port, rcon, modid) VALUES ('%s', '%s', '', (SELECT mid FROM %s_mods WHERE modfolder = '%s'))", DatabasePrefix, ServerIp, ServerPort, DatabasePrefix, desc);
-		SQL_TQuery(Database, ErrorCheckCallback, query);
+		SQL_TQuery(hDatabase, ErrorCheckCallback, query);
 	}
 }
 
@@ -1759,7 +1759,7 @@ public VerifyBan(Handle:owner, Handle:hndl, const String:error[], any:userid)
 		decl String:Name[128];
 		decl String:Query[512];
 
-		SQL_EscapeString(Database, clientName, Name, sizeof(Name));
+		SQL_EscapeString(hDatabase, clientName, Name, sizeof(Name));
 		if( serverID == -1 )
 		{
 			FormatEx(Query, sizeof(Query), "INSERT INTO %s_banlog (sid ,time ,name ,bid) VALUES  \
@@ -1775,7 +1775,7 @@ public VerifyBan(Handle:owner, Handle:hndl, const String:error[], any:userid)
 				DatabasePrefix, serverID, Name, DatabasePrefix, clientAuth[8], clientIp);
 		}
 
-		SQL_TQuery(Database, ErrorCheckCallback, Query, client, DBPrio_High);
+		SQL_TQuery(hDatabase, ErrorCheckCallback, Query, client, DBPrio_High);
 		if(!StrEqual(clientAuth, g_sOwnerSteamID[client], false))
 		{
 
@@ -2063,13 +2063,13 @@ public GroupsDone(Handle:owner, Handle:hndl, const String:error[], any:data)
 	// Load the group overrides
 	decl String:query[512];
 	FormatEx(query, 512, "SELECT sg.name, so.type, so.name, so.access FROM %s_srvgroups_overrides so LEFT JOIN %s_srvgroups sg ON sg.id = so.group_id ORDER BY sg.id", DatabasePrefix, DatabasePrefix);
-	SQL_TQuery(Database, LoadGroupsOverrides, query);
+	SQL_TQuery(hDatabase, LoadGroupsOverrides, query);
 
 	/*if (reparse)
 	{
 		decl String:query[512];
 		FormatEx(query,512,"SELECT name, immunity, groups_immune FROM %s_srvgroups ORDER BY id",DatabasePrefix);
-		SQL_TQuery(Database,GroupsSecondPass,query);
+		SQL_TQuery(hDatabase,GroupsSecondPass,query);
 	}
 	else
 	{
@@ -2264,7 +2264,7 @@ public Action:PruneBans(Handle:timer)
 			"UPDATE %s_bans SET RemovedBy = 0, RemoveType = 'E', RemovedOn = UNIX_TIMESTAMP() WHERE length != '0' AND ends < UNIX_TIMESTAMP()",
 			DatabasePrefix);
 			
-	SQL_TQuery(Database, ErrorCheckCallback, Query);
+	SQL_TQuery(hDatabase, ErrorCheckCallback, Query);
 	return Plugin_Continue;
 }
 */
@@ -2569,7 +2569,7 @@ public bool:CreateBan(client, target, time, String:reason[])
 	if(reason[0] != '\0')
 	{
 		// if we have a valid reason pass move forward with the ban
-		if(Database != INVALID_HANDLE)
+		if(hDatabase != INVALID_HANDLE)
 		{
 			UTIL_InsertBan(time, name, auth, ip, reason, adminAuth, adminIp, dataPack);
 			if(!StrEqual(auth2, "", false) && !StrEqual(auth, auth2, false))
@@ -2600,8 +2600,8 @@ stock UTIL_InsertBan(time, const String:Name[], const String:Authid[], const Str
 	decl String:banName[128];
 	decl String:banReason[256];
 	decl String:Query[1024];
-	SQL_EscapeString(Database, Name, banName, sizeof(banName));
-	SQL_EscapeString(Database, Reason, banReason, sizeof(banReason));
+	SQL_EscapeString(hDatabase, Name, banName, sizeof(banName));
+	SQL_EscapeString(hDatabase, Reason, banReason, sizeof(banReason));
 	if( serverID == -1 )
 	{
 		FormatEx(Query, sizeof(Query), "INSERT INTO %s_bans (ip, authid, name, created, ends, length, reason, aid, adminIp, sid, country) VALUES \
@@ -2615,7 +2615,7 @@ stock UTIL_InsertBan(time, const String:Name[], const String:Authid[], const Str
 						DatabasePrefix, Ip, Authid, banName, (time*60), (time*60), banReason, DatabasePrefix, AdminAuthid, AdminAuthid[8], AdminIp, serverID);
 	}
 
-	SQL_TQuery(Database, VerifyInsert, Query, Pack, DBPrio_High);
+	SQL_TQuery(hDatabase, VerifyInsert, Query, Pack, DBPrio_High);
 }
 
 stock UTIL_InsertTempBan(time, const String:name[], const String:auth[], const String:ip[], const String:reason[], const String:adminAuth[], const String:adminIp[], Handle:dataPack)
@@ -2661,7 +2661,7 @@ stock CheckLoadAdmins()
 
 stock InsertServerInfo()
 {
-	if(Database == INVALID_HANDLE)
+	if(hDatabase == INVALID_HANDLE)
 	{
 		return;
 	}
@@ -2678,7 +2678,7 @@ stock InsertServerInfo()
 	if(AutoAdd != false)
 	{
 		FormatEx(query, sizeof(query), "SELECT sid FROM %s_servers WHERE ip = '%s' AND port = '%s'", DatabasePrefix, ServerIp, ServerPort);
-		SQL_TQuery(Database, ServerInfoCallback, query);
+		SQL_TQuery(hDatabase, ServerInfoCallback, query);
 	}
 }