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

4 files changed, 48 insertions, 8 deletions

diff --git a/sql/updates/auth/2013_09_02_12_auth_misc.sql b/sql/updates/auth/2013_09_02_12_auth_misc.sql
new file mode 100644
index 00000000000..640f54b03f8
--- /dev/null
+++ b/sql/updates/auth/2013_09_02_12_auth_misc.sql
@@ -0,0 +1,23 @@
+/* cs_lfg.cpp */
+
+SET @id = 430;
+
+-- Add new permissions
+DELETE FROM `rbac_permissions` WHERE `id` BETWEEN @id AND @id+5;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
+(@id+0, 'lfg'),
+(@id+1, 'lfg player'),
+(@id+2, 'lfg group'),
+(@id+3, 'lfg queue'),
+(@id+4, 'lfg clean'),
+(@id+5, 'lfg options');
+
+-- 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
+(2, @id+0),
+(2, @id+1),
+(2, @id+2),
+(2, @id+3),
+(4, @id+4),
+(4, @id+5);
diff --git a/sql/updates/world/2013_09_02_13_world_command.sql b/sql/updates/world/2013_09_02_13_world_command.sql
new file mode 100644
index 00000000000..55fff43aafb
--- /dev/null
+++ b/sql/updates/world/2013_09_02_13_world_command.sql
@@ -0,0 +1,11 @@
+/* cs_learn.cpp */
+
+SET @id = 430;
+
+-- Update command table with new RBAC permissions
+UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'lfg';
+UPDATE `command` SET `permission` = @id+1 WHERE `name` = 'lfg player';
+UPDATE `command` SET `permission` = @id+2 WHERE `name` = 'lfg group';
+UPDATE `command` SET `permission` = @id+3 WHERE `name` = 'lfg queue';
+UPDATE `command` SET `permission` = @id+4 WHERE `name` = 'lfg clean';
+UPDATE `command` SET `permission` = @id+5 WHERE `name` = 'lfg options');
diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h
index 646b23f647e..2ac74586514 100644
--- a/src/server/game/Accounts/RBAC.h
+++ b/src/server/game/Accounts/RBAC.h
@@ -306,6 +306,12 @@ enum RBACPermissions
     RBAC_PERM_COMMAND_LEARN_ALL_LANG                         = 427,

     RBAC_PERM_COMMAND_LEARN_ALL_RECIPES                      = 428,

     RBAC_PERM_COMMAND_UNLEARN                                = 429,

+    RBAC_PERM_COMMAND_LFG                                    = 430,

+    RBAC_PERM_COMMAND_LFG_PLAYER                             = 431,

+    RBAC_PERM_COMMAND_LFG_GROUP                              = 432,

+    RBAC_PERM_COMMAND_LFG_QUEUE                              = 433,

+    RBAC_PERM_COMMAND_LFG_CLEAN                              = 434,

+    RBAC_PERM_COMMAND_LFG_OPTIONS                            = 435,

 

     // custom permissions 1000+

     RBAC_PERM_MAX

diff --git a/src/server/scripts/Commands/cs_lfg.cpp b/src/server/scripts/Commands/cs_lfg.cpp
index c11a00c7bba..76d9fe50de1 100644
--- a/src/server/scripts/Commands/cs_lfg.cpp
+++ b/src/server/scripts/Commands/cs_lfg.cpp
@@ -45,18 +45,18 @@ public:
     {
         static ChatCommand lfgCommandTable[] =
         {
-            {  "player",     RBAC_PERM_GAMEMASTER_COMMANDS, false, &HandleLfgPlayerInfoCommand, "", NULL },
-            {   "group",     RBAC_PERM_GAMEMASTER_COMMANDS, false,  &HandleLfgGroupInfoCommand, "", NULL },
-            {   "queue",     RBAC_PERM_GAMEMASTER_COMMANDS, false,  &HandleLfgQueueInfoCommand, "", NULL },
-            {   "clean",  RBAC_PERM_ADMINISTRATOR_COMMANDS, false,      &HandleLfgCleanCommand, "", NULL },
-            { "options",  RBAC_PERM_ADMINISTRATOR_COMMANDS, false,    &HandleLfgOptionsCommand, "", NULL },
-            {      NULL,         RBAC_PERM_PLAYER_COMMANDS, false,                        NULL, "", NULL }
+            {  "player", RBAC_PERM_COMMAND_LFG_PLAYER,  false, &HandleLfgPlayerInfoCommand, "", NULL },
+            {   "group", RBAC_PERM_COMMAND_LFG_GROUP,   false, &HandleLfgGroupInfoCommand,  "", NULL },
+            {   "queue", RBAC_PERM_COMMAND_LFG_QUEUE,   false, &HandleLfgQueueInfoCommand,  "", NULL },
+            {   "clean", RBAC_PERM_COMMAND_LFG_CLEAN,   false, &HandleLfgCleanCommand,      "", NULL },
+            { "options", RBAC_PERM_COMMAND_LFG_OPTIONS, false, &HandleLfgOptionsCommand,    "", NULL },
+            {      NULL, 0, false,                       NULL, "", NULL }
         };
 
         static ChatCommand commandTable[] =
         {
-            {       "lfg",   RBAC_PERM_GAMEMASTER_COMMANDS, false,                        NULL, "", lfgCommandTable },
-            {  NULL,             RBAC_PERM_PLAYER_COMMANDS, false,                        NULL, "", NULL }
+            { "lfg", RBAC_PERM_COMMAND_LFG, false, NULL, "", lfgCommandTable },
+            {  NULL,                     0, false, NULL, "", NULL }
         };
         return commandTable;
     }