diff --git a/SQL/Aurora_SQL_Schema.sql b/SQL/Aurora_SQL_Schema.sql
index a43ba9f001b..d3963e89367 100644
--- a/SQL/Aurora_SQL_Schema.sql
+++ b/SQL/Aurora_SQL_Schema.sql
@@ -277,6 +277,8 @@ CREATE TABLE `ss13_player_preferences` (
`UI_style_alpha` int(11) NOT NULL,
`be_special` int(11) NOT NULL,
`asfx_togs` int(11) NOT NULL,
+ `lastmotd` text NOT NULL,
+ `lastmemo` text NOT NULL,
PRIMARY KEY (`ckey`),
CONSTRAINT `player_preferences_fk_ckey` FOREIGN KEY (`ckey`) REFERENCES `ss13_player` (`ckey`) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
diff --git a/baystation12.dme b/baystation12.dme
index e4627f614b0..9871920c126 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -134,6 +134,7 @@
#include "code\datums\modules.dm"
#include "code\datums\organs.dm"
#include "code\datums\recipe.dm"
+#include "code\datums\server_greeting.dm"
#include "code\datums\sun.dm"
#include "code\datums\supplypacks.dm"
#include "code\datums\diseases\appendicitis.dm"
@@ -811,8 +812,8 @@
#include "code\modules\admin\admin.dm"
#include "code\modules\admin\admin_attack_log.dm"
#include "code\modules\admin\admin_investigate.dm"
-#include "code\modules\admin\admin_memo.dm"
#include "code\modules\admin\admin_ranks.dm"
+#include "code\modules\admin\admin_server_greeting.dm"
#include "code\modules\admin\admin_verbs.dm"
#include "code\modules\admin\banjob.dm"
#include "code\modules\admin\create_mob.dm"
@@ -896,6 +897,7 @@
#include "code\modules\client\preferences_ambience.dm"
#include "code\modules\client\preferences_factions.dm"
#include "code\modules\client\preferences_gear.dm"
+#include "code\modules\client\preferences_notification.dm"
#include "code\modules\client\preferences_save_migration.dm"
#include "code\modules\client\preferences_savefile.dm"
#include "code\modules\client\preferences_spawnpoints.dm"
diff --git a/code/datums/server_greeting.dm b/code/datums/server_greeting.dm
new file mode 100644
index 00000000000..4e5741486aa
--- /dev/null
+++ b/code/datums/server_greeting.dm
@@ -0,0 +1,209 @@
+/*
+ * Server greeting datum.
+ * Contains the following information:
+ * - hashes for the message of the day and staff memos
+ * - the current message of the day and staff memos
+ * - the fully parsed welcome screen HTML data
+ */
+
+#define MEMOFILE "data/greeting.sav"
+
+#define OUTDATED_MOTD 1
+#define OUTDATED_MEMO 2
+#define OUTDATED_NOTE 4
+
+/datum/server_greeting
+ // Hashes to figure out if we need to display the greeting message.
+ // These correspond to motd_hash and memo_hash on /datum/preferences for each client.
+ var/motd_hash = ""
+ var/memo_hash = ""
+
+ // The stored strings of general subcomponents.
+ var/motd = ""
+ var/memo_list[] = list()
+ var/memo = ""
+
+ var/raw_data_user = ""
+ var/raw_data_staff = ""
+ // The near-final string to be displayed.
+ // Only one placeholder remains: .
+ var/user_data = ""
+ var/staff_data = ""
+
+/datum/server_greeting/New()
+ ..()
+
+ load_from_file()
+
+ prepare_data()
+
+/*
+ * Populates variables from save file, and loads the raw HTML data.
+ * Needs to be called at least once for successful initialization.
+ */
+/datum/server_greeting/proc/load_from_file()
+ var/savefile/F = new(MEMOFILE)
+ if (F)
+ if (F["motd"])
+ F["motd"] >> motd
+
+ if (F["memo"])
+ F["memo"] >> memo_list
+
+ raw_data_staff = file2text('html/templates/welcome_screen.html')
+
+ // This is a lazy way, but it disables the user from being able to see the memo button.
+ var/staff_button = "
"
+ raw_data_user = replacetextEx(raw_data_staff, staff_button, "")
+
+/*
+ * Generates hashes, placeholders, and reparses var/memo.
+ * Then updates staff_data and user_data with the new contents.
+ * To be called after load_from_file or update_value.
+ */
+/datum/server_greeting/proc/prepare_data()
+ if (!motd)
+ motd = "
No new announcements to showcase.
"
+ motd_hash = ""
+ else
+ motd_hash = md5(motd)
+
+ memo = ""
+
+ if (memo_list.len)
+ for (var/ckey in memo_list)
+ var/data = {"
+
[ckey] wrote on [memo_list[ckey]["date"]]:
+ [memo_list[ckey]["content"]]
"
+ memo_hash = ""
+
+ var/html_one = raw_data_staff
+ html_one = replacetextEx(html_one, "", motd)
+ html_one = replacetextEx(html_one, "", memo)
+ staff_data = html_one
+
+ var/html_two = raw_data_user
+ html_two = replacetextEx(html_two, "", motd)
+ user_data = html_two
+
+ return
+
+/*
+ * Helper to update the MoTD or memo contents.
+ * Args:
+ * - var/change string
+ * - var/new_value mixed
+ * Returns:
+ * - 1 upon success
+ * - 0 upon failure
+ */
+/datum/server_greeting/proc/update_value(var/change, var/new_value)
+ if (!change || !new_value)
+ return 0
+
+ switch (change)
+ if ("motd")
+ motd = new_value
+ motd_hash = md5(new_value)
+
+ if ("memo_write")
+ memo_list[new_value[1]] = list("date" = time2text(world.realtime, "DD-MMM-YYYY"), "content" = new_value[2])
+
+ if ("memo_delete")
+ if (memo_list[new_value])
+ memo_list -= new_value
+ else
+ return 0
+
+ else
+ return 0
+
+ var/savefile/F = new(MEMOFILE)
+ F["motd"] << motd
+ F["memo"] << memo_list
+
+ prepare_data()
+
+ return 1
+
+/*
+ * Helper proc to determine whether or not we need to show the greeting window to a user.
+ * Args:
+ * - var/user client
+ * Returns:
+ * - int
+ */
+/datum/server_greeting/proc/find_outdated_info(var/client/user)
+ if (!user || !user.prefs)
+ return 0
+
+ var/outdated_info = 0
+
+ if (motd_hash && user.prefs.motd_hash != motd_hash)
+ outdated_info |= OUTDATED_MOTD
+
+ if (user.holder && memo_hash && user.prefs.memo_hash != memo_hash)
+ outdated_info |= OUTDATED_MEMO
+
+ if (user.prefs.notifications.len)
+ outdated_info |= OUTDATED_NOTE
+
+ return outdated_info
+
+/*
+ * Composes the final message and displays it to the user.
+ * Also clears the user's notifications, should he have any.
+ */
+/datum/server_greeting/proc/display_to_client(var/client/user, var/outdated_info = 0)
+ if (!user)
+ return
+
+ var/notifications = "
You do not have any notifications to show.
"
+ var/list/outdated_tabs = list()
+ var/save_prefs = 0
+
+ if (outdated_info & OUTDATED_NOTE)
+ outdated_tabs += "#note-tab"
+
+ notifications = ""
+ for (var/datum/client_notification/a in user.prefs.notifications)
+ notifications += a.get_html()
+
+ if (outdated_info & OUTDATED_MEMO)
+ outdated_tabs += "#memo-tab"
+ user.prefs.memo_hash = memo_hash
+ save_prefs = 1
+
+ if (outdated_info & OUTDATED_MOTD)
+ outdated_tabs += "#motd-tab"
+ user.prefs.motd_hash = motd_hash
+ save_prefs = 1
+
+ var/data = user_data
+
+ if (user.holder)
+ data = staff_data
+
+ data = replacetextEx(data, "", notifications)
+
+ if (outdated_tabs.len)
+ var/tab_string = json_encode(outdated_tabs)
+ data = replacetextEx(data, "var updated_tabs = \[\]", "var updated_tabs = [tab_string]")
+
+ user << browse(data, "window=welcome_screen;size=640x500")
+
+ if (save_prefs)
+ user.prefs.handle_preferences_save(user)
+
+#undef OUTDATED_NOTE
+#undef OUTDATED_MEMO
+#undef OUTDATED_MOTD
+
+#undef MEMOFILE
diff --git a/code/global.dm b/code/global.dm
index 9756bb67f62..2dbd6d65b9e 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -179,7 +179,7 @@ var/datum/moduletypes/mods = new()
var/wavesecret = 0
var/gravity_is_on = 1
-var/join_motd = null
+var/datum/server_greeting/server_greeting = null
var/forceblob = 0
var/datum/nanomanager/nanomanager = new() // NanoManager, the manager for Nano UIs.
diff --git a/code/modules/admin/DB ban/ban_mirroring.dm b/code/modules/admin/DB ban/ban_mirroring.dm
index 0ecc78a62dc..56e9a26efc2 100644
--- a/code/modules/admin/DB ban/ban_mirroring.dm
+++ b/code/modules/admin/DB ban/ban_mirroring.dm
@@ -113,8 +113,6 @@
var/DBQuery/query = dbcon.NewQuery("SELECT ban_mirror_id, player_ckey, ban_mirror_ip, ban_mirror_computerid, date(ban_mirror_datetime) as datetime FROM ss13_ban_mirrors WHERE ban_id = :ban_id")
query.Execute(list(":ban_id" = ban_id))
- testing("Ban ID: [ban_id]")
-
var/mirrors[] = list()
while (query.NextRow())
var/items[] = list()
diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm
deleted file mode 100644
index 4bcaf10d9c7..00000000000
--- a/code/modules/admin/admin_memo.dm
+++ /dev/null
@@ -1,54 +0,0 @@
-#define MEMOFILE "data/memo.sav" //where the memos are saved
-#define ENABLE_MEMOS 1 //using a define because screw making a config variable for it. This is more efficient and purty.
-
-//switch verb so we don't spam up the verb lists with like, 3 verbs for this feature.
-/client/proc/admin_memo(task in list("write","show","delete"))
- set name = "Memo"
- set category = "Server"
- if(!ENABLE_MEMOS) return
- if(!check_rights(0)) return
- switch(task)
- if("write") admin_memo_write()
- if("show") admin_memo_show()
- if("delete") admin_memo_delete()
-
-//write a message
-/client/proc/admin_memo_write()
- var/savefile/F = new(MEMOFILE)
- if(F)
- var/memo = sanitize(input(src,"Type your memo\n(Leaving it blank will delete your current memo):","Write Memo",null) as null|message, extra = 0)
- switch(memo)
- if(null)
- return
- if("")
- F.dir.Remove(ckey)
- src << "Memo removed"
- return
- if( findtext(memo,"[memo]"
- message_admins("[key] set an admin memo: [memo]")
-
-//show all memos
-/client/proc/admin_memo_show()
- if(ENABLE_MEMOS)
- var/savefile/F = new(MEMOFILE)
- if(F)
- for(var/ckey in F.dir)
- src << "
Admin Memo by [F[ckey]]
"
-
-//delete your own or somebody else's memo
-/client/proc/admin_memo_delete()
- var/savefile/F = new(MEMOFILE)
- if(F)
- var/ckey
- if(check_rights(R_SERVER,0)) //high ranking admins can delete other admin's memos
- ckey = input(src,"Whose memo shall we remove?","Remove Memo",null) as null|anything in F.dir
- else
- ckey = src.ckey
- if(ckey)
- F.dir.Remove(ckey)
- src << "Removed Memo created by [ckey]."
-
-#undef MEMOFILE
-#undef ENABLE_MEMOS
\ No newline at end of file
diff --git a/code/modules/admin/admin_server_greeting.dm b/code/modules/admin/admin_server_greeting.dm
new file mode 100644
index 00000000000..5f49aab6240
--- /dev/null
+++ b/code/modules/admin/admin_server_greeting.dm
@@ -0,0 +1,80 @@
+/*
+ * A file containing the admin commands for interfacing with the server_greeting datum.
+ */
+/client/proc/admin_edit_motd()
+ set name = "Edit MotD"
+ set category = "Server"
+
+ if (!check_rights(R_SERVER))
+ return
+
+ var/new_message = input(usr, "Please edit the Message of the Day as necessary.", "Message of the Day", server_greeting.motd) as message
+
+ if (!new_message)
+ new_message = "
This is a palceholder. Pester your staff to change it!
"
+
+ server_greeting.update_value("motd", new_message)
+ message_admins("[ckey] has edited the message of the day: [html_encode(new_message)]")
+
+/client/proc/admin_memo_control(task in list("write", "delete"))
+ set name = "Edit Memos"
+ set category = "Server"
+
+ if (!check_rights(R_ADMIN))
+ return
+
+ switch (task)
+ if ("write")
+ admin_memo_write()
+ if ("delete")
+ admin_memo_delete()
+
+/client/proc/admin_memo_write()
+ var/current_memo = ""
+ if (server_greeting.memo_list.len && server_greeting.memo_list[ckey])
+ current_memo = server_greeting.memo_list[ckey]
+
+ var/new_memo = input(usr, "Please write your memo.", "Memo", current_memo) as message
+
+ if (server_greeting.update_value("memo_write", list(ckey, new_memo)))
+ src << "Operation carried out successfully."
+ message_admins("[ckey] wrote a new memo: [html_encode(new_memo)]")
+ else
+ src << "Error carrying out desired operation."
+
+ return
+
+/client/proc/admin_memo_delete()
+ if (!server_greeting.memo_list.len)
+ src << "No memos are currently saved."
+ return
+
+ if (!check_rights(R_SERVER))
+ if (!server_greeting.memo_list[ckey])
+ src << "You do not have a memo saved. Cancelling."
+
+ else if (alert("Do you wish to delete your own memo, written on [server_greeting.memo_list[ckey]["date"]]?", "Choices", "Yes", "No") == "Yes")
+ if (server_greeting.update_value("memo_delete", ckey))
+ src << "Operation carried out successfully."
+ message_admins("[ckey] has deleted their own memo.")
+ else
+ src << "Error carrying out desired operation."
+
+ else
+ src << "Cancelled."
+
+ return
+ else
+ var/input = input(usr, "Whose memo shall we delete?", "Remove Memo", null) as null|anything in server_greeting.memo_list
+
+ if (!input)
+ src << "Cancelled."
+ return
+
+ if (server_greeting.update_value("memo_delete", input))
+ src << "Operation carried out successfully."
+ message_admins("[ckey] has deleted the memo of [input].")
+ else
+ src << "Error carrying out desired operation."
+
+ return
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 597b0a14329..15954a34a27 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -50,7 +50,7 @@ var/list/admin_verbs_admin = list(
/client/proc/rename_silicon, /*properly renames silicons*/
/client/proc/manage_silicon_laws, /* Allows viewing and editing silicon laws. */
/client/proc/check_antagonists,
- /client/proc/admin_memo, /*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/
+ /client/proc/admin_memo_control, /*admin memo system. show/delete/write. +SERVER needed to delete admin memos of others*/
/client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/
/client/proc/toggleprayers, /*toggles prayers on/off*/
// /client/proc/toggle_hear_deadcast, /*toggles whether we hear deadchat*/
@@ -155,7 +155,8 @@ var/list/admin_verbs_server = list(
/datum/admins/proc/toggle_space_ninja,
/client/proc/toggle_random_events,
/client/proc/check_customitem_activity,
- /client/proc/nanomapgen_DumpImage
+ /client/proc/nanomapgen_DumpImage,
+ /client/proc/admin_edit_motd
)
var/list/admin_verbs_debug = list(
/client/proc/getruntimelog, /*allows us to access runtime logs to somebody*/
diff --git a/code/modules/admin/verbs/warning.dm b/code/modules/admin/verbs/warning.dm
index 3ad7a81bfff..2af51b06a0d 100644
--- a/code/modules/admin/verbs/warning.dm
+++ b/code/modules/admin/verbs/warning.dm
@@ -183,11 +183,10 @@
warnings_check()
/*
- * A proc to alert you if you have unacknowledged warnings.
- * Called in /client/New (client procs.dm)
+ * A proc to gather notifications regarding your warnings.
+ * Called by /datum/preferences/proc/gather_notifications() in preferences.dm
*/
-
-/client/proc/warnings_alert()
+/client/proc/warnings_gather()
var/count = 0
var/count_expire = 0
@@ -210,12 +209,13 @@
while (query.NextRow())
count++
+ var/list/data = list("unread" = "", "expired" = "")
if (count)
- src << " "
- src << "You have [count] unread [count > 1 ? "warnings" : "warning"]! Click here to review and acknowledge them!"
+ data["unread"] = "You have [count] unread [count > 1 ? "warnings" : "warning"]! Click here to review and acknowledge them!"
if (count_expire)
- src << " "
- src << "[count_expire] of your warnings expired."
+ data["expired"] = "[count_expire] of your warnings have expired."
+
+ return data
/*
* A proc for an admin/moderator to look up a member's warnings.
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index e8b61049289..742169994b1 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -135,6 +135,36 @@
return
+ // JSlink switch.
+ if (href_list["JSlink"])
+ switch (href_list["JSlink"])
+ if ("warnings")
+ src.warnings_check()
+
+ if ("linking")
+ src.check_linking_requests()
+
+ if ("dismiss")
+ if (href_list["notification"])
+ var/datum/client_notification/a = locate(href_list["notification"])
+ if (a && isnull(a.gcDestroyed))
+ a.dismiss()
+
+ if ("github")
+ if (!config.githuburl)
+ src << "Github URL not set in the config. Unable to open the site."
+ else if (alert("This will open the issue tracker in your browser. Are you sure?",, "Yes", "No") == "Yes")
+ src << link(config.githuburl)
+
+ if ("forums")
+ src.forum()
+
+ if ("wiki")
+ src.wiki()
+
+ if ("webint")
+ src.open_webint()
+
..() //redirect to hsrc.()
/client/proc/handle_spam_prevention(var/message, var/mute_type)
@@ -207,6 +237,8 @@
if(!prefs)
prefs = new /datum/preferences(src)
preferences_datums[ckey] = prefs
+
+ prefs.gather_notifications(src)
prefs.last_ip = address //these are gonna be used for banning
prefs.last_id = computer_id //these are gonna be used for banning
@@ -223,18 +255,6 @@
else
del(src)
return 0
- else if (byond_version < config.client_warn_version)
- src << "Your version of BYOND may be out of date!"
- src << config.client_warn_message
- src << "Your version: [byond_version]."
- src << "Required version to remove this message: [config.client_warn_version] or later."
- src << "Visit http://www.byond.com/download/ to get the latest version of BYOND."
-
- if(custom_event_msg && custom_event_msg != "")
- src << "
Custom Event
"
- src << "
A custom event is taking place. OOC Info:
"
- src << "[custom_event_msg]"
- src << " "
if( (world.address == address || !address) && !host )
host = key
@@ -242,7 +262,6 @@
if(holder)
add_admin_verbs()
- admin_memo_show()
// Forcibly enable hardware-accelerated graphics, as we need them for the lighting overlays.
// (but turn them off first, since sometimes BYOND doesn't turn them on properly otherwise)
@@ -252,20 +271,13 @@
sleep(2) // wait a bit more, possibly fixes hardware mode not re-activating right
winset(src, null, "command=\".configure graphics-hwmode on\"")
- warnings_alert()
-
- check_linking_requests()
-
send_resources()
nanomanager.send_resources(src)
- if(prefs.lastchangelog != changelog_hash) //bolds the changelog button on the interface so we know there are updates.
- src << "You have unread updates in the changelog."
- winset(src, "rpane.changelog", "background-color=#eaeaea;font-style=bold")
- if(config.aggressive_changelog)
- src.changes()
-
+ var/outdated_greeting_info = server_greeting.find_outdated_info(src)
+ if (outdated_greeting_info)
+ server_greeting.display_to_client(src, outdated_greeting_info)
//////////////
//DISCONNECT//
@@ -384,6 +396,11 @@
'html/images/loading.gif',
'html/images/ntlogo.png',
'html/images/talisman.png',
+ 'html/bootstrap/css/bootstrap.min.css',
+ 'html/bootstrap/js/bootstrap.min.js',
+ 'html/bootstrap/js/html5shiv.min.js',
+ 'html/bootstrap/js/respond.min.js',
+ 'html/jquery/jquery-2.0.0.min.js',
'icons/pda_icons/pda_atmos.png',
'icons/pda_icons/pda_back.png',
'icons/pda_icons/pda_bell.png',
@@ -424,7 +441,6 @@
'icons/spideros_icons/sos_14.png'
)
-
/mob/proc/MayRespawn()
return 0
@@ -481,6 +497,23 @@
src << browse(dat, "window=LinkingRequests")
return
+/client/proc/gather_linking_requests()
+ if (!config.webint_url || !config.sql_enabled)
+ return
+
+ establish_db_connection(dbcon)
+ if (!dbcon.IsConnected())
+ return
+
+ var/DBQuery/select_query = dbcon.NewQuery("SELECT COUNT(*) AS request_count FROM ss13_player_linking WHERE status = 'new' AND player_ckey = :ckey AND deleted_at IS NULL")
+ select_query.Execute(list(":ckey" = ckey))
+
+ if (select_query.NextRow())
+ if (text2num(select_query.item[1]) > 0)
+ return "You have [select_query.item[1]] account linking requests pending review. Click here to see them!"
+
+ return null
+
/client/proc/process_webint_link(var/route, var/attributes)
if (!route)
return
@@ -523,3 +556,9 @@
src << link(linkURL)
return
+
+/client/verb/show_greeting()
+ set name = "Open Greeting"
+ set category = "OOC"
+
+ server_greeting.display_to_client(src, server_greeting.find_outdated_info(src))
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 13c1407743d..08d2443d0a8 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -40,6 +40,7 @@ datum/preferences
var/muted = 0
var/last_ip
var/last_id
+ var/list/notifications = list() //A list of datums, for the dynamic server greeting window.
//game-preferences
var/lastchangelog = "" //Saved changlog filesize to detect if there was a change
@@ -50,6 +51,8 @@ datum/preferences
var/asfx_togs = ASFX_DEFAULT
var/UI_style_color = "#ffffff"
var/UI_style_alpha = 255
+ var/motd_hash = "" //Hashes for the new server greeting window.
+ var/memo_hash = ""
//character preferences
var/real_name //our character's name
diff --git a/code/modules/client/preferences_notification.dm b/code/modules/client/preferences_notification.dm
new file mode 100644
index 00000000000..0e347defd0e
--- /dev/null
+++ b/code/modules/client/preferences_notification.dm
@@ -0,0 +1,198 @@
+/*
+ * A simple datum for storing notifications for dispaly.
+ */
+/datum/client_notification
+ var/datum/preferences/owner = null
+
+ var/list/note_wrapper = list()
+ var/note_text = ""
+
+ var/proc_src = null
+ var/proc_name = ""
+ var/proc_args = null
+
+ var/persistent = 0
+
+/datum/client_notification/New(var/datum/preferences/prefs, var/list/new_wrapper, var/new_text, var/new_persistence)
+ if (!prefs)
+ qdel(src)
+ return
+
+ if (!new_wrapper || new_wrapper.len != 2)
+ qdel(src)
+ return
+
+ if (!new_text)
+ qdel(src)
+ return
+
+ owner = prefs
+
+ note_wrapper = new_wrapper
+ note_text = new_text
+
+ note_text = replacetextEx(note_text, ":src_ref", "\ref[src]")
+ note_wrapper[1] = replacetextEx(note_wrapper[1], ":src_ref", "\ref[src]")
+
+ if (new_persistence)
+ persistent = new_persistence
+
+/datum/client_notification/Destroy()
+ if (owner)
+ owner.notifications -= src
+ owner = null
+
+ ..()
+
+/*
+ * Associates a callback to be executed whenever a notification is dismissed.
+ */
+/datum/client_notification/proc/tie_callback(var/dismiss_proc_src, var/dismiss_proc, var/dismiss_proc_args)
+ if (!dismiss_proc_src || !dismiss_proc)
+ return
+
+ proc_src = dismiss_proc_src
+ proc_name = dismiss_proc
+
+ if (dismiss_proc_args)
+ proc_args = dismiss_proc_args
+
+/*
+ * Returns the HTML required to display this alert.
+ */
+/datum/client_notification/proc/get_html()
+ var/html = "
[note_wrapper[1]]\n"
+
+ if (!persistent)
+ html += "×\n"
+
+ html += note_text
+ html += "\n[note_wrapper[2]]
"
+
+ return html
+
+/*
+ * Dismisses the notification, executing the proc that was set up as necessary.
+ */
+/datum/client_notification/proc/dismiss()
+ if (proc_src && proc_name)
+ call(proc_src, proc_name)(proc_args)
+
+ if (!persistent)
+ qdel(src)
+
+/*
+ * Adds a new notification datum for later processing.
+ */
+/datum/preferences/proc/new_notification(var/type, var/text, var/persistent, var/callback_src, var/callback_proc, var/callback_args)
+ if (!text)
+ return
+
+ var/list/wrapper
+ switch (type)
+ if ("success")
+ wrapper = list("
", "
")
+ if ("info")
+ wrapper = list("
", "
")
+ if ("warning")
+ wrapper = list("
", "
")
+ if ("danger")
+ wrapper = list("
", "
")
+ else
+ wrapper = list("
", "
")
+
+ var/datum/client_notification/note = new(src, wrapper, text, persistent)
+
+ if (callback_src && callback_proc)
+ note.tie_callback(callback_src, callback_proc, callback_args)
+
+ notifications += note
+
+/*
+ * Gathers all notifications relevant to the client.
+ */
+/datum/preferences/proc/gather_notifications(var/client/user)
+ if (!user)
+ return
+
+ if (user.byond_version < config.client_warn_version)
+ var/version_warn = ""
+ version_warn += "Your version of BYOND may be out of date! "
+ version_warn += config.client_warn_message
+ version_warn += "Your version: [user.byond_version]. "
+ version_warn += "Required version to remove this message: [config.client_warn_version] or later. "
+ version_warn += "Visit http://www.byond.com/download/ to get the latest version of BYOND."
+
+ new_notification("danger", version_warn)
+
+ if (custom_event_msg && custom_event_msg != "")
+ var/custom_event_warn = "
A custom event is taking place!
"
+ custom_event_warn += "OOC Info: [custom_event_msg]"
+
+ new_notification("danger", custom_event_warn)
+
+ if (lastchangelog != changelog_hash)
+ winset(user, "rpane.changelog", "background-color=#eaeaea;font-style=bold")
+ if (config.aggressive_changelog)
+ new_notification("info", "You have unread updates in the changelog.", callback_src = user, callback_proc = "changes")
+ else
+ new_notification("info", "You have unread updates in the changelog.")
+
+ if (config.sql_enabled)
+
+ var/list/warnings = user.warnings_gather()
+ if (warnings["unread"])
+ new_notification("danger", warnings["unread"], 1)
+ if (warnings["expired"])
+ new_notification("info", warnings["expired"])
+
+ var/linking = user.gather_linking_requests()
+ if (linking)
+ new_notification("info", linking, callback_src = user, callback_proc = "check_linking_requests")
+
+ var/cciaa_actions = count_ccia_actions(user)
+ if (cciaa_actions)
+ new_notification("info", cciaa_actions)
+
+/*
+ * Helper proc for getting a count of active CCIA actions against the player's character.
+ */
+/datum/preferences/proc/count_ccia_actions(var/client/user)
+ if (!user)
+ return null
+
+ if (!establish_db_connection(dbcon))
+ error("Error initiatlizing database connection while counting CCIA actions.")
+ return null
+
+ var/DBQuery/prep_query = dbcon.NewQuery("SELECT id FROM ss13_characters WHERE ckey = :ckey")
+ prep_query.Execute(list(":ckey" = user.ckey))
+ var/list/chars = list()
+
+ while (prep_query.NextRow())
+ chars += text2num(prep_query.item[1])
+
+ if (!chars.len)
+ return null
+
+ var/DBQuery/query = dbcon.NewQuery({"SELECT
+ COUNT(act_chr.action_id) AS action_count
+ FROM ss13_ccia_action_char act_chr
+ JOIN ss13_characters chr ON act_chr.char_id = chr.id
+ JOIN ss13_ccia_actions act ON act_chr.action_id = act.id
+ WHERE
+ act_chr.char_id IN :char_id AND
+ (act.expires_at IS NULL OR act.expires_at >= CURRENT_DATE()) AND
+ act.deleted_at IS NULL;"})
+ query.Execute(list(":char_id" = chars))
+
+ if (query.NextRow())
+ var/action_count = text2num(query.item[1])
+
+ if (action_count == 0)
+ return null
+
+ var/string = "There are [action_count] active CCIA actions currently active against your character(s)."
+ return string
+
+ return null
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index fa067bd9818..70408104e93 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -57,10 +57,14 @@
S["UI_style_color"] >> UI_style_color
S["UI_style_alpha"] >> UI_style_alpha
S["asfx_togs"] >> asfx_togs
+ S["motd_hash"] >> motd_hash
+ S["memo_hash"] >> memo_hash
//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor))
lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog))
+ motd_hash = sanitize_text(motd_hash, initial(motd_hash))
+ memo_hash = sanitize_text(memo_hash, initial(memo_hash))
UI_style = sanitize_inlist(UI_style, list("White", "Midnight","Orange","old"), initial(UI_style))
be_special = sanitize_integer(be_special, 0, 65535, initial(be_special))
default_slot = sanitize_integer(default_slot, 1, config.character_slots, initial(default_slot))
@@ -87,6 +91,8 @@
S["default_slot"] << default_slot
S["toggles"] << toggles
S["asfx_togs"] << asfx_togs
+ S["motd_hash"] << motd_hash
+ S["memo_hash"] << memo_hash
return 1
diff --git a/code/modules/client/preferences_sql.dm b/code/modules/client/preferences_sql.dm
index bdc85d74b25..23a6460399d 100644
--- a/code/modules/client/preferences_sql.dm
+++ b/code/modules/client/preferences_sql.dm
@@ -11,7 +11,9 @@
UI_style_color,
UI_style_alpha,
be_special,
- asfx_togs
+ asfx_togs,
+ motd_hash,
+ memo_hash
FROM ss13_player_preferences
WHERE ckey = :ckey"})
query.Execute(list(":ckey" = C.ckey))
@@ -28,10 +30,14 @@
UI_style_alpha = text2num(query.item[7])
be_special = text2num(query.item[8])
asfx_togs = text2num(query.item[9])
+ motd_hash = query.item[10]
+ memo_hash = query.item[11]
//Sanitize
ooccolor = sanitize_hexcolor(ooccolor, initial(ooccolor))
lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog))
+ motd_hash = sanitize_text(motd_hash, initial(motd_hash))
+ memo_hash = sanitize_text(memo_hash, initial(memo_hash))
UI_style = sanitize_inlist(UI_style, list("White", "Midnight","Orange","old"), initial(UI_style))
be_special = sanitize_integer(be_special, 0, 65535, initial(be_special))
default_slot = sanitize_integer(default_slot, 1, config.character_slots, initial(default_slot))
@@ -61,7 +67,9 @@
UI_style_color = :ui_color,
UI_style_alpha = :ui_alpha,
be_special = :be_special,
- asfx_togs = :asfx_togs
+ asfx_togs = :asfx_togs,
+ motd_hash = :motd_hash,
+ memo_hash = :memo_hash
WHERE ckey = :ckey"})
update_query.Execute(get_prefs_update_insert_params(C))
@@ -71,8 +79,8 @@
if (!C)
return 0
- var/DBQuery/query = dbcon.NewQuery({"INSERT INTO ss13_player_preferences (ckey, ooccolor, lastchangelog, UI_style, current_character, toggles, UI_style_color, UI_style_alpha, be_special, asfx_togs)
- VALUES (:ckey, :ooccolor, :lastchangelog, :ui_style, :current_character, :toggles, :ui_color, :ui_alpha, :be_special, :asfx_togs);"})
+ var/DBQuery/query = dbcon.NewQuery({"INSERT INTO ss13_player_preferences (ckey, ooccolor, lastchangelog, UI_style, current_character, toggles, UI_style_color, UI_style_alpha, be_special, asfx_togs, motd_hash, memo_hash)
+ VALUES (:ckey, :ooccolor, :lastchangelog, :ui_style, :current_character, :toggles, :ui_color, :ui_alpha, :be_special, :asfx_togs, :motd_hash, :memo_hash);"})
query.Execute(get_prefs_update_insert_params(C))
return 1
@@ -92,6 +100,8 @@
params[":ui_alpha"] = UI_style_alpha
params[":be_special"] = be_special
params[":asfx_togs"] = asfx_togs
+ params[":motd_hash"] = motd_hash
+ params[":memo_hash"] = memo_hash
return params
diff --git a/code/modules/mob/new_player/login.dm b/code/modules/mob/new_player/login.dm
index 235c4ce7241..ddc000e7582 100644
--- a/code/modules/mob/new_player/login.dm
+++ b/code/modules/mob/new_player/login.dm
@@ -1,7 +1,5 @@
/mob/new_player/Login()
update_Login_details() //handles setting lastKnownIP and computer_id for use by the ban systems as well as checking for multikeying
- if(join_motd)
- src << "