From 6fa4c8626e219e801723a263fd47a6f2c39daba4 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Tue, 6 Jul 2021 08:58:47 +0200
Subject: [PATCH 1/3] Revert "Fix Issue #25"

This reverts commit c1aab666b3e47d2fc549bcbeb434fff4b9903078.
---
 sccpManClasses/xmlinterface.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sccpManClasses/xmlinterface.class.php b/sccpManClasses/xmlinterface.class.php
index bb7f90a..0107c5e 100644
--- a/sccpManClasses/xmlinterface.class.php
+++ b/sccpManClasses/xmlinterface.class.php
@@ -287,10 +287,10 @@ function create_SEP_XML($store_path = '', $data_values = array(), $dev_config =
                         if (!empty($dev_config['addon'])) {
                             $xnode = $xml_work->addChild('addOnModules');
                             $ti = 1;
-                            $hw_addon = explode(';', $dev_config['addon']);
+                            $hw_addon = explode(',', $dev_config['addon']);
                             foreach ($hw_addon as $add_key) {
-                                if (!empty($dev_config['addon_info'][$dev_config['addon']])) {
-                                    $add_val = $dev_config['addon_info'][$dev_config['addon']];
+                                if (!empty($dev_config['addon_info'][$add_key])) {
+                                    $add_val = $dev_config['addon_info'][$add_key];
                                     $xnode_obj = $xnode->addChild('addOnModule');
                                     $xnode_obj->addAttribute('idx', $ti);
                                     $xnode_obj->addChild('loadInformation', $add_val);

From 4ad33852fdb95ecde70220de9556df7e98872e78 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:01:26 +0200
Subject: [PATCH 2/3] Revert "Revert "Fix Issue #25""

This reverts commit 6fa4c8626e219e801723a263fd47a6f2c39daba4.
---
 sccpManClasses/xmlinterface.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sccpManClasses/xmlinterface.class.php b/sccpManClasses/xmlinterface.class.php
index 0107c5e..bb7f90a 100644
--- a/sccpManClasses/xmlinterface.class.php
+++ b/sccpManClasses/xmlinterface.class.php
@@ -287,10 +287,10 @@ function create_SEP_XML($store_path = '', $data_values = array(), $dev_config =
                         if (!empty($dev_config['addon'])) {
                             $xnode = $xml_work->addChild('addOnModules');
                             $ti = 1;
-                            $hw_addon = explode(',', $dev_config['addon']);
+                            $hw_addon = explode(';', $dev_config['addon']);
                             foreach ($hw_addon as $add_key) {
-                                if (!empty($dev_config['addon_info'][$add_key])) {
-                                    $add_val = $dev_config['addon_info'][$add_key];
+                                if (!empty($dev_config['addon_info'][$dev_config['addon']])) {
+                                    $add_val = $dev_config['addon_info'][$dev_config['addon']];
                                     $xnode_obj = $xnode->addChild('addOnModule');
                                     $xnode_obj->addAttribute('idx', $ti);
                                     $xnode_obj->addChild('loadInformation', $add_val);

From 47522b4a259147ab2a1326fd77890c3c364ccd83 Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Tue, 6 Jul 2021 09:06:10 +0200
Subject: [PATCH 3/3] Update SIP cnf as well

---
 sccpManClasses/xmlinterface.class.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/sccpManClasses/xmlinterface.class.php b/sccpManClasses/xmlinterface.class.php
index bb7f90a..394400c 100644
--- a/sccpManClasses/xmlinterface.class.php
+++ b/sccpManClasses/xmlinterface.class.php
@@ -610,11 +610,15 @@ function create_SEP_SIP_XML($store_path = '', $data_values = array(), $dev_confi
                         if (!empty($dev_config['addon'])) {
                             $xnode = $xml_work->addChild('addOnModules');
                             $ti = 1;
-                            foreach ($dev_config['addon_info'] as $add_key => $add_val) {
-                                $xnode_obj = $xnode->addChild('addOnModule');
-                                $xnode_obj->addAttribute('idx', $ti);
-                                $xnode_obj->addChild('loadInformation', $add_val);
-                                $ti++;
+                            $hw_addon = explode(';', $dev_config['addon']);
+                            foreach ($hw_addon as $add_key) {
+                                if (!empty($dev_config['addon_info'][$dev_config['addon']])) {
+                                    $add_val = $dev_config['addon_info'][$dev_config['addon']];
+                                    $xnode_obj = $xnode->addChild('addOnModule');
+                                    $xnode_obj->addAttribute('idx', $ti);
+                                    $xnode_obj->addChild('loadInformation', $add_val);
+                                    $ti++;
+                                }
                             }
                         }
                         break;