Merge pull request #1950 from xibosignage/develop

Release 3.3.7

lib/Controller/Campaign.php

@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -319,7 +319,7 @@ public function grid(Request $request, Response $response)
                         'url' => $this->urlFor($request, 'campaign.edit.form', ['id' => $campaign->campaignId]),
                         'text' => __('Edit'),
                     );
-                } else if ($campaign->type === 'ad' && $this->getUser()->featureEnabled('ad.campaigns')) {
+                } else if ($campaign->type === 'ad' && $this->getUser()->featureEnabled('ad.campaign')) {
                     $campaign->buttons[] = [
                         'id' => 'campaign_button_edit',
                         'linkType' => '_self',

lib/Controller/Folder.php

@@ -1,8 +1,8 @@
 <?php
 /*
- * Copyright (c) 2022 Xibo Signage Ltd
+ * Copyright (C) 2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -85,6 +85,7 @@ public function displayPage(Request $request, Response $response)
      */
     public function grid(Request $request, Response $response, $folderId = null)
     {
+        $params = $this->getSanitizer($request->getParams());
         // Should we return information for a specific folder?
         if ($folderId !== null) {
             $folder = $this->folderFactory->getById($folderId);
@@ -99,7 +100,15 @@ public function grid(Request $request, Response $response, $folderId = null)
             // Show a tree view of all folders.
             $rootFolder = $this->folderFactory->getById(1);
             $rootFolder->a_attr['title'] = __('Right click a Folder for further Options');
-            $this->buildTreeView($rootFolder, $this->getUser()->homeFolderId);
+
+            // homeFolderId,
+            // do we show tree for current user
+            // or a specified user?
+            $homeFolderId = ($params->getInt('homeFolderId') !== null)
+                ? $params->getInt('homeFolderId')
+                : $this->getUser()->homeFolderId;
+
+            $this->buildTreeView($rootFolder, $homeFolderId);
             return $response->withJson([$rootFolder]);
         }
     }
@@ -357,7 +366,10 @@ private function decorateWithButtons($folder)
     {
         $user = $this->getUser();
 
-        if ($user->featureEnabled('folder.add') &&  $user->checkViewable($folder)) {
+        if ($user->featureEnabled('folder.add')
+            && $user->checkViewable($folder)
+            && (!$folder->isRoot() || $user->isSuperAdmin())
+        ) {
             $folder->buttons['create'] = true;
         }
 
@@ -430,12 +442,7 @@ public function move(Request $request, Response $response, $folderId)
         }
 
         if ($folder->parentId === $newParentFolder->getId() && $params->getCheckbox('merge') !== 1) {
-            throw new InvalidArgumentException(
-                __(
-                    'This Folder is already a sub-folder of the selected Folder,
-                     if you wish to move its content to the parent Folder, please check the merge checkbox.'
-                )
-            );
+            throw new InvalidArgumentException(__('This Folder is already a sub-folder of the selected Folder, if you wish to move its content to the parent Folder, please check the merge checkbox.'));//phpcs:ignore
         }
 
         // if we need to merge contents of the folder, dispatch an event that will move every object inside the folder

lib/Controller/Library.php

@@ -1034,7 +1034,7 @@ public function delete(Request $request, Response $response, $id)
      *      name="playlistId",
      *      in="formData",
      *      description="A playlistId to add this uploaded media to",
-     *      type="int",
+     *      type="integer",
      *      required=false
      *   ),
      *  @SWG\Parameter(

lib/Controller/User.php

@@ -1,8 +1,8 @@
 <?php
 /*
- * Copyright (C) 2022 Xibo Signage Ltd
+ * Copyright (C) 2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -1910,7 +1910,7 @@ public function permissions(Request $request, Response $response, $entity, $id)
 
             if ($object->canChangeOwner()) {
                 $object->setOwner($ownerId);
-                $object->save(['notify' => false, 'manageDynamicDisplayLinks' => false]);
+                $object->save(['notify' => false, 'manageDynamicDisplayLinks' => false, 'validate' => false]);
             } else {
                 throw new ConfigurationException(__('Cannot change owner on this Object'));
             }

lib/Entity/User.php

@@ -764,7 +764,10 @@ public function save($options = [])
         } else if ($options['passwordUpdate']) {
             $this->updatePassword();
             $this->audit($this->userId, 'User updated password', false);
-        } else if ($this->hash() != $this->hash || $this->hasPropertyChanged('twoFactorRecoveryCodes')) {
+        } else if ($this->hash() != $this->hash
+            || $this->hasPropertyChanged('twoFactorRecoveryCodes')
+            || $this->hasPropertyChanged('password')
+        ) {
             $this->update();
             $this->audit($this->userId, 'User updated');
         }

lib/Factory/DisplayFactory.php

@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -620,7 +620,7 @@ public function query($sortOrder = null, $filterBy = [])
             }
         }
 
-        if (is_array($sortOrder) && ($sortOrder != ['`member`'] && $sortOrder != ['`member` DESC'] )) {
+        if (is_array($sortOrder) && (!in_array('`member`', $sortOrder) && !in_array('`member` DESC', $sortOrder))) {
             $order .= 'ORDER BY ' . implode(',', $sortOrder);
         }
 

lib/Factory/DisplayGroupFactory.php

@@ -1,8 +1,8 @@
 <?php
 /*
- * Copyright (c) 2022 Xibo Signage Ltd
+ * Copyright (C) 2022-2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -463,7 +463,7 @@ public function query($sortOrder = null, $filterBy = [])
         if ($parsedBody->getInt('displayGroupIdMembers') !== null) {
             $members = [];
             foreach ($this->getStore()->select($select . $body, $params) as $row) {
-                $displayGroupId = $parsedBody->getInt($row['displayGroupId']);
+                $displayGroupId = $this->getSanitizer($row)->getInt('displayGroupId');
                 $parentId = $parsedBody->getInt('displayGroupIdMembers');
 
                 if ($this->getStore()->exists('SELECT `childId` FROM `lkdgdg` WHERE `parentId` = :parentId AND `childId` = :childId AND `depth` = 1',
@@ -513,7 +513,7 @@ public function query($sortOrder = null, $filterBy = [])
             }
         }
 
-        if (is_array($sortOrder) && ($sortOrder != ['`member`'] && $sortOrder != ['`member` DESC'] )) {
+        if (is_array($sortOrder) && (!in_array('`member`', $sortOrder) && !in_array('`member` DESC', $sortOrder))) {
             $order .= ' ORDER BY ' . implode(',', $sortOrder);
         }
 

lib/Factory/UserGroupFactory.php

@@ -1,8 +1,8 @@
 <?php
 /*
- * Copyright (C) 2022 Xibo Signage Ltd
+ * Copyright (C) 2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -787,7 +787,7 @@ public function getFeatures()
                 'folder.add' => [
                     'feature' => 'folder.add',
                     'group' => 'folders',
-                    'title' => __('Create new Folders')
+                    'title' => __('Allow users to create Sub-Folders under Folders they have access to. (Except the Root Folder)')
                 ],
                 'folder.modify' => [
                     'feature' => 'folder.modify',

lib/Helper/Environment.php

@@ -30,7 +30,7 @@
  */
 class Environment
 {
-    public static $WEBSITE_VERSION_NAME = '3.3.6';
+    public static $WEBSITE_VERSION_NAME = '3.3.7';
     public static $XMDS_VERSION = '6';
     public static $XLF_VERSION = 3;
     public static $VERSION_REQUIRED = '7.2.9';

lib/Middleware/Handlers.php

@@ -1,8 +1,8 @@
 <?php
-/**
- * Copyright (C) 2020 Xibo Signage Ltd
+/*
+ * Copyright (C) 2023 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -195,8 +195,13 @@ public static function webErrorHandler($container)
                         $template = 'error';
                     }
 
-                    return $twig->render($response, $template . '.twig', array_merge($viewParams, $exceptionData))
-                        ->withStatus($statusCode);
+                    try {
+                        return $twig->render($response, $template . '.twig', array_merge($viewParams, $exceptionData))
+                            ->withStatus($statusCode);
+                    } catch (\Exception $exception) {
+                        $response->getBody()->write('Fatal error');
+                        return $response->withStatus(500);
+                    }
                 }
             }
         };

locale/default.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-06 11:51+0100\n"
+"POT-Creation-Date: 2023-07-31 17:51+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15299,7 +15299,7 @@ msgid "Cannot modify root folder."
 msgstr ""
 
 #: cache/e1/e12568f445a23579c43fcfebd85ce8eee11d450b2050aad01f770f474b1d3218.php:430
-#: lib/Controller/Folder.php:329
+#: lib/Controller/Folder.php:338
 msgid "Cannot remove Folder with content"
 msgstr ""
 
@@ -18714,7 +18714,7 @@ msgstr ""
 #: lib/Controller/DisplayGroup.php:706 lib/Controller/DisplayGroup.php:2531
 #: lib/Controller/DataSet.php:622 lib/Controller/Notification.php:575
 #: lib/Controller/Campaign.php:605 lib/Controller/Campaign.php:1337
-#: lib/Controller/Module.php:735 lib/Controller/Folder.php:204
+#: lib/Controller/Module.php:735 lib/Controller/Folder.php:213
 #: lib/Controller/Playlist.php:707 lib/Controller/DataSetColumn.php:386
 #: lib/Controller/Tag.php:356 lib/Controller/Layout.php:549
 #: lib/Controller/Help.php:191 lib/Controller/DisplayProfile.php:303
@@ -18731,7 +18731,7 @@ msgstr ""
 #: lib/Controller/DataSet.php:917 lib/Controller/ScheduleReport.php:429
 #: lib/Controller/Notification.php:705 lib/Controller/Campaign.php:912
 #: lib/Controller/MenuBoard.php:465 lib/Controller/Module.php:379
-#: lib/Controller/Module.php:848 lib/Controller/Folder.php:272
+#: lib/Controller/Module.php:848 lib/Controller/Folder.php:281
 #: lib/Controller/Playlist.php:892 lib/Controller/Transition.php:159
 #: lib/Controller/Library.php:1353 lib/Controller/DataSetColumn.php:594
 #: lib/Controller/Tag.php:506 lib/Controller/Connector.php:201
@@ -18753,7 +18753,7 @@ msgstr ""
 #: lib/Controller/DataSet.php:1008 lib/Controller/ScheduleReport.php:467
 #: lib/Controller/Notification.php:764 lib/Controller/Campaign.php:991
 #: lib/Controller/SavedReport.php:290 lib/Controller/MenuBoard.php:542
-#: lib/Controller/Module.php:983 lib/Controller/Folder.php:334
+#: lib/Controller/Module.php:983 lib/Controller/Folder.php:343
 #: lib/Controller/Playlist.php:973 lib/Controller/Library.php:961
 #: lib/Controller/DataSetColumn.php:684 lib/Controller/Tag.php:632
 #: lib/Controller/Layout.php:967 lib/Controller/MenuBoardCategory.php:498
@@ -19436,41 +19436,40 @@ msgstr ""
 msgid "Switched to Normal Mode"
 msgstr ""
 
-#: lib/Controller/Folder.php:101
+#: lib/Controller/Folder.php:102
 msgid "Right click a Folder for further Options"
 msgstr ""
 
-#: lib/Controller/Folder.php:136
+#: lib/Controller/Folder.php:145
 msgid "Private Folder"
 msgstr ""
 
-#: lib/Controller/Folder.php:259
+#: lib/Controller/Folder.php:268
 msgid "Cannot edit root Folder"
 msgstr ""
 
-#: lib/Controller/Folder.php:318
+#: lib/Controller/Folder.php:327
 msgid "Cannot remove root Folder"
 msgstr ""
 
-#: lib/Controller/Folder.php:329
+#: lib/Controller/Folder.php:338
 msgid "Reassign objects from this Folder before deleting."
 msgstr ""
 
-#: lib/Controller/Folder.php:422
+#: lib/Controller/Folder.php:434
 msgid "Please select different folder, cannot move Folder to the same Folder"
 msgstr ""
 
-#: lib/Controller/Folder.php:428
+#: lib/Controller/Folder.php:440
 msgid ""
 "Please select different folder, cannot move Folder inside of one of its sub-"
 "folders"
 msgstr ""
 
-#: lib/Controller/Folder.php:435
+#: lib/Controller/Folder.php:445
 msgid ""
-"This Folder is already a sub-folder of the selected Folder,\n"
-"                     if you wish to move its content to the parent Folder, "
-"please check the merge checkbox."
+"This Folder is already a sub-folder of the selected Folder, if you wish to "
+"move its content to the parent Folder, please check the merge checkbox."
 msgstr ""
 
 #: lib/Controller/DataSetData.php:156
@@ -21125,15 +21124,15 @@ msgstr ""
 msgid "Library Quota must be a positive number."
 msgstr ""
 
-#: lib/Entity/User.php:1083
+#: lib/Entity/User.php:1086
 msgid "Provided Object not under permission management"
 msgstr ""
 
-#: lib/Entity/User.php:1340
+#: lib/Entity/User.php:1343
 msgid "You have exceeded your library quota"
 msgstr ""
 
-#: lib/Entity/User.php:1358
+#: lib/Entity/User.php:1361
 msgid "Your password does not meet the required complexity"
 msgstr ""
 
@@ -22197,7 +22196,9 @@ msgid "View Folder Tree on Grids and Forms"
 msgstr ""
 
 #: lib/Factory/UserGroupFactory.php:790
-msgid "Create new Folders"
+msgid ""
+"Allow users to create Sub-Folders under Folders they have access to. (Except "
+"the Root Folder)"
 msgstr ""
 
 #: lib/Factory/UserGroupFactory.php:795