From 360ceea6cddbf113a5c02aaa4e2fe2cbe293fa14 Mon Sep 17 00:00:00 2001 From: stevenA Date: Sat, 15 Jan 2022 10:48:36 +0100 Subject: [PATCH] Upgrade Installer Installer was dropping new 14.3 columns data as these columns did not exist in module.xml schema. Modify schema to include all columns, including legacy columns, and then move data prior to modifying schema. --- Sccp_manager.class.php | 4 +- conf/CiscoIPPhone.xsd | 803 +++++++++++++++++++++++ conf/SEP0000000000.cnf.xml_796x_template | 2 +- conf/sccpgeneral.xml.v433 | 2 +- install.php | 126 +++- module.xml | 88 ++- sccpManClasses/xmlinterface.class.php | 89 +-- 7 files changed, 1030 insertions(+), 84 deletions(-) create mode 100644 conf/CiscoIPPhone.xsd diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php index 4d4e7b0..a74a5d8 100644 --- a/Sccp_manager.class.php +++ b/Sccp_manager.class.php @@ -675,9 +675,9 @@ private function findInstLangs() { */ private function initializeTFtpLanguagePath() { - $dir = $this->sccppath["tftp_lang_path"]; + //$dir = $this->sccppath["tftp_lang_path"]; foreach ($this->extconfigs->getExtConfig('sccp_lang') as $langKey => $langValueArr) { - $localeDir = $dir . DIRECTORY_SEPARATOR . $langValueArr['locale']; + $localeDir = $this->sccppath["tftp_lang_path"] . DIRECTORY_SEPARATOR . $langValueArr['locale']; if (!is_dir($localeDir)) { if (!mkdir($localeDir, 0755, true)) { die("Error creating $localeDir directory"); diff --git a/conf/CiscoIPPhone.xsd b/conf/CiscoIPPhone.xsd new file mode 100644 index 0000000..4e333b1 --- /dev/null +++ b/conf/CiscoIPPhone.xsd @@ -0,0 +1,803 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/conf/SEP0000000000.cnf.xml_796x_template b/conf/SEP0000000000.cnf.xml_796x_template index 5970926..3ee1f1f 100644 --- a/conf/SEP0000000000.cnf.xml_796x_template +++ b/conf/SEP0000000000.cnf.xml_796x_template @@ -39,7 +39,7 @@ 120 - {Jan 01 2003 00:00:00} + {Jan 01 2003 00:00:00} P00308010100 false diff --git a/conf/sccpgeneral.xml.v433 b/conf/sccpgeneral.xml.v433 index 835cda5..5dee7b6 100644 --- a/conf/sccpgeneral.xml.v433 +++ b/conf/sccpgeneral.xml.v433 @@ -502,7 +502,7 @@ and open the template in the editor. Base Version before all crash :-) - + dateformat