Merge branch 'develop'

Author: jmgasper

.circleci/config.yml

@@ -29,7 +29,7 @@ builddeploy_steps: &builddeploy_steps
       - run: *install_dependency
       - run: *install_deploysuite
       #- restore_cache: *restore_cache_settings_for_build
-      - run: ./build.sh ${APPNAME} ${CI_DEPLOY_TOKEN}
+      - run: ./build.sh ${APPNAME} ${CI_DEPLOY_TOKEN} ${LOGICAL_ENV}
       #- save_cache: *save_cache_settings
       - deploy:
           name: Running MasterScript.

Dockerfile

@@ -2,6 +2,8 @@ FROM webdevops/php-apache
 
 ARG CI_DEPLOY_TOKEN
 ARG VANILLA_VERSION=3.3
+ARG ENV
+
 ENV WEB_DOCUMENT_ROOT /vanillapp
 
 # Get the latest release of Vanilla Forums
@@ -14,6 +16,12 @@ RUN chmod -R 777 /vanillapp
 RUN rm -R /vanillapp/plugins/stubcontent
 # Clone the forum-plugins repository
 RUN git clone https://github.com/topcoder-platform/forums-plugins.git /tmp/forums-plugins
+
+# Remove SqlPlugin from PROD env
+RUN if [ "$ENV" = "prod" ]; \
+    then rm -R /tmp/forums-plugins/DebugPlugin; \
+    fi
+
 # Copy the Filestack plugin
 RUN git clone https://${CI_DEPLOY_TOKEN}@github.com/topcoder-platform/forums-filestack-plugin /tmp/forums-plugins/Filestack
 
@@ -45,4 +53,4 @@ COPY ./vanilla/. /vanillapp/.
 RUN chown application:application /vanillapp/conf/config.php
 RUN chmod ug=rwx,o=rx /vanillapp/conf/config.php
 # Clone the forum-theme repository
-RUN git clone 'https://github.com/topcoder-platform/forums-theme.git' /vanillapp/themes/topcoder-theme
+RUN git clone 'https://github.com/topcoder-platform/forums-theme.git' /vanillapp/themes/topcoder

README.md

@@ -29,3 +29,7 @@ installation.These variables are mandatory.
 ## Setup Vanilla Forums 
 
 Go to [Setup Vanilla Forums](./docs/SetupVanillaForums.md) to complete installation.
+
+## Build Vanilla Forums
+
+Go to [Build Vanilla Forums](./docs/BuildVanillaForums.md) to install dependencies and build assets. 

build.sh

@@ -2,7 +2,8 @@
 set -eo pipefail
 APP_NAME=$1
 CI_DEPLOY_TOKEN=$2
+ENV=$3
 UPDATE_CACHE=""
 echo "" > vanilla.env
-CI_DEPLOY_TOKEN=$CI_DEPLOY_TOKEN docker-compose -f docker-compose.yml build $APP_NAME
+ENV=$ENV CI_DEPLOY_TOKEN=$CI_DEPLOY_TOKEN docker-compose -f docker-compose.yml build $APP_NAME
 #docker create --name app $APP_NAME:latest

config/vanilla/bootstrap.before.php

@@ -263,8 +263,8 @@ function _formatStringCallback($match, $setArgs = false) {
                             // Manually build instead of using userAnchor() because of special 'You' case.
                             if(function_exists('topcoderRatingCssClass') &&
                                 function_exists('topcoderRoleCssStyles')) {
-                                $ratingCssClass = topcoderRatingCssClass($user->Name);
-                                $roleCssClass = topcoderRoleCssStyles($user->Name);
+                                $ratingCssClass = topcoderRatingCssClass($user);
+                                $roleCssClass = topcoderRoleCssStyles($user);
                                 $topcoderStyles =$ratingCssClass.' '.$roleCssClass;
                                 $result = anchor(htmlspecialchars($name), userUrl($user), $topcoderStyles);
                             } else {
@@ -362,13 +362,15 @@ function watchButton($categoryID) {
     /**
      * Check group permission for the current user
      * @param $groupID
-     * @param null $permission  null - any permission for a group
+     * @param null $category
+     * @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,$permission = null, $fullMatch = true) {
+   function checkGroupPermission($groupID, $category = null , $permissionCategoryID = null , $permission = null, $fullMatch = true) {
        $groupModel = new GroupModel();
-       return $groupModel->checkPermission(Gdn::session()->UserID,$groupID, $permission, $fullMatch);
+       return $groupModel->checkPermission(Gdn::session()->UserID,$groupID, $category,$permissionCategoryID , $permission, $fullMatch);
    }
 }
 
@@ -744,3 +746,57 @@ function filtersDropDown($baseUrl, array $filters = [], $extraClasses = '', $def
         return $output;
     }
 }
+
+if (!function_exists('filterCountString')) {
+    /**
+     * This function was moved from 'vanilla/applications/vanilla/views/modules/discussionfilter.php'
+     * @param $count
+     * @param string $url
+     * @param array $options
+     * @return string
+     */
+    function filterCountString($count, $url = '', $options = []) {
+        $count = countString($count, $url, $options);
+        return $count != '' ? '<span class="Aside">'.$count.'</span>' : '';
+    }
+}
+
+if (!function_exists('myBookmarksMenuItem')) {
+    /**
+     *
+     *
+     * @param $CountBookmarks
+     * @return string
+     */
+    function myBookmarksMenuItem($CountBookmarks) {
+        if (!Gdn::session()->isValid()) {
+            return '';
+        }
+        $Bookmarked = t('My Bookmarks');
+        $Bookmarked .= FilterCountString($CountBookmarks, '/discussions/UserBookmarkCount');
+        $cssClass = 'MyBookmarks';
+        $cssClass .= Gdn::controller()->RequestMethod == 'bookmarked' ? ' Active' : '';
+        $cssClass .= $CountBookmarks == 0 && Gdn::controller()->RequestMethod != 'bookmarked' ? ' hidden': '';
+        return sprintf('<li id="MyBookmarks" class="%s">%s</li>', $cssClass, anchor(sprite('SpBookmarks').$Bookmarked, '/discussions/bookmarked'));
+    }
+}
+
+if (!function_exists('myDraftsMenuItem')) {
+    /**
+     *
+     *
+     * @param $CountDrafts
+     * @return string
+     */
+    function myDraftsMenuItem($CountDrafts) {
+        if (!Gdn::session()->isValid()) {
+            return '';
+        }
+        $Drafts = t('My Drafts');
+        $Drafts .= FilterCountString($CountDrafts, '/drafts');
+        $cssClass = 'MyDrafts';
+        $cssClass .= Gdn::controller()->ControllerName == 'draftscontroller' ? ' Active' : '';
+        $cssClass .= $CountDrafts == 0 ? ' hidden': '';
+        return sprintf('<li id="MyDrafts" class="%s">%s</li>', $cssClass, anchor(sprite('SpMyDrafts').$Drafts, '/drafts'));
+    }
+}

config/vanilla/config.php

@@ -8,8 +8,9 @@
 $Configuration['Database']['Password'] = getenv('MYSQL_ROOT_PASSWORD');
 
 // Cache
-$Configuration['Cache']['Enabled'] = getenv('CACHE_ENABLED');
+$Configuration['Cache']['Enabled'] = strtolower(getenv('CACHE_ENABLED')) === "true";
 $Configuration['Cache']['Method'] = getenv('CACHE_METHOD');
+$Configuration['Cache']['Memcached']['Store']=[getenv('MEMCACHED_SERVER')];
 
 // Conversations
 $Configuration['Conversations']['Version'] = '3.0';
@@ -56,14 +57,14 @@
 $Configuration['Garden']['Email']['SmtpPort'] = getenv('MAIL_SMTP_PORT');
 $Configuration['Garden']['Email']['SmtpSecurity'] = getenv('MAIL_SMTP_SECURITY');
 $Configuration['Garden']['UpdateToken'] = '105e786dc643fd20143d3c137b593af168560c13';
-$Configuration['Garden']['InputFormatter'] = 'Markdown';
+$Configuration['Garden']['InputFormatter'] = 'Rich';
 $Configuration['Garden']['Version'] = 'Undefined';
 $Configuration['Garden']['CanProcessImages'] = true;
-$Configuration['Garden']['Theme'] = 'topcoder-theme';
-$Configuration['Garden']['MobileTheme'] = 'topcoder-theme';
+$Configuration['Garden']['Theme'] = 'topcoder';
+$Configuration['Garden']['MobileTheme'] = 'topcoder';
 $Configuration['Garden']['Profile']['EditPhotos'] = false;
 $Configuration['Garden']['SystemUserID'] = '1';
-$Configuration['Garden']['MobileInputFormatter'] = 'Markdown';
+$Configuration['Garden']['MobileInputFormatter'] = 'Rich';
 $Configuration['Garden']['AllowFileUploads'] = true;
 $Configuration['Garden']['EditContentTimeout'] = -1;
 $Configuration['Garden']['Profile']['EditPhotos'] = false;
@@ -144,8 +145,6 @@
 $Configuration['Vanilla']['EnableCategoryFollowing'] = true;
 $Configuration['Vanilla']['Version'] = '3.0';
 
-// memcached
-$Configuration['memcached']['Store'] = getenv('MEMCACHED_SERVER');
 
 // Initial setup config
 
@@ -181,4 +180,12 @@
 $Configuration['Vanilla']['Activity']['SpamLock'] = '120';
 $Configuration['Vanilla']['ActivityComment']['SpamCount'] = '5';
 $Configuration['Vanilla']['ActivityComment']['SpamTime'] = '60';
-$Configuration['Vanilla']['ActivityComment']['SpamLock'] = '120';
+$Configuration['Vanilla']['ActivityComment']['SpamLock'] = '120';
+
+// Posting Settings:
+//    Should users be automatically pushed to the last comment they read in a discussion?
+$Configuration['Vanilla']['Comments']['AutoOffset'] = false;
+//    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;

docker-compose.dev.yml

@@ -12,4 +12,10 @@ services:
     command: --default-authentication-plugin=mysql_native_password
   vanilla-forums:
     links:
-      - mysql-local
+      - mysql-local
+      - memcached-local
+  memcached-local:
+    image: memcached:1.5
+    container_name: memcached-local
+    ports:
+      - "11211:11211"

docker-compose.yml

@@ -8,6 +8,7 @@ services:
     build:
       context: .
       args:
+        - ENV
         - VANILLA_VERSION=3.3
         - CI_DEPLOY_TOKEN
     ports:

docs/BuildVanillaForums.md

@@ -0,0 +1,57 @@
+# Build Vanilla Forums
+
+Vanilla Forums has pre-built frontend assets (js, css and addons assets).
+
+The full source code of Vanilla  Forums is available as a Git repository:
+
+https://github.com/vanilla/vanilla/tree/Vanilla_3.3.
+
+## Requirements
+
+- Node.js “>=8.0.0 <12.0.0”
+- PHP 7.2 - 7.4 (as of Vanilla 3.3)
+- Yarn
+- Composer 
+
+## Installing yarn
+
+Install yarn:
+ 
+`npm install -g yarn`
+
+## Installing composer
+
+Install composer:
+
+`php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"`
+
+`php -r "if (hash_file('sha384', 'composer-setup.php') === '756890a4488ce9024fc62c56153228907f1545c228516cbf63f885e036d37e9a59d27d63f46af1d4d07ee0f76181c7d3') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;"`
+
+`php composer-setup.php`
+
+`php -r "unlink('composer-setup.php');"`
+
+
+## Building Frontend assets
+ 
+1.Clone or download a repo. Go to the root folder: 
+cd `Vanilla_3.3`
+
+2.The 'forum' repo overrides Vanilla files. 
+Copy 'forums/vanilla' to `Vanilla_3.3`.
+
+3.Run the command to install dependencies and build:
+`composer install or php composer.phar install`
+
+You should see output 
+
+![./images/build.png](./images/build.png)
+
+
+4.Copy all files from the 'dist' folder to 'forums/vanilla/dist' (the 'forums' repo). 
+
+Notes:
+The first time you run this, it may take a while. Subsequent runs should be faster, but if you are constantly 
+updating the javascript or CSS or addons or themes, it's recommended to use the developer build.
+
+`yarn build:dev`