From 17293287fa2a765fbf28e2eef9afa671305f047f Mon Sep 17 00:00:00 2001
From: steve-lad <72376554+steve-lad@users.noreply.github.com>
Date: Fri, 4 Jun 2021 17:02:27 +0200
Subject: [PATCH] Correct Default values

Correct default values
Fix SQL syntax error
---
 conf/sccpgeneral.xml.v433            | 526 +++++++++++++--------------
 sccpManClasses/dbinterface.class.php |   8 +-
 2 files changed, 267 insertions(+), 267 deletions(-)

diff --git a/conf/sccpgeneral.xml.v433 b/conf/sccpgeneral.xml.v433
index f734102..698f0d6 100644
--- a/conf/sccpgeneral.xml.v433
+++ b/conf/sccpgeneral.xml.v433
@@ -3,34 +3,34 @@
 To change this license header, choose License Headers in Project Properties.
 To change this template file, choose Tools | Templates
 and open the template in the editor. Base Version before all crash :-)
- *                          IE - Text Input 
+ *                          IE - Text Input
  *                         IED - Text Input Dynamic
  *                         ITED- Input Dynamic Table
  *                          IS - Radio box
- *                          SL - Select element 
+ *                          SL - Select element
  *                         SLA - Select element (from - data )
- *    Input element Select SLD - Date format 
- *                         SLZ - Time Zone 
+ *    Input element Select SLD - Date format
+ *                         SLZ - Time Zone
  *                       SLTZN - Time Zone List
  *                         SLT - TFTP Lang
- *                         SLM - Music on hold 
+ *                         SLM - Music on hold
  *                         SLK - System KeySet
- *  * Input element Select SLS - System Language 
- *    Input element Select SDM - Model List 
+ *  * Input element Select SLS - System Language
+ *    Input element Select SDM - Model List
  *                         SDE - Extension List tftp_rewrite
  *    Help elemen          HLP - Help Element
- 
+
 -->
 <root>
     <page_group name="sccp_info">
         <item type="IS" id="6" seq="99">
-            <name>XML_info</name> 
+            <name>XML_info</name>
             <label>XML_Ver 433</label>
             <default>NONE</default>
             <button value="NONE">XML_Ver 433</button>
             <help></help>
         </item>
-        
+
     </page_group>
 
     <page_group name="sccp_hidden">
@@ -67,7 +67,7 @@ and open the template in the editor. Base Version before all crash :-)
             </input>
             <help>Help.</help>
         </item>
-    
+
     </page_group>
 
     <page_group name="sccp_general">
@@ -76,36 +76,36 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="2">
             <label>SCCP Server Name</label>
             <input>
-                <name>servername</name> 
+                <name>servername</name>
                 <default>Vt</default>
             </input>
             <help>Servername: This is the type of server - usually, it will be Asterisk.</help>
         </item>
-        <item type="IE" id="3"> 
+        <item type="IE" id="3">
             <label>Bind Address : [ Port ]</label>
             <input>
-                <name>bindaddr</name> 
+                <name>bindaddr</name>
                 <default>0.0.0.0</default>
                 <class>sccp-custom</class>
             </input>
             <input>
-                <name>port</name> 
+                <name>port</name>
                 <default>2000</default>
                 <class>sccp-custom</class>
             </input>
             <help>Bind Address: The address to bind to for SCCP. In general, it should be set to '0.0.0.0'. If you find problems with one-way audio, you can set this to a specific address in the server. Note that '127.0.0.1' is always wrong here.  Also note that placing in your external IP address will cause the chan_sccp module to not load.  A manual edit of the /etc/asterisk/sccp.conf file will be needed to fix and reload the module.</help>
             <nameseparator> : </nameseparator>
         </item>
-        <item type="IE" id="4"> 
+        <item type="IE" id="4">
             <label>External Ip / Name</label>
             <input>
-                <name>externip</name> 
+                <name>externip</name>
                 <default>0.0.0.0</default>
                 <class>sccp-custom</class>
                 <options placeholder="Provider IP"></options>
             </input>
             <input>
-                <name>externhost</name> 
+                <name>externhost</name>
                 <default></default>
                 <class>sccp-custom</class>
                 <options placeholder="Host Name"></options>
@@ -116,7 +116,7 @@ and open the template in the editor. Base Version before all crash :-)
             <nameseparator> / </nameseparator>
             externhost
         </item>
-        
+
         <item type="IE" id="5">
             <label>SCCP SERVER Keepalive</label>
             <input>
@@ -129,16 +129,16 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Time between Keep Alive checks. Valid range is 60-300 seconds. After much trial-and-error, the minimum (60) seems to work just fine.</help>
         </item>
         <item type="IS" id="3" seq="0">
-            <name>nat</name> 
+            <name>nat</name>
             <label>Support NAT</label>
             <default>auto</default>
             <button value="auto">Auto</button>
             <button value="off">Off</button>
             <button value="on">On</button>
             <help>Global NAT support (default Auto)</help>
-        </item>      
+        </item>
         <item type="IS" id="6">
-            <name>debug</name> 
+            <name>debug</name>
             <label>SCCP DEBUG</label>
             <default>NONE</default>
             <button value="NONE">No</button>
@@ -150,7 +150,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Debug: Enable debugging level in SCCP module.</help>
         </item>
         <item type="IS" id="6" seq="98">
-            <name>displayconfig</name> 
+            <name>displayconfig</name>
             <label>SCCP Config Mode </label>
             <default>sccpgeneral</default>
             <button value="sccpgeneral">Advanced</button>
@@ -158,7 +158,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Help!</help>
         </item>
         <item type="IS" id="7" seq="98">
-            <name>siptftp</name> 
+            <name>siptftp</name>
             <label>Support SIP device</label>
             <default>off</default>
             <button value="off">Disabled</button>
@@ -177,7 +177,7 @@ and open the template in the editor. Base Version before all crash :-)
                 <options placeholder="0.0.0.0" pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"/>
             </input>
             <input value="NONE" field="mask">
-                <options placeholder="255.255.255.0" pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"/> 
+                <options placeholder="255.255.255.0" pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"/>
             </input>
             <add_pluss>+</add_pluss>
             <addbutton-disabled>Add Allow Range</addbutton-disabled>
@@ -195,7 +195,7 @@ and open the template in the editor. Base Version before all crash :-)
                 <class></class>
             </input>
             <input value="NONE" field="mask">
-                <options placeholder="255.255.255.0" pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"/> 
+                <options placeholder="255.255.255.0" pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"/>
                 <class></class>
             </input>
             <add_pluss>+</add_pluss>
@@ -243,30 +243,30 @@ and open the template in the editor. Base Version before all crash :-)
         <label>SCCP Language</label>
         <item type="SLS" id="1">
             <label>SCCP System Language</label>
-            <name>language</name> 
+            <name>language</name>
             <default>English</default>
             <select></select>
             <help>SCCP Language: This is the language for your hints and other features of the phone. If you don't have any languages installed or are using a single language, you can leave this blank.</help>
         </item>
         <item type="SLT" id="2">
             <label>SCCP Network Device Language</label>
-            <name>netlang</name> 
+            <name>netlang</name>
             <default>English_United_States</default>
             <select></select>
             <help>The Network locales allows the phone to play tones (ringing, busy etc.) native to the phone's country.</help>
         </item>
         <item type="SLT" id="3">
             <label>SCCP Phone Device Language</label>
-            <name>devlang</name> 
+            <name>devlang</name>
             <default>English_United_States</default>
             <select> </select>
             <help>The user locale allows the phone to display text (menu items, soft keys etc.) native to the phone's language.</help>
         </item>
-        
-    </page_group>          
+
+    </page_group>
     <page_group name="sccp_dev_config">
         <label>SCCP Device general config</label>
-        <item type="IE" id="1"> 
+        <item type="IE" id="1">
             <label>First Digit Timeout</label>
             <input>
                 <name>firstdigittimeout</name>
@@ -277,10 +277,10 @@ and open the template in the editor. Base Version before all crash :-)
             </input>
             <help>First Digit Timeout: The amount of time after your first digit to start dialing automatically. This can be over-ridden with settings in your dialplan.xml or by using the 'immediate dial' button.</help>
         </item>
