Changeset 360 for binary-improvements

Timestamp:

Aug 23, 2020, 9:52:01 AM (4 years ago)

Author:

alloc

Message:

A19 code

Location:

binary-improvements

Files:

• . (modified) (1 prop)
• MapRendering/ModInfo.xml (modified) (1 diff)
• MapRendering/Web/API/ExecuteConsoleCommand.cs (modified) (1 diff)
• MapRendering/Web/API/GetAllowedCommands.cs (modified) (1 diff)
• MapRendering/Web/API/GetServerInfo.cs (modified) (1 diff)
• MapRendering/Web/Web.cs (modified) (3 diffs)

binary-improvements

@@ -1 +1 @@
 bin
+.idea

@@ -1 +1 @@
 bin
+.idea

binary-improvements/MapRendering/ModInfo.xml

@@ -5 +5 @@
                 <Description value="Render the game map to image map tiles as it is uncovered" />
                 <Author value="Christian 'Alloc' Illy" />
-                <Version value="33" />
+                <Version value="35" />
                 <Website value="http://7dtd.illy.bz" />
         </ModInfo>

binary-improvements/MapRendering/Web/API/ExecuteConsoleCommand.cs

@@ -31 +31 @@
                         }
 
-                        AdminToolsCommandPermissions atcp =
-                                GameManager.Instance.adminTools.GetAdminToolsCommandPermission (command.GetCommands ());
+                        int commandPermissionLevel = GameManager.Instance.adminTools.GetCommandPermissionLevel (command.GetCommands ());
 
-                        if (_permissionLevel > atcp.PermissionLevel) {
+                        if (_permissionLevel > commandPermissionLevel) {
                                 _resp.StatusCode = (int) HttpStatusCode.Forbidden;
                                 Web.SetResponseTextContent (_resp, "You are not allowed to execute this command");

binary-improvements/MapRendering/Web/API/GetAllowedCommands.cs

@@ -9 +9 @@
                         JSONArray entries = new JSONArray ();
                         foreach (IConsoleCommand cc in SdtdConsole.Instance.GetCommands ()) {
-                                AdminToolsCommandPermissions atcp =
-                                        GameManager.Instance.adminTools.GetAdminToolsCommandPermission (cc.GetCommands ());
-                                if (_permissionLevel <= atcp.PermissionLevel) {
+                                int commandPermissionLevel = GameManager.Instance.adminTools.GetCommandPermissionLevel (cc.GetCommands ());
+                                if (_permissionLevel <= commandPermissionLevel) {
                                         string cmd = string.Empty;
                                         foreach (string s in cc.GetCommands ()) {

binary-improvements/MapRendering/Web/API/GetServerInfo.cs

@@ -9 +9 @@
                         JSONObject serverInfo = new JSONObject ();
 
-                        GameServerInfo gsi = Steam.Masterserver.Server.LocalGameInfo;
+                        GameServerInfo gsi = ConnectionManager.Instance.LocalServerInfo;
 
                         foreach (string stringGamePref in Enum.GetNames (typeof (GameInfoString))) {

binary-improvements/MapRendering/Web/Web.cs

@@ -245 +245 @@
                                 }
                         } catch (Exception e) {
-                                Log.Out ("Error in Web.HandleRequest(): " + e);
+                                Log.Error ("Error in Web.HandleRequest(): ");
+                                Log.Exception (e);
                         } finally {
                                 if (ctx != null && !ctx.Response.SendChunked) {
@@ -276 +277 @@
                                 if (con != null) {
                                         _con = con;
-                                        return GameManager.Instance.adminTools.GetAdminToolsClientInfo (_con.SteamID.ToString ())
-                                                .PermissionLevel;
+                                        return GameManager.Instance.adminTools.GetUserPermissionLevel (_con.SteamID.ToString ());
                                 }
                         }
@@ -297 +297 @@
                                                 WebConnection con = connectionHandler.LogIn (id, _req.RemoteEndPoint.Address);
                                                 _con = con;
-                                                int level = GameManager.Instance.adminTools.GetAdminToolsClientInfo (id.ToString ())
-                                                        .PermissionLevel;
+                                                int level = GameManager.Instance.adminTools.GetUserPermissionLevel (id.ToString ());
                                                 Log.Out ("Steam OpenID login from {0} with ID {1}, permission level {2}",
                                                         _req.RemoteEndPoint.ToString (), con.SteamID, level);

@@ -1 +1 @@
 bin
+.idea