edshot99/ulx
1
0
Fork 0
forked from TeamUlysses/ulx
Code Pull Requests Activity

Fixed lua errors that pop up when motd generator settings file is invalid.

Browse Source 
Fixes #16
This commit is contained in:
SticklyMan 2016-01-30 16:08:18 -07:00
parent 7083fc6662
commit cce7e16414
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -28,7 +28,7 @@
* [FIX] XGUI: Server error in some cases when sorting bans by Unban Date after a new ban has been added.
* [FIX] XGUI: Right-clicking an advert group and renaming it was broken.
* [CHANGE] MOTD now uses DHTML (Awesomium framework).
* [CHANGE] MOTD configuration changes and new "motdurl" CVAR.
* [CHANGE] MOTD configuration changes and new "ulx_motdurl" CVAR.
* [CHANGE] Data files are now injected from a Lua script rather than included directly, in order to be Workshop-friendly.
* [CHANGE] Hook calls to match ULib's new format.
* [CHANGE] ULX convar updates will now append an entry to data/config.txt if it is not defined in the file. Previously, these changes would not be saved.

14
lua/ulx/modules/cl/motdmenu.lua
View File

@ -184,6 +184,18 @@ local template_footer = [[
</html>
]]
local template_error = [[
<html>
<head>
</head>
<body style="background-color: white">
<div class="footer">
<h3>ULX: MOTD Generator error. Could not parse settings file.</h3>
</div>
</body>
</html>
]]
local function escape(str)
return (str:gsub("<", "&lt;"):gsub(">", "&gt;")) -- Wrapped in parenthesis so we ignore other return vals
end
@ -213,6 +225,8 @@ local function renderMods()
end
function ulx.generateMotdHTML()
if ulx.motdSettings == nil or ulx.motdSettings.info == nil then return template_error end
local header = string.gsub( template_header, "%%hostname%%", escape(GetHostName() or "") )
header = string.gsub( header, "{{(.-)}}", function(a)
local success, value = ULib.findVar(a, ulx.motdSettings)

2
lua/ulx/modules/sh/menus.lua
View File

@ -70,7 +70,7 @@ if ULib.fileExists( "lua/ulx/modules/cl/motdmenu.lua" ) or ulx.motdmenu_exists t
ulx.convar( "motdurl", "ulyssesmod.net", "MOTD URL to use if ulx showMotd is 3.", ULib.ACCESS_ADMIN )
function ulx.populateMotdData()
if ulx.motdSettings == nil then return end
if ulx.motdSettings == nil or ulx.motdSettings.info == nil then return end
ulx.motdSettings.admins = {}
ulx.motdSettings.addons = nil

2
ulx.build
View File

@ -1 +1 @@
1454184264
1454195298