Version 1.4

DebugPlugin/controllers/api/PermissionApiController.php

@@ -0,0 +1,67 @@
+<?php
+
+use Garden\Web\Exception\ClientException;
+use Garden\Schema\Schema;
+use Vanilla\Utility\InstanceValidatorSchema;
+use Garden\Web\Data;
+use Garden\Web\Exception\NotFoundException;
+use Garden\Web\Exception\ServerException;
+use Vanilla\ApiUtils;
+
+/**
+ * Permission API Controller for the `/permission` resource.
+ */
+class PermissionApiController extends AbstractApiController {
+
+    /**
+     * Get default user permissions
+     * @param $userID
+     * @return Data
+     * @throws \Garden\Web\Exception\HttpException
+     * @throws \Vanilla\Exception\PermissionException
+     */
+    public function index($userID) {
+        $this->permission('Garden.Settings.Manage');
+        if (!Gdn::userModel()->getID($userID)) {
+            throw notFoundException('User');
+        }
+        $userPermissions = Gdn::userModel()->getPermissions($userID);
+        $data = [
+            'userPermissions' => $userPermissions,
+        ];
+        return $data;
+    }
+
+    /**
+     * Get user permissions for a category
+     * @param $userID
+     * @param $categoryID
+     * @return Data
+     * @throws \Garden\Web\Exception\HttpException
+     * @throws \Vanilla\Exception\PermissionException
+     */
+    public function get($userID, $categoryID) {
+        $this->permission('Garden.Settings.Manage');
+
+        if (!Gdn::userModel()->getID($userID)) {
+            throw notFoundException('User');
+        }
+
+        $category =  CategoryModel::categories($categoryID);
+        if (!$category) {
+            throw notFoundException('Category');
+        }
+        $groupID = val('GroupID', $category, null);
+        $data = [
+            'GroupID' => $groupID,
+            'PermsGroupView' => $groupID? GroupModel::getGroupRoleFor($userID, $groupID) : null,
+            'PermsDiscussionsView' => CategoryModel::checkPermission($category, 'Vanilla.Discussions.View', true, $userID),
+            'PermsDiscussionsAdd' => CategoryModel::checkPermission($category, 'Vanilla.Discussions.Add', true, $userID),
+            'PermsDiscussionsEdit' => CategoryModel::checkPermission($category, 'Vanilla.Discussions.Edit', true, $userID),
+            'PermsCommentsAdd' => CategoryModel::checkPermission($category, 'Vanilla.Comments.Add', true, $userID),
+            'PermsDiscussionsUploads' => CategoryModel::checkPermission($category, 'Vanilla.Discussions.Uploads', true, $userID),
+            'PermsCommentsUploads' => CategoryModel::checkPermission($category, 'Vanilla.Comments.Uploads', true, $userID)
+        ];
+        return $data;
+    }
+}

DebugPlugin/openapi/permission.yml

@@ -0,0 +1,52 @@
+openapi: 3.0.2
+info: Vanilla Permission API
+paths:
+  /permission/{userID}/{categoryID}:
+    get:
+      parameters:
+        - description: UserID to check.
+          in: path
+          name: userID
+          schema:
+            type: integer
+        - description: CategoryID to check.
+          in: path
+          name: categoryID
+          schema:
+            type: integer
+      responses:
+        '200':
+          content:
+            'application/json':
+              schema:
+                items:
+                  $ref: '#/components/schemas/Records'
+                type: array
+          description: Success
+      tags:
+        - Data
+      summary: List records.
+  /permission/{userID}:
+    get:
+      parameters:
+        - description: UserID to check.
+          in: path
+          name: userID
+          schema:
+            type: integer
+      responses:
+        '200':
+          content:
+            'application/json':
+              schema:
+                items:
+                  $ref: '#/components/schemas/Records'
+                type: array
+          description: Success
+      tags:
+        - Data
+      summary: List records.
+components:
+  schemas:
+    Records:
+      type: object

ReplyTo/class.replyto.plugin.php

@@ -9,7 +9,6 @@ class ReplyToPlugin extends Gdn_Plugin {
 
     const QUERY_PARAMETER_VIEW='view';
     const VIEW_FLAT = 'flat';
-    const VIEW_TREE = 'tree';
     const VIEW_THREADED = 'threaded';
 
     private $replyToModel;
@@ -67,12 +66,22 @@ public function postController_render_before($sender) {
         $this->prepareController($sender);
     }
 
+    /**
+     * Add View Mode before rendering comments
+     * @param $sender
+     * @param $args
+     */
+    public function base_beforeCommentsRender_handler($sender, $args) {
+        $viewMode = self::getViewMode();
+        $sender->setData('ViewMode', $viewMode);
+    }
+
     /**
      * Render View options for a discussion
      * @param $sender
      * @param $args
      */
-    public function base_Replies_handler($sender, $args){
+    public function base_InlineDiscussionOptionsLeft_handler($sender, $args){
         $discussion = $sender->data('Discussion');
         if (!$discussion) {
             return;
@@ -83,13 +92,13 @@ public function base_Replies_handler($sender, $args){
         }
 
         $discussionUrl = discussionUrl($discussion, '', '/');
-        $viewMode = getIncomingValue(self::QUERY_PARAMETER_VIEW, self::VIEW_FLAT);
+        $viewMode = self::getViewMode();
 
-        echo '<div class="ReplyViewOptions"><span class="MLabel">View:&nbsp</span>';
-        echo anchor('Flat', $discussionUrl.'?'.self::QUERY_PARAMETER_VIEW.'='.self::VIEW_FLAT, $viewMode == self::VIEW_FLAT?'Active':'').'&nbsp;&nbsp;|&nbsp;&nbsp;';
-        echo anchor('Threaded', $discussionUrl.'?'.self::QUERY_PARAMETER_VIEW.'='.self::VIEW_THREADED, $viewMode == self::VIEW_THREADED?'Active':'').'&nbsp;&nbsp;|&nbsp;&nbsp;';
-        echo anchor('Tree', $discussionUrl.'?'.self::QUERY_PARAMETER_VIEW.'='.self::VIEW_TREE, $viewMode == self::VIEW_TREE?'Active':'');
-        echo '</div>';
+        echo '<span class="ReplyViewOptions">';
+        echo '<span class="MLabel">View:&nbsp</span>';
+        echo anchor('Threaded', $discussionUrl.'?'.self::QUERY_PARAMETER_VIEW.'='.self::VIEW_THREADED, $viewMode == self::VIEW_THREADED?'ReplyViewOptionLink Active':'ReplyViewOptionLink').'&nbsp;&nbsp;|&nbsp;&nbsp;';
+        echo anchor('Flat', $discussionUrl.'?'.self::QUERY_PARAMETER_VIEW.'='.self::VIEW_FLAT, $viewMode == self::VIEW_FLAT?'ReplyViewOptionLink Active':'ReplyViewOptionLink');
+        echo '</span>';
     }
 
     /**
@@ -98,9 +107,9 @@ public function base_Replies_handler($sender, $args){
      * @param $sender
      */
     public function commentModel_afterConstruct_handler(&$sender) {
-        self::log('commentModel_afterConstruct_handler', ['path'=> Gdn::request()->pathAndQuery()]);
-        $viewMode = getIncomingValue(self::QUERY_PARAMETER_VIEW, self::VIEW_FLAT);
-        if($viewMode == self::VIEW_TREE || $viewMode == self::VIEW_THREADED) {
+        $viewMode = self::getViewMode();
+
+        if($viewMode == self::VIEW_THREADED) {
             $sender->orderBy(array('TreeLeft asc', 'DateInserted asc'));
         }
     }
@@ -135,13 +144,8 @@ public function commentModel_deleteComment_handler(&$Sender) {
      }
 
     public function discussionController_BeforeCalculatingOffsetLimit_handler($sender, $args) {
-        if (!Gdn::session()->isValid()) {
-            return;
-        }
-        $viewMode = getIncomingValue(self::QUERY_PARAMETER_VIEW);
-        if(!$viewMode) {
-            return;
-        }
+        $viewMode = self::getViewMode();
+        //  $offsetProvided = $args['OffsetProvided'];
         $discussion = $args['Discussion'];
         $offset = & $args['Offset'];
         $limit = & $args['Limit'];
@@ -152,7 +156,6 @@ public function discussionController_BeforeCalculatingOffsetLimit_handler($sende
         }
 
         if($viewMode === self::VIEW_FLAT) {
-            $offset = 0;
             $enableAutoOffset = false;
         } else {
             // Show all comment on one offset for Tree/Threaded View
@@ -176,7 +179,7 @@ public function discussionController_beforeDiscussionRender_handler($sender, $ar
             return;
         }
 
-        $viewMode = getIncomingValue(self::QUERY_PARAMETER_VIEW, self::VIEW_FLAT);
+        $viewMode = self::getViewMode();
         if($viewMode == self::VIEW_FLAT) {
             return;
         }
@@ -196,32 +199,30 @@ public function base_commentOptions_handler($sender, $args) {
             return;
         }
         $discussion = $sender->data('Discussion');
-        $isClosed = ((int)$discussion->Closed) == 1;
-        if ($isClosed) {
-            return;
-        }
 
         //Check permission
-        if (isset($discussion->PermissionCategoryID)) {
-            $CategoryID = val('PermissionCategoryID', $discussion);
-        } else {
-            $CategoryID = $discussion->CategoryID;
-        }
+        $CategoryID = val('PermissionCategoryID', $discussion)? val('PermissionCategoryID', $discussion):val('CategoryID', $discussion);
+        $userCanClose = CategoryModel::checkPermission($CategoryID, 'Vanilla.Discussions.Close');
+        $userCanComment = CategoryModel::checkPermission($CategoryID, 'Vanilla.Comments.Add');
 
-        // Can the user comment on this category, and is the discussion open for comments?
-        if (!Gdn::Session()->CheckPermission('Vanilla.Comments.Add', TRUE, 'Category', $CategoryID)) {
+        $canAddComment = ($discussion->Closed == '1' && $userCanClose) || ($discussion->Closed == '0' && $userCanComment);
+        if (!$canAddComment) {
             return;
         }
+        // Can the user comment on this category, and is the discussion open for comments?
+       // if (!Gdn::Session()->CheckPermission('Vanilla.Comments.Add', TRUE, 'Category', $CategoryID)) {
+       //     return;
+       // }
 
         $options = &$args['CommentOptions'];
-        $comment = &$args['Comment'];
+        $comment = $args['Comment'];
         $options['ReplyToComment'] = [
             'Label' => t('Reply'),
             'Url' => '/?ParentCommentID='.$comment->CommentID,
             'Class' => 'ReplyComment'
         ];
 
-        $viewMode = getIncomingValue(self::QUERY_PARAMETER_VIEW, self::VIEW_FLAT);
+        $viewMode = self::getViewMode();
         foreach ($options as $key => $value) {
             $currentUrl =  $options[$key]['Url'];
             if (strpos($currentUrl, '?') !== false ) {
@@ -236,26 +237,70 @@ public function base_commentOptions_handler($sender, $args) {
         }
     }
 
+    /**
+     * Add 'Reply' option to discussion.
+     *
+     * @param Gdn_Controller $sender
+     * @param array $args
+     */
+    public function base_inlineDiscussionOptions_handler($sender, $args) {
+        $discussion = $args['Discussion'];
+        if (!$discussion) {
+            return;
+        }
+
+        if (!Gdn::session()->UserID) {
+            return;
+        }
+
+        //Check permission
+        $CategoryID = val('PermissionCategoryID', $discussion)? val('PermissionCategoryID', $discussion):val('CategoryID', $discussion);
+        $userCanClose = CategoryModel::checkPermission($CategoryID, 'Vanilla.Discussions.Close');
+        $userCanComment = CategoryModel::checkPermission($CategoryID, 'Vanilla.Comments.Add');
+
+        // See  the 'writeCommentForm' method vanilla/applications/vanilla/views/discussion/helper_functions.php
+        $canAddComment = ($discussion->Closed == '1' && $userCanClose) || ($discussion->Closed == '0' && $userCanComment);
+        if (!$canAddComment) {
+            return;
+        }
+
+        // DropdownModule options
+        $options = & $args['DiscussionOptions'];
+        $options->addLink('Reply', url("/", true), 'reply', 'ReplyComment');
+    }
+
     /**
      * Insert the indentation classes into the comment.
+     * All rendering options should be set before displaying comments
      * @param $sender
      * @param $args
      */
     public function base_beforeCommentDisplay_handler($sender, $args) {
-        ReplyToPlugin::log('base_beforeCommentDisplay_handler', []);
-
-        $viewMode = getIncomingValue(self::QUERY_PARAMETER_VIEW, self::VIEW_FLAT);
-        if($viewMode == self::VIEW_FLAT) {
-           return;
-        }
         if($sender->deliveryType() != DELIVERY_TYPE_ALL) {
-            ReplyToPlugin::log('base_beforeCommentDisplay_handler', ['']);
-            $this->buildCommentReplyToCssClasses($sender);
+            // Ajax request to post new comments or update comments
+            if(isset($_SERVER['HTTP_REFERER'])) {
+                $previous = $_SERVER['HTTP_REFERER'];
+                $query = parse_url($previous, PHP_URL_QUERY);
+                parse_str($query, $params);
+                $viewMode = $params['view'];
+                if(!$viewMode) {
+                    $viewMode = self::isPagingUrl($previous) ? self::VIEW_FLAT : self::VIEW_THREADED;
+                }
+                $sender->setData('ViewMode', $viewMode);
+                if($viewMode == self::VIEW_THREADED) {
+                    $this->buildCommentReplyToCssClasses($sender);
+                }
+            }
+        } else {
+            $viewMode = self::getViewMode();
+            if($viewMode == self::VIEW_THREADED) {
+                $this->buildCommentReplyToCssClasses($sender);
+            }
         }
         $comment = &$args['Comment'];
         $cssClass = &$args['CssClass'];
-        $displayBody = &$args['DisplayBody'];
-        $displayBody = $viewMode == self::VIEW_FLAT || $viewMode == self::VIEW_THREADED;
+        // $displayBody = &$args['DisplayBody'];
+        // $displayBody = $viewMode == self::VIEW_FLAT || $viewMode == self::VIEW_THREADED;
         $cssClass .= (!empty($comment->ReplyToClass)? ' ' . $comment->ReplyToClass : '');
     }
 
@@ -330,6 +375,19 @@ private function buildCommentReplyToCssClasses(&$sender){
         }
     }
 
+    private static function isPagingUrl($url) {
+        return preg_match('/\/p\d+$/', $url);
+    }
+
+    private static function getViewMode(){
+        $viewMode = getIncomingValue(self::QUERY_PARAMETER_VIEW);
+        if(!$viewMode) {
+            $viewMode = self::isPagingUrl(Gdn::request()->path())? self::VIEW_FLAT: self::VIEW_THREADED;
+        }
+
+        return $viewMode;
+    }
+
     public static function log($message, $data) {
         if (c('Debug')) {
             Logger::event(