Merge branch 'evolution-cms:3.2.x' into 3.2.x

Author: elcreator

core/src/Core.php

@@ -9,6 +9,7 @@
 use EvolutionCMS\Models\ActiveUserSession;
 use EvolutionCMS\Models\DocumentGroup;
 use EvolutionCMS\Models\EventLog;
+use EvolutionCMS\Models\MembergroupAccess;
 use EvolutionCMS\Models\MembergroupName;
 use EvolutionCMS\Models\SiteContent;
 use EvolutionCMS\Models\SitePlugin;
@@ -5173,12 +5174,16 @@ public function getWebUserInfo($uid)
     public function getUserDocGroups($resolveIds = false)
     {
         $context = $this->getContext();
-        if (isset($_SESSION[$context . 'Docgroups']) && isset($_SESSION[$context . 'Validated'])) {
+
+        if ($context == 'web' && isset($_SESSION['mgrValidated']) && (isset($_SESSION['mgrRole']) && $_SESSION['mgrRole'] == 1)) {
+            $dg = MembergroupAccess::pluck('documentgroup')->toArray();
+        } elseif (isset($_SESSION[$context . 'Docgroups']) && isset($_SESSION[$context . 'Validated'])) {
             $dg = $_SESSION[$context . 'Docgroups'];
             $dgn = isset($_SESSION[$context . 'DocgrpNames']) ? $_SESSION[$context . 'DocgrpNames'] : false;
         } else {
             $dg = '';
         }
+
         if (!$resolveIds) {
             return $dg;
         }

core/src/Models/SiteContent.php

@@ -2067,8 +2067,8 @@ public function scopeWithoutProtected($query)
     {
         $query->leftJoin('document_groups', 'document_groups.document', '=', 'site_content.id');
         $query->where(function($query){
-            $docgrp = EvolutionCMS()->getUserDocGroups();
-            if (EvolutionCMS()->isFrontend()) {
+            $docgrp = evo()->getUserDocGroups();
+            if (evo()->isFrontend()) {
                 $query->where('privateweb', 0);
             } else {
                 $query->whereRaw("1 = {$_SESSION['mgrRole']}");

index.php

@@ -108,19 +108,16 @@
     define('MODX_CLI', false);
 }
 
-// initiate a new document parser
-$modx = evolutionCMS();
-
-// set some parser options
-$modx->minParserPasses = 1; // min number of parser recursive loops or passes
-$modx->maxParserPasses = 10; // max number of parser recursive loops or passes
-$modx->dumpSQL = false;
-$modx->dumpSnippets = false; // feed the parser the execution start time
-$modx->dumpPlugins = false;
-$modx->mstart = $mstart;
+// Initiate a new document parser
+evo()->minParserPasses = 1; // min number of parser recursive loops or passes
+evo()->maxParserPasses = 10; // max number of parser recursive loops or passes
+evo()->dumpSQL = false;
+evo()->dumpSnippets = false; // feed the parser the execution start time
+evo()->dumpPlugins = false;
+evo()->mstart = $mstart;
 
 // Debugging mode:
-$modx->stopOnNotice = false;
+evo()->stopOnNotice = false;
 
 // Don't show PHP errors to the public
 if (!isset($_SESSION['mgrValidated']) || !$_SESSION['mgrValidated']) {
@@ -132,7 +129,7 @@
     @ini_set('max_execution_time', 0);
 }
 
-// execute the parser if index.php was not included
+// Execute the parser if index.php was not included
 if (!MODX_API_MODE && !MODX_CLI) {
-    $modx->processRoutes();
+    evo()->processRoutes();
 }