Merge branch 'develop' of github.com:topcoder-platform/forums into develop

Author: jmgasper

config/vanilla/config.php

@@ -4,6 +4,7 @@
 // Embed
 $Configuration['Garden']['Embed']['Allow'] = true;
 $Configuration['Garden']['Embed']['ForceForum'] = false;
+$Configuration['Garden']['Embed']['RemoteUrl'] = getenv('VANILLA_ENV') === 'prod'? 'https://platform.topcoder.com':'https://platform.topcoder-dev.com';
 // Trusted Domains. Specify one domain per line; use * for wildcard matches
 $Configuration['Garden']['TrustedDomains'] = '*.topcoder-dev.com
 *.topcoder.com';

vanilla/applications/dashboard/controllers/class.entrycontroller.php

@@ -375,7 +375,11 @@ protected function checkOverride($type, $target, $transientKey = null) {
             // FIX: micro-frontends-forums-app issues-12
             $isEmbedded = (bool)  c('Garden.Embed.Allow',false);
             $remoteUrl = c("Garden.Embed.RemoteUrl");
-            if($isEmbedded && is_string( $remoteUrl)) {
+
+            // FIX Issues-681: signing from Forum
+            //$forceEmbed = $this->Request->get('Source', '') != 'forum';
+            $referer = $_SERVER['HTTP_REFERER'];
+            if($isEmbedded && is_string( $remoteUrl) && $referer != '' && strpos($referer, $remoteUrl) !== false) {
                 $targetUrl = rawurlencode($remoteUrl.'/#'.url($target));
             } else {
                 $targetUrl = rawurlencode(url($target, true));

vanilla/applications/vanilla/controllers/class.vanillacontroller.php

@@ -96,15 +96,13 @@ protected function buildBreadcrumbs($CategoryID) {
         $ancestors = CategoryModel::getAncestors($CategoryID);
         $parentCategoryID = val('ParentCategoryID', $Category);
         // FIX https://github.com/topcoder-platform/forums/issues/648
-
         $showFullBreadcrumbs = true;
         $this->EventArguments['ShowFullBreadcrumbs'] = & $showFullBreadcrumbs;
         $this->fireEvent('BeforeBuildBreadcrumbs');
-        // getIncomingValue('embed_type') == 'mfe'
         if(!$showFullBreadcrumbs) {
            $temp = [];
           if(val('GroupID', $Category) > 0) {
-            $GroupCategoryID =  $this->data('Breadcrumbs.Options.GroupCategoryID');
+            $GroupCategoryID =  $this->data('BreadcrumbsOptionsGroupCategoryID');
             foreach ($ancestors as $id => $ancestor) {
                 if($GroupCategoryID == $ancestor['CategoryID']) {// root category for a group
                    array_push($temp,  ['Name' => $ancestor['Name'], 'Url'=>'/group/'.$ancestor['GroupID']]);
@@ -113,17 +111,14 @@ protected function buildBreadcrumbs($CategoryID) {
                 }
             }
           }
-          if(count($temp) == 1) {
-              return [];
-          }
           return $temp;
         } else {
 
             if (val('GroupID', $Category) > 0) {
                 $challenge = $this->data('Challenge');
                 $track = $challenge ? $challenge['Track'] : false;
                 $temp = [];
-                $GroupCategoryID = $this->data('Breadcrumbs.Options.GroupCategoryID');
+                $GroupCategoryID = $this->data('BreadcrumbsOptionsGroupCategoryID');
                 foreach ($ancestors as $id => $ancestor) {
                     if ($ancestor['GroupID'] > 0) {
                         if ($GroupCategoryID == $ancestor['CategoryID']) {// root category for a group

vanilla/library/core/functions.render.php

@@ -1729,7 +1729,8 @@ function signInUrl($target = '', $force = false) {
             $target = '' ;
        }
 
-        return '/entry/signin'.($target ? '?Target='.urlencode($target) : '');
+        // FIX Issues-681: signing from Forum
+        return '/entry/signin'.($target ? '?Source=forum&Target='.urlencode($target) : '?Source=forum');
     }
 }