-        <item type="IE" id="2"> 
+        <item type="IE" id="2">
             <label>Digit Timeout</label>
             <input>
-                <name>digittimeout</name> 
+                <name>digittimeout</name>
                 <default>8</default>
                 <class>sccp-custom</class>
                 <type>number</type>
@@ -291,7 +291,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="3">
             <label>No Answer Ring Time</label>
             <input>
-                <name>cfwdnoanswer_timeout</name> 
+                <name>cfwdnoanswer_timeout</name>
                 <default>30</default>
                 <class>sccp-custom</class>
                 <type>number</type>
@@ -302,7 +302,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="3">
             <label>Autoanswer Ring Time</label>
             <input>
-                <name>autoanswer_ring_time</name> 
+                <name>autoanswer_ring_time</name>
                 <default>0</default>
                 <class>sccp-custom</class>
                 <type>number</type>
@@ -313,7 +313,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="4">
             <label>Autoanswer Tone</label>
             <input>
-                <name>autoanswer_tone</name> 
+                <name>autoanswer_tone</name>
                 <default>0x32</default>
                 <class>sccp-custom</class>
             </input>
@@ -322,7 +322,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="5">
             <label>Remote Hangup Tone</label>
             <input>
-                <name>remotehangup_tone</name> 
+                <name>remotehangup_tone</name>
                 <default>0x32</default>
                 <class>sccp-custom</class>
             </input>
@@ -331,7 +331,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="6">
             <label>Transfer Tone</label>
             <input>
-                <name>transfer_tone</name> 
+                <name>transfer_tone</name>
                 <default>0x32</default>
                 <class>sccp-custom</class>
             </input>
@@ -340,14 +340,14 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="7">
             <label>Call Waiting Tone</label>
             <input>
-                <name>callwaiting_tone</name> 
+                <name>callwaiting_tone</name>
                 <default>0x2D</default>
                 <class>sccp-custom</class>
             </input>
             <help>Call Waiting Tone: The tone played when a call is waiting. If you set this one to '0', you will not get a tone in your current call if a new call comes in, so you might want to disable call waiting for this line instead.</help>
         </item>
         <item type="IS" id="8">
-            <name>echocancel</name> 
+            <name>echocancel</name>
             <label>Echo Cancel</label>
             <default>off</default>
             <button value="on">On</button>
@@ -355,15 +355,15 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Echo Cancel: Echo Cancellation (On or Off).</help>
         </item>
         <item type="IS" id="9">
-            <name>silencesuppression</name> 
-            <label>Silence Suppression</label>      
+            <name>silencesuppression</name>
+            <label>Silence Suppression</label>
             <default>off</default>
             <button value="on">On</button>
             <button value="off">Off</button>
             <help>Silence Suppression: Slience Suppression on the phone.</help>
         </item>
         <item type="IS" id="10">
-            <name>private</name> 
+            <name>private</name>
             <label>Private Calling</label>
             <default>on</default>
             <button value="on">On</button>
@@ -371,7 +371,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Private Calling Enabled: Place a call with privacy Options (no Caller ID) turned on. Needs to be supported in Asterisk to work through SIP and DAHDI trunks.</help>
         </item>
         <item type="IS" id="13">
-            <name>callanswerorder</name> 
+            <name>callanswerorder</name>
             <label>Call Answer Order</label>
             <default>oldestfirst</default>
             <button value="oldestfirst">Oldestfirst</button>
@@ -379,7 +379,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Call Answer Order: Which call should be answered first? The most common choice is "oldestfirst", but other orders are supported.</help>
         </item>
         <item type="IS" id="13">
-            <name>callhistory_answered_elsewhere</name> 
+            <name>callhistory_answered_elsewhere</name>
             <label>Call history stored book</label>
             <default>Missed Calls</default>
             <button value="Placed Calls">Placed Calls</button>
@@ -389,7 +389,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help></help>
         </item>
         <item type="IS" id="14">
-            <name>mwilamp</name> 
+            <name>mwilamp</name>
             <label>Message Lamp</label>
             <default>On</default>
             <button value="on">On</button>
@@ -400,19 +400,19 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Set the MWI lamp style when MWI active to on, off, wink, flash or blink</help>
         </item>
         <item type="IS" id="15">
-            <name>mwioncall</name> 
+            <name>mwioncall</name>
             <label>Message Lamp On Call</label>
             <default>off</default>
             <button value="on">Yes</button>
             <button value="off">No</button>
             <help>Set the MWI on call.</help>
         </item>
-    </page_group>    
-          
+    </page_group>
+
     <page_group name="sccp_dev_advconfig">
         <label>SCCP Device advanced config</label>
         <item type="IS" id="4" seq="0">
-            <name>directrtp</name> 
+            <name>directrtp</name>
             <label>Direct RTP</label>
             <default>off</default>
             <button value="on">On</button>
@@ -420,7 +420,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>This option set global allow devices to do direct RTP sessions (default Off)</help>
         </item>
         <item type="IS" id="5" seq="0">
-            <name>earlyrtp</name> 
+            <name>earlyrtp</name>
             <label>Early RTP</label>
             <default>none</default>
             <button-d value="immediate">Immediate</button-d>
@@ -432,18 +432,18 @@ and open the template in the editor. Base Version before all crash :-)
             <help>The audio strem will be open in the progress and connected state. Valid options: NONE, progress, offhook, dial, ringout. Default may be Progress.</help>
         </item>
         <item type="IS" id="5" seq="0">
-            <name>simulate_enbloc</name> 
+            <name>simulate_enbloc</name>
             <label>Simulated Enbloc Dialing</label>
             <default>on</default>
             <button value="on">On</button>
             <button value="off">Off</button>
             <help>Use simulated enbloc dialing to speedup connection when dialing while onhook (older phones)</help>
         </item>
-    </page_group>          
+    </page_group>
     <page_group name="sccp_dev_softkey">
         <label>Global Enable/Disable Softkeys</label>
             <item type="IS" id="2" seq="0">
-            <name>cfwdall</name> 
+            <name>cfwdall</name>
             <label>Call Forward</label>
             <default>off</default>
             <button value="on">On</button>
@@ -451,7 +451,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Activate the callforward softkeys. Default is On</help>
         </item>
         <item type="IS" id="3" seq="0">
-            <name>cfwdbusy</name> 
+            <name>cfwdbusy</name>
             <label>Call Forward busy</label>
             <default>off</default>
             <button value="on">On</button>Call Forward
@@ -459,7 +459,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Activate the callforward busy softkeys. Default is On</help>
         </item>
         <item type="IS" id="3" seq="0">
-            <name>cfwdnoanswer</name> 
+            <name>cfwdnoanswer</name>
             <label>Call Forward NOANSWER</label>
             <default>off</default>
             <button value="on">On</button>
@@ -467,7 +467,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Activate the callforward NOANSWER stuff and softkeys. Default is On</help>
         </item>
         <item type="IS" id="5" seq="0">
-            <name>dndFeature</name> 
+            <name>dndFeature</name>
             <label>DND Button on Device</label>
             <default>on</default>
             <button value="on">On</button>
@@ -475,19 +475,19 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Do Not Disturb. Default is Off</help>
         </item>
         <item type="IS" id="1" seq="0">
-            <name>transfer</name> 
+            <name>transfer</name>
             <label>Transfer</label>
             <default>on</default>
             <button value="on">On</button>
             <button value="off">Off</button>
             <help>Allow the use of the transfer feature</help>
-        </item>        
-    </page_group>          
+        </item>
+    </page_group>
 
     <page_group name="sccp_dev_ntp">
         <label>SCCP NTP Service config</label>
         <item type="IS" id="1" seq="98">
-            <name>ntp_config_enabled</name> 
+            <name>ntp_config_enabled</name>
             <label>NTP Server Enabled</label>
             <default>off</default>
             <button value="on">Yes</button>
@@ -497,14 +497,14 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="2" seq="10">
             <label>NTP Server name (ip)</label>
             <input>
-                <name>ntp_server</name> 
+                <name>ntp_server</name>
                 <default>pool.ntp.org</default>
                 <value>pool.ntp.org</value>
             </input>
             <help>NTP Server name or IP</help>
         </item>
         <item type="IS" id="3" seq="10">
