Various v4 fixes

lib/Controller/Display.php

@@ -1949,6 +1949,12 @@ function delete(Request $request, Response $response, $id)
             throw new AccessDeniedException();
         }
 
+        if ($display->isLead()) {
+            throw new InvalidArgumentException(
+                __('Cannot delete a Lead Display of a Sync Group'),
+            );
+        }
+
         $display->delete();
 
         // Return

lib/Controller/Folder.php

@@ -334,11 +334,23 @@ public function delete(Request $request, Response $response, $folderId)
             throw new AccessDeniedException();
         }
 
+        if ($folder->isHome()) {
+            throw new InvalidArgumentException(
+                __('Cannot remove Folder set as home Folder for a user'),
+                'folderId',
+                __('Change home Folder for Users using this Folder before deleting')
+            );
+        }
+
         try {
             $folder->delete();
         } catch (\Exception $exception) {
             $this->getLog()->debug('Folder delete failed with message: ' . $exception->getMessage());
-            throw new InvalidArgumentException(__('Cannot remove Folder with content'), 'folderId', __('Reassign objects from this Folder before deleting.'));
+            throw new InvalidArgumentException(
+                __('Cannot remove Folder with content'),
+                'folderId',
+                __('Reassign objects from this Folder before deleting.')
+            );
         }
 
         // Return

lib/Controller/Schedule.php

