Changeset 107 for binary-improvements/7dtd-server-fixes/src/AdminToolsStuff.cs

Timestamp:

Jul 26, 2014, 4:41:11 PM (10 years ago)

Author:

alloc

Message:

fixes

File:

• binary-improvements/7dtd-server-fixes/src/AdminToolsStuff.cs (modified) (2 diffs)

binary-improvements/7dtd-server-fixes/src/AdminToolsStuff.cs

@@ -25 +25 @@
                                 }
                         }
+
+                        if (tmpInfo.PermissionLevel <= 0) {
+                                List<ConsoleCommand> commands = console.commands;
+                                foreach (ConsoleCommand c in commands) {
+                                        if (!allowed.Contains (c.Names () [0])) {
+                                                if (!hasPermissionLevel (admTools, c.Names () [0])) {
+                                                        addAllowed (console, allowed, c.Names () [0]);
+                                                }
+                                        }
+                                }
+                        }
                 } catch (Exception e) {
                         Log.Out ("Error in GetAllowedCommandsList: " + e);
@@ -33 +44 @@
         }
 
+        private static bool hasPermissionLevel (AdminTools admTools, string cmd)
+        {
+                List<AdminToolsCommandPermissions> perms = admTools.commandPermissions;
+
+                foreach (AdminToolsCommandPermissions atcp in perms) {
+                        foreach (string ccName in getAlternativeNames(cmd)) {
+                                if (atcp.Command.ToLower ().Equals (ccName)) {
+                                        return true;
+                                }
+                        }
+                }
+                return false;
+        }
+
         private static void addAllowed (ConsoleSdtd console, List<string> list, string cmd)
         {
-                ConsoleCommand cc = console.getCommand (cmd);
+                foreach (string ccName in getAlternativeNames(cmd)) {
+                        if (!list.Contains (ccName)) {
+                                list.Add (ccName);
+                        }
+                }
+        }
+
+        private static string[] getAlternativeNames (string cmd)
+        {
+                ConsoleCommand cc = CommonMappingFunctions.GetGameManager ().m_GUIConsole.getCommand (cmd);
                 if (cc != null) {
-                        foreach (string ccName in cc.Names()) {
-                                if (!list.Contains (ccName)) {
-                                        list.Add (ccName);
-                                }
-                        }
+                        return cc.Names ();
                 } else {
-                        list.Add (cmd);
+                        return new string[0];
                 }
         }