-            <name>ntp_server_mode</name> 
+            <name>ntp_server_mode</name>
             <label>Call Answer Order</label>
             <default>unicast</default>
             <button value="unicast">Unicast</button>
@@ -514,12 +514,12 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Configure NTP Server protocol time synchronization</help>
         </item>
 
-    </page_group>          
+    </page_group>
     <page_group name="sccp_dev_time">
         <label>SCCP Time Service config</label>
         <item type="SLD" id="1" seq="1">
             <label>Display Day Format</label>
-            <name>dateformat</name> 
+            <name>dateformat</name>
             <select>
                 <default>D.M.Y</default>
             </select>
@@ -527,61 +527,61 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
         <item type="SLTZN" id="2" seq="95">
             <label>Time Zone</label>
-            <name>ntp_timezone</name> 
+            <name>ntp_timezone</name>
             <class>sccp-custom</class>
             <select>
                 <default>UTC</default>
             </select>
             <help>Date Format: Time zone</help>
         </item>
-    </page_group>    
-        
+    </page_group>
+
     <page_group name="sccp_advant">
         <label>Device Vendor Setting</label>
-        <item type="IE" id="3" seq="98"> 
+        <item type="IE" id="3" seq="98">
             <label>Log Server</label>
             <input>
-                <name>vendorconfig_logserver</name> 
+                <name>vendorconfig_logserver</name>
                 <default></default>
                 <class>sccp-custom</class>
                 <options placeholder="x.x.x.x:9001" />
             </input>
             <help>Log server Address: x.x.x.x:9001 </help>
         </item>
-        <item type="IE" id="3" seq="98"> 
+        <item type="IE" id="3" seq="98">
             <label>Display Not Active</label>
             <input>
-                <name>vendorconfig_daysdisplaynotactive</name> 
+                <name>vendorconfig_daysdisplaynotactive</name>
                 <default></default>
                 <class>sccp-custom</class>
                 <options placeholder="1,7" />
             </input>
             <help>Comma separated list of days that the phone's display is not active and will be automatically turned off after the time specified by "displayIdleTimeout" has elapsed (1 - Sunday, 7 - Saturday)</help>
         </item>
-        <item type="IE" id="3" seq="98"> 
+        <item type="IE" id="3" seq="98">
             <label>Display Not Active</label>
             <input>
-                <name>vendorconfig_displayontime</name> 
+                <name>vendorconfig_displayontime</name>
                 <default></default>
                 <class>sccp-custom</class>
                 <options placeholder="08:00" />
             </input>
             <help>Time in HH:MM format to automatically turn on the phone display.</help>
         </item>
-        <item type="IE" id="3" seq="98"> 
+        <item type="IE" id="3" seq="98">
             <label>Display On Duration</label>
             <input>
-                <name>vendorconfig_displayonduration</name> 
+                <name>vendorconfig_displayonduration</name>
                 <default></default>
                 <class>sccp-custom</class>
                 <options placeholder="10:00" />
             </input>
             <help>Time duration in HH:MM format to automatically turn off the phone display after it was turned on.</help>
         </item>
-        <item type="IE" id="3" seq="98"> 
+        <item type="IE" id="3" seq="98">
             <label>Display Idle Timeout</label>
             <input>
-                <name>vendorconfig_displayidletimeout</name> 
+                <name>vendorconfig_displayidletimeout</name>
                 <default></default>
                 <class>sccp-custom</class>
                 <options placeholder="00:10" />
@@ -590,7 +590,7 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
 
         <item type="IS" id="6" seq="98">
-            <name>vendorconfig_settingsaccess</name> 
+            <name>vendorconfig_settingsaccess</name>
             <label>Settings Access</label>
             <default></default>
             <button value="">Inherit</button>
@@ -599,7 +599,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Whether a user can access the phone settings.</help>
         </item>
         <item type="IS" id="6" seq="98">
-            <name>vendorconfig_videocapability</name> 
+            <name>vendorconfig_videocapability</name>
             <label>Video Capability</label>
             <default></default>
             <button value="">Inherit</button>
@@ -608,7 +608,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help></help>
         </item>
         <item type="IS" id="6" seq="98">
-            <name>vendorconfig_webaccess</name> 
+            <name>vendorconfig_webaccess</name>
             <label>Web Access</label>
             <default></default>
             <button value="">Inherit</button>
@@ -617,7 +617,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Enable the phone's HTTP server.</help>
         </item>
         <item type="IS" id="6" seq="98">
-            <name>vendorconfig_webadmin</name> 
+            <name>vendorconfig_webadmin</name>
             <label>Web Admin</label>
             <default></default>
             <button value="">Inherit</button>
@@ -626,7 +626,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Enable remote administration using the phone's HTTP server. 8821 model only.</help>
         </item>
         <item type="IS" id="6" seq="98">
-            <name>vendorconfig_pcport</name> 
+            <name>vendorconfig_pcport</name>
             <label>Pc Port</label>
             <default></default>
             <button value="">Inherit</button>
@@ -635,7 +635,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Disable the PC (computer) port</help>
         </item>
         <item type="IS" id="6" seq="98">
-            <name>vendorconfig_spantopcport</name> 
+            <name>vendorconfig_spantopcport</name>
             <label>Span to PC Port</label>
             <default></default>
             <button value="">Inherit</button>
@@ -644,7 +644,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Forward packets sent and received on the SW (network) port to the PC (computer) port.</help>
         </item>
         <item type="IS" id="6" seq="98">
-            <name>vendorconfig_voicevlanaccess</name> 
+            <name>vendorconfig_voicevlanaccess</name>
             <label>Voice Vlan Access</label>
             <default></default>
             <button value="">Inherit</button>
@@ -653,7 +653,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Allow devices connected to the PC (computer) port to access the voice VLAN.</help>
         </item>
         <item type="IS" id="6" seq="98">
-            <name>vendorconfig_enablecdpswport</name> 
+            <name>vendorconfig_enablecdpswport</name>
             <label>Cdp Sw Port</label>
             <default></default>
             <button value="">Inherit</button>
@@ -662,7 +662,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Enable Cisco Discovery Protocol on the SW (network) port.</help>
         </item>
         <item type="IS" id="6" seq="98">
-            <name>vendorconfig_enablecdppcport</name> 
+            <name>vendorconfig_enablecdppcport</name>
             <label>Cdp PC Port</label>
             <default></default>
             <button value="">Inherit</button>
@@ -671,7 +671,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Enable Cisco Discovery Protocol on the PC (computer) port.</help>
         </item>
         <item type="IS" id="6" seq="98">
-            <name>vendorconfig_enablelldpswport</name> 
+            <name>vendorconfig_enablelldpswport</name>
             <label>Link Layer Discovery Sw</label>
             <default></default>
             <button value="">Inherit</button>
@@ -680,7 +680,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Enable Link Layer Discovery Protocol on the SW (network) port.</help>
         </item>
         <item type="IS" id="6" seq="98">
-            <name>vendorconfig_enablelldppcport</name> 
+            <name>vendorconfig_enablelldppcport</name>
             <label>Link Layer Discovery PC</label>
             <default></default>
             <button value="">Inherit</button>
@@ -688,21 +688,21 @@ and open the template in the editor. Base Version before all crash :-)
             <button value="1">Enabled</button>
             <help> Enable Link Layer Discovery Protocol on the PC (computer) port.</help>
         </item>
-      
-      
-    </page_group>        
-    
+
+
+    </page_group>
+
     <page_group name="sccp_srst">
         <label>SCCP Phone SRST</label>
         <item type="HLP" id="2">
