11 files changed, 261 insertions, 25 deletions

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 9aaadcb55d5..2bc5bca0264 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -265,7 +265,106 @@ CREATE TABLE `rbac_group_roles` (
 
 LOCK TABLES `rbac_group_roles` WRITE;
 /*!40000 ALTER TABLE `rbac_group_roles` DISABLE KEYS */;
-INSERT INTO `rbac_group_roles` VALUES (1,1),(2,2),(3,3),(4,4),(2,5),(1,6),(1,7);
+INSERT INTO `rbac_group_roles` VALUES
+(1, 1),
+(2, 2),
+(3, 3),
+(4, 4),
+(2, 5),
+(1, 6),
+(1, 7),
+(2, 8),
+(3, 8),
+(4, 8),
+(2, 9),
+(3, 9),
+(4, 9),
+(2, 10),
+(3, 10),
+(4, 10),
+(2, 11),
+(3, 11),
+(4, 11),
+(2, 12),
+(3, 12),
+(4, 12),
+(2, 13),
+(3, 13),
+(4, 13),
+(2, 14),
+(3, 14),
+(4, 14),
+(2, 15),
+(3, 15),
+(4, 15),
+(2, 16),
+(3, 16),
+(4, 16),
+(2, 17),
+(3, 17),
+(4, 17),
+(4, 18),
+(1, 19),
+(2, 19),
+(3, 19),
+(4, 19),
+(2, 20),
+(3, 20),
+(4, 20),
+(2, 21),
+(3, 21),
+(4, 21),
+(2, 22),
+(3, 22),
+(4, 22),
+(4, 23),
+(2, 24),
+(3, 24),
+(4, 24),
+(2, 25),
+(3, 25),
+(4, 25),
+(2, 26),
+(3, 26),
+(4, 26),
+(2, 27),
+(3, 27),
+(4, 27),
+(1, 28),
+(2, 28),
+(3, 28),
+(4, 28),
+(2, 29),
+(3, 29),
+(4, 29),
+(1, 30),
+(2, 30),
+(3, 30),
+(4, 30),
+(2, 31),
+(3, 31),
+(4, 31),
+(2, 32),
+(3, 32),
+(4, 32),
+(2, 33),
+(3, 33),
+(4, 33),
+(2, 34),
+(3, 34),
+(4, 34),
+(2, 35),
+(3, 35),
+(4, 35),
+(2, 36),
+(3, 36),
+(4, 36),
+(2, 37),
+(3, 37),
+(4, 37),
+(2, 38),
+(3, 38),
+(4, 38);
 /*!40000 ALTER TABLE `rbac_group_roles` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -278,7 +377,7 @@ DROP TABLE IF EXISTS `rbac_groups`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `rbac_groups` (
   `id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Group id',
-  `name` varchar(50) NOT NULL COMMENT 'Group name',
+  `name` varchar(100) NOT NULL COMMENT 'Group name',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Group List';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -289,7 +388,11 @@ CREATE TABLE `rbac_groups` (
 
 LOCK TABLES `rbac_groups` WRITE;
 /*!40000 ALTER TABLE `rbac_groups` DISABLE KEYS */;
-INSERT INTO `rbac_groups` VALUES (1,'Player'),(2,'Moderator'),(3,'GameMaster'),(4,'Administrator');
+INSERT INTO `rbac_groups` VALUES
+(1,'Player'),
+(2,'Moderator'),
+(3,'GameMaster'),
+(4,'Administrator');
 /*!40000 ALTER TABLE `rbac_groups` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -313,7 +416,53 @@ CREATE TABLE `rbac_permissions` (
 
 LOCK TABLES `rbac_permissions` WRITE;
 /*!40000 ALTER TABLE `rbac_permissions` DISABLE KEYS */;
-INSERT INTO `rbac_permissions` VALUES (1,'Instant logout'),(2,'Skip Queue'),(3,'Join Normal Battleground'),(4,'Join Random Battleground'),(5,'Join Arenas'),(6,'Join Dungeon Finder'),(7,'Player Commands (Temporal till commands moved to rbac)'),(8,'Moderator Commands (Temporal till commands moved to rbac)'),(9,'GameMaster Commands (Temporal till commands moved to rbac)'),(10,'Administrator Commands (Temporal till commands moved to rbac)');
+INSERT INTO `rbac_permissions` VALUES
+(1, 'Instant logout'),
+(2, 'Skip Queue'),
+(3, 'Join Normal Battleground'),
+(4, 'Join Random Battleground'),
+(5, 'Join Arenas'),
+(6, 'Join Dungeon Finder'),
+(7, 'Player Commands (Temporal till commands moved to rbac)'),
+(8, 'Moderator Commands (Temporal till commands moved to rbac)'),
+(9, 'GameMaster Commands (Temporal till commands moved to rbac)'),
+(10, 'Administrator Commands (Temporal till commands moved to rbac)'),
+(11, 'Log GM trades'),
+(13, 'Skip Instance required bosses check'),
+(14, 'Skip character creation team mask check'),
+(15, 'Skip character creation class mask check'),
+(16, 'Skip character creation race mask check'),
+(17, 'Skip character creation reserved name check'),
+(18, 'Skip character creation heroic min level check'),
+(19, 'Skip needed requirements to use channel check'),
+(20, 'Skip disable map check'),
+(21, 'Skip reset talents when used more than allowed check'),
+(22, 'Skip spam chat check'),
+(23, 'Skip over-speed ping check'),
+(24, 'Two side faction characters on the same account'),
+(25, 'Allow say chat between factions'),
+(26, 'Allow channel chat between factions'),
+(27, 'Two side mail interaction'),
+(28, 'See two side who list'),
+(29, 'Add friends of other faction'),
+(30, 'Save character without delay with .save command'),
+(31, 'Use params with .unstuck command'),
+(32, 'Can be assigned tickets with .assign ticket command'),
+(33, 'Notify if a command was not found'),
+(34, 'Check if should appear in list using .gm ingame command'),
+(35, 'See all security levels with who command'),
+(36, 'Filter whispers'),
+(37, 'Use staff badge in chat'),
+(38, 'Resurrect with full Health Points'),
+(39, 'Restore saved gm setting states'),
+(40, 'Allows to add a gm to friend list'),
+(41, 'Use Config option START_GM_LEVEL to assign new character level'),
+(42, 'Allows to use CMSG_WORLD_TELEPORT opcode'),
+(43, 'Allows to use CMSG_WHOIS opcode'),
+(44, 'Receive global GM messages/texts'),
+(45, 'Join channels without announce'),
+(46, 'Change channel settings without being channel moderator'),
+(47, 'Enables lower security than target check');
 /*!40000 ALTER TABLE `rbac_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -340,7 +489,53 @@ CREATE TABLE `rbac_role_permissions` (
 
 LOCK TABLES `rbac_role_permissions` WRITE;
 /*!40000 ALTER TABLE `rbac_role_permissions` DISABLE KEYS */;
-INSERT INTO `rbac_role_permissions` VALUES (5,1),(5,2),(6,3),(6,4),(6,5),(7,6),(1,7),(2,8),(3,9),(4,10);
+INSERT INTO `rbac_role_permissions` VALUES
+(5, 1),
+(5, 2),
+(6, 3),
+(6, 4),
+(6, 5),
+(7, 6),
+(1, 7),
+(2, 8),
+(3, 9),
+(4, 10),
+(8, 11),
+(9, 13),
+(33, 14),
+(33, 15),
+(33, 16),
+(33, 17),
+(33, 18),
+(27, 19),
+(22, 20),
+(23, 21),
+(24, 22),
+(17, 23),
+(34, 24);
+(28, 25),
+(30, 26),
+(19, 27),
+(35, 28),
+(36, 29),
+(11, 30),
+(12, 31),
+(10, 32),
+(20, 33),
+(14, 34),
+(37, 35),
+(29, 36),
+(15, 37),
+(13, 38),
+(25, 39),
+(38, 40),
+(26, 41),
+(18, 42),
+(18, 43),
+(16, 44),
+(31, 45),
+(32, 46),
+(21, 47);
 /*!40000 ALTER TABLE `rbac_role_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -353,7 +548,7 @@ DROP TABLE IF EXISTS `rbac_roles`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `rbac_roles` (
   `id` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Role id',
-  `name` varchar(50) NOT NULL COMMENT 'Role name',
+  `name` varchar(100) NOT NULL COMMENT 'Role name',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Roles List';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -364,7 +559,45 @@ CREATE TABLE `rbac_roles` (
 
 LOCK TABLES `rbac_roles` WRITE;
 /*!40000 ALTER TABLE `rbac_roles` DISABLE KEYS */;
-INSERT INTO `rbac_roles` VALUES (1,'Player Commands'),(2,'Moderator Commands'),(3,'GameMaster Commands'),(4,'Administrator Commands'),(5,'Quick Login/Logout'),(6,'Use Battleground/Arenas'),(7,'Use Dungeon Finder');
+INSERT INTO `rbac_roles` VALUES
+(1, 'Player Commands'),
+(2, 'Moderator Commands'),
+(3, 'GameMaster Commands'),
+(4, 'Administrator Commands'),
+(5, 'Quick Login/Logout'),
+(6, 'Use Battleground/Arenas'),
+(7, 'Use Dungeon Finder'),
+(8, 'Log GM trades'),
+(9, 'Skip Instance required bosses check'),
+(10, 'Ticket management'),
+(11, 'Instant .save'),
+(12, 'Allow params with .unstuck'),
+(13, 'Full HP after resurrect'),
+(14, 'Appear in GM ingame list'),
+(15, 'Use staff badge in chat'),
+(16, 'Receive global GM messages/texts'),
+(17, 'Skip over-speed ping check'),
+(18, 'Allows Admin Opcodes'),
+(19, 'Two side mail interaction'),
+(20, 'Notify if a command was not found'),
+(21, 'Enables lower security than target check'),
+(22, 'Skip disable map check'),
+(23, 'Skip reset talents when used more than allowed check'),
+(24, 'Skip spam chat check'),
+(25, 'Restore saved gm setting states'),
+(26, 'Use Config option START_GM_LEVEL to assign new character level'),
+(27, 'Skips needed requirements to use channel check'),
+(28, 'Allow say chat between factions'),
+(29, 'Filter whispers'),
+(30, 'Allow channel chat between factions'),
+(31, 'Join channels without announce'),
+(32, 'Change channel settings without being channel moderator'),
+(33, 'Skip character creation checks'),
+(34, 'Two side faction characters on the same account')
+(35, 'See two side who list'),
+(36, 'Add friends of other faction'),
+(37, 'See all security levels with who command'),
+(38, 'Allows to add a gm to friend list');
 /*!40000 ALTER TABLE `rbac_roles` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/updates/auth/2013_02_25_00_auth_misc.sql b/sql/updates/auth/2013_02_25_00_auth_misc.sql
index 5531252037a..3cce3c0d5ce 100644
--- a/sql/updates/auth/2013_02_25_00_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_00_auth_misc.sql
@@ -1,3 +1,6 @@
+ALTER TABLE `rbac_roles` MODIFY COLUMN `name` varchar(100) NOT NULL COMMENT 'Role name';
+ALTER TABLE `rbac_roles` MODIFY COLUMN `name` varchar(100) NOT NULL COMMENT 'Group name';
+
 -- Add new permission
 DELETE FROM `rbac_permissions` WHERE `id` = 11;
 INSERT INTO `rbac_permissions` (`id`, `name`) VALUES (11, 'Log GM trades');
diff --git a/sql/updates/auth/2013_02_25_03_auth_misc.sql b/sql/updates/auth/2013_02_25_03_auth_misc.sql
index ab2c6e0692c..5f290ebf0cd 100644
--- a/sql/updates/auth/2013_02_25_03_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_03_auth_misc.sql
@@ -20,7 +20,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (13, 38);
 
 -- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (11, 12, 13);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (11, 12, 13);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 11),
 (3, 11),
diff --git a/sql/updates/auth/2013_02_25_04_auth_misc.sql b/sql/updates/auth/2013_02_25_04_auth_misc.sql
index faaee3582ea..bf42990a1bd 100644
--- a/sql/updates/auth/2013_02_25_04_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_04_auth_misc.sql
@@ -17,7 +17,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (15, 37);
 
 -- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (14, 15);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (14, 15);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 14),
 (3, 14),
diff --git a/sql/updates/auth/2013_02_25_07_auth_misc.sql b/sql/updates/auth/2013_02_25_07_auth_misc.sql
index 2416f08280c..4c6dadf4eaa 100644
--- a/sql/updates/auth/2013_02_25_07_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_07_auth_misc.sql
@@ -15,7 +15,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (18, 42),
 (18, 43);
 
--- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` = 18;
+-- Add it to admins groups
+DELETE FROM `rbac_group_roles` WHERE `roleId` = 18;
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (4, 18);
diff --git a/sql/updates/auth/2013_02_25_09_auth_misc.sql b/sql/updates/auth/2013_02_25_09_auth_misc.sql
index f2affe05b70..6297bf7427a 100644
--- a/sql/updates/auth/2013_02_25_09_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_09_auth_misc.sql
@@ -17,7 +17,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (21, 47);
 
 -- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (20, 21);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (20, 21);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 20),
 (3, 20),
diff --git a/sql/updates/auth/2013_02_25_10_auth_misc.sql b/sql/updates/auth/2013_02_25_10_auth_misc.sql
index 4255bdac8ba..ccca7c74f06 100644
--- a/sql/updates/auth/2013_02_25_10_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_10_auth_misc.sql
@@ -26,7 +26,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (26, 41);
 
 -- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (22, 23, 24, 25, 26);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (22, 23, 24, 25, 26);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 22),
 (3, 22),
diff --git a/sql/updates/auth/2013_02_25_11_auth_misc.sql b/sql/updates/auth/2013_02_25_11_auth_misc.sql
index 9c2897394e5..90c19526b06 100644
--- a/sql/updates/auth/2013_02_25_11_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_11_auth_misc.sql
@@ -20,7 +20,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (29, 36);
 
 -- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (27, 28, 29);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (27, 28, 29);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 27),
 (3, 27),
diff --git a/sql/updates/auth/2013_02_25_12_auth_misc.sql b/sql/updates/auth/2013_02_25_12_auth_misc.sql
index 2b394dc9bcb..30e203ea4b3 100644
--- a/sql/updates/auth/2013_02_25_12_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_12_auth_misc.sql
@@ -20,7 +20,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (32, 46);
 
 -- Add it to all GM+ groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (30, 31, 32);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (30, 31, 32);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (1, 30),
 (2, 30),
diff --git a/sql/updates/auth/2013_02_25_13_auth_misc.sql b/sql/updates/auth/2013_02_25_13_auth_misc.sql
index 82247ecd07d..9a7806ede68 100644
--- a/sql/updates/auth/2013_02_25_13_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_13_auth_misc.sql
@@ -1,18 +1,18 @@
 -- Add new permissions
 DELETE FROM `rbac_permissions` WHERE `id` IN (14, 15, 16, 17, 18, 24);
 INSERT INTO `rbac_permissions` (`id`, `name`) VALUES
-(14, 'Skips character creation team mask check'),
-(15, 'Skips character creation class mask check'),
-(16, 'Skips character creation race mask check'),
-(17, 'Skips character creation reserved name check'),
-(18, 'Skips character creation heroic min level check'),
-(24, 'Creation of two side faction characters in same account');
+(14, 'Skip character creation team mask check'),
+(15, 'Skip character creation class mask check'),
+(16, 'Skip character creation race mask check'),
+(17, 'Skip character creation reserved name check'),
+(18, 'Skip character creation heroic min level check'),
+(24, 'Two side faction characters on the same account');
 
 -- Add new role
 DELETE FROM `rbac_roles` WHERE `id` IN (33, 34);
 INSERT INTO `rbac_roles` (`id`, `name`) VALUES
-(33, 'Skips character creation checks'),
-(34, 'Creation of two side faction characters in same account');
+(33, 'Skip character creation checks'),
+(34, 'Two side faction characters on the same account');
 
 -- Add the permission to the role
 DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (33, 34);
@@ -25,7 +25,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (34, 24);
 
 -- Add it to all groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (33, 34);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (33, 34);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 33),
 (3, 33),
diff --git a/sql/updates/auth/2013_02_25_14_auth_misc.sql b/sql/updates/auth/2013_02_25_14_auth_misc.sql
index c02b600b12f..f88280feae7 100644
--- a/sql/updates/auth/2013_02_25_14_auth_misc.sql
+++ b/sql/updates/auth/2013_02_25_14_auth_misc.sql
@@ -23,7 +23,7 @@ INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES
 (38, 40);
 
 -- Add it to all groups
-DELETE FROM `rbac_role_permissions` WHERE `roleId` IN (35, 36, 37, 38);
+DELETE FROM `rbac_group_roles` WHERE `roleId` IN (35, 36, 37, 38);
 INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES
 (2, 35),
 (3, 35),