Misc 4.0.5 issues

docker/entrypoint.sh

@@ -232,7 +232,7 @@ then
     /bin/sed -i "s/^MYSQL_BACKUP_ENABLED=.*$/MYSQL_BACKUP_ENABLED=$MYSQL_BACKUP_ENABLED/" /etc/periodic/15min/cms-db-backup
     /bin/sed -i "s/^MYSQL_DATABASE=.*$/MYSQL_DATABASE=$MYSQL_DATABASE/" /etc/periodic/15min/cms-db-backup
 
-    echo "*/15 * * * root /etc/periodic/15min/cms-db-backup > /dev/null 2>&1" > /etc/cron.d/cms_backup_cron
+    echo "*/15 * * * * root /etc/periodic/15min/cms-db-backup > /dev/null 2>&1" > /etc/cron.d/cms_backup_cron
     echo "" >> /etc/cron.d/cms_backup_cron
 
     # Update /var/www/maintenance with current environment (for cron)

lib/Entity/Layout.php

@@ -1015,7 +1015,7 @@
             }
 
             // Delete widget history
             $this->getStore()->update('DELETE FROM `widgethistory` WHERE layoutHistoryId IN (SELECT layoutHistoryId FROM `layouthistory` WHERE campaignId = :campaignId)', ['campaignId' => $this->campaignId]);
 
             // Delete layout history
             $this->getStore()->update('DELETE FROM `layouthistory` WHERE campaignId = :campaignId', ['campaignId' => $this->campaignId]);
@@ -1179,7 +1179,7 @@
         if (count($layoutHistoryId) <= 0) {
             // We are missing the parent layout history record, which isn't good.
             // I think all we can do at this stage is log it
             $this->getLog()->alert('Missing Layout History for layoutId ' . $parent->layoutId . ' which is on campaignId ' . $parent->campaignId);
             return;
         }
 
@@ -1652,7 +1652,7 @@
 
                 foreach ($module->properties as $property) {
                     // We only output properties for native rendered widgets
-                    if ($module->renderAs === 'native') {
+                    if ($module->renderAs === 'native' || $property->includeInXlf) {
                         if (($uriInjected && $property->id == 'uri') || empty($property->id)) {
                             // Skip any property named "uri" if we've already injected a special node for that.
                             // Skip properties without an id
@@ -2488,8 +2488,8 @@
     {
         $this->getLog()->debug('Adding Layout ' . $this->layout);
 
         $sql  = 'INSERT INTO layout (layout, description, userID, createdDT, modifiedDT, publishedStatusId, status, width, height, schemaVersion, backgroundImageId, backgroundColor, backgroundzIndex, parentId, enableStat, retired, duration, autoApplyTransitions, code)
                   VALUES (:layout, :description, :userid, :createddt, :modifieddt, :publishedStatusId, :status, :width, :height, :schemaVersion, :backgroundImageId, :backgroundColor, :backgroundzIndex, :parentId, :enableStat, 0, 0, :autoApplyTransitions, :code)';
 
         $time = Carbon::now()->format(DateFormatHelper::getSystemFormat());
 

lib/Factory/ModuleXmlTrait.php

@@ -122,6 +122,7 @@ private function parseProperties($propertyNodes, ?Module $module = null): array
                 $property->allowLibraryRefs = $node->getAttribute('allowLibraryRefs') === 'true';
                 $property->allowAssetRefs = $node->getAttribute('allowAssetRefs') === 'true';
                 $property->parseTranslations = $node->getAttribute('parseTranslations') === 'true';
+                $property->includeInXlf = $node->getAttribute('includeInXlf') === 'true';
                 $property->title = __($this->getFirstValueOrDefaultFromXmlNode($node, 'title'));
                 $property->helpText = __($this->getFirstValueOrDefaultFromXmlNode($node, 'helpText'));
                 $property->value = $this->getFirstValueOrDefaultFromXmlNode($node, 'value');

lib/Widget/Definition/Property.php

@@ -90,6 +90,9 @@ class Property implements \JsonSerializable
     /** @var bool Should translations be parsed in the value? */
     public $parseTranslations = false;
 
+    /** @var bool Should the prooperty be included in the XLF? */
+    public $includeInXlf = false;
+
     /** @var \Xibo\Widget\Definition\PlayerCompatibility */
     public $playerCompatibility;
 

lib/Widget/Render/WidgetHtmlRenderer.php

@@ -536,7 +536,13 @@ private function render(
                             if ($moduleTemplate->stencil->twig !== null) {
                                 $twig['twig'][] = $this->twig->fetchFromString(
                                     $this->decorateTranslations($moduleTemplate->stencil->twig),
-                                    $moduleTemplate->getPropertyValues()
+                                    $widgetData['templateProperties'],
+                                );
+                            }
+                            if ($moduleTemplate->stencil->style !== null) {
+                                $twig['style'][] = $this->twig->fetchFromString(
+                                    $moduleTemplate->stencil->style,
+                                    $widgetData['templateProperties'],
                                 );
                             }
                         }
@@ -556,10 +562,12 @@ private function render(
             // What does our module have
             if ($module->stencil !== null) {
                 // Stencils have access to any module properties
+                $modulePropertyValues = $module->getPropertyValues();
+
                 if ($module->stencil->twig !== null) {
                     $twig['twig'][] = $this->twig->fetchFromString(
                         $this->decorateTranslations($module->stencil->twig),
-                        array_merge($module->getPropertyValues(), ['settings' => $module->getSettingsForOutput()]),
+                        array_merge($modulePropertyValues, ['settings' => $module->getSettingsForOutput()]),
                     );
                 }
                 if ($module->stencil->hbs !== null) {
@@ -573,11 +581,14 @@ private function render(
                 if ($module->stencil->head !== null) {
                     $twig['head'][] = $this->twig->fetchFromString(
                         $this->decorateTranslations($module->stencil->head),
-                        $module->getPropertyValues()
+                        $modulePropertyValues
                     );
                 }
                 if ($module->stencil->style !== null) {
-                    $twig['style'][] = $module->stencil->style;
+                    $twig['style'][] = $this->twig->fetchFromString(
+                        $module->stencil->style,
+                        $modulePropertyValues,
+                    );
                 }
             }
 

modules/hls.xml

@@ -40,7 +40,7 @@
         </property>
     </settings>
     <properties>
-        <property id="uri" type="text" variant="uri">
+        <property id="uri" type="text" variant="uri" includeInXlf="true">
             <title>Video Path</title>
             <helpText>A URL to the HLS video stream. Requires Player running Windows 8.1 or later, or Android 6 or later. Earlier Android devices may play HLS via the LocalVideo widget.</helpText>
             <rule>

views/displayprofile-form-edit-android.twig

@@ -302,6 +302,7 @@
                     {% set title = "Video Engine"|trans %}
                     {% set helpText = "Select which video engine should be used to playback video. ExoPlayer is usually better, but if you experience issues you can revert back to Android Media Player. HLS always uses ExoPlayer. Available from v3 R300."|trans %}
                     {% set options = [
+                        { id: 'default', value: "Device Default"|trans },
                         { id: 'exoplayer', value: "ExoPlayer"|trans },
                         { id: 'mediaplayer', value: "Android Media Player"|trans },
                     ] %}