-            <label>HELP SRST</label>        
+            <label>HELP SRST</label>
             <name>Help_srst</name>
             <element type='p'>You can also configure a Survivable Remote Site Telephony (SRST) reference as the last device in the CallManager(CM) list. This proves especially useful in a remote site configuration where the phones and Asterisk are connected over a WAN network. SRST provides users with fallback support for the IP phones that cannot access the primary, secondary, or tertiary Asterisk Node in the CallManager List because of an Asterisk Node failure or loss of connectivity across the WAN. For the remote sites attached to multiple-service routers across the WAN, SRST ensures that your remote users receive continuous (although minimal) service by providing call handling support directly from the SRST router.</element>
             <element type='p'>When IP phones lose contact with primary, secondary, and tertiary Asterisk Nodes (CM's), they must establish a connection to a local SRST router to sustain the call-processing capability necessary to place and receive calls. The IP phone retains the IP address of the local SRST router as a default router in the Network Configuration area of the Settings menu. The Settings menu supports a maximum of five default router entries; however, the cnf.xml accommodates a maximum of three entries. When a secondary Asterisk Node is not available on the network, the local SRST Router's IP address is retained as the standby connection for Asterisk Node during normal operation.</element>
         </item>
 
         <item type="IS" id="1" seq="20">
-            <name>srst_Option</name> 
+            <name>srst_Option</name>
             <label>SRST Server Enabled</label>
             <default>disable</default>
             <button value="enabled">Yes</button>
@@ -711,7 +711,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>You enabled/configured a Survivable Remote Site Telephony (SRST) reference as the last device in the CallManager(CM) list.</help>
         </item>
         <item type="IS" id="3" seq="20">
-            <name>srst_userModifiable</name> 
+            <name>srst_userModifiable</name>
             <label>SRST User Modifiable</label>
             <default>false</default>
             <button value="true">Yes</button>
@@ -719,7 +719,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>The user can change the personal SRST configuration on the device</help>
         </item>
         <item type="IS" id="3" seq="20">
-            <name>srst_isSecure</name> 
+            <name>srst_isSecure</name>
             <label>SRST Security</label>
             <default>false</default>
             <button value="true">Yes</button>
@@ -730,7 +730,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="2" seq="20">
             <label>SRST Config Name</label>
             <input>
-                <name>srst_Name</name> 
+                <name>srst_Name</name>
                 <default>Enable</default>
             </input>
             <help>You enabled configure a Survivable Remote Site Telephony (SRST) reference as the last device in the CallManager(CM) list.</help>
@@ -746,7 +746,7 @@ and open the template in the editor. Base Version before all crash :-)
                 <class></class>
             </input>
             <input value="NONE" field="port">
-                <options placeholder="2000" pattern="^([0-9]){3,5}$"/> 
+                <options placeholder="2000" pattern="^([0-9]){3,5}$"/>
                 <class></class>
             </input>
             <addbutton>Add Server</addbutton>
@@ -762,40 +762,40 @@ and open the template in the editor. Base Version before all crash :-)
                 <class></class>
             </input>
             <input value="NONE" field="port">
-                <options placeholder="2000" pattern="^[0-9]{3,5}$"/> 
+                <options placeholder="2000" pattern="^[0-9]{3,5}$"/>
                 <class></class>
             </input>
             <addbutton>Add Server</addbutton>
             <help>Help.</help>
         </item>
-    </page_group>          
+    </page_group>
 
     <page_group name="sccp_dev_url">
         <label>SCCP URL Service config</label>
         <item type="IE" id="1" seq="10">
             <label>Phone Service URL</label>
             <input>
-                <name>dev_servicesURL</name> 
+                <name>dev_servicesURL</name>
                 <default></default>
                 <value></value>
-                <options placeholder="http://x.x.x.x/cisco_menu/service.php"></options>           
+                <options placeholder="http://x.x.x.x/cisco_menu/service.php"></options>
             </input>
             <help></help>
         </item>
         <item type="IE" id="1" seq="10">
             <label>Phone Secure Service URL</label>
             <input>
-                <name>dev_secureservicesURL</name> 
+                <name>dev_secureservicesURL</name>
                 <default></default>
                 <value></value>
-                <options placeholder="https://x.x.x.x:port/cisco_menu/service.php"></options>           
+                <options placeholder="https://x.x.x.x:port/cisco_menu/service.php"></options>
             </input>
             <help></help>
         </item>
         <item type="IE" id="2" seq="10">
             <label>Phone authentication URL</label>
             <input>
-                <name>dev_authenticationURL</name> 
+                <name>dev_authenticationURL</name>
                 <options placeholder="http://x.x.x.x/cisco_menu/authentication.php"></options>
                 <default></default>
                 <value></value>
@@ -805,7 +805,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="2" seq="10">
             <label>Phone Secure authentication URL</label>
             <input>
-                <name>dev_secureauthenticationURL</name> 
+                <name>dev_secureauthenticationURL</name>
                 <options placeholder="https://x.x.x.x:port/cisco_menu/authentication.php"></options>
                 <default></default>
                 <value></value>
@@ -886,7 +886,7 @@ and open the template in the editor. Base Version before all crash :-)
             </input>
             <help></help>
         </item>
-        
+
         <item type="IE" id="7" seq="10">
             <label>Phone proxyServer URL</label>
             <input>
@@ -897,7 +897,7 @@ and open the template in the editor. Base Version before all crash :-)
             </input>
             <help></help>
         </item>
-       	
+
         <item type="IE" id="8" seq="10">
             <label>Phone Idle Timeout</label>
             <input>
@@ -909,58 +909,58 @@ and open the template in the editor. Base Version before all crash :-)
             </input>
             <help></help>
         </item>
-        
-    </page_group>          
-    <page_group name="sccp_qos_config"> 
+
+    </page_group>
+    <page_group name="sccp_qos_config">
         <label>SCCP QoS config</label>
-        <item type="IE" id="1"> 
+        <item type="IE" id="1">
             <label>SCCP ToS / CoS</label>
             <input>
-                <name>sccp_tos</name> 
+                <name>sccp_tos</name>
                 <default>0x68</default>
                 <class>sccp-custom</class>
             </input>
             <input>
-                <name>sccp_cos</name> 
+                <name>sccp_cos</name>
                 <default>0x4</default>
                 <class>sccp-custom</class>
             </input>
             <help>SCCP Type Of Service / Class Of Service: SCCP Type or Class of Service - this is modifiable, but don't.</help>
         </item>
-        <item type="IE" id="2"> 
+        <item type="IE" id="2">
             <label>SCCP Audio ToS / CoS</label>
             <input>
-                <name>audio_tos</name> 
+                <name>audio_tos</name>
                 <default>0xB8</default>
                 <class>sccp-custom</class>
             </input>
             <input>
-                <name>audio_cos</name> 
+                <name>audio_cos</name>
                 <default>0x6</default>
                 <class>sccp-custom</class>
             </input>
             <help>Audio Type Of Service / Class Of Service: Audio Type or Class of Service - this is modifiable, but don't.</help>
         </item>
-        <item type="IE" id="3"> 
+        <item type="IE" id="3">
             <label>SCCP Video ToS / CoS</label>
             <input>
-                <name>video_tos</name> 
+                <name>video_tos</name>
                 <default>0x88</default>
                 <class>sccp-custom</class>
             </input>
             <input>
-                <name>video_cos</name> 
+                <name>video_cos</name>
                 <default>0x5</default>
                 <class>sccp-custom</class>
             </input>
             <help>Video Type Of Service / Class Of Service: Video Type or Class of Service - this is modifiable, but don't.</help>
-        </item>       
+        </item>
     </page_group>
     <page_group name="sccp_hotline_config">
         <label>SCCP Hot Line config</label>
         <item type="HLP" id="2">
             <name>Help_id2</name>
-            <label>HELP SCCP HotLine</label>        
+            <label>HELP SCCP HotLine</label>
             <element type='p'>Setting the hotline Feature on a device, will make it connect to a predefined extension as soon as the Receiver is picked up or the "New Call" Button is pressed. No number has to be given. This works even on devices which have no entry in the config file or realtime database.</element>
             <element type='h4'>The hotline function can be used in :</element>
             <element type='table'>
@@ -1001,11 +1001,11 @@ and open the template in the editor. Base Version before all crash :-)
                     <col>hotline</col>
                 </row>
             </element>
-      
+
         </item>
-    
+
         <item type="IS" id="1">
-            <name>hotline_enabled</name> 
+            <name>hotline_enabled</name>
             <label>Hotline</label>
             <default>off</default>
             <button value="on">Enabled</button>
@@ -1015,7 +1015,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="2">
             <label>Hotline extension</label>
             <input>
-                <name>hotline_extension</name> 
+                <name>hotline_extension</name>
                 <default>*111</default>
                 <class>sccp-custom</class>
             </input>
