Misc bugs and release preparation for 3.3.9 (#2291)

* SSP: always send isAdspaceEnabled in register. fixes xibosignage/xibo#3267 * Weather: fix issue with preloading background image select2. fixes xibosignage/xibo#3280 * Release Prep for 3.3.9
xibosignage · Jan 8, 2024 · 3095896 · 3095896
1 parent f09bb8a
commit 3095896
Show file tree

Hide file tree

Showing 52 changed files with 91 additions and 106 deletions.
diff --git a/lib/Helper/Environment.php b/lib/Helper/Environment.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2023 Xibo Signage Ltd
+ * Copyright (C) 2024 Xibo Signage Ltd
  *
  * Xibo - Digital Signage - https://xibosignage.com
  *
@@ -30,7 +30,7 @@
  */
 class Environment
 {
-    public static $WEBSITE_VERSION_NAME = '3.3.8';
+    public static $WEBSITE_VERSION_NAME = '3.3.9';
     public static $XMDS_VERSION = '6';
     public static $XLF_VERSION = 3;
     public static $VERSION_REQUIRED = '7.2.9';

diff --git a/lib/Widget/ForecastIo.php b/lib/Widget/ForecastIo.php
@@ -1,8 +1,8 @@
 <?php
 /*
- * Copyright (c) 2022 Xibo Signage Ltd
+ * Copyright (C) 2024 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -1032,23 +1032,6 @@ public function getBackgroundList()
         return self::WEATHER_BACKGROUNDS;
     }
 
-    /**
-     * @return \Xibo\Entity\Media[]
-     * @throws \Xibo\Support\Exception\NotFoundException
-     */
-    public function getBackgroundOptions()
-    {
-        $initBackgrounds = [];
-
-        foreach (self::WEATHER_BACKGROUNDS as $background) {
-            if ($this->getOption($background) != $background) {
-                $initBackgrounds[] = $this->getOption($background);
-            }
-        }
-
-        return $this->mediaFactory->query(null, array('disableUserCheck' => 1, 'id' => $initBackgrounds, 'allModules' => 1, 'type' => 'image'));
-    }
-
     /**
      * @return mixed
      */

diff --git a/lib/Xmds/Soap5.php b/lib/Xmds/Soap5.php
@@ -1,8 +1,8 @@
 <?php
 /*
- * Copyright (c) 2022 Xibo Signage Ltd
+ * Copyright (C) 2024 Xibo Signage Ltd
  *
- * Xibo - Digital Signage - http://www.xibo.org.uk
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *
@@ -264,11 +264,9 @@ public function RegisterDisplay($serverKey, $hardwareKey, $displayName, $clientT
 
                 // Adspace Enabled CMS?
                 $isAdspaceEnabled = intval($this->getConfig()->getSetting('isAdspaceEnabled', 0));
-                if ($isAdspaceEnabled === 1) {
-                    $node = $return->createElement('isAdspaceEnabled', 1);
-                    $node->setAttribute('type', 'checkbox');
-                    $displayElement->appendChild($node);
-                }
+                $node = $return->createElement('isAdspaceEnabled', $isAdspaceEnabled);
+                $node->setAttribute('type', 'checkbox');
+                $displayElement->appendChild($node);
 
                 if (!empty($display->timeZone)) {
                     // Calculate local time

diff --git a/locale/README.md b/locale/README.md
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/dbtranslate.php b/locale/dbtranslate.php
@@ -1,7 +1,8 @@
 <?php
 /*
- * Xibo - Digital Signage - http://www.xibo.org.uk
- * Copyright (C) 2009-12 Daniel Garner
+ * Copyright (C) 2024 Xibo Signage Ltd
+ *
+ * Xibo - Digital Signage - https://xibosignage.com
  *
  * This file is part of Xibo.
  *

diff --git a/locale/de.mo b/locale/de.mo