From 328548366580fd8f19e21ca8147036c291a2f3db Mon Sep 17 00:00:00 2001
From: Antonio Fernandez <tfernandez.sc2@gmail.com>
Date: Tue, 23 Jul 2024 17:17:26 -0400
Subject: [PATCH] changes to wallpaper settings for Avaya J-Series (#7063)

---
 app/avaya/app_config.php                      | 40 +++++++++++++++++++
 .../templates/provision/avaya/J139/{$mac}.cfg |  2 +-
 .../templates/provision/avaya/J169/{$mac}.cfg |  2 +-
 .../templates/provision/avaya/J179/{$mac}.cfg |  6 +--
 .../templates/provision/avaya/J189/{$mac}.cfg |  8 ++--
 5 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/app/avaya/app_config.php b/app/avaya/app_config.php
index 645fbc6dcb..ea1e386394 100644
--- a/app/avaya/app_config.php
+++ b/app/avaya/app_config.php
@@ -111,6 +111,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "800 x 480 pixels max. JPG only. Max file size is 256KB";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "554de3b3-444a-4221-9d15-524be3ef71a8";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "avaya_j189_wallpaper_filename";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The filename of the default wallpaper to be displayed";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "90222f45-3996-4b74-89bc-68f12ad78afe";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "avaya_j189_secondary_wallpaper_url";
@@ -119,6 +127,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "240 x 320 pixels max. JPG only. Max file size is 256KB";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "1b08fd61-246f-4053-a053-568e7128e3e1";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "avaya_j189_secondary_wallpaper_filename";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The filename of the default wallpaper to be displayed";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "75d92d17-6096-47ec-89f6-bbf17479fb85";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "avaya_j179_wallpaper_url";
@@ -127,6 +143,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "320 x 240 pixels max. JPG only. Max file size is 256KB";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7b45e899-53ac-41b5-94c6-b485a41f66ff";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "avaya_j179_wallpaper_filename";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The filename of the default wallpaper to be displayed";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4244f3b6-78cd-46a2-bdbd-e0d8452c4de3";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "avaya_j139_wallpaper_url";
@@ -135,6 +159,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "320 x 240 pixels max. JPG only. Max file size is 256KB";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "234e2429-11dc-4a62-be81-79737085284c";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "avaya_j139_wallpaper_filename";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The filename of the default wallpaper to be displayed";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "30cbfda7-f068-463f-80a4-aeecf8c48eaf";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "avaya_j169_wallpaper_url";
@@ -143,6 +175,14 @@
 		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
 		$apps[$x]['default_settings'][$y]['default_setting_description'] = "320 x 240 pixels max. JPG only. Max file size is 256KB";
 		$y++;
+		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7e29deec-d19a-4ff2-ab5b-513fa824e4ed";
+		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
+		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "avaya_j169_wallpaper_filename";
+		$apps[$x]['default_settings'][$y]['default_setting_name'] = "text";
+		$apps[$x]['default_settings'][$y]['default_setting_value'] = "";
+		$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false";
+		$apps[$x]['default_settings'][$y]['default_setting_description'] = "The filename of the default wallpaper to be displayed";
+		$y++;
 		$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a53f2369-19fb-449d-8daa-189707b79cc6";
 		$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
 		$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "avaya_ntp_server";
diff --git a/resources/templates/provision/avaya/J139/{$mac}.cfg b/resources/templates/provision/avaya/J139/{$mac}.cfg
index a78121f254..aa001d4729 100644
--- a/resources/templates/provision/avaya/J139/{$mac}.cfg
+++ b/resources/templates/provision/avaya/J139/{$mac}.cfg
@@ -141,7 +141,7 @@ SET PSTN_VM_NUM *97
 {if isset($avaya_j139_wallpaper_url)}
 SET BACKGROUND_IMAGE "{$avaya_j139_wallpaper_url}"
 SET BACKGROUND_IMAGE_AVAILABLE "{$avaya_j139_wallpaper_url}"
-SET BACKGROUND_IMAGE_DISPLAY "{$avaya_j139_wallpaper_url}"
+SET BACKGROUND_IMAGE_DISPLAY "{$avaya_j139_wallpaper_filename}"
 {/if}
 
 ## Disable Avaya Mode
diff --git a/resources/templates/provision/avaya/J169/{$mac}.cfg b/resources/templates/provision/avaya/J169/{$mac}.cfg
index 46a1ec9768..2d33a60e97 100644
--- a/resources/templates/provision/avaya/J169/{$mac}.cfg
+++ b/resources/templates/provision/avaya/J169/{$mac}.cfg
@@ -141,7 +141,7 @@ SET PSTN_VM_NUM *97
 {if isset($avaya_j169_wallpaper_url)}
 SET BACKGROUND_IMAGE "{$avaya_j169_wallpaper_url}"
 SET BACKGROUND_IMAGE_AVAILABLE "{$avaya_j169_wallpaper_url}"
-SET BACKGROUND_IMAGE_DISPLAY "{$avaya_j169_wallpaper_url}"
+SET BACKGROUND_IMAGE_DISPLAY "{$avaya_j169_wallpaper_filename}"
 {/if}
 
 ## Disable Avaya Mode
diff --git a/resources/templates/provision/avaya/J179/{$mac}.cfg b/resources/templates/provision/avaya/J179/{$mac}.cfg
index 7a8440422e..bcd73af710 100644
--- a/resources/templates/provision/avaya/J179/{$mac}.cfg
+++ b/resources/templates/provision/avaya/J179/{$mac}.cfg
@@ -139,9 +139,9 @@ SET PSTN_VM_NUM *97
 ## Wallpaper dimensions: 320 x 240 pixels
 ## The Avaya JEM24 will display the default wallpaper if you use a custom image.
 {if isset($avaya_j179_wallpaper)}
-SET BACKGROUND_IMAGE "{$avaya_j179_wallpaper}"
-SET BACKGROUND_IMAGE_AVAILABLE "{$avaya_j179_wallpaper}"
-SET BACKGROUND_IMAGE_DISPLAY "{$avaya_j179_wallpaper}"
+SET BACKGROUND_IMAGE "{$avaya_j179_wallpaper_url}"
+SET BACKGROUND_IMAGE_AVAILABLE "{$avaya_j179_wallpaper_url}"
+SET BACKGROUND_IMAGE_DISPLAY "{$avaya_j179_wallpaper_filename}"
 {/if}
 
 ## Disable Avaya Mode
diff --git a/resources/templates/provision/avaya/J189/{$mac}.cfg b/resources/templates/provision/avaya/J189/{$mac}.cfg
index d96b000e3e..1f10ce5533 100644
--- a/resources/templates/provision/avaya/J189/{$mac}.cfg
+++ b/resources/templates/provision/avaya/J189/{$mac}.cfg
@@ -142,12 +142,12 @@ SET PSTN_VM_NUM *97
 {if isset($avaya_j189_wallpaper_url)}
 SET BACKGROUND_IMAGE "{$avaya_j189_wallpaper_url}"
 SET BACKGROUND_IMAGE_AVAILABLE "{$avaya_j189_wallpaper_url}"
-SET BACKGROUND_IMAGE_DISPLAY "{$avaya_j189_wallpaper_url}"
+SET BACKGROUND_IMAGE_DISPLAY "{$avaya_j189_wallpaper_filename}"
 {/if}
 {if isset($avaya_j189_secondary_wallpaper_url)}
-SET BACKGROUND_IMAGE "{$avaya_j189_secondary_wallpaper_url}"
-SET BACKGROUND_IMAGE_AVAILABLE "{$avaya_j189_secondary_wallpaper_url}"
-SET BACKGROUND_IMAGE_DISPLAY "{$avaya_j189_wallpaper_url}"
+SET BACKGROUND_IMAGE_SECONDARY "{$avaya_j189_secondary_wallpaper_url}"
+SET BACKGROUND_IMAGE_AVAILABLE_SECONDARY "{$avaya_j189_secondary_wallpaper_url}"
+SET BACKGROUND_IMAGE_DISPLAY_SECONDARY "{$avaya_j189_secondary_wallpaper_filename}"
 {/if}
 
 ## Disable Avaya Mode