@@ -1024,7 +1024,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="2">
             <label>Hotline Label</label>
             <input>
-                <name>hotline_label</name> 
+                <name>hotline_label</name>
                 <default>Hot Line</default>
                 <class>sccp-custom</class>
             </input>
@@ -1033,20 +1033,20 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="3">
             <label>Hotline Context</label>
             <input>
-                <name>hotline_context</name> 
+                <name>hotline_context</name>
                 <default>default</default>
                 <class>sccp-custom</class>
             </input>
             <help>Hotline Context: This is the context through which the phone will connect. It should probably match your other contest. The default is "from-internal" but "from-internal-xfer" would also make sense by limiting the options for the person using the phone.</help>
         </item>
     </page_group>
-    
+
     <page_group name="sccp_dev_group_config">
         <label>SCCP Line config</label>
         <item type="IE" id="4">
             <label>System Context</label>
             <input>
-                <name>context</name> 
+                <name>context</name>
                 <default>from-internal</default>
                 <class>sccp-custom</class>
             </input>
@@ -1055,7 +1055,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="5">
             <label>Dynamically registration Context</label>
             <input>
-                <name>regcontext</name> 
+                <name>regcontext</name>
                 <default>sccpregistration</default>
                 <class>sccp-custom</class>
             </input>
@@ -1064,7 +1064,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="7">
             <label>Directed pickup context</label>
             <input>
-                <name>directed_pickup_context</name> 
+                <name>directed_pickup_context</name>
                 <default></default>
                 <options placeholder="default"></options>
                 <class>sccp-custom</class>
@@ -1074,16 +1074,16 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="7">
             <label>Default pickup group</label>
             <input>
-                <name>pickupgroup</name> 
+                <name>pickupgroup</name>
                 <default></default>
                 <options placeholder="default"></options>
                 <class>sccp-custom</class>
             </input>
             <help>Context where direct pickup search for extensions. if not set current contect will be use.</help>
         </item>
-        
+
         <item type="IS" id="11">
-            <name>pickup_modeanswer</name> 
+            <name>pickup_modeanswer</name>
             <label>Directed Pickup</label>
             <default>off</default>
             <button value="on">Enabled</button>
@@ -1091,7 +1091,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Directed Pickup Mode (Answer): If a call is sent with the "directed pickup" flag, the phone will answer when set to "Yes".</help>
         </item>
         <item type="IS" id="12">
-            <name>transfer_on_hangup</name> 
+            <name>transfer_on_hangup</name>
             <label>Transfer on hangup</label>
             <default>off</default>
             <button value="on">Enabled</button>
@@ -1101,14 +1101,14 @@ and open the template in the editor. Base Version before all crash :-)
 
         <item type="SLA-disabled" id="6">
             <label>Default Dial Plan</label>
-            <name>dial_template</name> 
+            <name>dial_template</name>
             <default>NONE</default>
             <select></select>
             <class>sccp-custom</class>
             <help>Help.</help>
         </item>
         <item type="IS" id="7" seq="98">
-            <name>autoselectline_enabled</name> 
+            <name>autoselectline_enabled</name>
             <label>Autoselect Line</label>
             <default>off</default>
             <button value="on">Enabled</button>
@@ -1116,7 +1116,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Enables and Disables auto line selection.</help>
         </item>
         <item type="IS-disabled" id="8" seq="0">
-            <name>meetme</name> 
+            <name>meetme</name>
             <label>Meetme Conference</label>
             <default>off</default>
             <button value="on">Enabled</button>
@@ -1126,7 +1126,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IS-disabled" id="9" seq="0">
             <label>Meetme Options</label>
             <input>
-                <name>meetmeopts</name> 
+                <name>meetmeopts</name>
                 <default>qxd</default>
                 <class>sccp-custom</class>
             </input>
@@ -1134,7 +1134,7 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
 
         <item type="IS" id="10" seq="98">
-            <name>autocall_select</name> 
+            <name>autocall_select</name>
             <label>Auto Call Select</label>
             <default>off</default>
             <button value="on">Enabled</button>
@@ -1142,7 +1142,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help></help>
         </item>
         <item type="IS" id="11" seq="98">
-            <name>backgroundImageAccess</name> 
+            <name>backgroundImageAccess</name>
             <label>Allow change Background Image</label>
             <default>true</default>
             <button value="true">Enabled</button>
@@ -1150,7 +1150,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>I'm guessing on this one, but on some devices, the background image on the display can be modified at the device. I think this is the thing that allows that to take.</help>
         </item>
         <item type="IS" id="11" seq="98">
-            <name>phonePersonalization</name> 
+            <name>phonePersonalization</name>
             <label>Allow push background from server </label>
             <default>0</default>
             <button value="1">Enabled</button>
@@ -1158,7 +1158,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Phone personalization needs to be set to allow the server to push background or ringtones to the phone in the SEPXXXXXXXXXX.cnf.xml of each phone:</help>
         </item>
         <item type="IS" id="11" seq="98">
-            <name>callLogBlfEnabled</name> 
+            <name>callLogBlfEnabled</name>
             <label>Allow BLF in Phone Directory</label>
             <default>2</default>
             <button value="3">Enabled</button>
@@ -1167,7 +1167,7 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
         <item type="SLM" id="6">
             <label>Music On Hold Class</label>
-            <name>musicclass</name> 
+            <name>musicclass</name>
             <default>NONE</default>
             <select></select>
             <class>form-control</class>
@@ -1178,7 +1178,7 @@ and open the template in the editor. Base Version before all crash :-)
 
     <page_group name="sccp_extpath_config">
         <item type="HLP" id="2">
-            <label>Rewrite HELP </label>        
+            <label>Rewrite HELP </label>
             <name>Help_tftp_rewrite</name>
             <element type='p'>This section is responsible for the modes of operation of external services: tftp http.</element>
             <element type='p'> * off - Flat model cisco. All data is in the directory /tftproot</element>
@@ -1190,7 +1190,7 @@ and open the template in the editor. Base Version before all crash :-)
             <label>SCCP TFTP SERVER Path</label>
             <class>provision_hide</class>
             <input>
-                <name>tftp_path</name> 
+                <name>tftp_path</name>
                 <default>/tftpboot</default>
                 <class>sccp-custom</class>
             </input>
@@ -1200,7 +1200,7 @@ and open the template in the editor. Base Version before all crash :-)
             <label>Provision SERVER Path</label>
             <class>provision_show</class>
             <input>
-                <name>tftp_rewrite_path</name> 
+                <name>tftp_rewrite_path</name>
                 <default>/tftpboot</default>
                 <class>sccp-custom</class>
             </input>
@@ -1208,7 +1208,7 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
 
         <item type="IS" id="2" seq="20">
-            <name>tftp_rewrite</name> 
+            <name>tftp_rewrite</name>
             <label>TFTP SERVER remapping support</label>
             <default>off</default>
             <option_hide class=".provision_hide">pro</option_hide>
@@ -1222,7 +1222,7 @@ and open the template in the editor. Base Version before all crash :-)
 
         <item type="SL" id="2">
             <label>SCCP SERVER MySQL Device Table Name</label>
-            <name>devicetable</name> 
+            <name>devicetable</name>
             <default>sccpdevice</default>
             <select>sccpdevice</select>
             <select>sccpdeviceconfig</select>
@@ -1233,7 +1233,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="3">
             <label>SCCP SERVER MySQL Line Table Name</label>
             <input>
-                <name>linetable</name> 
+                <name>linetable</name>
                 <default>sccpline</default>
                 <class>sccp-custom</class>
             </input>
@@ -1241,7 +1241,7 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
 
         <item type="IS" id="4" seq="99">
-            <name>createlangdir</name> 
+            <name>createlangdir</name>
             <label>Create tftp empty language dir</label>
             <default>no</default>
             <button value="yes">Yes</button>
@@ -1250,28 +1250,28 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
 
         <item type="IS" id="4" seq="90">
-            <name>system_rouminguser</name> 
+            <name>system_rouminguser</name>
             <label>User Roaming</label>
             <default>no</default>
             <button value="yes">Yes</button>
             <button value="no">No</button>
             <help>Experemental Function Roaming Users</help>
         </item>
-    
+
     </page_group>
