Merge pull request #1849 from xibosignage/develop

Release 3.3.6
xibosignage · Jun 6, 2023 · 591c039 · 591c039
2 parents 6f5d4dd + 11b3a4b
commit 591c039
Show file tree

Hide file tree

Showing 68 changed files with 339 additions and 117 deletions.
diff --git a/lib/Controller/Library.php b/lib/Controller/Library.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2022 Xibo Signage Ltd
+ * Copyright (C) 2023 Xibo Signage Ltd
  *
  * Xibo - Digital Signage - http://www.xibo.org.uk
  *
@@ -980,7 +980,7 @@ public function delete(Request $request, Response $response, $id)
      *  operationId="libraryAdd",
      *  tags={"library"},
      *  summary="Add Media",
-     *  description="Add Media to the Library",
+     *  description="Add Media to the Library, optionally replacing an existing media item, optionally adding to a playlist.",
      *  @SWG\Parameter(
      *      name="files",
      *      in="formData",
@@ -1031,16 +1031,23 @@ public function delete(Request $request, Response $response, $id)
      *      required=false
      *   ),
      *  @SWG\Parameter(
+     *      name="playlistId",
+     *      in="formData",
+     *      description="A playlistId to add this uploaded media to",
+     *      type="int",
+     *      required=false
+     *   ),
+     *  @SWG\Parameter(
      *      name="widgetFromDt",
      *      in="formData",
-     *      description="Date in Y-m-d H:i:s format, will set widget start date",
+     *      description="Date in Y-m-d H:i:s format, will set widget start date. Requires a playlistId.",
      *      type="string",
      *      required=false
      *   ),
      *  @SWG\Parameter(
      *      name="widgetToDt",
      *      in="formData",
-     *      description="Date in Y-m-d H:i:s format, will set widget end date",
+     *      description="Date in Y-m-d H:i:s format, will set widget end date. Requires a playlistId.",
      *      type="string",
      *      required=false
      *   ),

diff --git a/lib/Controller/Module.php b/lib/Controller/Module.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.
  *
@@ -799,7 +799,7 @@ public function editWidgetForm(Request $request, Response $response, $id)
             'validExtensions' => str_replace(',', '|', $module->getModule()->validExtensions),
             'templatesAvailable' => $templates,
             'options' => $options,
-            'isTopLevel' => $this->playlistFactory->getById($module->widget->playlistId)->isRegionPlaylist()
+            'isTopLevel' => $this->playlistFactory->getById($module->widget->playlistId)->isRegionPlaylist(),
         ]));
 
         return $this->render($request, $response);

diff --git a/lib/Entity/Schedule.php b/lib/Entity/Schedule.php
@@ -610,9 +610,57 @@ public function validate()
         if ($this->isPriority < 0) {
             throw new InvalidArgumentException(__('Priority must be 0 or a positive number'), 'isPriority');
         }