@@ -2193,6 +2193,36 @@ public function grid(Request $request, Response $response)
     {
         $params = $this->getSanitizer($request->getParams());
 
+        $displayGroupIds = $params->getIntArray('displayGroupIds', ['default' => []]);
+        $originalDisplayGroupIds = $displayGroupIds;
+
+        if (!$this->getUser()->isSuperAdmin()) {
+            $userDisplayGroupIds = array_map(function ($element) {
+                /** @var \Xibo\Entity\DisplayGroup $element */
+                return $element->displayGroupId;
+            }, $this->displayGroupFactory->query(null, ['isDisplaySpecific' => -1]));
+
+            // Reset the list to only those display groups that intersect and if 0 have been provided, only those from
+            // the user list
+            $displayGroupIds = (count($displayGroupIds) > 0)
+                    ? array_intersect($displayGroupIds, $userDisplayGroupIds)
+                    : $userDisplayGroupIds;
+
+            $this->getLog()->debug('Resolved list of display groups ['
+                . json_encode($displayGroupIds) . '] from provided list ['
+                . json_encode($originalDisplayGroupIds) . '] and user list ['
+                . json_encode($userDisplayGroupIds) . ']');
+
+            // If we have none, then we do not return any events.
+            if (count($displayGroupIds) <= 0) {
+                $this->getState()->template = 'grid';
+                $this->getState()->recordsTotal = $this->scheduleFactory->countLast();
+                $this->getState()->setData([]);
+
+                return $this->render($request, $response);
+            }
+        }
+
         $events = $this->scheduleFactory->query(
             $this->gridRenderSort($params),
             $this->gridRenderFilter([
@@ -2202,7 +2232,7 @@ public function grid(Request $request, Response $response)
                 'geoAware' => $params->getInt('geoAware'),
                 'recurring' => $params->getInt('recurring'),
                 'campaignId' => $params->getInt('campaignId'),
-                'displayGroupIds' => $params->getIntArray('displayGroupIds'),
+                'displayGroupIds' => $displayGroupIds,
                 'name' => $params->getString('name'),
                 'useRegexForName' => $params->getCheckbox('useRegexForName'),
                 'logicalOperatorName' => $params->getString('logicalOperatorName'),

lib/Controller/SyncGroup.php

@@ -134,6 +134,7 @@ public function grid(Request $request, Response $response): Response|\Psr\Http\M
             'name' => $parsedQueryParams->getString('name'),
             'folderId' => $parsedQueryParams->getInt('folderId'),
             'ownerId' => $parsedQueryParams->getInt('ownerId'),
+            'leadDisplayId' => $parsedQueryParams->getInt('leadDisplayId')
         ];
 
         $syncGroups = $this->syncGroupFactory->query(

lib/Entity/Display.php

@@ -747,12 +747,12 @@
 
         // Check the number of licensed displays
         if ($maxDisplays > 0) {
             $this->getLog()->debug(sprintf('Testing authorised displays against %d maximum. Currently authorised = %d, authorised = %d.', $maxDisplays, $this->currentlyLicensed, $this->licensed));
 
             if ($this->currentlyLicensed != $this->licensed && $this->licensed == 1) {
                 $countLicensed = $this->getStore()->select('SELECT COUNT(DisplayID) AS CountLicensed FROM display WHERE licensed = 1', []);
 
                 $this->getLog()->debug(sprintf('There are %d authorised displays and we the maximum is %d', $countLicensed[0]['CountLicensed'], $maxDisplays));
 
                 if (intval($countLicensed[0]['CountLicensed']) + 1 > $maxDisplays) {
                     return false;
@@ -893,8 +893,8 @@
     private function add()
     {
         $this->displayId = $this->getStore()->insert('
             INSERT INTO display (display, auditingUntil, defaultlayoutid, license, licensed, lastAccessed, inc_schedule, email_alert, alert_timeout, clientAddress, xmrChannel, xmrPubKey, lastCommandSuccess, macAddress, lastChanged, lastWakeOnLanCommandSent, client_type, client_version, client_code, overrideConfig, newCmsAddress, newCmsKey, commercialLicence, lanIpAddress, syncGroupId)
               VALUES (:display, :auditingUntil, :defaultlayoutid, :license, :licensed, :lastAccessed, :inc_schedule, :email_alert, :alert_timeout, :clientAddress, :xmrChannel, :xmrPubKey, :lastCommandSuccess, :macAddress, :lastChanged, :lastWakeOnLanCommandSent, :clientType, :clientVersion, :clientCode, :overrideConfig, :newCmsAddress, :newCmsKey, :commercialLicence, :lanIpAddress, :syncGroupId)
         ', [
             'display' => $this->display,
             'auditingUntil' => 0,
@@ -1389,4 +1389,18 @@
 
         return $this;
     }
+
+    /**
+     * Check if this Display is set as Lead Display on any Sync Group
+     * @return bool
+     */
+    public function isLead(): bool
+    {
+        $syncGroups = $this->getStore()->select(
+            'SELECT syncGroupId FROM `syncgroup` WHERE `syncgroup`.leadDisplayId = :displayId',
+            ['displayId' => $this->displayId]
+        );
+
+        return count($syncGroups) > 0;
+    }
 }

lib/Entity/Folder.php

@@ -152,7 +152,7 @@
     public function validate()
     {
         if (!v::stringType()->notEmpty()->length(1, 254)->validate($this->text)) {
             throw new InvalidArgumentException(__('Folder needs to have a name, between 1 and 254 characters.'), 'folderName');
         }
 
         if (empty($this->parentId)) {
@@ -206,20 +206,20 @@
     {
         $parent = $this->folderFactory->getById($this->parentId);
 
         $this->id = $this->getStore()->insert('INSERT INTO `folder` (folderName, parentId, isRoot, permissionsFolderId) VALUES (:folderName, :parentId, :isRoot, :permissionsFolderId)',
             [
                 'folderName' => $this->text,
                 'parentId' => $this->parentId,
                 'isRoot' => 0,
                 'permissionsFolderId' => ($parent->permissionsFolderId == null) ? $this->parentId : $parent->permissionsFolderId
             ]);
 
         $this->manageChildren('add');
     }
 
     private function edit()
     {
         $this->getStore()->update('UPDATE `folder` SET folderName = :folderName, parentId = :parentId WHERE folderId = :folderId',
             [
                 'folderId' => $this->id,
                 'folderName' => $this->text,
@@ -275,8 +275,8 @@
     /**
      * Manages folder permissions
      *
      * When permissions are added on folder, this starts new ACL from that folder and is cascaded down to all folders under this folder
      * permissionsFolderId is also updated on all relevant objects that are in this folder or under this folder in folder tree structure
      *
      * When permissions are removed from a folder, this sets the permissionsFolderId to parent folderId (or parent permissionsFolderId)
      * same is cascaded down the folder tree and all relevant objects
@@ -455,4 +455,17 @@
 
         return $found;
     }
+
+    /**
+     * Check if this folder is used as Home Folder for any existing Users
+     * @return bool
+     */
+    public function isHome(): bool
+    {
+        $userIds = $this->getStore()->select('SELECT userId FROM `user` WHERE `user`.homeFolderId = :folderId', [
+            'folderId' => $this->id
+        ]);
+
+        return count($userIds) > 0;
+    }
 }

lib/Factory/SyncGroupFactory.php

@@ -193,6 +193,11 @@ public function query($sortOrder = null, $filterBy = []): array
             $params['folderId'] = $parsedBody->getInt('folderId');
         }
 
+        if ($parsedBody->getInt('leadDisplayId') !== null) {
+            $body .= ' AND `syncgroup`.leadDisplayId = :leadDisplayId ';
+            $params['leadDisplayId'] = $parsedBody->getInt('leadDisplayId');
+        }
+
         // View Permissions
         $this->viewPermissionSql(
             'Xibo\Entity\SyncGroup',

lib/Helper/XiboUploadHandler.php

@@ -408,6 +408,13 @@ protected function handle_form_data($file, $index)
                 // Get the Playlist
                 $playlist = $controller->getPlaylistFactory()->getById($this->options['playlistId']);
 
+                if (!$playlist->isEditable()) {
+                    throw new InvalidArgumentException(
+                        __('This Layout is not a Draft, please checkout.'),
+                        'layoutId'
+                    );
+                }
+
                 // Create a Widget and add it to our region
                 $widget = $controller->getWidgetFactory()->create(
                     $this->options['userId'],

lib/Service/DisplayNotifyService.php

@@ -279,7 +279,7 @@ public function notifyByCampaignId($campaignId)
                ) campaigns
                ON campaigns.campaignId = `schedule`.campaignId
              WHERE (
-                  (`schedule`.FromDT < :toDt AND IFNULL(`schedule`.toDt, `schedule`.fromDt) > :fromDt) 
+                  (`schedule`.FromDT < :toDt AND IFNULL(`schedule`.toDt, UNIX_TIMESTAMP()) > :fromDt) 
                   OR `schedule`.recurrence_range >= :fromDt 
                   OR (
                     IFNULL(`schedule`.recurrence_range, 0) = 0 AND IFNULL(`schedule`.recurrence_type, \'\') <> \'\' 
@@ -436,7 +436,7 @@ public function notifyByDataSetId($dataSetId)
                     AND `widgetoption`.option = \'dataSetId\'
                     AND `widgetoption`.value = :activeDataSetId
             WHERE (
-               (schedule.FromDT < :toDt AND IFNULL(`schedule`.toDt, `schedule`.fromDt) > :fromDt) 
+               (schedule.FromDT < :toDt AND IFNULL(`schedule`.toDt, UNIX_TIMESTAMP()) > :fromDt) 
                   OR `schedule`.recurrence_range >= :fromDt 
                   OR (
                     IFNULL(`schedule`.recurrence_range, 0) = 0 AND IFNULL(`schedule`.recurrence_type, \'\') <> \'\' 
@@ -588,7 +588,7 @@ public function notifyByPlaylistId($playlistId)
                ON `playlist`.regionId = `region`.regionId
              WHERE `playlist`.playlistId = :playlistId
               AND (
-                  (schedule.FromDT < :toDt AND IFNULL(`schedule`.toDt, `schedule`.fromDt) > :fromDt) 
+                  (schedule.FromDT < :toDt AND IFNULL(`schedule`.toDt, UNIX_TIMESTAMP()) > :fromDt) 
                   OR `schedule`.recurrence_range >= :fromDt 
                   OR (
                     IFNULL(`schedule`.recurrence_range, 0) = 0 AND IFNULL(`schedule`.recurrence_type, \'\') <> \'\' 
@@ -741,7 +741,7 @@ public function notifyByLayoutCode($code)
                ) campaigns
                ON campaigns.campaignId = `schedule`.campaignId
              WHERE (
-                  (`schedule`.FromDT < :toDt AND IFNULL(`schedule`.toDt, `schedule`.fromDt) > :fromDt) 
+                  (`schedule`.FromDT < :toDt AND IFNULL(`schedule`.toDt, UNIX_TIMESTAMP()) > :fromDt) 
                   OR `schedule`.recurrence_range >= :fromDt 
                   OR (
                     IFNULL(`schedule`.recurrence_range, 0) = 0 AND IFNULL(`schedule`.recurrence_type, \'\') <> \'\' 
@@ -769,7 +769,7 @@ public function notifyByLayoutCode($code)
                         ON lkdisplaydg.DisplayID = display.displayID
             WHERE schedule.actionLayoutCode = :code 
               AND (
-                  (`schedule`.FromDT < :toDt AND IFNULL(`schedule`.toDt, `schedule`.fromDt) > :fromDt)
+                  (`schedule`.FromDT < :toDt AND IFNULL(`schedule`.toDt, UNIX_TIMESTAMP()) > :fromDt)
                   OR `schedule`.recurrence_range >= :fromDt 
                   OR (
                     IFNULL(`schedule`.recurrence_range, 0) = 0 AND IFNULL(`schedule`.recurrence_type, \'\') <> \'\'

lib/routes.php

@@ -50,7 +50,7 @@
  *  description="Xibo CMS API.
        Using HTTP formData requests.
        All PUT requests require Content-Type:application/x-www-form-urlencoded header.",
- *  version="3.3",
+ *  version="4.0",
  *  termsOfService="https://xibosignage.com/legal",
  *  @SWG\License(
  *      name="AGPLv3 or later",

ui/src/core/xibo-cms.js

@@ -3870,11 +3870,13 @@ function initJsTreeAjax(container, id, isForm, ttl, onReady = null, onSelected =
                             $('#container-folder-tree').jstree(true).refresh();
                         }
                     } else {
-                        toastr.error(translations.folderWithContent);
-                        console.log(data.message);
+                        if (data.message !== undefined) {
+                            toastr.error(data.message)
+                        } else {
+                            toastr.error(translations.folderWithContent);
+                        }
                         $(container).jstree(true).refresh();
                     }
-
                 }
             });
         }).bind("changed.jstree", function (e, data) {

views/syncgroup-page.twig

@@ -48,6 +48,9 @@
                             {% set title %}{% trans "Name" %}{% endset %}
                             {{ inline.inputNameGrid('name', title) }}
 
+                            {% set title %}{% trans "Lead Display ID" %}{% endset %}
+                            {{ inline.input("leadDisplayId", title) }}
+
                             {{ inline.hidden("folderId") }}
                         </form>
                     </div>