Core/RBAC: Move misc commands to RBAC (using individual permissions)

2 files changed, 51 insertions, 51 deletions

diff --git a/src/server/scripts/Commands/cs_misc.cpp b/src/server/scripts/Commands/cs_misc.cpp
index 24d9aefcda7..96244c19036 100644
--- a/src/server/scripts/Commands/cs_misc.cpp
+++ b/src/server/scripts/Commands/cs_misc.cpp
@@ -46,55 +46,55 @@ public:
     {
         static ChatCommand commandTable[] =
         {
-            { "dev",                RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleDevCommand,                   "", NULL },
-            { "gps",                RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleGPSCommand,                   "", NULL },
-            { "aura",               RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleAuraCommand,                  "", NULL },
-            { "unaura",             RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleUnAuraCommand,                "", NULL },
-            { "appear",             RBAC_PERM_MODERATOR_COMMANDS,          false, &HandleAppearCommand,                "", NULL },
-            { "summon",             RBAC_PERM_MODERATOR_COMMANDS,          false, &HandleSummonCommand,                "", NULL },
-            { "commands",           RBAC_PERM_PLAYER_COMMANDS,             true,  &HandleCommandsCommand,              "", NULL },
-            { "die",                RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleDieCommand,                   "", NULL },
-            { "revive",             RBAC_PERM_ADMINISTRATOR_COMMANDS,      true,  &HandleReviveCommand,                "", NULL },
-            { "dismount",           RBAC_PERM_PLAYER_COMMANDS,             false, &HandleDismountCommand,              "", NULL },
-            { "guid",               RBAC_PERM_GAMEMASTER_COMMANDS,         false, &HandleGUIDCommand,                  "", NULL },
-            { "help",               RBAC_PERM_PLAYER_COMMANDS,             true,  &HandleHelpCommand,                  "", NULL },
-            { "itemmove",           RBAC_PERM_GAMEMASTER_COMMANDS,         false, &HandleItemMoveCommand,              "", NULL },
-            { "cooldown",           RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleCooldownCommand,              "", NULL },
-            { "distance",           RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleGetDistanceCommand,           "", NULL },
-            { "recall",             RBAC_PERM_MODERATOR_COMMANDS,          false, &HandleRecallCommand,                "", NULL },
-            { "save",               RBAC_PERM_PLAYER_COMMANDS,             false, &HandleSaveCommand,                  "", NULL },
-            { "saveall",            RBAC_PERM_MODERATOR_COMMANDS,          true,  &HandleSaveAllCommand,               "", NULL },
-            { "kick",               RBAC_PERM_GAMEMASTER_COMMANDS,         true,  &HandleKickPlayerCommand,            "", NULL },
-            { "unstuck",            RBAC_PERM_PLAYER_COMMANDS,             true,  &HandleUnstuckCommand,               "", NULL },
-            { "linkgrave",          RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleLinkGraveCommand,             "", NULL },
-            { "neargrave",          RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleNearGraveCommand,             "", NULL },
-            { "showarea",           RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleShowAreaCommand,              "", NULL },
-            { "hidearea",           RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleHideAreaCommand,              "", NULL },
-            { "additem",            RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleAddItemCommand,               "", NULL },
-            { "additemset",         RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleAddItemSetCommand,            "", NULL },
-            { "bank",               RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleBankCommand,                  "", NULL },
-            { "wchange",            RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleChangeWeather,                "", NULL },
-            { "maxskill",           RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleMaxSkillCommand,              "", NULL },
-            { "setskill",           RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleSetSkillCommand,              "", NULL },
-            { "pinfo",              RBAC_PERM_GAMEMASTER_COMMANDS,         true,  &HandlePInfoCommand,                 "", NULL },
-            { "respawn",            RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleRespawnCommand,               "", NULL },
-            { "mute",               RBAC_PERM_MODERATOR_COMMANDS,          true,  &HandleMuteCommand,                  "", NULL },
-            { "unmute",             RBAC_PERM_MODERATOR_COMMANDS,          true,  &HandleUnmuteCommand,                "", NULL },
-            { "movegens",           RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleMovegensCommand,              "", NULL },
-            { "cometome",           RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleComeToMeCommand,              "", NULL },
-            { "damage",             RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleDamageCommand,                "", NULL },
-            { "combatstop",         RBAC_PERM_GAMEMASTER_COMMANDS,         true,  &HandleCombatStopCommand,            "", NULL },
-            { "flusharenapoints",   RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, &HandleFlushArenaPointsCommand,      "", NULL },
-            { "repairitems",        RBAC_PERM_GAMEMASTER_COMMANDS,         true,  &HandleRepairitemsCommand,           "", NULL },
-            { "freeze",             RBAC_PERM_MODERATOR_COMMANDS,          false, &HandleFreezeCommand,                "", NULL },
-            { "unfreeze",           RBAC_PERM_MODERATOR_COMMANDS,          false, &HandleUnFreezeCommand,              "", NULL },
-            { "listfreeze",         RBAC_PERM_MODERATOR_COMMANDS,          false, &HandleListFreezeCommand,            "", NULL },
-            { "possess",            RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, HandlePossessCommand,                "", NULL },
-            { "unpossess",          RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, HandleUnPossessCommand,              "", NULL },
-            { "bindsight",          RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, HandleBindSightCommand,              "", NULL },
-            { "unbindsight",        RBAC_PERM_ADMINISTRATOR_COMMANDS,      false, HandleUnbindSightCommand,            "", NULL },
-            { "playall",            RBAC_PERM_GAMEMASTER_COMMANDS,         false, HandlePlayAllCommand,                "", NULL },
-            { NULL,                 0,                      false, NULL,                                "", NULL }
+            { "additem",          RBAC_PERM_COMMAND_ADDITEM,          false, &HandleAddItemCommand,          "", NULL },
+            { "additemset",       RBAC_PERM_COMMAND_ADDITEMSET,       false, &HandleAddItemSetCommand,       "", NULL },
+            { "appear",           RBAC_PERM_COMMAND_APPEAR,           false, &HandleAppearCommand,           "", NULL },
+            { "aura",             RBAC_PERM_COMMAND_AURA,             false, &HandleAuraCommand,             "", NULL },
+            { "bank",             RBAC_PERM_COMMAND_BANK,             false, &HandleBankCommand,             "", NULL },
+            { "bindsight",        RBAC_PERM_COMMAND_BINDSIGHT,        false, &HandleBindSightCommand,        "", NULL },
+            { "combatstop",       RBAC_PERM_COMMAND_COMBATSTOP,        true, &HandleCombatStopCommand,       "", NULL },
+            { "cometome",         RBAC_PERM_COMMAND_COMETOME,         false, &HandleComeToMeCommand,         "", NULL },
+            { "commands",         RBAC_PERM_COMMAND_COMMANDS,          true, &HandleCommandsCommand,         "", NULL },
+            { "cooldown",         RBAC_PERM_COMMAND_COOLDOWN,         false, &HandleCooldownCommand,         "", NULL },
+            { "damage",           RBAC_PERM_COMMAND_DAMAGE,           false, &HandleDamageCommand,           "", NULL },
+            { "dev",              RBAC_PERM_COMMAND_DEV,              false, &HandleDevCommand,              "", NULL },
+            { "die",              RBAC_PERM_COMMAND_DIE,              false, &HandleDieCommand,              "", NULL },
+            { "dismount",         RBAC_PERM_COMMAND_DISMOUNT,         false, &HandleDismountCommand,         "", NULL },
+            { "distance",         RBAC_PERM_COMMAND_DISTANCE,         false, &HandleGetDistanceCommand,      "", NULL },
+            { "flusharenapoints", RBAC_PERM_COMMAND_FLUSHARENAPOINTS, false, &HandleFlushArenaPointsCommand, "", NULL },
+            { "freeze",           RBAC_PERM_COMMAND_FREEZE,           false, &HandleFreezeCommand,           "", NULL },
+            { "gps",              RBAC_PERM_COMMAND_GPS,              false, &HandleGPSCommand,              "", NULL },
+            { "guid",             RBAC_PERM_COMMAND_GUID,             false, &HandleGUIDCommand,             "", NULL },
+            { "help",             RBAC_PERM_COMMAND_HELP,              true, &HandleHelpCommand,             "", NULL },
+            { "hidearea",         RBAC_PERM_COMMAND_HIDEAREA,         false, &HandleHideAreaCommand,         "", NULL },
+            { "itemmove",         RBAC_PERM_COMMAND_ITEMMOVE,         false, &HandleItemMoveCommand,         "", NULL },
+            { "kick",             RBAC_PERM_COMMAND_KICK,              true, &HandleKickPlayerCommand,       "", NULL },
+            { "linkgrave",        RBAC_PERM_COMMAND_LINKGRAVE,        false, &HandleLinkGraveCommand,        "", NULL },
+            { "listfreeze",       RBAC_PERM_COMMAND_LISTFREEZE,       false, &HandleListFreezeCommand,       "", NULL },
+            { "maxskill",         RBAC_PERM_COMMAND_MAXSKILL,         false, &HandleMaxSkillCommand,         "", NULL },
+            { "movegens",         RBAC_PERM_COMMAND_MOVEGENS,         false, &HandleMovegensCommand,         "", NULL },
+            { "mute",             RBAC_PERM_COMMAND_MUTE,              true, &HandleMuteCommand,             "", NULL },
+            { "neargrave",        RBAC_PERM_COMMAND_NEARGRAVE,        false, &HandleNearGraveCommand,        "", NULL },
+            { "pinfo",            RBAC_PERM_COMMAND_PINFO,             true, &HandlePInfoCommand,            "", NULL },
+            { "playall",          RBAC_PERM_COMMAND_PLAYALL,          false, &HandlePlayAllCommand,          "", NULL },
+            { "possess",          RBAC_PERM_COMMAND_POSSESS,          false, &HandlePossessCommand,          "", NULL },
+            { "recall",           RBAC_PERM_COMMAND_RECALL,           false, &HandleRecallCommand,           "", NULL },
+            { "repairitems",      RBAC_PERM_COMMAND_REPAIRITEMS,       true, &HandleRepairitemsCommand,      "", NULL },
+            { "respawn",          RBAC_PERM_COMMAND_RESPAWN,          false, &HandleRespawnCommand,          "", NULL },
+            { "revive",           RBAC_PERM_COMMAND_REVIVE,            true, &HandleReviveCommand,           "", NULL },
+            { "saveall",          RBAC_PERM_COMMAND_SAVEALL,           true, &HandleSaveAllCommand,          "", NULL },
+            { "save",             RBAC_PERM_COMMAND_SAVE,             false, &HandleSaveCommand,             "", NULL },
+            { "setskill",         RBAC_PERM_COMMAND_SETSKILL,         false, &HandleSetSkillCommand,         "", NULL },
+            { "showarea",         RBAC_PERM_COMMAND_SHOWAREA,         false, &HandleShowAreaCommand,         "", NULL },
+            { "summon",           RBAC_PERM_COMMAND_SUMMON,           false, &HandleSummonCommand,           "", NULL },
+            { "unaura",           RBAC_PERM_COMMAND_UNAURA,           false, &HandleUnAuraCommand,           "", NULL },
+            { "unbindsight",      RBAC_PERM_COMMAND_UNBINDSIGHT,      false, HandleUnbindSightCommand,       "", NULL },
+            { "unfreeze",         RBAC_PERM_COMMAND_UNFREEZE,         false, &HandleUnFreezeCommand,         "", NULL },
+            { "unmute",           RBAC_PERM_COMMAND_UNMUTE,            true, &HandleUnmuteCommand,           "", NULL },
+            { "unpossess",        RBAC_PERM_COMMAND_UNPOSSESS,        false, &HandleUnPossessCommand,        "", NULL },
+            { "unstuck",          RBAC_PERM_COMMAND_UNSTUCK,           true, &HandleUnstuckCommand,          "", NULL },
+            { "wchange",          RBAC_PERM_COMMAND_WCHANGE,          false, &HandleChangeWeather,           "", NULL },
+            { NULL,               0,                                  false, NULL,                           "", NULL }
         };
         return commandTable;
     }
diff --git a/src/server/scripts/Commands/cs_rbac.cpp b/src/server/scripts/Commands/cs_rbac.cpp
index 9c682acb224..ba899fee077 100644
--- a/src/server/scripts/Commands/cs_rbac.cpp
+++ b/src/server/scripts/Commands/cs_rbac.cpp
@@ -64,7 +64,7 @@ public:
             {       "grant", RBAC_PERM_COMMAND_RBAC_ACC_ROLE_GRANT,  true, &HandleRBACRoleGrantCommand,   "", NULL },

             {        "deny", RBAC_PERM_COMMAND_RBAC_ACC_ROLE_DENY,   true, &HandleRBACRoleDenyCommand,    "", NULL },

             {      "revoke", RBAC_PERM_COMMAND_RBAC_ACC_ROLE_REVOKE, true, &HandleRBACRoleRevokeCommand,  "", NULL },

-            {            "", RBAC_PERM_COMMAND_RBAC_ACC_ROLE,   true, &HandleRBACRoleListCommand,    "", NULL },

+            {            "", RBAC_PERM_COMMAND_RBAC_ACC_ROLE,        true, &HandleRBACRoleListCommand,    "", NULL },

             {          NULL, 0, false, NULL, "", NULL }

         };

 

@@ -73,7 +73,7 @@ public:
             {       "grant", RBAC_PERM_COMMAND_RBAC_ACC_PERM_GRANT,  true, &HandleRBACPermGrantCommand,   "", NULL },

             {        "deny", RBAC_PERM_COMMAND_RBAC_ACC_PERM_DENY,   true, &HandleRBACPermDenyCommand,    "", NULL },

             {      "revoke", RBAC_PERM_COMMAND_RBAC_ACC_PERM_REVOKE, true, &HandleRBACPermRevokeCommand,  "", NULL },

-            {            "", RBAC_PERM_COMMAND_RBAC_ACC_PERM,   true, &HandleRBACPermListCommand,    "", NULL },

+            {            "", RBAC_PERM_COMMAND_RBAC_ACC_PERM,        true, &HandleRBACPermListCommand,    "", NULL },

             {          NULL, 0, false, NULL, "", NULL }

         };