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

4 files changed, 48 insertions, 8 deletions

diff --git a/sql/updates/auth/2013_09_10_04_auth_misc.sql b/sql/updates/auth/2013_09_10_04_auth_misc.sql
new file mode 100644
index 00000000000..9b1f48f2914
--- /dev/null
+++ b/sql/updates/auth/2013_09_10_04_auth_misc.sql
@@ -0,0 +1,23 @@
+/* cs_mmaps.cpp */
+
+SET @id = 536;
+
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` BETWEEN @id AND @id+5;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(@id+0, 'mmap'),
+(@id+1, 'mmap loadedtiles'),
+(@id+2, 'mmap loc'),
+(@id+3, 'mmap path'),
+(@id+4, 'mmap stats'),
+(@id+5, 'mmap testarea');
+
+-- Add permissions to "corresponding Commands Role"
+DELETE FROM `rbac_role_permissions` WHERE `permissionId` BETWEEN @id AND @id+5;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
+(4, @id+0),
+(4, @id+1),
+(4, @id+2),
+(4, @id+3),
+(4, @id+4),
+(4, @id+5);
diff --git a/sql/updates/world/2013_09_10_06_world_command.sql b/sql/updates/world/2013_09_10_06_world_command.sql
new file mode 100644
index 00000000000..57aba9eadaa
--- /dev/null
+++ b/sql/updates/world/2013_09_10_06_world_command.sql
@@ -0,0 +1,11 @@
+/* cs_mmaps.cpp */
+
+SET @id = 536;
+
+-- Update command table with new RBAC permissions
+UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'mmap';
+UPDATE `command` SET `permission` = @id+1 WHERE `name` = 'mmap loadedtiles';
+UPDATE `command` SET `permission` = @id+2 WHERE `name` = 'mmap loc';
+UPDATE `command` SET `permission` = @id+3 WHERE `name` = 'mmap path';
+UPDATE `command` SET `permission` = @id+4 WHERE `name` = 'mmap stats';
+UPDATE `command` SET `permission` = @id+5 WHERE `name` = 'mmap testarea';
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index a758062ee8a..926b2769842 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -435,6 +435,12 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_UNPOSSESS                              = 533,

     RBAC_PERM_COMMAND_UNSTUCK                                = 534,

     RBAC_PERM_COMMAND_WCHANGE                                = 535,

+    RBAC_PERM_COMMAND_MMAP                                   = 536,

+    RBAC_PERM_COMMAND_MMAP_LOADEDTILES                       = 537,

+    RBAC_PERM_COMMAND_MMAP_LOC                               = 538,

+    RBAC_PERM_COMMAND_MMAP_PATH                              = 539,

+    RBAC_PERM_COMMAND_MMAP_STATS                             = 540,

+    RBAC_PERM_COMMAND_MMAP_TESTAREA                          = 541,

 

     // custom permissions 1000+

     RBAC_PERM_MAX

diff --git a/src/server/scripts/Commands/cs_mmaps.cpp b/src/server/scripts/Commands/cs_mmaps.cpp
index 6667499af58..caefcceb886 100644
--- a/src/server/scripts/Commands/cs_mmaps.cpp
+++ b/src/server/scripts/Commands/cs_mmaps.cpp
@@ -45,18 +45,18 @@ public:
     {
         static ChatCommand mmapCommandTable[] =
         {
-            { "path",           RBAC_PERM_ADMINISTRATOR_COMMANDS,     false, &HandleMmapPathCommand,            "", NULL },
-            { "loc",            RBAC_PERM_ADMINISTRATOR_COMMANDS,     false, &HandleMmapLocCommand,             "", NULL },
-            { "loadedtiles",    RBAC_PERM_ADMINISTRATOR_COMMANDS,     false, &HandleMmapLoadedTilesCommand,     "", NULL },
-            { "stats",          RBAC_PERM_ADMINISTRATOR_COMMANDS,     false, &HandleMmapStatsCommand,           "", NULL },
-            { "testarea",       RBAC_PERM_ADMINISTRATOR_COMMANDS,     false, &HandleMmapTestArea,               "", NULL },
-            { NULL,             0,                     false, NULL,                              "", NULL }
+            { "loadedtiles", RBAC_PERM_COMMAND_MMAP_LOADEDTILES, false, &HandleMmapLoadedTilesCommand, "", NULL },
+            { "loc",         RBAC_PERM_COMMAND_MMAP_LOC,         false, &HandleMmapLocCommand,         "", NULL },
+            { "path",        RBAC_PERM_COMMAND_MMAP_PATH,        false, &HandleMmapPathCommand,        "", NULL },
+            { "stats",       RBAC_PERM_COMMAND_MMAP_STATS,       false, &HandleMmapStatsCommand,       "", NULL },
+            { "testarea",    RBAC_PERM_COMMAND_MMAP_TESTAREA,    false, &HandleMmapTestArea,           "", NULL },
+            { NULL,          0,                                  false, NULL,                          "", NULL }
         };
 
         static ChatCommand commandTable[] =
         {
-            { "mmap",           RBAC_PERM_ADMINISTRATOR_COMMANDS,     true,  NULL,                 "", mmapCommandTable  },
-            { NULL,             0,                     false, NULL,                              "", NULL }
+            { "mmap", RBAC_PERM_COMMAND_MMAP, true, NULL, "", mmapCommandTable  },
+            { NULL,   0,                     false, NULL, "", NULL }
         };
         return commandTable;
     }