From c7434ddfa9f36ab45966152639f3b418c655a22c Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Sun, 20 Jul 2014 04:53:53 +0000 Subject: [PATCH] Update the Cisco SPA phone templates --- .../provision/cisco/spa301/{$mac}.xml | 92 ++--- .../provision/cisco/spa303/{$mac}.xml | 104 ++---- .../provision/cisco/spa501g/{$mac}.xml | 338 ++++++++---------- .../provision/cisco/spa502g/{$mac}.xml | 194 ++++------ .../provision/cisco/spa504g/{$mac}.xml | 1 + .../provision/cisco/spa508g/{$mac}.xml | 96 ++--- .../provision/cisco/spa509g/{$mac}.xml | 307 +++++++--------- .../provision/cisco/spa512g/{$mac}.xml | 81 +---- .../provision/cisco/spa514g/{$mac}.xml | 87 +---- .../provision/cisco/spa525g/{$mac}.xml | 105 ++---- 10 files changed, 500 insertions(+), 905 deletions(-) diff --git a/resources/templates/provision/cisco/spa301/{$mac}.xml b/resources/templates/provision/cisco/spa301/{$mac}.xml index 2ed867be9b..8ae1d52255 100644 --- a/resources/templates/provision/cisco/spa301/{$mac}.xml +++ b/resources/templates/provision/cisco/spa301/{$mac}.xml @@ -1,6 +1,6 @@ - + Yes @@ -12,15 +12,15 @@ Yes No No - + DHCP - + - + @@ -36,17 +36,17 @@ Yes - + No Yes Yes 3 1 - + - + 70 5 @@ -77,7 +77,7 @@ No No No - + .5 4 @@ -99,7 +99,7 @@ 10 7200 10 - + @@ -107,7 +107,7 @@ - + 16384 16538 @@ -117,7 +117,7 @@ No No No - + 101 @@ -140,7 +140,7 @@ G729ab G722 encaprtp - + No No @@ -155,7 +155,7 @@ 15 No - + No 224.168.168.168:6061 @@ -163,7 +163,7 @@ none Yes - + Yes Yes @@ -189,7 +189,7 @@ $PN $MAC -- Resync failed: $ERR Yes - + Yes 3600 @@ -199,10 +199,10 @@ $PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR $PN $MAC -- Upgrade failed: $ERR - + - + @@ -220,7 +220,7 @@ - + 350@-19,440@-19;10(*/0/1+2) 420@-16;10(*/0/1) @@ -242,7 +242,7 @@ 397@-19,507@-19;15(0/2/0,.2/.1/1,.1/2.1/2) 600@-16;.3(.05/0.05/1) 600@-19;.2(.05/0.05/1) - + 60(2/4) 60(.3/.2,1/.2,.3/4) @@ -253,7 +253,7 @@ 60(4.5/4) 60(0.25/9.75) 60(.4/.2,.4/2) - + 255 1800 @@ -261,7 +261,7 @@ .5 10 3 - + *69 *98 @@ -295,11 +295,11 @@ *03 - + - + *017110 *027110 @@ -317,7 +317,7 @@ *0272640 *01729 *02729 - + @@ -330,7 +330,7 @@ .1 12dB en-US - + {$display_name_1} {$display_name_1} @@ -338,6 +338,7 @@ {foreach $keys as $row} {if $row.device_key_category == "line"} +{if $row.device_key_type == "line"} {$row.device_key_value} {$row.device_key_label} @@ -349,9 +350,10 @@ private {$row.device_key_value} {/if} +{/if} {/foreach} - + Yes Yes @@ -367,7 +369,7 @@ Yes Yes No - + n=Classic-1;w=3;c=1 n=Classic-2;w=3;c=2 @@ -381,36 +383,36 @@ n=Office;w=4;c=1 n=Pulse;w=5;c=1 n=Du-dut;w=6;c=1 - + 0 0 - + - + Trusted - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -418,9 +420,9 @@ 6 high up and down - + -{$sip_transport_1} +{$sip_transport_1|upper} {$sip_port_1} No @@ -439,7 +441,7 @@ none No - + No @@ -460,7 +462,7 @@ Yes No No - + {$server_address_1} @@ -477,7 +479,7 @@ 3600 Normal No - + {$display_name_1} {$user_id_1} @@ -489,7 +491,7 @@ - + G711u No @@ -509,20 +511,20 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes 20 - + @@ -532,7 +534,7 @@ - + Yes No @@ -546,7 +548,7 @@ media Yes Yes - + 8 10 diff --git a/resources/templates/provision/cisco/spa303/{$mac}.xml b/resources/templates/provision/cisco/spa303/{$mac}.xml index 8b901b90c3..38908670e3 100644 --- a/resources/templates/provision/cisco/spa303/{$mac}.xml +++ b/resources/templates/provision/cisco/spa303/{$mac}.xml @@ -246,7 +246,7 @@ up and down -{$sip_transport_1} +{$sip_transport_1|upper} {$sip_port_1} No @@ -358,7 +358,7 @@ up and down -{$sip_transport_2} +{$sip_transport_2|upper} {$sip_port_2} No @@ -470,7 +470,7 @@ up and down -{$sip_transport_3} +{$sip_transport_3|upper} {$sip_port_3} No @@ -582,7 +582,7 @@ up and down -{$sip_transport_4} +{$sip_transport_4|upper} {$sip_port_4} No @@ -694,7 +694,7 @@ up and down -{$sip_transport_5} +{$sip_transport_5|upper} {$sip_port_5} No @@ -806,7 +806,7 @@ up and down -{$sip_transport_6} +{$sip_transport_6|upper} {$sip_port_6} No @@ -918,7 +918,7 @@ up and down -{$sip_transport_7} +{$sip_transport_7|upper} {$sip_port_7} No @@ -1030,7 +1030,7 @@ up and down -{$sip_transport_8} +{$sip_transport_8|upper} {$sip_port_8} No @@ -1142,7 +1142,7 @@ up and down -{$sip_transport_9} +{$sip_transport_9|upper} {$sip_port_9} No @@ -1254,7 +1254,7 @@ up and down -{$sip_transport_10} +{$sip_transport_10|upper} {$sip_port_10} No @@ -1366,7 +1366,7 @@ up and down -{$sip_transport_11} +{$sip_transport_11|upper} {$sip_port_11} No @@ -1478,7 +1478,7 @@ up and down -{$sip_transport_12} +{$sip_transport_12|upper} {$sip_port_12} No @@ -1640,6 +1640,7 @@ {foreach $keys as $row} {if $row.device_key_category == "line"} +{if $row.device_key_type == "line"} {$row.device_key_value} {$row.device_key_label} @@ -1651,6 +1652,7 @@ private {$row.device_key_value} {/if} +{/if} {/foreach} @@ -1933,73 +1935,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +{foreach $keys as $row} +{if $row.device_key_category == "expansion"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-1"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-2"} +{$row.device_key_value} +{/if} +{/foreach} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - No \ No newline at end of file diff --git a/resources/templates/provision/cisco/spa501g/{$mac}.xml b/resources/templates/provision/cisco/spa501g/{$mac}.xml index ec5e666e14..3d6db05ad3 100644 --- a/resources/templates/provision/cisco/spa501g/{$mac}.xml +++ b/resources/templates/provision/cisco/spa501g/{$mac}.xml @@ -1,6 +1,6 @@ - + Yes @@ -12,18 +12,18 @@ Yes No No - + Normal - + DHCP - + - + @@ -39,7 +39,7 @@ Yes - + No Yes @@ -49,10 +49,10 @@ No Limit No 1 - + - + 70 5 @@ -83,7 +83,7 @@ No No No - + .5 4 @@ -105,7 +105,7 @@ 10 7200 10 - + @@ -113,7 +113,7 @@ - + 16384 16538 @@ -123,7 +123,7 @@ No No No - + 101 @@ -146,7 +146,7 @@ G729ab G722 encaprtp - + No No @@ -167,7 +167,7 @@ none Yes - + Yes Yes @@ -193,7 +193,7 @@ $PN $MAC -- Resync failed: $ERR Yes - + Yes 3600 @@ -203,10 +203,10 @@ $PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR $PN $MAC -- Upgrade failed: $ERR - + - + @@ -224,7 +224,7 @@ - + 350@-19,440@-19;10(*/0/1+2) 420@-16;10(*/0/1) @@ -247,7 +247,7 @@ 600@-16;.3(.05/0.05/1) 600@-19;.2(.05/0.05/1) 440@-10;30(.3/9.7/1) - + 60(2/4) 60(.3/.2,1/.2,.3/4) @@ -258,7 +258,7 @@ 60(4.5/4) 60(0.25/9.75) 60(.4/.2,.4/2) - + 255 1800 @@ -266,7 +266,7 @@ .5 10 3 - + *69 *98 @@ -300,11 +300,11 @@ *03 - + - + *017110 *027110 @@ -322,7 +322,7 @@ *0272640 *01729 *02729 - + @@ -335,14 +335,15 @@ .1 12dB en-US - + {$display_name_1} {$display_name_1} *97 - + {foreach $keys as $row} {if $row.device_key_category == "line"} +{if $row.device_key_type == "line"} {$row.device_key_value} {$row.device_key_label} @@ -354,15 +355,16 @@ private {$row.device_key_value} {/if} +{/if} {/foreach} - + Vertical First No No Per Line - + @@ -383,7 +385,7 @@ - + Yes Yes @@ -399,7 +401,7 @@ Yes Yes No - + n=Classic-1;w=3;c=1 n=Classic-2;w=3;c=2 @@ -413,7 +415,7 @@ n=Office;w=4;c=1 n=Pulse;w=5;c=1 n=Du-dut;w=6;c=1 - + 0 0 @@ -421,32 +423,32 @@ 0 0 0 - + - + Trusted - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -454,9 +456,9 @@ 6 high up and down - + -{$sip_transport_1} +{$sip_transport_1|upper} {$sip_port_1} No @@ -475,7 +477,7 @@ none No - + No @@ -496,7 +498,7 @@ Yes No No - + {$server_address_1} @@ -513,7 +515,7 @@ 3600 Normal No - + {$display_name_1} {$user_id_1} @@ -525,7 +527,7 @@ - + G711u No @@ -545,29 +547,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -575,9 +577,9 @@ 6 high up and down - + -{$sip_transport_2} +{$sip_transport_2|upper} {$sip_transport_2} No @@ -596,7 +598,7 @@ none No - + No @@ -617,7 +619,7 @@ Yes No No - + {$server_address_2} @@ -634,7 +636,7 @@ 3600 Normal No - + {$display_name_2} {$user_id_2} @@ -646,7 +648,7 @@ - + G711u No @@ -666,29 +668,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -696,9 +698,9 @@ 6 high up and down - + -{$sip_transport_3} +{$sip_transport_3|upper} {$sip_port_3} No @@ -717,7 +719,7 @@ none No - + No @@ -738,7 +740,7 @@ Yes No No - + {$server_address_3} @@ -755,7 +757,7 @@ 3600 Normal No - + {$display_name_3} {$user_id_3} @@ -767,7 +769,7 @@ - + G711u No @@ -787,29 +789,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -817,9 +819,9 @@ 6 high up and down - + -{$sip_transport_4} +{$sip_transport_4|upper} {$sip_port_4} No @@ -838,7 +840,7 @@ none No - + No @@ -859,7 +861,7 @@ Yes No No - + {$server_address_4} @@ -876,7 +878,7 @@ 3600 Normal No - + {$display_name_4} {$user_id_4} @@ -888,7 +890,7 @@ - + G711u No @@ -908,29 +910,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -938,9 +940,9 @@ 6 high up and down - + -{$sip_transport_5} +{$sip_transport_5|upper} {$sip_port_5} No @@ -959,7 +961,7 @@ none No - + No @@ -980,7 +982,7 @@ Yes No No - + {$server_address_5} @@ -997,7 +999,7 @@ 3600 Normal No - + {$display_name_5} {$user_id_5} @@ -1009,7 +1011,7 @@ - + G711u No @@ -1029,29 +1031,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -1059,9 +1061,9 @@ 6 high up and down - + -{$sip_transport_6} +{$sip_transport_6|upper} {$sip_port_6} No @@ -1080,7 +1082,7 @@ none No - + No @@ -1101,7 +1103,7 @@ Yes No No - + {$server_address_6} @@ -1118,7 +1120,7 @@ 3600 Normal No - + {$display_name_6} {$user_id_6} @@ -1130,7 +1132,7 @@ - + G711u No @@ -1150,29 +1152,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -1180,9 +1182,9 @@ 6 high up and down - + -{$sip_transport_7} +{$sip_transport_7|upper} {$sip_port_7} No @@ -1201,7 +1203,7 @@ none No - + No @@ -1222,7 +1224,7 @@ Yes No No - + {$server_address_7} @@ -1239,7 +1241,7 @@ 3600 Normal No - + {$display_name_7} {$user_id_7} @@ -1251,7 +1253,7 @@ - + G711u No @@ -1271,29 +1273,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -1301,9 +1303,9 @@ 6 high up and down - + -{$sip_transport_8} +{$sip_transport_8|upper} {$sip_port_8} No @@ -1322,7 +1324,7 @@ none No - + No @@ -1343,7 +1345,7 @@ Yes No No - + {$server_address_8} @@ -1360,7 +1362,7 @@ 3600 Normal No - + {$display_name_8} {$user_id_8} @@ -1372,7 +1374,7 @@ - + G711u No @@ -1392,20 +1394,20 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes 20 - + @@ -1415,7 +1417,7 @@ - + Yes No @@ -1438,7 +1440,7 @@ Yes Yes Yes - + 8 8 @@ -1447,7 +1449,7 @@ Auto Default Yes - + 1800 30 @@ -1463,7 +1465,7 @@ No 10 7 - + @@ -1476,72 +1478,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +{foreach $keys as $row} +{if $row.device_key_category == "expansion"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-1"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-2"} +{$row.device_key_value} +{/if} +{/foreach} + \ No newline at end of file diff --git a/resources/templates/provision/cisco/spa502g/{$mac}.xml b/resources/templates/provision/cisco/spa502g/{$mac}.xml index 65a233e2ad..85570a7d52 100644 --- a/resources/templates/provision/cisco/spa502g/{$mac}.xml +++ b/resources/templates/provision/cisco/spa502g/{$mac}.xml @@ -1,6 +1,6 @@ - + Yes @@ -12,18 +12,18 @@ Yes No No - + Normal - + DHCP - + - + @@ -39,7 +39,7 @@ Yes - + No Yes @@ -49,10 +49,10 @@ No Limit No 1 - + - + 70 5 @@ -83,7 +83,7 @@ No No No - + .5 4 @@ -105,7 +105,7 @@ 10 7200 10 - + @@ -113,7 +113,7 @@ - + 16384 16538 @@ -123,7 +123,7 @@ No No No - + 101 @@ -146,7 +146,7 @@ G729ab G722 encaprtp - + No No @@ -161,7 +161,7 @@ 15 No - + No 224.168.168.168:6061 @@ -169,7 +169,7 @@ none Yes - + Yes Yes @@ -195,7 +195,7 @@ $PN $MAC -- Resync failed: $ERR Yes - + Yes 3600 @@ -205,10 +205,10 @@ $PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR $PN $MAC -- Upgrade failed: $ERR - + - + @@ -226,7 +226,7 @@ - + 350@-19,440@-19;10(*/0/1+2) 420@-16;10(*/0/1) @@ -249,7 +249,7 @@ 600@-16;.3(.05/0.05/1) 600@-19;.2(.05/0.05/1) 440@-10;30(.3/9.7/1) - + 60(2/4) 60(.3/.2,1/.2,.3/4) @@ -260,7 +260,7 @@ 60(4.5/4) 60(0.25/9.75) 60(.4/.2,.4/2) - + 255 1800 @@ -268,7 +268,7 @@ .5 10 3 - + *69 *98 @@ -304,11 +304,11 @@ *03 - + - + *017110 *027110 @@ -326,7 +326,7 @@ *0272640 *01729 *02729 - + @@ -342,7 +342,7 @@ ISO-8859-1 en-US - + {$display_name_1} {$display_name_1} @@ -355,9 +355,10 @@ No 300 Background Picture - + {foreach $keys as $row} {if $row.device_key_category == "line"} +{if $row.device_key_type == "line"} {$row.device_key_value} {$row.device_key_label} @@ -369,13 +370,14 @@ private {$row.device_key_value} {/if} +{/if} {/foreach} - + 2 Scrollable - + Yes Yes @@ -395,7 +397,7 @@ Yes 1 No - + n=Classic-1;w=3;c=1 n=Classic-2;w=3;c=2 @@ -409,7 +411,7 @@ n=Office;w=4;c=1 n=Pulse;w=5;c=1 n=Du-dut;w=6;c=1 - + 0 0 @@ -417,11 +419,11 @@ 0 0 0 - + - + No @@ -429,7 +431,7 @@ Enterprise - + No @@ -447,7 +449,7 @@ - + @@ -456,11 +458,11 @@ Trusted - + No - + No em_login|1;acd_login|1;acd_logout|1;astate|2;avail|3;unavail|3;redial|5;dir|6;cfwd|7;dnd|8;lcr|9;pickup|10;gpickup|11;unpark|12;em_logout @@ -493,23 +495,23 @@ - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -517,9 +519,9 @@ 6 high up and down - + -{$sip_transport_1} +{$sip_transport_1|upper} {$sip_port_1} No @@ -538,7 +540,7 @@ none No - + No @@ -559,7 +561,7 @@ Yes No No - + {$server_address_1} @@ -576,7 +578,7 @@ 3600 Normal No - + {$display_name_1} {$user_id_1} @@ -588,7 +590,7 @@ - + G711u No @@ -608,20 +610,20 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes 20 - + @@ -631,7 +633,7 @@ - + Yes No @@ -654,7 +656,7 @@ No Yes Yes - + 8 8 @@ -663,11 +665,11 @@ Auto Default Yes - + 8 10 s - + 1800 30 @@ -683,7 +685,7 @@ No 10 7 - + @@ -696,72 +698,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +{foreach $keys as $row} +{if $row.device_key_category == "expansion"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-1"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-2"} +{$row.device_key_value} +{/if} +{/foreach} + \ No newline at end of file diff --git a/resources/templates/provision/cisco/spa504g/{$mac}.xml b/resources/templates/provision/cisco/spa504g/{$mac}.xml index 5bef8cd5ca..67a537213d 100644 --- a/resources/templates/provision/cisco/spa504g/{$mac}.xml +++ b/resources/templates/provision/cisco/spa504g/{$mac}.xml @@ -191,6 +191,7 @@ {$row.device_key_value} {/if} {/if} + {/foreach} Vertical First diff --git a/resources/templates/provision/cisco/spa508g/{$mac}.xml b/resources/templates/provision/cisco/spa508g/{$mac}.xml index 862b6d8c04..0403c4d9c7 100644 --- a/resources/templates/provision/cisco/spa508g/{$mac}.xml +++ b/resources/templates/provision/cisco/spa508g/{$mac}.xml @@ -357,6 +357,7 @@ {foreach $keys as $row} {if $row.device_key_category == "line"} +{if $row.device_key_type == "line"} {$row.device_key_value} {$row.device_key_label} @@ -368,6 +369,7 @@ private {$row.device_key_value} {/if} +{/if} {/foreach} @@ -543,7 +545,7 @@ up and down -{$sip_transport_1} +{$sip_transport_1|upper} {$sip_port_1} No @@ -664,7 +666,7 @@ up and down -{$sip_transport_2} +{$sip_transport_2|upper} {$sip_port_2} No @@ -785,7 +787,7 @@ up and down -{$sip_transport_3} +{$sip_transport_3|upper} {$sip_port_3} No @@ -905,7 +907,7 @@ up and down -{$sip_transport_4} +{$sip_transport_4|upper} {$sip_port_4} No @@ -1026,7 +1028,7 @@ up and down -{$sip_transport_5} +{$sip_transport_5|upper} {$sip_port_5} No @@ -1147,7 +1149,7 @@ up and down -{$sip_transport_6} +{$sip_transport_6|upper} {$sip_port_6} No @@ -1268,7 +1270,7 @@ up and down -{$sip_transport_7} +{$sip_transport_7|upper} {$sip_port_7} No @@ -1389,7 +1391,7 @@ up and down -{$sip_transport_8} +{$sip_transport_8|upper} {$sip_port_8} No @@ -1574,71 +1576,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +{foreach $keys as $row} +{if $row.device_key_category == "expansion"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-1"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-2"} +{$row.device_key_value} +{/if} +{/foreach} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/templates/provision/cisco/spa509g/{$mac}.xml b/resources/templates/provision/cisco/spa509g/{$mac}.xml index 0284515b2b..799982c479 100644 --- a/resources/templates/provision/cisco/spa509g/{$mac}.xml +++ b/resources/templates/provision/cisco/spa509g/{$mac}.xml @@ -358,6 +358,7 @@ {foreach $keys as $row} {if $row.device_key_category == "line"} +{if $row.device_key_type == "line"} {$row.device_key_value} {$row.device_key_label} @@ -369,8 +370,10 @@ private {$row.device_key_value} {/if} +{/if} {/foreach} + Vertical First No @@ -543,7 +546,7 @@ up and down -{$sip_transport_1} +{$sip_transport_1|upper} {$sip_port_1} No @@ -664,7 +667,7 @@ up and down -{$sip_transport_2} +{$sip_transport_2|upper} {$sip_port_2} No @@ -785,7 +788,7 @@ up and down -{$sip_transport_3} +{$sip_transport_3|upper} {$sip_port_3} No @@ -854,7 +857,7 @@ - + G711u No @@ -874,29 +877,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -904,9 +907,9 @@ 6 high up and down - + -{$sip_transport_4} +{$sip_transport_4|upper} {$sip_port_4} No @@ -925,7 +928,7 @@ none No - + No @@ -946,7 +949,7 @@ Yes No No - + {$server_address_4} @@ -963,7 +966,7 @@ 3600 Normal No - + {$display_name_4} {$user_id_4} @@ -975,7 +978,7 @@ - + G711u No @@ -995,29 +998,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -1025,9 +1028,9 @@ 6 high up and down - + -{$sip_transport_5} +{$sip_transport_5|upper} {$sip_port_5} No @@ -1046,7 +1049,7 @@ none No - + No @@ -1067,7 +1070,7 @@ Yes No No - + {$server_address_5} @@ -1084,7 +1087,7 @@ 3600 Normal No - + {$display_name_5} {$user_id_5} @@ -1096,7 +1099,7 @@ - + G711u No @@ -1116,29 +1119,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -1146,9 +1149,9 @@ 6 high up and down - + -{$sip_transport_6} +{$sip_transport_6|upper} {$sip_port_6} No @@ -1167,7 +1170,7 @@ none No - + No @@ -1188,7 +1191,7 @@ Yes No No - + {$server_address_6} @@ -1205,7 +1208,7 @@ 3600 Normal No - + {$display_name_6} {$user_id_6} @@ -1217,7 +1220,7 @@ - + G711u No @@ -1237,29 +1240,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -1267,9 +1270,9 @@ 6 high up and down - + -{$sip_transport_7} +{$sip_transport_7|upper} {$sip_port_7} No @@ -1288,7 +1291,7 @@ none No - + No @@ -1309,7 +1312,7 @@ Yes No No - + {$server_address_7} @@ -1326,7 +1329,7 @@ 3600 Normal No - + {$display_name_7} {$user_id_7} @@ -1338,7 +1341,7 @@ - + G711u No @@ -1358,29 +1361,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -1388,9 +1391,9 @@ 6 high up and down - + -{$sip_transport_8} +{$sip_transport_8|upper} {$sip_port_8} No @@ -1409,7 +1412,7 @@ none No - + No @@ -1430,7 +1433,7 @@ Yes No No - + {$server_address_8} @@ -1447,7 +1450,7 @@ 3600 Normal No - + {$display_name_8} {$user_id_8} @@ -1459,7 +1462,7 @@ - + G711u No @@ -1479,29 +1482,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -1509,9 +1512,9 @@ 6 high up and down - + -{$sip_transport_9} +{$sip_transport_9|upper} {$sip_port_9} No @@ -1530,7 +1533,7 @@ none No - + No @@ -1551,7 +1554,7 @@ Yes No No - + {$server_address_9} @@ -1568,7 +1571,7 @@ 3600 Normal No - + {$display_name_9} {$user_id_9} @@ -1580,7 +1583,7 @@ - + G711u No @@ -1600,29 +1603,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -1630,9 +1633,9 @@ 6 high up and down - + -{$sip_transport_10} +{$sip_transport_10|upper} {$sip_port_10} No @@ -1651,7 +1654,7 @@ none No - + No @@ -1672,7 +1675,7 @@ Yes No No - + {$server_address_10} @@ -1689,7 +1692,7 @@ 3600 Normal No - + {$display_name_10} {$user_id_10} @@ -1701,7 +1704,7 @@ - + G711u No @@ -1721,29 +1724,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -1751,9 +1754,9 @@ 6 high up and down - + -{$sip_transport_11} +{$sip_transport_11|upper} {$sip_port_11} No @@ -1772,7 +1775,7 @@ none No - + No @@ -1793,7 +1796,7 @@ Yes No No - + {$server_address_11} @@ -1810,7 +1813,7 @@ 3600 Normal No - + {$display_name_11} {$user_id_11} @@ -1822,7 +1825,7 @@ - + G711u No @@ -1842,29 +1845,29 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 @@ -1872,9 +1875,9 @@ 6 high up and down - + -{$sip_transport_12} +{$sip_transport_12|upper} {$sip_port_12} No @@ -1893,7 +1896,7 @@ none No - + No @@ -1914,7 +1917,7 @@ Yes No No - + {$server_address_12} @@ -1931,7 +1934,7 @@ 3600 Normal No - + {$display_name_12} {$user_id_12} @@ -1943,7 +1946,7 @@ - + G711u No @@ -1963,20 +1966,20 @@ 0 No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes 20 - + @@ -1986,7 +1989,7 @@ - + Yes No @@ -2020,7 +2023,7 @@ Yes Yes Yes - + 8 8 @@ -2029,11 +2032,11 @@ Auto Default Yes - + 8 10 s - + 1800 30 @@ -2049,7 +2052,7 @@ No 10 7 - + @@ -2062,72 +2065,18 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +{foreach $keys as $row} +{if $row.device_key_category == "expansion"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-1"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-2"} +{$row.device_key_value} +{/if} +{/foreach} + \ No newline at end of file diff --git a/resources/templates/provision/cisco/spa512g/{$mac}.xml b/resources/templates/provision/cisco/spa512g/{$mac}.xml index 63887985cf..6405f557b1 100644 --- a/resources/templates/provision/cisco/spa512g/{$mac}.xml +++ b/resources/templates/provision/cisco/spa512g/{$mac}.xml @@ -359,6 +359,7 @@ {foreach $keys as $row} {if $row.device_key_category == "line"} +{if $row.device_key_type == "line"} {$row.device_key_value} {$row.device_key_label} @@ -370,6 +371,7 @@ private {$row.device_key_value} {/if} +{/if} {/foreach} @@ -519,7 +521,7 @@ up and down -{$sip_transport_1} +{$sip_transport_1|upper} {$sip_port_1} No @@ -692,70 +694,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +{foreach $keys as $row} +{if $row.device_key_category == "expansion"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-1"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-2"} +{$row.device_key_value} +{/if} +{/foreach} No diff --git a/resources/templates/provision/cisco/spa514g/{$mac}.xml b/resources/templates/provision/cisco/spa514g/{$mac}.xml index ec91a3cf71..522fda5945 100644 --- a/resources/templates/provision/cisco/spa514g/{$mac}.xml +++ b/resources/templates/provision/cisco/spa514g/{$mac}.xml @@ -162,6 +162,7 @@ {foreach $keys as $row} {if $row.device_key_category == "line"} +{if $row.device_key_type == "line"} {$row.device_key_value} {$row.device_key_label} @@ -173,6 +174,7 @@ private {$row.device_key_value} {/if} +{/if} {/foreach} @@ -234,7 +236,7 @@ up and down -{$sip_transport_1} +{$sip_transport_1|upper} {$sip_port_1} No @@ -355,7 +357,7 @@ up and down -{$sip_transport_2} +{$sip_transport_2|upper} {$sip_port_2} No @@ -474,7 +476,7 @@ 6 high up and down -{$sip_transport_3} +{$sip_transport_3|upper} {$sip_port_3} No @@ -593,7 +595,7 @@ 6 high up and down -{$sip_transport_4} +{$sip_transport_4|upper} {$sip_port_4} No @@ -772,70 +774,19 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + +{foreach $keys as $row} +{if $row.device_key_category == "expansion"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-1"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-2"} +{$row.device_key_value} +{/if} +{/foreach} No diff --git a/resources/templates/provision/cisco/spa525g/{$mac}.xml b/resources/templates/provision/cisco/spa525g/{$mac}.xml index b93353b765..65495c6cca 100644 --- a/resources/templates/provision/cisco/spa525g/{$mac}.xml +++ b/resources/templates/provision/cisco/spa525g/{$mac}.xml @@ -246,7 +246,7 @@ up and down -{$sip_transport_1} +{$sip_transport_1|upper} {$sip_port_1} No @@ -358,7 +358,7 @@ up and down -{$sip_transport_2} +{$sip_transport_2|upper} {$sip_port_2} No @@ -470,7 +470,7 @@ up and down -{$sip_transport_3} +{$sip_transport_3|upper} {$sip_port_3} No @@ -582,7 +582,7 @@ up and down -{$sip_transport_4} +{$sip_transport_4|upper} {$sip_port_4} No @@ -694,7 +694,7 @@ up and down -{$sip_transport_5} +{$sip_transport_5|upper} {$sip_port_5} No @@ -806,7 +806,7 @@ up and down -{$sip_transport_6} +{$sip_transport_6|upper} {$sip_port_6} No @@ -918,7 +918,7 @@ up and down -{$sip_transport_7} +{$sip_transport_7|upper} {$sip_port_7} No @@ -1030,7 +1030,7 @@ up and down -{$sip_transport_8} +{$sip_transport_8|upper} {$sip_port_8} No @@ -1142,7 +1142,7 @@ up and down -{$sip_transport_9} +{$sip_transport_9|upper} {$sip_port_9} No @@ -1254,7 +1254,7 @@ up and down -{$sip_transport_10} +{$sip_transport_10|upper} {$sip_port_10} No @@ -1366,7 +1366,7 @@ up and down -{$sip_transport_11} +{$sip_transport_11|upper} {$sip_port_11} No @@ -1478,7 +1478,7 @@ up and down -{$sip_transport_12} +{$sip_transport_12|upper} {$sip_port_12} No @@ -1640,6 +1640,7 @@ {foreach $keys as $row} {if $row.device_key_category == "line"} +{if $row.device_key_type == "line"} {$row.device_key_value} {$row.device_key_label} @@ -1651,6 +1652,7 @@ private {$row.device_key_value} {/if} +{/if} {/foreach} @@ -1933,73 +1935,20 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +{foreach $keys as $row} +{if $row.device_key_category == "expansion"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-1"} +{$row.device_key_value} +{/if} +{if $row.device_key_category == "expansion-2"} +{$row.device_key_value} +{/if} +{/foreach} + No \ No newline at end of file