-    <!--  Form   add/ edit device -->  
+    <!--  Form   add/ edit device -->
     <page_group name="sccp_hw_dev">
         <label>General Device configuration</label>
         <item type="IE" id="1" seq="99">
             <label>Device SEP ID.[XXXXXXXXXXXX]=MAC</label>
             <input>
-                <name>mac</name> 
+                <name>mac</name>
                 <default>000000000</default>
                 <class>sccp-custom</class>
             </input>
             <help>The MAC address of the phone. You must specify 12 characters in the format XXXX.XXXX.XXXX or XX-XX-XX-XX-XX-XX or XXXXXXXXXXXX</help>
         </item>
-       
+
         <item type="SDM" id="2" seq="99">
             <label>Type</label>
             <name>type</name>
@@ -1282,7 +1282,7 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
         <item type="SDE" id="3" seq="99">
             <label>Addon</label>
-            <name>addon</name> 
+            <name>addon</name>
             <default>NONE</default>
             <select name="model" dataval="buttons">description</select>
             <class>hw_select sccp-custom</class>
@@ -1295,13 +1295,13 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="1" seq="99">
             <label>Device SEP ID</label>
             <input>
-                <name>mac</name> 
+                <name>mac</name>
                 <default>000000000</default>
                 <class>sccp-custom</class>
                 <options readonly="readonly"></options>
             </input>
             <help>The MAC address of the phone</help>
-        </item>      
+        </item>
         <item type="SDM-remove" id="2" seq="99">
             <label>Type</label>
             <name>type</name>
@@ -1315,7 +1315,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="2" seq="99">
             <label>Type</label>
             <input>
-                <name>type</name> 
+                <name>type</name>
                 <default>79XX</default>
                 <class>sccp-custom</class>
                 <options readonly="readonly"></options>
@@ -1325,7 +1325,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="3" seq="99">
             <label>Addon</label>
             <input>
-                <name>addon</name> 
+                <name>addon</name>
                 <default>NONE</default>
                 <class>sccp-custom</class>
                 <options readonly="readonly"></options>
@@ -1336,11 +1336,11 @@ and open the template in the editor. Base Version before all crash :-)
 
 
     <page_group name="sccp_hw_dev2">
-        <label>Device configuration</label>       
+        <label>Device configuration</label>
         <item type="IE" id="1" seq="99">
             <label>Device Label</label>
             <input>
-                <name>_description</name> 
+                <name>_description</name>
                 <default>000000000</default>
                 <class>sccp-custom</class>
                 <options pattern="[0-9a-zA-Z]+"/>
@@ -1349,28 +1349,28 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
         <item type="SLK" id="2" seq="99">
             <label>Soft Keyset</label>
-            <name>softkeyset</name> 
+            <name>softkeyset</name>
             <default>default</default>
             <select></select>
             <help>System Default Softkey</help>
         </item>
         <item type="SLZ" id="3" seq="98">
             <label>Time Zone offset</label>
-            <name>tzoffset</name> 
+            <name>tzoffset</name>
             <default>00</default>
             <select></select>
             <help>Time Zone offset</help>
         </item>
         <item type="SLT" id="4" seq="98">
             <label>SCCP Network Device Language</label>
-            <name>netlang</name> 
+            <name>netlang</name>
             <default>English_United_States</default>
             <select></select>
             <help>The Network locales allows the phone to play tones (ringing, busy etc.) native to the phone's country.</help>
         </item>
         <item type="SLT" id="5" seq="98">
             <label>SCCP Phone Device Language</label>
-            <name>devlang</name> 
+            <name>devlang</name>
             <default>Russian_Russia</default>
             <select> </select>
             <help>The user locale allows the phone to display text (menu items, soft keys etc.) native to the phone's language.</help>
@@ -1378,7 +1378,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="6" seq="99">
             <label>Background Image</label>
             <input>
-                <name>backgroundImage</name> 
+                <name>backgroundImage</name>
                 <default></default>
                 <class>sccp-custom</class>
             </input>
@@ -1387,40 +1387,40 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="7" seq="99">
             <label>Ringtone</label>
             <input>
-                <name>ringtone</name> 
+                <name>ringtone</name>
                 <default></default>
                 <class>sccp-custom</class>
             </input>
             <help>The ringtone that the phone will default to. Can be overridden in the phone. The files RINGLIST.XML provice the basic phone ring tones, while DISTINCTIVERINGLIST.XML defines the list of possible ring tones for your other line types. They, along with the actual 'raw' ringtones, are stored in the /tftpboot/ringtones directory with the rest of the config files.</help>
         </item>
-    
+
     </page_group>
     <page_group name="sccp_hw_dev_button">
         <label>Buttons Configuration</label>
         <item type="IE" id="1" seq="99">
             <label>Device MAC SEP.</label>
             <input>
-                <name>mac</name> 
+                <name>mac</name>
                 <default>000000000</default>
                 <class>sccp-custom</class>
             </input>
             <help></help>
         </item>
-        
+
     </page_group>
     <page_group name="sccp_hw_dev_softkey">
         <label>Enable/Disable Softkeys</label>
         <item type="IS" id="1" seq="99">
-            <name>transfer</name> 
+            <name>transfer</name>
             <label>Transfer</label>
-            <default>NONE</default>
-            <button value="NONE">Inherit</button>
+            <default>off</default>
+            <button value="off">Inherit</button>
             <button value="on">On</button>
             <button value="off">Off</button>
             <help>Transfer allowed</help>
         </item>
         <item type="IS" id="1" seq="99">
-            <name>park</name> 
+            <name>park</name>
             <label>Park</label>
             <default>on</default>
             <button_d value="NONE">Inherit</button_d>
@@ -1429,58 +1429,58 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Take a look to the compile how-to. Park stuff is not compiled by default.</help>
         </item>
         <item type="IS" id="2" seq="99">
-            <name>cfwdall</name> 
+            <name>cfwdall</name>
             <label>Call Forward</label>
-            <default>NONE</default>
-            <button value="NONE">Inherit</button>
+            <default>off</default>
+            <button value="off">Inherit</button>
             <button value="on">On</button>
             <button value="off">Off</button>
             <help>Activate the callforward softkeys. Default is On</help>
         </item>
         <item type="IS" id="3" seq="99">
-            <name>cfwdbusy</name> 
+            <name>cfwdbusy</name>
             <label>Call Forward busy</label>
-            <default>NONE</default>
-            <button value="NONE">Inherit</button>
+            <default>off</default>
+            <button value="off">Inherit</button>
             <button value="on">On</button>
             <button value="off">Off</button>
             <help>Activate the callforward busy softkeys. Default is On</help>
         </item>
         <item type="IS" id="3" seq="0">
-            <name>cfwdnoanswer</name> 
+            <name>cfwdnoanswer</name>
             <label>Call Forward NOANSWER</label>
-            <default>NONE</default>
-            <button value="NONE">Inherit</button>
+            <default>on</default>
+            <button value="on">Inherit</button>
             <button value="on">On</button>
             <button value="off">Off</button>
             <help>Activate the callforward NOANSWER stuff and softkeys. Default is On</help>
         </item>
         <item type="IS" id="5" seq="99">
-            <name>dndFeature</name> 
+            <name>dndFeature</name>
             <label>DND Button on Device</label>
-            <default>NONE</default>
-            <button value="NONE">Inherit</button>
+            <default>off</default>
+            <button value="off">Inherit</button>
             <button value="on">On</button>
             <button value="off">Off</button>
             <help>Do Not Disturb. Default is Off</help>
         </item>
         <item type="IS" id="1" seq="99">
-            <name>conf_allow</name> 
+            <name>conf_allow</name>
             <label>Conference</label>
             <default>on</default>
             <option_hide class=".conf_hide">off</option_hide>
             <button value="on">On</button>
             <button value="off">Off</button>
             <help>Allow the use of conference</help>
-        </item>        
+        </item>
     </page_group>
-    
-    
+
+
     <page_group name="sccp_hw_dev_advance">
-        
+
         <label>Device Properies</label>
         <item type="IS" id="4" seq="99">
-            <name>useRedialMenu</name> 
+            <name>useRedialMenu</name>
             <label>Redial using Phonebook</label>
             <default>off</default>
             <button value="on">On</button>
