Use User::can('topic.*')

beaver-dev · beaver-dev · commit 373657149147 · 2016-04-16T18:21:32.000+02:00
diff --git a/featherbb/Controller/Forum.php b/featherbb/Controller/Forum.php
@@ -41,7 +41,7 @@ public function display($req, $res, $args)
         $sort_by = $this->model->sort_forum_by($cur_forum['sort_by']);
 
         // Can we or can we not post new topics?
-        if (($cur_forum['post_topics'] == '' && User::get()->g_post_topics == '1') || $cur_forum['post_topics'] == '1' || $is_admmod) {
+        if (($cur_forum['post_topics'] == '' && User::can('topic.post')) || $cur_forum['post_topics'] == '1' || $is_admmod) {
             $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.Router::pathFor('newTopic', ['fid' => $args['id']]).'">'.__('Post topic').'</a></p>'."\n";
         } else {
             $post_link = '';
diff --git a/featherbb/Controller/Post.php b/featherbb/Controller/Post.php
@@ -74,8 +74,8 @@ public function newpost($req, $res, $args)
         $is_admmod = (User::get()->g_id == ForumEnv::get('FEATHER_ADMIN') || (User::can('mod.is_mod') && array_key_exists(User::get()->username, $mods_array))) ? true : false;
 
         // Do we have permission to post?
-        if ((($args['tid'] && (($cur_posting['post_replies'] == '' && User::get()->g_post_replies == '0') || $cur_posting['post_replies'] == '0')) ||
-                ($args['fid'] && (($cur_posting['post_topics'] == '' && User::get()->g_post_topics == '0') || $cur_posting['post_topics'] == '0')) ||
+        if ((($args['tid'] && (($cur_posting['post_replies'] == '' && !User::can('topic.reply')) || $cur_posting['post_replies'] == '0')) ||
+                ($args['fid'] && (($cur_posting['post_topics'] == '' && !User::can('topic.post')) || $cur_posting['post_topics'] == '0')) ||
                 (isset($cur_posting['closed']) && $cur_posting['closed'] == '1')) &&
                 !$is_admmod) {
             throw new Error(__('No permission'), 403);
diff --git a/featherbb/Model/Topic.php b/featherbb/Model/Topic.php
@@ -177,7 +177,7 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
         $closed = Container::get('hooks')->fire('model.topic.get_post_link_start', $closed, $topic_id, $post_replies, $is_admmod);
 
         if ($closed == '0') {
-            if (($post_replies == '' && User::get()->g_post_replies == '1') || $post_replies == '1' || $is_admmod) {
+            if (($post_replies == '' && User::can('topic.reply')) || $post_replies == '1' || $is_admmod) {
                 $post_link = "\t\t\t".'<p class="postlink conr"><a href="'.Router::pathFor('newReply', ['tid' => $topic_id]).'">'.__('Post reply').'</a></p>'."\n";
             } else {
                 $post_link = '';
@@ -201,7 +201,7 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)
     public function is_quickpost($post_replies, $closed, $is_admmod)
     {
         $quickpost = false;
-        if (ForumSettings::get('o_quickpost') == '1' && ($post_replies == '1' || ($post_replies == '' && User::get()->g_post_replies == '1')) && ($closed == '0' || $is_admmod)) {
+        if (ForumSettings::get('o_quickpost') == '1' && ($post_replies == '1' || ($post_replies == '' && User::can('topic.reply'))) && ($closed == '0' || $is_admmod)) {
             $quickpost = true;
         }
 
@@ -962,7 +962,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)
                         }
                     }
 
-                    if (($cur_topic['post_replies'] == '' && User::get()->g_post_replies == '1') || $cur_topic['post_replies'] == '1') {
+                    if (($cur_topic['post_replies'] == '' && User::can('topic.reply')) || $cur_topic['post_replies'] == '1') {
                         $cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.Router::pathFor('newQuoteReply', ['tid' => $topic_id, 'qid' => $cur_post['id']]).'">'.__('Quote').'</a></span></li>';
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)`
`177`	`177`	`$closed = Container::get('hooks')->fire('model.topic.get_post_link_start', $closed, $topic_id, $post_replies, $is_admmod);`
`178`	`178`
`179`	`179`	`if ($closed == '0') {`
`180`		`- if (($post_replies == '' && User::get()->g_post_replies == '1') \|\| $post_replies == '1' \|\| $is_admmod) {`
	`180`	`+ if (($post_replies == '' && User::can('topic.reply')) \|\| $post_replies == '1' \|\| $is_admmod) {`
`181`	`181`	`$post_link = "\t\t\t".'<p class="postlink conr"><a href="'.Router::pathFor('newReply', ['tid' => $topic_id]).'">'.__('Post reply').'</a></p>'."\n";`
`182`	`182`	`} else {`
`183`	`183`	`$post_link = '';`
`@@ -201,7 +201,7 @@ public function get_post_link($topic_id, $closed, $post_replies, $is_admmod)`
`201`	`201`	`public function is_quickpost($post_replies, $closed, $is_admmod)`
`202`	`202`	`{`
`203`	`203`	`$quickpost = false;`
`204`		`- if (ForumSettings::get('o_quickpost') == '1' && ($post_replies == '1' \|\| ($post_replies == '' && User::get()->g_post_replies == '1')) && ($closed == '0' \|\| $is_admmod)) {`
	`204`	`+ if (ForumSettings::get('o_quickpost') == '1' && ($post_replies == '1' \|\| ($post_replies == '' && User::can('topic.reply'))) && ($closed == '0' \|\| $is_admmod)) {`
`205`	`205`	`$quickpost = true;`
`206`	`206`	`}`
`207`	`207`
`@@ -962,7 +962,7 @@ public function print_posts($topic_id, $start_from, $cur_topic, $is_admmod)`
`962`	`962`	`}`
`963`	`963`	`}`
`964`	`964`
`965`		`- if (($cur_topic['post_replies'] == '' && User::get()->g_post_replies == '1') \|\| $cur_topic['post_replies'] == '1') {`
	`965`	`+ if (($cur_topic['post_replies'] == '' && User::can('topic.reply')) \|\| $cur_topic['post_replies'] == '1') {`
`966`	`966`	`$cur_post['post_actions'][] = '<li class="postquote"><span><a href="'.Router::pathFor('newQuoteReply', ['tid' => $topic_id, 'qid' => $cur_post['id']]).'">'.__('Quote').'</a></span></li>';`
`967`	`967`	`}`
`968`	`968`	`}`