Merge pull request #3136 from xibosignage/release43

4.3.1 release

Author: maurofmferrao

.github/workflows/build-container.yaml

@@ -5,10 +5,9 @@ on:
     branches:
       - master
       - develop
-      - kopff
       - release23
       - release33
-      - release40
+      - release43
 
 jobs:
   build:

composer.lock

@@ -0,0 +1,38 @@
+<?php
+/*
+ * Copyright (C) 2025 Xibo Signage Ltd
+ *
+ * Xibo - Digital Signage - https://xibosignage.com
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version.
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Migrations for core-canvas module duration
+ * @phpcs:disable PSR1.Classes.ClassDeclaration.MissingNamespace
+ */
+
+use Phinx\Migration\AbstractMigration;
+
+class UpdateCoreCanvasDurationInModuleTableMigration extends AbstractMigration
+{
+    public function change(): void
+    {
+        $this->execute('UPDATE `module` SET `defaultDuration` = 10 WHERE `moduleId` = :moduleId', [
+            'moduleId' => 'core-canvas',
+        ]);
+    }
+}

db/migrations/20251001125431_update_core_canvas_duration_in_module_table_migration.php

@@ -1306,12 +1306,12 @@ function unretire(Request $request, Response $response, $id)
         }
 
         $layout->retired = 0;
+
         $layout->save([
             'saveLayout' => true,
             'saveRegions' => false,
             'saveTags' => false,
             'setBuildRequired' => false,
-            'notify' => false
         ]);
 
         // Return

lib/Controller/Layout.php

@@ -572,7 +572,7 @@ public function grid(Request $request, Response $response)
                         $libraryLocation = $this->getConfig()->getSetting('LIBRARY_LOCATION');
                         $renderThumbnail = file_exists($libraryLocation . $media->mediaId . '_videocover.png');
                     }
-                    
+
                     if ($renderThumbnail) {
                         $thumbnailUrl = $this->urlFor($request, $thumbnailRouteName, [
                             'id' => $media->mediaId,
@@ -1838,8 +1838,10 @@ public function thumbnailPublic(Request $request, Response $response, $id): Resp
 
         $this->getLog()->debug('thumbnailPublic: authorised for ' . $id);
 
+        $res = $this->thumbnail($request, $response, $id, true);
+
         // Pass to the thumbnail route
-        return $this->thumbnail($request, $response, $id, true);
+        return $res->withHeader('Access-Control-Allow-Origin', '*');
     }
 
     /**

lib/Controller/Library.php

@@ -1727,8 +1727,17 @@ public function edit(Request $request, Response $response, $id)
         $schedule->campaignId = $this->isFullScreenSchedule($schedule->eventTypeId)
             ? $sanitizedParams->getInt('fullScreenCampaignId')
             : $sanitizedParams->getInt('campaignId');
-        $schedule->displayOrder = $sanitizedParams->getInt('displayOrder', ['default' => $schedule->displayOrder]);
-        $schedule->isPriority = $sanitizedParams->getInt('isPriority', ['default' => $schedule->isPriority]);
+
+        // displayOrder and isPriority: if present but empty (""): set to 0
+        // if missing from form: keep existing value (fallback to 0 if unset)
+        $schedule->displayOrder = $sanitizedParams->hasParam('displayOrder')
+            ? $sanitizedParams->getInt('displayOrder', ['default' => 0])
+            : ($schedule->displayOrder ?? 0);
+
+        $schedule->isPriority = $sanitizedParams->hasParam('isPriority')
+            ? $sanitizedParams->getInt('isPriority', ['default' => 0])
+            : ($schedule->isPriority ?? 0);
+
         $schedule->dayPartId = $sanitizedParams->getInt('dayPartId', ['default' => $schedule->dayPartId]);
         $schedule->syncTimezone = $sanitizedParams->getCheckbox('syncTimezone');
         $schedule->syncEvent = $this->isSyncEvent($schedule->eventTypeId);

lib/Controller/Schedule.php

@@ -475,11 +475,6 @@ public function update(Request $request, Response $response)
             $this->getConfig()->changeSetting('PHONE_HOME_DATE', $sanitizedParams->getInt('PHONE_HOME_DATE'));
         }
 
-        if ($this->getConfig()->isSettingEditable('PHONE_HOME_URL')) {
-            $this->handleChangedSettings('PHONE_HOME_URL', $this->getConfig()->getSetting('PHONE_HOME_URL'), $sanitizedParams->getString('PHONE_HOME_URL'), $changedSettings);
-            $this->getConfig()->changeSetting('PHONE_HOME_URL', $sanitizedParams->getString('PHONE_HOME_URL'));
-        }
-
         if ($this->getConfig()->isSettingEditable('SCHEDULE_LOOKAHEAD')) {
             $this->handleChangedSettings('SCHEDULE_LOOKAHEAD', $this->getConfig()->getSetting('SCHEDULE_LOOKAHEAD'), $sanitizedParams->getCheckbox('SCHEDULE_LOOKAHEAD'), $changedSettings);
             $this->getConfig()->changeSetting('SCHEDULE_LOOKAHEAD', $sanitizedParams->getCheckbox('SCHEDULE_LOOKAHEAD'));

lib/Controller/Settings.php

@@ -478,7 +478,12 @@ public function editWidget(Request $request, Response $response, $id)
 
         // Handle common parameters.
         $widget->useDuration = $params->getCheckbox('useDuration');
-        $widget->duration = $params->getInt('duration', ['default' => $module->defaultDuration]);
+
+        // If we enabled useDuration, then use the provided duration
+        $widget->duration = ($widget->useDuration == 1)
+            ? $params->getInt('duration', ['default' => $module->defaultDuration])
+            : $module->defaultDuration;
+
         $widget->setOptionValue('name', 'attrib', $params->getString('name'));
         $widget->setOptionValue('enableStat', 'attrib', $params->getString('enableStat'));
 

lib/Controller/Widget.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2024 Xibo Signage Ltd
+ * Copyright (C) 2025 Xibo Signage Ltd
  *
  * Xibo - Digital Signage - https://xibosignage.com
  *
@@ -73,7 +73,9 @@ public static function registerFactoriesWithDi()
                 return $repository;
             },
             'bandwidthFactory' => function (ContainerInterface $c) {
-                $repository = new \Xibo\Factory\BandwidthFactory();
+                $repository = new \Xibo\Factory\BandwidthFactory(
+                    $c->get('pool'),
+                );
                 $repository->useBaseDependenciesService($c->get('RepositoryBaseDependenciesService'));
                 return $repository;
             },

lib/Dependencies/Factories.php

@@ -1315,9 +1315,6 @@ public function toXlf()
         // merge regions and drawers into one array and go through it.
         $allRegions = array_merge($this->regions, $this->drawers);
 
-        // Used to identify Layouts which only have Canvas with global elements
-        $isCanvasOnlyRegion = true;
-
         foreach ($allRegions as $region) {
             /* @var Region $region */
 
@@ -1379,8 +1376,7 @@ public function toXlf()
                     // Pull out the global widget, if we have one (we should)
                     if ($item->type === 'global') {
                         $widget = $item;
-                    } else {
-                        $isCanvasOnlyRegion = false;
+
                     }
 
                     // Get the highest duration.
@@ -1403,8 +1399,6 @@ public function toXlf()
                     $widgets = [$widget];
                 }
             } else {
-                $isCanvasOnlyRegion = false;
-
                 $widgets = $region->getPlaylist()->setModuleFactory($this->moduleFactory)->expandWidgets();
             }
 