-        // Check recurrenceDetail every is positive
-        if ($this->recurrenceType != '' && ($this->recurrenceDetail === null || $this->recurrenceDetail <= 0)) {
-            throw new InvalidArgumentException(__('Repeat every must be a positive number'), 'recurrenceDetail');
+
+        // Run some additional validation if we have a recurrence type set.
+        if (!empty($this->recurrenceType)) {
+            // Check recurrenceDetail every is positive
+            if ($this->recurrenceDetail === null || $this->recurrenceDetail <= 0) {
+                throw new InvalidArgumentException(__('Repeat every must be a positive number'), 'recurrenceDetail');
+            }
+
+            // Make sure that we don't repeat more frequently than the duration of the event as this is a common
+            // misconfiguration which results in overlapping repeats
+            if ($this->eventTypeId !== Schedule::$COMMAND_EVENT) {
+                $eventDuration = $this->toDt - $this->fromDt;
+
+                // Determine the number of seconds our repeat type/interval represents
+                switch ($this->recurrenceType) {
+                    case 'Minute':
+                        $repeatDuration = $this->recurrenceDetail * 60;
+                        break;
+
+                    case 'Hour':
+                        $repeatDuration = $this->recurrenceDetail * 3600;
+                        break;
+
+                    case 'Day':
+                        $repeatDuration = $this->recurrenceDetail * 86400;
+                        break;
+
+                    case 'Week':
+                        $repeatDuration = $this->recurrenceDetail * 86400 * 7;
+                        break;
+
+                    case 'Month':
+                        $repeatDuration = $this->recurrenceDetail * 86400 * 30;
+                        break;
+
+                    case 'Year':
+                        $repeatDuration = $this->recurrenceDetail * 86400 * 365;
+                        break;
+
+                    default:
+                        throw new InvalidArgumentException(__('Unknown repeat type'), 'recurrenceType');
+                }
+
+                if ($repeatDuration < $eventDuration) {
+                    throw new InvalidArgumentException(
+                        __('An event cannot repeat more often than the interval between its start and end date'),
+                        'recurrenceDetail',
+                        $eventDuration . ' seconds'
+                    );
+                }
+            }
         }
     }
 

diff --git a/lib/Factory/LayoutFactory.php b/lib/Factory/LayoutFactory.php
@@ -2276,8 +2276,8 @@ public function query($sortOrder = null, $filterBy = [])
             $layout->width = $parsedRow->getDouble('width');
             $layout->height = $parsedRow->getDouble('height');
             $layout->orientation = $layout->width >= $layout->height ? 'landscape' : 'portrait';
-            $layout->createdDt = $parsedRow->getDate('createdDt');
-            $layout->modifiedDt = $parsedRow->getDate('modifiedDt');
+            $layout->createdDt = $parsedRow->getString('createdDt');
+            $layout->modifiedDt = $parsedRow->getString('modifiedDt');
             $layout->displayOrder = $parsedRow->getInt('displayOrder');
             $layout->statusMessage = $parsedRow->getString('statusMessage');
             $layout->enableStat = $parsedRow->getInt('enableStat');

