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.
This commit is contained in:
stevenA
parent
0dec44161f
commit
360ceea6cd
|
|
@ -675,9 +675,9 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
|
||||||
*/
|
*/
|
||||||
|
|
||||||
private function initializeTFtpLanguagePath() {
|
private function initializeTFtpLanguagePath() {
|
||||||
$dir = $this->sccppath["tftp_lang_path"];
|
//$dir = $this->sccppath["tftp_lang_path"];
|
||||||
foreach ($this->extconfigs->getExtConfig('sccp_lang') as $langKey => $langValueArr) {
|
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 (!is_dir($localeDir)) {
|
||||||
if (!mkdir($localeDir, 0755, true)) {
|
if (!mkdir($localeDir, 0755, true)) {
|
||||||
die("Error creating $localeDir directory");
|
die("Error creating $localeDir directory");
|
||||||
|
|
|
||||||
803
conf/CiscoIPPhone.xsd
Normal file
803
conf/CiscoIPPhone.xsd
Normal file
|
|
@ -0,0 +1,803 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!-- edited with XML Spy v4.4 U (http://www.xmlspy.com) by Cisco Systems, Inc. (Cisco Systems, Inc.) -->
|
||||||
|
<!-- Last updated 31 Dec 20 -->
|
||||||
|
<!-- The following Cisco IP Phones implement this XML parser: 6921, 6941, 6945, 6961, 7906G, 7911G, 7921G, 7925G, 7925G-EX, 7926G, 7931G, 7941G, 7941G-GE 7942G, 7945G, 7961G, 7961G-GE, 7962G, 7965G, 7970G, 7971G-GE, 7975G, 8800 Series, 8821, 8961, 9951, and 9971.-->
|
||||||
|
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
|
||||||
|
attributeFormDefault="unqualified" version="3.3.4">
|
||||||
|
<xsd:complexType name="CiscoIPPhoneExecuteItemType">
|
||||||
|
<xsd:attribute name="Priority" use="optional">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedByte">
|
||||||
|
<xsd:minInclusive value="0"/>
|
||||||
|
<xsd:maxInclusive value="2"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:attribute>
|
||||||
|
<xsd:attribute name="URL" use="required">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
<xsd:minLength value="1"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:attribute>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:complexType name="CiscoIPPhoneResponseItemType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Status" type="xsd:short"/>
|
||||||
|
<xsd:element name="Data">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="32"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="URL">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:complexType name="CiscoIPPhoneTouchAreaMenuItemType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Name" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="32"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="URL" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="TouchArea" type="CiscoIPPhoneTouchAreaType" minOccurs="0"/>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:complexType name="CiscoIPPhoneTouchAreaType">
|
||||||
|
<xsd:attribute name="X1" type="xsd:unsignedShort" use="required"/>
|
||||||
|
<xsd:attribute name="Y1" type="xsd:unsignedShort" use="required"/>
|
||||||
|
<xsd:attribute name="X2" type="xsd:unsignedShort" use="required"/>
|
||||||
|
<xsd:attribute name="Y2" type="xsd:unsignedShort" use="required"/>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:complexType name="CiscoIPPhoneDirectoryEntryType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Name" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="32"/>
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Telephone" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="32"/>
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:complexType name="CiscoIPPhoneInputItemType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="DisplayName" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="32"/>
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="QueryStringParam">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="32"/>
|
||||||
|
<xsd:minLength value="1"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="InputFlags">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:enumeration value="A"/>
|
||||||
|
<xsd:enumeration value="T"/>
|
||||||
|
<xsd:enumeration value="N"/>
|
||||||
|
<xsd:enumeration value="E"/>
|
||||||
|
<xsd:enumeration value="U"/>
|
||||||
|
<xsd:enumeration value="L"/>
|
||||||
|
<xsd:enumeration value="AP"/>
|
||||||
|
<xsd:enumeration value="TP"/>
|
||||||
|
<xsd:enumeration value="NP"/>
|
||||||
|
<xsd:enumeration value="EP"/>
|
||||||
|
<xsd:enumeration value="UP"/>
|
||||||
|
<xsd:enumeration value="LP"/>
|
||||||
|
<xsd:enumeration value="PA"/>
|
||||||
|
<xsd:enumeration value="PT"/>
|
||||||
|
<xsd:enumeration value="PN"/>
|
||||||
|
<xsd:enumeration value="PE"/>
|
||||||
|
<xsd:enumeration value="PU"/>
|
||||||
|
<xsd:enumeration value="PL"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="DefaultValue" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="32"/>
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:complexType name="CiscoIPPhoneMenuItemType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Name" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="64"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="URL" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:complexType name="CiscoIPPhoneIconItemType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Index" type="xsd:unsignedShort"/>
|
||||||
|
<xsd:element name="Width">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="16"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Height">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="10"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Depth">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="2"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Data" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:hexBinary">
|
||||||
|
<xsd:maxLength value="40"/>
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:complexType name="CiscoIPPhoneIconMenuItemType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Name" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="64"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="URL" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="IconIndex" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="0"/>
|
||||||
|
<xsd:maxInclusive value="9"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:complexType name="CiscoIPPhoneIconFileItemType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Index">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="0"/>
|
||||||
|
<xsd:maxInclusive value="9"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="URL">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="1"/>
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:complexType name="CiscoIPPhoneKeyType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Key">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:enumeration value="KeyPad0"/>
|
||||||
|
<xsd:enumeration value="KeyPad1"/>
|
||||||
|
<xsd:enumeration value="KeyPad2"/>
|
||||||
|
<xsd:enumeration value="KeyPad3"/>
|
||||||
|
<xsd:enumeration value="KeyPad4"/>
|
||||||
|
<xsd:enumeration value="KeyPad5"/>
|
||||||
|
<xsd:enumeration value="KeyPad6"/>
|
||||||
|
<xsd:enumeration value="KeyPad7"/>
|
||||||
|
<xsd:enumeration value="KeyPad8"/>
|
||||||
|
<xsd:enumeration value="KeyPad9"/>
|
||||||
|
<xsd:enumeration value="KeyPadStar"/>
|
||||||
|
<xsd:enumeration value="KeyPadPound"/>
|
||||||
|
<xsd:enumeration value="NavUp"/>
|
||||||
|
<xsd:enumeration value="NavDown"/>
|
||||||
|
<xsd:enumeration value="NavLeft"/>
|
||||||
|
<xsd:enumeration value="NavRight"/>
|
||||||
|
<xsd:enumeration value="NavSelect"/>
|
||||||
|
<xsd:enumeration value="NavBack"/>
|
||||||
|
<xsd:enumeration value="PushToTalk"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="URL" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="URLDown" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:complexType name="CiscoIPPhoneSoftKeyType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Name" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="32"/>
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Position">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="8"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="URL" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="URLDown" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:complexType name="CiscoIPPhoneDisplayableType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Title" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="32"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Prompt" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="32"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="SoftKeyItem" type="CiscoIPPhoneSoftKeyType" minOccurs="0" maxOccurs="8"/>
|
||||||
|
<xsd:element name="KeyItem" type="CiscoIPPhoneKeyType" minOccurs="0" maxOccurs="32"/>
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="keypadTarget" use="optional" default="application">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:enumeration value="application"/>
|
||||||
|
<xsd:enumeration value="applicationCall"/>
|
||||||
|
<xsd:enumeration value="activeCall"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:attribute>
|
||||||
|
<xsd:attribute name="appId" use="optional">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="1"/>
|
||||||
|
<xsd:maxLength value="64"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:attribute>
|
||||||
|
<xsd:attribute name="onAppFocusLost" use="optional">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="1"/>
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:attribute>
|
||||||
|
<xsd:attribute name="onAppFocusGained" use="optional">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="1"/>
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:attribute>
|
||||||
|
<xsd:attribute name="onAppMinimized" use="optional">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="1"/>
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:attribute>
|
||||||
|
<xsd:attribute name="onAppClosed" use="optional">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="1"/>
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:attribute>
|
||||||
|
</xsd:complexType>
|
||||||
|
<xsd:element name="CiscoIPPhoneExecute">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="ExecuteItem" type="CiscoIPPhoneExecuteItemType" maxOccurs="3"/>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPhoneResponse">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="ResponseItem" type="CiscoIPPhoneResponseItemType" maxOccurs="3"/>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneError">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:attribute name="Number" type="xsd:unsignedShort" use="required"/>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneText">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:complexContent>
|
||||||
|
<xsd:extension base="CiscoIPPhoneDisplayableType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Text" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="4000"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:extension>
|
||||||
|
</xsd:complexContent>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneInput">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:complexContent>
|
||||||
|
<xsd:extension base="CiscoIPPhoneDisplayableType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="URL">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="1"/>
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="InputItem" type="CiscoIPPhoneInputItemType" minOccurs="0" maxOccurs="5"/>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:extension>
|
||||||
|
</xsd:complexContent>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneDirectory">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:complexContent>
|
||||||
|
<xsd:extension base="CiscoIPPhoneDisplayableType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="DirectoryEntry" type="CiscoIPPhoneDirectoryEntryType" minOccurs="0" maxOccurs="32"/>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:extension>
|
||||||
|
</xsd:complexContent>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneImage">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:complexContent>
|
||||||
|
<xsd:extension base="CiscoIPPhoneDisplayableType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="LocationX" default="0" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="-1"/>
|
||||||
|
<xsd:maxInclusive value="132"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="LocationY" default="0" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="-1"/>
|
||||||
|
<xsd:maxInclusive value="64"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Width">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="133"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Height">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="65"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Depth">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="2"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Data" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:hexBinary">
|
||||||
|
<xsd:maxLength value="2162"/>
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:extension>
|
||||||
|
</xsd:complexContent>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneImageFile">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:complexContent>
|
||||||
|
<xsd:extension base="CiscoIPPhoneDisplayableType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="LocationX" default="0" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="-1"/>
|
||||||
|
<xsd:maxInclusive value="297"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="LocationY" default="0" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="-1"/>
|
||||||
|
<xsd:maxInclusive value="167"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="URL">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
<xsd:minLength value="1"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:extension>
|
||||||
|
</xsd:complexContent>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneMenu">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:complexContent>
|
||||||
|
<xsd:extension base="CiscoIPPhoneDisplayableType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="MenuItem" type="CiscoIPPhoneMenuItemType" minOccurs="0" maxOccurs="100"/>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:extension>
|
||||||
|
</xsd:complexContent>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneIconMenu">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:complexContent>
|
||||||
|
<xsd:extension base="CiscoIPPhoneDisplayableType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="MenuItem" type="CiscoIPPhoneIconMenuItemType" minOccurs="0" maxOccurs="32"/>
|
||||||
|
<xsd:element name="IconItem" type="CiscoIPPhoneIconItemType" minOccurs="0" maxOccurs="10"/>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:extension>
|
||||||
|
</xsd:complexContent>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneIconFileMenu">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:complexContent>
|
||||||
|
<xsd:extension base="CiscoIPPhoneDisplayableType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="MenuItem" type="CiscoIPPhoneIconMenuItemType" minOccurs="0" maxOccurs="32"/>
|
||||||
|
<xsd:element name="IconItem" type="CiscoIPPhoneIconFileItemType" minOccurs="0" maxOccurs="10"/>
|
||||||
|
</xsd:sequence>
|
||||||
|
<xsd:attribute name="IconIndex" type="xsd:unsignedShort" use="optional"/>
|
||||||
|
</xsd:extension>
|
||||||
|
</xsd:complexContent>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneGraphicMenu">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:complexContent>
|
||||||
|
<xsd:extension base="CiscoIPPhoneDisplayableType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="LocationX" default="0" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="-1"/>
|
||||||
|
<xsd:maxInclusive value="132"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="LocationY" default="0" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="-1"/>
|
||||||
|
<xsd:maxInclusive value="64"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Width">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="133"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Height">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="65"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Depth">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="2"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Data" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:hexBinary">
|
||||||
|
<xsd:maxLength value="2162"/>
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="MenuItem" type="CiscoIPPhoneMenuItemType" minOccurs="0" maxOccurs="12"/>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:extension>
|
||||||
|
</xsd:complexContent>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneGraphicFileMenu">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:complexContent>
|
||||||
|
<xsd:extension base="CiscoIPPhoneDisplayableType">
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="LocationX" default="0" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="-1"/>
|
||||||
|
<xsd:maxInclusive value="297"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="LocationY" default="0" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="-1"/>
|
||||||
|
<xsd:maxInclusive value="167"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="URL">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
<xsd:minLength value="1"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="MenuItem" type="CiscoIPPhoneTouchAreaMenuItemType" minOccurs="0" maxOccurs="32"/>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:extension>
|
||||||
|
</xsd:complexContent>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneStatus">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Text" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="32"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Timer" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="LocationX" default="0" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="-1"/>
|
||||||
|
<xsd:maxInclusive value="105"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="LocationY" default="0" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="-1"/>
|
||||||
|
<xsd:maxInclusive value="20"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Width">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="106"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Height">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="21"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Depth">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="1"/>
|
||||||
|
<xsd:maxInclusive value="2"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Data" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:hexBinary">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="557"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="CiscoIPPhoneStatusFile">
|
||||||
|
<xsd:complexType>
|
||||||
|
<xsd:sequence>
|
||||||
|
<xsd:element name="Text" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="0"/>
|
||||||
|
<xsd:maxLength value="32"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="Timer" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:unsignedShort">
|
||||||
|
<xsd:minInclusive value="0"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="LocationX" default="0" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="-1"/>
|
||||||
|
<xsd:maxInclusive value="261"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="LocationY" default="0" minOccurs="0">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:short">
|
||||||
|
<xsd:minInclusive value="-1"/>
|
||||||
|
<xsd:maxInclusive value="49"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
<xsd:element name="URL">
|
||||||
|
<xsd:simpleType>
|
||||||
|
<xsd:restriction base="xsd:string">
|
||||||
|
<xsd:minLength value="1"/>
|
||||||
|
<xsd:maxLength value="256"/>
|
||||||
|
</xsd:restriction>
|
||||||
|
</xsd:simpleType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:sequence>
|
||||||
|
</xsd:complexType>
|
||||||
|
</xsd:element>
|
||||||
|
</xsd:schema>
|
||||||
|
|
@ -502,7 +502,7 @@ and open the template in the editor. Base Version before all crash :-)
|
||||||
|
|
||||||
<page_group name="sccp_dev_time">
|
<page_group name="sccp_dev_time">
|
||||||
<label>SCCP Time Service config</label>
|
<label>SCCP Time Service config</label>
|
||||||
<item type="SLD" id="1" seq="1">
|
<item type="SLD" id="1" seq="0">
|
||||||
<label>Display Day Format</label>
|
<label>Display Day Format</label>
|
||||||
<name>dateformat</name>
|
<name>dateformat</name>
|
||||||
<select>
|
<select>
|
||||||
|
|
|
||||||
126
install.php
126
install.php
|
|
@ -377,12 +377,72 @@ function CheckChanSCCPCompatible()
|
||||||
|
|
||||||
function InstallDB_updateSchema($db_config)
|
function InstallDB_updateSchema($db_config)
|
||||||
{
|
{
|
||||||
|
/*
|
||||||
|
Initially, referred to schema existing and created db from scratch. This required
|
||||||
|
initialising sccp_manager object which in term required that sccpsettings existed
|
||||||
|
To overcome this, moved to creation/modification of db via module.xml.
|
||||||
|
In early version of 14.3, only used initial fields present in older versions, and then
|
||||||
|
added new required fields. This resulted in new fields being dropped at next install.
|
||||||
|
Now include all fields in module.xml, and then transfer any data in old fields to new fields
|
||||||
|
before then deleting old fields, rather than renaming columns which will no longer work as
|
||||||
|
the new column already exists, and may contain data. This affected 36 fields in sccpdevice
|
||||||
|
and 5 fields in sccpline which in old db schema used _ prefix to hide from chan-sccp.
|
||||||
|
*/
|
||||||
global $db;
|
global $db;
|
||||||
if (!$db_config) {
|
if (!$db_config) {
|
||||||
die_freepbx("No db_config provided");
|
die_freepbx("No db_config provided");
|
||||||
}
|
}
|
||||||
|
outn("<li>" . _("Saving legacy data into current column") . "</li>");
|
||||||
|
$priorSchemaFields = array(
|
||||||
|
'sccpdevice' => array(
|
||||||
|
'_description', '_loginname', '_profileid', '_dialrules', '_devlang', '_netlang', '_logserver',
|
||||||
|
'_daysdisplaynotactive', '_displayontime', '_displayonduration', '_displayidletimeout', '_settingsaccess', '_videocapability',
|
||||||
|
'_webaccess', '_webadmin', '_pcport', '_spantopcport', '_voicevlanaccess', '_enablecdpswport', '_enablecdppcport',
|
||||||
|
'_enablelldpswport', '_enablelldppcport', '_firstdigittimeout', '_digittimeout', '_cfwdnoanswer_timeout',
|
||||||
|
'_autoanswer_ring_time', '_autoanswer_tone', '_remotehangup_tone', '_transfer_tone', '_callwaiting_tone',
|
||||||
|
'_callanswerorder', '_sccp_tos', '_sccp_cos', '_dev_sshPassword', '_dev_sshUserId', '_phonepersonalization'),
|
||||||
|
'sccpline' => array(
|
||||||
|
'_regcontext', '_transfer_on_hangup', '_autoselectline_enabled', '_autocall_select', '_backgroundImageAccess', '_callLogBlfEnabled')
|
||||||
|
);
|
||||||
|
foreach ($priorSchemaFields as $table => $fieldsArr) {
|
||||||
|
// First get any data in columns to be deleted ( _Column)
|
||||||
|
$sqlMatch = array_reduce($fieldsArr, function($carry, $column) {
|
||||||
|
return "${carry} ${column} IS NOT NULL OR";
|
||||||
|
});
|
||||||
|
unset($column);
|
||||||
|
$sqlFields = array_reduce($fieldsArr, function($carry, $column) {
|
||||||
|
return "${carry} ${column} AS " . ltrim($column,"_") .",";
|
||||||
|
});
|
||||||
|
|
||||||
|
$sqlMatch = rtrim($sqlMatch, "OR");
|
||||||
|
$sqlFields = rtrim($sqlFields, ",");
|
||||||
|
$stmt = $db->prepare("SELECT name, ${sqlFields} FROM ${table} WHERE ${sqlMatch}");
|
||||||
|
$stmt->execute();
|
||||||
|
$dbResult = $stmt->fetchAll(\PDO::FETCH_ASSOC|\PDO::FETCH_UNIQUE);
|
||||||
|
// Now move any data found from _Column to Column. This is safe as the two should not exist.
|
||||||
|
if (!empty($dbResult)) {
|
||||||
|
foreach ($dbResult as $name => $columnArr) {
|
||||||
|
$sqlVar = array_reduce(array_keys($columnArr), function($carry, $key) use ($columnArr){
|
||||||
|
$carry .= (isset($columnArr[$key])) ? "${key} = '${columnArr[$key]}'," : "";
|
||||||
|
return $carry;
|
||||||
|
});
|
||||||
|
$sqlVar = rtrim($sqlVar, ",");
|
||||||
|
$stmt = $db->prepare("UPDATE ${table} SET ${sqlVar} WHERE name = '${name}'");
|
||||||
|
$stmt->execute();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Processed all _Column names; now safe to delete them
|
||||||
|
$sqlDrop = array_reduce($fieldsArr, function($carry, $column) {
|
||||||
|
return "${carry} DROP COLUMN IF EXISTS ${column},";
|
||||||
|
});
|
||||||
|
$sqlDrop = rtrim($sqlDrop, ", ");
|
||||||
|
$stmt = $db->prepare("ALTER TABLE ${table} ${sqlDrop}");
|
||||||
|
$stmt->execute();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Now process the column updates as per the legacy installer
|
||||||
$count_modify = 0;
|
$count_modify = 0;
|
||||||
outn("<li>" . _("Modify Database schema") . "</li>");
|
outn("<li>" . _("Modifying Database schema") . "</li>");
|
||||||
foreach ($db_config as $tabl_name => $tab_modif) {
|
foreach ($db_config as $tabl_name => $tab_modif) {
|
||||||
$sql_create = '';
|
$sql_create = '';
|
||||||
$sql_modify = '';
|
$sql_modify = '';
|
||||||
|
|
@ -399,9 +459,11 @@ function InstallDB_updateSchema($db_config)
|
||||||
foreach ($db_result as $fld_id => $tabl_data) {
|
foreach ($db_result as $fld_id => $tabl_data) {
|
||||||
if (!empty($tab_modif[$fld_id])) {
|
if (!empty($tab_modif[$fld_id])) {
|
||||||
// have column in table so potentially something to update
|
// have column in table so potentially something to update
|
||||||
// if dropping column, prepare sql and continue
|
// if dropping column, prepare sql and continue. The drop case will never
|
||||||
|
// occur as columns that are dropped should no longer be in the module.xml schema
|
||||||
|
// and so Doctrine will have already dropped them.
|
||||||
if (!empty($tab_modif[$fld_id]['drop'])) {
|
if (!empty($tab_modif[$fld_id]['drop'])) {
|
||||||
$sql_create .= "DROP COLUMN {$row_fld}, ";
|
$sql_create .= "DROP COLUMN IF EXISTS {$row_fld}, ";
|
||||||
unset($tab_modif[$fld_id]['drop']);
|
unset($tab_modif[$fld_id]['drop']);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
@ -438,25 +500,33 @@ function InstallDB_updateSchema($db_config)
|
||||||
$count_modify ++;
|
$count_modify ++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// Now handle rename. Need to be carefull that the newname does not exist. If it does then need to
|
||||||
|
// ignore or unexpected things may happen.
|
||||||
if (!empty($tab_modif[$fld_id]['rename'])) {
|
if (!empty($tab_modif[$fld_id]['rename'])) {
|
||||||
// Field currently exists so need to rename (and keep data)
|
// Field currently exists so need to rename (and keep data). All of legacy _columns have already
|
||||||
|
// been dropped so will not get here as $fld_id cannot be _column.
|
||||||
// for backward compatibility use CHANGE - REPLACE is only available in MariaDb > 10.5.
|
// for backward compatibility use CHANGE - REPLACE is only available in MariaDb > 10.5.
|
||||||
$fld_id_newName = $tab_modif[$fld_id]['rename'];
|
$fld_id_newName = $tab_modif[$fld_id]['rename'];
|
||||||
// Does a create exist for newName
|
|
||||||
if (!empty($tab_modif[$fld_id_newName]['create'])) {
|
// Only execute if the newname column does not already exist.
|
||||||
//carry the attributes from the new create to the rename
|
if (empty($db_result[$fld_id_newName])) {
|
||||||
$sql_rename .= "CHANGE COLUMN {$fld_id} {$fld_id_newName} {$tab_modif[$fld_id_newName]['create']}, ";
|
// Trying to rename to an existing column. Ignore this case.
|
||||||
// do not create newName as modifying existing
|
// Does a create exist for newName
|
||||||
unset($tab_modif[$fld_id_newName]['create']);
|
if (!empty($tab_modif[$fld_id_newName]['create'])) {
|
||||||
} else {
|
//carry the attributes from the new create to the rename
|
||||||
// add current attributes to the new name.
|
$sql_rename .= "CHANGE COLUMN {$fld_id} {$fld_id_newName} {$tab_modif[$fld_id_newName]['create']}, ";
|
||||||
$existingAttrs = strtoupper($tabl_data['Type']).(($tabl_data['Null'] == 'NO') ?' NOT NULL': ' NULL') .
|
// do not create newName as modifying existing
|
||||||
((empty($tabl_data['Default']))?'': ' DEFAULT ' . "'" . $tabl_data['Default']."'");
|
unset($tab_modif[$fld_id_newName]['create']);
|
||||||
$sql_rename .= "CHANGE COLUMN {$fld_id} {$fld_id_newName} {$existingAttrs}, ";
|
} else {
|
||||||
|
// add current attributes to the new name.
|
||||||
|
$existingAttrs = strtoupper($tabl_data['Type']).(($tabl_data['Null'] == 'NO') ?' NOT NULL': ' NULL') .
|
||||||
|
((empty($tabl_data['Default']))?'': ' DEFAULT ' . "'" . $tabl_data['Default']."'");
|
||||||
|
$sql_rename .= "CHANGE COLUMN {$fld_id} {$fld_id_newName} {$existingAttrs}, ";
|
||||||
|
}
|
||||||
|
$count_modify ++;
|
||||||
}
|
}
|
||||||
|
// Have treated this rename so unset. If the newname already exists, have done nothing.
|
||||||
unset($tab_modif[$fld_id]['rename']);
|
unset($tab_modif[$fld_id]['rename']);
|
||||||
$count_modify ++;
|
|
||||||
}
|
}
|
||||||
// is there a create for this field
|
// is there a create for this field
|
||||||
if (!empty($tab_modif[$fld_id]['create'])) {
|
if (!empty($tab_modif[$fld_id]['create'])) {
|
||||||
|
|
@ -502,15 +572,6 @@ function InstallDB_updateSchema($db_config)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
outn("<li>" . _("Total modify count :") . $count_modify . "</li>");
|
outn("<li>" . _("Total modify count :") . $count_modify . "</li>");
|
||||||
/*
|
|
||||||
$stmt = $db->prepare('SELECT CASE WHEN EXISTS(SELECT 1 FROM sccpdevmodel) THEN 0 ELSE 1 END AS IsEmpty;');
|
|
||||||
$stmt->execute();
|
|
||||||
$result = $stmt->fetchAll(\PDO::FETCH_ASSOC);
|
|
||||||
if (!$result[0]['IsEmpty']) {
|
|
||||||
return;
|
|
||||||
} else {
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Force update of sccp devmodel to ensure changes are taken into account
|
// Force update of sccp devmodel to ensure changes are taken into account
|
||||||
outn("Updating sccpdevmodel...");
|
outn("Updating sccpdevmodel...");
|
||||||
|
|
@ -647,7 +708,6 @@ function InstallDB_updateSchema($db_config)
|
||||||
if (DB::IsError($check)) {
|
if (DB::IsError($check)) {
|
||||||
die_freepbx("Can not create sccpdevmodel table, error:$check\n");
|
die_freepbx("Can not create sccpdevmodel table, error:$check\n");
|
||||||
}
|
}
|
||||||
//}
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -747,9 +807,9 @@ function InstallDbCreateViews($sccp_compatible)
|
||||||
GROUP BY sccpdevice.name;";
|
GROUP BY sccpdevice.name;";
|
||||||
}
|
}
|
||||||
$stmt = $db->prepare($sql);
|
$stmt = $db->prepare($sql);
|
||||||
$stmt->execute();
|
$result = $stmt->execute();
|
||||||
if (DB::IsError($stmt)) {
|
if (!$result) {
|
||||||
die_freepbx(sprintf(_("Error updating sccpdeviceconfig view. Command was: %s; error was: %s "), $sql, $results->getMessage()));
|
die_freepbx(sprintf(_("Error updating sccpdeviceconfig view. Command was: %s"), $sql));
|
||||||
}
|
}
|
||||||
|
|
||||||
outn("<li>" . _("(Re)Create sccplineconfig view") . "</li>");
|
outn("<li>" . _("(Re)Create sccplineconfig view") . "</li>");
|
||||||
|
|
@ -766,9 +826,9 @@ function InstallDbCreateViews($sccp_compatible)
|
||||||
sccpline.namedcallgroup, sccpline.namedpickupgroup, sccpline.phonecodepage, sccpline.videomode
|
sccpline.namedcallgroup, sccpline.namedpickupgroup, sccpline.phonecodepage, sccpline.videomode
|
||||||
FROM sccpline";
|
FROM sccpline";
|
||||||
$stmt = $db->prepare($sql);
|
$stmt = $db->prepare($sql);
|
||||||
$stmt->execute();
|
$result = $stmt->execute();
|
||||||
if (DB::IsError($stmt)) {
|
if (!$result) {
|
||||||
die_freepbx(sprintf(_("Error updating sccplineconfig view. Command was: %s; error was: %s "), $sql, $results->getMessage()));
|
die_freepbx(sprintf(_("Error updating sccplineconfig view. Command was: %s"), $sql));
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
88
module.xml
88
module.xml
|
|
@ -1,7 +1,7 @@
|
||||||
<module>
|
<module>
|
||||||
<rawname>sccp_manager</rawname>
|
<rawname>sccp_manager</rawname>
|
||||||
<name>SCCP Manager</name>
|
<name>SCCP Manager</name>
|
||||||
<version>14.3.0.33</version>
|
<version>14.4.0.1</version>
|
||||||
<type>setup</type>
|
<type>setup</type>
|
||||||
<category>SCCP Connectivity</category>
|
<category>SCCP Connectivity</category>
|
||||||
<publisher>Steve Lad, Alex GP</publisher>
|
<publisher>Steve Lad, Alex GP</publisher>
|
||||||
|
|
@ -36,7 +36,8 @@
|
||||||
* Version 14.3.0.28 * - Fix issue with RNav which caused exception with new device
|
* Version 14.3.0.28 * - Fix issue with RNav which caused exception with new device
|
||||||
* Version 14.3.0.29 * - Fix issue reloading page after saving settings and not restarting devices.
|
* Version 14.3.0.29 * - Fix issue reloading page after saving settings and not restarting devices.
|
||||||
* Version 14.3.0.30 * - Fix reversion in 29. Not returning to correct page when saving device.
|
* Version 14.3.0.30 * - Fix reversion in 29. Not returning to correct page when saving device.
|
||||||
* Version 14.3.0.30 * - Fix rewrite rules.
|
* Version 14.3.0.31 * - Fix rewrite rules.
|
||||||
|
* Version 14.4.0.1 * - Modify installer to avoid data loss on existing 14.3 fields. Bump Minor version to reflect this.
|
||||||
</changelog>
|
</changelog>
|
||||||
<location>https://github.com/chan-sccp/sccp_manager</location>
|
<location>https://github.com/chan-sccp/sccp_manager</location>
|
||||||
<depends>
|
<depends>
|
||||||
|
|
@ -56,6 +57,7 @@
|
||||||
<field name="name" type="string" length="15" primarykey="true"/>
|
<field name="name" type="string" length="15" primarykey="true"/>
|
||||||
<field name="type" type="string" length="15" notnull="false"/>
|
<field name="type" type="string" length="15" notnull="false"/>
|
||||||
<field name="addon" type="string" length="45" notnull="false"/>
|
<field name="addon" type="string" length="45" notnull="false"/>
|
||||||
|
<field name="description" type="string" length="45" notnull="false"/>
|
||||||
<field name="_description" type="string" length="45" notnull="false"/>
|
<field name="_description" type="string" length="45" notnull="false"/>
|
||||||
<field name="tzoffset" type="string" length="5" notnull="false"/>
|
<field name="tzoffset" type="string" length="5" notnull="false"/>
|
||||||
<field name="imageversion" type="string" length="31" notnull="false"/>
|
<field name="imageversion" type="string" length="31" notnull="false"/>
|
||||||
|
|
@ -89,8 +91,11 @@
|
||||||
<field name="backgroundThumbnail" type="string" length="255" notnull="false"/>
|
<field name="backgroundThumbnail" type="string" length="255" notnull="false"/>
|
||||||
<field name="ringtone" type="string" length="255" notnull="false"/>
|
<field name="ringtone" type="string" length="255" notnull="false"/>
|
||||||
<field name="callhistory_answered_elsewhere" type="string" notnull="false"/>
|
<field name="callhistory_answered_elsewhere" type="string" notnull="false"/>
|
||||||
|
<field name="loginname" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
<field name="_loginname" type="string" length="20" notnull="false"/>
|
<field name="_loginname" type="string" length="20" notnull="false"/>
|
||||||
<field name="_profileid" type="integer" default="0"/>
|
<field name="profileid" type="integer" default="0"/>
|
||||||
|
<field name="_profileid" type="integer" notnull="false"/>
|
||||||
|
<field name="dialrules" type="string" length="255" default="NULL" notnull="false"/>
|
||||||
<field name="_dialrules" type="string" length="255" notnull="false"/>
|
<field name="_dialrules" type="string" length="255" notnull="false"/>
|
||||||
<field name="useRedialMenu" type="string" length="5" default="no" notnull="false"/>
|
<field name="useRedialMenu" type="string" length="5" default="no" notnull="false"/>
|
||||||
<field name="cfwdnoanswer" type="string" default="on" notnull="false"/>
|
<field name="cfwdnoanswer" type="string" default="on" notnull="false"/>
|
||||||
|
|
@ -98,6 +103,71 @@
|
||||||
<field name="monitor" type="string" notnull="false"/>
|
<field name="monitor" type="string" notnull="false"/>
|
||||||
<field name="transfer_on_hangup" type="string" notnull="false"/>
|
<field name="transfer_on_hangup" type="string" notnull="false"/>
|
||||||
<field name="phonecodepage" type="string" length="50" notnull="false"/>
|
<field name="phonecodepage" type="string" length="50" notnull="false"/>
|
||||||
|
<field name="logserver" type="string" length="100" default="NULL" notnull="false"/>
|
||||||
|
<field name="_logserver" type="string" length="100" notnull="false"/>
|
||||||
|
<field name="daysdisplaynotactive" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
|
<field name="_daysdisplaynotactive" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="displayontime" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
|
<field name="_displayontime" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="displayonduration" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
|
<field name="_displayonduration" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="displayidletimeout" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
|
<field name="_displayidletimeout" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="settingsaccess" type="string" default="off"/>
|
||||||
|
<field name="_settingsaccess" type="string" notnull="false"/>
|
||||||
|
<field name="videocapability" type="string" default="off"/>
|
||||||
|
<field name="_videocapability" type="string" notnull="false"/>
|
||||||
|
<field name="webaccess" type="string" default="off"/>
|
||||||
|
<field name="_webaccess" type="string" notnull="false"/>
|
||||||
|
<field name="webadmin" type="string" default="off"/>
|
||||||
|
<field name="_webadmin" type="string" notnull="false"/>
|
||||||
|
<field name="pcport" type="string" default="on"/>
|
||||||
|
<field name="_pcport" type="string" notnull="false"/>
|
||||||
|
<field name="spantopcport" type="string" default="on"/>
|
||||||
|
<field name="_spantopcport" type="string" notnull="false"/>
|
||||||
|
<field name="voicevlanaccess" type="string" default="off"/>
|
||||||
|
<field name="_voicevlanaccess" type="string" notnull="false"/>
|
||||||
|
<field name="enablecdpswport" type="string" default="off"/>
|
||||||
|
<field name="_enablecdpswport" type="string" notnull="false"/>
|
||||||
|
<field name="enablecdppcport" type="string" default="off"/>
|
||||||
|
<field name="_enablecdppcport" type="string" notnull="false"/>
|
||||||
|
<field name="enablelldpswport" type="string" default="off"/>
|
||||||
|
<field name="_enablelldpswport" type="string" notnull="false"/>
|
||||||
|
<field name="enablelldppcport" type="string" default="off"/>
|
||||||
|
<field name="_enablelldppcport" type="string" notnull="false"/>
|
||||||
|
<field name="firstdigittimeout" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
|
<field name="_firstdigittimeout" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="digittimeout" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
|
<field name="_digittimeout" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="cfwdnoanswer_timeout" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
|
<field name="_cfwdnoanswer_timeout" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="autoanswer_ring_time" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
|
<field name="_autoanswer_ring_time" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="autoanswer_tone" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
|
<field name="_autoanswer_tone" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="remotehangup_tone" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
|
<field name="_remotehangup_tone" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="transfer_tone" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
|
<field name="_transfer_tone" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="callwaiting_tone" type="string" length="20" default="NULL" notnull="false"/>
|
||||||
|
<field name="_callwaiting_tone" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="callanswerorder" type="string" default="latestfirst"/>
|
||||||
|
<field name="_callanswerorder" type="string" notnull="false"/>
|
||||||
|
<field name="sccp_tos" type="string" length="11" default="0x68"/>
|
||||||
|
<field name="_sccp_tos" type="string" length="11" notnull="false"/>
|
||||||
|
<field name="sccp_cos" type="string" length="11" default="0x4"/>
|
||||||
|
<field name="_sccp_cos" type="string" length="11" notnull="false"/>
|
||||||
|
<field name="dev_sshPassword" type="string" length="25" default="cisco"/>
|
||||||
|
<field name="_dev_sshPassword" type="string" length="25" notnull="false"/>
|
||||||
|
<field name="dev_sshUserId" type="string" length="25" default="cisco"/>
|
||||||
|
<field name="_dev_sshUserId" type="string" length="25" notnull="false"/>
|
||||||
|
<field name="phonepersonalization" type="string" length="25" default="0"/>
|
||||||
|
<field name="_phonepersonalization" type="string" length="25" notnull="false"/>
|
||||||
|
<field name="devlang" type="string" length="50" default="NULL" notnull="false"/>
|
||||||
|
<field name="_devlang" type="string" length="50" notnull="false"/>
|
||||||
|
<field name="netlang" type="string" length="50" default="NULL" notnull="false"/>
|
||||||
|
<field name="_netlang" type="string" length="50" notnull="false"/>
|
||||||
|
<field name="keepalive" type="integer" default="60" notnull="false"/>
|
||||||
</table>
|
</table>
|
||||||
<table name="sccpline">
|
<table name="sccpline">
|
||||||
<field name="id" type="integer" autoincrement="true"/>
|
<field name="id" type="integer" autoincrement="true"/>
|
||||||
|
|
@ -139,6 +209,18 @@
|
||||||
<field name="setvar" type="string" length="50" notnull="false"/>
|
<field name="setvar" type="string" length="50" notnull="false"/>
|
||||||
<field name="name" type="string" length="40" primarykey="true"/>
|
<field name="name" type="string" length="40" primarykey="true"/>
|
||||||
<field name="phonecodepage" type="string" length="50" notnull="false"/>
|
<field name="phonecodepage" type="string" length="50" notnull="false"/>
|
||||||
|
<field name="regcontext" type="string" length="20" default="sccpregistration" notnull="false"/>
|
||||||
|
<field name="_regcontext" type="string" length="20" notnull="false"/>
|
||||||
|
<field name="transfer_on_hangup" type="string" default="off"/>
|
||||||
|
<field name="_transfer_on_hangup" type="string" notnull="false"/>
|
||||||
|
<field name="autoselectline_enabled" type="string" default="off"/>
|
||||||
|
<field name="_autoselectline_enabled" type="string" notnull="false"/>
|
||||||
|
<field name="autocall_select" type="string" default="off"/>
|
||||||
|
<field name="_autocall_select" type="string" notnull="false"/>
|
||||||
|
<field name="backgroundImageAccess" type="string" default="off"/>
|
||||||
|
<field name="_backgroundImageAccess" type="string" notnull="false"/>
|
||||||
|
<field name="callLogBlfEnabled" type="string" default="2"/>
|
||||||
|
<field name="_callLogBlfEnabled" type="string" notnull="false"/>
|
||||||
<key name="id" type="unique">
|
<key name="id" type="unique">
|
||||||
<column name="id"/>
|
<column name="id"/>
|
||||||
</key>
|
</key>
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,46 @@ class xmlinterface
|
||||||
public function __construct($parent_class = null)
|
public function __construct($parent_class = null)
|
||||||
{
|
{
|
||||||
$this->paren_class = $parent_class;
|
$this->paren_class = $parent_class;
|
||||||
|
$this->langCodeArray = array(
|
||||||
|
'Arabic_Saudi_Arabia' => 'ar',
|
||||||
|
'Bulgarian_Bulgaria' => 'bg',
|
||||||
|
'Czech_Czech_Republic' => 'cz',
|
||||||
|
'Danish_Denmark' => 'da',
|
||||||
|
'German_Germany' => 'de',
|
||||||
|
'Greek_Greece' => 'el',
|
||||||
|
'AU_English_United_States' => 'en',
|
||||||
|
'English_United_Kingdom' => 'en',
|
||||||
|
'English_United_States' => 'en',
|
||||||
|
'Spanish_Spain' => 'es',
|
||||||
|
'Estonian_Estonia' => 'et',
|
||||||
|
'Finnish_Finland' => 'fi',
|
||||||
|
'French_Canada' => 'fr',
|
||||||
|
'French_France' => 'fr',
|
||||||
|
'Hebrew_Israel' => 'he',
|
||||||
|
'Croatian_Croatia' => 'hr',
|
||||||
|
'Hungarian_Hungary' => 'hu',
|
||||||
|
'Italian_Italy' => 'it',
|
||||||
|
'Japanese_Japan' => 'ja',
|
||||||
|
'Korean_Korea_Republic' => 'ko',
|
||||||
|
'Lithuanian_Lithuania' => 'lt',
|
||||||
|
'Latvian_Latvia' => 'lv',
|
||||||
|
'Dutch_Netherlands' => 'nl',
|
||||||
|
'Norwegian_Norway' => 'no',
|
||||||
|
'Polish_Poland' => 'pl',
|
||||||
|
'Portuguese_Brazil' => 'pt',
|
||||||
|
'Portuguese_Portugal' => 'pt',
|
||||||
|
'Romanian_Romania' => 'ro',
|
||||||
|
'Russian_Russian_Federation' => 'ru',
|
||||||
|
'Slovak_Slovakia' => 'sk',
|
||||||
|
'Slovenian_Slovenia' => 'sl',
|
||||||
|
'Serbian_Republic_of_Montenegro' => 'sr',
|
||||||
|
'Serbian_Republic_of_Serbia' => 'rs',
|
||||||
|
'Swedish_Sweden' => 'sv',
|
||||||
|
'Thai_Thailand' => 'th',
|
||||||
|
'Turkish_Turkey' => 'tr',
|
||||||
|
'Chinese_China' => 'cn',
|
||||||
|
'Chinese_Taiwan' => 'zh'
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function info()
|
public function info()
|
||||||
|
|
@ -120,46 +160,7 @@ class xmlinterface
|
||||||
{
|
{
|
||||||
// TODO: $data_values are system wide defaults, $dev_config are specific device values.
|
// TODO: $data_values are system wide defaults, $dev_config are specific device values.
|
||||||
// Need to merge the two arrays so that device specific values override system values
|
// Need to merge the two arrays so that device specific values override system values
|
||||||
$langCodeArray = array(
|
|
||||||
'Arabic_Saudi_Arabia' => 'ar',
|
|
||||||
'Bulgarian_Bulgaria' => 'bg',
|
|
||||||
'Czech_Czech_Republic' => 'cz',
|
|
||||||
'Danish_Denmark' => 'da',
|
|
||||||
'German_Germany' => 'de',
|
|
||||||
'Greek_Greece' => 'el',
|
|
||||||
'AU_English_United_States' => 'en',
|
|
||||||
'English_United_Kingdom' => 'en',
|
|
||||||
'English_United_States' => 'en',
|
|
||||||
'Spanish_Spain' => 'es',
|
|
||||||
'Estonian_Estonia' => 'et',
|
|
||||||
'Finnish_Finland' => 'fi',
|
|
||||||
'French_Canada' => 'fr',
|
|
||||||
'French_France' => 'fr',
|
|
||||||
'Hebrew_Israel' => 'he',
|
|
||||||
'Croatian_Croatia' => 'hr',
|
|
||||||
'Hungarian_Hungary' => 'hu',
|
|
||||||
'Italian_Italy' => 'it',
|
|
||||||
'Japanese_Japan' => 'ja',
|
|
||||||
'Korean_Korea_Republic' => 'ko',
|
|
||||||
'Lithuanian_Lithuania' => 'lt',
|
|
||||||
'Latvian_Latvia' => 'lv',
|
|
||||||
'Dutch_Netherlands' => 'nl',
|
|
||||||
'Norwegian_Norway' => 'no',
|
|
||||||
'Polish_Poland' => 'pl',
|
|
||||||
'Portuguese_Brazil' => 'pt',
|
|
||||||
'Portuguese_Portugal' => 'pt',
|
|
||||||
'Romanian_Romania' => 'ro',
|
|
||||||
'Russian_Russian_Federation' => 'ru',
|
|
||||||
'Slovak_Slovakia' => 'sk',
|
|
||||||
'Slovenian_Slovenia' => 'sl',
|
|
||||||
'Serbian_Republic_of_Montenegro' => 'sr',
|
|
||||||
'Serbian_Republic_of_Serbia' => 'rs',
|
|
||||||
'Swedish_Sweden' => 'sv',
|
|
||||||
'Thai_Thailand' => 'th',
|
|
||||||
'Turkish_Turkey' => 'tr',
|
|
||||||
'Chinese_China' => 'cn',
|
|
||||||
'Chinese_Taiwan' => 'zh'
|
|
||||||
);
|
|
||||||
|
|
||||||
$data_values = array_merge($data_values, $dev_config);
|
$data_values = array_merge($data_values, $dev_config);
|
||||||
$var_xml_general_fields = array('authenticationurl' => 'dev_authenticationURL', 'informationurl' => 'dev_informationURL', 'messagesurl' => 'dev_messagesURL',
|
$var_xml_general_fields = array('authenticationurl' => 'dev_authenticationURL', 'informationurl' => 'dev_informationURL', 'messagesurl' => 'dev_messagesURL',
|
||||||
|
|
@ -368,8 +369,8 @@ class xmlinterface
|
||||||
$xml_node->winCharSet = $dev_config['phonecodepage'];
|
$xml_node->winCharSet = $dev_config['phonecodepage'];
|
||||||
$xml_node->name = $dev_config['devlang'];
|
$xml_node->name = $dev_config['devlang'];
|
||||||
$xml_node->langCode = 'en';
|
$xml_node->langCode = 'en';
|
||||||
if (isset($langCodeArray[$dev_config['devlang']])) {
|
if (isset($this->langCodeArray[$dev_config['devlang']])) {
|
||||||
$xml_node->langCode = $langCodeArray[$dev_config['devlang']];
|
$xml_node->langCode = $this->langCodeArray[$dev_config['devlang']];
|
||||||
}
|
}
|
||||||
$this->replaceSimpleXmlNode($xml_work->$key, $xml_node);
|
$this->replaceSimpleXmlNode($xml_work->$key, $xml_node);
|
||||||
break;
|
break;
|
||||||
|
|
@ -693,8 +694,8 @@ class xmlinterface
|
||||||
$xml_node->winCharSet = $dev_config['phonecodepage'];
|
$xml_node->winCharSet = $dev_config['phonecodepage'];
|
||||||
$xml_node->name = $dev_config['devlang'];
|
$xml_node->name = $dev_config['devlang'];
|
||||||
$xml_node->langCode = 'en';
|
$xml_node->langCode = 'en';
|
||||||
if (isset($langCodeArray['devlang'])) {
|
if (isset($this->langCodeArray['devlang'])) {
|
||||||
$xml_node->langCode = $langCodeArray['devlang'];
|
$xml_node->langCode = $this->langCodeArray['devlang'];
|
||||||
}
|
}
|
||||||
$this->replaceSimpleXmlNode($xml_work->$key, $xml_node);
|
$this->replaceSimpleXmlNode($xml_work->$key, $xml_node);
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue