Index: /TFP-WebServer/CommandExtensions/CommandExtensions.csproj =================================================================== --- /TFP-WebServer/CommandExtensions/CommandExtensions.csproj (revision 452) +++ /TFP-WebServer/CommandExtensions/CommandExtensions.csproj (revision 453) @@ -10,5 +10,5 @@ CommandExtensions CommandExtensions - v4.5 + v4.8 Index: /TFP-WebServer/CommandExtensions/ModInfo.xml =================================================================== --- /TFP-WebServer/CommandExtensions/ModInfo.xml (revision 452) +++ /TFP-WebServer/CommandExtensions/ModInfo.xml (revision 453) @@ -5,5 +5,5 @@ - + Index: /TFP-WebServer/MapRendering/MapRendering.csproj =================================================================== --- /TFP-WebServer/MapRendering/MapRendering.csproj (revision 452) +++ /TFP-WebServer/MapRendering/MapRendering.csproj (revision 453) @@ -10,5 +10,5 @@ MapRendering MapRendering - v4.5 + v4.8 8 Index: /TFP-WebServer/MapRendering/ModInfo.xml =================================================================== --- /TFP-WebServer/MapRendering/ModInfo.xml (revision 452) +++ /TFP-WebServer/MapRendering/ModInfo.xml (revision 453) @@ -5,5 +5,5 @@ - + Index: /TFP-WebServer/MapRendering/src/Commands/EnableRendering.cs =================================================================== --- /TFP-WebServer/MapRendering/src/Commands/EnableRendering.cs (revision 452) +++ /TFP-WebServer/MapRendering/src/Commands/EnableRendering.cs (revision 453) @@ -6,5 +6,16 @@ public class EnableRendering : ConsoleCmdAbstract { protected override string getDescription () { - return "enable/disable live map rendering"; + return "Disable live map rendering"; + } + + protected override string getHelp () { + return @" + |Usage: + | 1. enablerendering + | 2. enablerendering <0/1> + |1. Show current state of renderer + |2. Disable/enable renderer + |NOTE: This command can only turn the renderer off, it can not turn it on if it is not enabled in the serverconfig! + ".Unindent (); } @@ -15,5 +26,6 @@ public override void Execute (List _params, CommandSenderInfo _senderInfo) { if (_params.Count != 1) { - SdtdConsole.Instance.Output ($"Current state: {MapRenderer.renderingEnabled}"); + SdtdConsole.Instance.Output ( + $"Current state: {MapRenderer.Enabled && MapRenderer.renderingEnabled}{(!MapRenderer.Enabled ? " (disabled by serverconfig!)" : "")}"); return; } Index: /TFP-WebServer/MarkersMod/MarkersMod.csproj =================================================================== --- /TFP-WebServer/MarkersMod/MarkersMod.csproj (revision 452) +++ /TFP-WebServer/MarkersMod/MarkersMod.csproj (revision 453) @@ -10,5 +10,5 @@ Examples MarkersMod - v4.5 + v4.8 8 @@ -87,7 +87,5 @@ - + Index: /TFP-WebServer/MarkersMod/ModInfo.xml =================================================================== --- /TFP-WebServer/MarkersMod/ModInfo.xml (revision 452) +++ /TFP-WebServer/MarkersMod/ModInfo.xml (revision 453) @@ -5,5 +5,5 @@ - + Index: /TFP-WebServer/SpaceWizards.HttpListener/SpaceWizards.HttpListener.csproj =================================================================== --- /TFP-WebServer/SpaceWizards.HttpListener/SpaceWizards.HttpListener.csproj (revision 452) +++ /TFP-WebServer/SpaceWizards.HttpListener/SpaceWizards.HttpListener.csproj (revision 453) @@ -10,5 +10,5 @@ SpaceWizards.HttpListener SpaceWizards.HttpListener - v4.5 + v4.8 8 enable Index: /TFP-WebServer/TFP-WebDashboard.sln =================================================================== --- /TFP-WebServer/TFP-WebDashboard.sln (revision 453) +++ /TFP-WebServer/TFP-WebDashboard.sln (revision 453) @@ -0,0 +1,68 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandExtensions", "CommandExtensions\CommandExtensions.csproj", "{E273D042-57F9-4E2E-8268-5053527E5287}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapRendering", "MapRendering\MapRendering.csproj", "{A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWizards.HttpListener", "SpaceWizards.HttpListener\SpaceWizards.HttpListener.csproj", "{E273D042-57F9-4E2E-8268-5053527E5287}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarkersMod", "MarkersMod\MarkersMod.csproj", "{2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebServer", "WebServer\WebServer.csproj", "{01B5F981-B9FD-4364-8F9E-9127130D2542}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Release|Any CPU = Release|Any CPU + Release_Version|Any CPU = Release_Version|Any CPU + Debug|Any CPU = Debug|Any CPU + Release_Profiler|Any CPU = Release_Profiler|Any CPU + Debug_Profiler|Any CPU = Debug_Profiler|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Release_Version|Any CPU.ActiveCfg = Release|Any CPU + {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Release_Version|Any CPU.Build.0 = Release|Any CPU + {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Release|Any CPU.Build.0 = Release|Any CPU + {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Release_Profiler|Any CPU.ActiveCfg = Release_Profiler|Any CPU + {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Release_Profiler|Any CPU.Build.0 = Release_Profiler|Any CPU + {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Debug_Profiler|Any CPU.ActiveCfg = Debug_Profiler|Any CPU + {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Debug_Profiler|Any CPU.Build.0 = Debug_Profiler|Any CPU + {E273D042-57F9-4E2E-8268-5053527E5287}.Release_Version|Any CPU.ActiveCfg = Release|Any CPU + {E273D042-57F9-4E2E-8268-5053527E5287}.Release_Version|Any CPU.Build.0 = Release|Any CPU + {E273D042-57F9-4E2E-8268-5053527E5287}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E273D042-57F9-4E2E-8268-5053527E5287}.Release|Any CPU.Build.0 = Release|Any CPU + {E273D042-57F9-4E2E-8268-5053527E5287}.Release_Profiler|Any CPU.ActiveCfg = Release_Profiler|Any CPU + {E273D042-57F9-4E2E-8268-5053527E5287}.Release_Profiler|Any CPU.Build.0 = Release_Profiler|Any CPU + {E273D042-57F9-4E2E-8268-5053527E5287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E273D042-57F9-4E2E-8268-5053527E5287}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E273D042-57F9-4E2E-8268-5053527E5287}.Debug_Profiler|Any CPU.ActiveCfg = Debug_Profiler|Any CPU + {E273D042-57F9-4E2E-8268-5053527E5287}.Debug_Profiler|Any CPU.Build.0 = Debug_Profiler|Any CPU + {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release|Any CPU.Build.0 = Release|Any CPU + {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release_Version|Any CPU.ActiveCfg = Release|Any CPU + {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release_Version|Any CPU.Build.0 = Release|Any CPU + {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release_Profiler|Any CPU.ActiveCfg = Release_Profiler|Any CPU + {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release_Profiler|Any CPU.Build.0 = Release_Profiler|Any CPU + {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Debug_Profiler|Any CPU.ActiveCfg = Debug_Profiler|Any CPU + {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Debug_Profiler|Any CPU.Build.0 = Debug_Profiler|Any CPU + {01B5F981-B9FD-4364-8F9E-9127130D2542}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01B5F981-B9FD-4364-8F9E-9127130D2542}.Release|Any CPU.Build.0 = Release|Any CPU + {01B5F981-B9FD-4364-8F9E-9127130D2542}.Release_Version|Any CPU.ActiveCfg = Release|Any CPU + {01B5F981-B9FD-4364-8F9E-9127130D2542}.Release_Version|Any CPU.Build.0 = Release|Any CPU + {01B5F981-B9FD-4364-8F9E-9127130D2542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01B5F981-B9FD-4364-8F9E-9127130D2542}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01B5F981-B9FD-4364-8F9E-9127130D2542}.Release_Profiler|Any CPU.ActiveCfg = Release_Profiler|Any CPU + {01B5F981-B9FD-4364-8F9E-9127130D2542}.Release_Profiler|Any CPU.Build.0 = Release_Profiler|Any CPU + {01B5F981-B9FD-4364-8F9E-9127130D2542}.Debug_Profiler|Any CPU.ActiveCfg = Debug_Profiler|Any CPU + {01B5F981-B9FD-4364-8F9E-9127130D2542}.Debug_Profiler|Any CPU.Build.0 = Debug_Profiler|Any CPU + EndGlobalSection + GlobalSection(MonoDevelopProperties) = preSolution + StartupItem = 7dtd-server-fixes\7dtd-server-fixes.csproj + outputpath = bin + EndGlobalSection +EndGlobal Index: /TFP-WebServer/WebServer/ModInfo.xml =================================================================== --- /TFP-WebServer/WebServer/ModInfo.xml (revision 452) +++ /TFP-WebServer/WebServer/ModInfo.xml (revision 453) @@ -5,5 +5,5 @@ - + Index: /TFP-WebServer/WebServer/WebServer.csproj =================================================================== --- /TFP-WebServer/WebServer/WebServer.csproj (revision 452) +++ /TFP-WebServer/WebServer/WebServer.csproj (revision 453) @@ -10,5 +10,5 @@ Webserver WebServer - v4.5 + v4.8 9 Index: /TFP-WebServer/WebServer/src/UrlHandlers/ApiHandler.cs =================================================================== --- /TFP-WebServer/WebServer/src/UrlHandlers/ApiHandler.cs (revision 452) +++ /TFP-WebServer/WebServer/src/UrlHandlers/ApiHandler.cs (revision 453) @@ -30,5 +30,6 @@ private void apiFoundCallback (Type _type) { - ConstructorInfo ctor = _type.GetConstructor (apiWithParentCtorTypes); + ConstructorInfo ctor = _type.GetConstructor (BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, (Binder)null, + apiWithParentCtorTypes, (ParameterModifier[])null); if (ctor != null) { AbsWebAPI apiInstance = (AbsWebAPI)ctor.Invoke (apiWithParentCtorArgs); @@ -37,5 +38,6 @@ } - ctor = _type.GetConstructor (apiEmptyCtorTypes); + ctor = _type.GetConstructor (BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic, (Binder)null, + apiEmptyCtorTypes, (ParameterModifier[])null); if (ctor != null) { AbsWebAPI apiInstance = (AbsWebAPI)ctor.Invoke (apiEmptyCtorArgs); Index: /TFP-WebServer/WebServer/src/UrlHandlers/SessionHandler.cs =================================================================== --- /TFP-WebServer/WebServer/src/UrlHandlers/SessionHandler.cs (revision 452) +++ /TFP-WebServer/WebServer/src/UrlHandlers/SessionHandler.cs (revision 453) @@ -9,4 +9,5 @@ namespace Webserver.UrlHandlers { public class SessionHandler : AbsHandler { + private const string pageBasePath = "/app"; private const string pageErrorPath = "/app/error/"; @@ -14,19 +15,16 @@ private const string steamOpenIdVerifyUrl = "verifysteamopenid"; private const string steamLoginUrl = "loginsteam"; + private const string steamLoginName = "Steam OpenID"; private const string steamLoginFailedPage = "SteamLoginFailed"; private const string userPassLoginUrl = "login"; public const string userPassLoginName = "User/pass"; - public const string userPassErrorPage = "UserPassLoginFailed"; + private const string userPassErrorPage = "UserPassLoginFailed"; - private readonly ConnectionHandler connectionHandler; - - public SessionHandler (ConnectionHandler _connectionHandler) : base (null) { - connectionHandler = _connectionHandler; + public SessionHandler () : base (null) { } - public override void HandleRequest (RequestContext _context) { if (_context.Request.RemoteEndPoint == null) { - _context.Response.Redirect (pageErrorPath + "NoRemoteEndpoint"); + WebUtils.WriteText (_context.Response, "NoRemoteEndpoint", HttpStatusCode.BadRequest); return; } @@ -37,30 +35,34 @@ if (subpath.StartsWith (steamOpenIdVerifyUrl)) { - HandleSteamVerification (_context, remoteEndpointString); + if (HandleSteamVerification (parent.ConnectionHandler, _context, remoteEndpointString)) { + _context.Response.Redirect (pageBasePath); + } else { + _context.Response.Redirect (pageErrorPath + steamLoginFailedPage); + } return; } if (subpath.StartsWith ("logout")) { - HandleLogout (_context); + HandleLogout (parent.ConnectionHandler, _context, pageBasePath); return; } if (subpath.StartsWith (steamLoginUrl)) { - HandleSteamLogin (_context); + HandleSteamLogin (_context, $"{urlBasePath}{steamOpenIdVerifyUrl}"); return; } if (subpath.StartsWith (userPassLoginUrl)) { - HandleUserPassLogin (_context, remoteEndpointString); + HandleUserPassLogin (parent.ConnectionHandler, _context, remoteEndpointString); return; } - _context.Response.Redirect (pageErrorPath + "InvalidSessionsCommand"); + WebUtils.WriteText (_context.Response, "InvalidSessionsCommand", HttpStatusCode.BadRequest); } - private void HandleUserPassLogin (RequestContext _context, string _remoteEndpointString) { + public static bool HandleUserPassLogin (ConnectionHandler _connectionHandler, RequestContext _context, string _remoteEndpointString) { if (!_context.Request.HasEntityBody) { WebUtils.WriteText (_context.Response, "NoLoginData", HttpStatusCode.BadRequest); - return; + return false; } @@ -77,33 +79,40 @@ Log.Exception (e); WebUtils.WriteText (_context.Response, "InvalidLoginJson", HttpStatusCode.BadRequest); - return; + return false; } if (!inputJson.TryGetValue ("username", out object fieldNode) || fieldNode is not string username) { WebUtils.WriteText (_context.Response, "InvalidLoginJson", HttpStatusCode.BadRequest); - return; + return false; } if (!inputJson.TryGetValue ("password", out fieldNode) || fieldNode is not string password) { WebUtils.WriteText (_context.Response, "InvalidLoginJson", HttpStatusCode.BadRequest); - return; + return false; } if (!AdminWebUsers.Instance.TryGetUser (username, password, out AdminWebUsers.WebUser webUser)) { + WebUtils.WriteText (_context.Response, "UserPassInvalid", HttpStatusCode.Unauthorized); Log.Out ($"[Web] User/pass login failed from {_remoteEndpointString}"); - WebUtils.WriteText (_context.Response, "UserPassInvalid", HttpStatusCode.Unauthorized); - return; + return false; } - HandleUserIdLogin (connectionHandler, _context, _remoteEndpointString, userPassLoginName, userPassErrorPage, webUser.Name, webUser.PlatformUser, webUser.CrossPlatformUser); + var loginResult = HandleUserIdLogin (_connectionHandler, _context, _remoteEndpointString, userPassLoginName, webUser.Name, webUser.PlatformUser, webUser.CrossPlatformUser); + if (loginResult) { + WebUtils.WriteText (_context.Response, ""); + } else { + WebUtils.WriteText (_context.Response, "LoginError", HttpStatusCode.InternalServerError); + } + + return loginResult; } - private void HandleSteamLogin (RequestContext _context) { + public static void HandleSteamLogin (RequestContext _context, string _verificationCallbackUrl) { string host = $"{(WebUtils.IsSslRedirected (_context.Request) ? "https://" : "http://")}{_context.Request.UserHostName}"; - string url = OpenID.GetOpenIdLoginUrl (host, $"{host}{urlBasePath}{steamOpenIdVerifyUrl}"); + string url = OpenID.GetOpenIdLoginUrl (host, $"{host}{_verificationCallbackUrl}"); _context.Response.Redirect (url); } - private void HandleLogout (RequestContext _context) { + public static bool HandleLogout (ConnectionHandler _connectionHandler, RequestContext _context, string _pageBase) { Cookie cookie = new Cookie ("sid", "", "/") { Expired = true @@ -112,13 +121,14 @@ if (_context.Connection == null) { - _context.Response.Redirect (pageErrorPath + "NotLoggedIn"); - return; + _context.Response.Redirect (_pageBase); + return false; } - connectionHandler.LogOut (_context.Connection.SessionID); - _context.Response.Redirect (pageBasePath); + _connectionHandler.LogOut (_context.Connection.SessionID); + _context.Response.Redirect (_pageBase); + return true; } - private void HandleSteamVerification (RequestContext _context, string _remoteEndpointString) { + public static bool HandleSteamVerification (ConnectionHandler _connectionHandler, RequestContext _context, string _remoteEndpointString) { ulong id; try { @@ -127,20 +137,18 @@ Log.Error ($"[Web] Error validating Steam login from {_remoteEndpointString}:"); Log.Exception (e); - _context.Response.Redirect (pageErrorPath + steamLoginFailedPage); - return; + return false; } if (id <= 0) { Log.Out ($"[Web] Steam OpenID login failed (invalid ID) from {_remoteEndpointString}"); - _context.Response.Redirect (pageErrorPath + steamLoginFailedPage); - return; + return false; } UserIdentifierSteam userId = new UserIdentifierSteam (id); - HandleUserIdLogin (connectionHandler, _context, _remoteEndpointString, "Steam OpenID", steamLoginFailedPage, userId.ToString (), userId); + return HandleUserIdLogin (_connectionHandler, _context, _remoteEndpointString, steamLoginName, userId.ToString (), userId); } - public static void HandleUserIdLogin (ConnectionHandler _connectionHandler, RequestContext _context, string _remoteEndpointString, - string _loginName, string _errorPage, string _username, PlatformUserIdentifierAbs _userId, PlatformUserIdentifierAbs _crossUserId = null, bool _sendResponse = true) { + public static bool HandleUserIdLogin (ConnectionHandler _connectionHandler, RequestContext _context, string _remoteEndpointString, + string _loginName, string _username, PlatformUserIdentifierAbs _userId, PlatformUserIdentifierAbs _crossUserId = null) { try { WebConnection con = _connectionHandler.LogIn (_context.Request.RemoteEndPoint!.Address, _username, _userId, _crossUserId); @@ -154,5 +162,5 @@ int higherLevel = Math.Min (level1, level2); - Log.Out ($"[Web] {_loginName} login from {_remoteEndpointString}, name {_username} with ID {_userId}, CID {(_crossUserId != null ? _crossUserId : "none")}, permission level {higherLevel}"); + Log.Out ($"[Web] {_loginName} login from {_remoteEndpointString}, name {_username} with ID {_userId}, CID {(_crossUserId != null ? _crossUserId.ToString () : "none")}, permission level {higherLevel}"); Cookie cookie = new Cookie ("sid", con.SessionID, "/") { Expired = false, @@ -163,15 +171,13 @@ _context.Response.AppendCookie (cookie); - if (_sendResponse) { - WebUtils.WriteText (_context.Response, ""); - } + return true; } catch (Exception e) { Log.Error ($"[Web] Error during {_loginName} login:"); Log.Exception (e); - if (_sendResponse) { - WebUtils.WriteText (_context.Response, "LoginError", HttpStatusCode.InternalServerError); - } } + + return false; } + } } Index: /TFP-WebServer/WebServer/src/Web.cs =================================================================== --- /TFP-WebServer/WebServer/src/Web.cs (revision 452) +++ /TFP-WebServer/WebServer/src/Web.cs (revision 453) @@ -85,5 +85,5 @@ RegisterWebMods (useCacheForStatic); - RegisterPathHandler ("/session/", new SessionHandler (ConnectionHandler)); + RegisterPathHandler ("/session/", new SessionHandler ()); RegisterPathHandler ("/userstatus", new UserStatusHandler ()); RegisterPathHandler ("/sse/", new SseHandler ()); Index: /TFP-WebServer/WebServer/src/WebAPI/APIs/Permissions/RegisterUser.cs =================================================================== --- /TFP-WebServer/WebServer/src/WebAPI/APIs/Permissions/RegisterUser.cs (revision 452) +++ /TFP-WebServer/WebServer/src/WebAPI/APIs/Permissions/RegisterUser.cs (revision 453) @@ -110,5 +110,5 @@ string remoteEndpointString = _context.Request.RemoteEndPoint!.ToString (); SessionHandler.HandleUserIdLogin (ParentWeb.ConnectionHandler, _context, remoteEndpointString, SessionHandler.userPassLoginName, - SessionHandler.userPassErrorPage, username, regData.PlatformUserId, regData.CrossPlatformUserId, false); + username, regData.PlatformUserId, regData.CrossPlatformUserId); _context.Response.StatusCode = (int)HttpStatusCode.Created; Index: /TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml =================================================================== --- /TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml (revision 452) +++ /TFP-WebServer/bin/Mods/TFP_CommandExtensions/ModInfo.xml (revision 453) @@ -5,5 +5,5 @@ - + Index: /TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml =================================================================== --- /TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml (revision 452) +++ /TFP-WebServer/bin/Mods/TFP_MapRendering/ModInfo.xml (revision 453) @@ -5,5 +5,5 @@ - + Index: /TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml =================================================================== --- /TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml (revision 452) +++ /TFP-WebServer/bin/Mods/TFP_WebServer/ModInfo.xml (revision 453) @@ -5,5 +5,5 @@ - + Index: /TFP-WebServer/bin/Mods/Xample_MarkersMod/ModInfo.xml =================================================================== --- /TFP-WebServer/bin/Mods/Xample_MarkersMod/ModInfo.xml (revision 452) +++ /TFP-WebServer/bin/Mods/Xample_MarkersMod/ModInfo.xml (revision 453) @@ -5,5 +5,5 @@ - + Index: P-WebServer/server-fixes.sln =================================================================== --- /TFP-WebServer/server-fixes.sln (revision 452) +++ (revision ) @@ -1,68 +1,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandExtensions", "CommandExtensions\CommandExtensions.csproj", "{E273D042-57F9-4E2E-8268-5053527E5287}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MapRendering", "MapRendering\MapRendering.csproj", "{A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SpaceWizards.HttpListener", "SpaceWizards.HttpListener\SpaceWizards.HttpListener.csproj", "{E273D042-57F9-4E2E-8268-5053527E5287}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MarkersMod", "MarkersMod\MarkersMod.csproj", "{2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebServer", "WebServer\WebServer.csproj", "{01B5F981-B9FD-4364-8F9E-9127130D2542}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Release|Any CPU = Release|Any CPU - Release_Version|Any CPU = Release_Version|Any CPU - Debug|Any CPU = Debug|Any CPU - Release_Profiler|Any CPU = Release_Profiler|Any CPU - Debug_Profiler|Any CPU = Debug_Profiler|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Release_Version|Any CPU.ActiveCfg = Release|Any CPU - {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Release_Version|Any CPU.Build.0 = Release|Any CPU - {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Release|Any CPU.Build.0 = Release|Any CPU - {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Release_Profiler|Any CPU.ActiveCfg = Release_Profiler|Any CPU - {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Release_Profiler|Any CPU.Build.0 = Release_Profiler|Any CPU - {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Debug_Profiler|Any CPU.ActiveCfg = Debug_Profiler|Any CPU - {A1847B5F-7BFC-4BCD-94AA-A6C9FB7E7C54}.Debug_Profiler|Any CPU.Build.0 = Debug_Profiler|Any CPU - {E273D042-57F9-4E2E-8268-5053527E5287}.Release_Version|Any CPU.ActiveCfg = Release|Any CPU - {E273D042-57F9-4E2E-8268-5053527E5287}.Release_Version|Any CPU.Build.0 = Release|Any CPU - {E273D042-57F9-4E2E-8268-5053527E5287}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E273D042-57F9-4E2E-8268-5053527E5287}.Release|Any CPU.Build.0 = Release|Any CPU - {E273D042-57F9-4E2E-8268-5053527E5287}.Release_Profiler|Any CPU.ActiveCfg = Release_Profiler|Any CPU - {E273D042-57F9-4E2E-8268-5053527E5287}.Release_Profiler|Any CPU.Build.0 = Release_Profiler|Any CPU - {E273D042-57F9-4E2E-8268-5053527E5287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E273D042-57F9-4E2E-8268-5053527E5287}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E273D042-57F9-4E2E-8268-5053527E5287}.Debug_Profiler|Any CPU.ActiveCfg = Debug_Profiler|Any CPU - {E273D042-57F9-4E2E-8268-5053527E5287}.Debug_Profiler|Any CPU.Build.0 = Debug_Profiler|Any CPU - {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release|Any CPU.Build.0 = Release|Any CPU - {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release_Version|Any CPU.ActiveCfg = Release|Any CPU - {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release_Version|Any CPU.Build.0 = Release|Any CPU - {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release_Profiler|Any CPU.ActiveCfg = Release_Profiler|Any CPU - {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Release_Profiler|Any CPU.Build.0 = Release_Profiler|Any CPU - {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Debug_Profiler|Any CPU.ActiveCfg = Debug_Profiler|Any CPU - {2A008E16-6EB8-4B85-A175-3CB89D9FF4AE}.Debug_Profiler|Any CPU.Build.0 = Debug_Profiler|Any CPU - {01B5F981-B9FD-4364-8F9E-9127130D2542}.Release|Any CPU.ActiveCfg = Release|Any CPU - {01B5F981-B9FD-4364-8F9E-9127130D2542}.Release|Any CPU.Build.0 = Release|Any CPU - {01B5F981-B9FD-4364-8F9E-9127130D2542}.Release_Version|Any CPU.ActiveCfg = Release|Any CPU - {01B5F981-B9FD-4364-8F9E-9127130D2542}.Release_Version|Any CPU.Build.0 = Release|Any CPU - {01B5F981-B9FD-4364-8F9E-9127130D2542}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {01B5F981-B9FD-4364-8F9E-9127130D2542}.Debug|Any CPU.Build.0 = Debug|Any CPU - {01B5F981-B9FD-4364-8F9E-9127130D2542}.Release_Profiler|Any CPU.ActiveCfg = Release_Profiler|Any CPU - {01B5F981-B9FD-4364-8F9E-9127130D2542}.Release_Profiler|Any CPU.Build.0 = Release_Profiler|Any CPU - {01B5F981-B9FD-4364-8F9E-9127130D2542}.Debug_Profiler|Any CPU.ActiveCfg = Debug_Profiler|Any CPU - {01B5F981-B9FD-4364-8F9E-9127130D2542}.Debug_Profiler|Any CPU.Build.0 = Debug_Profiler|Any CPU - EndGlobalSection - GlobalSection(MonoDevelopProperties) = preSolution - StartupItem = 7dtd-server-fixes\7dtd-server-fixes.csproj - outputpath = bin - EndGlobalSection -EndGlobal