Index: binary-improvements/MapRendering/API.cs =================================================================== --- binary-improvements/MapRendering/API.cs (revision 350) +++ binary-improvements/MapRendering/API.cs (revision 351) @@ -21,9 +21,9 @@ private void GameShutdown () { - AllocsFixes.MapRendering.MapRendering.Shutdown (); + MapRendering.MapRendering.Shutdown (); } private void CalcChunkColorsDone (Chunk _chunk) { - AllocsFixes.MapRendering.MapRendering.RenderSingleChunk (_chunk); + MapRendering.MapRendering.RenderSingleChunk (_chunk); } } Index: binary-improvements/MapRendering/MapRendering/Constants.cs =================================================================== --- binary-improvements/MapRendering/MapRendering/Constants.cs (revision 350) +++ binary-improvements/MapRendering/MapRendering/Constants.cs (revision 351) @@ -3,8 +3,8 @@ namespace AllocsFixes.MapRendering { public class Constants { - public static TextureFormat DEFAULT_TEX_FORMAT = TextureFormat.ARGB32; + public static readonly TextureFormat DEFAULT_TEX_FORMAT = TextureFormat.ARGB32; public static int MAP_BLOCK_SIZE = 128; - public static int MAP_CHUNK_SIZE = 16; - public static int MAP_REGION_SIZE = 512; + public const int MAP_CHUNK_SIZE = 16; + public const int MAP_REGION_SIZE = 512; public static int ZOOMLEVELS = 5; public static string MAP_DIRECTORY = string.Empty; Index: binary-improvements/MapRendering/MapRendering/MapRenderBlockBuffer.cs =================================================================== --- binary-improvements/MapRendering/MapRendering/MapRenderBlockBuffer.cs (revision 350) +++ binary-improvements/MapRendering/MapRendering/MapRenderBlockBuffer.cs (revision 351) @@ -18,7 +18,7 @@ private string currentBlockMapFolder = string.Empty; - public MapRenderBlockBuffer (int level, MapTileCache cache) { - zoomLevel = level; - this.cache = cache; + public MapRenderBlockBuffer (int _level, MapTileCache _cache) { + zoomLevel = _level; + cache = _cache; folderBase = Constants.MAP_DIRECTORY + "/" + zoomLevel + "/"; @@ -59,12 +59,12 @@ } - public bool LoadBlock (Vector2i block) { + public bool LoadBlock (Vector2i _block) { Profiler.BeginSample ("LoadBlock"); lock (blockMap) { - if (currentBlockMapPos != block) { + if (currentBlockMapPos != _block) { Profiler.BeginSample ("LoadBlock.Strings"); string folder; - if (currentBlockMapPos.x != block.x) { - folder = folderBase + block.x + '/'; + if (currentBlockMapPos.x != _block.x) { + folder = folderBase + _block.x + '/'; Profiler.BeginSample ("LoadBlock.Directory"); @@ -75,5 +75,5 @@ } - string fileName = folder + block.y + ".png"; + string fileName = folder + _block.y + ".png"; Profiler.EndSample (); @@ -82,5 +82,5 @@ currentBlockMapFolder = folder; - currentBlockMapPos = block; + currentBlockMapPos = _block; Profiler.EndSample (); @@ -93,13 +93,13 @@ } - public void SetPart (Vector2i offset, int partSize, Color32[] pixels) { - if (offset.x + partSize > Constants.MAP_BLOCK_SIZE || offset.y + partSize > Constants.MAP_BLOCK_SIZE) { + public void SetPart (Vector2i _offset, int _partSize, Color32[] _pixels) { + if (_offset.x + _partSize > Constants.MAP_BLOCK_SIZE || _offset.y + _partSize > Constants.MAP_BLOCK_SIZE) { Log.Error (string.Format ("MapBlockBuffer[{0}].SetPart ({1}, {2}, {3}) has blockMap.size ({4}/{5})", - zoomLevel, offset, partSize, pixels.Length, Constants.MAP_BLOCK_SIZE, Constants.MAP_BLOCK_SIZE)); + zoomLevel, _offset, _partSize, _pixels.Length, Constants.MAP_BLOCK_SIZE, Constants.MAP_BLOCK_SIZE)); return; } Profiler.BeginSample ("SetPart"); - blockMap.SetPixels32 (offset.x, offset.y, partSize, partSize, pixels); + blockMap.SetPixels32 (_offset.x, _offset.y, _partSize, _partSize, _pixels); Profiler.EndSample (); } @@ -135,8 +135,8 @@ } - public void SetPartNative (Vector2i offset, int partSize, NativeArray pixels) { - if (offset.x + partSize > Constants.MAP_BLOCK_SIZE || offset.y + partSize > Constants.MAP_BLOCK_SIZE) { + public void SetPartNative (Vector2i _offset, int _partSize, NativeArray _pixels) { + if (_offset.x + _partSize > Constants.MAP_BLOCK_SIZE || _offset.y + _partSize > Constants.MAP_BLOCK_SIZE) { Log.Error (string.Format ("MapBlockBuffer[{0}].SetPart ({1}, {2}, {3}) has blockMap.size ({4}/{5})", - zoomLevel, offset, partSize, pixels.Length, Constants.MAP_BLOCK_SIZE, Constants.MAP_BLOCK_SIZE)); + zoomLevel, _offset, _partSize, _pixels.Length, Constants.MAP_BLOCK_SIZE, Constants.MAP_BLOCK_SIZE)); return; } @@ -145,9 +145,9 @@ NativeArray destData = blockMap.GetRawTextureData (); - for (int y = 0; y < partSize; y++) { - int srcLineStartIdx = partSize * y; - int destLineStartIdx = blockMap.width * (offset.y + y) + offset.x; - for (int x = 0; x < partSize; x++) { - destData [destLineStartIdx + x] = pixels [srcLineStartIdx + x]; + for (int y = 0; y < _partSize; y++) { + int srcLineStartIdx = _partSize * y; + int destLineStartIdx = blockMap.width * (_offset.y + y) + _offset.x; + for (int x = 0; x < _partSize; x++) { + destData [destLineStartIdx + x] = _pixels [srcLineStartIdx + x]; } } Index: binary-improvements/MapRendering/MapRendering/MapRendering.cs =================================================================== --- binary-improvements/MapRendering/MapRendering/MapRendering.cs (revision 350) +++ binary-improvements/MapRendering/MapRendering/MapRendering.cs (revision 351) @@ -5,5 +5,4 @@ using System.Text; using System.Threading; -using System.Timers; using AllocsFixes.FileCache; using AllocsFixes.JSON; @@ -66,12 +65,12 @@ } - public static void RenderSingleChunk (Chunk chunk) { + public static void RenderSingleChunk (Chunk _chunk) { if (renderingEnabled) { // TODO: Replace with regular thread and a blocking queue / set - ThreadPool.UnsafeQueueUserWorkItem (o => { + ThreadPool.UnsafeQueueUserWorkItem (_o => { try { if (!Instance.renderingFullMap) { lock (lockObject) { - Chunk c = (Chunk) o; + Chunk c = (Chunk) _o; Vector3i cPos = c.GetWorldPos (); Vector2i cPos2 = new Vector2i (cPos.x / Constants.MAP_CHUNK_SIZE, @@ -95,5 +94,5 @@ Log.Out ("Exception in MapRendering.RenderSingleChunk(): " + e); } - }, chunk); + }, _chunk); } } @@ -279,10 +278,10 @@ } - private void RenderZoomLevel (Vector2i innerBlock) { + private void RenderZoomLevel (Vector2i _innerBlock) { Profiler.BeginSample ("RenderZoomLevel"); int level = Constants.ZOOMLEVELS - 1; while (level > 0) { Vector2i block, blockOffset; - getBlockNumber (innerBlock, out block, out blockOffset, 2, Constants.MAP_BLOCK_SIZE / 2); + getBlockNumber (_innerBlock, out block, out blockOffset, 2, Constants.MAP_BLOCK_SIZE / 2); zoomLevelBuffers [level - 1].LoadBlock (block); @@ -299,17 +298,17 @@ level--; - innerBlock = block; + _innerBlock = block; } Profiler.EndSample (); } - private void getBlockNumber (Vector2i innerPos, out Vector2i block, out Vector2i blockOffset, int scaleFactor, - int offsetSize) { - block = default (Vector2i); - blockOffset = default (Vector2i); - block.x = (innerPos.x + 16777216) / scaleFactor - 16777216 / scaleFactor; - block.y = (innerPos.y + 16777216) / scaleFactor - 16777216 / scaleFactor; - blockOffset.x = (innerPos.x + 16777216) % scaleFactor * offsetSize; - blockOffset.y = (innerPos.y + 16777216) % scaleFactor * offsetSize; + private void getBlockNumber (Vector2i _innerPos, out Vector2i _block, out Vector2i _blockOffset, int _scaleFactor, + int _offsetSize) { + _block = default (Vector2i); + _blockOffset = default (Vector2i); + _block.x = (_innerPos.x + 16777216) / _scaleFactor - 16777216 / _scaleFactor; + _block.y = (_innerPos.y + 16777216) / _scaleFactor - 16777216 / _scaleFactor; + _blockOffset.x = (_innerPos.x + 16777216) % _scaleFactor * _offsetSize; + _blockOffset.y = (_innerPos.y + 16777216) % _scaleFactor * _offsetSize; } @@ -352,14 +351,14 @@ } - private void getWorldExtent (RegionFileManager rfm, out Vector2i minChunk, out Vector2i maxChunk, - out Vector2i minPos, out Vector2i maxPos, - out int widthChunks, out int heightChunks, - out int widthPix, out int heightPix) { - minChunk = default (Vector2i); - maxChunk = default (Vector2i); - minPos = default (Vector2i); - maxPos = default (Vector2i); - - long[] keys = rfm.GetAllChunkKeys (); + private void getWorldExtent (RegionFileManager _rfm, out Vector2i _minChunk, out Vector2i _maxChunk, + out Vector2i _minPos, out Vector2i _maxPos, + out int _widthChunks, out int _heightChunks, + out int _widthPix, out int _heightPix) { + _minChunk = default (Vector2i); + _maxChunk = default (Vector2i); + _minPos = default (Vector2i); + _maxPos = default (Vector2i); + + long[] keys = _rfm.GetAllChunkKeys (); int minX = int.MaxValue; int minY = int.MaxValue; @@ -387,28 +386,28 @@ } - minChunk.x = minX; - minChunk.y = minY; - - maxChunk.x = maxX; - maxChunk.y = maxY; - - minPos.x = minX * Constants.MAP_CHUNK_SIZE; - minPos.y = minY * Constants.MAP_CHUNK_SIZE; - - maxPos.x = maxX * Constants.MAP_CHUNK_SIZE; - maxPos.y = maxY * Constants.MAP_CHUNK_SIZE; - - widthChunks = maxX - minX + 1; - heightChunks = maxY - minY + 1; - - widthPix = widthChunks * Constants.MAP_CHUNK_SIZE; - heightPix = heightChunks * Constants.MAP_CHUNK_SIZE; - } - - private static Color32 shortColorToColor32 (ushort col) { - byte r = (byte) (256 * ((col >> 10) & 31) / 32); - byte g = (byte) (256 * ((col >> 5) & 31) / 32); - byte b = (byte) (256 * (col & 31) / 32); - byte a = 255; + _minChunk.x = minX; + _minChunk.y = minY; + + _maxChunk.x = maxX; + _maxChunk.y = maxY; + + _minPos.x = minX * Constants.MAP_CHUNK_SIZE; + _minPos.y = minY * Constants.MAP_CHUNK_SIZE; + + _maxPos.x = maxX * Constants.MAP_CHUNK_SIZE; + _maxPos.y = maxY * Constants.MAP_CHUNK_SIZE; + + _widthChunks = maxX - minX + 1; + _heightChunks = maxY - minY + 1; + + _widthPix = _widthChunks * Constants.MAP_CHUNK_SIZE; + _heightPix = _heightChunks * Constants.MAP_CHUNK_SIZE; + } + + private static Color32 shortColorToColor32 (ushort _col) { + byte r = (byte) (256 * ((_col >> 10) & 31) / 32); + byte g = (byte) (256 * ((_col >> 5) & 31) / 32); + byte b = (byte) (256 * (_col & 31) / 32); + const byte a = 255; return new Color32 (r, g, b, a); } Index: binary-improvements/MapRendering/Web/API/ExecuteConsoleCommand.cs =================================================================== --- binary-improvements/MapRendering/Web/API/ExecuteConsoleCommand.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/ExecuteConsoleCommand.cs (revision 351) @@ -4,20 +4,20 @@ namespace AllocsFixes.NetConnections.Servers.Web.API { public class ExecuteConsoleCommand : WebAPI { - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { - if (string.IsNullOrEmpty (req.QueryString ["command"])) { - resp.StatusCode = (int) HttpStatusCode.BadRequest; - Web.SetResponseTextContent (resp, "No command given"); + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { + if (string.IsNullOrEmpty (_req.QueryString ["command"])) { + _resp.StatusCode = (int) HttpStatusCode.BadRequest; + Web.SetResponseTextContent (_resp, "No command given"); return; } WebCommandResult.ResultType responseType = - req.QueryString ["raw"] != null + _req.QueryString ["raw"] != null ? WebCommandResult.ResultType.Raw - : (req.QueryString ["simple"] != null + : (_req.QueryString ["simple"] != null ? WebCommandResult.ResultType.ResultOnly : WebCommandResult.ResultType.Full); - string commandline = req.QueryString ["command"]; + string commandline = _req.QueryString ["command"]; string commandPart = commandline.Split (' ') [0]; string argumentsPart = commandline.Substring (Math.Min (commandline.Length, commandPart.Length + 1)); @@ -26,6 +26,6 @@ if (command == null) { - resp.StatusCode = (int) HttpStatusCode.NotFound; - Web.SetResponseTextContent (resp, "Unknown command"); + _resp.StatusCode = (int) HttpStatusCode.NotFound; + Web.SetResponseTextContent (_resp, "Unknown command"); return; } @@ -34,12 +34,12 @@ GameManager.Instance.adminTools.GetAdminToolsCommandPermission (command.GetCommands ()); - if (permissionLevel > atcp.PermissionLevel) { - resp.StatusCode = (int) HttpStatusCode.Forbidden; - Web.SetResponseTextContent (resp, "You are not allowed to execute this command"); + if (_permissionLevel > atcp.PermissionLevel) { + _resp.StatusCode = (int) HttpStatusCode.Forbidden; + Web.SetResponseTextContent (_resp, "You are not allowed to execute this command"); return; } - resp.SendChunked = true; - WebCommandResult wcr = new WebCommandResult (commandPart, argumentsPart, responseType, resp); + _resp.SendChunked = true; + WebCommandResult wcr = new WebCommandResult (commandPart, argumentsPart, responseType, _resp); SdtdConsole.Instance.ExecuteAsync (commandline, wcr); } Index: binary-improvements/MapRendering/Web/API/GetAllowedCommands.cs =================================================================== --- binary-improvements/MapRendering/Web/API/GetAllowedCommands.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/GetAllowedCommands.cs (revision 351) @@ -4,6 +4,6 @@ namespace AllocsFixes.NetConnections.Servers.Web.API { public class GetAllowedCommands : WebAPI { - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { JSONObject result = new JSONObject (); JSONArray entries = new JSONArray (); @@ -11,5 +11,5 @@ AdminToolsCommandPermissions atcp = GameManager.Instance.adminTools.GetAdminToolsCommandPermission (cc.GetCommands ()); - if (permissionLevel <= atcp.PermissionLevel) { + if (_permissionLevel <= atcp.PermissionLevel) { string cmd = string.Empty; foreach (string s in cc.GetCommands ()) { @@ -29,5 +29,5 @@ result.Add ("commands", entries); - WriteJSON (resp, result); + WriteJSON (_resp, result); } Index: binary-improvements/MapRendering/Web/API/GetAnimalsLocation.cs =================================================================== --- binary-improvements/MapRendering/Web/API/GetAnimalsLocation.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/GetAnimalsLocation.cs (revision 351) @@ -8,6 +8,6 @@ private readonly List animals = new List (); - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { JSONArray animalsJsResult = new JSONArray (); @@ -36,5 +36,5 @@ } - WriteJSON (resp, animalsJsResult); + WriteJSON (_resp, animalsJsResult); } } Index: binary-improvements/MapRendering/Web/API/GetHostileLocation.cs =================================================================== --- binary-improvements/MapRendering/Web/API/GetHostileLocation.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/GetHostileLocation.cs (revision 351) @@ -8,6 +8,6 @@ private readonly List enemies = new List (); - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { JSONArray hostilesJsResult = new JSONArray (); @@ -36,5 +36,5 @@ } - WriteJSON (resp, hostilesJsResult); + WriteJSON (_resp, hostilesJsResult); } } Index: binary-improvements/MapRendering/Web/API/GetLandClaims.cs =================================================================== --- binary-improvements/MapRendering/Web/API/GetLandClaims.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/GetLandClaims.cs (revision 351) @@ -6,14 +6,14 @@ namespace AllocsFixes.NetConnections.Servers.Web.API { public class GetLandClaims : WebAPI { - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { string requestedSteamID = string.Empty; - if (req.QueryString ["steamid"] != null) { + if (_req.QueryString ["steamid"] != null) { ulong lViewersSteamID; - requestedSteamID = req.QueryString ["steamid"]; + requestedSteamID = _req.QueryString ["steamid"]; if (requestedSteamID.Length != 17 || !ulong.TryParse (requestedSteamID, out lViewersSteamID)) { - resp.StatusCode = (int) HttpStatusCode.BadRequest; - Web.SetResponseTextContent (resp, "Invalid SteamID given"); + _resp.StatusCode = (int) HttpStatusCode.BadRequest; + Web.SetResponseTextContent (_resp, "Invalid SteamID given"); return; } @@ -21,10 +21,10 @@ // default user, cheap way to avoid 'null reference exception' - user = user ?? new WebConnection ("", IPAddress.None, 0L); + _user = _user ?? new WebConnection ("", IPAddress.None, 0L); - bool bViewAll = WebConnection.CanViewAllClaims (permissionLevel); + bool bViewAll = WebConnection.CanViewAllClaims (_permissionLevel); JSONObject result = new JSONObject (); - result.Add ("claimsize", new JSONNumber (GamePrefs.GetInt (EnumGamePrefs.LandClaimSize))); + result.Add ("claimsize", new JSONNumber (GamePrefs.GetInt (EnumUtils.Parse ("LandClaimSize")))); JSONArray claimOwners = new JSONArray (); @@ -35,9 +35,9 @@ if (!string.IsNullOrEmpty (requestedSteamID) && !bViewAll) { ownerFilters = new[] { - LandClaimList.SteamIdFilter (user.SteamID.ToString ()), + LandClaimList.SteamIdFilter (_user.SteamID.ToString ()), LandClaimList.SteamIdFilter (requestedSteamID) }; } else if (!bViewAll) { - ownerFilters = new[] {LandClaimList.SteamIdFilter (user.SteamID.ToString ())}; + ownerFilters = new[] {LandClaimList.SteamIdFilter (_user.SteamID.ToString ())}; } else { ownerFilters = new[] {LandClaimList.SteamIdFilter (requestedSteamID)}; @@ -78,5 +78,5 @@ } - WriteJSON (resp, result); + WriteJSON (_resp, result); } } Index: binary-improvements/MapRendering/Web/API/GetPlayerList.cs =================================================================== --- binary-improvements/MapRendering/Web/API/GetPlayerList.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/GetPlayerList.cs (revision 351) @@ -17,21 +17,21 @@ #endif - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { AdminTools admTools = GameManager.Instance.adminTools; - user = user ?? new WebConnection ("", IPAddress.None, 0L); - - bool bViewAll = WebConnection.CanViewAllPlayers (permissionLevel); + _user = _user ?? new WebConnection ("", IPAddress.None, 0L); + + bool bViewAll = WebConnection.CanViewAllPlayers (_permissionLevel); // TODO: Sort (and filter?) prior to converting to JSON ... hard as how to get the correct column's data? (i.e. column name matches JSON object field names, not source data) int rowsPerPage = 25; - if (req.QueryString ["rowsperpage"] != null) { - int.TryParse (req.QueryString ["rowsperpage"], out rowsPerPage); + if (_req.QueryString ["rowsperpage"] != null) { + int.TryParse (_req.QueryString ["rowsperpage"], out rowsPerPage); } int page = 0; - if (req.QueryString ["page"] != null) { - int.TryParse (req.QueryString ["page"], out page); + if (_req.QueryString ["page"] != null) { + int.TryParse (_req.QueryString ["page"], out page); } @@ -55,5 +55,5 @@ } - if (player_steam_ID == user.SteamID || bViewAll) { + if (player_steam_ID == _user.SteamID || bViewAll) { JSONObject pos = new JSONObject (); pos.Add ("x", new JSONNumber (p.LastPosition.x)); @@ -93,9 +93,9 @@ IEnumerable list = playerList; - foreach (string key in req.QueryString.AllKeys) { + foreach (string key in _req.QueryString.AllKeys) { if (!string.IsNullOrEmpty (key) && key.StartsWith ("filter[")) { string filterCol = key.Substring (key.IndexOf ('[') + 1); filterCol = filterCol.Substring (0, filterCol.Length - 1); - string filterVal = req.QueryString.Get (key).Trim (); + string filterVal = _req.QueryString.Get (key).Trim (); list = ExecuteFilter (list, filterCol, filterVal); @@ -105,9 +105,9 @@ int totalAfterFilter = list.Count (); - foreach (string key in req.QueryString.AllKeys) { + foreach (string key in _req.QueryString.AllKeys) { if (!string.IsNullOrEmpty (key) && key.StartsWith ("sort[")) { string sortCol = key.Substring (key.IndexOf ('[') + 1); sortCol = sortCol.Substring (0, sortCol.Length - 1); - string sortVal = req.QueryString.Get (key); + string sortVal = _req.QueryString.Get (key); list = ExecuteSort (list, sortCol, sortVal == "0"); @@ -130,10 +130,10 @@ result.Add ("players", playersJsResult); - WriteJSON (resp, result); + WriteJSON (_resp, result); } private IEnumerable ExecuteFilter (IEnumerable _list, string _filterCol, string _filterVal) { - if (_list.Count () == 0) { + if (!_list.Any()) { return _list; } @@ -147,5 +147,5 @@ if (colType == typeof (JSONBoolean)) { bool value = StringParsers.ParseBool (_filterVal); - return _list.Where (line => ((JSONBoolean) line [_filterCol]).GetBool () == value); + return _list.Where (_line => ((JSONBoolean) _line [_filterCol]).GetBool () == value); } @@ -157,5 +157,5 @@ //Log.Out ("GetPlayerList: Filter on String with Regex '" + _filterVal + "'"); Regex matcher = new Regex (_filterVal, RegexOptions.IgnoreCase); - return _list.Where (line => matcher.IsMatch (((JSONString) line [_filterCol]).GetString ())); + return _list.Where (_line => matcher.IsMatch (((JSONString) _line [_filterCol]).GetString ())); } } @@ -198,6 +198,6 @@ } - return _list.Where (delegate (JSONObject line) { - double objVal = ((JSONNumber) line [_filterCol]).GetDouble (); + return _list.Where (delegate (JSONObject _line) { + double objVal = ((JSONNumber) _line [_filterCol]).GetDouble (); switch (matchType) { case NumberMatchType.Greater: @@ -230,23 +230,23 @@ if (colType == typeof (JSONNumber)) { if (_ascending) { - return _list.OrderBy (line => ((JSONNumber) line [_sortCol]).GetDouble ()); - } - - return _list.OrderByDescending (line => ((JSONNumber) line [_sortCol]).GetDouble ()); + return _list.OrderBy (_line => ((JSONNumber) _line [_sortCol]).GetDouble ()); + } + + return _list.OrderByDescending (_line => ((JSONNumber) _line [_sortCol]).GetDouble ()); } if (colType == typeof (JSONBoolean)) { if (_ascending) { - return _list.OrderBy (line => ((JSONBoolean) line [_sortCol]).GetBool ()); - } - - return _list.OrderByDescending (line => ((JSONBoolean) line [_sortCol]).GetBool ()); + return _list.OrderBy (_line => ((JSONBoolean) _line [_sortCol]).GetBool ()); + } + + return _list.OrderByDescending (_line => ((JSONBoolean) _line [_sortCol]).GetBool ()); } if (_ascending) { - return _list.OrderBy (line => line [_sortCol].ToString ()); - } - - return _list.OrderByDescending (line => line [_sortCol].ToString ()); + return _list.OrderBy (_line => _line [_sortCol].ToString ()); + } + + return _list.OrderByDescending (_line => _line [_sortCol].ToString ()); } @@ -255,18 +255,18 @@ - private bool NearlyEqual (double a, double b, double epsilon) { - double absA = Math.Abs (a); - double absB = Math.Abs (b); - double diff = Math.Abs (a - b); - - if (a == b) { + private bool NearlyEqual (double _a, double _b, double _epsilon) { + double absA = Math.Abs (_a); + double absB = Math.Abs (_b); + double diff = Math.Abs (_a - _b); + + if (_a == _b) { return true; } - if (a == 0 || b == 0 || diff < double.Epsilon) { - return diff < epsilon; - } - - return diff / (absA + absB) < epsilon; + if (_a == 0 || _b == 0 || diff < double.Epsilon) { + return diff < _epsilon; + } + + return diff / (absA + absB) < _epsilon; } Index: binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs =================================================================== --- binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/GetPlayersLocation.cs (revision 351) @@ -6,15 +6,15 @@ namespace AllocsFixes.NetConnections.Servers.Web.API { public class GetPlayersLocation : WebAPI { - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { AdminTools admTools = GameManager.Instance.adminTools; - user = user ?? new WebConnection ("", IPAddress.None, 0L); + _user = _user ?? new WebConnection ("", IPAddress.None, 0L); bool listOffline = false; - if (req.QueryString ["offline"] != null) { - bool.TryParse (req.QueryString ["offline"], out listOffline); + if (_req.QueryString ["offline"] != null) { + bool.TryParse (_req.QueryString ["offline"], out listOffline); } - bool bViewAll = WebConnection.CanViewAllPlayers (permissionLevel); + bool bViewAll = WebConnection.CanViewAllPlayers (_permissionLevel); JSONArray playersJsResult = new JSONArray (); @@ -37,5 +37,5 @@ } - if (player_steam_ID == user.SteamID || bViewAll) { + if (player_steam_ID == _user.SteamID || bViewAll) { JSONObject pos = new JSONObject (); pos.Add ("x", new JSONNumber (p.LastPosition.x)); @@ -61,5 +61,5 @@ } - WriteJSON (resp, playersJsResult); + WriteJSON (_resp, playersJsResult); } } Index: binary-improvements/MapRendering/Web/API/GetPlayersOnline.cs =================================================================== --- binary-improvements/MapRendering/Web/API/GetPlayersOnline.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/GetPlayersOnline.cs (revision 351) @@ -6,6 +6,6 @@ namespace AllocsFixes.NetConnections.Servers.Web.API { public class GetPlayersOnline : WebAPI { - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { JSONArray players = new JSONArray (); @@ -46,5 +46,5 @@ } - WriteJSON (resp, players); + WriteJSON (_resp, players); } } Index: binary-improvements/MapRendering/Web/API/GetServerInfo.cs =================================================================== --- binary-improvements/MapRendering/Web/API/GetServerInfo.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/GetServerInfo.cs (revision 351) @@ -5,6 +5,6 @@ namespace AllocsFixes.NetConnections.Servers.Web.API { public class GetServerInfo : WebAPI { - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { JSONObject serverInfo = new JSONObject (); @@ -42,5 +42,5 @@ - WriteJSON (resp, serverInfo); + WriteJSON (_resp, serverInfo); } } Index: binary-improvements/MapRendering/Web/API/GetStats.cs =================================================================== --- binary-improvements/MapRendering/Web/API/GetStats.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/GetStats.cs (revision 351) @@ -5,6 +5,6 @@ namespace AllocsFixes.NetConnections.Servers.Web.API { public class GetStats : WebAPI { - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { JSONObject result = new JSONObject (); @@ -19,5 +19,5 @@ result.Add ("animals", new JSONNumber (Animals.Instance.GetCount ())); - WriteJSON (resp, result); + WriteJSON (_resp, result); } Index: binary-improvements/MapRendering/Web/API/GetWebUIUpdates.cs =================================================================== --- binary-improvements/MapRendering/Web/API/GetWebUIUpdates.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/GetWebUIUpdates.cs (revision 351) @@ -5,9 +5,9 @@ namespace AllocsFixes.NetConnections.Servers.Web.API { public class GetWebUIUpdates : WebAPI { - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { int latestLine; - if (req.QueryString ["latestLine"] == null || - !int.TryParse (req.QueryString ["latestLine"], out latestLine)) { + if (_req.QueryString ["latestLine"] == null || + !int.TryParse (_req.QueryString ["latestLine"], out latestLine)) { latestLine = 0; } @@ -27,5 +27,5 @@ result.Add ("newlogs", new JSONNumber (LogBuffer.Instance.LatestLine - latestLine)); - WriteJSON (resp, result); + WriteJSON (_resp, result); } Index: binary-improvements/MapRendering/Web/API/Null.cs =================================================================== --- binary-improvements/MapRendering/Web/API/Null.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/Null.cs (revision 351) @@ -4,10 +4,10 @@ namespace AllocsFixes.NetConnections.Servers.Web.API { public class Null : WebAPI { - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { - resp.ContentLength64 = 0; - resp.ContentType = "text/plain"; - resp.ContentEncoding = Encoding.ASCII; - resp.OutputStream.Write (new byte[] { }, 0, 0); + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { + _resp.ContentLength64 = 0; + _resp.ContentType = "text/plain"; + _resp.ContentEncoding = Encoding.ASCII; + _resp.OutputStream.Write (new byte[] { }, 0, 0); } } Index: binary-improvements/MapRendering/Web/API/WebAPI.cs =================================================================== --- binary-improvements/MapRendering/Web/API/WebAPI.cs (revision 350) +++ binary-improvements/MapRendering/Web/API/WebAPI.cs (revision 351) @@ -17,10 +17,10 @@ #endif - public static void WriteJSON (HttpListenerResponse resp, JSONNode root) { + public static void WriteJSON (HttpListenerResponse _resp, JSONNode _root) { #if ENABLE_PROFILER jsonSerializeSampler.Begin (); #endif StringBuilder sb = new StringBuilder (); - root.ToString (sb); + _root.ToString (sb); #if ENABLE_PROFILER jsonSerializeSampler.End (); @@ -28,8 +28,8 @@ #endif byte[] buf = Encoding.UTF8.GetBytes (sb.ToString ()); - resp.ContentLength64 = buf.Length; - resp.ContentType = "application/json"; - resp.ContentEncoding = Encoding.UTF8; - resp.OutputStream.Write (buf, 0, buf.Length); + _resp.ContentLength64 = buf.Length; + _resp.ContentType = "application/json"; + _resp.ContentEncoding = Encoding.UTF8; + _resp.OutputStream.Write (buf, 0, buf.Length); #if ENABLE_PROFILER netWriteSampler.End (); @@ -45,6 +45,6 @@ } - public abstract void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel); + public abstract void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel); public virtual int DefaultPermissionLevel () { Index: binary-improvements/MapRendering/Web/ConnectionHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/ConnectionHandler.cs (revision 350) +++ binary-improvements/MapRendering/Web/ConnectionHandler.cs (revision 351) @@ -41,7 +41,7 @@ } - public void SendLine (string line) { + public void SendLine (string _line) { foreach (KeyValuePair kvp in connections) { - kvp.Value.SendLine (line); + kvp.Value.SendLine (_line); } } Index: binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs (revision 350) +++ binary-improvements/MapRendering/Web/Handlers/ApiHandler.cs (revision 351) @@ -11,6 +11,6 @@ private readonly string staticPart; - public ApiHandler (string staticPart, string moduleName = null) : base (moduleName) { - this.staticPart = staticPart; + public ApiHandler (string _staticPart, string _moduleName = null) : base (_moduleName) { + staticPart = _staticPart; foreach (Type t in Assembly.GetExecutingAssembly ().GetTypes ()) { @@ -45,10 +45,18 @@ #endif - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { - string apiName = req.Url.AbsolutePath.Remove (0, staticPart.Length); - if (!AuthorizeForCommand (apiName, user, permissionLevel)) { - resp.StatusCode = (int) HttpStatusCode.Forbidden; - if (user != null) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { + string apiName = _req.Url.AbsolutePath.Remove (0, staticPart.Length); + + WebAPI api; + if (!apis.TryGetValue (apiName, out api)) { + Log.Out ("Error in ApiHandler.HandleRequest(): No handler found for API \"" + apiName + "\""); + _resp.StatusCode = (int) HttpStatusCode.NotFound; + return; + } + + if (!AuthorizeForCommand (apiName, _user, _permissionLevel)) { + _resp.StatusCode = (int) HttpStatusCode.Forbidden; + if (_user != null) { //Log.Out ("ApiHandler: user '{0}' not allowed to execute '{1}'", user.SteamID, apiName); } @@ -57,29 +65,21 @@ } - WebAPI api; - if (apis.TryGetValue (apiName, out api)) { - try { + try { #if ENABLE_PROFILER - apiHandlerSampler.Begin (); + apiHandlerSampler.Begin (); #endif - api.HandleRequest (req, resp, user, permissionLevel); + api.HandleRequest (_req, _resp, _user, _permissionLevel); #if ENABLE_PROFILER - apiHandlerSampler.End (); + apiHandlerSampler.End (); #endif - return; - } catch (Exception e) { - Log.Error ("Error in ApiHandler.HandleRequest(): Handler {0} threw an exception:", api.Name); - Log.Exception (e); - resp.StatusCode = (int) HttpStatusCode.InternalServerError; - return; - } + } catch (Exception e) { + Log.Error ("Error in ApiHandler.HandleRequest(): Handler {0} threw an exception:", api.Name); + Log.Exception (e); + _resp.StatusCode = (int) HttpStatusCode.InternalServerError; } - - Log.Out ("Error in ApiHandler.HandleRequest(): No handler found for API \"" + apiName + "\""); - resp.StatusCode = (int) HttpStatusCode.NotFound; } - private bool AuthorizeForCommand (string apiName, WebConnection user, int permissionLevel) { - return WebPermissions.Instance.ModuleAllowedWithLevel ("webapi." + apiName, permissionLevel); + private bool AuthorizeForCommand (string _apiName, WebConnection _user, int _permissionLevel) { + return WebPermissions.Instance.ModuleAllowedWithLevel ("webapi." + _apiName, _permissionLevel); } } Index: binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs (revision 350) +++ binary-improvements/MapRendering/Web/Handlers/ItemIconHandler.cs (revision 351) @@ -18,7 +18,7 @@ } - public ItemIconHandler (string staticPart, bool logMissingFiles, string moduleName = null) : base (moduleName) { - this.staticPart = staticPart; - this.logMissingFiles = logMissingFiles; + public ItemIconHandler (string _staticPart, bool _logMissingFiles, string _moduleName = null) : base (_moduleName) { + staticPart = _staticPart; + logMissingFiles = _logMissingFiles; Instance = this; } @@ -26,26 +26,26 @@ public static ItemIconHandler Instance { get; private set; } - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { if (!loaded) { - resp.StatusCode = (int) HttpStatusCode.InternalServerError; + _resp.StatusCode = (int) HttpStatusCode.InternalServerError; Log.Out ("Web:IconHandler: Icons not loaded"); return; } - string requestFileName = req.Url.AbsolutePath.Remove (0, staticPart.Length); + string requestFileName = _req.Url.AbsolutePath.Remove (0, staticPart.Length); requestFileName = requestFileName.Remove (requestFileName.LastIndexOf ('.')); - if (icons.ContainsKey (requestFileName) && req.Url.AbsolutePath.EndsWith (".png", StringComparison.OrdinalIgnoreCase)) { - resp.ContentType = MimeType.GetMimeType (".png"); + if (icons.ContainsKey (requestFileName) && _req.Url.AbsolutePath.EndsWith (".png", StringComparison.OrdinalIgnoreCase)) { + _resp.ContentType = MimeType.GetMimeType (".png"); byte[] itemIconData = icons [requestFileName]; - resp.ContentLength64 = itemIconData.Length; - resp.OutputStream.Write (itemIconData, 0, itemIconData.Length); + _resp.ContentLength64 = itemIconData.Length; + _resp.OutputStream.Write (itemIconData, 0, itemIconData.Length); } else { - resp.StatusCode = (int) HttpStatusCode.NotFound; + _resp.StatusCode = (int) HttpStatusCode.NotFound; if (logMissingFiles) { - Log.Out ("Web:IconHandler:FileNotFound: \"" + req.Url.AbsolutePath + "\" "); + Log.Out ("Web:IconHandler:FileNotFound: \"" + _req.Url.AbsolutePath + "\" "); } } Index: binary-improvements/MapRendering/Web/Handlers/PathHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/PathHandler.cs (revision 350) +++ binary-improvements/MapRendering/Web/Handlers/PathHandler.cs (revision 351) @@ -14,10 +14,10 @@ } - public abstract void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel); + public abstract void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel); - public bool IsAuthorizedForHandler (WebConnection user, int permissionLevel) { + public bool IsAuthorizedForHandler (WebConnection _user, int _permissionLevel) { if (moduleName != null) { - return WebPermissions.Instance.ModuleAllowedWithLevel (moduleName, permissionLevel); + return WebPermissions.Instance.ModuleAllowedWithLevel (moduleName, _permissionLevel); } Index: binary-improvements/MapRendering/Web/Handlers/SessionHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/SessionHandler.cs (revision 350) +++ binary-improvements/MapRendering/Web/Handlers/SessionHandler.cs (revision 351) @@ -10,6 +10,6 @@ private readonly string staticPart; - public SessionHandler (string _staticPart, string _dataFolder, Web _parent, string moduleName = null) : - base (moduleName) { + public SessionHandler (string _staticPart, string _dataFolder, Web _parent, string _moduleName = null) : + base (_moduleName) { staticPart = _staticPart; parent = _parent; @@ -24,7 +24,7 @@ } - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { - string subpath = req.Url.AbsolutePath.Remove (0, staticPart.Length); + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { + string subpath = _req.Url.AbsolutePath.Remove (0, staticPart.Length); StringBuilder result = new StringBuilder (); @@ -32,6 +32,6 @@ if (subpath.StartsWith ("verify")) { - if (user != null) { - resp.Redirect ("/static/index.html"); + if (_user != null) { + _resp.Redirect ("/static/index.html"); return; } @@ -40,10 +40,10 @@ "

Login failed, click to return to main page.

"); } else if (subpath.StartsWith ("logout")) { - if (user != null) { - parent.connectionHandler.LogOut (user.SessionID); + if (_user != null) { + parent.connectionHandler.LogOut (_user.SessionID); Cookie cookie = new Cookie ("sid", "", "/"); cookie.Expired = true; - resp.AppendCookie (cookie); - resp.Redirect ("/static/index.html"); + _resp.AppendCookie (cookie); + _resp.Redirect ("/static/index.html"); return; } @@ -52,7 +52,7 @@ "

Not logged in, click to return to main page.

"); } else if (subpath.StartsWith ("login")) { - string host = (Web.isSslRedirected (req) ? "https://" : "http://") + req.UserHostName; + string host = (Web.isSslRedirected (_req) ? "https://" : "http://") + _req.UserHostName; string url = OpenID.GetOpenIdLoginUrl (host, host + "/session/verify"); - resp.Redirect (url); + _resp.Redirect (url); return; } else { @@ -63,9 +63,9 @@ result.Append (footer); - resp.ContentType = MimeType.GetMimeType (".html"); - resp.ContentEncoding = Encoding.UTF8; + _resp.ContentType = MimeType.GetMimeType (".html"); + _resp.ContentEncoding = Encoding.UTF8; byte[] buf = Encoding.UTF8.GetBytes (result.ToString ()); - resp.ContentLength64 = buf.Length; - resp.OutputStream.Write (buf, 0, buf.Length); + _resp.ContentLength64 = buf.Length; + _resp.OutputStream.Write (buf, 0, buf.Length); } } Index: binary-improvements/MapRendering/Web/Handlers/SimpleRedirectHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/SimpleRedirectHandler.cs (revision 350) +++ binary-improvements/MapRendering/Web/Handlers/SimpleRedirectHandler.cs (revision 351) @@ -5,11 +5,11 @@ private readonly string target; - public SimpleRedirectHandler (string target, string moduleName = null) : base (moduleName) { - this.target = target; + public SimpleRedirectHandler (string _target, string _moduleName = null) : base (_moduleName) { + target = _target; } - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { - resp.Redirect (target); + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { + _resp.Redirect (target); } } Index: binary-improvements/MapRendering/Web/Handlers/StaticHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/StaticHandler.cs (revision 350) +++ binary-improvements/MapRendering/Web/Handlers/StaticHandler.cs (revision 351) @@ -10,26 +10,26 @@ private readonly string staticPart; - public StaticHandler (string staticPart, string filePath, AbstractCache cache, bool logMissingFiles, - string moduleName = null) : base (moduleName) { - this.staticPart = staticPart; - datapath = filePath + (filePath [filePath.Length - 1] == '/' ? "" : "/"); - this.cache = cache; - this.logMissingFiles = logMissingFiles; + public StaticHandler (string _staticPart, string _filePath, AbstractCache _cache, bool _logMissingFiles, + string _moduleName = null) : base (_moduleName) { + staticPart = _staticPart; + datapath = _filePath + (_filePath [_filePath.Length - 1] == '/' ? "" : "/"); + cache = _cache; + logMissingFiles = _logMissingFiles; } - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { - string fn = req.Url.AbsolutePath.Remove (0, staticPart.Length); + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { + string fn = _req.Url.AbsolutePath.Remove (0, staticPart.Length); byte[] content = cache.GetFileContent (datapath + fn); if (content != null) { - resp.ContentType = MimeType.GetMimeType (Path.GetExtension (fn)); - resp.ContentLength64 = content.Length; - resp.OutputStream.Write (content, 0, content.Length); + _resp.ContentType = MimeType.GetMimeType (Path.GetExtension (fn)); + _resp.ContentLength64 = content.Length; + _resp.OutputStream.Write (content, 0, content.Length); } else { - resp.StatusCode = (int) HttpStatusCode.NotFound; + _resp.StatusCode = (int) HttpStatusCode.NotFound; if (logMissingFiles) { - Log.Out ("Web:Static:FileNotFound: \"" + req.Url.AbsolutePath + "\" @ \"" + datapath + fn + "\""); + Log.Out ("Web:Static:FileNotFound: \"" + _req.Url.AbsolutePath + "\" @ \"" + datapath + fn + "\""); } } Index: binary-improvements/MapRendering/Web/Handlers/UserStatusHandler.cs =================================================================== --- binary-improvements/MapRendering/Web/Handlers/UserStatusHandler.cs (revision 350) +++ binary-improvements/MapRendering/Web/Handlers/UserStatusHandler.cs (revision 351) @@ -5,13 +5,13 @@ namespace AllocsFixes.NetConnections.Servers.Web.Handlers { public class UserStatusHandler : PathHandler { - public UserStatusHandler (string moduleName = null) : base (moduleName) { + public UserStatusHandler (string _moduleName = null) : base (_moduleName) { } - public override void HandleRequest (HttpListenerRequest req, HttpListenerResponse resp, WebConnection user, - int permissionLevel) { + public override void HandleRequest (HttpListenerRequest _req, HttpListenerResponse _resp, WebConnection _user, + int _permissionLevel) { JSONObject result = new JSONObject (); - result.Add ("loggedin", new JSONBoolean (user != null)); - result.Add ("username", new JSONString (user != null ? user.SteamID.ToString () : string.Empty)); + result.Add ("loggedin", new JSONBoolean (_user != null)); + result.Add ("username", new JSONString (_user != null ? _user.SteamID.ToString () : string.Empty)); JSONArray perms = new JSONArray (); @@ -19,5 +19,5 @@ JSONObject permObj = new JSONObject (); permObj.Add ("module", new JSONString (perm.module)); - permObj.Add ("allowed", new JSONBoolean (perm.permissionLevel >= permissionLevel)); + permObj.Add ("allowed", new JSONBoolean (perm.permissionLevel >= _permissionLevel)); perms.Add (permObj); } @@ -25,5 +25,5 @@ result.Add ("permissions", perms); - WebAPI.WriteJSON (resp, result); + WebAPI.WriteJSON (_resp, result); } } Index: binary-improvements/MapRendering/Web/MimeType.cs =================================================================== --- binary-improvements/MapRendering/Web/MimeType.cs (revision 350) +++ binary-improvements/MapRendering/Web/MimeType.cs (revision 351) @@ -568,16 +568,16 @@ }; - public static string GetMimeType (string extension) { - if (extension == null) { - throw new ArgumentNullException ("extension"); + public static string GetMimeType (string _extension) { + if (_extension == null) { + throw new ArgumentNullException ("_extension"); } - if (!extension.StartsWith (".")) { - extension = "." + extension; + if (!_extension.StartsWith (".")) { + _extension = "." + _extension; } string mime; - return _mappings.TryGetValue (extension, out mime) ? mime : "application/octet-stream"; + return _mappings.TryGetValue (_extension, out mime) ? mime : "application/octet-stream"; } } Index: binary-improvements/MapRendering/Web/OpenID.cs =================================================================== --- binary-improvements/MapRendering/Web/OpenID.cs (revision 350) +++ binary-improvements/MapRendering/Web/OpenID.cs (revision 351) @@ -25,5 +25,5 @@ "/steam-intermediate.cer"); - private static readonly bool verboseSsl = false; + private const bool verboseSsl = false; public static bool debugOpenId; @@ -35,6 +35,6 @@ } - ServicePointManager.ServerCertificateValidationCallback = (srvPoint, certificate, chain, errors) => { - if (errors == SslPolicyErrors.None) { + ServicePointManager.ServerCertificateValidationCallback = (_srvPoint, _certificate, _chain, _errors) => { + if (_errors == SslPolicyErrors.None) { if (verboseSsl) { Log.Out ("Steam certificate: No error (1)"); @@ -50,5 +50,5 @@ privateChain.ChainPolicy.ExtraStore.Add (caIntermediateCert); - if (privateChain.Build (new X509Certificate2 (certificate))) { + if (privateChain.Build (new X509Certificate2 (_certificate))) { // No errors, immediately return privateChain.Reset (); Index: binary-improvements/MapRendering/Web/Web.cs =================================================================== --- binary-improvements/MapRendering/Web/Web.cs (revision 350) +++ binary-improvements/MapRendering/Web/Web.cs (revision 351) @@ -27,5 +27,5 @@ public Web () { try { - int webPort = GamePrefs.GetInt (EnumGamePrefs.ControlPanelPort); + int webPort = GamePrefs.GetInt (EnumUtils.Parse ("ControlPanelPort")); if (webPort < 1 || webPort > 65533) { Log.Out ("Webserver not started (ControlPanelPort not within 1-65533)"); @@ -132,14 +132,14 @@ } - public void SendLine (string line) { - connectionHandler.SendLine (line); - } - - public void SendLog (string text, string trace, LogType type) { + public void SendLine (string _line) { + connectionHandler.SendLine (_line); + } + + public void SendLog (string _text, string _trace, LogType _type) { // Do nothing, handled by LogBuffer internally } - public static bool isSslRedirected (HttpListenerRequest req) { - string proto = req.Headers ["X-Forwarded-Proto"]; + public static bool isSslRedirected (HttpListenerRequest _req) { + string proto = _req.Headers ["X-Forwarded-Proto"]; if (!string.IsNullOrEmpty (proto)) { return proto.Equals ("https", StringComparison.OrdinalIgnoreCase); @@ -156,5 +156,5 @@ #endif - private void HandleRequest (IAsyncResult result) { + private void HandleRequest (IAsyncResult _result) { if (!_listener.IsListening) { return; @@ -167,5 +167,5 @@ #if ENABLE_PROFILER Profiler.BeginThreadProfiling ("AllocsMods", "WebRequest"); - HttpListenerContext ctx = _listener.EndGetContext (result); + HttpListenerContext ctx = _listener.EndGetContext (_result); try { #else @@ -314,10 +314,10 @@ } - public static void SetResponseTextContent (HttpListenerResponse resp, string text) { - byte[] buf = Encoding.UTF8.GetBytes (text); - resp.ContentLength64 = buf.Length; - resp.ContentType = "text/html"; - resp.ContentEncoding = Encoding.UTF8; - resp.OutputStream.Write (buf, 0, buf.Length); + public static void SetResponseTextContent (HttpListenerResponse _resp, string _text) { + byte[] buf = Encoding.UTF8.GetBytes (_text); + _resp.ContentLength64 = buf.Length; + _resp.ContentType = "text/html"; + _resp.ContentEncoding = Encoding.UTF8; + _resp.OutputStream.Write (buf, 0, buf.Length); } } Index: binary-improvements/MapRendering/Web/WebPermissions.cs =================================================================== --- binary-improvements/MapRendering/Web/WebPermissions.cs (revision 350) +++ binary-improvements/MapRendering/Web/WebPermissions.cs (revision 351) @@ -3,5 +3,4 @@ using System.IO; using System.Xml; -using UniLinq; namespace AllocsFixes.NetConnections.Servers.Web { @@ -171,5 +170,5 @@ } - private void OnFileChanged (object source, FileSystemEventArgs e) { + private void OnFileChanged (object _source, FileSystemEventArgs _e) { Log.Out ("Reloading " + PERMISSIONS_FILE); Load (); @@ -177,5 +176,5 @@ private string GetFilePath () { - return GamePrefs.GetString (EnumGamePrefs.SaveGameFolder); + return GamePrefs.GetString (EnumUtils.Parse ("SaveGameFolder")); }