Merge branch '5.1.x' of github.com:baserproject/basercms into 5.1.x

Author: ryuring

.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
   test:
     name: Unit Test
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       matrix:

README.md

@@ -12,7 +12,7 @@
     </a>
 </p>
 
-baserCMS is a website development framework with WebAPI that runs on PHP8 and CakePHP4.
+baserCMS is a website development framework with WebAPI that runs on PHP8 and CakePHP5.
 
 The plugins such as "Mail Forms" and "Blogs", which are the minimum required for the Website, are equipped from the beginning as "Core Plugins", and a mechanism is provided to centrally manage those "Contents". The management system also has a tree-like display that makes it easy to understand the site structure, and intuitive operation is possible. It also has a REST API and "Custom Content", and can also be used as a "Headless CMS".
 

plugins/baser-core/src/Controller/AppController.php

@@ -178,8 +178,8 @@ public function beforeFilter(EventInterface $event)
                     }
                     $url = Configure::read("BcPrefixAuth.{$prefix}.loginRedirect");
                 } else {
-                    $url = Router::url(Configure::read("BcPrefixAuth.{$prefix}.loginAction"))
-                        . '?redirect=' . urlencode(Router::url());
+                    $url = Router::url(Configure::read("BcPrefixAuth.{$prefix}.loginAction"), true)
+                        . '?redirect=' . rawurlencode($this->getRequest()->getPath());
                 }
                 return $this->redirect($url);
             }

plugins/baser-core/src/Controller/UploadsController.php

@@ -102,10 +102,13 @@ protected function output($args, $funcNum)
             unlink($path);
         }
 
-        if ($ext !== 'gif' && $ext !== 'jpg' && $ext !== 'png') {
-            Header("Content-disposition: attachment; filename=" . $name);
+        $response = $this->getResponse()
+            ->withHeader('Content-type', sprintf('%s; name=%s', $type, $name))
+            ->withStringBody($data);
+        if($ext !== 'gif' && $ext !== 'jpg' && $ext !== 'png') {
+            $response = $response->withHeader('Content-disposition', sprintf('attachment; filename=%s', $name));
         }
-        Header("Content-type: " . $type . "; name=" . $name);
+        $this->setResponse($response);
         return $data;
     }
 

plugins/baser-core/src/Service/Admin/ContentsAdminService.php

@@ -79,7 +79,7 @@ protected function _isAvailablePreview($content)
     protected function _isAvailableDelete($content)
     {
         if(!BcUtil::loginUser()->user_groups) return false;
-        $path = BcUtil::getPrefix() . 'baser-core/contents/delete';
+        $path = BcUtil::getPrefix() . '/baser-core/contents/delete';
         $userGroupIds = Hash::extract(BcUtil::loginUser()->user_groups, '{n}.id');
         $service = $this->getService(PermissionsServiceInterface::class);
         return ($content->id && $service->check($path, $userGroupIds) && !$content->site_root);

plugins/baser-core/src/TestSuite/BcTestCase.php

@@ -165,8 +165,14 @@ public function setUp(): void
     public function classMethod()
     {
         $test = $this->provides()[0];
+        $contents = ob_get_contents();
+        if (ob_get_level() > 0) {
+            ob_end_clean();
+        }
         echo "\n" . $test->getTarget() . ' ';
-        ob_end_flush();
+        if($contents) {
+            echo $contents;
+        }
         ob_start();
     }
 

plugins/baser-core/src/Utility/BcUtil.php

@@ -25,7 +25,6 @@
 use Cake\Core\Plugin;
 use Cake\Core\Configure;
 use Cake\Database\Exception\MissingConnectionException;
-use Cake\Event\EventListenerInterface;
 use Cake\Event\EventManagerInterface;
 use Cake\Http\ServerRequest;
 use Cake\Http\UriFactory;

plugins/baser-core/src/View/Helper/BcBaserHelper.php

@@ -1281,18 +1281,18 @@ public function pagination($name = 'default', $data = [], $options = [])
     public function content()
     {
         /*** contentHeader ***/
-        $this->dispatchLayerEvent('contentHeader', null, ['layer' => 'View', 'class' => '', 'plugin' => '']);
+        $this->dispatchLayerEvent('contentHeader', [], ['layer' => 'View', 'class' => '', 'plugin' => '']);
 
         /*** Controller.contentHeader ***/
-        $this->dispatchLayerEvent('contentHeader', null, ['layer' => 'View', 'class' => $this->getView()->getName()]);
+        $this->dispatchLayerEvent('contentHeader', [], ['layer' => 'View', 'class' => $this->getView()->getName()]);
 
         echo $this->getView()->fetch('content');
 
         /*** contentFooter ***/
-        $this->dispatchLayerEvent('contentFooter', null, ['layer' => 'View', 'class' => '', 'plugin' => '']);
+        $this->dispatchLayerEvent('contentFooter', [], ['layer' => 'View', 'class' => '', 'plugin' => '']);
 
         /*** Controller.contentFooter ***/
-        $this->dispatchLayerEvent('contentFooter', null, ['layer' => 'View', 'class' => $this->getView()->getName()]);
+        $this->dispatchLayerEvent('contentFooter', [], ['layer' => 'View', 'class' => $this->getView()->getName()]);
     }
 
     /**

plugins/baser-core/src/View/Helper/BcContentsHelper.php

@@ -141,11 +141,13 @@ public function setup()
                 if (!empty($item['routes'][$method])) {
                     $route = $item['routes'][$method];
                     $item['url'][$method] = Router::url($route);
+                    $item['permissionCheckUrl'][$method] = Router::url([...$route, '_base' => false]);
                 }
             }
             // disabled
             if (!empty($item['url']['add'])) {
-                $item['addDisabled'] = !($this->PermissionsService->check($item['url']['add'], Hash::extract($user->user_groups, '{n}.id')));
+                $item['addDisabled'] = !($this->PermissionsService->check($item['permissionCheckUrl']['add'],
+                    Hash::extract($user->user_groups, '{n}.id')));
             } else {
                 $item['addDisabled'] = true;
             }
@@ -167,10 +169,10 @@ public function setup()
     public function isActionAvailable($type, $action, $entityId): bool
     {
         $user = BcUtil::loginUser();
-        if (!isset($this->getConfig('items')[$type]['url'][$action])) {
+        if (!isset($this->getConfig('items')[$type]['permissionCheckUrl'][$action])) {
             return false;
         }
-        $url = $this->getConfig('items')[$type]['url'][$action] . '/' . $entityId;
+        $url = $this->getConfig('items')[$type]['permissionCheckUrl'][$action] . '/' . $entityId;
         if (isset($user->user_groups)) {
             $userGroups = $user->user_groups;
             $userGroupIds = [];

plugins/baser-core/src/View/Helper/BcCsvHelper.php

@@ -12,6 +12,7 @@
 namespace BaserCore\View\Helper;
 
 use BaserCore\Event\BcEventDispatcherTrait;
+use BaserCore\Utility\BcUtil;
 use Cake\View\Helper;
 use BaserCore\Annotation\UnitTest;
 use BaserCore\Annotation\NoTodo;
@@ -209,7 +210,7 @@ protected function _perseValue($data)
      */
     public function download($fileName, $debug = false)
     {
-        if (!$debug) {
+        if (!$debug && !BcUtil::isTest()) {
             for($i = 0; $i < ob_get_level(); $i++) {
                 ob_end_flush();
             }