diff --git a/lib/Helper/Environment.php b/lib/Helper/Environment.php
@@ -30,7 +30,7 @@
  */
 class Environment
 {
-    public static $WEBSITE_VERSION_NAME = '3.3.5';
+    public static $WEBSITE_VERSION_NAME = '3.3.6';
     public static $XMDS_VERSION = '6';
     public static $XLF_VERSION = 3;
     public static $VERSION_REQUIRED = '7.2.9';

diff --git a/lib/Middleware/Theme.php b/lib/Middleware/Theme.php
@@ -1,8 +1,8 @@
 <?php
-/**
- * Copyright (C) 2019 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.
  *
@@ -128,7 +128,7 @@ public static function setTheme(ContainerInterface $container, Request $request,
             'maxSize' => ByteFormatter::toBytes(Environment::getMaxUploadSize()),
             'maxSizeMessage' => sprintf(__('This form accepts files up to a maximum size of %s'), Environment::getMaxUploadSize()),
             'validExt' => implode('|', $container->get('moduleFactory')->getValidExtensions()),
-            'validImageExt' => implode('|', $container->get('moduleFactory')->getValidExtensions(['type' => 'image']))
+            'validImageExt' => implode('|', $container->get('moduleFactory')->getValidExtensions(['type' => 'image'])),
         ];
         $view['ckeditorConfig'] = $container->get('mediaService')->setUser($container->get('user'))->fontCKEditorConfig(RouteContext::fromRequest($request)->getRouteParser());
         $view['version'] = Environment::$WEBSITE_VERSION_NAME;

diff --git a/lib/Widget/Agenda.php b/lib/Widget/Agenda.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2022 Xibo Signage Ltd
+ * Copyright (C) 2023 Xibo Signage Ltd
  *
  * Xibo - Digital Signage - http://www.xibo.org.uk
  *
@@ -23,6 +23,7 @@
 namespace Xibo\Widget;
 
 use Carbon\Carbon;
+use Carbon\CarbonInterval;
 use ICal\ICal;
 use Respect\Validation\Validator as v;
 use Slim\Http\Response as Response;
@@ -794,7 +795,14 @@ public function isValid()
 
             if ($customInterval != '') {
                 // Try to create a date interval from it
-                $dateInterval = \DateInterval::createFromDateString($customInterval);
+                $dateInterval = CarbonInterval::createFromDateString($customInterval);
+
+                if ($dateInterval === false) {
+                    throw new InvalidArgumentException(
+                        __('That is not a valid date interval, please use natural language such as 1 week'),
+                        'customInterval'
+                    );
+                }
 
                 // Use now and add the date interval to it
                 $now = Carbon::now();

diff --git a/lib/Widget/Calendar.php b/lib/Widget/Calendar.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2022 Xibo Signage Ltd
+ * Copyright (C) 2023 Xibo Signage Ltd
  *
  * Xibo - Digital Signage - http://www.xibo.org.uk
  *
@@ -23,6 +23,7 @@
 namespace Xibo\Widget;
 
 use Carbon\Carbon;
+use Carbon\CarbonInterval;
 use ICal\ICal;
 use Respect\Validation\Validator as v;
 use Slim\Http\Response as Response;
@@ -873,7 +874,14 @@ public function isValid()
 
             if ($customInterval != '') {
                 // Try to create a date interval from it
-                $dateInterval = \DateInterval::createFromDateString($customInterval);
+                $dateInterval = CarbonInterval::createFromDateString($customInterval);
+
+                if ($dateInterval === false) {
+                    throw new InvalidArgumentException(
+                        __('That is not a valid date interval, please use natural language such as 1 week'),
+                        'customInterval'
+                    );
+                }
 
                 // Use now and add the date interval to it
                 $now = Carbon::now();

diff --git a/lib/Widget/Dashboard.php b/lib/Widget/Dashboard.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (c) 2022 Xibo Signage Ltd
+ * Copyright (C) 2023 Xibo Signage Ltd
  *
  * Xibo - Digital Signage - http://www.xibo.org.uk
  *
@@ -24,7 +24,6 @@
 
 use Slim\Http\Response;
 use Slim\Http\ServerRequest as Request;
-use Xibo\Event\XmdsConnectorFileEvent;
 use Xibo\Event\XmdsConnectorTokenEvent;
 use Xibo\Helper\DateFormatHelper;
 use Xibo\Support\Exception\ConfigurationException;
@@ -294,6 +293,7 @@ public function installOrUpdate($moduleFactory)
             $module->defaultDuration = 60;
             $module->settings = [];
             $module->viewPath = '../modules';
+            $module->installName = 'dashboard';
 
             // Set the newly created module and then call install
             $this->setModule($module);

diff --git a/lib/Widget/PlayerSoftware.php b/lib/Widget/PlayerSoftware.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.
  *
@@ -149,6 +149,11 @@ public function postProcess($media, PlayerVersionFactory $factory = null)
             $type = 'sssp';
         }
 
+        // if we were given media name on upload use that.
+        if ($media->name !== $media->fileName) {
+            $playerShowVersion = $media->name;
+        }
+
         return $factory->create($type, $version, $code, $media->mediaId, $playerShowVersion);
     }
 
@@ -159,5 +164,4 @@ public function getValidExtensions()
     {
         return $this->module->validExtensions;
     }
-
-}
+}
diff --git a/locale/af.mo b/locale/af.mo
diff --git a/locale/ar.mo b/locale/ar.mo
diff --git a/locale/bg.mo b/locale/bg.mo
diff --git a/locale/ca.mo b/locale/ca.mo
diff --git a/locale/cs.mo b/locale/cs.mo
diff --git a/locale/da.mo b/locale/da.mo
diff --git a/locale/de.mo b/locale/de.mo