@@ -1488,7 +1488,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>You can specifying 'useRedialMenu = yes' in the sccp.conf device section and the redial softkey will cause the "placed calls" list instead of immediately calling the last dialed number.</help>
         </item>
         <item type="IS" id="6" seq="99">
-            <name>force_dtmfmode</name> 
+            <name>force_dtmfmode</name>
             <label>Dual-Tone Multi-Frequency (DTMF)</label>
             <default>auto</default>
             <button value="auto">AUTO</button>
@@ -1497,29 +1497,29 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Some phone models with bad firmware do send dtmf in a messed up order and need to be forced to skinny mode.</help>
         </item>
         <item type="IS" id="14">
-            <name>mwioncall</name> 
+            <name>mwioncall</name>
             <label>Message Lamp On Call</label>
-            <default>NONE</default>
-            <button value="NONE">Inherit</button>
+            <default>on</default>
+            <button value="on">Inherit</button>
             <button value="on">Yes</button>
             <button value="off">No</button>
             <help>Set the MWI on call.</help>
         </item>
-      
-        <item type="IS" id="7" seq="99"> 
-            <name>mwilamp</name> 
+
+        <item type="IS" id="7" seq="99">
+            <name>mwilamp</name>
             <label>Message Waiting Indication (MWI)</label>
-            <default>NONE</default>
-            <button value="NONE">Inherit</button>
+            <default>on</default>
+            <button value="on">Inherit</button>
             <button value="on">On</button>
             <button value="off">Off</button>
             <button value="wink">Wink</button>
             <button value="flash">Flash</button>
             <button value="blink">Blink</button>
             <help>Set the MWI lamp style when MWI active to on, off, wink, flash or blink</help>
-        </item>        
+        </item>
         <item type="IS" id="8" seq="99">
-            <name>callhistory_answered_elsewhere</name> 
+            <name>callhistory_answered_elsewhere</name>
             <label>Call history stored book</label>
             <default>Missed Calls</default>
             <button value="Placed Calls">Placed Calls</button>
@@ -1528,14 +1528,14 @@ and open the template in the editor. Base Version before all crash :-)
             <button value="Ignore">Ignore</button>
             <help></help>
         </item>
-        
+
     </page_group>
-    
+
     <page_group name="sccp_hw_dev_conference">
         <class>conf_hide</class>
         <label>Conference</label>
         <item type="IS" id="2" seq="99">
-            <name>conf_play_general_announce</name> 
+            <name>conf_play_general_announce</name>
             <label>Playback Conference Anncouncements</label>
             <default>on</default>
             <button value="on">Yes</button>
@@ -1543,7 +1543,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Playback General Announcements (like: 'You are Entering/Leaving the conference')</help>
         </item>
         <item type="IS" id="3" seq="99">
-            <name>conf_play_part_announce</name> 
+            <name>conf_play_part_announce</name>
             <label>Playback Participant Anncouncements</label>
             <default>on</default>
             <button value="on">Yes</button>
@@ -1551,7 +1551,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Playback Personal/Participant Announcements, (like: 'You have been muted / You have been kicked')</help>
         </item>
         <item type="IS" id="4" seq="99">
-            <name>conf_mute_on_entry</name> 
+            <name>conf_mute_on_entry</name>
             <label>Start Muted</label>
             <default>off</default>
             <button value="on">Yes</button>
@@ -1559,7 +1559,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help>Mute new participants from the start</help>
         </item>
         <item type="IS" id="5" seq="99">
-            <name>conf_show_conflist</name> 
+            <name>conf_show_conflist</name>
             <label>Show conference list</label>
             <default>on</default>
             <button value="on">Yes</button>
@@ -1568,7 +1568,7 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
         <item type="SLM" id="6" seq="99">
             <label>Music On Hold Class</label>
-            <name>conf_music_on_hold_class</name> 
+            <name>conf_music_on_hold_class</name>
             <default>default</default>
             <select></select>
             <class>form-control</class>
@@ -1578,41 +1578,41 @@ and open the template in the editor. Base Version before all crash :-)
     </page_group>
     <page_group name="add_network_1">
         <item type="IS" id="1" seq="99">
-            <name>custom_network_acc</name> 
+            <name>custom_network_acc</name>
             <label>Select Networks Actions</label>
             <default>permit</default>
             <button value="permit">Permit</button>
             <button value="deny">Deny</button>
             <button value="local">Local</button>
             <help>Help.</help>
-        </item>        
+        </item>
         <item type="IS" id="1" seq="99">
-            <name>custom_network_type</name> 
+            <name>custom_network_type</name>
             <label>Select Networks Type</label>
             <default>ipv4</default>
             <button value="ipv4">IpV4</button>
             <button value="ipv6">IpV6</button>
             <help>Help.</help>
-        </item>        
+        </item>
         <item type="IE" id="1" seq="99">
             <label>Network IP</label>
             <input>
-                <name>custom_network_v</name> 
+                <name>custom_network_v</name>
                 <options placeholder="0.0.0.0" pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"/>
                 <default></default>
                 <class>sccp-custom</class>
             </input>
             <input>
-                <name>custom_network_m</name> 
+                <name>custom_network_m</name>
                 <default></default>
                 <class>sccp-custom</class>
                 <options placeholder="255.255.255.0" pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"/>
             </input>
             <help>Help.</help>
         </item>
-        
+
     </page_group>
-    
+
     <page_group name="sccp_hw_dev_network">
         <label>Network</label>
         <item type="IED" id="2" seq="0">
@@ -1629,7 +1629,7 @@ and open the template in the editor. Base Version before all crash :-)
             <add_pluss>+</add_pluss>
             <addbutton-disabled>Add Deny network</addbutton-disabled>
             <help>All RFC 1918 addresses are local networks. Should always be at least '0.0.0.0/0.0.0.0'.</help>
-        </item>        
+        </item>
 
         <item type="IED" id="1" seq="0">
             <label>Allow Networks / Mask</label>
@@ -1646,18 +1646,18 @@ and open the template in the editor. Base Version before all crash :-)
                 <options placeholder="0.0.0.0" pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"/>
             </input>
             <input value="NONE" field="mask">
-                <options placeholder="255.255.255.0" pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"/> 
-            </input>            
+                <options placeholder="255.255.255.0" pattern="^([0-9]{1,3}\.){3}[0-9]{1,3}$"/>
+            </input>
             <add_pluss>+</add_pluss>
             <addbutton-disables>Add Allow network</addbutton-disables>
             <help>Allow network settings. Blank fields will be ignored used Network 0.0.0.0.</help>
         </item>
 
         <item type="IS" id="3" seq="99">
-            <name>nat</name> 
+            <name>nat</name>
             <label>NAT</label>
-            <default>NONE</default>
-            <button value="NONE">Inherit</button>
+            <default>auto</default>
+            <button value="auto">Inherit</button>
             <button value="auto">Auto</button>
             <button value="off">Off</button>
             <button value="on">On</button>
@@ -1665,17 +1665,17 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
 
         <item type="IS" id="4" seq="99">
-            <name>directrtp</name> 
+            <name>directrtp</name>
             <label>Direct RTP</label>
-            <default>NONE</default>
-            <button- value="NONE">Auto</button->
-            <button value="NONE">Inherit</button>
+            <default>off</default>
+            <button- value="off">Auto</button->
+            <button value="off">Inherit</button>
             <button value="off">Off</button>
             <button value="on">On</button>
             <help>This option allow devices to do direct RTP sessions (default Off)</help>
         </item>
         <item type="IS" id="5" seq="99">
-            <name>earlyrtp</name> 
+            <name>earlyrtp</name>
             <label>Early RTP</label>
             <default>NONE</default>
             <button value="NONE">Inherit</button>
@@ -1692,18 +1692,18 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="1" seq="99">
             <label>Template Name </label>
             <input>
-                <name>dialtemplate_name</name> 
+                <name>dialtemplate_name</name>
                 <default>name_ruls</default>
                 <class>form-control</class>
             </input>
             <help>Help.</help>
         </item>
-        
+
     </page_group>
     <page_group name="sccp_dp_template">
         <label>Device Template Function</label>
         <item type="HLP" id="2">
