Merge branch 'develop'

Author: jmgasper

Dockerfile

@@ -31,6 +31,9 @@ RUN git clone https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-gro
 #Copy the SumoLogic plugin
 RUN git clone https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-sumologic-plugin /tmp/forums-plugins/Sumologic
 
+#Copy the TopcoderEditor plugin
+RUN git clone https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-topcoder-editor-plugin /tmp/forums-plugins/TopcoderEditor
+
 # Copy all plugins to the Vanilla plugins folder
 RUN cp -r /tmp/forums-plugins/. /vanillapp/plugins
 
@@ -45,6 +48,8 @@ RUN composer install --working-dir /vanillapp/plugins/Topcoder
 RUN composer install --working-dir /vanillapp/plugins/Filestack
 # Install Groups dependencies
 RUN composer install --working-dir /vanillapp/plugins/Groups
+# Install TopcoderEditor dependencies
+RUN composer install --working-dir /vanillapp/plugins/TopcoderEditor
 # Copy Vanilla configuration files
 COPY ./config/vanilla/. /vanillapp/conf/.
 # Copy Topcoder Vanilla files

config/vanilla/bootstrap.before.php

@@ -307,12 +307,16 @@ function dateUpdated($row, $wrap = null) {
             $dateUpdatedFormatted = Gdn::getContainer()->get(DateTimeFormatter::class)->formatDate($dateUpdated, false, DateTimeFormatter::FORCE_FULL_FORMAT);
             if ($updateUser) {
                 $title = sprintf(t('Edited %s by %s.'), $dateUpdatedFormatted, val('Name', $updateUser));
+                $link = userAnchor($updateUser);
+                $text =  sprintf(t('edited %s by %s'), $dateUpdatedFormatted, $link);
             } else {
                 $title = sprintf(t('Edited %s.'), $dateUpdatedFormatted);
+                $text = sprintf(t('edited %s'), $dateUpdatedFormatted);
             }
 
             $result = ' <span title="'.htmlspecialchars($title).'" class="DateUpdated">'.
-                sprintf(t('edited %s'), $dateUpdatedFormatted).'</span> ';
+                $text.'</span> ';
+
             if ($wrap) {
                 $result = $wrap[0].$result.$wrap[1];
             }
@@ -360,17 +364,18 @@ function watchButton($categoryID) {
 
 if (!function_exists('checkGroupPermission')) {
     /**
-     * Check group permission for the current user
+     * Check group permission for an user
+     * @param $userID
      * @param $groupID
-     * @param null $category
+     * @param null $categoryID
      * @param null $permissionCategoryID
      * @param null $permission null - any permission for a group
      * @param bool $fullMatch
      * @return bool return true if user has a permission
      */
-   function checkGroupPermission($groupID, $category = null , $permissionCategoryID = null , $permission = null, $fullMatch = true) {
+   function checkGroupPermission($userID,$groupID, $categoryID = null , $permissionCategoryID = null , $permission = null, $fullMatch = true) {
        $groupModel = new GroupModel();
-       return $groupModel->checkPermission(Gdn::session()->UserID,$groupID, $category,$permissionCategoryID , $permission, $fullMatch);
+       return $groupModel->checkPermission($userID,$groupID, $categoryID,$permissionCategoryID , $permission, $fullMatch);
    }
 }
 

config/vanilla/config.php

@@ -25,6 +25,7 @@
 $Configuration['EnabledPlugins']['GettingStarted'] = 'GettingStarted';
 $Configuration['EnabledPlugins']['stubcontent'] = false;
 $Configuration['EnabledPlugins']['Topcoder'] = true;
+$Configuration['EnabledPlugins']['TopcoderEditor'] = true;
 $Configuration['EnabledPlugins']['rich-editor'] = true;
 $Configuration['EnabledPlugins']['editor'] = false;
 $Configuration['EnabledPlugins']['emojiextender'] = true;
@@ -57,14 +58,15 @@
 $Configuration['Garden']['Email']['SmtpPort'] = getenv('MAIL_SMTP_PORT');
 $Configuration['Garden']['Email']['SmtpSecurity'] = getenv('MAIL_SMTP_SECURITY');
 $Configuration['Garden']['UpdateToken'] = '105e786dc643fd20143d3c137b593af168560c13';
-$Configuration['Garden']['InputFormatter'] = 'Rich';
+$Configuration['Garden']['InputFormatter'] = 'Markdown';
+$Configuration['Garden']['MobileInputFormatter'] = 'Markdown';
+$Configuration['Garden']['ForceInputFormatter'] = false;
 $Configuration['Garden']['Version'] = 'Undefined';
 $Configuration['Garden']['CanProcessImages'] = true;
 $Configuration['Garden']['Theme'] = 'topcoder';
 $Configuration['Garden']['MobileTheme'] = 'topcoder';
 $Configuration['Garden']['Profile']['EditPhotos'] = false;
 $Configuration['Garden']['SystemUserID'] = '1';
-$Configuration['Garden']['MobileInputFormatter'] = 'Rich';
 $Configuration['Garden']['AllowFileUploads'] = true;
 $Configuration['Garden']['EditContentTimeout'] = -1;
 $Configuration['Garden']['Profile']['EditPhotos'] = false;
@@ -188,4 +190,12 @@
 //    Maximum number of characters allowed in a comment
 $Configuration['Vanilla']['Comment']['MaxLength'] = 16000;
 //    Minimum comment length to discourage short comments
-$Configuration['Vanilla']['Comment']['MinLength'] = 2;
+$Configuration['Vanilla']['Comment']['MinLength'] = 2;
+
+// File handling.
+$Configuration['Garden']['Upload']['MaxFileSize'] = '5M';
+$Configuration['Garden']['Upload']['AllowedFileExtensions'] = [
+    'txt', 'jpg', 'jpeg', 'gif', 'png', 'bmp', 'tiff', 'ico', 'zip', 'gz', 'tar.gz', 'tgz', 'psd', 'ai', 'pdf', 'doc', 'xls', 'ppt', 'docx', 'xlsx', 'pptx', 'log', 'rar', '7z', 'xml', 'json'
+];
+// Allow "target='_blank'" for Markdown format;
+$Configuration['Garden']['Html']['BlockedAttributes']='on*, download';

vanilla/applications/dashboard/controllers/api/MediaApiController.php

@@ -95,10 +95,11 @@ public function delete_byUrl(array $query) {
      *
      * @param UploadedFile $upload An object representing an uploaded file.
      * @param string $type The upload type (e.g. "image").
-     * @throws Exception if there was an error encountered when saving the upload.
+     * @param bool $doImageProcessing
      * @return array
+     * @throws Exception if there was an error encountered when saving the upload.
      */
-    private function doUpload(UploadedFile $upload, $type) {
+    private function doUpload(UploadedFile $upload, string $type, bool $doImageProcessing) {
         $file = $upload->getFile();
 
         $media = [
@@ -109,9 +110,11 @@ private function doUpload(UploadedFile $upload, $type) {
             'ForeignTable' => 'embed'
         ];
 
-        switch ($type) {
-            case self::TYPE_IMAGE:
-                [$media['ImageWidth'], $media['ImageHeight']] = $this->preprocessImage($upload);
+        if($doImageProcessing) {
+            switch ($type) {
+                case self::TYPE_IMAGE:
+                    [$media['ImageWidth'], $media['ImageHeight']] = $this->preprocessImage($upload);
+            }
         }
 
         $ext = pathinfo(strtolower($upload->getClientFilename()), PATHINFO_EXTENSION);
@@ -385,10 +388,12 @@ public function post(array $body) {
         $imageExtensions = array_keys(ImageResizer::getExtType());
         /** @var UploadedFile $file */
         $file = $body['file'];
-        $extension = pathinfo($file->getClientFilename(), PATHINFO_EXTENSION) ?? '';
+        $extension = strtolower(pathinfo($file->getClientFilename(), PATHINFO_EXTENSION) ?? '');
         $type = in_array($extension, $imageExtensions) ? self::TYPE_IMAGE : self::TYPE_FILE;
 
-        $row = $this->doUpload($body['file'], $type);
+        $doImageProcessing = $type === self::TYPE_IMAGE && in_array($extension, ['gif', 'jpeg', 'png', 'jpg']);
+
+        $row = $this->doUpload($body['file'], $type, $doImageProcessing);
 
         $row = $this->normalizeOutput($row);
         $result = $out->validate($row);