From 839e4a62db9384a79bfa07fc4bc091136efc29ba Mon Sep 17 00:00:00 2001
From: PhantomVl <phv123@mail.ru>
Date: Thu, 5 Oct 2017 15:25:16 +0300
Subject: [PATCH] Prerelease 05.10.2017

---
 !Readme.txt/SEPXML.txt |  3 ++-
 Sccp_manager.class.php | 18 +++++++++++-------
 install.php            |  8 ++++----
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/!Readme.txt/SEPXML.txt b/!Readme.txt/SEPXML.txt
index 04f89ce..79cd723 100644
--- a/!Readme.txt/SEPXML.txt
+++ b/!Readme.txt/SEPXML.txt
@@ -4,4 +4,5 @@ http://usecallmanager.nz/user-locale.html
 https://www.voip-info.org/wiki/view/Asterisk+phone+cisco+79x1+xml+configuration+files+for+SIP
 https://www.voip-info.org/wiki/view/Asterisk+phone+cisco+7970+SIP
 https://www.cisco.com/c/en/us/td/docs/voice_ip_comm/cuipph/all_models/xsi/8_5_1/xsi_dev_guide/xmlobjects.html
-https://habrahabr.ru/post/176019/
\ No newline at end of file
+https://habrahabr.ru/post/176019/
+https://learningnetwork.cisco.com/thread/14585
\ No newline at end of file
diff --git a/Sccp_manager.class.php b/Sccp_manager.class.php
index 62f0c6e..f5d30d9 100644
--- a/Sccp_manager.class.php
+++ b/Sccp_manager.class.php
@@ -1964,6 +1964,8 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
             'servicesURL' => 'dev_servicesURL', 'directoryURL' => 'dev_directoryURL', 'proxyServerURL' => 'dev_proxyServerURL', 'idleTimeout' => 'dev_idleTimeout',
             'idleURL' => 'dev_idleURL', 'sshUserId' => 'dev_sshUserId', 'sshPassword' => 'dev_sshPassword', 'deviceProtocol' => 'dev_deviceProtocol'
             );
+        $var_xml_general_vars = array('capfAuthMode' => '0', 'deviceSecurityMode' => '1', 'mobility' => '', 'phoneServices' =>'');
+        
         if (empty($dev_id)) {
             return false;
         }
@@ -1992,6 +1994,10 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
 //              Set System global Values
                 if (!empty($var_xml_general_fields[$key])) {
                     $xml_work->$key = $this->sccpvalues[$var_xml_general_fields[$key]]['data'];
+                } else {
+                    if (!isset($var_xml_general_vars[$key])) {
+                        $xml_work->$key = $var_xml_general_vars[$key];
+                    }
                 }
 //              Set section Values
                 $xml_node = $xml_work->$key;
@@ -2127,15 +2133,13 @@ class Sccp_manager extends \FreePBX_Helpers implements \BMO {
                             $this->replaceSimpleXmlNode($xml_work->$key, $xml_node);
                         }
                         break;
-//                    case 'networkLocale':
-//                        $xml_work->$key = $this->sccp_lang[$this->sccpvalues['netlang']['data']]['language'];
-//                        $xml_work->$key = $this->sccp_lang[$this->sccpvalues['netlang']['data']]['language'];
-//                        break;
-                    case 'mobility':
+// Move all set to $var_xml_general_vars
+//                    case 'mobility':
+//                    case 'capfList':
 //                       break;
-                    case 'phoneServices':
+//                    case 'phoneServices':
 //                        break;
-                        $xml_work->$key = '';
+//                        $xml_work->$key = '';
                     default:
                         break;
                 }
diff --git a/install.php b/install.php
index 13c781b..c8d9f0a 100644
--- a/install.php
+++ b/install.php
@@ -209,8 +209,8 @@ END;
     if (db::IsError($check)) {
         die_freepbx("Can not create sccpsettings table, error:$check\n");
     }
-
-sql = <<< END
+    
+$sql = <<< END
     CREATE TABLE IF NOT EXISTS `sccpdevmodel` (
         `model` varchar(20) NOT NULL DEFAULT '',
         `vendor` varchar(40) DEFAULT '',
@@ -222,10 +222,10 @@ sql = <<< END
         `nametemplate` VARCHAR(50) NULL DEFAULT NULL,
         PRIMARY KEY (`model`),
         KEY `model` (`model`)
-    ) ENGINE=MyISAM DEFAULT CHARSET=latin1";
+    ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 END;
 
-    $check = $db->query($sql);
+$check = $db->query($sql);
     if (db::IsError($check)) {
         die_freepbx("Can not create sccpdevmodel table, error:$check\n");
     }