diff options
| -rw-r--r-- | sql/updates/auth/2013_09_02_08_auth_misc.sql | 25 | ||||
| -rw-r--r-- | sql/updates/world/2013_09_02_09_world_command.sql | 12 | ||||
| -rw-r--r-- | src/server/game/Accounts/RBAC.h | 7 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_guild.cpp | 18 |
4 files changed, 53 insertions, 9 deletions
diff --git a/sql/updates/auth/2013_09_02_08_auth_misc.sql b/sql/updates/auth/2013_09_02_08_auth_misc.sql new file mode 100644 index 00000000000..b6bf442aeb5 --- /dev/null +++ b/sql/updates/auth/2013_09_02_08_auth_misc.sql @@ -0,0 +1,25 @@ +/* cs_guild.cpp */ + +SET @id = 401; + +-- Add new permissions +DELETE FROM `rbac_permissions` WHERE `id` BETWEEN @id AND @id+6; +INSERT INTO `rbac_permissions` (`id`, `name`) VALUES +(@id+0, 'guild'), +(@id+1, 'guild create'), +(@id+2, 'guild delete'), +(@id+3, 'guild invite'), +(@id+4, 'guild uninvite'), +(@id+5, 'guild rank'), +(@id+6, 'guild rename'); + +-- Add permissions to "corresponding Commands Role" +DELETE FROM `rbac_role_permissions` WHERE `permissionId` BETWEEN @id AND @id+6; +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), +(4, @id+6); diff --git a/sql/updates/world/2013_09_02_09_world_command.sql b/sql/updates/world/2013_09_02_09_world_command.sql new file mode 100644 index 00000000000..5d32d09a45a --- /dev/null +++ b/sql/updates/world/2013_09_02_09_world_command.sql @@ -0,0 +1,12 @@ +/* cs_gobject.cpp */ + +SET @id = 401; + +-- Update command table with new RBAC permissions +UPDATE `command` SET `permission` = @id+0 WHERE `name` = 'guild'; +UPDATE `command` SET `permission` = @id+1 WHERE `name` = 'guild create'; +UPDATE `command` SET `permission` = @id+2 WHERE `name` = 'guild delete'; +UPDATE `command` SET `permission` = @id+3 WHERE `name` = 'guild invite'; +UPDATE `command` SET `permission` = @id+4 WHERE `name` = 'guild uninvite'; +UPDATE `command` SET `permission` = @id+5 WHERE `name` = 'guild rank'; +UPDATE `command` SET `permission` = @id+6 WHERE `name` = 'guild rename'); diff --git a/src/server/game/Accounts/RBAC.h b/src/server/game/Accounts/RBAC.h index 32509817a1b..77e2a647e73 100644 --- a/src/server/game/Accounts/RBAC.h +++ b/src/server/game/Accounts/RBAC.h @@ -277,6 +277,13 @@ enum RBACPermissions RBAC_PERM_COMMAND_GOBJECT_SET_STATE = 397,
RBAC_PERM_COMMAND_GOBJECT_TARGET = 398,
RBAC_PERM_COMMAND_GOBJECT_TURN = 399,
+ RBAC_PERM_COMMAND_GUILD = 401,
+ RBAC_PERM_COMMAND_GUILD_CREATE = 402,
+ RBAC_PERM_COMMAND_GUILD_DELETE = 403,
+ RBAC_PERM_COMMAND_GUILD_INVITE = 404,
+ RBAC_PERM_COMMAND_GUILD_UNINVITE = 405,
+ RBAC_PERM_COMMAND_GUILD_RANK = 406,
+ RBAC_PERM_COMMAND_GUILD_RENAME = 407,
// custom permissions 1000+
RBAC_PERM_MAX
diff --git a/src/server/scripts/Commands/cs_guild.cpp b/src/server/scripts/Commands/cs_guild.cpp index f1251cb2932..0af0da10846 100644 --- a/src/server/scripts/Commands/cs_guild.cpp +++ b/src/server/scripts/Commands/cs_guild.cpp @@ -38,18 +38,18 @@ public: { static ChatCommand guildCommandTable[] = { - { "create", RBAC_PERM_GAMEMASTER_COMMANDS, true, &HandleGuildCreateCommand, "", NULL }, - { "delete", RBAC_PERM_GAMEMASTER_COMMANDS, true, &HandleGuildDeleteCommand, "", NULL }, - { "invite", RBAC_PERM_GAMEMASTER_COMMANDS, true, &HandleGuildInviteCommand, "", NULL }, - { "uninvite", RBAC_PERM_GAMEMASTER_COMMANDS, true, &HandleGuildUninviteCommand, "", NULL }, - { "rank", RBAC_PERM_GAMEMASTER_COMMANDS, true, &HandleGuildRankCommand, "", NULL }, - { "rename", RBAC_PERM_GAMEMASTER_COMMANDS, true, &HandleGuildRenameCommand, "", NULL }, - { NULL, 0, false, NULL, "", NULL } + { "create", RBAC_PERM_COMMAND_GUILD_CREATE, true, &HandleGuildCreateCommand, "", NULL }, + { "delete", RBAC_PERM_COMMAND_GUILD_DELETE, true, &HandleGuildDeleteCommand, "", NULL }, + { "invite", RBAC_PERM_COMMAND_GUILD_INVITE, true, &HandleGuildInviteCommand, "", NULL }, + { "uninvite", RBAC_PERM_COMMAND_GUILD_UNINVITE, true, &HandleGuildUninviteCommand, "", NULL }, + { "rank", RBAC_PERM_COMMAND_GUILD_RANK, true, &HandleGuildRankCommand, "", NULL }, + { "rename", RBAC_PERM_COMMAND_GUILD_RENAME, true, &HandleGuildRenameCommand, "", NULL }, + { NULL, 0, false, NULL, "", NULL } }; static ChatCommand commandTable[] = { - { "guild", RBAC_PERM_ADMINISTRATOR_COMMANDS, true, NULL, "", guildCommandTable }, - { NULL, 0, false, NULL, "", NULL } + { "guild", RBAC_PERM_COMMAND_GUILD, true, NULL, "", guildCommandTable }, + { NULL, 0, false, NULL, "", NULL } }; return commandTable; } |