From d11456a5861d9be94b0b917dcbf61d78b4c54cec Mon Sep 17 00:00:00 2001 From: skull132 Date: Mon, 8 Jun 2015 21:35:26 +0300 Subject: [PATCH] Fixes for notes * Fixes the dumb with the caller name saving * Disables the transfer proc --- code/modules/admin/player_notes_sql.dm | 12 ++++++------ code/modules/admin/topic.dm | 6 +++--- code/modules/admin/verbs/warning.dm | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/admin/player_notes_sql.dm b/code/modules/admin/player_notes_sql.dm index 9e59318e..6e7ea6ae 100644 --- a/code/modules/admin/player_notes_sql.dm +++ b/code/modules/admin/player_notes_sql.dm @@ -1,7 +1,7 @@ //System will now support SQL pulls for fetching player notes. //Yay! -/proc/notes_add_sql(var/key, var/note, var/usr, var/IP, var/CID) +/proc/notes_add_sql(var/key, var/note, var/mob/usr, var/IP, var/CID) if(!key || !note) return @@ -10,7 +10,7 @@ var/a_ckey if(usr) - a_ckey = sanitizeSQL(usr) + a_ckey = sanitizeSQL(usr.key) else a_ckey = "Adminbot" @@ -161,7 +161,7 @@ if(adminckey && ckey(a_ckey) != ckey(adminckey)) continue else - dat += "[p_ckey][a_ckey][date]
[content]
" + dat += "[p_ckey][a_ckey][date][content]" if(edited) var/lasteditor = query.item[7] var/editdate = query.item[8] @@ -183,7 +183,7 @@ var/content = adminquery.item[4] var/edited = text2num(adminquery.item[5]) - dat += "[p_ckey][adminckey][date]
[content]
" + dat += "[p_ckey][adminckey][date][content]" if(edited) var/lasteditor = adminquery.item[6] var/editdate = adminquery.item[7] @@ -194,7 +194,7 @@ dat += "" usr << browse(dat,"window=lookupnotes;size=900x500") -/proc/notes_transfer() +/*/proc/notes_transfer() msg_scopes("Locating master list.") var/savefile/note_list = new("data/player_notes.sav") var/list/note_keys @@ -270,4 +270,4 @@ if(insertquery.ErrorMsg()) msg_scopes(insertquery.ErrorMsg()) else - msg_scopes("Transfer successful.") \ No newline at end of file + msg_scopes("Transfer successful.")*/ diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index fe68382b..144b463f 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -909,7 +909,7 @@ message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.") if(!config.ban_legacy_system) - notes_add_sql(M.ckey, "Banned for: [reason]. Duration: [mins] minutes.", usr.client.ckey, M.lastKnownIP, M.computer_id) + notes_add_sql(M.ckey, "Banned for: [reason]. Duration: [mins] minutes.", usr, M.lastKnownIP, M.computer_id) del(M.client) //del(M) // See no reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends. @@ -937,7 +937,7 @@ DB_ban_record(BANTYPE_PERMA, M, -1, reason) if(!config.ban_legacy_system) - notes_add_sql(M.ckey, "Banned for: [reason]. The ban is permanent.", usr.client.ckey, M.lastKnownIP, M.computer_id) + notes_add_sql(M.ckey, "Banned for: [reason]. The ban is permanent.", usr, M.lastKnownIP, M.computer_id) del(M.client) //del(M) @@ -2778,7 +2778,7 @@ if(C) IP = C.address CID = C.computer_id - notes_add_sql(key, add, src.owner:ckey, IP, CID) + notes_add_sql(key, add, usr, IP, CID) show_player_info(key) diff --git a/code/modules/admin/verbs/warning.dm b/code/modules/admin/verbs/warning.dm index 9334bc25..322b1a50 100644 --- a/code/modules/admin/verbs/warning.dm +++ b/code/modules/admin/verbs/warning.dm @@ -114,7 +114,7 @@ if(config.ban_legacy_system) notes_add(warned_ckey, "Warning added by [a_ckey], for: [reason]. || Notes regarding the warning: [notes].") else - notes_add_sql(warned_ckey, "Warning added by [a_ckey], for: [reason]. || Notes regarding the warning: [notes].", a_ckey, ip, computerid) + notes_add_sql(warned_ckey, "Warning added by [a_ckey], for: [reason]. || Notes regarding the warning: [notes].", src, ip, computerid) feedback_add_details("admin_verb","WARN-DB") if(C)