cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-21 19:56:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #598 from skull132/master

Browse Source 
Fixes for notes
This commit is contained in:
skull132
2015-06-08 21:36:10 +03:00
parent c6d41c8cd1 d11456a586
commit 6c8ccb00aa
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/player_notes_sql.dm
+6 -6
View File
@@ -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 += "<tr bgcolor='#ffeeee'><td><b>[p_ckey]</b></td><td><b>[a_ckey]</b></td><td>[date]</td><td><center>[content]</center></td></tr>"
dat += "<tr bgcolor='#ffeeee'><td align='center'><b>[p_ckey]</b></td><td align='center'><b>[a_ckey]</b></td><td align='center'>[date]</td><td align='center'>[content]</td></tr>"
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 += "<tr bgcolor='#ffeeee'><td><b>[p_ckey]</b></td><td><b>[adminckey]</b></td><td>[date]</td><td><center>[content]</center></td></tr>"
dat += "<tr bgcolor='#ffeeee'><td align='center'><b>[p_ckey]</b></td><td align='center'><b>[adminckey]</b></td><td align='center'>[date]</td><td align='center'>[content]</td></tr>"
if(edited)
var/lasteditor = adminquery.item[6]
var/editdate = adminquery.item[7]
@@ -194,7 +194,7 @@
dat += "</table>"
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.")
msg_scopes("Transfer successful.")*/
code/modules/admin/topic.dm
+3 -3
View File
@@ -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)
code/modules/admin/verbs/warning.dm
+1 -1
View File
@@ -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)