Merge branch 'master' into gxp_feature_key_sync

resources/check_auth.php

@@ -74,6 +74,7 @@
 			if ($result["authorized"] === "true") {
 				//set the session variables
 					$_SESSION["domain_uuid"] = $result["domain_uuid"];
+					//$_SESSION["domain_name"] = $result["domain_name"];
 					$_SESSION["user_uuid"] = $result["user_uuid"];
 
 				//user session array
@@ -246,7 +247,7 @@
 								$_SESSION['user']['extension'][$x]['user_context'] = $row['user_context'];
 								$_SESSION['user']['extension'][$x]['description'] = $row['description'];
 
-								//set the user context
+								//set the context
 								$_SESSION['user']['user_context'] = $row["user_context"];
 								$_SESSION['user_context'] = $row["user_context"];
 							}

resources/classes/button.php

@@ -59,7 +59,9 @@ if (!class_exists('button')) {
 				$button .= $array['onclick'] ? "onclick=".self::quote($array['onclick'])." " : null;
 				$button .= $array['onmouseover'] ? "onmouseenter=".self::quote($array['onmouseover'])." " : null;
  				$button .= $array['onmouseout'] ? "onmouseleave=".self::quote($array['onmouseout'])." " : null;
-				$button .= "class='btn btn-".($array['class'] ? $array['class'] : 'default')." ".($array['disabled'] ? 'disabled' : null)."' ";
+				//detect class addition (using + prefix)
+				$button_class = $array['class'] && $array['class'][0] == '+' ? 'default '.substr($array['class'], 1) : $array['class'];
+				$button .= "class='btn btn-".($button_class ? $button_class : 'default')." ".($array['disabled'] ? 'disabled' : null)."' ";
 				//ensure margin* styles are not applied to the button element when a link is defined
 				if (is_array($array['style']) && @sizeof($array['style']) != 0) {
 					foreach ($array['style'] as $property => $value) {

resources/classes/cache.php

@@ -145,11 +145,13 @@ class cache {
 					event_socket_request($fp, $event);
 
 				//remove the local files
-					if (file_exists($_SESSION['cache']['location']['text'] . "/" . $key)) {
-						unlink($_SESSION['cache']['location']['text'] . "/" . $key);
-					}
-					if (file_exists($_SESSION['cache']['location']['text'] . "/" . $key . ".tmp")) {
-						unlink($_SESSION['cache']['location']['text'] . "/" . $key . ".tmp");
+					foreach (glob($_SESSION['cache']['location']['text'] . "/" . $key) as $file) {
+						if (file_exists($file)) {
+							unlink($file);
+						}
+						if (file_exists($file)) {
+							unlink($file . ".tmp");
+						}
 					}
 			}
 

resources/classes/database.php

@@ -62,7 +62,7 @@ include "root.php";
 			 * Called when the object is created
 			 */
 			public function __construct() {
-				if (!isset($this->domain_uuid)) {
+				if (!isset($this->domain_uuid) && isset($_SESSION['domain_uuid'])) {
 					$this->domain_uuid = $_SESSION['domain_uuid'];
 				}
 			}

resources/classes/domains.php

@@ -262,8 +262,6 @@ if (!class_exists('domains')) {
 
 										//clear the domains session array to update it
 											unset($_SESSION["domains"]);
-											unset($_SESSION["domain_uuid"]);
-											unset($_SESSION["domain_name"]);
 											unset($_SESSION['domain']);
 											unset($_SESSION['switch']);
 

resources/classes/schema.php

@@ -34,6 +34,7 @@ if (!class_exists('schema')) {
 			public $apps;
 			public $db_type;
 			public $result;
+			public $data_types;
 
 		//class constructor
 			public function __construct() {
@@ -49,7 +50,12 @@ if (!class_exists('schema')) {
 				$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
 				$x=0;
 				foreach ($config_list as &$config_path) {
-					include($config_path);
+					try {
+					    include($config_path);
+					}
+					catch (Exception $e) {
+					    //echo 'Caught exception: ',  $e->getMessage(), "\n";
+					}
 					$x++;
 				}
 				$this->apps = $apps;
@@ -381,7 +387,7 @@ if (!class_exists('schema')) {
 									$field_count++;
 								}
 							}
-							$sql .= ");\n\n";
+							$sql .= ");\n";
 							return $sql;
 						}
 					}
@@ -452,7 +458,7 @@ if (!class_exists('schema')) {
 									$field_count++;
 								}
 							}
-							$sql .= " FROM tmp_".$table.";\n\n";
+							$sql .= " FROM tmp_".$table.";\n";
 							return $sql;
 						}
 					}
@@ -463,8 +469,9 @@ if (!class_exists('schema')) {
 			public function schema ($format = '') {
  
  				//set the global variable
-					global $db, $upgrade_data_types, $text,$output_format;
-					if ($format=='') $format = $output_format;
+					global $db, $text, $output_format;
+
+					if ($format == '') $format = $output_format;
 
 				//get the db variables
 					require_once "resources/classes/config.php";
@@ -519,7 +526,12 @@ if (!class_exists('schema')) {
 					$config_list = glob($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/*/*/app_config.php");
 					$x=0;
 					foreach ($config_list as &$config_path) {
-						include($config_path);
+						try {
+							include($config_path);
+						}
+						catch (Exception $e) {
+						    //echo 'Caught exception: ',  $e->getMessage(), "\n";
+						}
 						$x++;
 					}
 
@@ -665,7 +677,7 @@ if (!class_exists('schema')) {
 
 												//change the data type if it has been changed
 													//if the data type in the app db array is different than the type in the database then change the data type
-													if ($upgrade_data_types) {
+													if ($this->data_types) {
 														$db_field_type = $this->db_column_data_type ($db_type, $db_name, $table_name, $field_name);
 														$field_type_array = explode("(", $field_type);
 														$field_type = $field_type_array[0];
@@ -896,11 +908,11 @@ if (!class_exists('schema')) {
 									try {
 										$this->db->query(trim($sql));
 										if ($format == "text") {
-											$response .= "	$sql\n";
+											$response .= "	$sql;\n";
 										}
 									}
 									catch (PDOException $error) {
-										$response .= "	error: " . $error->getMessage() . "	sql: $sql<br/>";
+										$response .= "	error: " . $error->getMessage() . "	sql: $sql\n";
 									}
 								}
 							}

resources/footer.php

@@ -72,7 +72,7 @@
 	$view = new template();
 	$view->engine = 'smarty';
 	$view->template_dir = $_SERVER['DOCUMENT_ROOT'].PROJECT_PATH.'/themes/'.$_SESSION['domain']['template']['name'].'/';
-	$view->cache_dir = $_SESSION['server']['temp']['dir'];
+	$view->cache_dir = $_SESSION['server']['temp']['dir'] ?: sys_get_temp_dir();
 	$view->init();
 
 //add multi-lingual support

resources/functions.php

@@ -2058,13 +2058,25 @@ function number_pad($number,$n) {
 //validate and format order by clause of select statement
 	if (!function_exists('order_by')) {
 		function order_by($col, $dir, $col_default = '', $dir_default = 'asc') {
+			$order_by = ' order by ';
 			$col = preg_replace('#[^a-zA-Z0-9-_.]#', '', $col);
 			$dir = strtolower($dir) == 'desc' ? 'desc' : 'asc';
 			if ($col != '') {
-				return ' order by '.$col.' '.$dir.' ';
+				return $order_by.$col.' '.$dir.' ';
 			}
-			else if ($col_default != '') {
-				return ' order by '.$col_default.' '.$dir_default.' ';
+			else if (is_array($col_default) || $col_default != '') {
+				if (is_array($col_default) && @sizeof($col_default) != 0) {
+					foreach ($col_default as $k => $column) {
+						$direction = (is_array($dir_default) && @sizeof($dir_default) != 0 && (strtolower($dir_default[$k]) == 'asc' || strtolower($dir_default[$k]) == 'desc')) ? $dir_default[$k] : 'asc';
+						$order_bys[] = $column.' '.$direction.' ';
+					}
+					if (is_array($order_bys) && @sizeof($order_bys) != 0) {
+						return $order_by.implode(', ', $order_bys);
+					}
+				}
+				else {
+					return $order_by.$col_default.' '.$dir_default.' ';
+				}
 			}
 		}
 	}

resources/pdo.php

@@ -246,15 +246,12 @@ if ($db_type == "mysql") {
 if ($db_type == "pgsql") {
 	//database connection
 	try {
-		if (isset($db_secure)) {
-			$dbissecure = $db_secure;
-		}
-		else {
-			$dbissecure = false;
+		if (!isset($db_secure)) {
+			$db_secure = false;
 		}
 		if (strlen($db_host) > 0) {
 			if (strlen($db_port) == 0) { $db_port = "5432"; }
-			if ($dbissecure == true) {
+			if ($db_secure == true) {
 				$db = new PDO("pgsql:host=$db_host port=$db_port dbname=$db_name user=$db_username password=$db_password sslmode=verify-ca sslrootcert=$db_cert_authority");
 			}
 			else {
@@ -304,20 +301,20 @@ if ($db_type == "pgsql") {
 				unset($result);
 			}
 
-			if (is_array($domains)) { 
+			if (is_array($domains)) {
 				foreach($domains as $row) {
-					/*
-					if (count($domains) == 1) {
-						$_SESSION["domain_uuid"] = $row["domain_uuid"];
-						$_SESSION["domain_name"] = $row['domain_name'];
-					}
-					else {
-						if ($row['domain_name'] == $domain_array[0] || $row['domain_name'] == 'www.'.$domain_array[0]) {
+					if (!isset($_SESSION['username'])) {
+						if (count($domains) == 1) {
 							$_SESSION["domain_uuid"] = $row["domain_uuid"];
-							$_SESSION["domain_name"] = $row["domain_name"];
+							$_SESSION["domain_name"] = $row['domain_name'];
 						}
-					}
-					*/
+						else {
+							if ($row['domain_name'] == $domain_array[0] || $row['domain_name'] == 'www.'.$domain_array[0]) {
+								$_SESSION["domain_uuid"] = $row["domain_uuid"];
+								$_SESSION["domain_name"] = $row["domain_name"];
+							}
+						}
+					}	
 					$_SESSION['domains'][$row['domain_uuid']] = $row;
 				}
 				unset($domains, $prep_statement);

resources/require.php

@@ -72,11 +72,14 @@
 	require_once "resources/functions.php";
 	if ($config_exists) {
 		require "resources/pdo.php";
-		require_once "resources/switch.php";
+		if (file_exists($_SERVER["DOCUMENT_ROOT"] . PROJECT_PATH . "/resources/switch.php")) {
+			require_once "resources/switch.php";
+		}
 	}
 
 //change language on the fly - for translate tool (if available)
 	if (isset($_REQUEST['view_lang_code']) && ($_REQUEST['view_lang_code']) != '') {
 		$_SESSION['domain']['language']['code'] = $_REQUEST['view_lang_code'];
 	}
+
 ?>

resources/switch.php

@@ -432,97 +432,96 @@ function outbound_route_to_bridge($domain_uuid, $destination_number, array $chan
 		$hostname = 'unknown';
 	}
 
-	$sql = "select * from v_dialplans ";
-	if (is_uuid($domain_uuid)) {
-		$sql .= "where (domain_uuid = :domain_uuid or domain_uuid is null) ";
-	}
-	else {
-		$sql .= "where (domain_uuid is null) ";
-	}
-	$sql .= "and (hostname = :hostname or hostname is null) ";
-	$sql .= "and app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' ";
-	$sql .= "and dialplan_enabled = 'true' ";
-	$sql .= "order by dialplan_order asc ";
+	$sql = "select d.dialplan_uuid, ";
+	$sql .= "d.dialplan_name, "; 
+	$sql .= "dd.dialplan_detail_uuid, ";
+	$sql .= "dd.dialplan_detail_tag, ";
+	$sql .= "dd.dialplan_detail_type, ";
+	$sql .= "dd.dialplan_detail_data , ";
+	$sql .= "d.dialplan_continue ";
+	$sql .= "from v_dialplans d, v_dialplan_details dd  ";
+	$sql .= "where d.dialplan_uuid = dd.dialplan_uuid ";
 	if (is_uuid($domain_uuid)) {
+		$sql .= "and (d.domain_uuid = :domain_uuid or d.domain_uuid is null) ";
 		$parameters['domain_uuid'] = $domain_uuid;
 	}
+	else {
+		$sql .= "and (d.domain_uuid is null) ";
+	}
+	$sql .= "and (hostname = :hostname or hostname is null) ";
+	$sql .= "and d.app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' ";
+	$sql .= "and d.dialplan_enabled = 'true' ";
+	$sql .= "order by d.domain_uuid,  d.dialplan_order, dd.dialplan_detail_order ";
 	$parameters['hostname'] = $hostname;
 	$database = new database;
 	$result = $database->select($sql, $parameters, 'all');
 	unset($sql, $parameters);
+
 	if (is_array($result) && @sizeof($result) != 0) {
-		$x = 0;
 		foreach ($result as &$row) {
-			//set as variables
-				$dialplan_uuid = $row['dialplan_uuid'];
-				$dialplan_detail_tag = $row["dialplan_detail_tag"];
-				$dialplan_detail_type = $row['dialplan_detail_type'];
-				$dialplan_continue = $row['dialplan_continue'];
-
-			//get the extension number using the dialplan_uuid
-				$sql = "select * ";
-				$sql .= "from v_dialplan_details ";
-				$sql .= "where dialplan_uuid = :dialplan_uuid ";
-				$sql .= "order by dialplan_detail_order asc ";
-				$parameters['dialplan_uuid'] = $dialplan_uuid;
-				$database = new database;
-				$sub_result = $database->select($sql, $parameters, 'all');
-				unset($sql, $parameters);
-
-				$condition_match = false;
-				if (is_array($sub_result) && @sizeof($sub_result) != 0) {
-					foreach ($sub_result as &$sub_row) {
-						if ($sub_row['dialplan_detail_tag'] == "condition") {
-							if ($sub_row['dialplan_detail_type'] == "destination_number") {
-									$pattern = '/'.$sub_row['dialplan_detail_data'].'/';
-									preg_match($pattern, $destination_number, $matches, PREG_OFFSET_CAPTURE);
-									if (count($matches) == 0) {
-										$condition_match[] = 'false';
-									}
-									else {
-										$condition_match[] = 'true';
-										$regex_match_1 = $matches[1][0];
-										$regex_match_2 = $matches[2][0];
-										$regex_match_3 = $matches[3][0];
-										$regex_match_4 = $matches[4][0];
-										$regex_match_5 = $matches[5][0];
-									}
-							}
-							elseif ($sub_row['dialplan_detail_type'] == "\${toll_allow}") {
-								$pattern = '/'.$sub_row['dialplan_detail_data'].'/';
-								preg_match($pattern, $channel_variables['toll_allow'], $matches, PREG_OFFSET_CAPTURE);
-								if (count($matches) == 0) {
-									$condition_match[] = 'false';
-								} 
-								else {
-									$condition_match[] = 'true';
-								}
-							}
-						}
-					}
-				}
-
-				if (!in_array('false', $condition_match)) {
-					$x = 0;
-					foreach ($sub_result as &$sub_row) {
-						$dialplan_detail_data = $sub_row['dialplan_detail_data'];
-						if ($sub_row['dialplan_detail_tag'] == "action" && $sub_row['dialplan_detail_type'] == "bridge" && $dialplan_detail_data != "\${enum_auto_route}") {
-							$dialplan_detail_data = str_replace("\$1", $regex_match_1, $dialplan_detail_data);
-							$dialplan_detail_data = str_replace("\$2", $regex_match_2, $dialplan_detail_data);
-							$dialplan_detail_data = str_replace("\$3", $regex_match_3, $dialplan_detail_data);
-							$dialplan_detail_data = str_replace("\$4", $regex_match_4, $dialplan_detail_data);
-							$dialplan_detail_data = str_replace("\$5", $regex_match_5, $dialplan_detail_data);
-							$bridge_array[$x] = $dialplan_detail_data;
-							$x++;
-							if ($dialplan_continue == "false") {
-								break 2;
-							}
-						}
-					}
-				}
+			$dialplan_uuid = $row["dialplan_uuid"];
+			$dialplan_detail_uuid = $row["dialplan_detail_uuid"];
+			$outbound_routes[$dialplan_uuid][$dialplan_detail_uuid]["dialplan_detail_tag"] = $row["dialplan_detail_tag"];
+			$outbound_routes[$dialplan_uuid][$dialplan_detail_uuid]["dialplan_detail_type"] = $row["dialplan_detail_type"];
+			$outbound_routes[$dialplan_uuid][$dialplan_detail_uuid]["dialplan_detail_data"] = $row["dialplan_detail_data"];
+			$outbound_routes[$dialplan_uuid]["dialplan_continue"] = $row["dialplan_continue"];
+		}
+	}
+	
+	if (is_array($outbound_routes) && @sizeof($outbound_routes) != 0) {
+		$x = 0;
+		foreach ($outbound_routes as &$dialplan) {
+			$condition_match = false;
+			foreach ($dialplan as &$dialplan_details) {
+				if ($dialplan_details['dialplan_detail_tag'] == "condition") {
+					if ($dialplan_details['dialplan_detail_type'] == "destination_number") {
+							$pattern = '/'.$dialplan_details['dialplan_detail_data'].'/';
+							preg_match($pattern, $destination_number, $matches, PREG_OFFSET_CAPTURE);
+							if (count($matches) == 0) {
+								$condition_match[] = 'false';
+							}
+							else {
+								$condition_match[] = 'true';
+								$regex_match_1 = $matches[1][0];
+								$regex_match_2 = $matches[2][0];
+								$regex_match_3 = $matches[3][0];
+								$regex_match_4 = $matches[4][0];
+								$regex_match_5 = $matches[5][0];
+							}
+					}
+					elseif ($dialplan_details['dialplan_detail_type'] == "\${toll_allow}") {
+						$pattern = '/'.$dialplan_details['dialplan_detail_data'].'/';
+						preg_match($pattern, $channel_variables['toll_allow'], $matches, PREG_OFFSET_CAPTURE);
+						if (count($matches) == 0) {
+							$condition_match[] = 'false';
+						} 
+						else {
+							$condition_match[] = 'true';
+						}
+					}
+				}
+			}
+		
+			if (!in_array('false', $condition_match)) {
+				foreach ($dialplan as &$dialplan_details) {
+					$dialplan_detail_data = $dialplan_details['dialplan_detail_data'];
+					if ($dialplan_details['dialplan_detail_tag'] == "action" && $dialplan_details['dialplan_detail_type'] == "bridge" && $dialplan_detail_data != "\${enum_auto_route}") {
+						$dialplan_detail_data = str_replace("\$1", $regex_match_1, $dialplan_detail_data);
+						$dialplan_detail_data = str_replace("\$2", $regex_match_2, $dialplan_detail_data);
+						$dialplan_detail_data = str_replace("\$3", $regex_match_3, $dialplan_detail_data);
+						$dialplan_detail_data = str_replace("\$4", $regex_match_4, $dialplan_detail_data);
+						$dialplan_detail_data = str_replace("\$5", $regex_match_5, $dialplan_detail_data);
+						$bridge_array[$x] = $dialplan_detail_data;
+						$x++;
+					}
+				}
+				
+				if ($dialplan["dialplan_continue"] == "false") {
+					break;
+				}
+			}
 		}
 	}
-	unset($result, $row);
 	return $bridge_array;
 }
 //$destination_number = '1231234';

resources/templates/provision/fanvil/x4u/{$mac}.cfg

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Template is optimized for firmware ver 2.2.10 and newer. Older firmware has incorrect tag names.-->
 <sysConf>
     <Version>2.0000000000</Version>
     <net>
@@ -33,7 +34,36 @@
         <Vendor6ClassID>Fanvil X4U</Vendor6ClassID>
         <wifi>
             <WIFIEnable>{$fanvil_wifi_enable}</WIFIEnable>
+            <WIFILogEnable>0</WIFILogEnable>
+            <WANTYPE>0</WANTYPE>
+            <WANIP>192.168.1.179</WANIP>
+            <WANSubnetMask>255.255.255.0</WANSubnetMask>
+            <WANGateway>192.168.1.1</WANGateway>
+            <DomainName></DomainName>
+            <PrimaryDNS>8.8.8.8</PrimaryDNS>
+            <SecondaryDNS>202.96.134.133</SecondaryDNS>
+            <EnableDHCP>1</EnableDHCP>
+            <DHCPAutoDNS>1</DHCPAutoDNS>
+            <DHCPOption100-101>1</DHCPOption100-101>
+            <UseVendorClassID>0</UseVendorClassID>
+            <VendorClassID>Fanvil X4U</VendorClassID>
+            <EnablePPPoE>0</EnablePPPoE>
+            <PPPoEUser>user123</PPPoEUser>
+            <PPPoEPassword>password</PPPoEPassword>
+            <WAN6IP></WAN6IP>
+            <WAN6IPPREFIX></WAN6IPPREFIX>
+            <WAN6Gateway></WAN6Gateway>
+            <Domain6Name></Domain6Name>
+            <PrimaryDNS6></PrimaryDNS6>
+            <SecondaryDNS6></SecondaryDNS6>
+            <EnableDHCP6>1</EnableDHCP6>
+            <DHCP6AutoDNS>1</DHCP6AutoDNS>
+            <UseVendor6ClassID>0</UseVendor6ClassID>
+            <Vendor6ClassID></Vendor6ClassID>
         </wifi>
+        <NetGlobal>
+            <NetPriority>10</NetPriority>
+        </NetGlobal>
     </net>
     <mm>
         <G723BitRate>1</G723BitRate>
@@ -54,6 +84,7 @@
         <RTPInitialPort>10000</RTPInitialPort>
         <RTPPortQuantity>1000</RTPPortQuantity>
         <RTPKeepAlive>1</RTPKeepAlive>
+        <RTPRelay>0</RTPRelay>
         <RTCPCNAMEUser></RTCPCNAMEUser>
         <RTCPCNAMEHost></RTCPCNAMEHost>
         <SelectYourTone>{if isset($fanvil_country_toneset)}{$fanvil_country_toneset}{else}11{/if}</SelectYourTone>
@@ -104,22 +135,25 @@
             <RegisterUser>{$account.1.auth_id}</RegisterUser>
             <RegisterPswd>{$account.1.password}</RegisterPswd>
             <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.1.sip_port}</ProxyPort>
             <ProxyUser>{$account.1.auth_id}</ProxyUser>
             <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -251,6 +285,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="2">
             <PhoneNumber>{$account.2.user_id}</PhoneNumber>
@@ -261,22 +297,25 @@
             <RegisterUser>{$account.2.auth_id}</RegisterUser>
             <RegisterPswd>{$account.2.password}</RegisterPswd>
             <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.2.sip_port}</ProxyPort>
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -408,6 +447,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="3">
             <PhoneNumber>{$account.3.user_id}</PhoneNumber>
@@ -418,22 +459,25 @@
             <RegisterUser>{$account.3.auth_id}</RegisterUser>
             <RegisterPswd>{$account.3.password}</RegisterPswd>
             <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.3.sip_port}</ProxyPort>
             <ProxyUser>{$account.3.auth_id}</ProxyUser>
             <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -565,6 +609,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="4">
             <PhoneNumber>{$account.4.user_id}</PhoneNumber>
@@ -575,22 +621,25 @@
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
             <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.4.sip_port}</ProxyPort>
             <ProxyUser>{$account.4.auth_id}</ProxyUser>
             <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -722,6 +771,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="5">
             <PhoneNumber>{$account.5.user_id}</PhoneNumber>
@@ -732,22 +783,25 @@
             <RegisterUser>{$account.5.auth_id}</RegisterUser>
             <RegisterPswd>{$account.5.password}</RegisterPswd>
             <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.5.sip_port}</ProxyPort>
             <ProxyUser>{$account.5.auth_id}</ProxyUser>
             <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -879,6 +933,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="6">
             <PhoneNumber>{$account.6.user_id}</PhoneNumber>
@@ -889,22 +945,25 @@
             <RegisterUser>{$account.6.auth_id}</RegisterUser>
             <RegisterPswd>{$account.6.password}</RegisterPswd>
             <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.6.sip_port}</ProxyPort>
             <ProxyUser>{$account.6.auth_id}</ProxyUser>
             <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1036,6 +1095,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="7">
             <PhoneNumber>{$account.7.user_id}</PhoneNumber>
@@ -1046,22 +1107,25 @@
             <RegisterUser>{$account.7.auth_id}</RegisterUser>
             <RegisterPswd>{$account.7.password}</RegisterPswd>
             <RegisterTTL>{$account.7.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.7.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.7.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.7.sip_port}</ProxyPort>
             <ProxyUser>{$account.7.auth_id}</ProxyUser>
             <ProxyPswd>{$account.7.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.7.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.7.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.7.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1193,6 +1257,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="8">
             <PhoneNumber>{$account.8.user_id}</PhoneNumber>
@@ -1203,22 +1269,25 @@
             <RegisterUser>{$account.8.auth_id}</RegisterUser>
             <RegisterPswd>{$account.8.password}</RegisterPswd>
             <RegisterTTL>{$account.8.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.8.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.8.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.8.sip_port}</ProxyPort>
             <ProxyUser>{$account.8.auth_id}</ProxyUser>
             <ProxyPswd>{$account.8.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.8.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.8.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.8.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1350,6 +1419,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="9">
             <PhoneNumber>{$account.9.user_id}</PhoneNumber>
@@ -1360,22 +1431,25 @@
             <RegisterUser>{$account.9.auth_id}</RegisterUser>
             <RegisterPswd>{$account.9.password}</RegisterPswd>
             <RegisterTTL>{$account.9.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.9.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.9.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.9.sip_port}</ProxyPort>
             <ProxyUser>{$account.9.auth_id}</ProxyUser>
             <ProxyPswd>{$account.9.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.9.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.9.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.9.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1507,6 +1581,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="10">
             <PhoneNumber>{$account.10.user_id}</PhoneNumber>
@@ -1517,22 +1593,25 @@
             <RegisterUser>{$account.10.auth_id}</RegisterUser>
             <RegisterPswd>{$account.10.password}</RegisterPswd>
             <RegisterTTL>{$account.10.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.10.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.10.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.10.sip_port}</ProxyPort>
             <ProxyUser>{$account.10.auth_id}</ProxyUser>
             <ProxyPswd>{$account.10.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.10.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.10.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.10.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1664,6 +1743,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="11">
             <PhoneNumber>{$account.11.user_id}</PhoneNumber>
@@ -1674,22 +1755,25 @@
             <RegisterUser>{$account.11.auth_id}</RegisterUser>
             <RegisterPswd>{$account.11.password}</RegisterPswd>
             <RegisterTTL>{$account.11.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.11.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.11.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.11.sip_port}</ProxyPort>
             <ProxyUser>{$account.11.auth_id}</ProxyUser>
             <ProxyPswd>{$account.11.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.11.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.11.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.11.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1821,6 +1905,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="12">
             <PhoneNumber>{$account.12.user_id}</PhoneNumber>
@@ -1831,22 +1917,25 @@
             <RegisterUser>{$account.12.auth_id}</RegisterUser>
             <RegisterPswd>{$account.12.password}</RegisterPswd>
             <RegisterTTL>{$account.12.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.12.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.12.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.12.sip_port}</ProxyPort>
             <ProxyUser>{$account.12.auth_id}</ProxyUser>
             <ProxyPswd>{$account.12.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.12.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.12.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.12.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1978,12 +2067,17 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <p2p>
             <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
             <SIPP2PAutoAnswerDelay>30</SIPP2PAutoAnswerDelay>
             <SIPP2PDtmfMode>1</SIPP2PDtmfMode>
             <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
+            <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
+            <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
         </p2p>
     </sip>
     <call>
@@ -2057,6 +2151,10 @@
             <ConfDTMFCode></ConfDTMFCode>
             <DisableDialSearch>0</DisableDialSearch>
             <CallNumberFilter></CallNumberFilter>
+            <AutoResumeCurrent>0</AutoResumeCurrent>
+            <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
         </port>
         <basic>
             <DialbyPound>1</DialbyPound>
@@ -2137,13 +2235,17 @@
         <CallLogDisplayType>0</CallLogDisplayType>
         <EnableRecvSMS>1</EnableRecvSMS>
         <EnableCallHistory>1</EnableCallHistory>
-        <LineDisplayFormat>$name@$protocol$instance</LineDisplayFormat>
+        <LineDisplayFormat>$name</LineDisplayFormat>
         <EnableMWITone>0</EnableMWITone>
         <AllPswdEncryption>0</AllPswdEncryption>
         <SIPNotifyXML>1</SIPNotifyXML>
         <BlockXMLWhenCall>1</BlockXMLWhenCall>
         <XMLUpdateInterval>30</XMLUpdateInterval>
         <VqmDisplayOrder></VqmDisplayOrder>
+        <EnablePushXMLAuth>0</EnablePushXMLAuth>
+        <PickupVisualAlert>0</PickupVisualAlert>
+        <PickupAudioAlert>0</PickupAudioAlert>
+        <PickupRingType></PickupRingType>
         <display>
             <LCDTitle>{$fanvil_greeting}</LCDTitle>
             <LCDConstrast>5</LCDConstrast>
@@ -2172,14 +2274,25 @@
         <blfLed>
             <BLFIdleColor>0</BLFIdleColor>
             <BLFIdleCtl>1</BLFIdleCtl>
+            <BLFIdleText>terminated</BLFIdleText>
             <BLFRingColor>1</BLFRingColor>
             <BLFRingCtl>2</BLFRingCtl>
-            <BLFUsingColor>1</BLFUsingColor>
-            <BLFUsingCtl>1</BLFUsingCtl>
+            <BLFRingText>early</BLFRingText>
+            <BLFDialingColor>1</BLFDialingColor>
+            <BLFDialingCtl>0</BLFDialingCtl>
+            <BLFDialingText></BLFDialingText>
+            <BLFTalkingColor>1</BLFTalkingColor>
+            <BLFTalkingCtl>1</BLFTalkingCtl>
+            <BLFTalkingText>confirmed</BLFTalkingText>
+            <BLFHoldColor>1</BLFHoldColor>
+            <BLFHoldCtl>0</BLFHoldCtl>
+            <BLFHoldText></BLFHoldText>
             <BLFFailedColor>2</BLFFailedColor>
             <BLFFailedCtl>0</BLFFailedCtl>
+            <BLFFailedText>failed</BLFFailedText>
             <BLFParkedColor>0</BLFParkedColor>
             <BLFParkedCtl>3</BLFParkedCtl>
+            <BLFParkedText>parked</BLFParkedText>
         </blfLed>
         <volume>
             <HandsetVol></HandsetVol>
@@ -2237,6 +2350,7 @@
             <DialerCfwdSoftkey>send;2aB;delete;exit;</DialerCfwdSoftkey>
             <DesktopClick>history;status;none;none;none;</DesktopClick>
             <DailerClick>pline;nline;none;none;none;</DailerClick>
+            <RingingClick>none;none;none;none;none;</RingingClick>
             <CallClick>none;none;voldown;volup;none;</CallClick>
             <DesktopLongPress>status;none;none;none;reset;</DesktopLongPress>
             <DialerConfSoftkey>contact;clogs;redial;video;cancel;</DialerConfSoftkey>
@@ -2477,6 +2591,8 @@
     <dm>
         <OnhookTime>120</OnhookTime>
         <EnableHookflash>0</EnableHookflash>
+        <KeyLongPressTime>2</KeyLongPressTime>
+        <KeyLongLongPressTime>6</KeyLongLongPressTime>
     </dm>
     <vqm>
         <SessionReport>1</SessionReport>
@@ -2526,6 +2642,7 @@
         <NewMissedcallUrl></NewMissedcallUrl>
         <NewMWIUrl></NewMWIUrl>
         <NewSMSUrl></NewSMSUrl>
+        <WebAuthChangedUrl></WebAuthChangedUrl>
         <at></at>
     </cti>
     <ateTest>
@@ -2597,6 +2714,9 @@
             <Port>0</Port>
             <Channel>0</Channel>
         </addr>
+        <dynamic>
+            <AutoExitExpires>60</AutoExitExpires>
+        </dynamic>
     </mcast>
     <dsskey>
         <SelectDsskeyAction>0</SelectDsskeyAction>
@@ -2604,10 +2724,12 @@
         <FuncKeyPageNum>5</FuncKeyPageNum>
         <SideKeyPageNum>1</SideKeyPageNum>
         <DSSHomePage>0</DSSHomePage>
+        <DisplayParkedInfo>0</DisplayParkedInfo>
         <DSSDIALSwitchMode>0</DSSDIALSwitchMode>
         <FirstCallWaitTime>16</FirstCallWaitTime>
         <FirstNumStartTime>360</FirstNumStartTime>
         <FirstNumEndTime>1080</FirstNumEndTime>
+        <DSSLongPressAction>1</DSSLongPressAction>
         <Extern1PageBelong>0</Extern1PageBelong>
         <Extern2PageBelong>0</Extern2PageBelong>
         <Extern3PageBelong>0</Extern3PageBelong>
@@ -2737,7 +2859,7 @@
     </log>
     <tr069>
         <TR069Tone>1</TR069Tone>
-        <CPESerialNumber>00100400FV02001000000c383e42691d</CPESerialNumber>
+        <CPESerialNumber></CPESerialNumber>
         <ACSServerType>1</ACSServerType>
         <EnableTR069>0</EnableTR069>
         <ACSURL>0.0.0.0</ACSURL>
@@ -2859,6 +2981,7 @@
             <DHCPOption>66</DHCPOption>
             <DHCPv6Option>0</DHCPv6Option>
             <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
         </opt>
     </ap>
     <fwCheck>
@@ -2929,5 +3052,27 @@
         <OtherPopup>1</OtherPopup>
         <EnablePortMirror>0</EnablePortMirror>
         <AutoCloseLed>0</AutoCloseLed>
+        <IdleTimeFontColor>0xffffff</IdleTimeFontColor>
+        <CommonTitleFontColor>0xffffff</CommonTitleFontColor>
+        <SoftkeyFontColor>0xffffff</SoftkeyFontColor>
+        <MenuListFontColor>0x262626</MenuListFontColor>
+        <ScrollBarColor>0x5a9dba</ScrollBarColor>
+        <WarnThemeColor>0xc4012f</WarnThemeColor>
+        <InformThemeColor>0x007bb0</InformThemeColor>
+        <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
+        <TalkingFontColor>0x262626</TalkingFontColor>
+        <SidekeyLabelLength>0</SidekeyLabelLength>
+        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <DisplayProvisionprompt>0</DisplayProvisionprompt>
+        <DsskeyPage1Type>0</DsskeyPage1Type>
+        <DsskeyPage2Type>0</DsskeyPage2Type>
+        <DsskeyPage3Type>0</DsskeyPage3Type>
+        <DsskeyPage4Type>0</DsskeyPage4Type>
+        <DsskeyPage5Type>0</DsskeyPage5Type>
+        <DsskeyPage1XmlUrl></DsskeyPage1XmlUrl>
+        <DsskeyPage2XmlUrl></DsskeyPage2XmlUrl>
+        <DsskeyPage3XmlUrl></DsskeyPage3XmlUrl>
+        <DsskeyPage4XmlUrl></DsskeyPage4XmlUrl>
+        <DsskeyPage5XmlUrl></DsskeyPage5XmlUrl>
     </background>
 </sysConf>

resources/templates/provision/fanvil/x5u/{$mac}.cfg

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Template is optimized for firmware ver 2.2.10 and newer. Older firmware has incorrect tag names.-->
 <sysConf>
     <Version>2.0000000000</Version>
     <net>
@@ -33,7 +34,36 @@
         <Vendor6ClassID>Fanvil X5U</Vendor6ClassID>
         <wifi>
             <WIFIEnable>{$fanvil_wifi_enable}</WIFIEnable>
+            <WIFILogEnable>0</WIFILogEnable>
+            <WANTYPE>0</WANTYPE>
+            <WANIP>192.168.1.179</WANIP>
+            <WANSubnetMask>255.255.255.0</WANSubnetMask>
+            <WANGateway>192.168.1.1</WANGateway>
+            <DomainName></DomainName>
+            <PrimaryDNS>8.8.8.8</PrimaryDNS>
+            <SecondaryDNS>202.96.134.133</SecondaryDNS>
+            <EnableDHCP>1</EnableDHCP>
+            <DHCPAutoDNS>1</DHCPAutoDNS>
+            <DHCPOption100-101>1</DHCPOption100-101>
+            <UseVendorClassID>0</UseVendorClassID>
+            <VendorClassID>Fanvil X5U</VendorClassID>
+            <EnablePPPoE>0</EnablePPPoE>
+            <PPPoEUser>user123</PPPoEUser>
+            <PPPoEPassword>password</PPPoEPassword>
+            <WAN6IP></WAN6IP>
+            <WAN6IPPREFIX></WAN6IPPREFIX>
+            <WAN6Gateway></WAN6Gateway>
+            <Domain6Name></Domain6Name>
+            <PrimaryDNS6></PrimaryDNS6>
+            <SecondaryDNS6></SecondaryDNS6>
+            <EnableDHCP6>1</EnableDHCP6>
+            <DHCP6AutoDNS>1</DHCP6AutoDNS>
+            <UseVendor6ClassID>0</UseVendor6ClassID>
+            <Vendor6ClassID></Vendor6ClassID>
         </wifi>
+        <NetGlobal>
+            <NetPriority>10</NetPriority>
+        </NetGlobal>
     </net>
     <mm>
         <G723BitRate>1</G723BitRate>
@@ -54,6 +84,7 @@
         <RTPInitialPort>10000</RTPInitialPort>
         <RTPPortQuantity>1000</RTPPortQuantity>
         <RTPKeepAlive>1</RTPKeepAlive>
+        <RTPRelay>0</RTPRelay>
         <RTCPCNAMEUser></RTCPCNAMEUser>
         <RTCPCNAMEHost></RTCPCNAMEHost>
         <SelectYourTone>{if isset($fanvil_country_toneset)}{$fanvil_country_toneset}{else}11{/if}</SelectYourTone>
@@ -104,22 +135,25 @@
             <RegisterUser>{$account.1.auth_id}</RegisterUser>
             <RegisterPswd>{$account.1.password}</RegisterPswd>
             <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.1.sip_port}</ProxyPort>
             <ProxyUser>{$account.1.auth_id}</ProxyUser>
             <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -251,6 +285,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="2">
             <PhoneNumber>{$account.2.user_id}</PhoneNumber>
@@ -261,22 +297,25 @@
             <RegisterUser>{$account.2.auth_id}</RegisterUser>
             <RegisterPswd>{$account.2.password}</RegisterPswd>
             <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.2.sip_port}</ProxyPort>
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
+            <EnableFailback>1</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -408,6 +447,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="3">
             <PhoneNumber>{$account.3.user_id}</PhoneNumber>
@@ -418,22 +459,25 @@
             <RegisterUser>{$account.3.auth_id}</RegisterUser>
             <RegisterPswd>{$account.3.password}</RegisterPswd>
             <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.3.sip_port}</ProxyPort>
             <ProxyUser>{$account.3.auth_id}</ProxyUser>
             <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -565,6 +609,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="4">
             <PhoneNumber>{$account.4.user_id}</PhoneNumber>
@@ -575,22 +621,25 @@
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
             <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.4.sip_port}</ProxyPort>
             <ProxyUser>{$account.4.auth_id}</ProxyUser>
             <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -722,6 +771,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="5">
             <PhoneNumber>{$account.5.user_id}</PhoneNumber>
@@ -732,22 +783,25 @@
             <RegisterUser>{$account.5.auth_id}</RegisterUser>
             <RegisterPswd>{$account.5.password}</RegisterPswd>
             <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.5.sip_port}</ProxyPort>
             <ProxyUser>{$account.5.auth_id}</ProxyUser>
             <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -879,6 +933,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="6">
             <PhoneNumber>{$account.6.user_id}</PhoneNumber>
@@ -889,22 +945,25 @@
             <RegisterUser>{$account.6.auth_id}</RegisterUser>
             <RegisterPswd>{$account.6.password}</RegisterPswd>
             <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.6.sip_port}</ProxyPort>
             <ProxyUser>{$account.6.auth_id}</ProxyUser>
             <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1036,6 +1095,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="7">
             <PhoneNumber>{$account.7.user_id}</PhoneNumber>
@@ -1046,22 +1107,25 @@
             <RegisterUser>{$account.7.auth_id}</RegisterUser>
             <RegisterPswd>{$account.7.password}</RegisterPswd>
             <RegisterTTL>{$account.7.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.7.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.7.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.7.sip_port}</ProxyPort>
             <ProxyUser>{$account.7.auth_id}</ProxyUser>
             <ProxyPswd>{$account.7.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.7.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.7.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.7.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1193,6 +1257,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="8">
             <PhoneNumber>{$account.8.user_id}</PhoneNumber>
@@ -1203,22 +1269,25 @@
             <RegisterUser>{$account.8.auth_id}</RegisterUser>
             <RegisterPswd>{$account.8.password}</RegisterPswd>
             <RegisterTTL>{$account.8.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.8.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.8.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.8.sip_port}</ProxyPort>
             <ProxyUser>{$account.8.auth_id}</ProxyUser>
             <ProxyPswd>{$account.8.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.8.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.8.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.8.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1350,6 +1419,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="9">
             <PhoneNumber>{$account.9.user_id}</PhoneNumber>
@@ -1360,22 +1431,25 @@
             <RegisterUser>{$account.9.auth_id}</RegisterUser>
             <RegisterPswd>{$account.9.password}</RegisterPswd>
             <RegisterTTL>{$account.9.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.9.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.9.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.9.sip_port}</ProxyPort>
             <ProxyUser>{$account.9.auth_id}</ProxyUser>
             <ProxyPswd>{$account.9.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.9.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.9.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.9.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1507,6 +1581,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="10">
             <PhoneNumber>{$account.10.user_id}</PhoneNumber>
@@ -1517,22 +1593,25 @@
             <RegisterUser>{$account.10.auth_id}</RegisterUser>
             <RegisterPswd>{$account.10.password}</RegisterPswd>
             <RegisterTTL>{$account.10.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.10.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.10.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.10.sip_port}</ProxyPort>
             <ProxyUser>{$account.10.auth_id}</ProxyUser>
             <ProxyPswd>{$account.10.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.10.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.10.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.10.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1664,6 +1743,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="11">
             <PhoneNumber>{$account.11.user_id}</PhoneNumber>
@@ -1674,22 +1755,25 @@
             <RegisterUser>{$account.11.auth_id}</RegisterUser>
             <RegisterPswd>{$account.11.password}</RegisterPswd>
             <RegisterTTL>{$account.11.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.11.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.11.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.11.sip_port}</ProxyPort>
             <ProxyUser>{$account.11.auth_id}</ProxyUser>
             <ProxyPswd>{$account.11.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.11.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.11.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.11.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1821,6 +1905,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="12">
             <PhoneNumber>{$account.12.user_id}</PhoneNumber>
@@ -1831,22 +1917,25 @@
             <RegisterUser>{$account.12.auth_id}</RegisterUser>
             <RegisterPswd>{$account.12.password}</RegisterPswd>
             <RegisterTTL>{$account.12.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.12.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.12.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.12.sip_port}</ProxyPort>
             <ProxyUser>{$account.12.auth_id}</ProxyUser>
             <ProxyPswd>{$account.12.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.12.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.12.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.12.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1978,6 +2067,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="13">
             <PhoneNumber>{$account.13.user_id}</PhoneNumber>
@@ -1988,22 +2079,25 @@
             <RegisterUser>{$account.13.auth_id}</RegisterUser>
             <RegisterPswd>{$account.13.password}</RegisterPswd>
             <RegisterTTL>{$account.13.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.13.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.13.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.13.sip_port}</ProxyPort>
             <ProxyUser>{$account.13.auth_id}</ProxyUser>
             <ProxyPswd>{$account.13.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.13.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.13.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.13.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2135,6 +2229,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="14">
             <PhoneNumber>{$account.14.user_id}</PhoneNumber>
@@ -2145,22 +2241,25 @@
             <RegisterUser>{$account.14.auth_id}</RegisterUser>
             <RegisterPswd>{$account.14.password}</RegisterPswd>
             <RegisterTTL>{$account.14.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.14.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.14.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.14.sip_port}</ProxyPort>
             <ProxyUser>{$account.14.auth_id}</ProxyUser>
             <ProxyPswd>{$account.14.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.14.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.14.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.14.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2292,6 +2391,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="15">
             <PhoneNumber>{$account.15.user_id}</PhoneNumber>
@@ -2302,22 +2403,25 @@
             <RegisterUser>{$account.15.auth_id}</RegisterUser>
             <RegisterPswd>{$account.15.password}</RegisterPswd>
             <RegisterTTL>{$account.15.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.15.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.15.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.15.sip_port}</ProxyPort>
             <ProxyUser>{$account.15.auth_id}</ProxyUser>
             <ProxyPswd>{$account.15.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.15.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.15.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.15.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2449,6 +2553,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="16">
             <PhoneNumber>{$account.16.user_id}</PhoneNumber>
@@ -2459,22 +2565,25 @@
             <RegisterUser>{$account.16.auth_id}</RegisterUser>
             <RegisterPswd>{$account.16.password}</RegisterPswd>
             <RegisterTTL>{$account.16.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.16.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.16.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.16.sip_port}</ProxyPort>
             <ProxyUser>{$account.16.auth_id}</ProxyUser>
             <ProxyPswd>{$account.16.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.16.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.16.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.16.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2606,12 +2715,17 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <p2p>
             <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
             <SIPP2PAutoAnswerDelay>30</SIPP2PAutoAnswerDelay>
             <SIPP2PDtmfMode>1</SIPP2PDtmfMode>
             <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
+            <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
+            <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
         </p2p>
     </sip>
     <call>
@@ -2685,6 +2799,10 @@
             <ConfDTMFCode></ConfDTMFCode>
             <DisableDialSearch>0</DisableDialSearch>
             <CallNumberFilter></CallNumberFilter>
+            <AutoResumeCurrent>0</AutoResumeCurrent>
+            <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
         </port>
         <basic>
             <DialbyPound>1</DialbyPound>
@@ -2765,13 +2883,17 @@
         <CallLogDisplayType>0</CallLogDisplayType>
         <EnableRecvSMS>1</EnableRecvSMS>
         <EnableCallHistory>1</EnableCallHistory>
-        <LineDisplayFormat>$name@$protocol$instance</LineDisplayFormat>
+        <LineDisplayFormat>$name</LineDisplayFormat>
         <EnableMWITone>0</EnableMWITone>
         <AllPswdEncryption>0</AllPswdEncryption>
         <SIPNotifyXML>1</SIPNotifyXML>
         <BlockXMLWhenCall>1</BlockXMLWhenCall>
         <XMLUpdateInterval>30</XMLUpdateInterval>
         <VqmDisplayOrder></VqmDisplayOrder>
+        <EnablePushXMLAuth>0</EnablePushXMLAuth>
+        <PickupVisualAlert>0</PickupVisualAlert>
+        <PickupAudioAlert>0</PickupAudioAlert>
+        <PickupRingType></PickupRingType>
         <display>
             <LCDTitle>{$fanvil_greeting}</LCDTitle>
             <LCDConstrast>5</LCDConstrast>
@@ -2800,14 +2922,25 @@
         <blfLed>
             <BLFIdleColor>0</BLFIdleColor>
             <BLFIdleCtl>1</BLFIdleCtl>
+            <BLFIdleText>terminated</BLFIdleText>
             <BLFRingColor>1</BLFRingColor>
             <BLFRingCtl>2</BLFRingCtl>
-            <BLFUsingColor>1</BLFUsingColor>
-            <BLFUsingCtl>1</BLFUsingCtl>
+            <BLFRingText>early</BLFRingText>
+            <BLFDialingColor>1</BLFDialingColor>
+            <BLFDialingCtl>0</BLFDialingCtl>
+            <BLFDialingText></BLFDialingText>
+            <BLFTalkingColor>1</BLFTalkingColor>
+            <BLFTalkingCtl>1</BLFTalkingCtl>
+            <BLFTalkingText>confirmed</BLFTalkingText>
+            <BLFHoldColor>1</BLFHoldColor>
+            <BLFHoldCtl>0</BLFHoldCtl>
+            <BLFHoldText></BLFHoldText>
             <BLFFailedColor>2</BLFFailedColor>
             <BLFFailedCtl>0</BLFFailedCtl>
+            <BLFFailedText>failed</BLFFailedText>
             <BLFParkedColor>0</BLFParkedColor>
             <BLFParkedCtl>3</BLFParkedCtl>
+            <BLFParkedText>parked</BLFParkedText>
         </blfLed>
         <volume>
             <HandsetVol></HandsetVol>
@@ -2859,7 +2992,7 @@
             <ConferenceSoftkey>hold;none;split;end;</ConferenceSoftkey>
             <WaitingSoftkey>xfer;accept;reject;end;</WaitingSoftkey>
             <EndingSoftkey>redial;none;none;end;</EndingSoftkey>
-            <DialerPreSoftkey>send;save;delete;exit;</DialerPreSoftkey>
+            <DialerPreSoftkey>send;2aB;delete;exit;</DialerPreSoftkey>
             <DialerCallSoftkey>send;2aB;delete;exit;</DialerCallSoftkey>
             <DialerXferSoftkey>delete;xfer;send;exit;</DialerXferSoftkey>
             <DialerCfwdSoftkey>send;2aB;delete;exit;</DialerCfwdSoftkey>
@@ -3105,6 +3238,8 @@
     <dm>
         <OnhookTime>120</OnhookTime>
         <EnableHookflash>0</EnableHookflash>
+        <KeyLongPressTime>2</KeyLongPressTime>
+        <KeyLongLongPressTime>6</KeyLongLongPressTime>
     </dm>
     <vqm>
         <SessionReport>1</SessionReport>
@@ -3154,6 +3289,7 @@
         <NewMissedcallUrl></NewMissedcallUrl>
         <NewMWIUrl></NewMWIUrl>
         <NewSMSUrl></NewSMSUrl>
+        <WebAuthChangedUrl></WebAuthChangedUrl>
         <at></at>
     </cti>
     <ateTest>
@@ -3225,6 +3361,9 @@
             <Port>0</Port>
             <Channel>0</Channel>
         </addr>
+        <dynamic>
+            <AutoExitExpires>60</AutoExitExpires>
+        </dynamic>
     </mcast>
     <dsskey>
         <SelectDsskeyAction>0</SelectDsskeyAction>
@@ -3232,10 +3371,12 @@
         <FuncKeyPageNum>5</FuncKeyPageNum>
         <SideKeyPageNum>1</SideKeyPageNum>
         <DSSHomePage>0</DSSHomePage>
+        <DisplayParkedInfo>0</DisplayParkedInfo>
         <DSSDIALSwitchMode>0</DSSDIALSwitchMode>
         <FirstCallWaitTime>16</FirstCallWaitTime>
         <FirstNumStartTime>360</FirstNumStartTime>
         <FirstNumEndTime>1080</FirstNumEndTime>
+        <DSSLongPressAction>1</DSSLongPressAction>
         <Extern1PageBelong>0</Extern1PageBelong>
         <Extern2PageBelong>0</Extern2PageBelong>
         <Extern3PageBelong>0</Extern3PageBelong>
@@ -3363,7 +3504,7 @@
     </log>
     <tr069>
         <TR069Tone>1</TR069Tone>
-        <CPESerialNumber>00100400FV02001000000c383e43ed5d</CPESerialNumber>
+        <CPESerialNumber></CPESerialNumber>
         <ACSServerType>1</ACSServerType>
         <EnableTR069>0</EnableTR069>
         <ACSURL>0.0.0.0</ACSURL>
@@ -3501,6 +3642,7 @@
             <DHCPOption>66</DHCPOption>
             <DHCPv6Option>0</DHCPv6Option>
             <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
         </opt>
     </ap>
     <fwCheck>
@@ -3571,5 +3713,27 @@
         <OtherPopup>1</OtherPopup>
         <EnablePortMirror>0</EnablePortMirror>
         <AutoCloseLed>0</AutoCloseLed>
+        <IdleTimeFontColor>0xffffff</IdleTimeFontColor>
+        <CommonTitleFontColor>0xffffff</CommonTitleFontColor>
+        <SoftkeyFontColor>0xffffff</SoftkeyFontColor>
+        <MenuListFontColor>0x262626</MenuListFontColor>
+        <ScrollBarColor>0x5a9dba</ScrollBarColor>
+        <WarnThemeColor>0xc4012f</WarnThemeColor>
+        <InformThemeColor>0x007bb0</InformThemeColor>
+        <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
+        <TalkingFontColor>0x262626</TalkingFontColor>
+        <SidekeyLabelLength>0</SidekeyLabelLength>
+        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <DisplayProvisionprompt>0</DisplayProvisionprompt>
+        <DsskeyPage1Type>0</DsskeyPage1Type>
+        <DsskeyPage2Type>0</DsskeyPage2Type>
+        <DsskeyPage3Type>0</DsskeyPage3Type>
+        <DsskeyPage4Type>0</DsskeyPage4Type>
+        <DsskeyPage5Type>0</DsskeyPage5Type>
+        <DsskeyPage1XmlUrl></DsskeyPage1XmlUrl>
+        <DsskeyPage2XmlUrl></DsskeyPage2XmlUrl>
+        <DsskeyPage3XmlUrl></DsskeyPage3XmlUrl>
+        <DsskeyPage4XmlUrl></DsskeyPage4XmlUrl>
+        <DsskeyPage5XmlUrl></DsskeyPage5XmlUrl>
     </background>
 </sysConf>

resources/templates/provision/fanvil/x6u/{$mac}.cfg

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--Template is optimized for firmware ver 2.2.10 and newer. Older firmware has incorrect tag names.-->
 <sysConf>
     <Version>2.0000000000</Version>
     <net>
@@ -33,7 +34,36 @@
         <Vendor6ClassID>Fanvil X6U</Vendor6ClassID>
         <wifi>
             <WIFIEnable>{$fanvil_wifi_enable}</WIFIEnable>
+            <WIFILogEnable>0</WIFILogEnable>
+            <WANTYPE>0</WANTYPE>
+            <WANIP>192.168.1.179</WANIP>
+            <WANSubnetMask>255.255.255.0</WANSubnetMask>
+            <WANGateway>192.168.1.1</WANGateway>
+            <DomainName></DomainName>
+            <PrimaryDNS>8.8.8.8</PrimaryDNS>
+            <SecondaryDNS>202.96.134.133</SecondaryDNS>
+            <EnableDHCP>1</EnableDHCP>
+            <DHCPAutoDNS>1</DHCPAutoDNS>
+            <DHCPOption100-101>1</DHCPOption100-101>
+            <UseVendorClassID>0</UseVendorClassID>
+            <VendorClassID>Fanvil X6U</VendorClassID>
+            <EnablePPPoE>0</EnablePPPoE>
+            <PPPoEUser>user123</PPPoEUser>
+            <PPPoEPassword>password</PPPoEPassword>
+            <WAN6IP></WAN6IP>
+            <WAN6IPPREFIX></WAN6IPPREFIX>
+            <WAN6Gateway></WAN6Gateway>
+            <Domain6Name></Domain6Name>
+            <PrimaryDNS6></PrimaryDNS6>
+            <SecondaryDNS6></SecondaryDNS6>
+            <EnableDHCP6>1</EnableDHCP6>
+            <DHCP6AutoDNS>1</DHCP6AutoDNS>
+            <UseVendor6ClassID>0</UseVendor6ClassID>
+            <Vendor6ClassID>Fanvil X6U</Vendor6ClassID>
         </wifi>
+        <NetGlobal>
+            <NetPriority>10</NetPriority>
+        </NetGlobal>
     </net>
     <mm>
         <G723BitRate>1</G723BitRate>
@@ -54,6 +84,7 @@
         <RTPInitialPort>10000</RTPInitialPort>
         <RTPPortQuantity>1000</RTPPortQuantity>
         <RTPKeepAlive>1</RTPKeepAlive>
+        <RTPRelay>0</RTPRelay>
         <RTCPCNAMEUser></RTCPCNAMEUser>
         <RTCPCNAMEHost></RTCPCNAMEHost>
         <SelectYourTone>{if isset($fanvil_country_toneset)}{$fanvil_country_toneset}{else}11{/if}</SelectYourTone>
@@ -109,22 +140,25 @@
             <RegisterUser>{$account.1.auth_id}</RegisterUser>
             <RegisterPswd>{$account.1.password}</RegisterPswd>
             <RegisterTTL>{$account.1.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.1.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.1.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.1.sip_port}</ProxyPort>
             <ProxyUser>{$account.1.auth_id}</ProxyUser>
             <ProxyPswd>{$account.1.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.1.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.1.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.1.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -256,6 +290,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="2">
             <PhoneNumber>{$account.2.user_id}</PhoneNumber>
@@ -266,22 +302,25 @@
             <RegisterUser>{$account.2.auth_id}</RegisterUser>
             <RegisterPswd>{$account.2.password}</RegisterPswd>
             <RegisterTTL>{$account.2.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.2.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.2.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.2.sip_port}</ProxyPort>
             <ProxyUser>{$account.2.auth_id}</ProxyUser>
             <ProxyPswd>{$account.2.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.2.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.2.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.2.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -413,6 +452,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="3">
             <PhoneNumber>{$account.3.user_id}</PhoneNumber>
@@ -423,22 +464,25 @@
             <RegisterUser>{$account.3.auth_id}</RegisterUser>
             <RegisterPswd>{$account.3.password}</RegisterPswd>
             <RegisterTTL>{$account.3.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.3.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.3.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.3.sip_port}</ProxyPort>
             <ProxyUser>{$account.3.auth_id}</ProxyUser>
             <ProxyPswd>{$account.3.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.3.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.3.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.3.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -570,6 +614,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="4">
             <PhoneNumber>{$account.4.user_id}</PhoneNumber>
@@ -580,22 +626,25 @@
             <RegisterUser>{$account.4.auth_id}</RegisterUser>
             <RegisterPswd>{$account.4.password}</RegisterPswd>
             <RegisterTTL>{$account.4.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.4.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.4.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.4.sip_port}</ProxyPort>
             <ProxyUser>{$account.4.auth_id}</ProxyUser>
             <ProxyPswd>{$account.4.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.4.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.4.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.4.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -727,6 +776,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="5">
             <PhoneNumber>{$account.5.user_id}</PhoneNumber>
@@ -737,22 +788,25 @@
             <RegisterUser>{$account.5.auth_id}</RegisterUser>
             <RegisterPswd>{$account.5.password}</RegisterPswd>
             <RegisterTTL>{$account.5.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.5.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.5.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.5.sip_port}</ProxyPort>
             <ProxyUser>{$account.5.auth_id}</ProxyUser>
             <ProxyPswd>{$account.5.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.5.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.5.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.5.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -884,6 +938,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="6">
             <PhoneNumber>{$account.6.user_id}</PhoneNumber>
@@ -894,22 +950,25 @@
             <RegisterUser>{$account.6.auth_id}</RegisterUser>
             <RegisterPswd>{$account.6.password}</RegisterPswd>
             <RegisterTTL>{$account.6.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.6.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.6.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.6.sip_port}</ProxyPort>
             <ProxyUser>{$account.6.auth_id}</ProxyUser>
             <ProxyPswd>{$account.6.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.6.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.6.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.6.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1041,6 +1100,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="7">
             <PhoneNumber>{$account.7.user_id}</PhoneNumber>
@@ -1051,22 +1112,25 @@
             <RegisterUser>{$account.7.auth_id}</RegisterUser>
             <RegisterPswd>{$account.7.password}</RegisterPswd>
             <RegisterTTL>{$account.7.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.7.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.7.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.7.sip_port}</ProxyPort>
             <ProxyUser>{$account.7.auth_id}</ProxyUser>
             <ProxyPswd>{$account.7.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.7.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.7.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.7.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1198,6 +1262,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="8">
             <PhoneNumber>{$account.8.user_id}</PhoneNumber>
@@ -1208,22 +1274,25 @@
             <RegisterUser>{$account.8.auth_id}</RegisterUser>
             <RegisterPswd>{$account.8.password}</RegisterPswd>
             <RegisterTTL>{$account.8.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.8.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.8.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.8.sip_port}</ProxyPort>
             <ProxyUser>{$account.8.auth_id}</ProxyUser>
             <ProxyPswd>{$account.8.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.8.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.8.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.8.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1355,6 +1424,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="9">
             <PhoneNumber>{$account.9.user_id}</PhoneNumber>
@@ -1365,22 +1436,25 @@
             <RegisterUser>{$account.9.auth_id}</RegisterUser>
             <RegisterPswd>{$account.9.password}</RegisterPswd>
             <RegisterTTL>{$account.9.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.9.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.9.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.9.sip_port}</ProxyPort>
             <ProxyUser>{$account.9.auth_id}</ProxyUser>
             <ProxyPswd>{$account.9.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.9.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.9.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.9.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1512,6 +1586,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="10">
             <PhoneNumber>{$account.10.user_id}</PhoneNumber>
@@ -1522,22 +1598,25 @@
             <RegisterUser>{$account.10.auth_id}</RegisterUser>
             <RegisterPswd>{$account.10.password}</RegisterPswd>
             <RegisterTTL>{$account.10.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.10.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.10.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.10.sip_port}</ProxyPort>
             <ProxyUser>{$account.10.auth_id}</ProxyUser>
             <ProxyPswd>{$account.10.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.10.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.10.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.10.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1669,6 +1748,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="11">
             <PhoneNumber>{$account.11.user_id}</PhoneNumber>
@@ -1679,22 +1760,25 @@
             <RegisterUser>{$account.11.auth_id}</RegisterUser>
             <RegisterPswd>{$account.11.password}</RegisterPswd>
             <RegisterTTL>{$account.11.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.11.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.11.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.11.sip_port}</ProxyPort>
             <ProxyUser>{$account.11.auth_id}</ProxyUser>
             <ProxyPswd>{$account.11.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.11.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.11.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.11.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1826,6 +1910,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="12">
             <PhoneNumber>{$account.12.user_id}</PhoneNumber>
@@ -1836,22 +1922,25 @@
             <RegisterUser>{$account.12.auth_id}</RegisterUser>
             <RegisterPswd>{$account.12.password}</RegisterPswd>
             <RegisterTTL>{$account.12.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.12.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.12.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.12.sip_port}</ProxyPort>
             <ProxyUser>{$account.12.auth_id}</ProxyUser>
             <ProxyPswd>{$account.12.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.12.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.12.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.12.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -1983,6 +2072,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="13">
             <PhoneNumber>{$account.13.user_id}</PhoneNumber>
@@ -1997,18 +2088,20 @@
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.13.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.13.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.13.sip_port}</ProxyPort>
             <ProxyUser>{$account.13.auth_id}</ProxyUser>
             <ProxyPswd>{$account.13.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.13.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.13.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.13.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2140,6 +2233,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="14">
             <PhoneNumber>{$account.14.user_id}</PhoneNumber>
@@ -2150,22 +2245,25 @@
             <RegisterUser>{$account.14.auth_id}</RegisterUser>
             <RegisterPswd>{$account.14.password}</RegisterPswd>
             <RegisterTTL>{$account.14.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.14.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.14.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.14.sip_port}</ProxyPort>
             <ProxyUser>{$account.14.auth_id}</ProxyUser>
             <ProxyPswd>{$account.14.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.14.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.14.sip_port}</BakProxyPort>
+             <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.14.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2297,6 +2395,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="15">
             <PhoneNumber>{$account.15.user_id}</PhoneNumber>
@@ -2307,22 +2407,25 @@
             <RegisterUser>{$account.15.auth_id}</RegisterUser>
             <RegisterPswd>{$account.15.password}</RegisterPswd>
             <RegisterTTL>{$account.15.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.15.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.15.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.15.sip_port}</ProxyPort>
             <ProxyUser>{$account.15.auth_id}</ProxyUser>
             <ProxyPswd>{$account.15.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.15.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.15.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.15.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2454,6 +2557,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="16">
             <PhoneNumber>{$account.16.user_id}</PhoneNumber>
@@ -2464,22 +2569,25 @@
             <RegisterUser>{$account.16.auth_id}</RegisterUser>
             <RegisterPswd>{$account.16.password}</RegisterPswd>
             <RegisterTTL>{$account.16.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.16.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.16.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.16.sip_port}</ProxyPort>
             <ProxyUser>{$account.16.auth_id}</ProxyUser>
             <ProxyPswd>{$account.16.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.16.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.16.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.16.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2611,6 +2719,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="17">
             <PhoneNumber>{$account.17.user_id}</PhoneNumber>
@@ -2621,22 +2731,25 @@
             <RegisterUser>{$account.17.auth_id}</RegisterUser>
             <RegisterPswd>{$account.17.password}</RegisterPswd>
             <RegisterTTL>{$account.17.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.17.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.17.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.17.sip_port}</ProxyPort>
             <ProxyUser>{$account.17.auth_id}</ProxyUser>
             <ProxyPswd>{$account.17.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.17.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.17.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.17.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2769,6 +2882,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="18">
             <PhoneNumber>{$account.18.user_id}</PhoneNumber>
@@ -2779,22 +2894,25 @@
             <RegisterUser>{$account.18.auth_id}</RegisterUser>
             <RegisterPswd>{$account.18.password}</RegisterPswd>
             <RegisterTTL>{$account.18.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.18.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.18.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.18.sip_port}</ProxyPort>
             <ProxyUser>{$account.18.auth_id}</ProxyUser>
             <ProxyPswd>{$account.18.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.18.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.18.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.18.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -2927,6 +3045,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="19">
             <PhoneNumber>{$account.19.user_id}</PhoneNumber>
@@ -2937,22 +3057,25 @@
             <RegisterUser>{$account.19.auth_id}</RegisterUser>
             <RegisterPswd>{$account.19.password}</RegisterPswd>
             <RegisterTTL>{$account.19.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.19.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.19.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.19.sip_port}</ProxyPort>
             <ProxyUser>{$account.19.auth_id}</ProxyUser>
             <ProxyPswd>{$account.19.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.19.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.19.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.19.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -3085,6 +3208,8 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <line index="20">
             <PhoneNumber>{$account.20.user_id}</PhoneNumber>
@@ -3095,22 +3220,25 @@
             <RegisterUser>{$account.20.auth_id}</RegisterUser>
             <RegisterPswd>{$account.20.password}</RegisterPswd>
             <RegisterTTL>{$account.20.register_expires}</RegisterTTL>
+            <NeedRegOn>0</NeedRegOn>
             <BackupAddr></BackupAddr>
             <BackupPort>5060</BackupPort>
             <BackupTransport>0</BackupTransport>
             <BackupTTL>3600</BackupTTL>
+            <BackupNeedRegOn>0</BackupNeedRegOn>
             <EnableReg>{if isset($account.20.password)}1{else}0{/if}</EnableReg>
             <ProxyAddr>{$account.20.outbound_proxy_primary}</ProxyAddr>
             <ProxyPort>{$account.20.sip_port}</ProxyPort>
             <ProxyUser>{$account.20.auth_id}</ProxyUser>
             <ProxyPswd>{$account.20.password}</ProxyPswd>
+            <ProxyNeedRegOn>0</ProxyNeedRegOn>
             <BakProxyAddr>{$account.20.outbound_proxy_secondary}</BakProxyAddr>
             <BakProxyPort>{$account.20.sip_port}</BakProxyPort>
+            <BakProxyNeedRegOn>0</BakProxyNeedRegOn>
             <EnableFailback>{if isset($account.20.outbound_proxy_secondary)}1{else}0{/if}</EnableFailback>
             <FailbackInterval>1800</FailbackInterval>
             <SignalFailback>0</SignalFailback>
             <SignalRetryCounts>3</SignalRetryCounts>
-            <SignalCrypto>0</SignalCrypto>
             <SigCryptoKey></SigCryptoKey>
             <MediaCrypto>0</MediaCrypto>
             <MedCryptoKey></MedCryptoKey>
@@ -3243,12 +3371,17 @@
             <SessionTimerT1>500</SessionTimerT1>
             <SessionTimerT2>4000</SessionTimerT2>
             <SessionTimerT4>5000</SessionTimerT4>
+            <UnavailableMode>0</UnavailableMode>
+            <TCPUseRetryTimer>0</TCPUseRetryTimer>
         </line>
         <p2p>
             <SIPP2PEnableAutoAnswer>0</SIPP2PEnableAutoAnswer>
             <SIPP2PAutoAnswerDelay>30</SIPP2PAutoAnswerDelay>
             <SIPP2PDtmfMode>1</SIPP2PDtmfMode>
             <SIPP2PSipInfoDtmfMode>0</SIPP2PSipInfoDtmfMode>
+            <SIPP2PEnablePreview>0</SIPP2PEnablePreview>
+            <SIPP2PPreviewMode>0</SIPP2PPreviewMode>
+            <SIPP2PUseVPN>1</SIPP2PUseVPN>
         </p2p>
     </sip>
     <call>
@@ -3322,6 +3455,10 @@
             <ConfDTMFCode></ConfDTMFCode>
             <DisableDialSearch>0</DisableDialSearch>
             <CallNumberFilter></CallNumberFilter>
+            <AutoResumeCurrent>0</AutoResumeCurrent>
+            <AlertTimeout>120</AlertTimeout>
+            <RingTimeout>120</RingTimeout>
+            <RingPriority>0</RingPriority>
         </port>
         <basic>
             <DialbyPound>1</DialbyPound>
@@ -3402,13 +3539,17 @@
         <CallLogDisplayType>0</CallLogDisplayType>
         <EnableRecvSMS>1</EnableRecvSMS>
         <EnableCallHistory>1</EnableCallHistory>
-        <LineDisplayFormat>$name@$protocol$instance</LineDisplayFormat>
+        <LineDisplayFormat>$name</LineDisplayFormat>
         <EnableMWITone>0</EnableMWITone>
         <AllPswdEncryption>0</AllPswdEncryption>
         <SIPNotifyXML>1</SIPNotifyXML>
         <BlockXMLWhenCall>1</BlockXMLWhenCall>
         <XMLUpdateInterval>30</XMLUpdateInterval>
         <VqmDisplayOrder></VqmDisplayOrder>
+        <EnablePushXMLAuth>0</EnablePushXMLAuth>
+        <PickupVisualAlert>0</PickupVisualAlert>
+        <PickupAudioAlert>0</PickupAudioAlert>
+        <PickupRingType></PickupRingType>
         <display>
             <LCDTitle>{$fanvil_greeting}</LCDTitle>
             <LCDConstrast>5</LCDConstrast>
@@ -3437,14 +3578,25 @@
         <blfLed>
             <BLFIdleColor>0</BLFIdleColor>
             <BLFIdleCtl>1</BLFIdleCtl>
+            <BLFIdleText>terminated</BLFIdleText>
             <BLFRingColor>1</BLFRingColor>
             <BLFRingCtl>2</BLFRingCtl>
-            <BLFUsingColor>1</BLFUsingColor>
-            <BLFUsingCtl>1</BLFUsingCtl>
+            <BLFRingText>early</BLFRingText>
+            <BLFDialingColor>1</BLFDialingColor>
+            <BLFDialingCtl>0</BLFDialingCtl>
+            <BLFDialingText></BLFDialingText>
+            <BLFTalkingColor>1</BLFTalkingColor>
+            <BLFTalkingCtl>1</BLFTalkingCtl>
+            <BLFTalkingText>confirmed</BLFTalkingText>
+            <BLFHoldColor>1</BLFHoldColor>
+            <BLFHoldCtl>0</BLFHoldCtl>
+            <BLFHoldText></BLFHoldText>
             <BLFFailedColor>2</BLFFailedColor>
             <BLFFailedCtl>0</BLFFailedCtl>
+            <BLFFailedText>failed</BLFFailedText>
             <BLFParkedColor>0</BLFParkedColor>
             <BLFParkedCtl>3</BLFParkedCtl>
+            <BLFParkedText>parked</BLFParkedText>
         </blfLed>
         <volume>
             <HandsetVol></HandsetVol>
@@ -3742,6 +3894,8 @@
     <dm>
         <OnhookTime>120</OnhookTime>
         <EnableHookflash>0</EnableHookflash>
+        <KeyLongPressTime>2</KeyLongPressTime>
+        <KeyLongLongPressTime>6</KeyLongLongPressTime>
     </dm>
     <vqm>
         <SessionReport>1</SessionReport>
@@ -3791,6 +3945,7 @@
         <NewMissedcallUrl></NewMissedcallUrl>
         <NewMWIUrl></NewMWIUrl>
         <NewSMSUrl></NewSMSUrl>
+        <WebAuthChangedUrl></WebAuthChangedUrl>
         <at></at>
     </cti>
     <ateTest>
@@ -3862,6 +4017,9 @@
             <Port>0</Port>
             <Channel>0</Channel>
         </addr>
+        <dynamic>
+            <AutoExitExpires>60</AutoExitExpires>
+        </dynamic>
     </mcast>
     <dsskey>
         <SelectDsskeyAction>0</SelectDsskeyAction>
@@ -3869,10 +4027,12 @@
         <FuncKeyPageNum>5</FuncKeyPageNum>
         <SideKeyPageNum>1</SideKeyPageNum>
         <DSSHomePage>0</DSSHomePage>
+        <DisplayParkedInfo>0</DisplayParkedInfo>
         <DSSDIALSwitchMode>0</DSSDIALSwitchMode>
         <FirstCallWaitTime>16</FirstCallWaitTime>
         <FirstNumStartTime>360</FirstNumStartTime>
         <FirstNumEndTime>1080</FirstNumEndTime>
+        <DSSLongPressAction>1</DSSLongPressAction>
         <Extern1PageBelong>0</Extern1PageBelong>
         <Extern2PageBelong>0</Extern2PageBelong>
         <Extern3PageBelong>0</Extern3PageBelong>
@@ -4000,7 +4160,7 @@
     </log>
     <tr069>
         <TR069Tone>1</TR069Tone>
-        <CPESerialNumber>00100400FV02001000000c383e3dc493</CPESerialNumber>
+        <CPESerialNumber></CPESerialNumber>
         <ACSServerType>1</ACSServerType>
         <EnableTR069>0</EnableTR069>
         <ACSURL>0.0.0.0</ACSURL>
@@ -4154,6 +4314,7 @@
             <DHCPOption>66</DHCPOption>
             <DHCPv6Option>0</DHCPv6Option>
             <DhcpOption120>0</DhcpOption120>
+            <SaveDHCPOpion>0</SaveDHCPOpion>
         </opt>
     </ap>
     <fwCheck>
@@ -4224,5 +4385,27 @@
         <OtherPopup>1</OtherPopup>
         <EnablePortMirror>0</EnablePortMirror>
         <AutoCloseLed>0</AutoCloseLed>
+        <IdleTimeFontColor>0xffffff</IdleTimeFontColor>
+        <CommonTitleFontColor>0xffffff</CommonTitleFontColor>
+        <SoftkeyFontColor>0xffffff</SoftkeyFontColor>
+        <MenuListFontColor>0x262626</MenuListFontColor>
+        <ScrollBarColor>0x5a9dba</ScrollBarColor>
+        <WarnThemeColor>0xc4012f</WarnThemeColor>
+        <InformThemeColor>0x007bb0</InformThemeColor>
+        <FunkeyListFontColor>0xffffff</FunkeyListFontColor>
+        <TalkingFontColor>0x262626</TalkingFontColor>
+        <SidekeyLabelLength>0</SidekeyLabelLength>
+        <AppIconDisplay>1,1,1,1</AppIconDisplay>
+        <DisplayProvisionprompt>0</DisplayProvisionprompt>
+        <DsskeyPage1Type>0</DsskeyPage1Type>
+        <DsskeyPage2Type>0</DsskeyPage2Type>
+        <DsskeyPage3Type>0</DsskeyPage3Type>
+        <DsskeyPage4Type>0</DsskeyPage4Type>
+        <DsskeyPage5Type>0</DsskeyPage5Type>
+        <DsskeyPage1XmlUrl></DsskeyPage1XmlUrl>
+        <DsskeyPage2XmlUrl></DsskeyPage2XmlUrl>
+        <DsskeyPage3XmlUrl></DsskeyPage3XmlUrl>
+        <DsskeyPage4XmlUrl></DsskeyPage4XmlUrl>
+        <DsskeyPage5XmlUrl></DsskeyPage5XmlUrl>
     </background>
 </sysConf>

resources/templates/provision/grandstream/dp715.sm/{$mac}.xml

@@ -80,7 +80,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/dp715/{$mac}.xml

@@ -42,7 +42,7 @@
                 <P237></P237>
                 {elseif isset($grandstream_config_server_path)}
                 <P237>{$grandstream_config_server_path}</P237>
-                {else}
+                {elseif isset($domain_name)}
                 <P237>{$domain_name}{$project_path}/app/provision</P237>
                 {/if}
 	

resources/templates/provision/grandstream/dp750/{$mac}.xml

@@ -2913,7 +2913,7 @@
 <!-- Provisioning via. 0 - TFTP Upgrade, 1 - HTTP Upgrade, 2 - HTTPS Upgrade. -->
 <!-- Number: 0 to 2 -->
 <!-- Mandatory -->
-<P212>1</P212>
+<P212>2</P212>
 
 <!-- Config Server Path -->
 <!-- String: serveraddress  -->
@@ -2921,7 +2921,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gac2500/{$mac}.xml

@@ -4170,7 +4170,7 @@
 	<P237></P237>
 	{elseif isset($grandstream_config_server_path)}
 	<P237>{$grandstream_config_server_path}</P237>
-	{else}
+	{elseif isset($domain_name)}
 	<P237>{$domain_name}{$project_path}/app/provision</P237>
 	{/if}
 

resources/templates/provision/grandstream/gds3705/{$mac}.xml

@@ -690,7 +690,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     <!-- HTTP/HTTPS User Name -->

resources/templates/provision/grandstream/gds3710/{$mac}.xml

@@ -743,7 +743,7 @@ E0Fw0O5Kx31JPa+aSBLDMZAG1+SZ/zfxRYQe7VH8p1g=
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     <!-- Config HTTP/HTTPS User Name -->

resources/templates/provision/grandstream/grp2612/{$mac}.xml

@@ -2453,7 +2453,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/grp2612w/{$mac}.xml

@@ -2547,7 +2547,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/grp2613/phonebook.xml

@@ -1,49 +1,151 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <AddressBook>
-<version>1</version>
-{foreach $contacts as $contact}
-{if $contact.contact_type == "group"}
-<pbgroup>
-<id>{$contact.id}</id>
-<name>{$contact.group_description|truncate:10}</name>
-</pbgroup>
-{/if}
-{/foreach}
-{$i=0}
-{foreach $contacts as $contact}
-{if $contact.contact_name_given != "" && $contact.contact_type == "contact"}
-<Contact>
-<FirstName>{$contact.contact_name_given}</FirstName>
-<LastName>{$contact.contact_name_family}</LastName>
-{if $contact.contact_role != "" }
-<JobTitle>{$contact.contact_role}</JobTitle>
-{/if}
-{if $contact.contact_category != "" }
-<Department>{$contact.contact_category}</Department>
-{/if}
-<Phone type="Work">
-<phonenumber>{$contact.contact_work}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{if $contact.contact_home != "" }
-<Phone type="Home">
-<phonenumber>{$contact.contact_home}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_cell != "" }
-<Phone type="Cell">
-<phonenumber>{$contact.contact_cell}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_organization != "" }
-<Company>{$contact.contact_organization}</Company>
-{/if}
-{foreach $contact.groups as $group}
-<Group>{$group}</Group>
-{/foreach}
-</Contact>
-{/if}
-{/foreach}
+
+	<pbgroup>
+		<id>1</id>
+		<name>Users</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>2</id>
+		<name>Groups</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>3</id>
+		<name>Extensions</name>
+		<ringtones>system</ringtones>
+	</pbgroup>
+
+	{$start_id=0}
+	{foreach $contacts as $row}
+		{if $row.category == "users"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>1</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "groups"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>2</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "extensions"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{if $row.phone_number != ""}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{else}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_extension}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{/if}
+			<Group>3</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{/if}
+	{/foreach}
+
 </AddressBook>

resources/templates/provision/grandstream/grp2613/{$mac}.xml

@@ -3279,7 +3279,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/grp2614/phonebook.xml

@@ -1,49 +1,151 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <AddressBook>
-<version>1</version>
-{foreach $contacts as $contact}
-{if $contact.contact_type == "group"}
-<pbgroup>
-<id>{$contact.id}</id>
-<name>{$contact.group_description|truncate:10}</name>
-</pbgroup>
-{/if}
-{/foreach}
-{$i=0}
-{foreach $contacts as $contact}
-{if $contact.contact_name_given != "" && $contact.contact_type == "contact"}
-<Contact>
-<FirstName>{$contact.contact_name_given}</FirstName>
-<LastName>{$contact.contact_name_family}</LastName>
-{if $contact.contact_role != "" }
-<JobTitle>{$contact.contact_role}</JobTitle>
-{/if}
-{if $contact.contact_category != "" }
-<Department>{$contact.contact_category}</Department>
-{/if}
-<Phone type="Work">
-<phonenumber>{$contact.contact_work}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{if $contact.contact_home != "" }
-<Phone type="Home">
-<phonenumber>{$contact.contact_home}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_cell != "" }
-<Phone type="Cell">
-<phonenumber>{$contact.contact_cell}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_organization != "" }
-<Company>{$contact.contact_organization}</Company>
-{/if}
-{foreach $contact.groups as $group}
-<Group>{$group}</Group>
-{/foreach}
-</Contact>
-{/if}
-{/foreach}
+
+	<pbgroup>
+		<id>1</id>
+		<name>Users</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>2</id>
+		<name>Groups</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>3</id>
+		<name>Extensions</name>
+		<ringtones>system</ringtones>
+	</pbgroup>
+
+	{$start_id=0}
+	{foreach $contacts as $row}
+		{if $row.category == "users"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>1</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "groups"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>2</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "extensions"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{if $row.phone_number != ""}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{else}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_extension}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{/if}
+			<Group>3</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{/if}
+	{/foreach}
+
 </AddressBook>

resources/templates/provision/grandstream/grp2614/{$mac}.xml

@@ -4485,7 +4485,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -6895,7 +6895,7 @@
     <!-- # P8480 = -->
 
     <!-- ######################################################################## -->
-    <!-- ##          Settings/Extension Boards --->
+    <!-- ##          Settings/Extension Boards -->
     <!-- ######################################################################## -->
 
     <!-- ######################################################################## -->
@@ -6959,7 +6959,6 @@
 {/if}
 
 {/for}
-{
 
   </config>
 </gs_provision>

resources/templates/provision/grandstream/grp2615/phonebook.xml

@@ -1,49 +1,151 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <AddressBook>
-<version>1</version>
-{foreach $contacts as $contact}
-{if $contact.contact_type == "group"}
-<pbgroup>
-<id>{$contact.id}</id>
-<name>{$contact.group_description|truncate:10}</name>
-</pbgroup>
-{/if}
-{/foreach}
-{$i=0}
-{foreach $contacts as $contact}
-{if $contact.contact_name_given != "" && $contact.contact_type == "contact"}
-<Contact>
-<FirstName>{$contact.contact_name_given}</FirstName>
-<LastName>{$contact.contact_name_family}</LastName>
-{if $contact.contact_role != "" }
-<JobTitle>{$contact.contact_role}</JobTitle>
-{/if}
-{if $contact.contact_category != "" }
-<Department>{$contact.contact_category}</Department>
-{/if}
-<Phone type="Work">
-<phonenumber>{$contact.contact_work}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{if $contact.contact_home != "" }
-<Phone type="Home">
-<phonenumber>{$contact.contact_home}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_cell != "" }
-<Phone type="Cell">
-<phonenumber>{$contact.contact_cell}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_organization != "" }
-<Company>{$contact.contact_organization}</Company>
-{/if}
-{foreach $contact.groups as $group}
-<Group>{$group}</Group>
-{/foreach}
-</Contact>
-{/if}
-{/foreach}
+
+	<pbgroup>
+		<id>1</id>
+		<name>Users</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>2</id>
+		<name>Groups</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>3</id>
+		<name>Extensions</name>
+		<ringtones>system</ringtones>
+	</pbgroup>
+
+	{$start_id=0}
+	{foreach $contacts as $row}
+		{if $row.category == "users"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>1</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "groups"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>2</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "extensions"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{if $row.phone_number != ""}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{else}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_extension}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{/if}
+			<Group>3</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{/if}
+	{/foreach}
+
 </AddressBook>

resources/templates/provision/grandstream/grp2615/{$mac}.xml

@@ -5432,7 +5432,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/grp2616/phonebook.xml

@@ -1,49 +1,151 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+
 <AddressBook>
-<version>1</version>
-{foreach $contacts as $contact}
-{if $contact.contact_type == "group"}
-<pbgroup>
-<id>{$contact.id}</id>
-<name>{$contact.group_description|truncate:10}</name>
-</pbgroup>
-{/if}
-{/foreach}
-{$i=0}
-{foreach $contacts as $contact}
-{if $contact.contact_name_given != "" && $contact.contact_type == "contact"}
-<Contact>
-<FirstName>{$contact.contact_name_given}</FirstName>
-<LastName>{$contact.contact_name_family}</LastName>
-{if $contact.contact_role != "" }
-<JobTitle>{$contact.contact_role}</JobTitle>
-{/if}
-{if $contact.contact_category != "" }
-<Department>{$contact.contact_category}</Department>
-{/if}
-<Phone type="Work">
-<phonenumber>{$contact.contact_work}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{if $contact.contact_home != "" }
-<Phone type="Home">
-<phonenumber>{$contact.contact_home}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_cell != "" }
-<Phone type="Cell">
-<phonenumber>{$contact.contact_cell}</phonenumber>
-<accountindex>1</accountindex>
-</Phone>
-{/if}
-{if $contact.contact_organization != "" }
-<Company>{$contact.contact_organization}</Company>
-{/if}
-{foreach $contact.groups as $group}
-<Group>{$group}</Group>
-{/foreach}
-</Contact>
-{/if}
-{/foreach}
+
+	<pbgroup>
+		<id>1</id>
+		<name>Users</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>2</id>
+		<name>Groups</name>
+		<ringtones>default ringtone</ringtones>
+	</pbgroup>
+	<pbgroup>
+		<id>3</id>
+		<name>Extensions</name>
+		<ringtones>system</ringtones>
+	</pbgroup>
+
+	{$start_id=0}
+	{foreach $contacts as $row}
+		{if $row.category == "users"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>1</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "groups"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+
+			<Frequent>0</Frequent>
+			{foreach $row.numbers as $number}
+			{if $number.phone_number != ""}
+				{if $number.phone_label == "work"}
+				<Phone type="Work">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "home"}
+				<Phone type="Home">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+				{if $number.phone_label == "mobile"}
+				<Phone type="Cell">
+					<phonenumber>{$number.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+				{/if}
+			{/if}
+			{/foreach}
+			<Group>2</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{elseif $row.category == "extensions"}
+		<Contact>
+			<id>{$start_id++}</id>
+			{if $row.contact_name_given != ""}
+			{if $row.contact_organization != ""}
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<FirstName>{$row.contact_name_given} {$row.contact_name_family}</FirstName>
+				<Company>{$row.contact_organization}</Company>
+			{else}
+				<FirstName>{$row.contact_name_given}</FirstName>
+				<LastName>{$row.contact_name_family}</LastName>
+			{/if}
+			{else}
+				<FirstName>{$row.effective_caller_id_name}</FirstName>
+			{/if}
+			<JobTitle></JobTitle>
+			<Frequent>0</Frequent>
+			{if $row.phone_number != ""}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_number}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{else}
+				<Phone type="Work">
+					<phonenumber>{$row.phone_extension}</phonenumber>
+					<accountindex>0</accountindex>
+				</Phone>
+			{/if}
+			<Group>3</Group>
+			<Primary>0</Primary>
+			<Department></Department>
+			<Job></Job>
+			<Company></Company>
+		</Contact>
+		{/if}
+	{/foreach}
+
 </AddressBook>

resources/templates/provision/grandstream/grp2616/{$mac}.xml

@@ -6383,7 +6383,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 
@@ -8817,7 +8817,7 @@
     <!-- # P8480 = -->
 
     <!-- ###################################################################################### -->
-    <!-- # Softkey 3 --->
+    <!-- # Softkey 3 -->
     <!-- ###################################################################################### -->
     <!-- # Key Mode. -->
     <!-- # 0 - Default, 10 - Speed Dial, 14 - Speed Dial via active account, 15 - Dial DTMF, 16 - Voicemail,  -->
@@ -8835,7 +8835,7 @@
     <!-- # P8483 =  -->
 
     <!-- ######################################################################## -->
-    <!-- ##          Settings/Extension Boards --->
+    <!-- ##          Settings/Extension Boards -->
     <!-- ######################################################################## -->
 
     <!-- ######################################################################## -->
@@ -8899,7 +8899,6 @@
 {/if}
 
 {/for}
-{
 
   </config>
 </gs_provision>

resources/templates/provision/grandstream/grp26xx/{$mac}.xml

@@ -5748,7 +5748,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp110x/{$mac}.xml

@@ -940,7 +940,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp116x/{$mac}.xml

@@ -814,7 +814,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp140x/{$mac}.xml

@@ -1188,7 +1188,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     

resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml

@@ -1188,7 +1188,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     

resources/templates/provision/grandstream/gxp1450/{$mac}.xml

@@ -1569,7 +1569,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml

@@ -1376,7 +1376,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp16xx/{$mac}.xml

@@ -2073,7 +2073,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 <!--  Config HTTP/HTTPS User Name -->

resources/templates/provision/grandstream/gxp17xx/{$mac}.xml

@@ -773,7 +773,7 @@
 
 <!-- # SIP Server -->
 <!-- # String -->
-<P47>{$account.1.server_address}</P47>
+<P47>{$account.1.server_address}:{$account.1.sip_port}</P47>
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
@@ -781,11 +781,19 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
+{if isset($account.1.outbound_proxy_primary)}
+<P48>{$account.1.outbound_proxy_primary}:{$account.1.sip_port}</P48>
+{else}
 <P48></P48>
+{/if}	 
 
 <!-- # Backup Outbound Proxy -->
 <!-- # String -->
+{if isset($account.1.outbound_proxy_secondary)}
+<P2333>{$account.1.outbound_proxy_secondary}:{$account.1.sip_port}</P2333>
+{else}
 <P2333></P2333>
+{/if}	
 
 <!-- # BLF Server -->
 <!-- # String -->
@@ -816,7 +824,11 @@
 <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_dns_mode)}
+<P103>{$grandstream_dns_mode}</P103>
+{else}
 <P103>0</P103>
+{/if}
 
 <!-- # Primary IP. Maximum 15 characters -->
 <!-- # String -->
@@ -833,7 +845,11 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0. -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
+{if isset($grandstream_nat_traversal)}
+<P52>{$grandstream_nat_traversal}</P52>
+{else}
 <P52>0</P52>
+{/if}
 
 <!-- # Proxy-Require (A SIP extension to enable firewall penetration). Max length is 64 characters -->
 <!-- # String -->
@@ -911,7 +927,12 @@
 <!-- # SIP Transport. 0 - UDP, 1 - TCP, 2 - TLS/TCP. Default is 0 -->
 <!-- # Number: 0, 1, 2 -->
 <!-- # Mandatory -->
-<P130>0</P130>
+{$tp=0}
+{if $account.1.sip_transport == 'udp'}{$tp=0}{/if}
+{if $account.1.sip_transport == 'tcp'}{$tp=1}{/if}
+{if $account.1.sip_transport == 'tls'}{$tp=2}{/if}
+{if $account.1.sip_transport == 'dns srv'}{$tp=1}{/if}
+<P130>{$tp}</P130>
 
 <!-- # SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1 -->
 <!-- # Number: 0, 1 -->
@@ -936,7 +957,12 @@
 <!-- # SUBSCRIBE for MWI. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
+{if isset($subscribe_mwi)}
+<P99>1</P99>
+{else}
 <P99>0</P99>
+{/if}
+
 
 <!-- # SUBSCRIBE for Registration. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
@@ -1017,7 +1043,9 @@
 <!-- # Force BLF Call-pickup by prefix. 0 - Disable, 1 - Enable. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P6752>0</P6752>
+{if isset($grandstream_blf_call_pickup)}
+<P6752>{$grandstream_blf_call_pickup}</P6752>
+{/if}
 
 <!-- # BLF Call-pickup Prefix. Default is ** -->
 <!-- # String -->
@@ -1146,7 +1174,7 @@
 <!-- # Accept Incoming SIP from Proxy Only. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P2347>0</P2347>
+<P2347>1</P2347>
 
 <!-- # Authenticate Incoming INVITE. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
@@ -1217,7 +1245,11 @@
 <!-- # SRTP Mode. 0 - Disabled, 1 - Enabled but not forced, 2 - Enabled and forced, 3 - Optional. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_srtp)}
+<P183>{$grandstream_srtp}</P183>
+{else}
 <P183>0</P183>
+{/if}
 
 <!-- # Crypto Life Time -->
 <!-- # 0 - No, 1 - Yes. Default is 0 -->
@@ -1448,11 +1480,11 @@
 
 <!-- # Account Name -->
 <!-- # String -->
-<P417>{$display_name_2}</P417>
+<P417>{$account.2.display_name}</P417>
 
 <!-- # SIP Server -->
 <!-- # String -->
-<P402>{$server_address_2}</P402>
+<P402>{$account.2.server_address}:{$account.2.sip_port}</P402>
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
@@ -1460,11 +1492,19 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
+{if isset($account.2.outbound_proxy_primary)}
+<P403>{$account.2.outbound_proxy_primary}:{$account.2.sip_port}</P403>
+{else}
 <P403></P403>
+{/if}  
 
 <!-- # Backup Outbound Proxy -->
 <!-- # String -->
+{if isset($account.2.outbound_proxy_secondary)}
+<P2433>{$account.2.outbound_proxy_secondary}:{$account.2.sip_port}</P2433>
+{else}
 <P2433></P2433>
+{/if}
 
 <!-- # BLF Server -->
 <!-- # String -->
@@ -1472,7 +1512,7 @@
 
 <!-- # SIP User ID -->
 <!-- # String -->
-<P404>{$account.2.user_id}</P404>
+<P404></P404>
 
 <!-- # Authenticate ID -->
 <!-- # String -->
@@ -1495,7 +1535,11 @@
 <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_dns_mode)}
+<P408>{$grandstream_dns_mode}</P408>
+{else}
 <P408>0</P408>
+{/if}
 
 <!-- # Primary IP. Maximum 15 characters -->
 <!-- # String -->
@@ -1512,7 +1556,11 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
+{if isset($grandstream_nat_traversal)}
+<P414>{$grandstream_nat_traversal}</P414>
+{else}
 <P414>0</P414>
+{/if}
 
 <!-- # Proxy-Require (A SIP extension to enable firewall penetration). Max length is 64 characters -->
 <!-- # String -->
@@ -1590,7 +1638,12 @@
 <!-- # SIP Transport. 0 - UDP, 1 - TCP, 2 - TCP/TLS. Default is 0 -->
 <!-- # Number: 0, 1, 2 -->
 <!-- # Mandatory -->
-<P448>0</P448>
+{$tp=0}
+{if $account.2.sip_transport == 'udp'}{$tp=0}{/if}
+{if $account.2.sip_transport == 'tcp'}{$tp=1}{/if}
+{if $account.2.sip_transport == 'tls'}{$tp=2}{/if}
+{if $account.2.sip_transport == 'dns srv'}{$tp=1}{/if}
+<P448>{$tp}</P448>
 
 <!-- # SIP URI Scheme when using TLS. 0 - sip, 1 - sips. Default is 1 -->
 <!-- # Number: 0, 1 -->
@@ -1615,7 +1668,12 @@
 <!-- # SUBSCRIBE for MWI (Whether or not send SUBSCRIBE for Message Waiting Indication). 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
+{if isset($subscribe_mwi)}
+<P415>1</P415>
+{else}
 <P415>0</P415>
+{/if}
+
 
 <!-- # SUBSCRIBE for Registration. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
@@ -1696,7 +1754,9 @@
 <!-- # Force BLF Call-pickup by prefix. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P6753>0</P6753>
+{if isset($grandstream_blf_call_pickup)}
+<P6753>{$grandstream_blf_call_pickup}</P6753>
+{/if}
 
 <!-- # BLF Call-pickup Prefix. Default is ** -->
 <!-- # String -->
@@ -1895,7 +1955,11 @@
 <!-- # 0 - Disabled, 1 - Enabled but not forced, 2 - Enabled and forced, 3 - Optional. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_srtp)}
+<P443>{$grandstream_srtp}</P443>
+{else}
 <P443>0</P443>
+{/if}
 
 <!-- #Crypto Life Time -->
 <!-- #0 - No, 1 - Yes. Default is 0 -->
@@ -2120,7 +2184,7 @@
 
 <!-- # SIP Server -->
 <!-- # String -->
-<P502>{$account.3.server_address}</P502>
+<P502>{$account.3.server_address}:{$account.3.sip_port}</P502>
 
 <!-- # Secondary SIP Server -->
 <!-- # String -->
@@ -2128,11 +2192,19 @@
 
 <!-- # Outbound Proxy -->
 <!-- # String -->
+{if isset($account.3.outbound_proxy_primary)}
+<P503>{$account.3.outbound_proxy_primary}:{$account.3.sip_port}</P503>
+{else}
 <P503></P503>
+{/if}  
 
 <!-- # Backup Outbound Proxy -->
 <!-- # String -->
+{if isset($account.3.outbound_proxy_secondary)}
+<P2533>{$account.3.outbound_proxy_secondary}:{$account.3.sip_port}</P2533>
+{else}
 <P2533></P2533>
+{/if}
 
 <!-- # BLF Server -->
 <!-- # String -->
@@ -2163,7 +2235,11 @@
 <!-- # DNS Mode. 0 - A Record, 1 - SRV, 2 - NAPTR/SRV, 3 - Use Configured IP. Default is 0  -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_dns_mode)}
+<P508>{$grandstream_dns_mode}</P508>
+{else}
 <P508>0</P508>
+{/if}
 
 <!-- # Primary IP. Maximum 15 characters -->
 <!-- # String -->
@@ -2180,7 +2256,11 @@
 <!-- # NAT Traversal. 0 - No, 1 - STUN, 2 - keep alive, 3 - UPnP, 4 - Auto, 5 - VPN. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3, 4, 5 -->
 <!-- # Mandatory -->
+{if isset($grandstream_nat_traversal)}
+<P514>{$grandstream_nat_traversal}</P514>
+{else}
 <P514>0</P514>
+{/if}
 
 <!-- # Proxy-Require (A SIP extension to enable firewall penetration). Max length is 64 characters -->
 <!-- # String -->
@@ -2258,7 +2338,12 @@
 <!-- # SIP Transport. 0 - UDP, 1 - TCP. 2- TCP/TLS. Default is 0 -->
 <!-- # Number: 0, 1, 2 -->
 <!-- # Mandatory -->
-<P548>0</P548>
+{$tp=0}
+{if $account.3.sip_transport == 'udp'}{$tp=0}{/if}
+{if $account.3.sip_transport == 'tcp'}{$tp=1}{/if}
+{if $account.3.sip_transport == 'tls'}{$tp=2}{/if}
+{if $account.3.sip_transport == 'dns srv'}{$tp=1}{/if}
+<P548>{$tp}</P548>
 
 <!-- # SIP URI Scheme When Using TLS. 0 - sip, 1 - sips. Default is 1 -->
 <!-- # Number: 0, 1 -->
@@ -2283,7 +2368,12 @@
 <!-- # SUBSCRIBE for MWI (Whether or not send SUBSCRIBE for Message Waiting Indication). 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
+{if isset($subscribe_mwi)}
+<P515>1</P515>
+{else}
 <P515>0</P515>
+{/if}
+
 
 <!-- # SUBSCRIBE for Registration. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
@@ -2364,7 +2454,9 @@
 <!-- # Force BLF Call-pickup by prefix. 0 - No, 1 - Yes. Default is 0 -->
 <!-- # Number: 0, 1 -->
 <!-- # Mandatory -->
-<P6754>0</P6754>
+{if isset($grandstream_blf_call_pickup)}
+<P6754>{$grandstream_blf_call_pickup}</P6754>
+{/if}
 
 <!-- # BLF Call-pickup Prefix. Default is ** -->
 <!-- # String -->
@@ -2562,7 +2654,11 @@
 <!-- # 0 - Disabled, 1 - Enabled but not forced, 2 - Enabled and forced, 3 - Optional. Default is 0 -->
 <!-- # Number: 0, 1, 2, 3 -->
 <!-- # Mandatory -->
+{if isset($grandstream_srtp)}
+<P543>{$grandstream_srtp}</P543>
+{else}
 <P543>0</P543>
+{/if}
 
 <!-- # Crypto Life Time -->
 <!-- # 0 - No, 1 - Yes. Default is 0 -->
@@ -6039,7 +6135,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp20xx/{$mac}.xml

@@ -85,7 +85,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp2100/{$mac}.xml

@@ -2811,7 +2811,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp2124/{$mac}.xml

@@ -1927,7 +1927,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     

resources/templates/provision/grandstream/gxp2130/{$mac}.xml

@@ -6307,7 +6307,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp2135/{$mac}.xml

@@ -6251,7 +6251,7 @@
     <!-- # 3CX Auto Provision. 0 - No, 1 - Yes. Default is Yes -->
     <!-- # Number: 0, 1 -->
     <!-- # Mandatory -->
-    <P1414>1</P1414>
+    <P1414>0</P1414>
 
     <!-- # Automatic Upgrade.  -->
     <!-- # 0 - No,  -->
@@ -6293,7 +6293,7 @@
     <!-- # Firmware Upgrade Confirmation. 0 - No, 1 - Yes. Default is 1 -->
     <!-- # Number: 0,1 -->
     <!-- # Mandatory -->
-    <P8375>1</P8375>
+    <P8375>0</P8375>
 
     <!-- #Config -->
     <!-- # Config Via. 0 - TFTP,  1 - HTTP, 2 - HTTPS, 3 - FTP, 4 - FTPS. Default is 1. Default is 2 -->
@@ -6307,7 +6307,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp2140/{$mac}.xml

@@ -6307,7 +6307,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp2160/{$mac}.xml

@@ -6307,7 +6307,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp2170/{$mac}.xml

@@ -6307,7 +6307,7 @@
     <P237></P237>
 {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp21xx/{$mac}.xml

@@ -2716,7 +2716,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     

resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml

@@ -48,7 +48,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp2200/{$mac}.xml

@@ -3016,7 +3016,7 @@ Account 5 Codec Settings
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxp3240/{$mac}.xml

@@ -3226,7 +3226,7 @@ Account 5 Codec Settings
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxv300x/{$mac}.xml

@@ -78,7 +78,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     

resources/templates/provision/grandstream/gxv3140/{$mac}.xml

@@ -1385,7 +1385,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxv3175/{$mac}.xml

@@ -1268,7 +1268,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml

@@ -769,7 +769,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     

resources/templates/provision/grandstream/gxv3240/{$mac}.xml

@@ -4820,7 +4820,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxv3275/{$mac}.xml

@@ -3225,7 +3225,7 @@ Account 5 Codec Settings
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxv3370/{$mac}.xml

@@ -27,425 +27,471 @@
 		<!-- Web/SSH Access SSH Port has no alias yet -->
 
 		<!-- Account General Settings -->
-
+		{for $line=1 to 16}
+		{$row=$lines.$line}
 		<!-- Account Active -->
 		<!-- Yes, No -->
-		<item name="account.1.enable">Yes</item>
+		<item name="account.{$line}.enable">{if filter_var($row.enabled, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
 
 		<!-- Account Name -->
-		<item name="account.1.name">{$account.1.display_name}</item>
+		<item name="account.{$line}.name">{$row.display_name}</item>
 
 		<!-- SIP Server -->
-		<item name="account.1.sip.server.1.address">{$account.1.server_address}</item>
+		<item name="account.{$line}.sip.server.1.address">{$row.server_address}</item>
 
 		<!-- SIP User ID -->
-		<item name="account.1.sip.userid">{$account.1.user_id}</item>
+		<item name="account.{$line}.sip.userid">{$row.user_id}</item>
 
 		<!-- SIP Authentication ID -->
-		<item name="account.1.sip.subscriber.userId">{$account.1.auth_id}</item>
+		<item name="account.{$line}.sip.subscriber.userId">{$row.auth_id}</item>
 
 		<!-- SIP Authentication Password -->
-		<item name="account.1.sip.subscriber.password">{$account.1.password}</item>
+		<item name="account.{$line}.sip.subscriber.password">{$row.password}</item>
 		<!-- Voice Mail Access Number -->
-		<item name="account.1.sip.voicemail.number">*97</item>
+		<item name="account.{$line}.sip.voicemail.number">*97</item>
 		<!-- Display Name -->
-		<item name="account.1.sip.subscriber.name">{$account.1.display_name}</item>
+		<item name="account.{$line}.sip.subscriber.name">{$row.display_name}</item>
 		<!-- Tel URI -->
 		<!-- Disabled, UserIsPhone, Enabled -->
-		<item name="account.1.sip.telUri">Disabled</item>
+		<item name="account.{$line}.sip.telUri">Disabled</item>
 		<!-- Account 1 Network Settings -->
 		<!-- Outbound Proxy -->
-		<item name="account.1.sip.outboundProxy.1.address">{$account.1.outbound_proxy_primary}</item>
+		<item name="account.{$line}.sip.outboundProxy.1.address">{$row.outbound_proxy_primary}</item>
 		<!-- Secondary Outbound Proxy -->
-		<item name="account.1.sip.outboundProxy.2.address">{$account.1.outbound_proxy_secondary}</item>
+		<item name="account.{$line}.sip.outboundProxy.2.address">{$row.outbound_proxy_secondary}</item>
 		<!-- DNS Mode -->
 		<!-- ARecord, SRV, NaptrOrSrv -->
-		<item name="account.1.network.dnsMode">ARecord</item>
+		<item name="account.{$line}.network.dnsMode">ARecord</item>
 		<!-- DNS SRV Fail-over Mode -->
 		<!-- Default, SavedOneUntilDNSTTL, SavedOneUntilNoResponse -->
-		<item name="account.1.network.dnsSRVFailoverMode">Default</item>
+		<item name="account.{$line}.network.dnsSRVFailoverMode">Default</item>
 		<!-- NAT Traversal -->
 		<!-- No, STUN, KeepAlive, UPnP, Auto, VPN -->
-		<item name="account.1.network.natTraversal">Auto</item>
+		<item name="account.{$line}.network.natTraversal">Auto</item>
 		<!-- Proxy-Require -->
-		<item name="account.1.network.proxyRequire"></item>
+		<item name="account.{$line}.network.proxyRequire"></item>
 		<!-- SIP Registration -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.registration">Yes</item>
+		<item name="account.{$line}.sip.registration">Yes</item>
 		<!-- Unregister Before New Registration -->
 		<!-- No, Yes - All, Instance -->
-		<item name="account.1.sip.unregisterOnReboot">Instance</item>
+		<item name="account.{$line}.sip.unregisterOnReboot">Instance</item>
 		<!-- Register Expiration (m) -->
-		<item name="account.1.sip.registerExpiration">{$account.1.register_expires}</item>
+		<item name="account.{$line}.sip.registerExpiration">{$row.register_expires}</item>
 		<!-- Re-register before Expiration (s)  -->
-		<item name="account.1.sip.registerBeforeExpiration">0</item>
+		<item name="account.{$line}.sip.registerBeforeExpiration">0</item>
 		<!-- Registration Retry Wait Time (s) -->
-		<item name="account.1.sip.registrationFailureRetryWaitTime">20</item>
+		<item name="account.{$line}.sip.registrationFailureRetryWaitTime">20</item>
 		<!-- Add Auth Header On RE-REGISTER tobetested -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.header.authOnInitialRegister">Yes</item>
+		<item name="account.{$line}.sip.header.authOnInitialRegister">Yes</item>
 		<!-- Enable SIP OPTIONS Keep Alive -->
-		<item name="account.1.sip.keepAlive.enable">No</item>
+		<item name="account.{$line}.sip.keepAlive.enable">No</item>
 		<!-- SIP OPTIONS Keep Alive Interval (s)  -->
-		<item name="account.1.sip.keepAlive.interval">30</item>
+		<item name="account.{$line}.sip.keepAlive.interval">30</item>
 		<!-- SIP OPTIONS Keep Alive Maximum Tries -->
-		<item name="account.1.sip.keepAlive.maxLost">3</item>
+		<item name="account.{$line}.sip.keepAlive.maxLost">3</item>
 		<!-- Subscribe for MWI -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.subscribe.forMwi">No</item>
+		<item name="account.{$line}.sip.subscribe.forMwi">No</item>
 		<!-- Use Privacy Header -->
 		<!-- Default, No, Yes -->
-		<item name="account.1.sip.header.privacy">Default</item>
+		<item name="account.{$line}.sip.header.privacy">Default</item>
 		<!-- Use P-Preferred-Identity Header  -->
 		<!-- Default, No, Yes -->
-		<item name="account.1.sip.header.ppi">Default</item>
+		<item name="account.{$line}.sip.header.ppi">Default</item>
 		<!-- SIP Transport -->
 		<!-- UDP, TCP, TlsOrTcp -->
-		<item name="account.1.sip.transport">{$account.1.sip_transport}</item>
+		<item name="account.{$line}.sip.transport">{if $row.sip_transport=='tcp'}TCP{elseif $row.sip_transport=='tls'}TlsOrTcp{else}UDP{/if}</item>
 		<!-- Local SIP Port -->
-		<item name="account.1.sip.localPort">5060</item>
+		<item name="account.{$line}.sip.localPort">{$row.sip_port}</item>
 		<!-- SIP URI Scheme When Using TLS -->
 		<!-- sip, sips -->
-		<item name="account.1.sip.uriSchemeWhenUsingTls">sip</item>
+		<item name="account.{$line}.sip.uriSchemeWhenUsingTls">sip</item>
 		<!-- Use Actual Ephemeral Port in Contact with TCP/TLS -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.useActualEphemeralPortInContactWithTcpTls">No</item>
+		<item name="account.{$line}.sip.useActualEphemeralPortInContactWithTcpTls">No</item>
 		<!-- Support SIP Instance ID -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.supportInstanceId">Yes</item>
+		<item name="account.{$line}.sip.supportInstanceId">Yes</item>
 		<!-- SIP T1 Timeout -->
 		<!-- 0.5 sec - 0_5sec, 1 sec - 1sec, 2 sec - 2sec -->
-		<item name="account.1.sip.timer.t1">0_5sec</item>
+		<item name="account.{$line}.sip.timer.t1">0_5sec</item>
 		<!-- SIP T2 Interval -->
 		<!-- 2 sec - 2sec, 4 sec - 4sec, 8 sec - 8sec -->
-		<item name="account.1.sip.timer.t2">4sec</item>
+		<item name="account.{$line}.sip.timer.t2">4sec</item>
 		<!-- SIP Timer D Interval (Seconds) -->
-		<item name="account.1.sip.timerd.interval">0</item>
+		<item name="account.{$line}.sip.timerd.interval">0</item>
 		<!-- Remove OBP from Route -->
 		<!-- Disable - InRoute, Enable - NotInRoute, Always - AlwaysSentTo -->
-		<item name="account.1.sip.outboundProxy.mode">InRoute</item>
+		<item name="account.{$line}.sip.outboundProxy.mode">InRoute</item>
 		<!-- Enable 100rel -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.header.100rel">No</item>
+		<item name="account.{$line}.sip.header.100rel">No</item>
 		<!-- Enable Session Timer/Session Expiration (s) -->
 		<!-- Session Timer is disabled if the value is 0 -->
-		<item name="account.1.sip.sessionTimer.expiration">180</item>
+		<item name="account.{$line}.sip.sessionTimer.expiration">180</item>
 		<!-- Min-SE(s) -->
-		<item name="account.1.sip.minimumSE">90</item>
+		<item name="account.{$line}.sip.minimumSE">90</item>
 		<!-- UAC Specify Refresher -->
 		<!-- Omit, UAC, UAS -->
-		<item name="account.1.sip.sessionTimer.refresher.uacSpecify">Omit</item>
+		<item name="account.{$line}.sip.sessionTimer.refresher.uacSpecify">Omit</item>
 		<!-- UAS Specify Refresher -->
 		<!--UAC, UAS -->
-		<item name="account.1.sip.sessionTimer.refresher.uasSpecify">UAC</item>
+		<item name="account.{$line}.sip.sessionTimer.refresher.uasSpecify">UAC</item>
 		<!-- Caller Request Timer -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.sessionTimer.requestTimer.caller">No</item>
+		<item name="account.{$line}.sip.sessionTimer.requestTimer.caller">No</item>
 		<!-- Callee Request Timer -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.sessionTimer.requestTimer.callee">No</item>
+		<item name="account.{$line}.sip.sessionTimer.requestTimer.callee">No</item>
 		<!-- Force Timer -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.sessionTimer.force">No</item>
+		<item name="account.{$line}.sip.sessionTimer.force">No</item>
 		<!-- Force INVITE -->
 		<!-- No, Yes -->
-		<item name="account.1.sip.sessionTimer.forceInvite">No</item>
+		<item name="account.{$line}.sip.sessionTimer.forceInvite">No</item>
 		<!-- Codec Settings -->
 		<!-- Preferred Vocoder -->
 		<!-- PCMU, PCMA, G_726_32, G_722, G_729AOrB, iLBC, OPUS -->
-		<item name="account.1.codec.choice.1">PCMU</item>
-		<item name="account.1.codec.choice.2">PCMA</item>
-		<item name="account.1.codec.choice.3">G_726_32</item>
-		<item name="account.1.codec.choice.4">G_722</item>
-		<item name="account.1.codec.choice.5">G_729AOrB</item>
-		<item name="account.1.codec.choice.6">iLBC</item>
-		<item name="account.1.codec.choice.7">OPUS</item>
+		<item name="account.{$line}.codec.choice.1">PCMU</item>
+		<item name="account.{$line}.codec.choice.2">PCMA</item>
+		<item name="account.{$line}.codec.choice.3">G_726_32</item>
+		<item name="account.{$line}.codec.choice.4">G_722</item>
+		<item name="account.{$line}.codec.choice.5">G_729AOrB</item>
+		<item name="account.{$line}.codec.choice.6">iLBC</item>
+		<item name="account.{$line}.codec.choice.7">OPUS</item>
 		<!-- Codec Negotiation Priority -->
 		<!-- Caller, Callee -->
-		<item name="account.1.codec.negotiatePriority">Callee</item>
+		<item name="account.{$line}.codec.negotiatePriority">Callee</item>
 		<!-- Use First Matching Vocoder in 200OK SDP -->
 		<!-- No, Yes -->
-		<item name="account.1.codec.useFirstMatch">No</item>
+		<item name="account.{$line}.codec.useFirstMatch">No</item>
 		<!-- iLBC Frame Size -->
 		<!-- 20ms, 30ms -->
-		<item name="account.1.codec.iLBC.frameSize">30ms</item>
+		<item name="account.{$line}.codec.iLBC.frameSize">30ms</item>
 		<!-- G726-32 ITU Payload -->
 		<!-- 2 - 0, Dynamic - 1 -->
-		<item name="account.1.codec.payloadType.g72632.ITU">1</item>
+		<item name="account.{$line}.codec.payloadType.g72632.ITU">1</item>
 		<!-- G726-32 Dynamic PT -->
 		<!-- Range: 96-126, default: 126 -->
-		<item name="account.1.codec.payloadType.g72632">126</item>
+		<item name="account.{$line}.codec.payloadType.g72632">126</item>
 		<!-- Opus Payload Type -->
-		<item name="account.1.codec.payloadType.opus">123</item>
+		<item name="account.{$line}.codec.payloadType.opus">123</item>
 		<!-- DTMF -->
 		<!-- No, Yes -->
-		<item name="account.1.dtmf.sendInAudio">No</item>
-		<item name="account.1.dtmf.sendInRtp">Yes</item>
-		<item name="account.1.dtmf.sendInSip">No</item>
+		<item name="account.{$line}.dtmf.sendInAudio">No</item>
+		<item name="account.{$line}.dtmf.sendInRtp">Yes</item>
+		<item name="account.{$line}.dtmf.sendInSip">No</item>
 		<!-- DTMF Payload Type -->
-		<item name="account.1.codec.payoadType.dtmf">101</item>
+		<item name="account.{$line}.codec.payoadType.dtmf">101</item>
 		<!-- Jitter Buffer Type -->
 		<!-- Fixed, Adaptive -->
-		<item name="account.1.audio.jitterBufferType">Adaptive</item>
+		<item name="account.{$line}.audio.jitterBufferType">Adaptive</item>
 		<!-- Enable Audio RED with FEC -->
 		<!-- No, Yes -->
-		<item name="account.1.audio.fec.enable">No</item>
+		<item name="account.{$line}.audio.fec.enable">No</item>
 		<!-- Audio FEC Payload Type -->
 		<!-- Range: 96-126, default: 121 -->
-		<item name="account.1.codec.payloadType.fec.audio">121</item>
+		<item name="account.{$line}.codec.payloadType.fec.audio">121</item>
 		<!-- Audio RED Payload Type -->
 		<!-- Range: 96-126, default: 124 -->
-		<item name="account.1.codec.payloadType.red">124</item>
+		<item name="account.{$line}.codec.payloadType.red">124</item>
 		<!-- Silence Suppression -->
 		<!-- No, Yes -->
-		<item name="account.1.audio.silenceSuppression">No</item>
+		<item name="account.{$line}.audio.silenceSuppression">No</item>
 		<!-- Voice Frames Per TX -->
-		<item name="account.1.audio.voiceFramePerTX">2</item>
+		<item name="account.{$line}.audio.voiceFramePerTX">2</item>
 		<!-- Enable Video FEC -->
 		<!-- No, Yes -->
-		<item name="account.1.video.fec.enable">Yes</item>
+		<item name="account.{$line}.video.fec.enable">Yes</item>
 		<!-- Enable RFC5168 Support -->
 		<!-- No, Yes -->
-		<item name="account.1.codec.rfc5168.enable">No</item>
+		<item name="account.{$line}.codec.rfc5168.enable">No</item>
 		<!-- Video FEC Mode  -->
 		<!-- 0 , 1 -->
-		<item name="account.1.video.fec.mode">0</item>
+		<item name="account.{$line}.video.fec.mode">0</item>
 		<!-- FEC Payload Type -->
 		<!-- Range: 96-126, default: 120 -->
-		<item name="account.1.codec.payloadType.fec.video">120</item>
+		<item name="account.{$line}.codec.payloadType.fec.video">120</item>
 		<!-- Packetization mode -->
 		<!-- SingleNALUnit, Non-Interleaved -->
 		<!-- [Note] Prefer Non-Interleaved Mode is not supported yet -->
-		<item name="account.1.codec.packetizationMode">Non-Interleaved</item>
+		<item name="account.{$line}.codec.packetizationMode">Non-Interleaved</item>
 		<!-- H.264 Image Size -->
 		<!-- 720P, 4CIF, VGA, CIF, QVGA, QCIF -->
-		<item name="account.1.video.h264.imagesize">720P</item>
+		<item name="account.{$line}.video.h264.imagesize">720P</item>
 		<!-- Use H.264 Constrained Profiles -->
 		<!-- No, Yes -->
-		<item name="account.1.codec.h264.CBP.enable">No</item>
+		<item name="account.{$line}.codec.h264.CBP.enable">No</item>
 		<!-- H.264 Profile Type -->
 		<!-- Baseline, Main, High, BP&amp;MP&amp;HP -->
-		<item name="account.1.codec.H264ProfileType">BP&amp;MP&amp;HP</item>
+		<item name="account.{$line}.codec.H264ProfileType">BP&amp;MP&amp;HP</item>
 		<!-- Video Bit Rate -->
 		<!-- 32 - 32 kbps, 64 - 64 kbps, 96 - 96 kbps, 128 - 128 kbps, 160 - 160 kbps, 192 - 192 kbps -->
 		<!-- # 210 - 210 kbps, 256 - 256 kbps, 384 - 384 kbps, 512 - 512 kbps, 640 - 640 kbps, 768 - 768 kbps -->
 		<!-- # 1024 - 1024 kbps, 1280 - 1280 kbps, 1536 - 1536 kbps, 2048 - 2048 kbps. -->
-		<item name="account.1.video.bitRate">2048</item>
+		<item name="account.{$line}.video.bitRate">2048</item>
 		<!-- SDP Bandwidth Attribute -->
 		<!-- Standard, MediaLevel, SessionLevel, None -->
-		<item name="account.1.codec.SDPBandwidthAttr">MediaLevel</item>
+		<item name="account.{$line}.codec.SDPBandwidthAttr">MediaLevel</item>
 		<!-- H.264 Payload Type -->
 		<!-- Range: 96-126, default: 99 -->
-		<item name="account.1.codec.payloadType.h264">99</item>
+		<item name="account.{$line}.codec.payloadType.h264">99</item>
 		<!-- Disable BFCP -->
 		<!-- No, Yes -->
-		<item name="account.1.presentation.BFCP.enable">Yes</item>
+		<item name="account.{$line}.presentation.BFCP.enable">Yes</item>
 		<!-- Presentation H.264 Image Size -->
 		<!-- 1080P, 720P -->
-		<item name="account.1.presentation.h264.imagesize">1080P</item>
+		<item name="account.{$line}.presentation.h264.imagesize">1080P</item>
 		<!-- Presentation H.264 Profile Type -->
 		<!-- Baseline, Main, High, BP&amp;MP&amp;HP -->
-		<item name="account.1.presentation.H264ProfileType">BP&amp;MP&amp;HP</item>
+		<item name="account.{$line}.presentation.H264ProfileType">BP&amp;MP&amp;HP</item>
 		<!-- Presentation Video Bit Rate -->
 		<!-- 32 - 32 kbps, 64 - 64 kbps, 96 - 96 kbps, 128 - 128 kbps, 160 - 160 kbps, 192 - 192 kbps -->
 		<!-- # 210 - 210 kbps, 256 - 256 kbps, 384 - 384 kbps, 512 - 512 kbps, 640 - 640 kbps, 768 - 768 kbps -->
 		<!-- # 1024 - 1024 kbps, 1280 - 1280 kbps, 1536 - 1536 kbps, 2048 - 2048 kbps. -->
-		<item name="account.1.presentation.bitRate">1024</item>
+		<item name="account.{$line}.presentation.bitRate">1024</item>
 		<!-- Presentation Video Frame Rate -->
 		<!-- 5, 10, 15 -->
-		<item name="account.1.presentation.frameRate">15</item>
+		<item name="account.{$line}.presentation.frameRate">15</item>
 		<!-- BFCP Transport Protocol -->
 		<!-- Automatic, UDP, TCP -->
-		<item name="account.1.presentation.BFCP.transportProtocol">UDP</item>
+		<item name="account.{$line}.presentation.BFCP.transportProtocol">UDP</item>
 		<!-- SRTP Mode -->
 		<!-- Disabled, EnabledButNotForced, EnabledAndForced -->
-		<item name="account.1.audio.srtpMode">Disabled</item>
+		<item name="account.{$line}.audio.srtpMode">Disabled</item>
 		<!-- SRTP Key Length -->
 		<!-- AES128And256Bit, AES128Bit, AES256Bit -->
-		<item name="account.1.audio.srtpKeyLength">AES128And256Bit</item>
+		<item name="account.{$line}.audio.srtpKeyLength">AES128And256Bit</item>
 		<!-- Enable SRTP Key Life Time -->
 		<!-- No, Yes -->
-		<item name="account.1.audio.cryptoLifeTime">Yes</item>
+		<item name="account.{$line}.audio.cryptoLifeTime">Yes</item>
 		<!-- RTCP Destination -->
-		<item name="account.1.rtcp.destination"></item>
+		<item name="account.{$line}.rtcp.destination"></item>
 		<!-- Symmetric RTP -->
 		<!-- No, Yes -->
-		<item name="account.1.audio.symmetricRTP">No</item>
+		<item name="account.{$line}.audio.symmetricRTP">No</item>
 		<!-- RTP IP Filter -->
 		<!-- Disable, IPOnly, IPandPort -->
-		<item name="account.1.rtp.filter">Disable</item>
+		<item name="account.{$line}.rtp.filter">Disable</item>
 		<!-- Call Settings -->
 		<!-- Start Video Automatically -->
 		<!-- No, Yes -->
-		<item name="account.1.video.startAuto.enable">Yes</item>
+		<item name="account.{$line}.video.startAuto.enable">Yes</item>
 		<!-- Remote Video Request -->
 		<!-- Prompt, Accept, Deny -->
-		<item name="account.1.video.request">Prompt</item>
+		<item name="account.{$line}.video.request">Prompt</item>
 		<!-- Auto Answer -->
 		<!-- No, Yes, EnableIntercom/Paging -->
-		<item name="account.1.call.autoAnswer">EnableIntercom/Paging</item>
+		<item name="account.{$line}.call.autoAnswer">EnableIntercom/Paging</item>
 		<!-- Play Warning Tone for Auto Answer Intercom  -->
 		<!-- No, Yes -->
-		<item name="account.1.intercom.playWarningToneForAutoAnswer">Yes</item>
+		<item name="account.{$line}.intercom.playWarningToneForAutoAnswer">Yes</item>
 		<!-- Intercom Barging -->
 		<!-- No, Yes -->
-		<item name="account.1.intercom.allowBargingByCallInfo">No</item>
+		<item name="account.{$line}.intercom.allowBargingByCallInfo">No</item>
 		<!-- Auto Preview -->
 		<!-- No, Yes, YeswithRinging -->
-		<item name="account.1.call.autoPreview">Yes</item>
+		<item name="account.{$line}.call.autoPreview">Yes</item>
 		<!-- Send Anonymous -->
 		<!-- No, Yes -->
-		<item name="account.1.call.sendAnonymous">No</item>
+		<item name="account.{$line}.call.sendAnonymous">No</item>
 		<!-- Anonymous Call Rejection -->
 		<!-- No, Yes -->
-		<item name="account.1.call.rejectAnonymousCall">No</item>
+		<item name="account.{$line}.call.rejectAnonymousCall">No</item>
 		<!-- Call Log -->
 		<!-- All, IncomingAndOutgoing, Disable, DonotPromptMissedCall -->
-		<item name="account.1.call.callLog">All</item>
+		<item name="account.{$line}.call.callLog">All</item>
 		<!-- Enable Call Features -->
 		<!-- No, Yes -->
-		<item name="account.1.featureCodes.callFeatures">No</item>
+		<item name="account.{$line}.featureCodes.callFeatures">No</item>
 		<!-- Transfer on 3 Way Conference Hangup -->
 		<!-- No, Yes -->
-		<item name="account.1.call.transferOnConferenceHangup">No</item>
+		<item name="account.{$line}.call.transferOnConferenceHangup">No</item>
 		<!-- Use # as Dial Key  -->
 		<!-- Yes, No -->
-		<item name="account.1.call.keyAsSend">Yes</item>
+		<item name="account.{$line}.call.keyAsSend">Yes</item>
 		<!-- DND Call Feature On -->
-		<item name="account.1.featureCodes.dndOn"></item>
+		<item name="account.{$line}.featureCodes.dndOn"></item>
 		<!-- DND Call Feature Off  -->
-		<item name="account.1.featureCodes.dndOff"></item>
+		<item name="account.{$line}.featureCodes.dndOff"></item>
 		<!-- No Key Entry Timeout (s) -->
 		<!-- Number: 4 - 15 -->
-		<item name="account.1.call.noKeyEntryTimeout">4</item>
+		<item name="account.{$line}.call.noKeyEntryTimeout">4</item>
 		<!-- Ring Timeout -->
 		<!-- Number: 10 - 300 -->
-		<item name="account.1.ring.timeout">60</item>
+		<item name="account.{$line}.ring.timeout">60</item>
 		<!-- Refer-To Use Target Contact -->
 		<!-- Yes, No -->
-		<item name="account.1.call.referToUseTargetContact">No</item>
+		<item name="account.{$line}.call.referToUseTargetContact">No</item>
 		<!-- RFC2543 Hold -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.rfc2543Hold">Yes</item>
+		<item name="account.{$line}.sip.rfc2543Hold">Yes</item>
 		<!-- Dial Plan Prefix -->
-		<item name="account.1.call.dialplanPrefix"></item>
+		<item name="account.{$line}.call.dialplanPrefix"></item>
 		<!-- Disable DialPlan -->
 		<!-- # Disable DialPlan. 0 - No Selection, 1 - Dial Page, 2 - Contact, 4 - Incoming Call History, 8 -  Outgoing Call History, 16 - MPK & Click2Dial.  -->
 		<!-- # If need to check multiple selections, add the specific values for each selections together. Default value is 0 -->
-		<item name="account.1.call.dialplan.disableMode">0</item>
+		<item name="account.{$line}.call.dialplan.disableMode">0</item>
 		<!-- DialPlan -->
-		<item name="account.1.call.dialplan">{$grandstream_dial_plan}</item>
+		<item name="account.{$line}.call.dialplan">{$grandstream_dial_plan}</item>
 		<!-- Caller ID Display -->
 		<!-- Auto, Disabled, Header, PAIHeader -->
 		<!-- [Note] PAI Header is not supported yet -->
-		<item name="account.1.sip.callerIdDisplay">Auto</item>
+		<item name="account.{$line}.sip.callerIdDisplay">Auto</item>
 		<!-- Account Ring Tone -->
-		<item name="account.1.ring.ringtone">content://settings/system/ringtone</item>
+		<item name="account.{$line}.ring.ringtone">content://settings/system/ringtone</item>
 		<!-- Ignore Alert-Info Header -->
 		<!-- Yes, No -->
-		<item name="account.1.ring.ignoreSipAlertInfo">No</item>
+		<item name="account.{$line}.ring.ignoreSipAlertInfo">No</item>
 		<!-- Match Incoming Caller ID -->
-		<item name="account.1.ring.match.1.callerId"></item>
+		<item name="account.{$line}.ring.match.1.callerId"></item>
 		<!-- Distinctive Ring Tone -->
-		<item name="account.1.ring.match.1.ringtone">content://settings/system/ringtone</item>
+		<item name="account.{$line}.ring.match.1.ringtone">content://settings/system/ringtone</item>
 		<!-- Match Incoming Caller ID -->
-		<item name="account.1.ring.match.2.callerId"></item>
+		<item name="account.{$line}.ring.match.2.callerId"></item>
 		<!-- Distinctive Ring Tone -->
-		<item name="account.1.ring.match.2.ringtone">content://settings/system/ringtone</item>
+		<item name="account.{$line}.ring.match.2.ringtone">content://settings/system/ringtone</item>
 		<!-- Match Incoming Caller ID -->
-		<item name="account.1.ring.match.3.callerId"></item>
+		<item name="account.{$line}.ring.match.3.callerId"></item>
 		<!-- Distinctive Ring Tone -->
-		<item name="account.1.ring.match.3.ringtone">content://settings/system/ringtone</item>
+		<item name="account.{$line}.ring.match.3.ringtone">content://settings/system/ringtone</item>
 		<!-- ############Ring Tone Value Table###############
-				# Web GUI Option                            Value
-				# Use System Ring tone                      content://settings/system/ringtone 
-				# Silent                                    ringtone_silence
-				# Ring2_OrganDub                            /system/media/audio/ringtones/Ring2_OrganDub.ogg
-				# Big_Easy                                  /system/media/audio/ringtones/Big_Easy.ogg
-				# DonMessWivlt                              /system/media/audio/ringtones/DonMessWivIt.ogg
-				# Club_Cubano                               /system/media/audio/ringtones/Club_Cubano.ogg
-				# Growl                                     /system/media/audio/ringtones/Growl.ogg
-				# CrayonRock                                /system/media/audio/ringtones/CrayonRock.ogg
-				# Ring9_Nairobi                             /system/media/audio/ringtones/Ring9_Nairobi.ogg
-				# Ring10_Nassau                             /system/media/audio/ringtones/Ring10_Nassau.ogg
-				# Third_Eye                                 /system/media/audio/ringtones/Third_Eye.ogg
-				# Ring1_Ding                                /system/media/audio/ringtones/Ring1_Ding.ogg
-				# Road_Trip                                 /system/media/audio/ringtones/Road_Trip.ogg
-				# bellcore-dr2                              /system/media/audio/ringtones/bellcore-dr2.ogg
-				# Ring_Digital_02                           /system/media/audio/ringtones/Ring_Digital_02.ogg
-				# bellcore-dr3                              /system/media/audio/ringtones/bellcore-dr3.ogg
-				# DancinFool                                /system/media/audio/ringtones/DancinFool.ogg
-				# Ring_Classic_02                           /system/media/audio/ringtones/Ring_Classic_02.ogg
-				# Ring5_FreeFlight                          /system/media/audio/ringtones/Ring5_FreeFlight.ogg
-				# Funk_Yall                                 /system/media/audio/ringtones/Funk_Yall.ogg
-				# World                                     /system/media/audio/ringtones/World.ogg
-				# Ring8_MidEvilJaunt                        /system/media/audio/ringtones/Ring8_MidEvilJaunt.ogg
-				# TwirlAway                                 /system/media/audio/ringtones/TwirlAway.ogg
-				# bellcore-dr4                              /system/media/audio/ringtones/bellcore-dr4.ogg
-				# Ring6_Glacial_Groove                      /system/media/audio/ringtones/Ring6_Glacial_Groove.ogg
-				# Shes_All_That                             /system/media/audio/ringtones/Shes_All_That.ogg
-				# Ring4_EtherShake                          /system/media/audio/ringtones/Ring4_EtherShake.ogg
-				# Seville                                   /system/media/audio/ringtones/Seville.ogg
-				# BussaMove                                 /system/media/audio/ringtones/BussaMove.ogg
-				# Default_ringtone                          /system/media/audio/ringtones/Default_ringtone.ogg
-				# BirdLoop                                  /system/media/audio/ringtones/BirdLoop.ogg
-				# MildlyAlarming                            /system/media/audio/ringtones/MildlyAlarming.ogg
-				# Terminated                                /system/media/audio/ringtones/Terminated.ogg
-				# Calypso_Steel                             /system/media/audio/ringtones/Calypso_Steel.ogg
-				# Safari                                    /system/media/audio/ringtones/Safari.ogg
-				# Ring_Synth_04                             /system/media/audio/ringtones/Ring_Synth_04.ogg
-				# Ring_Synth_02                             /system/media/audio/ringtones/Ring_Synth_02.ogg
-				# CurveBall                                 /system/media/audio/ringtones/CurveBall.ogg
-				# Enter_the_Nexus                           /system/media/audio/ringtones/Enter_the_Nexus.ogg
-				# Bollywood                                 /system/media/audio/ringtones/Bollywood.ogg
-				# Champagne_Edition                         /system/media/audio/ringtones/Champagne_Edition.ogg
-				# Steppin_Out                               /system/media/audio/ringtones/Steppin_Out.ogg
-				# Ring3_Paradise_Island                     /system/media/audio/ringtones/Ring3_Paradise_Island.ogg
-				# Playa                                     /system/media/audio/ringtones/Playa.ogg
-				# No_Limits                                 /system/media/audio/ringtones/No_Limits.ogg
-				# LoopyLounge                               /system/media/audio/ringtones/LoopyLounge.ogg
-				# Cairo                                     /system/media/audio/ringtones/Cairo.ogg
-				# Ring7_HalfwayHome                         /system/media/audio/ringtones/Ring7_HalfwayHome.ogg
-				# SilkyWay                                  /system/media/audio/ringtones/SilkyWay.ogg
-				# LoveFlute                                 /system/media/audio/ringtones/LoveFlute.ogg
-				# Eastern_Sky                               /system/media/audio/ringtones/Eastern_Sky.ogg
-				# bellcore-dr5                              /system/media/audio/ringtones/bellcore-dr5.ogg
-				# Gimme_Mo_Town                             /system/media/audio/ringtones/Gimme_Mo_Town.ogg
-				# bellcore-dr1                              /system/media/audio/ringtones/bellcore-dr1.ogg
-				# Backroad                                  /system/media/audio/ringtones/Backroad.ogg -->
+                # Web GUI Option                            Value
+                # Use System Ring tone                      content://settings/system/ringtone
+                # Silent                                    ringtone_silence
+                # Ring2_OrganDub                            /system/media/audio/ringtones/Ring2_OrganDub.ogg
+                # Big_Easy                                  /system/media/audio/ringtones/Big_Easy.ogg
+                # DonMessWivlt                              /system/media/audio/ringtones/DonMessWivIt.ogg
+                # Club_Cubano                               /system/media/audio/ringtones/Club_Cubano.ogg
+                # Growl                                     /system/media/audio/ringtones/Growl.ogg
+                # CrayonRock                                /system/media/audio/ringtones/CrayonRock.ogg
+                # Ring9_Nairobi                             /system/media/audio/ringtones/Ring9_Nairobi.ogg
+                # Ring10_Nassau                             /system/media/audio/ringtones/Ring10_Nassau.ogg
+                # Third_Eye                                 /system/media/audio/ringtones/Third_Eye.ogg
+                # Ring1_Ding                                /system/media/audio/ringtones/Ring1_Ding.ogg
+                # Road_Trip                                 /system/media/audio/ringtones/Road_Trip.ogg
+                # bellcore-dr2                              /system/media/audio/ringtones/bellcore-dr2.ogg
+                # Ring_Digital_02                           /system/media/audio/ringtones/Ring_Digital_02.ogg
+                # bellcore-dr3                              /system/media/audio/ringtones/bellcore-dr3.ogg
+                # DancinFool                                /system/media/audio/ringtones/DancinFool.ogg
+                # Ring_Classic_02                           /system/media/audio/ringtones/Ring_Classic_02.ogg
+                # Ring5_FreeFlight                          /system/media/audio/ringtones/Ring5_FreeFlight.ogg
+                # Funk_Yall                                 /system/media/audio/ringtones/Funk_Yall.ogg
+                # World                                     /system/media/audio/ringtones/World.ogg
+                # Ring8_MidEvilJaunt                        /system/media/audio/ringtones/Ring8_MidEvilJaunt.ogg
+                # TwirlAway                                 /system/media/audio/ringtones/TwirlAway.ogg
+                # bellcore-dr4                              /system/media/audio/ringtones/bellcore-dr4.ogg
+                # Ring6_Glacial_Groove                      /system/media/audio/ringtones/Ring6_Glacial_Groove.ogg
+                # Shes_All_That                             /system/media/audio/ringtones/Shes_All_That.ogg
+                # Ring4_EtherShake                          /system/media/audio/ringtones/Ring4_EtherShake.ogg
+                # Seville                                   /system/media/audio/ringtones/Seville.ogg
+                # BussaMove                                 /system/media/audio/ringtones/BussaMove.ogg
+                # Default_ringtone                          /system/media/audio/ringtones/Default_ringtone.ogg
+                # BirdLoop                                  /system/media/audio/ringtones/BirdLoop.ogg
+                # MildlyAlarming                            /system/media/audio/ringtones/MildlyAlarming.ogg
+                # Terminated                                /system/media/audio/ringtones/Terminated.ogg
+                # Calypso_Steel                             /system/media/audio/ringtones/Calypso_Steel.ogg
+                # Safari                                    /system/media/audio/ringtones/Safari.ogg
+                # Ring_Synth_04                             /system/media/audio/ringtones/Ring_Synth_04.ogg
+                # Ring_Synth_02                             /system/media/audio/ringtones/Ring_Synth_02.ogg
+                # CurveBall                                 /system/media/audio/ringtones/CurveBall.ogg
+                # Enter_the_Nexus                           /system/media/audio/ringtones/Enter_the_Nexus.ogg
+                # Bollywood                                 /system/media/audio/ringtones/Bollywood.ogg
+                # Champagne_Edition                         /system/media/audio/ringtones/Champagne_Edition.ogg
+                # Steppin_Out                               /system/media/audio/ringtones/Steppin_Out.ogg
+                # Ring3_Paradise_Island                     /system/media/audio/ringtones/Ring3_Paradise_Island.ogg
+                # Playa                                     /system/media/audio/ringtones/Playa.ogg
+                # No_Limits                                 /system/media/audio/ringtones/No_Limits.ogg
+                # LoopyLounge                               /system/media/audio/ringtones/LoopyLounge.ogg
+                # Cairo                                     /system/media/audio/ringtones/Cairo.ogg
+                # Ring7_HalfwayHome                         /system/media/audio/ringtones/Ring7_HalfwayHome.ogg
+                # SilkyWay                                  /system/media/audio/ringtones/SilkyWay.ogg
+                # LoveFlute                                 /system/media/audio/ringtones/LoveFlute.ogg
+                # Eastern_Sky                               /system/media/audio/ringtones/Eastern_Sky.ogg
+                # bellcore-dr5                              /system/media/audio/ringtones/bellcore-dr5.ogg
+                # Gimme_Mo_Town                             /system/media/audio/ringtones/Gimme_Mo_Town.ogg
+                # bellcore-dr1                              /system/media/audio/ringtones/bellcore-dr1.ogg
+                # Backroad                                  /system/media/audio/ringtones/Backroad.ogg -->
 		<!-- Account Advanced Settings -->
 		<!-- Check Domain Certificates		 -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.validate.domainCertificates">No</item>
+		<item name="account.{$line}.sip.validate.domainCertificates">No</item>
 		<!-- Validate Certification Chain 	 -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.validate.certificationChain">No</item>
+		<item name="account.{$line}.sip.validate.certificationChain">No</item>
 		<!-- Validate Incoming SIP Messages -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.validate.incomingMessage">No</item>
+		<item name="account.{$line}.sip.validate.incomingMessage">No</item>
 		<!-- Allow Unsolicited REFER -->
 		<!-- Disabled, Enabled, EnabledOrForceAuth -->
-		<item name="account.1.sip.allowUnsolicitedRefer">Disabled</item>
+		<item name="account.{$line}.sip.allowUnsolicitedRefer">Disabled</item>
 		<!-- Only Accept SIP Requests from Known Servers -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.validate.incomingServer">No</item>
+		<item name="account.{$line}.sip.validate.incomingServer">No</item>
 		<!-- Check SIP User ID for Incoming INVITE  -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.validate.userIdforInvite">No</item>
+		<item name="account.{$line}.sip.validate.userIdforInvite">No</item>
 		<!-- Allow SIP Reset  -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.allowSipReset">No</item>
+		<item name="account.{$line}.sip.allowSipReset">No</item>
 		<!-- Authenticate Incoming INVITE -->
 		<!-- Yes, No -->
-		<item name="account.1.sip.authenticateIncomingInvite">No</item>
+		<item name="account.{$line}.sip.authenticateIncomingInvite">No</item>
 		<!-- SIP Realm Used for Challenge INVITE & NOTIFY -->
-		<item name="account.1.sipRealmForChallengeINVITE"></item>
+		<item name="account.{$line}.sipRealmForChallengeINVITE"></item>
 		<!-- Virtual Account Group -->
 		<!-- -1 - Default, 0 - 15 - Virtual Account Group 1 - 16 -->
-		<item name="account.1.virtualGroup">-1</item>
+		<item name="account.{$line}.virtualGroup">-1</item>
 		<!-- Special Feature -->
 		<!-- 100 - Standard, 102 - Broadsoft, 113 - China Mobile, 114 - ZTE IMS, 115 - Mobotix, 116 - ZTE NGN, 117 - Huawei IMS, 123 - NEC, 125 - Worldstone -->
-		<item name="account.1.sip.specialFeature">100</item>
+		<item name="account.{$line}.sip.specialFeature">100</item>
+		<!-- BLF Call-pickup Prefix  -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sip.blf.callPickup.forcePrefix">No</item>
+		<!-- EventList BLF URI -->
+		<item name="account.{$line}.sip.blf.eventlist.uri"></item>
+		<!-- Force BLF Call-pickup by Prefix -->
+		<item name="account.{$line}.sip.blf.callPickup.prefix">**</item>
+		<!-- Value-added Service - Broadsoft Settings - Braodsoft Call Features -->
+		<!-- Feature Key Synchronization -->
+		<!-- No - Disable, Yes - Broadsoft -->
+		<item name="account.{$line}.broadsoft.syncFeatureKey">{if filter_var($grandstream_feature_key_sync, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
+		<!-- Enable BroadSoft Call Park -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.broadsoft.callPark">No</item>
+		<!-- Conference URI -->
+		<item name="account.{$line}.sip.conferenceUri"></item>
+		<!-- BroadSoft Call Center -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.broadsoft.callCenter">No</item>
+
+		<!-- Hoteling Event -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.broadsoft.hoteling">No</item>
+
+		<!-- Call Center Status -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.broadsoft.callCenterStatus">No</item>
+
+		<!-- Value-added Service - Broadsoft Settings - SCA -->
+		<!-- Enable SCA (Shared Call Appearance) -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sca.enable">{if isset($row.shared_line)}Yes{else}No{/if}</item>
+
+		<!-- Enable BargeIn -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sca.bargein.enable">{if isset($row.shared_line)}Yes{else}No{/if}</item>
+		<!-- Auto-filling Pickup Feature Code -->
+		<!-- Yes, No -->
+		<item name="account.{$line}.sca.autoPickup.enable">Yes</item>
+		<!-- Pickup Feature Code -->
+		<item name="account.{$line}.sca.pickupFeatureCode"></item>
+		<!-- Line-seize Timeout -->
+		<!-- Range: 15 - 60. Default: 15 -->
+		<item name="account.{$line}.sip.lineSeizeTimeout">15</item>
+		{/for}
 		<!-- Phone Settings - General Settings -->
 		<!-- Local RTP Port -->
 		<!-- Number: 50040 - 65535 -->
@@ -686,17 +732,21 @@
 		<item name="network.md5Password"></item>
 		<!-- Wi-Fi Settings -->
 		<!-- Wi-Fi Function -->
+		{if isset($grandstream_wifi_enable)}
 		<!-- No, Yes -->
-		<item name="wifi.enable">No</item>
+		<item name="wifi.enable">{if filter_var($grandstream_wifi_enable, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if}</item>
 		<!-- ESSID -->
-		<item name="wifi.essidname"></item>
+		{if isset($grandstream_wifi_essid)}
+		<item name="wifi.essidname">{$grandstream_wifi_essid}</item>
 		<!-- Password -->
-		<item name="wifi.essidpassword"></item>
+		<item name="wifi.essidpassword">{$grandstream_wifi_password}</item>
 		<!-- Security Mode for Hidden SSID -->
 		<!-- None, WEP, WPA/WPA2_PSK, 802.1X_EAP -->
-		<item name="wifi.hiddenessid.securitymode">None</item>
+		<item name="wifi.hiddenessid.securitymode">{$grandstream_wifi_hidden_security}</item>
+		{/if}
 		<!-- Layer 2 QoS 802.1p Priority Value (Wi-Fi) -->
 		<item name="wifi.layer2qos.priority">0</item>
+		{/if}
 		<!-- OpenVPN Settings -->
 		<!-- Enable OpenVPN -->
 		<!-- Yes, No -->
@@ -899,9 +949,9 @@
 		<!-- Allow, RequireAdminPassword, RequireAdminPasswordIfSrcUnknown, NotAllow -->
 		<item name="security.installThirdApp.permission">Allow</item>
 		<!-- Admin Password -->
-		<item name="users.admin.password">admin1</item>
+		<item name="users.admin.password">{if isset($admin_password)}{$admin_password}{else}admin{/if}</item>
 		<!-- User Password -->
-		<item name="users.user.password">user</item>
+		<item name="users.user.password">{if isset($device_password)}{$device_password}{else}user{/if}</item>
 		<!-- SIP TLS Certificate -->
 		<!-- <item name="security.certificate"></item> -->
 		<!-- SIP TLS Private Key  -->
@@ -986,11 +1036,17 @@
 		<!-- TFTP, HTTP, HTTPS -->
 		<item name="provisioning.firmware.protocol">HTTP</item>
 		<!-- Firmware Server Path -->
-		<item name="provisioning.firmware.serverPath"></item>
+		{if isset($grandstream_firmware_path) && isset($firmware_version)}
+		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}/{$firmware_version}</item>
+		{elseif isset($grandstream_firmware_path)}
+		<item name="provisioning.firmware.serverPath">{$grandstream_firmware_path}</item>
+		{else}
+		<item name="provisioning.firmware.serverPath">{$domain_name}{$project_path}/app/provision/resources/firmware/</item>
+		{/if}
 		<!-- HTTP/HTTPS User Name -->
-		<item name="provisioning.firmware.username"></item>
+		<item name="provisioning.firmware.username">{$http_auth_username}</item>
 		<!-- HTTP/HTTPS Password -->
-		<item name="provisioning.firmware.password"></item>
+		<item name="provisioning.firmware.password">{$http_auth_password}</item>
 		<!-- Firmware File Prefix -->
 		<item name="provisioning.firmware.filePrefix"></item>
 		<!-- Firmware File Postfix -->
@@ -999,11 +1055,17 @@
 		<!-- TFTP, HTTP, HTTPS -->
 		<item name="provisioning.config.protocol">HTTP</item>
 		<!-- Config Server Path -->
+		{if $grandstream_config_server_path=="none"}
 		<item name="provisioning.config.serverPath"></item>
+		{elseif isset($grandstream_config_server_path)}
+		<item name="provisioning.config.serverPath">{$grandstream_config_server_path}</item>
+		{else}
+		<item name="provisioning.config.serverPath">{$domain_name}{$project_path}/app/provision</item>
+		{/if}
 		<!-- HTTP/HTTPS User Name -->
-		<item name="provisioning.config.username"></item>
+		<item name="provisioning.config.username">{$http_auth_username}</item>
 		<!-- HTTP/HTTPS Password -->
-		<item name="provisioning.config.password"></item>
+		<item name="provisioning.config.password">{$http_auth_password}</item>
 		<!-- Config File Prefix -->
 		<item name="provisioning.config.filePrefix"></item>
 		<!-- Config File Postfix -->
@@ -1081,58 +1143,6 @@
 		<!-- Show Display Name from Server -->
 		<!-- Yes, No -->
 		<item name="pks.mpk.showNamefromServer.enable">No</item>
-		<!-- BLF Call-pickup Prefix  -->
-		<!-- Yes, No -->
-		<item name="account.1.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.2.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.3.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.4.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.5.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.6.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.7.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.8.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.9.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.10.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.11.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.12.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.13.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.14.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.15.sip.blf.callPickup.forcePrefix">No</item>
-		<item name="account.16.sip.blf.callPickup.forcePrefix">No</item>
-		<!-- EventList BLF URI -->
-		<item name="account.1.sip.blf.eventlist.uri"></item>
-		<item name="account.2.sip.blf.eventlist.uri"></item>
-		<item name="account.3.sip.blf.eventlist.uri"></item>
-		<item name="account.4.sip.blf.eventlist.uri"></item>
-		<item name="account.5.sip.blf.eventlist.uri"></item>
-		<item name="account.6.sip.blf.eventlist.uri"></item>
-		<item name="account.7.sip.blf.eventlist.uri"></item>
-		<item name="account.8.sip.blf.eventlist.uri"></item>
-		<item name="account.9.sip.blf.eventlist.uri"></item>
-		<item name="account.10.sip.blf.eventlist.uri"></item>
-		<item name="account.11.sip.blf.eventlist.uri"></item>
-		<item name="account.12.sip.blf.eventlist.uri"></item>
-		<item name="account.13.sip.blf.eventlist.uri"></item>
-		<item name="account.14.sip.blf.eventlist.uri"></item>
-		<item name="account.15.sip.blf.eventlist.uri"></item>
-		<item name="account.16.sip.blf.eventlist.uri"></item>
-		<!-- Force BLF Call-pickup by Prefix -->
-		<item name="account.1.sip.blf.callPickup.prefix">**</item>
-		<item name="account.2.sip.blf.callPickup.prefix">**</item>
-		<item name="account.3.sip.blf.callPickup.prefix">**</item>
-		<item name="account.4.sip.blf.callPickup.prefix">**</item>
-		<item name="account.5.sip.blf.callPickup.prefix">**</item>
-		<item name="account.6.sip.blf.callPickup.prefix">**</item>
-		<item name="account.7.sip.blf.callPickup.prefix">**</item>
-		<item name="account.8.sip.blf.callPickup.prefix">**</item>
-		<item name="account.9.sip.blf.callPickup.prefix">**</item>
-		<item name="account.10.sip.blf.callPickup.prefix">**</item>
-		<item name="account.11.sip.blf.callPickup.prefix">**</item>
-		<item name="account.12.sip.blf.callPickup.prefix">**</item>
-		<item name="account.13.sip.blf.callPickup.prefix">**</item>
-		<item name="account.14.sip.blf.callPickup.prefix">**</item>
-		<item name="account.15.sip.blf.callPickup.prefix">**</item>
-		<item name="account.16.sip.blf.callPickup.prefix">**</item>
 		<!-- Applications - Contacts - General settings -->
 		<!-- Sort Phonebook by -->
 		<!-- LastName, FirstName -->
@@ -1208,65 +1218,31 @@
 		<!-- LDAP Dialing Default Account -->
 		<!-- Default - 0, Account 1 - 1, Account 2 - 2 ... -->
 		<item name="ldap.defalutAccount">0</item>
-		<!-- Value-added Service - Broadsoft Settings - Braodsoft Call Features -->
-		<!-- Feature Key Synchronization -->
-		<!-- No - Disable, Yes - Broadsoft -->
-		<item name="account.1.broadsoft.syncFeatureKey">No</item>
-		<!-- Enable BroadSoft Call Park -->
-		<!-- Yes, No -->
-		<item name="account.1.broadsoft.callPark">No</item>
-		<!-- Conference URI -->
-		<item name="account.1.sip.conferenceUri"></item>
-		<!-- BroadSoft Call Center -->
-		<!-- Yes, No -->
-		<item name="account.1.broadsoft.callCenter">No</item>
-		
-		<!-- Hoteling Event -->
-		<!-- Yes, No -->
-		<item name="account.1.broadsoft.hoteling">No</item>
-
-		<!-- Call Center Status -->
-		<!-- Yes, No -->
-		<item name="account.1.broadsoft.callCenterStatus">No</item>
-
-		<!-- Value-added Service - Broadsoft Settings - SCA -->
-		<!-- Enable SCA (Shared Call Appearance) -->
-		<!-- Yes, No -->
-		<item name="account.1.sca.enable">No</item>
-
-		<!-- Enable BargeIn -->
-		<!-- Yes, No -->
-		<item name="account.1.sca.bargein.enable">No</item>
-		<!-- Auto-filling Pickup Feature Code -->
-		<!-- Yes, No -->
-		<item name="account.1.sca.autoPickup.enable">Yes</item>
-		<!-- Pickup Feature Code -->
-		<item name="account.1.sca.pickupFeatureCode"></item>
-		<!-- Line-seize Timeout -->
-		<!-- Range: 15 - 60. Default: 15 -->
-		<item name="account.1.sip.lineSeizeTimeout">15</item>
 		
 		<!--#############################################-->
 		<!--# 160 MPKs can be configured via MPK APP    #-->
 		<!--#############################################-->
 		<!-- [Note] MPK provision needs reboot to take effect -->
+		{$keyIndex=1}
 		<!-- MPK Key Mode -->
 		<!-- SpeedDial, BLF, SpeedDialViaActiveAccount, DialDTMF, Intercom, Transfer, CallPark, MulticastPaging, Conference, DialPrefix -->
-		<item name="pks.mpk.1.mode">SpeedDial</item>
+		{$key_types=["none"=>"","speed dial"=>"SpeedDial","blf"=>"BLF","speed dial active"=>"SpeedDialViaActiveAccount","dial dtmf"=>"DialDTMF","intercom"=>"Intercom","transfer"=>"Transfer","call park"=>"CallPark","multicast paging"=>"MulticastPaging","conference"=>"Conference"]}
+		{foreach $keys as $category => $rows}
+		{foreach $rows as $row}
+		{if isset($row.device_key_type)}
+		<item name="pks.mpk.{$keyIndex}.mode">{$key_types[$row.device_key_type]}</item>
 		<!-- MPK Account -->
 		<!-- Account1, Account2, ... , Account16 -->
-		<item name="pks.mpk.1.account">Account1</item>
+		<item name="pks.mpk.{$keyIndex}.account">Account{$row.device_key_line}</item>
 		<!-- MPK Display Name -->
-		<item name="pks.mpk.1.description"></item>
+		<item name="pks.mpk.{$keyIndex}.description">{$row.device_key_label}</item>
 		<!-- MPK User ID -->
 		<!-- extendValue may be used based on MPK mode -->
-		<item name="pks.mpk.1.value"></item>
-		<item name="pks.mpk.1.extendValue"></item>
-
-		<item name="pks.mpk.2.mode">SpeedDial</item>
-		<item name="pks.mpk.2.account">Account1</item>
-		<item name="pks.mpk.2.description"></item>
-		<item name="pks.mpk.2.value"></item>
-		<item name="pks.mpk.2.extendValue"></item>
+		<item name="pks.mpk.{$keyIndex}.value">{$row.device_key_value}</item>
+		<item name="pks.mpk.{$keyIndex}.extendValue">device_key_extension</item>
+		{$keyIndex=$keyIndex+1}
+		{/if}
+		{/foreach}
+		{/foreach}
 	</config>
 </gs_provision>

resources/templates/provision/grandstream/gxv3504/{$mac}.xml

@@ -580,7 +580,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/gxw4004/{$mac}.xml

@@ -26,7 +26,7 @@
                 <P237></P237>
                 {elseif isset($grandstream_config_server_path)}
                 <P237>{$grandstream_config_server_path}</P237>
-                {else}
+                {elseif isset($domain_name)}
                 <P237>{$domain_name}{$project_path}/app/provision</P237>
                 {/if}
 

resources/templates/provision/grandstream/gxw4008/{$mac}.xml

@@ -26,7 +26,7 @@
                 <P237></P237>
                 {elseif isset($grandstream_config_server_path)}
                 <P237>{$grandstream_config_server_path}</P237>
-                {else}
+                {elseif isset($domain_name)}
                 <P237>{$domain_name}{$project_path}/app/provision</P237>
                 {/if}
 

resources/templates/provision/grandstream/gxw40xx/{$mac}.xml

@@ -63,7 +63,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     

resources/templates/provision/grandstream/gxw410x/{$mac}.xml

@@ -43,7 +43,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
     

resources/templates/provision/grandstream/gxw42xx/{$mac}.xml

@@ -171,7 +171,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/ht502/{$mac}.xml

@@ -53,7 +53,7 @@
                 <P237></P237>
                 {elseif isset($grandstream_config_server_path)}
                 <P237>{$grandstream_config_server_path}</P237>
-                {else}
+                {elseif isset($domain_name)}
                 <P237>{$domain_name}{$project_path}/app/provision</P237>
                 {/if}
 		

resources/templates/provision/grandstream/ht503/{$mac}.xml

@@ -150,7 +150,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/ht701/{$mac}.xml

@@ -75,7 +75,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/ht702/{$mac}.xml

@@ -86,7 +86,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/ht704/{$mac}.xml

@@ -81,7 +81,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/grandstream/ht802/{$mac}.xml

@@ -105,7 +105,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
 
@@ -1013,13 +1013,13 @@
     <!-- # Mandatory -->
     <P72>1</P72>
 
-<!-- Dial Plan -->
-<!--  String -->
+    <!-- Dial Plan -->
+    <!--  String -->
 	
 {if isset($grandstream_dial_plan) }
-<P4200>{$grandstream_dial_plan}</P4200>
+    <P4200>{$grandstream_dial_plan}</P4200>
 {else}
-<P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
+    <P4200>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4200>
 {/if}
 
     <!-- # SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
@@ -1896,7 +1896,12 @@
 
     <!-- # Dial Plan  -->
     <!-- # String -->
-    <P4201>{ x+ | \+x+ | *x+ | *xx*x+ }</P4201>
+
+{if isset($grandstream_dial_plan) }
+    <P4201>{$grandstream_dial_plan}</P4201>
+{else}
+    <P4201>{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal}</P4201>
+{/if}	  
 
     <!-- # SUBSCRIBE for MWI. 0 - No, 1 - Yes -->
     <!-- # Number: 0, 1 -->

resources/templates/provision/grandstream/ht818/{$mac}.xml

@@ -94,7 +94,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
 

resources/templates/provision/grandstream/htx86/{$mac}.xml

@@ -57,7 +57,7 @@
     <P237></P237>
     {elseif isset($grandstream_config_server_path)}
     <P237>{$grandstream_config_server_path}</P237>
-    {else}
+    {elseif isset($domain_name)}
     <P237>{$domain_name}{$project_path}/app/provision</P237>
     {/if}
 

resources/templates/provision/grandstream/wp820/{$mac}.xml

@@ -2235,7 +2235,7 @@
 <P237></P237>
 {elseif isset($grandstream_config_server_path)}
 <P237>{$grandstream_config_server_path}</P237>
-{else}
+{elseif isset($domain_name)}
 <P237>{$domain_name}{$project_path}/app/provision</P237>
 {/if}
 

resources/templates/provision/yealink/t33g/directory.xml

@@ -0,0 +1,83 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.category == "extensions"}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+{else}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>

resources/templates/provision/yealink/t33g/favorite_setting.xml

@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>

resources/templates/provision/yealink/t33g/y000000000000.boot

@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000124.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}

resources/templates/provision/yealink/t43u/y000000000107.cfg

@@ -39,17 +39,17 @@ static.network.ipv6_prefix =
 ##(X ranges from 1 to 5)
 ##Only T5XW/T54S/T52S/T48G/T48S/T46G/T46S/T42S/T41S/T29G/T27G/T4XU Models support these parameters.
 
-static.wifi.enable =
-static.wifi.1.label =
-static.wifi.1.ssid =
-static.wifi.1.priority =
-static.wifi.1.security_mode =
-static.wifi.1.cipher_type =
-static.wifi.1.password =
-static.wifi.1.eap_type =
-static.wifi.1.eap_user_name =
-static.wifi.1.eap_password =
-static.wifi.show_scan_prompt =
+static.wifi.enable = {$yealink_wifi_enable}
+static.wifi.1.label = {$yealink_wifi_1_label}
+static.wifi.1.ssid = {$yealink_wifi_1_ssid}
+static.wifi.1.priority = {$yealink_wifi_1_priority}
+static.wifi.1.security_mode = {$yealink_wifi_1_security}
+static.wifi.1.cipher_type = {$yealink_wifi_1_cipher}
+static.wifi.1.password = {$yealink_wifi_1_password}
+static.wifi.1.eap_type = {$yealink_wifi_1_type}
+static.wifi.1.eap_user_name = {$yealink_wifi_1_username}
+static.wifi.1.eap_password = {$yealink_wifi_1_password}
+static.wifi.show_scan_prompt = {$yealink_wifi_scan_prompt}
 
 ##V83 Add
 static.wifi.function.enable =
@@ -73,8 +73,6 @@ static.network.wifi.ipv6_static_dns_enable=
 static.network.wifi.ipv6_primary_dns=
 static.network.wifi.ipv6_secondary_dns=
 static.network.wifi.ipv6_icmp_v6.enable=
-
-
 #######################################################################################
 ##                                 Network Internet                                  ##
 #######################################################################################
@@ -136,7 +134,10 @@ static.network.vlan.vlan_change.enable =
 
 static.network.vlan.pc_port_priority = {$yealink_vlan_pc_cos}
 static.network.vlan.pc_port_vid = {$yealink_vlan_pc_id}
-static.network.vlan.pc_port_enable =
+
+{if isset($yealink_vlan_pc_enable)}static.network.vlan.pc_port_enable = {$yealink_vlan_pc_enable}{else}static.network.vlan.pc_port_enable = 0{/if}
+
+#static.network.vlan.pc_port_enable =
 
 static.network.vlan.internet_port_priority = {$yealink_vlan_cos}
 static.network.vlan.internet_port_vid = {$yealink_vlan_id}
@@ -686,7 +687,7 @@ phone_setting.early_media.rtp_sniffer.timeout=
 sip.reg_surge_prevention =
 
 ################################################################
-#    V84 new add 配合sip.escape_characters.enable=使用        ##
+#    V84 new add    sip.escape_characters.enable=             ##
 ################################################################
 sip.reserve_characters=
 

resources/templates/provision/yealink/t43u/{$mac}.cfg

@@ -6,7 +6,7 @@
 #######################################################################################
 ##                                   Transfer                                        ##
 #######################################################################################
-account.1.phone_setting.call_appearance.transfer_via_new_linekey=
+account.1.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
 
 
 #######################################################################################
@@ -574,7 +574,7 @@ bw.virtual_user.1.xsi.user=
 #######################################################################################
 ##                                   Transfer                                        ##
 #######################################################################################
-account.2.phone_setting.call_appearance.transfer_via_new_linekey=
+account.2.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
 
 
 #######################################################################################
@@ -1142,7 +1142,7 @@ account.2.acd.call_information=
 #######################################################################################
 ##                                   Transfer                                        ##
 #######################################################################################
-account.3.phone_setting.call_appearance.transfer_via_new_linekey=
+account.3.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
 
 
 #######################################################################################
@@ -1710,7 +1710,7 @@ account.3.acd.call_information=
 #######################################################################################
 ##                                   Transfer                                        ##
 #######################################################################################
-account.4.phone_setting.call_appearance.transfer_via_new_linekey=
+account.4.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
 
 
 #######################################################################################
@@ -2278,7 +2278,7 @@ account.4.acd.call_information=
 #######################################################################################
 ##                                   Transfer                                        ##
 #######################################################################################
-account.5.phone_setting.call_appearance.transfer_via_new_linekey=
+account.5.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
 
 
 #######################################################################################
@@ -2846,7 +2846,7 @@ account.5.acd.call_information=
 #######################################################################################
 ##                                   Transfer                                        ##
 #######################################################################################
-account.6.phone_setting.call_appearance.transfer_via_new_linekey=
+account.6.phone_setting.call_appearance.transfer_via_new_linekey= {$yealink_transfer_via_new_linekey}
 
 
 #######################################################################################

resources/templates/provision/yealink/t46u/favorite_setting.xml

@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>

resources/templates/provision/yealink/t46u/y000000000000.boot

@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000108.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}

resources/templates/provision/yealink/t53/directory.xml

@@ -0,0 +1,83 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.category == "extensions"}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+{else}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>

resources/templates/provision/yealink/t53/favorite_setting.xml

@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>

resources/templates/provision/yealink/t53/y000000000000.boot

@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000095.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}

resources/templates/provision/yealink/t53w/{$mac}.cfg

@@ -123,7 +123,8 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-account.1.sip_server.1.address= {$account.1.server_address}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+
 account.1.sip_server.1.port= {$account.1.sip_port}
 
 
@@ -199,7 +200,7 @@ account.1.ptime= 20
 account.1.register_line=
 account.1.register_mac=
 account.1.reg_fail_retry_interval=
-account.1.unregister_on_reboot=
+account.1.unregister_on_reboot=1
 
 account.1.session_timer.refresher=
 account.1.session_timer.expires=
@@ -662,7 +663,8 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-account.2.sip_server.1.address= {$account.2.server_address}
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+
 account.2.sip_server.1.port= {$account.2.sip_port}
 
 
@@ -1189,7 +1191,8 @@ account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
 account.3.user_name = {$account.3.user_id}
 {/if}
 
-account.3.sip_server.1.address= {$account.3.server_address}
+{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address} {else} account.3.sip_server.1.address= {$account.3.server_address} {/if}
+
 account.3.sip_server.1.port= {$account.3.sip_port}
 
 
@@ -1716,7 +1719,8 @@ account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
 account.4.user_name = {$account.4.user_id}
 {/if}
 
-account.4.sip_server.1.address= {$account.4.server_address}
+{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address} {else} account.4.sip_server.1.address= {$account.4.server_address} {/if}
+
 account.4.sip_server.1.port= {$account.4.sip_port}
 
 
@@ -2242,7 +2246,8 @@ account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
 account.5.user_name = {$account.5.user_id}
 {/if}
 
-account.5.sip_server.1.address= {$account.5.server_address}
+{if isset($account.5.server.1.address)} account.5.sip_server.1.address= {$account.5.server.1.address} {else} account.5.sip_server.1.address= {$account.5.server_address} {/if}
+
 account.5.sip_server.1.port= {$account.5.sip_port}
 
 
@@ -2782,7 +2787,8 @@ account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
 account.6.user_name = {$account.6.user_id}
 {/if}
 
-account.6.sip_server.1.address= {$account.6.server_address}
+{if isset($account.6.server.1.address)} account.6.sip_server.1.address= {$account.6.server.1.address} {else} account.6.sip_server.1.address= {$account.6.server_address} {/if}
+
 account.6.sip_server.1.port= {$account.6.sip_port}
 
 
@@ -3309,7 +3315,8 @@ account.7.user_name = {$account.7.user_id}@{$account.7.server_address}
 account.7.user_name = {$account.7.user_id}
 {/if}
 
-account.7.sip_server.1.address= {$account.7.server_address}
+{if isset($account.7.server.1.address)} account.7.sip_server.1.address= {$account.7.server.1.address} {else} account.7.sip_server.1.address= {$account.7.server_address} {/if}
+
 account.7.sip_server.1.port= {$account.7.sip_port}
 
 
@@ -3836,7 +3843,8 @@ account.8.user_name = {$account.8.user_id}@{$account.8.server_address}
 account.8.user_name = {$account.8.user_id}
 {/if}
 
-account.8.sip_server.1.address= {$account.8.server_address}
+{if isset($account.8.server.1.address)} account.8.sip_server.1.address= {$account.8.server.1.address} {else} account.8.sip_server.1.address= {$account.8.server_address} {/if}
+
 account.8.sip_server.1.port= {$account.8.sip_port}
 
 
@@ -4363,7 +4371,8 @@ account.9.user_name = {$account.9.user_id}@{$account.9.server_address}
 account.9.user_name = {$account.9.user_id}
 {/if}
 
-account.9.sip_server.1.address= {$account.9.server_address}
+{if isset($account.9.server.1.address)} account.9.sip_server.1.address= {$account.9.server.1.address} {else} account.9.sip_server.1.address= {$account.9.server_address} {/if}
+
 account.9.sip_server.1.port= {$account.9.sip_port}
 
 
@@ -4890,7 +4899,8 @@ account.10.user_name = {$account.10.user_id}@{$account.10.server_address}
 account.10.user_name = {$account.10.user_id}
 {/if}
 
-account.10.sip_server.1.address= {$account.10.server_address}
+{if isset($account.10.server.1.address)} account.10.sip_server.1.address= {$account.10.server.1.address} {else} account.10.sip_server.1.address= {$account.10.server_address} {/if}
+
 account.10.sip_server.1.port= {$account.10.sip_port}
 
 

resources/templates/provision/yealink/t54w/{$mac}.cfg

@@ -123,7 +123,8 @@ account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
 account.1.user_name = {$account.1.user_id}
 {/if}
 
-account.1.sip_server.1.address= {$account.1.server_address}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+
 account.1.sip_server.1.port= {$account.1.sip_port}
 
 
@@ -199,7 +200,7 @@ account.1.ptime= 20
 account.1.register_line=
 account.1.register_mac=
 account.1.reg_fail_retry_interval=
-account.1.unregister_on_reboot=
+account.1.unregister_on_reboot=1
 
 account.1.session_timer.refresher=
 account.1.session_timer.expires=
@@ -662,7 +663,8 @@ account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
 account.2.user_name = {$account.2.user_id}
 {/if}
 
-account.2.sip_server.1.address= {$account.2.server_address}
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+
 account.2.sip_server.1.port= {$account.2.sip_port}
 
 
@@ -738,7 +740,7 @@ account.2.ptime= 20
 account.2.register_line=
 account.2.register_mac=
 account.2.reg_fail_retry_interval=
-account.2.unregister_on_reboot=
+account.2.unregister_on_reboot=1
 
 account.2.session_timer.refresher=
 account.2.session_timer.expires=
@@ -1189,7 +1191,8 @@ account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
 account.3.user_name = {$account.3.user_id}
 {/if}
 
-account.3.sip_server.1.address= {$account.3.server_address}
+{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address} {else} account.3.sip_server.1.address= {$account.3.server_address} {/if}
+
 account.3.sip_server.1.port= {$account.3.sip_port}
 
 
@@ -1716,7 +1719,8 @@ account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
 account.4.user_name = {$account.4.user_id}
 {/if}
 
-account.4.sip_server.1.address= {$account.4.server_address}
+{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address} {else} account.4.sip_server.1.address= {$account.4.server_address} {/if}
+
 account.4.sip_server.1.port= {$account.4.sip_port}
 
 
@@ -2242,7 +2246,8 @@ account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
 account.5.user_name = {$account.5.user_id}
 {/if}
 
-account.5.sip_server.1.address= {$account.5.server_address}
+{if isset($account.5.server.1.address)} account.5.sip_server.1.address= {$account.5.server.1.address} {else} account.5.sip_server.1.address= {$account.5.server_address} {/if}
+
 account.5.sip_server.1.port= {$account.5.sip_port}
 
 
@@ -2782,7 +2787,8 @@ account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
 account.6.user_name = {$account.6.user_id}
 {/if}
 
-account.6.sip_server.1.address= {$account.6.server_address}
+{if isset($account.6.server.1.address)} account.6.sip_server.1.address= {$account.6.server.1.address} {else} account.6.sip_server.1.address= {$account.6.server_address} {/if}
+
 account.6.sip_server.1.port= {$account.6.sip_port}
 
 
@@ -3309,7 +3315,8 @@ account.7.user_name = {$account.7.user_id}@{$account.7.server_address}
 account.7.user_name = {$account.7.user_id}
 {/if}
 
-account.7.sip_server.1.address= {$account.7.server_address}
+{if isset($account.7.server.1.address)} account.7.sip_server.1.address= {$account.7.server.1.address} {else} account.7.sip_server.1.address= {$account.7.server_address} {/if}
+
 account.7.sip_server.1.port= {$account.7.sip_port}
 
 
@@ -3836,7 +3843,8 @@ account.8.user_name = {$account.8.user_id}@{$account.8.server_address}
 account.8.user_name = {$account.8.user_id}
 {/if}
 
-account.8.sip_server.1.address= {$account.8.server_address}
+{if isset($account.8.server.1.address)} account.8.sip_server.1.address= {$account.8.server.1.address} {else} account.8.sip_server.1.address= {$account.8.server_address} {/if}
+
 account.8.sip_server.1.port= {$account.8.sip_port}
 
 
@@ -4363,7 +4371,8 @@ account.9.user_name = {$account.9.user_id}@{$account.9.server_address}
 account.9.user_name = {$account.9.user_id}
 {/if}
 
-account.9.sip_server.1.address= {$account.9.server_address}
+{if isset($account.9.server.1.address)} account.9.sip_server.1.address= {$account.9.server.1.address} {else} account.9.sip_server.1.address= {$account.9.server_address} {/if}
+
 account.9.sip_server.1.port= {$account.9.sip_port}
 
 
@@ -4890,7 +4899,8 @@ account.10.user_name = {$account.10.user_id}@{$account.10.server_address}
 account.10.user_name = {$account.10.user_id}
 {/if}
 
-account.10.sip_server.1.address= {$account.10.server_address}
+{if isset($account.10.server.1.address)} account.10.sip_server.1.address= {$account.10.server.1.address} {else} account.10.sip_server.1.address= {$account.10.server_address} {/if}
+
 account.10.sip_server.1.port= {$account.10.sip_port}
 
 

resources/templates/provision/yealink/t58a/directory.xml

@@ -0,0 +1,83 @@
+<YealinkIPPhoneDirectory>
+{foreach $contacts as $row}
+{if $smarty.get.contacts == "users" && $row.category == "users"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "groups" && $row.category == "groups"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "extensions" && $row.category == "extensions"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+</DirectoryEntry>
+{elseif $smarty.get.contacts == "all"}
+<DirectoryEntry>
+{if $row.contact_name_given != ""}
+{if $row.contact_organization != ""}
+	<Name>{$row.contact_organization} {$row.contact_name_given} {$row.contact_name_family}</Name>
+{else}
+	<Name>{$row.contact_name_given} {$row.contact_name_family}</Name>
+{/if}
+{else}
+	<Name>{$row.effective_caller_id_name}</Name>
+{/if}
+{if $row.category == "extensions"}
+{if $row.phone_number != ""}
+	<Telephone>{$row.phone_number}</Telephone>
+{else}
+	<Telephone>{$row.phone_extension}</Telephone>
+{/if}
+{else}
+{foreach $row.numbers as $number}
+{if $number.phone_number != ""}
+	<Telephone>{$number.phone_number}</Telephone>
+{else}		
+	<Telephone>{$number.phone_extension}</Telephone>
+{/if}
+{/foreach}
+{/if}
+</DirectoryEntry>
+{/if}
+{/foreach}
+</YealinkIPPhoneDirectory>

resources/templates/provision/yealink/t58a/favorite_setting.xml

@@ -0,0 +1,8 @@
+<root_favorite_set>
+<item id_name="localdirectory" display_name="Local Directory" priority="2" enable="0" />
+<item id_name="history" display_name="History" priority="3" enable="1" />
+<item id_name="networkcalllog" display_name="Network CallLog" priority="4" enable="0" />
+<item id_name="remotedirectory" display_name="Remote Phone Book" priority="5" enable="1" />
+<item id_name="ldap" display_name="LDAP" priority="1" enable="0" />
+<item id_name="networkdirectory" display_name="Network Directory" priority="6" enable="0" />
+</root_favorite_set>

resources/templates/provision/yealink/t58a/y000000000000.boot

@@ -0,0 +1,7 @@
+#!version:1.0.0.1
+## The header above must appear as-is in the first line
+
+include:config "y000000000058.cfg"
+include:config "{$mac}.cfg"
+
+overwrite_mode = {$yealink_overwrite_mode}

resources/templates/provision/yealink/w60b/y000000000077.cfg

@@ -338,6 +338,7 @@ firmware.url = {$yealink_firmware_url}/{$yealink_firmware_w60b}
 #######################################################################################
 
 over_the_air.url = {$yealink_firmware_url}/{$yealink_w56h_handset_firmware_url}
+over_the_air.url.w59r = {$yealink_firmware_url}/{$yealink_w59r_handset_firmware_url}
 over_the_air.base_trigger = 1
 over_the_air.handset_tip = 1
 

resources/templates/provision/yealink/w60b/{$mac}.cfg

@@ -12,10 +12,17 @@ account.1.enable = {if isset($account.1.password)}1{else}0{/if}{""}
 
 account.1.label = {$account.1.display_name}
 account.1.display_name = {$account.1.display_name}
+
+{if isset($account.1.server.1.address)}
+account.1.user_name = {$account.1.user_id}@{$account.1.server_address}
+{else}
 account.1.user_name = {$account.1.user_id}
+{/if}
+{if isset($account.1.server.1.address)} account.1.sip_server.1.address= {$account.1.server.1.address} {else} account.1.sip_server.1.address= {$account.1.server_address} {/if}
+
 account.1.auth_name = {$account.1.user_id}
 account.1.password = {$account.1.password}
-account.1.sip_server_host = {$account.1.server_address}
+
 account.1.sip_server_port = {$account.1.sip_port}
 account.1.transport = {if $account.1.sip_transport == 'udp'}0{/if}{if $account.1.sip_transport == 'tcp'}1{/if}{if $account.1.sip_transport == 'tls'}2{/if}{if $account.1.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -284,6 +291,8 @@ account.1.dnd.enable =
 
 account.1.sip_trust_ctrl = 1
 
+voice_mail.number.1 = {$voicemail_number}
+
 #######################################################################################
 ##                                   Account 2 Settings                              ##
 #######################################################################################
@@ -293,10 +302,18 @@ account.2.enable = {if isset($account.2.password) }1{else}0{/if}{""}
 
 account.2.label = {$account.2.display_name}
 account.2.display_name = {$account.2.display_name}
+
+{if isset($account.2.server.1.address)}
+account.2.user_name = {$account.2.user_id}@{$account.2.server_address}
+{else}
 account.2.user_name = {$account.2.user_id}
+{/if}
+
 account.2.auth_name = {$account.2.user_id}
 account.2.password = {$account.2.password}
-account.2.sip_server_host = {$account.2.server_address}
+
+{if isset($account.2.server.1.address)} account.2.sip_server.1.address= {$account.2.server.1.address} {else} account.2.sip_server.1.address= {$account.2.server_address} {/if}
+
 account.2.sip_server_port = {$account.2.sip_port}
 account.2.transport = {if $account.2.sip_transport == 'udp'}0{/if}{if $account.2.sip_transport == 'tcp'}1{/if}{if $account.2.sip_transport == 'tls'}2{/if}{if $account.2.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -520,6 +537,8 @@ account.2.dnd.enable =
 
 account.2.sip_trust_ctrl = 1
 
+voice_mail.number.2 = {$voicemail_number}
+
 #######################################################################################
 ##                                   Account 3 Settings                              ##
 #######################################################################################
@@ -529,10 +548,18 @@ account.3.enable = {if isset($account.3.password) }1{else}0{/if}{""}
 
 account.3.label = {$account.3.display_name}
 account.3.display_name = {$account.3.display_name}
+
+{if isset($account.3.server.1.address)}
+account.3.user_name = {$account.3.user_id}@{$account.3.server_address}
+{else}
 account.3.user_name = {$account.3.user_id}
+{/if}
+
 account.3.auth_name = {$account.3.user_id}
 account.3.password = {$account.3.password}
-account.3.sip_server_host = {$account.3.server_address}
+
+{if isset($account.3.server.1.address)} account.3.sip_server.1.address= {$account.3.server.1.address} {else} account.3.sip_server.1.address= {$account.3.server_address} {/if}
+
 account.3.sip_server_port = {$account.3.sip_port}
 account.3.transport = {if $account.3.sip_transport == 'udp'}0{/if}{if $account.3.sip_transport == 'tcp'}1{/if}{if $account.3.sip_transport == 'tls'}2{/if}{if $account.3.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -756,6 +783,8 @@ account.3.dnd.enable =
 
 account.3.sip_trust_ctrl = 1
 
+voice_mail.number.3 = {$voicemail_number}
+
 #######################################################################################
 ##                                   Account 4 Settings                              ##
 #######################################################################################
@@ -765,10 +794,18 @@ account.4.enable = {if isset($account.4.password) }1{else}0{/if}{""}
 
 account.4.label = {$account.4.display_name}
 account.4.display_name = {$account.4.display_name}
+
+{if isset($account.4.server.1.address)}
+account.4.user_name = {$account.4.user_id}@{$account.4.server_address}
+{else}
 account.4.user_name = {$account.4.user_id}
+{/if}
+
 account.4.auth_name = {$account.4.user_id}
 account.4.password = {$account.4.password}
-account.4.sip_server_host = {$account.4.server_address}
+
+{if isset($account.4.server.1.address)} account.4.sip_server.1.address= {$account.4.server.1.address} {else} account.4.sip_server.1.address= {$account.4.server_address} {/if}
+
 account.4.sip_server_port = {$account.4.sip_port}
 account.4.transport = {if $account.4.sip_transport == 'udp'}0{/if}{if $account.4.sip_transport == 'tcp'}1{/if}{if $account.4.sip_transport == 'tls'}2{/if}{if $account.4.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -992,6 +1029,8 @@ account.4.dnd.enable =
 
 account.4.sip_trust_ctrl = 1
 
+voice_mail.number.4 = {$voicemail_number}
+
 #######################################################################################
 ##                                   Account 5 Settings                              ##
 #######################################################################################
@@ -1001,10 +1040,18 @@ account.5.enable = {if isset($account.5.password) }1{else}0{/if}{""}
 
 account.5.label = {$account.5.display_name}
 account.5.display_name = {$account.5.display_name}
+
+{if isset($account.5.server.1.address)}
+account.5.user_name = {$account.5.user_id}@{$account.5.server_address}
+{else}
 account.5.user_name = {$account.5.user_id}
+{/if}
+
 account.5.auth_name = {$account.5.user_id}
 account.5.password = {$account.5.password}
-account.5.sip_server_host = {$account.5.server_address}
+
+{if isset($account.5.server.1.address)} account.5.sip_server.1.address= {$account.5.server.1.address} {else} account.5.sip_server.1.address= {$account.5.server_address} {/if}
+
 account.5.sip_server_port = {$account.5.sip_port}
 account.5.transport = {if $account.5.sip_transport == 'udp'}0{/if}{if $account.5.sip_transport == 'tcp'}1{/if}{if $account.5.sip_transport == 'tls'}2{/if}{if $account.5.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -1228,7 +1275,7 @@ account.5.dnd.enable =
 
 account.5.sip_trust_ctrl = 1
 
-voice_mail.number.1 = {$voicemail_number}
+voice_mail.number.5 = {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -1258,10 +1305,18 @@ account.6.enable = {if isset($account.6.password) }1{else}0{/if}{""}
 
 account.6.label = {$account.6.display_name}
 account.6.display_name = {$account.6.display_name}
+
+{if isset($account.6.server.1.address)}
+account.6.user_name = {$account.6.user_id}@{$account.6.server_address}
+{else}
 account.6.user_name = {$account.6.user_id}
+{/if}
+
 account.6.auth_name = {$account.6.user_id}
 account.6.password = {$account.6.password}
-account.6.sip_server_host = {$account.6.server_address}
+
+{if isset($account.6.server.1.address)} account.6.sip_server.1.address= {$account.6.server.1.address} {else} account.6.sip_server.1.address= {$account.6.server_address} {/if}
+
 account.6.sip_server_port = {$account.6.sip_port}
 account.6.transport = {if $account.6.sip_transport == 'udp'}0{/if}{if $account.6.sip_transport == 'tcp'}1{/if}{if $account.6.sip_transport == 'tls'}2{/if}{if $account.6.sip_transport == 'dns srv'}3{/if}{""}
 a
@@ -1485,7 +1540,7 @@ account.6.dnd.enable =
 
 account.6.sip_trust_ctrl = 1
 
-voice_mail.number.1 = {$voicemail_number}
+voice_mail.number.6 = {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -1515,10 +1570,18 @@ account.7.enable = {if isset($account.7.user_password) }1{else}0{/if}{""}
 
 account.7.label = {$account.7.display_name}
 account.7.display_name = {$account.7.display_name}
+
+{if isset($account.7.server.1.address)}
+account.7.user_name = {$account.7.user_id}@{$account.7.server_address}
+{else}
 account.7.user_name = {$account.7.user_id}
+{/if}
+
 account.7.auth_name = {$account.7.user_id}
 account.7.password = {$account.7.user_password}
-account.7.sip_server_host = {$account.7.server_address}
+
+{if isset($account.7.server.1.address)} account.7.sip_server.1.address= {$account.7.server.1.address} {else} account.7.sip_server.1.address= {$account.7.server_address} {/if}
+
 account.7.sip_server_port = {$account.7.sip_port}
 account.7.transport = {if $account.7.sip_transport == 'udp'}0{/if}{if $account.7.sip_transport == 'tcp'}1{/if}{if $account.7.sip_transport == 'tls'}2{/if}{if $account.7.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -1742,7 +1805,7 @@ account.7.dnd.enable =
 
 account.7.sip_trust_ctrl = 1
 
-voice_mail.number.1 = {$voicemail_number}
+voice_mail.number.7= {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -1772,10 +1835,18 @@ account.8.enable = {if isset($account.8.user_password) }1{else}0{/if}{""}
 
 account.8.label = {$account.8.display_name}
 account.8.display_name = {$account.8.display_name}
+
+{if isset($account.8.server.1.address)}
+account.8.user_name = {$account.8.user_id}@{$account.8.server_address}
+{else}
 account.8.user_name = {$account.8.user_id}
+{/if}
+
 account.8.auth_name = {$account.8.user_id}
 account.8.password = {$account.8.user_password}
-account.8.sip_server_host = {$account.8.server_address}
+
+{if isset($account.8.server.1.address)} account.8.sip_server.1.address= {$account.8.server.1.address} {else} account.8.sip_server.1.address= {$account.8.server_address} {/if}
+
 account.8.sip_server_port = {$account.8.sip_port}
 account.8.transport = {if $account.8.sip_transport == 'udp'}0{/if}{if $account.8.sip_transport == 'tcp'}1{/if}{if $account.8.sip_transport == 'tls'}2{/if}{if $account.8.sip_transport == 'dns srv'}3{/if}{""}
 
@@ -1999,7 +2070,7 @@ account.8.dnd.enable =
 
 account.8.sip_trust_ctrl = 1
 
-voice_mail.number.1 = {$voicemail_number}
+voice_mail.number.8 = {$voicemail_number}
 
 #######################################################################################
 ##                                   Network                                         ##
@@ -2019,3 +2090,16 @@ network.internet_port.gateway =
 {if isset($dns_server_secondary)}network.secondary_dns = {$dns_server_secondary}{/if}{""}
 
 {if isset($dns_server_primary)}network.static_dns_enable = 1{else}network.static_dns_enable = 0{/if}{""}
+
+
+#######################################################################################
+##                                   SCA                                             ##       
+#######################################################################################
+account.1.shared_line= {$shared_line_1}
+account.2.shared_line= {$shared_line_2}
+account.3.shared_line= {$shared_line_3}
+account.4.shared_line= {$shared_line_4}
+account.5.shared_line= {$shared_line_5}
+account.6.shared_line= {$shared_line_6}
+account.7.shared_line= {$shared_line_7}
+account.8.shared_line= {$shared_line_8}