-            <label>HELP SCCP Server Name</label>        
+            <label>HELP SCCP Server Name</label>
             <name>Help_id1</name>
             <element type='p'>Specifies a pattern to match dialed digits against. Note: TEMPLATE must be in uppercase.</element>
             <element type='h4'>Rules:</element>
@@ -1788,7 +1788,7 @@ and open the template in the editor. Base Version before all crash :-)
                 <options class="form-control dpt-title" placeholder="Rewrite the matched"/>
             </element>
             <element type="select" value="NONE" field="tone">
-                <options class="form-control dpt-title" /> 
+                <options class="form-control dpt-title" />
                 <data>empty</data>
                 <data>Bellcore-Alerting</data>
                 <data>Bellcore-Inside</data>
@@ -1817,11 +1817,11 @@ and open the template in the editor. Base Version before all crash :-)
                 <data>CallWaiting-4</data>
             </element>
             <help>Allow network settings. Blank fields will be ignored used Network 0.0.0.0.</help>
-            
+
         </item>
-            
+
     </page_group>
- <!--   
+ <!--
     Roaming User Pages
      -->
     <page_group name="sccp_ruser">
@@ -1829,18 +1829,18 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="1" seq="99">
             <label>User ID</label>
             <input>
-                <name>id</name> 
+                <name>id</name>
                 <default>000000000</default>
                 <class>sccp-custom</class>
                 <options readonly="readonly"></options>
             </input>
             <help>Help!</help>
-        </item>      
+        </item>
 
         <item type="IE" id="2" seq="99">
             <label>User Display Name</label>
             <input>
-                <name>description</name> 
+                <name>description</name>
                 <default></default>
             </input>
             <help>Help!</help>
@@ -1848,7 +1848,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="2" seq="99">
             <label>User Pincode</label>
             <input>
-                <name>pin</name> 
+                <name>pin</name>
                 <default></default>
             </input>
             <help>Help!</help>
@@ -1856,13 +1856,13 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE-D" id="2" seq="99">
             <label>User password</label>
             <input>
-                <name>password</name> 
+                <name>password</name>
                 <default></default>
             </input>
             <help>Help!</help>
         </item>
         <item type="IS" id="13" seq="99">
-            <name>roaminglogin</name> 
+            <name>roaminglogin</name>
             <label>Roaming</label>
             <default>off</default>
             <button value="off">Disabled</button>
@@ -1871,7 +1871,7 @@ and open the template in the editor. Base Version before all crash :-)
             <help></help>
         </item>
         <item type="IS" id="13" seq="99">
-            <name>auto_logout</name> 
+            <name>auto_logout</name>
             <label>Auto Logout</label>
             <default>off</default>
             <button value="off">Ask User</button>
@@ -1881,20 +1881,20 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
         <item type="SDD" id="3" seq="99">
             <label>Link Buttons from Home Device</label>
-            <name>homedevice</name> 
+            <name>homedevice</name>
             <default>NONE</default>
             <select name="name" addlabel='description'>name</select>
             <class>sccp-custom</class>
             <help>Help!</help>
         </item>
     </page_group>
- <!--   
+ <!--
     Roaming User Pages
      -->
     <page_group name="sccp_ruser_time">
         <label>Time Work configuration</label>
         <item type="IS" id="13" seq="99">
-            <name>work_time</name> 
+            <name>work_time</name>
             <label>Logof after Work Time</label>
             <default>off</default>
             <button value="off">Disabled</button>
@@ -1905,7 +1905,7 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="2" seq="99">
             <label>Time Group</label>
             <input>
-                <name>work_group</name> 
+                <name>work_group</name>
                 <default></default>
             </input>
             <help>Help!</help>
@@ -1913,25 +1913,25 @@ and open the template in the editor. Base Version before all crash :-)
         <item type="IE" id="2" seq="99">
             <label>Out of time session length</label>
             <input>
-                <name>time_extend</name> 
+                <name>time_extend</name>
                 <default>30</default>
             </input>
             <help>Help!</help>
         </item>
-        
+
     </page_group>
     <page_group name="sccp_hw_sip_dev">
         <label>General Device configuration</label>
         <item type="IE" id="1" seq="99">
             <label>Device SEP ID.[XXXXXXXXXXXX]=MAC</label>
             <input>
-                <name>mac</name> 
+                <name>mac</name>
                 <default>000000000</default>
                 <class>sccp-custom</class>
             </input>
             <help>The MAC address of the phone. You must specify 12 characters in the format XXXX.XXXX.XXXX or XX-XX-XX-XX-XX-XX or XXXXXXXXXXXX</help>
         </item>
-       
+
         <item type="SDMS" id="2" seq="99">
             <label>Type</label>
             <name>type</name>
@@ -1942,7 +1942,7 @@ and open the template in the editor. Base Version before all crash :-)
         </item>
         <item type="SDE" id="3" seq="99">
             <label>Addon</label>
-            <name>addon</name> 
+            <name>addon</name>
             <default>NONE</default>
             <select name="model" dataval="buttons">model</select>
             <class>hw_select sccp-custom</class>
@@ -1951,19 +1951,19 @@ and open the template in the editor. Base Version before all crash :-)
     </page_group>
 
     <page_group name="sccp_hw_sip_conf">
-        <label>SIP Device config</label> 
+        <label>SIP Device config</label>
         <item type="SLP" id="2" seq="99">
             <label>Dial Templates</label>
-            <name>_dialrules</name> 
+            <name>_dialrules</name>
             <default>dialplan</default>
             <select></select>
              <help>Dial templates control what number patterns are valid and how many seconds to wait for extra digits before dialing. </help>
         </item>
-        
+
     </page_group>
 
     <page_group name="sccp_hw_addv_device">
-        <label>SIP Device config</label> 
+        <label>SIP Device config</label>
         <item type="IED" id="1" seq="0">
             <label>Set Vars</label>
             <name>setvar</name>
@@ -1974,7 +1974,7 @@ and open the template in the editor. Base Version before all crash :-)
             <add_pluss>+</add_pluss>
             <help></help>
         </item>
-        
+
     </page_group>
-    
+
 </root>
diff --git a/sccpManClasses/dbinterface.class.php b/sccpManClasses/dbinterface.class.php
index ae366d2..2a5e071 100644
--- a/sccpManClasses/dbinterface.class.php
+++ b/sccpManClasses/dbinterface.class.php
@@ -83,11 +83,11 @@ class dbinterface
                 } elseif (!empty($data['type'])) {
                     switch ($data['type']) {
                         case "cisco-sip":
-                            $stmts = $dbh->prepare('SELECT ' . $fld . ' FROM sccpdeviceconfig WHERE TYPE LIKE \'%-sip\' ORDER BY name');
+                            $stmts = $dbh->prepare("SELECT {$fld} FROM sccpdeviceconfig WHERE TYPE LIKE '%-sip' ORDER BY name");
                             break;
                         case "cisco":      // Fall through to default intentionally
                         default:
-                            $stmts = $dbh->prepare('SELECT ' . $fld . ' FROM sccpdeviceconfig WHERE TYPE not LIKE \'%-sip\' ORDER BY name');
+                            $stmts = $dbh->prepare("SELECT {$fld} FROM sccpdeviceconfig WHERE TYPE not LIKE '%-sip' ORDER BY name");
                             break;
                     }
                 } else {      //no filter and no name provided - return all
@@ -219,10 +219,10 @@ class dbinterface
                 $stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel WHERE (dns > 0) and (enabled = 1) ORDER BY model");
                 break;
             case 'ciscophones':
-                $stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel WHERE (dns > 0) and (enabled = 1) AND vendor NOT LIKE \'%-sip\' ORDER BY model");
+                $stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel WHERE (dns > 0) and (enabled = 1) AND vendor NOT LIKE '%-sip' ORDER BY model");
                 break;
             case 'sipphones':
-                $stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel WHERE (dns > 0) and (enabled = 1) AND vendor LIKE \'%-sip\' ORDER BY model");
+                $stmt = $dbh->prepare("SELECT {$sel_inf} FROM sccpdevmodel WHERE (dns > 0) and (enabled = 1) AND vendor LIKE '%-sip' ORDER BY model");
                 break;
             case 'all':     // Fall through to default
             default: