From 8b851d504875906afe3b40dd87f642fd7d5a93f1 Mon Sep 17 00:00:00 2001 From: Alexander Harkness Date: Sat, 19 Dec 2015 14:30:32 +0000 Subject: Added HTTPS links wherever they are supported. --- Server/hg.supp | 8 ++------ Server/webadmin/login_template.html | 4 ++-- Server/webadmin/template.lua | 26 +++++++++++++------------- 3 files changed, 17 insertions(+), 21 deletions(-) (limited to 'Server') diff --git a/Server/hg.supp b/Server/hg.supp index 27eb8c27a..bea6ecf3c 100644 --- a/Server/hg.supp +++ b/Server/hg.supp @@ -6,9 +6,9 @@ -# This covers GCC bug 40518, http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40518 +# This covers GCC bug 40518, https://gcc.gnu.org/bugzilla/show_bug.cgi?id=40518 # "Erasing an empty string causes a global value write / race condition warning in helgrind" -# Original suppression authored by Jonathan Wakely: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40518#c20 +# Original suppression authored by Jonathan Wakely: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=40518#c20 # Modified by Mattes to match the mangled function name used on Ubuntu { @@ -16,7 +16,3 @@ Helgrind:Race fun:_ZNSs9_M_mutateEjjj } - - - - diff --git a/Server/webadmin/login_template.html b/Server/webadmin/login_template.html index fb6f21b52..d0ab9b566 100644 --- a/Server/webadmin/login_template.html +++ b/Server/webadmin/login_template.html @@ -53,9 +53,9 @@ diff --git a/Server/webadmin/template.lua b/Server/webadmin/template.lua index 5b3ecf152..00b2523b7 100644 --- a/Server/webadmin/template.lua +++ b/Server/webadmin/template.lua @@ -25,7 +25,7 @@ function GetDefaultPage() local SubTitle = "Current Game" local Content = "" - + Content = Content .. "

Plugins:

" Content = Content .. "

Players:


"; return Content, SubTitle @@ -69,17 +69,17 @@ function ShowPage(WebAdmin, TemplateRequest) if (PageContent == "") then PageContent, SubTitle = GetDefaultPage() end - + local reqParamsClass = "" - + for key,value in pairs(TemplateRequest.Request.Params) do reqParamsClass = reqParamsClass .. " param-" .. string.lower(string.gsub(key, "[^a-zA-Z0-9]+", "-") .. "-" .. string.gsub(value, "[^a-zA-Z0-9]+", "-")) end - + if (string.gsub(reqParamsClass, "%s", "") == "") then reqParamsClass = " no-param" end - + Output([[ @@ -140,7 +140,7 @@ function ShowPage(WebAdmin, TemplateRequest) local TabNames = value:GetTabNames() if (GetTableSize(TabNames) > 0) then Output("
"..PluginWebTitle.."
\n"); - + for webname,prettyname in pairs(TabNames) do Output("
" .. prettyname .. "
\n") end @@ -149,7 +149,7 @@ function ShowPage(WebAdmin, TemplateRequest) end end - + Output([[ @@ -179,9 +179,9 @@ function ShowPage(WebAdmin, TemplateRequest) @@ -195,6 +195,6 @@ function ShowPage(WebAdmin, TemplateRequest) ]]) - + return table.concat(SiteContent) end -- cgit v1.2.3