@@ -1419,6 +1413,8 @@ public function toXlf()
             }
 
             // Work out if we have any "lead regions", those are Widgets with a duration
+            $maxWidgetDurationInLayout = 1;
+
             foreach ($widgets as $widget) {
                 if (($widget->useDuration == 1 && $widget->type !== 'global')
                     || $countWidgets > 1
@@ -1427,6 +1423,11 @@ public function toXlf()
                 ) {
                     $layoutCountRegionsWithDuration++;
                 }
+
+                $maxWidgetDurationInLayout = Max(
+                    ($widget->useDuration == 1 ? $widget->duration : $widget->calculatedDuration),
+                    $maxWidgetDurationInLayout
+                );
             }
 
             foreach ($widgets as $widget) {
@@ -1454,16 +1455,10 @@ public function toXlf()
                 ) {
                     // Make sure this Widget expires immediately so that the other Regions can be the leaders when
                     // it comes to expiring the Layout
-                    $widgetDuration = Widget::$widgetMinDuration;
-                }
-
-                // Layouts which only have Canvas with global elements
-                if ($region->type == 'canvas'
-                    && $widget->type == 'global'
-                    && $isCanvasOnlyRegion
-                ) {
-                    $widget->calculatedDuration = 10;
-                    $widgetDuration = $widget->calculatedDuration;
+                    // Only do this when the widget's default duration is not the max duration in layout
+                    if ($widgetDuration < $maxWidgetDurationInLayout) {
+                        $widgetDuration = Widget::$widgetMinDuration;
+                    }
                 }
 
                 if ($region->isDrawer === 0) {
@@ -1477,7 +1472,7 @@ public function toXlf()
                     if ($tempCyclePlaybackAverageDuration) {
                         $region->duration = $region->duration + $tempCyclePlaybackAverageDuration;
                     } else {
-                        $region->duration = $region->duration + $widget->calculatedDuration;
+                        $region->duration = $region->duration + $widgetDuration;
                     }
 
                     // We also want to add any transition OUT duration
@@ -1516,6 +1511,7 @@ public function toXlf()
                     ($widget->type === 'video' || $widget->type === 'audio')
                     && $widget->useDuration === 0
                 );
+
                 $mediaNode->setAttribute('duration', ($isEndDetectVideoWidget ? 0 : $widgetDuration));
                 $mediaNode->setAttribute('useDuration', $widget->useDuration);
                 $widgetActionNode = null;