From b553c6ea2fb5a5755764cebf84a9ef02f4099cbf Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 13 Dec 2024 10:25:56 -0500 Subject: [PATCH 01/14] added 8x6 template --- .../provision/grandstream/wp8x6/${mac}.xml | 3858 +++++++++++++++++ 1 file changed, 3858 insertions(+) create mode 100644 resources/templates/provision/grandstream/wp8x6/${mac}.xml diff --git a/resources/templates/provision/grandstream/wp8x6/${mac}.xml b/resources/templates/provision/grandstream/wp8x6/${mac}.xml new file mode 100644 index 0000000000..c07c359e42 --- /dev/null +++ b/resources/templates/provision/grandstream/wp8x6/${mac}.xml @@ -0,0 +1,3858 @@ + + + + + + + + + + + + + + + + + + + + + {for $line=1 to 3} + {$row=$lines.$line} + + + {if filter_var($row.enabled, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if} + + + {$row.display_name} + + + {$row.server_address}:{$row.sip_port} + + + {$row.secondary_server_address}:{$row.sip_port} + + + {if isset($row.outbound_proxy_primary)}{$row.outbound_proxy_primary}:{$row.sip_port}{/if} + + + {if isset($row.outbound_proxy_secondary)}{$row.outbound_proxy_secondary}:{$row.sip_port}{/if} + + + {$row.user_id} + + + {$row.auth_id} + + + {$row.password} + + + {$row.display_name} + + + + + + + {$voicemail_number} + + + + {$row.user_id} + + + + + + + + + + + + + + + + + + + + + + + + + + + Auto + + + + Yes + + + + + + + + + + + + + + + + + + + + + + + + Yes + + + + + + + + {$row.register_expires} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {if filter_var($subscribe_mwi_to_vm, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if} + + + + + + + + Default + + + + Default + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {if $row.sip_transport=='tcp'}TCP{elseif $row.sip_transport=='tls'}Tls Or Tcp{else}UDP{/if} + + + + + + + + + + + {$row.sip_port} + + + + sips + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + G.722 + OPUS + PCMU + PCMA + G.723.1 + G.729A/B + iLBC + G.726-32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Pound + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {$grandstream_dial_plan} + + + + + + + + + + + + + + + + + + + {if isset($grandstream_account_ring_tone_1)} + {$grandstream_account_ring_tone_1} + {/if} + + + + + + {if isset($grandstream_account_ring_tone_1)} + + {$grandstream_account_ring_tone_1} + {/if} + + + + {$grandstream_account_ring_tone_1} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_2)} + {$grandstream_distinctive_ringtone_name_2} + {/if} + + + {if isset($grandstream_distinctive_ringtone_2)} + {$grandstream_distinctive_ringtone_2} + {/if} + + + + {if isset($grandstream_distinctive_ringtone_name_3)} + {$grandstream_distinctive_ringtone_name_3} + {/if} + + + {if isset($grandstream_distinctive_ringtone_3)} + {$grandstream_distinctive_ringtone_3} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_4)} + {$grandstream_distinctive_ringtone_name_4} + {/if} + + + {if isset($grandstream_distinctive_ringtone_4)} + {$grandstream_distinctive_ringtone_4} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_5)} + {$grandstream_distinctive_ringtone_name_5} + {/if} + + + {if isset($grandstream_distinctive_ringtone_5)} + {$grandstream_distinctive_ringtone_5} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_6)} + {$grandstream_distinctive_ringtone_name_6} + {/if} + + + {if isset($grandstream_distinctive_ringtone_6)} + {$grandstream_distinctive_ringtone_6} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_7)} + {$grandstream_distinctive_ringtone_name_7} + {/if} + + + {if isset($grandstream_distinctive_ringtone_7)} + {$grandstream_distinctive_ringtone_7} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_8)} + {$grandstream_distinctive_ringtone_name_8} + {/if} + + + {if isset($grandstream_distinctive_ringtone_8)} + {$grandstream_distinctive_ringtone_8} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_9)} + {$grandstream_distinctive_ringtone_name_9} + {/if} + + + {if isset($grandstream_distinctive_ringtone_9)} + {$grandstream_distinctive_ringtone_9} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_10)} + {$grandstream_distinctive_ringtone_name_10} + {/if} + + + {if isset($grandstream_distinctive_ringtone_10)} + {$grandstream_distinctive_ringtone_10} + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { x+(xxxx)xxxx | xx(xx+)xx | x(xx+)x | x(x+) | (x+)} + + + + + + + Yes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Yes + + + + + + + + + + Yes + + + + + + Local,Remote,BSXSI,LDAPPhonebook,NETWorkSignaling + + + + + + + + + + + + + + + + + + + + + + LocalPhonebook,CallHistory,BSPhonebook,BSCallHistory,LDAPPhonebook,PersonalPhonebook,RemotePhonebook,FeatureCode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [()-] + + + + + + + + + + + + + + Yes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + f1=440,f2=480,c=200/400; + + + + + f1=350,f2=440; + + + + + f1=350,f2=440; + + + + + f1=350,f2=440,c=10/10; + + + + + f1=440,f2=480,c=200/400; + + + + + f1=440,f2=440,c=25/525; + + + + Low + + + + medium + + + + + f1=480,f2=620,c=50/50; + + + + + f1=480,f2=620,c=25/25; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + channel(*) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + On + + + + Auto + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Custom-Menu,Custom-History + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EndCall,Backspace,Dial,Custom-Contacts,Custom-History + + + + Answer,Reject,Forward,Custom-Silence + + + + EndCall,ConfCall + + + + EndCall,ConfCall,NewCall,Swap,Transfer,Record,Custom-Hold,Custom-NoiseShield,DialDTMF + + + + EndCall,Resume,NewCall,ConfCall,Swap,Transfer + + + + EndCall,Redial + + + + Cancel,Backspace,Transfer,Custom-Contacts,Custom-History + + + + Cancel,Dial,Backspace,Custom-Contacts,Custom-History + + + + EndCall,ConfRoom,Custom-Hold,Add,Custom-NoiseShield + + + + EndCall,Backspace,Dial,Custom-Contacts,Custom-History + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MTZ+6MDT+5,M4.1.0,M11.1.0 + + + + + + + + yyyy-mm-dd + + + + 12Hour + + + + + + + + + + + + Automatic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UNLIMITED + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 112,911,110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Overview,PacketLostRate,RoundTripDelay,Jitter,MosLQ,MosCQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + version3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + geodetic,civic,locationURI + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 911 + + + + + + + + + + \ No newline at end of file From 1e9b14d35d86eabf33e39c121f46bb36e74c5595 Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Thu, 19 Dec 2024 11:44:48 -0500 Subject: [PATCH 02/14] Add files via upload --- .../provision/grandstream/wp8x6/{$mac}.xml | 3869 +++++++++++++++++ 1 file changed, 3869 insertions(+) create mode 100644 resources/templates/provision/grandstream/wp8x6/{$mac}.xml diff --git a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml new file mode 100644 index 0000000000..347cc85e11 --- /dev/null +++ b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml @@ -0,0 +1,3869 @@ + + + + + + + + + + + + + + + + + + + + {for $line=1 to 3} + {$row=$lines.$line} + + + {if filter_var($row.enabled, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if} + + + {$row.display_name} + + + {$row.server_address}:{$row.sip_port} + + + {$row.secondary_server_address} + + + {if isset($row.outbound_proxy_primary)}{$row.outbound_proxy_primary}:{$row.sip_port}{/if} + + + {if isset($row.outbound_proxy_secondary)}{$row.outbound_proxy_secondary}:{$row.sip_port}{/if} + + + {$row.user_id} + + + {$row.auth_id} + + + {$row.password} + + + {$row.display_name} + + + + + + + {$voicemail_number} + + + + {$row.user_id} + + + + + + + + ARecord + + + + + + + + Default + + + + + + + No + + + + Auto + + + + Yes + + + + + + + + + + + + + + + + + + + + + + + + Yes + + + + + + + + {$row.register_expires} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {if filter_var($subscribe_mwi_to_vm, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if} + + + + no + + + + Default + + + + Default + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {if $row.sip_transport=='tcp'}TCP{elseif $row.sip_transport=='tls'}Tls Or Tcp{else}UDP{/if} + + + + + + + + + + + {$row.sip_port} + + + + sips + + + + + + + + Yes + + + + + + + + + + + + InRoute + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + G.722 + OPUS + PCMU + PCMA + G.723.1 + G.729A/B + iLBC + G.726-32 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Pound + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {$grandstream_dial_plan} + + + + + + + + + + + + + + + + + + + {if isset($grandstream_account_ring_tone_1)} + {$grandstream_account_ring_tone_1} + {/if} + + + + + + {if isset($grandstream_account_ring_tone_1)} + + {$grandstream_account_ring_tone_1} + {/if} + + + {if isset($grandstream_account_ring_tone_1)} + + {$grandstream_account_ring_tone_1} + {/if} + + + {if isset($grandstream_account_ringtone_name_2)} + {$grandstream_distinctive_ringtone_name_2} + {/if} + + + {if isset($grandstream_distinctive_ringtone_2)} + {$grandstream_distinctive_ringtone_2} + {/if} + + + + {if isset($grandstream_distinctive_ringtone_name_3)} + {$grandstream_distinctive_ringtone_name_3} + {/if} + + + {if isset($grandstream_distinctive_ringtone_3)} + {$grandstream_distinctive_ringtone_3} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_4)} + {$grandstream_distinctive_ringtone_name_4} + {/if} + + + {if isset($grandstream_distinctive_ringtone_4)} + {$grandstream_distinctive_ringtone_4} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_5)} + {$grandstream_distinctive_ringtone_name_5} + {/if} + + + {if isset($grandstream_distinctive_ringtone_5)} + {$grandstream_distinctive_ringtone_5} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_6)} + {$grandstream_distinctive_ringtone_name_6} + {/if} + + + {if isset($grandstream_distinctive_ringtone_6)} + {$grandstream_distinctive_ringtone_6} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_7)} + {$grandstream_distinctive_ringtone_name_7} + {/if} + + + {if isset($grandstream_distinctive_ringtone_7)} + {$grandstream_distinctive_ringtone_7} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_8)} + {$grandstream_distinctive_ringtone_name_8} + {/if} + + + {if isset($grandstream_distinctive_ringtone_8)} + {$grandstream_distinctive_ringtone_8} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_9)} + {$grandstream_distinctive_ringtone_name_9} + {/if} + + + {if isset($grandstream_distinctive_ringtone_9)} + {$grandstream_distinctive_ringtone_9} + {/if} + + + {if isset($grandstream_distinctive_ringtone_name_10)} + {$grandstream_distinctive_ringtone_name_10} + {/if} + + + {if isset($grandstream_distinctive_ringtone_10)} + {$grandstream_distinctive_ringtone_10} + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + { x+(xxxx)xxxx | xx(xx+)xx | x(xx+)x | x(x+) | (x+)} + + + + + + + Yes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Yes + + + + + + + + + + Yes + + + + + + Local,Remote,BSXSI,LDAPPhonebook,NETWorkSignaling + + + + + + + + + + + + + + + + + + + + + + LocalPhonebook,CallHistory,BSPhonebook,BSCallHistory,LDAPPhonebook,PersonalPhonebook,RemotePhonebook,FeatureCode + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + [()-] + + + + + + + + + + + + + + Yes + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + f1=440,f2=480,c=200/400; + + + + + f1=350,f2=440; + + + + + f1=350,f2=440; + + + + + f1=350,f2=440,c=10/10; + + + + + f1=440,f2=480,c=200/400; + + + + + f1=440,f2=440,c=25/525; + + + + Low + + + + medium + + + + + f1=480,f2=620,c=50/50; + + + + + f1=480,f2=620,c=25/25; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + channel(*) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + On + + + + Auto + {/for} + + + + + + + + + + + + + + + + + + + + + + + + + PWD + + + + None + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {if $grandstream_ipv_mode=='0'} + BothAndPreferIPv4 + {elseif $grandstream_ipv_mode=='1'} + BothAndPreferIPv6 + {elseif $grandstream_ipv_mode=='2'} + IPv4Only + {elseif $grandstream_ipv_mode=='3'} + IPv6Only + {else} + BothAndPreferIPv4 + {/if} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Custom-Menu,Custom-History + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + EndCall,Backspace,Dial,Custom-Contacts,Custom-History + + + + Answer,Reject,Forward,Custom-Silence + + + + EndCall,ConfCall + + + + EndCall,ConfCall,NewCall,Swap,Transfer,Record,Custom-Hold,Custom-NoiseShield,DialDTMF + + + + EndCall,Resume,NewCall,ConfCall,Swap,Transfer + + + + EndCall,Redial + + + + Cancel,Backspace,Transfer,Custom-Contacts,Custom-History + + + + Cancel,Dial,Backspace,Custom-Contacts,Custom-History + + + + EndCall,ConfRoom,Custom-Hold,Add,Custom-NoiseShield + + + + EndCall,Backspace,Dial,Custom-Contacts,Custom-History + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + MTZ+6MDT+5,M4.1.0,M11.1.0 + + + + + + + + yyyy-mm-dd + + + + 12Hour + + + + + + + + + + + + Automatic + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + UNLIMITED + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 112,911,110 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Overview,PacketLostRate,RoundTripDelay,Jitter,MosLQ,MosCQ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + version3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Account{$line} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + geodetic,civic,locationURI + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 911 + + + + + + + + + + + \ No newline at end of file From 2bb45fe23fb197708b67b1f96f0adb85802e41e5 Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Thu, 19 Dec 2024 11:57:00 -0500 Subject: [PATCH 03/14] 8x6 phonebook --- .../provision/grandstream/wp8x6/phonebook.xml | 151 ++++++++++++++++++ 1 file changed, 151 insertions(+) create mode 100644 resources/templates/provision/grandstream/wp8x6/phonebook.xml diff --git a/resources/templates/provision/grandstream/wp8x6/phonebook.xml b/resources/templates/provision/grandstream/wp8x6/phonebook.xml new file mode 100644 index 0000000000..8d0d0969ca --- /dev/null +++ b/resources/templates/provision/grandstream/wp8x6/phonebook.xml @@ -0,0 +1,151 @@ + + + + + + 1 + Users + default ringtone + + + 2 + Groups + default ringtone + + + 3 + Extensions + system + + + {$start_id=0} + {foreach $contacts as $row} + {if $row.category == "users"} + + {$start_id++} + {if $row.contact_name_given != ""} + {if $row.contact_organization != ""} + {$row.contact_name_given} {$row.contact_name_family} + {$row.contact_name_given} {$row.contact_name_family} + {$row.contact_organization} + {else} + {$row.contact_name_given} + {$row.contact_name_family} + {/if} + {else} + {$row.effective_caller_id_name} + {/if} + + 0 + {foreach $row.numbers as $number} + {if $number.phone_number != ""} + {if $number.phone_label == "work"} + + {$number.phone_number} + 0 + + {/if} + {if $number.phone_label == "home"} + + {$number.phone_number} + 0 + + {/if} + {if $number.phone_label == "mobile"} + + {$number.phone_number} + 0 + + {/if} + {/if} + {/foreach} + 1 + 0 + + + + + {elseif $row.category == "groups"} + + {$start_id++} + {if $row.contact_name_given != ""} + {if $row.contact_organization != ""} + {$row.contact_name_given} {$row.contact_name_family} + {$row.contact_name_given} {$row.contact_name_family} + {$row.contact_organization} + {else} + {$row.contact_name_given} + {$row.contact_name_family} + {/if} + {else} + {$row.effective_caller_id_name} + {/if} + + + 0 + {foreach $row.numbers as $number} + {if $number.phone_number != ""} + {if $number.phone_label == "work"} + + {$number.phone_number} + 0 + + {/if} + {if $number.phone_label == "home"} + + {$number.phone_number} + 0 + + {/if} + {if $number.phone_label == "mobile"} + + {$number.phone_number} + 0 + + {/if} + {/if} + {/foreach} + 2 + 0 + + + + + {elseif $row.category == "extensions"} + + {$start_id++} + {if $row.contact_name_given != ""} + {if $row.contact_organization != ""} + {$row.contact_name_given} {$row.contact_name_family} + {$row.contact_name_given} {$row.contact_name_family} + {$row.contact_organization} + {else} + {$row.contact_name_given} + {$row.contact_name_family} + {/if} + {else} + {$row.effective_caller_id_name} + {/if} + + 0 + {if $row.phone_number != ""} + + {$row.phone_number} + 0 + + {else} + + {$row.phone_extension} + 0 + + {/if} + 3 + 0 + + + + + {/if} + {/foreach} + + \ No newline at end of file From feed1a6fac6803c944b12f2697f24b7ffc76819d Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Mon, 23 Dec 2024 11:59:39 -0500 Subject: [PATCH 04/14] Update {$mac}.xml --- resources/templates/provision/grandstream/wp8x6/{$mac}.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml index 347cc85e11..77f1f24921 100644 --- a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml +++ b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml @@ -334,7 +334,7 @@ - + @@ -3866,4 +3866,4 @@ - \ No newline at end of file + From 20332e94382d184e97bb6ebc9f1e354d81712512 Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Mon, 23 Dec 2024 12:06:27 -0500 Subject: [PATCH 05/14] Deleted wp8x6/${mac}.xml --- .../provision/grandstream/wp8x6/${mac}.xml | 3858 ----------------- 1 file changed, 3858 deletions(-) delete mode 100644 resources/templates/provision/grandstream/wp8x6/${mac}.xml diff --git a/resources/templates/provision/grandstream/wp8x6/${mac}.xml b/resources/templates/provision/grandstream/wp8x6/${mac}.xml deleted file mode 100644 index c07c359e42..0000000000 --- a/resources/templates/provision/grandstream/wp8x6/${mac}.xml +++ /dev/null @@ -1,3858 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - {for $line=1 to 3} - {$row=$lines.$line} - - - {if filter_var($row.enabled, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if} - - - {$row.display_name} - - - {$row.server_address}:{$row.sip_port} - - - {$row.secondary_server_address}:{$row.sip_port} - - - {if isset($row.outbound_proxy_primary)}{$row.outbound_proxy_primary}:{$row.sip_port}{/if} - - - {if isset($row.outbound_proxy_secondary)}{$row.outbound_proxy_secondary}:{$row.sip_port}{/if} - - - {$row.user_id} - - - {$row.auth_id} - - - {$row.password} - - - {$row.display_name} - - - - - - - {$voicemail_number} - - - - {$row.user_id} - - - - - - - - - - - - - - - - - - - - - - - - - - - Auto - - - - Yes - - - - - - - - - - - - - - - - - - - - - - - - Yes - - - - - - - - {$row.register_expires} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {if filter_var($subscribe_mwi_to_vm, FILTER_VALIDATE_BOOLEAN)}Yes{else}No{/if} - - - - - - - - Default - - - - Default - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {if $row.sip_transport=='tcp'}TCP{elseif $row.sip_transport=='tls'}Tls Or Tcp{else}UDP{/if} - - - - - - - - - - - {$row.sip_port} - - - - sips - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - G.722 - OPUS - PCMU - PCMA - G.723.1 - G.729A/B - iLBC - G.726-32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Pound - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {$grandstream_dial_plan} - - - - - - - - - - - - - - - - - - - {if isset($grandstream_account_ring_tone_1)} - {$grandstream_account_ring_tone_1} - {/if} - - - - - - {if isset($grandstream_account_ring_tone_1)} - - {$grandstream_account_ring_tone_1} - {/if} - - - - {$grandstream_account_ring_tone_1} - {/if} - - - {if isset($grandstream_distinctive_ringtone_name_2)} - {$grandstream_distinctive_ringtone_name_2} - {/if} - - - {if isset($grandstream_distinctive_ringtone_2)} - {$grandstream_distinctive_ringtone_2} - {/if} - - - - {if isset($grandstream_distinctive_ringtone_name_3)} - {$grandstream_distinctive_ringtone_name_3} - {/if} - - - {if isset($grandstream_distinctive_ringtone_3)} - {$grandstream_distinctive_ringtone_3} - {/if} - - - {if isset($grandstream_distinctive_ringtone_name_4)} - {$grandstream_distinctive_ringtone_name_4} - {/if} - - - {if isset($grandstream_distinctive_ringtone_4)} - {$grandstream_distinctive_ringtone_4} - {/if} - - - {if isset($grandstream_distinctive_ringtone_name_5)} - {$grandstream_distinctive_ringtone_name_5} - {/if} - - - {if isset($grandstream_distinctive_ringtone_5)} - {$grandstream_distinctive_ringtone_5} - {/if} - - - {if isset($grandstream_distinctive_ringtone_name_6)} - {$grandstream_distinctive_ringtone_name_6} - {/if} - - - {if isset($grandstream_distinctive_ringtone_6)} - {$grandstream_distinctive_ringtone_6} - {/if} - - - {if isset($grandstream_distinctive_ringtone_name_7)} - {$grandstream_distinctive_ringtone_name_7} - {/if} - - - {if isset($grandstream_distinctive_ringtone_7)} - {$grandstream_distinctive_ringtone_7} - {/if} - - - {if isset($grandstream_distinctive_ringtone_name_8)} - {$grandstream_distinctive_ringtone_name_8} - {/if} - - - {if isset($grandstream_distinctive_ringtone_8)} - {$grandstream_distinctive_ringtone_8} - {/if} - - - {if isset($grandstream_distinctive_ringtone_name_9)} - {$grandstream_distinctive_ringtone_name_9} - {/if} - - - {if isset($grandstream_distinctive_ringtone_9)} - {$grandstream_distinctive_ringtone_9} - {/if} - - - {if isset($grandstream_distinctive_ringtone_name_10)} - {$grandstream_distinctive_ringtone_name_10} - {/if} - - - {if isset($grandstream_distinctive_ringtone_10)} - {$grandstream_distinctive_ringtone_10} - {/if} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { x+(xxxx)xxxx | xx(xx+)xx | x(xx+)x | x(x+) | (x+)} - - - - - - - Yes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Yes - - - - - - - - - - Yes - - - - - - Local,Remote,BSXSI,LDAPPhonebook,NETWorkSignaling - - - - - - - - - - - - - - - - - - - - - - LocalPhonebook,CallHistory,BSPhonebook,BSCallHistory,LDAPPhonebook,PersonalPhonebook,RemotePhonebook,FeatureCode - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - [()-] - - - - - - - - - - - - - - Yes - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - f1=440,f2=480,c=200/400; - - - - - f1=350,f2=440; - - - - - f1=350,f2=440; - - - - - f1=350,f2=440,c=10/10; - - - - - f1=440,f2=480,c=200/400; - - - - - f1=440,f2=440,c=25/525; - - - - Low - - - - medium - - - - - f1=480,f2=620,c=50/50; - - - - - f1=480,f2=620,c=25/25; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - channel(*) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - On - - - - Auto - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Custom-Menu,Custom-History - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - EndCall,Backspace,Dial,Custom-Contacts,Custom-History - - - - Answer,Reject,Forward,Custom-Silence - - - - EndCall,ConfCall - - - - EndCall,ConfCall,NewCall,Swap,Transfer,Record,Custom-Hold,Custom-NoiseShield,DialDTMF - - - - EndCall,Resume,NewCall,ConfCall,Swap,Transfer - - - - EndCall,Redial - - - - Cancel,Backspace,Transfer,Custom-Contacts,Custom-History - - - - Cancel,Dial,Backspace,Custom-Contacts,Custom-History - - - - EndCall,ConfRoom,Custom-Hold,Add,Custom-NoiseShield - - - - EndCall,Backspace,Dial,Custom-Contacts,Custom-History - - - - - - - - - - - - - - Account{$line} - - - - - - - - - - - - - - - - - - Account{$line} - - - - - - - - - - - - - - - - - Account{$line} - - - - - - - - - - - - - - - - - Account{$line} - - - - - - - - - - - - - - - - - Account{$line} - - - - - - - - - - - - - - - - - Account{$line} - - - - - - - - - - - - - - - - - Account{$line} - - - - - - - - - - - - - - - - - Account{$line} - - - - - - - - - - - - - - - - - - Account{$line} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - MTZ+6MDT+5,M4.1.0,M11.1.0 - - - - - - - - yyyy-mm-dd - - - - 12Hour - - - - - - - - - - - - Automatic - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - UNLIMITED - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 112,911,110 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Overview,PacketLostRate,RoundTripDelay,Jitter,MosLQ,MosCQ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - version3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Account{$line} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - geodetic,civic,locationURI - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 911 - - - - - - - - - - \ No newline at end of file From 13956b66393f2ba3762619c72e9cfee9d903b7de Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Tue, 24 Dec 2024 10:56:12 -0500 Subject: [PATCH 06/14] added TR69 variable --- .../templates/provision/grandstream/wp8x6/{$mac}.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml index 77f1f24921..3b8a417573 100644 --- a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml +++ b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml @@ -2208,7 +2208,7 @@ - MTZ+6MDT+5,M4.1.0,M11.1.0 + @@ -2216,11 +2216,11 @@ - yyyy-mm-dd + - 12Hour + @@ -2561,7 +2561,7 @@ - + {$grandstream_tr069_enable} From af3d4e8e35fadf2a3d92770537fddc4ebe40fb89 Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Tue, 24 Dec 2024 12:12:41 -0500 Subject: [PATCH 07/14] added tr69 url and interval --- resources/templates/provision/grandstream/wp8x6/{$mac}.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml index 3b8a417573..2b93b1d8f9 100644 --- a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml +++ b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml @@ -2564,7 +2564,7 @@ {$grandstream_tr069_enable} - + {$grandstream_tr069_url} @@ -2577,7 +2577,7 @@ - + {$grandstream_tr069_periodic_inform_enable} From 41297884ef9f684a6f38f1d9b382d2fbf6b77b75 Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Fri, 27 Dec 2024 08:05:15 -0500 Subject: [PATCH 08/14] Update {$mac}.xml changed asc variable --- resources/templates/provision/grandstream/wp8x6/{$mac}.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml index 2b93b1d8f9..f250f12d8d 100644 --- a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml +++ b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml @@ -2564,7 +2564,7 @@ {$grandstream_tr069_enable} - {$grandstream_tr069_url} + {$grandstream_acs_url} From 610e50dea1f447396b72a6c81b019ef8dfa870e2 Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Fri, 27 Dec 2024 09:09:46 -0500 Subject: [PATCH 09/14] added gs variables to wp8x6 --- .../provision/grandstream/wp8x6/{$mac}.xml | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml index 2b93b1d8f9..4d99a51b73 100644 --- a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml +++ b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml @@ -67,7 +67,7 @@ - ARecord + {$grandstream_dns_mode} @@ -86,7 +86,7 @@ - Auto + {$grandstream_nat_traversal} @@ -373,7 +373,7 @@ - + {$grandstream_srtp} @@ -820,7 +820,7 @@ - + {$grandstream_stun_server} @@ -1350,7 +1350,7 @@ - On + {$grandstream_wifi_enable} @@ -1369,7 +1369,7 @@ - + {$grandstream_wifi_essid} @@ -1422,7 +1422,7 @@ - + {$grandstream_ip_address_mode} @@ -1634,12 +1634,12 @@ - + {$grandstream_qos_sip} - + {$grandstream_qos_rtp} @@ -2200,15 +2200,15 @@ - + {$grandstream_gxp_time_zone} - + {$grandstream_dhcp_time_zone} - + {$grandstream_gxp_time_zone} @@ -2603,16 +2603,16 @@ - + {$grandstream_firmware_upgrade_protocol} - + {$grandstream_firmware_path} - + {$http_auth_username} - + {$http_auth_password} @@ -2625,16 +2625,16 @@ - + {$grandstream_firmware_upgrade_protocol} - + {$grandstream_config_server_path} - + {$http_auth_username} - + {$http_auth_password} @@ -2657,20 +2657,20 @@ - + {$grandstream_automatic_provisioning} - + {$grandstream_automatic_provisioning_minutes} - + {$grandstream_automatic_provisioning_hour} - + {$grandstream_automatic_provisioning_day} @@ -2686,14 +2686,14 @@ - + {$grandstream_dhcp_option_override} - + {$grandstream_dhcp_option_override_sip_server} - + {$grandstream_dhcp_option_additional_override} @@ -2722,17 +2722,17 @@ - + {$grandstream_syslog_server} - + {$grandstream_syslog_level} - + {$grandstream_send_sip_log} From b205f47774120b88b98a6028f16323d6f36fd600 Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Mon, 30 Dec 2024 10:05:21 -0500 Subject: [PATCH 10/14] removed hard code settings --- .../provision/grandstream/wp8x6/{$mac}.xml | 37 ++++++++++--------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml index f89d8e52f7..cc0ed6690e 100644 --- a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml +++ b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml @@ -2,6 +2,8 @@ + + @@ -11,6 +13,7 @@ + @@ -114,7 +117,7 @@ - Yes + @@ -155,7 +158,7 @@ - no + @@ -222,7 +225,7 @@ - Yes + @@ -234,7 +237,7 @@ - InRoute + {$outbound_proxy_primary} @@ -1369,14 +1372,14 @@ - {$grandstream_wifi_essid} + {$grandstream_wifi_essid} - + {$grandstream_wifi_password} @@ -1490,17 +1493,17 @@ - {if $grandstream_ipv_mode=='0'} - BothAndPreferIPv4 - {elseif $grandstream_ipv_mode=='1'} - BothAndPreferIPv6 - {elseif $grandstream_ipv_mode=='2'} - IPv4Only - {elseif $grandstream_ipv_mode=='3'} - IPv6Only - {else} - BothAndPreferIPv4 - {/if} + {if $grandstream_ipv_mode=='0'} + BothAndPreferIPv4 + {elseif $grandstream_ipv_mode=='1'} + BothAndPreferIPv6 + {elseif $grandstream_ipv_mode=='2'} + IPv4Only + {elseif $grandstream_ipv_mode=='3'} + IPv6Only + {else} + BothAndPreferIPv4 + {/if} From dc8ae202c259ec41cf393b1c5644a5faf76132b2 Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Mon, 30 Dec 2024 10:05:53 -0500 Subject: [PATCH 11/14] remove additionall hard code settings --- .../templates/provision/grandstream/wp8x6/{$mac}.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml index cc0ed6690e..89426974d2 100644 --- a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml +++ b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml @@ -78,14 +78,14 @@ - Default + - No + @@ -93,7 +93,7 @@ - Yes + @@ -162,11 +162,11 @@ - Default + - Default + @@ -217,7 +217,7 @@ - sips + From 85d49a352cd44d0f21a0cbf2029dfd5a207c7630 Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Wed, 22 Jan 2025 08:43:44 -0500 Subject: [PATCH 12/14] wifi, ringtone, and dhcp settings --- .../provision/grandstream/wp8x6/{$mac}.xml | 421 ++++++++++++------ 1 file changed, 289 insertions(+), 132 deletions(-) diff --git a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml index 89426974d2..63ae282b7a 100644 --- a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml +++ b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml @@ -16,6 +16,10 @@ + + + + @@ -88,8 +92,8 @@ - - {$grandstream_nat_traversal} + + @@ -125,7 +129,7 @@ - {$row.register_expires} + {$line_register_expires} @@ -413,7 +417,7 @@ - + {$row.sip_port} @@ -560,9 +564,9 @@ - {if isset($grandstream_account_ring_tone_1)} - {$grandstream_account_ring_tone_1} - {/if} + + + @@ -669,6 +673,7 @@ {if isset($grandstream_distinctive_ringtone_10)} {$grandstream_distinctive_ringtone_10} {/if} + @@ -820,10 +825,10 @@ - + 20 - {$grandstream_stun_server} + @@ -854,7 +859,7 @@ - Yes + @@ -1003,7 +1008,7 @@ - Yes + @@ -1348,17 +1353,19 @@ + {/for} + - {$grandstream_wifi_enable} - + On --> + Auto - {/for} + @@ -1370,13 +1377,18 @@ - + + + + + + {$grandstream_wifi_essid} - + WPA-PSK {$grandstream_wifi_password} @@ -1385,12 +1397,156 @@ PWD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - None + - + @@ -1425,7 +1581,7 @@ - {$grandstream_ip_address_mode} + @@ -1493,7 +1649,7 @@ - {if $grandstream_ipv_mode=='0'} + @@ -1534,10 +1690,10 @@ - + - + @@ -1563,10 +1719,10 @@ - + - + @@ -1637,12 +1793,12 @@ - {$grandstream_qos_sip} + - {$grandstream_qos_rtp} + @@ -1757,7 +1913,7 @@ - + @@ -1765,51 +1921,51 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -1824,46 +1980,46 @@ - + - + - + - + - + - + - + - + - + - + @@ -1916,17 +2072,17 @@ - + - Account{$line} + - + - + @@ -1934,119 +2090,119 @@ - + - Account{$line} + - + - + - + - Account{$line} + - + - + - + - Account{$line} + - + - + - + - Account{$line} + - + - + - + - Account{$line} + - + - + - + - Account{$line} + - + - + - + - Account{$line} + - + - + @@ -2054,17 +2210,17 @@ - + - Account{$line} + - + - + @@ -2072,21 +2228,21 @@ - + - + - + - + - + - + - + - + @@ -2133,7 +2289,7 @@ - + 0 @@ -2206,7 +2362,7 @@ {$grandstream_gxp_time_zone} - {$grandstream_dhcp_time_zone} + 0 @@ -2219,11 +2375,11 @@ - + {$grandstream_date_display} - + {$time_format} @@ -2316,7 +2472,7 @@ - + {$admin_password} @@ -2327,7 +2483,7 @@ - UNLIMITED + @@ -2347,7 +2503,7 @@ - + @@ -2389,7 +2545,7 @@ - + @@ -2401,16 +2557,16 @@ - + - + - + @@ -2419,19 +2575,19 @@ - + - + - + - + @@ -2467,7 +2623,7 @@ - + @@ -2577,10 +2733,10 @@ - + {$grandstream_tr069_periodic_inform_enable} - {$grandstream_tr069_periodic_inform_enable} + 300 @@ -2604,18 +2760,18 @@ - + - {$grandstream_firmware_upgrade_protocol} - + 1 + {$grandstream_firmware_path} - + - {$http_auth_username} + - {$http_auth_password} + @@ -2628,9 +2784,10 @@ - {$grandstream_firmware_upgrade_protocol} + 2 + {$grandstream_config_server_path} @@ -2650,7 +2807,7 @@ - + 0 @@ -2664,16 +2821,16 @@ - {$grandstream_automatic_provisioning_minutes} + - {$grandstream_automatic_provisioning_hour} + - {$grandstream_automatic_provisioning_day} + @@ -2689,14 +2846,14 @@ - {$grandstream_dhcp_option_override} + 0 - {$grandstream_dhcp_option_override_sip_server} + 0 - {$grandstream_dhcp_option_additional_override} + 0 @@ -2704,7 +2861,7 @@ - + @@ -2725,17 +2882,17 @@ - {$grandstream_syslog_server} + - {$grandstream_syslog_level} + - {$grandstream_send_sip_log} + @@ -3037,7 +3194,7 @@ - version3 + @@ -3294,7 +3451,7 @@ - Account{$line} + From 714fd045ddf3a3b6d5d41a48124f4c1bd59e2f2a Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Wed, 22 Jan 2025 08:59:43 -0500 Subject: [PATCH 13/14] bluetooth --- resources/templates/provision/grandstream/wp8x6/{$mac}.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml index 63ae282b7a..16e318b27e 100644 --- a/resources/templates/provision/grandstream/wp8x6/{$mac}.xml +++ b/resources/templates/provision/grandstream/wp8x6/{$mac}.xml @@ -1716,7 +1716,7 @@ - + From 60fc566cc0cea26f547760d70bb26541d58ed7ec Mon Sep 17 00:00:00 2001 From: rudyweiler Date: Thu, 27 Feb 2025 11:51:07 -0500 Subject: [PATCH 14/14] opt 9 leave as new, and opt 8 forward menu --- .../resources/conf/languages/en/vm/sounds.xml | 6 ++ .../conf/languages/en/vm/voicemail.xml | 19 +++++- .../resources/scripts/app/voicemail/index.lua | 1 + .../resources/functions/forward_menu.lua | 63 +++++++++++++++++++ .../functions/listen_to_recording.lua | 6 +- 5 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 app/switch/resources/scripts/app/voicemail/resources/functions/forward_menu.lua diff --git a/app/switch/resources/conf/languages/en/vm/sounds.xml b/app/switch/resources/conf/languages/en/vm/sounds.xml index 00ba8ac144..723a3e5de8 100644 --- a/app/switch/resources/conf/languages/en/vm/sounds.xml +++ b/app/switch/resources/conf/languages/en/vm/sounds.xml @@ -416,6 +416,12 @@ + + + + + + diff --git a/app/switch/resources/conf/languages/en/vm/voicemail.xml b/app/switch/resources/conf/languages/en/vm/voicemail.xml index 3218186ccc..c6cc1d369a 100644 --- a/app/switch/resources/conf/languages/en/vm/voicemail.xml +++ b/app/switch/resources/conf/languages/en/vm/voicemail.xml @@ -83,9 +83,11 @@ + + - + @@ -163,6 +165,21 @@ + + + + + + + + + + + + + + + diff --git a/app/switch/resources/scripts/app/voicemail/index.lua b/app/switch/resources/scripts/app/voicemail/index.lua index 253bfcb43b..d47a68bb71 100644 --- a/app/switch/resources/scripts/app/voicemail/index.lua +++ b/app/switch/resources/scripts/app/voicemail/index.lua @@ -361,6 +361,7 @@ require "app.voicemail.resources.functions.record_message"; require "app.voicemail.resources.functions.record_menu"; require "app.voicemail.resources.functions.forward_add_intro"; + require "app.voicemail.resources.functions.forward_menu"; require "app.voicemail.resources.functions.forward_to_extension"; require "app.voicemail.resources.functions.main_menu"; require "app.voicemail.resources.functions.listen_to_recording"; diff --git a/app/switch/resources/scripts/app/voicemail/resources/functions/forward_menu.lua b/app/switch/resources/scripts/app/voicemail/resources/functions/forward_menu.lua new file mode 100644 index 0000000000..324b5a1d93 --- /dev/null +++ b/app/switch/resources/scripts/app/voicemail/resources/functions/forward_menu.lua @@ -0,0 +1,63 @@ +-- Part of FusionPBX +-- Copyright (C) 2013-2024 Mark J Crane +-- All rights reserved. +-- +-- Redistribution and use in source and binary forms, with or without +-- modification, are permitted provided that the following conditions are met: +-- +-- 1. Redistributions of source code must retain the above copyright notice, +-- this list of conditions and the following disclaimer. +-- +-- 2. Redistributions in binary form must reproduce the above copyright +-- notice, this list of conditions and the following disclaimer in the +-- documentation and/or other materials provided with the distribution. +-- +-- THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, +-- INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY +-- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +-- AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +-- OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +-- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +-- INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +-- CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +-- ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +-- POSSIBILITY OF SUCH DAMAGE. + +--added function name to index.lua file +--changed listen to recording function menu starting at line 273 + + + + + +--forward message menu +function forward_menu(voicemail_id, uuid) + if (session:ready()) then + --clear the dtmf digits variable + dtmf_digits = ''; + --flush dtmf digits from the input buffer + session:flushDigits(); + --to listen to the recording press 1, to save the recording press 2, to re-record press 3 + if (session:ready()) then + if (string.len(dtmf_digits) == 0) then + -- TO DO update playAndGetDigit function + dtmf_digits = session:playAndGetDigits(1, 1, 1, 3000, "#", "phrase:voicemail_forward_menu:1:2", "", "^[1-2]$"); + end + end + --process the dtmf + if (session:ready()) then + if (dtmf_digits == "1") then + forward_to_extension(voicemail_id, uuid); + dtmf_digits = ''; + elseif (dtmf_digits == "2") then + send_email(voicemail_id, uuid); + dtmf_digits = ''; + session:execute("playback", "phrase:voicemail_ack:emailed"); + elseif (dtmf_digits == "*") then + timeouts = 0; + return main_menu(); + end + end + + end +end \ No newline at end of file diff --git a/app/switch/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua b/app/switch/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua index 3fc0cfd5f5..105398340d 100644 --- a/app/switch/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua +++ b/app/switch/resources/scripts/app/voicemail/resources/functions/listen_to_recording.lua @@ -280,12 +280,10 @@ message_waiting(voicemail_id_copy, domain_uuid); end elseif (dtmf_digits == "8") then - forward_to_extension(voicemail_id, uuid); - dtmf_digits = ''; + forward_menu(voicemail_id, uuid); elseif (dtmf_digits == "9") then - send_email(voicemail_id, uuid); dtmf_digits = ''; - session:execute("playback", "phrase:voicemail_ack:emailed"); + session:execute("playback", "phrase:voicemail_ack:marked_new"); elseif (dtmf_digits == "*") then timeouts = 0; return main_menu();