cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-07-17 10:42:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #600 from skull132/master

Browse Source 
Hotfix 2, 08JUN2015
This commit is contained in:
skull132
2015-06-08 23:41:18 +03:00
parent b9ff032e7d 8a0e383458
commit eafbf67c57
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/IsBanned.dm
+3 -3
View File
@@ -6,7 +6,7 @@ world/IsBanned(key,address,computer_id)
return ..()
//Making the adminbot for automated bans.
var/datum/admins/Adminbot = new /datum/admins(initial_rank = "Friendly Robot", initial_rights = 8196, "Adminbot")
var/datum/admins/Adminbot = new /datum/admins("Friendly Robot", 8196, "Adminbot")
//Guest Checking
if(!guests_allowed && IsGuestKey(key))
@@ -53,7 +53,7 @@ world/IsBanned(key,address,computer_id)
message_mods("\blue Failed Login: [key] - Blacklisted IP. User banned.")
var/reason = "This IP has been blacklisted from the server."
Adminbot.DB_ban_record(BANTYPE_PERMA, null, null, reason, null, null, ckey(key), 1, address, computer_id)
Adminbot.DB_ban_record(1, null, null, reason, null, null, ckey(key), 1, address, computer_id)
notes_add_sql(key, reason, null, address, computer_id)
del Adminbot
@@ -128,7 +128,7 @@ world/IsBanned(key,address,computer_id)
if(multikey)
desc = "\nReason: You, or another user of this computer or connection ([pckey]) is banned from playing here. The ban reason is:\nThis is an automatic ban for attempted bandodging. The original ban reason is this: [reason]\nThis ban was applied by [ackey] on [bantime], [expires]"
var/newreason = "This is an automatic ban for attempted bandodging. The original ban reason: [reason]."
Adminbot.DB_ban_record(BANTYPE_PERMA, null, null, reason, null, null, ckey(key), 1, address, computer_id)
Adminbot.DB_ban_record(1, null, null, reason, null, null, ckey(key), 1, address, computer_id)
notes_add_sql(key, newreason, null, address, computer_id)
del Adminbot
code/modules/admin/player_notes_sql.dm
+4 -2
View File
@@ -21,8 +21,10 @@
if(!IP || !CID)
var/DBQuery/initquery = dbcon.NewQuery("SELECT ip, computerid FROM erro_player WHERE ckey = '[ckey]'")
IP = initquery.item[1]
CID = initquery.item[2]
initquery.Execute()
if(initquery.NextRow())
IP = initquery.item[1]
CID = initquery.item[2]
var/querycontents
if(IP && CID)
code/modules/admin/topic.dm
+6 -4
View File
@@ -2774,10 +2774,12 @@
else
var/IP
var/CID
var/client/C = directory[key]
if(C)
IP = C.address
CID = C.computer_id
if(directory[key])
var/client/C = directory[key]
if(C)
IP = C.address
CID = C.computer_id
notes_add_sql(key, add, usr, IP, CID)
show_player_info(key)