Don't use group inheritance (may be back later)

beaver-dev · beaver-dev · commit 09829d74f75b · 2016-04-17T19:37:57.000+02:00
diff --git a/featherbb/Controller/Install.php b/featherbb/Controller/Install.php
@@ -207,14 +207,18 @@ public function create_db(array $data)
         }
 
         // Init permissions
-        Container::get('perms')->addParent(4, array(3));
-        Container::get('perms')->addParent(2, array(3,4));
-        Container::get('perms')->addParent(1, array(2,3,4));
+        // TODO: Reuse groups inheritance later ?
+        // Container::get('perms')->addParent(4, array(3));
+        // Container::get('perms')->addParent(2, array(3,4));
+        // Container::get('perms')->addParent(1, array(2,3,4));
+        // Container::get('perms')->allowGroup(3, array('board.read', 'users.view', 'search.topics', 'search.users'));
+        // Container::get('perms')->allowGroup(4, array('topic.reply', 'topic.post', 'topic.delete', 'post.delete', 'post.edit', 'post.links', 'email.send'));
+        // Container::get('perms')->allowGroup(2, array('mod.is_mod', 'mod.edit_users', 'mod.rename_users', 'mod.change_passwords', 'mod.promote_users', 'mod.ban_users', 'user.set_title'));
 
         Container::get('perms')->allowGroup(3, array('board.read', 'users.view', 'search.topics', 'search.users'));
-        Container::get('perms')->allowGroup(4, array('topic.reply', 'topic.post', 'topic.delete', 'post.delete', 'post.edit', 'post.links', 'email.send'));
-        Container::get('perms')->allowGroup(2, array('modpanel.*', 'mod.is_mod', 'mod.edit_users', 'mod.rename_users', 'mod.change_passwords', 'mod.promote_users', 'mod.ban_users', 'user.set_title'));
-        Container::get('perms')->allowGroup(1, array('board.*'));
+        Container::get('perms')->allowGroup(4, array('board.read', 'users.view', 'search.topics', 'search.users', 'topic.reply', 'topic.post', 'topic.delete', 'post.delete', 'post.edit', 'post.links', 'email.send'));
+        Container::get('perms')->allowGroup(2, array('board.read', 'users.view', 'user.set_title', 'search.topics', 'search.users', 'topic.reply', 'topic.post', 'topic.delete', 'post.delete', 'post.edit', 'post.links', 'email.send', 'mod.is_mod', 'mod.edit_users', 'mod.rename_users', 'mod.change_passwords', 'mod.promote_users', 'mod.ban_users'));
+        Container::get('perms')->allowGroup(1, array('*'));
         // Init preferences
         Container::get('prefs')->set(array(
             'post.min_interval' => 60,
diff --git a/featherbb/Model/Install.php b/featherbb/Model/Install.php
@@ -80,7 +80,6 @@ class Install
             `g_promote_min_posts` int(10) unsigned NOT NULL DEFAULT '0',
             `g_promote_next_group` int(10) unsigned NOT NULL DEFAULT '0',
             `g_moderator` tinyint(1) NOT NULL DEFAULT '0',
-            `g_read_board` tinyint(1) NOT NULL DEFAULT '1',
             `g_post_replies` tinyint(1) NOT NULL DEFAULT '1',
             `g_post_topics` tinyint(1) NOT NULL DEFAULT '1',
             `inherit` text,
@@ -283,7 +282,6 @@ public static function load_default_groups()
             'g_title' => __('Administrators'),
             'g_user_title' => __('Administrator'),
             'g_moderator' => 1,
-            'g_read_board' => 1,
             'g_post_replies' => 1,
             'g_post_topics' => 1
         );
@@ -292,7 +290,6 @@ public static function load_default_groups()
             'g_title' => __('Moderators'),
             'g_user_title' => __('Moderator'),
             'g_moderator' => 1,
-            'g_read_board' => 1,
             'g_post_replies' => 1,
             'g_post_topics' => 1
         );
@@ -301,7 +298,6 @@ public static function load_default_groups()
             'g_title' => __('Guests'),
             'g_user_title' => __('Guest'),
             'g_moderator' => 0,
-            'g_read_board' => 1,
             'g_post_replies' => 0,
             'g_post_topics' => 0
         );
@@ -310,7 +306,6 @@ public static function load_default_groups()
             'g_title' => __('Members'),
             'g_user_title' => __('Member'),
             'g_moderator' => 0,
-            'g_read_board' => 1,
             'g_post_replies' => 1,
             'g_post_topics' => 1
         );
