From c409e04472ed82bed4ab0309e5cfd125713ad9a8 Mon Sep 17 00:00:00 2001 From: Len Date: Mon, 28 Sep 2020 13:19:25 -0400 Subject: [PATCH 001/147] Update {$mac}.xml --- .../provision/grandstream/ht802/{$mac}.xml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/resources/templates/provision/grandstream/ht802/{$mac}.xml b/resources/templates/provision/grandstream/ht802/{$mac}.xml index 1478b0aedc..00362b1e70 100644 --- a/resources/templates/provision/grandstream/ht802/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht802/{$mac}.xml @@ -1013,13 +1013,13 @@ 1 - - + + {if isset($grandstream_dial_plan) } -{$grandstream_dial_plan} + {$grandstream_dial_plan} {else} -{literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal} + {literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal} {/if} @@ -1896,7 +1896,12 @@ - { x+ | \+x+ | *x+ | *xx*x+ } + +{if isset($grandstream_dial_plan) } + {$grandstream_dial_plan} +{else} + {literal}{x+|*x+|*++|\p\a\r\k\+*x+| \f\l\o\w\+*x+}{/literal} +{/if} From f5d85a808668a74e3ed3a8f8ffea48e241e41aa8 Mon Sep 17 00:00:00 2001 From: Len Date: Mon, 28 Sep 2020 14:17:46 -0400 Subject: [PATCH 002/147] Use updated phonebook code --- .../grandstream/grp2615/phonebook.xml | 196 +++++++++++++----- 1 file changed, 149 insertions(+), 47 deletions(-) diff --git a/resources/templates/provision/grandstream/grp2615/phonebook.xml b/resources/templates/provision/grandstream/grp2615/phonebook.xml index 62c745db9f..deb211d001 100644 --- a/resources/templates/provision/grandstream/grp2615/phonebook.xml +++ b/resources/templates/provision/grandstream/grp2615/phonebook.xml @@ -1,49 +1,151 @@ - + + -1 -{foreach $contacts as $contact} -{if $contact.contact_type == "group"} - -{$contact.id} -{$contact.group_description|truncate:10} - -{/if} -{/foreach} -{$i=0} -{foreach $contacts as $contact} -{if $contact.contact_name_given != "" && $contact.contact_type == "contact"} - -{$contact.contact_name_given} -{$contact.contact_name_family} -{if $contact.contact_role != "" } -{$contact.contact_role} -{/if} -{if $contact.contact_category != "" } -{$contact.contact_category} -{/if} - -{$contact.contact_work} -1 - -{if $contact.contact_home != "" } - -{$contact.contact_home} -1 - -{/if} -{if $contact.contact_cell != "" } - -{$contact.contact_cell} -1 - -{/if} -{if $contact.contact_organization != "" } -{$contact.contact_organization} -{/if} -{foreach $contact.groups as $group} -{$group} -{/foreach} - -{/if} -{/foreach} + + + 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} + From 36a433fcb0386699aa4994d150dbdf033cc8feb5 Mon Sep 17 00:00:00 2001 From: Len Date: Mon, 28 Sep 2020 14:19:05 -0400 Subject: [PATCH 003/147] Updated phonebook code --- .../grandstream/grp2616/phonebook.xml | 196 +++++++++++++----- 1 file changed, 149 insertions(+), 47 deletions(-) diff --git a/resources/templates/provision/grandstream/grp2616/phonebook.xml b/resources/templates/provision/grandstream/grp2616/phonebook.xml index 62c745db9f..deb211d001 100644 --- a/resources/templates/provision/grandstream/grp2616/phonebook.xml +++ b/resources/templates/provision/grandstream/grp2616/phonebook.xml @@ -1,49 +1,151 @@ - + + -1 -{foreach $contacts as $contact} -{if $contact.contact_type == "group"} - -{$contact.id} -{$contact.group_description|truncate:10} - -{/if} -{/foreach} -{$i=0} -{foreach $contacts as $contact} -{if $contact.contact_name_given != "" && $contact.contact_type == "contact"} - -{$contact.contact_name_given} -{$contact.contact_name_family} -{if $contact.contact_role != "" } -{$contact.contact_role} -{/if} -{if $contact.contact_category != "" } -{$contact.contact_category} -{/if} - -{$contact.contact_work} -1 - -{if $contact.contact_home != "" } - -{$contact.contact_home} -1 - -{/if} -{if $contact.contact_cell != "" } - -{$contact.contact_cell} -1 - -{/if} -{if $contact.contact_organization != "" } -{$contact.contact_organization} -{/if} -{foreach $contact.groups as $group} -{$group} -{/foreach} - -{/if} -{/foreach} + + + 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} + From 844c43d9f8aad34fac131b411690bb325cbc6ba4 Mon Sep 17 00:00:00 2001 From: Len Date: Mon, 28 Sep 2020 14:19:48 -0400 Subject: [PATCH 004/147] Update phonebook.xml --- .../grandstream/grp2614/phonebook.xml | 196 +++++++++++++----- 1 file changed, 149 insertions(+), 47 deletions(-) diff --git a/resources/templates/provision/grandstream/grp2614/phonebook.xml b/resources/templates/provision/grandstream/grp2614/phonebook.xml index 62c745db9f..deb211d001 100644 --- a/resources/templates/provision/grandstream/grp2614/phonebook.xml +++ b/resources/templates/provision/grandstream/grp2614/phonebook.xml @@ -1,49 +1,151 @@ - + + -1 -{foreach $contacts as $contact} -{if $contact.contact_type == "group"} - -{$contact.id} -{$contact.group_description|truncate:10} - -{/if} -{/foreach} -{$i=0} -{foreach $contacts as $contact} -{if $contact.contact_name_given != "" && $contact.contact_type == "contact"} - -{$contact.contact_name_given} -{$contact.contact_name_family} -{if $contact.contact_role != "" } -{$contact.contact_role} -{/if} -{if $contact.contact_category != "" } -{$contact.contact_category} -{/if} - -{$contact.contact_work} -1 - -{if $contact.contact_home != "" } - -{$contact.contact_home} -1 - -{/if} -{if $contact.contact_cell != "" } - -{$contact.contact_cell} -1 - -{/if} -{if $contact.contact_organization != "" } -{$contact.contact_organization} -{/if} -{foreach $contact.groups as $group} -{$group} -{/foreach} - -{/if} -{/foreach} + + + 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} + From 07454571459b511dbeddf10e76fd3e4be8fbea0c Mon Sep 17 00:00:00 2001 From: Len Date: Mon, 28 Sep 2020 14:20:33 -0400 Subject: [PATCH 005/147] Uses updated phonebook code --- .../grandstream/grp2613/phonebook.xml | 196 +++++++++++++----- 1 file changed, 149 insertions(+), 47 deletions(-) diff --git a/resources/templates/provision/grandstream/grp2613/phonebook.xml b/resources/templates/provision/grandstream/grp2613/phonebook.xml index 62c745db9f..deb211d001 100644 --- a/resources/templates/provision/grandstream/grp2613/phonebook.xml +++ b/resources/templates/provision/grandstream/grp2613/phonebook.xml @@ -1,49 +1,151 @@ - + + -1 -{foreach $contacts as $contact} -{if $contact.contact_type == "group"} - -{$contact.id} -{$contact.group_description|truncate:10} - -{/if} -{/foreach} -{$i=0} -{foreach $contacts as $contact} -{if $contact.contact_name_given != "" && $contact.contact_type == "contact"} - -{$contact.contact_name_given} -{$contact.contact_name_family} -{if $contact.contact_role != "" } -{$contact.contact_role} -{/if} -{if $contact.contact_category != "" } -{$contact.contact_category} -{/if} - -{$contact.contact_work} -1 - -{if $contact.contact_home != "" } - -{$contact.contact_home} -1 - -{/if} -{if $contact.contact_cell != "" } - -{$contact.contact_cell} -1 - -{/if} -{if $contact.contact_organization != "" } -{$contact.contact_organization} -{/if} -{foreach $contact.groups as $group} -{$group} -{/foreach} - -{/if} -{/foreach} + + + 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} + From bbe7c763a4f6bea505b9038dca229cfeebedeb97 Mon Sep 17 00:00:00 2001 From: PennyTone <47092923+pennytone@users.noreply.github.com> Date: Sat, 3 Oct 2020 14:57:32 -0700 Subject: [PATCH 006/147] Update {$mac}.xml line 6262 - auto upgrade based on hour of day. set to 2 line 6294 - Firmware Upgrade Confirmation set to 0 no this will allow unattended firmware upgrade. --- .../templates/provision/grandstream/gxp2135/{$mac}.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml index e27f59b922..5c17052baa 100644 --- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml @@ -6249,7 +6249,7 @@ - 1 + 0 @@ -6259,7 +6259,7 @@ - 0 + 2 @@ -6291,7 +6291,7 @@ - 1 + 0 From 05f5f8692d5e41a4646176a511da8032a276c050 Mon Sep 17 00:00:00 2001 From: demonspork Date: Sun, 18 Oct 2020 12:34:52 -0500 Subject: [PATCH 007/147] Fix Config URLs for unconfigured Grandstream Phones Fix config URL so that the phones don't get an invalid URL when $domain_name is unset. They would previously receive `/app/provision` with no domain/ip included, which makes the phone unable to provision again once they have been added to the Devices page without manually re-setting the config URL or factory defaulting the device. The alternative solution is that the PHP code could always ensure that the $domain_name variable is set even if the device doesn't exist. My suggestion is to see if it can be set to the same domain/IP as the original provision request from this unconfigured device --- resources/templates/provision/grandstream/dp715.sm/{$mac}.xml | 2 +- resources/templates/provision/grandstream/dp715/{$mac}.xml | 2 +- resources/templates/provision/grandstream/dp750/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gac2500/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gds3705/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gds3710/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp2612/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp2612w/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp2613/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp2614/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp2615/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp2616/{$mac}.xml | 2 +- resources/templates/provision/grandstream/grp26xx/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp110x/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp116x/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp140x/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp1450/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp16xx/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp17xx/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp20xx/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2100/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2124/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2130/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2135/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2140/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2160/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2170/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp21xx/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp2200/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxp3240/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxv300x/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxv3140/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxv3175/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxv3240/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxv3275/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxv3504/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxw4004/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxw4008/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxw40xx/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxw410x/{$mac}.xml | 2 +- resources/templates/provision/grandstream/gxw42xx/{$mac}.xml | 2 +- resources/templates/provision/grandstream/ht502/{$mac}.xml | 2 +- resources/templates/provision/grandstream/ht503/{$mac}.xml | 2 +- resources/templates/provision/grandstream/ht701/{$mac}.xml | 2 +- resources/templates/provision/grandstream/ht702/{$mac}.xml | 2 +- resources/templates/provision/grandstream/ht704/{$mac}.xml | 2 +- resources/templates/provision/grandstream/ht802/{$mac}.xml | 2 +- resources/templates/provision/grandstream/ht818/{$mac}.xml | 2 +- resources/templates/provision/grandstream/htx86/{$mac}.xml | 2 +- resources/templates/provision/grandstream/wp820/{$mac}.xml | 2 +- 54 files changed, 54 insertions(+), 54 deletions(-) diff --git a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml index 34a4a3a753..a6d55a3c99 100644 --- a/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml +++ b/resources/templates/provision/grandstream/dp715.sm/{$mac}.xml @@ -80,7 +80,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/dp715/{$mac}.xml b/resources/templates/provision/grandstream/dp715/{$mac}.xml index 03e799b669..defae594d4 100644 --- a/resources/templates/provision/grandstream/dp715/{$mac}.xml +++ b/resources/templates/provision/grandstream/dp715/{$mac}.xml @@ -42,7 +42,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/dp750/{$mac}.xml b/resources/templates/provision/grandstream/dp750/{$mac}.xml index b759950d6f..3976b06932 100644 --- a/resources/templates/provision/grandstream/dp750/{$mac}.xml +++ b/resources/templates/provision/grandstream/dp750/{$mac}.xml @@ -2921,7 +2921,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gac2500/{$mac}.xml b/resources/templates/provision/grandstream/gac2500/{$mac}.xml index 44958da1f2..24904d30c7 100644 --- a/resources/templates/provision/grandstream/gac2500/{$mac}.xml +++ b/resources/templates/provision/grandstream/gac2500/{$mac}.xml @@ -4168,7 +4168,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gds3705/{$mac}.xml b/resources/templates/provision/grandstream/gds3705/{$mac}.xml index 36576d913f..24f049aa17 100644 --- a/resources/templates/provision/grandstream/gds3705/{$mac}.xml +++ b/resources/templates/provision/grandstream/gds3705/{$mac}.xml @@ -690,7 +690,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gds3710/{$mac}.xml b/resources/templates/provision/grandstream/gds3710/{$mac}.xml index 456a9013b2..b9c4a39462 100644 --- a/resources/templates/provision/grandstream/gds3710/{$mac}.xml +++ b/resources/templates/provision/grandstream/gds3710/{$mac}.xml @@ -743,7 +743,7 @@ E0Fw0O5Kx31JPa+aSBLDMZAG1+SZ/zfxRYQe7VH8p1g= {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/grp2612/{$mac}.xml b/resources/templates/provision/grandstream/grp2612/{$mac}.xml index 26f623e5fd..99cbfd181f 100644 --- a/resources/templates/provision/grandstream/grp2612/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2612/{$mac}.xml @@ -2451,7 +2451,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml index 5b3e26f4cd..9bf41b5f06 100644 --- a/resources/templates/provision/grandstream/grp2612w/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2612w/{$mac}.xml @@ -2545,7 +2545,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/grp2613/{$mac}.xml b/resources/templates/provision/grandstream/grp2613/{$mac}.xml index 113de1258a..4a5db26b0b 100644 --- a/resources/templates/provision/grandstream/grp2613/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2613/{$mac}.xml @@ -3277,7 +3277,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/grp2614/{$mac}.xml b/resources/templates/provision/grandstream/grp2614/{$mac}.xml index 29ca189204..f7302cceb4 100644 --- a/resources/templates/provision/grandstream/grp2614/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2614/{$mac}.xml @@ -4483,7 +4483,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/grp2615/{$mac}.xml b/resources/templates/provision/grandstream/grp2615/{$mac}.xml index 1bd69836d5..3135feaff7 100644 --- a/resources/templates/provision/grandstream/grp2615/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2615/{$mac}.xml @@ -5430,7 +5430,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/grp2616/{$mac}.xml b/resources/templates/provision/grandstream/grp2616/{$mac}.xml index efb9fc2ef2..803ab969a9 100644 --- a/resources/templates/provision/grandstream/grp2616/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp2616/{$mac}.xml @@ -6381,7 +6381,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml index 3532664e4b..1c0669429b 100644 --- a/resources/templates/provision/grandstream/grp26xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/grp26xx/{$mac}.xml @@ -5746,7 +5746,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml index 516c02b91b..b059454eab 100644 --- a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml @@ -940,7 +940,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml index a563803545..c36b2ed07e 100644 --- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml @@ -814,7 +814,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml index 9a9b3c0acb..77384b2f14 100644 --- a/resources/templates/provision/grandstream/gxp140x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp140x/{$mac}.xml @@ -1186,7 +1186,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml index b2073dec5f..e0fc2ae56b 100644 --- a/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp140xbk/{$mac}.xml @@ -1186,7 +1186,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml index d9a5c8c87d..f10e7bab05 100644 --- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml @@ -1569,7 +1569,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml index d222f2762c..bed1089f00 100644 --- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml @@ -1376,7 +1376,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml index a33b9bbca9..bf0d1ca349 100644 --- a/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp16xx/{$mac}.xml @@ -2073,7 +2073,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml index fe878be725..1ef300b899 100644 --- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml @@ -6039,7 +6039,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml index 7574d645a2..9b59b2fa28 100644 --- a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml @@ -85,7 +85,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml index 2751136ec3..9f4fea1e42 100644 --- a/resources/templates/provision/grandstream/gxp2100/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2100/{$mac}.xml @@ -2809,7 +2809,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml index 353fbb0256..026c4b5d4a 100644 --- a/resources/templates/provision/grandstream/gxp2124/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2124/{$mac}.xml @@ -1925,7 +1925,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml index c240ea921f..26ed86c5cb 100644 --- a/resources/templates/provision/grandstream/gxp2130/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2130/{$mac}.xml @@ -6305,7 +6305,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml index efaf755057..9550de47be 100644 --- a/resources/templates/provision/grandstream/gxp2135/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2135/{$mac}.xml @@ -6305,7 +6305,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml index efaf755057..9550de47be 100644 --- a/resources/templates/provision/grandstream/gxp2140/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2140/{$mac}.xml @@ -6305,7 +6305,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml index 611dc4afc2..fe9b6f4ca1 100644 --- a/resources/templates/provision/grandstream/gxp2160/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2160/{$mac}.xml @@ -6305,7 +6305,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml index e350b82463..8b967be7cd 100644 --- a/resources/templates/provision/grandstream/gxp2170/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2170/{$mac}.xml @@ -6305,7 +6305,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml index 41ed4aeb41..71a6875deb 100644 --- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml @@ -2714,7 +2714,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml index c706818fd9..a7b0ede910 100644 --- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml @@ -48,7 +48,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml index 6c0051972a..9db2cf0a43 100644 --- a/resources/templates/provision/grandstream/gxp2200/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp2200/{$mac}.xml @@ -3016,7 +3016,7 @@ Account 5 Codec Settings {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml index 71dd325f17..565eb48969 100644 --- a/resources/templates/provision/grandstream/gxp3240/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp3240/{$mac}.xml @@ -3226,7 +3226,7 @@ Account 5 Codec Settings {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml index ddb2fcbce3..154caa70dd 100644 --- a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml @@ -78,7 +78,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml index 01a3cc3cfe..933fc02783 100644 --- a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml @@ -1385,7 +1385,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml index 6da83e7eb9..ca06cf43b6 100644 --- a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml @@ -1268,7 +1268,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml index 331264c920..2ffd13d9f9 100644 --- a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml @@ -767,7 +767,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml index 158da35e69..8f1afc86b5 100644 --- a/resources/templates/provision/grandstream/gxv3240/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3240/{$mac}.xml @@ -4820,7 +4820,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml index 16a159f70e..92ab217ab4 100644 --- a/resources/templates/provision/grandstream/gxv3275/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3275/{$mac}.xml @@ -3225,7 +3225,7 @@ Account 5 Codec Settings {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml index a72548ece3..e27719804d 100644 --- a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml @@ -580,7 +580,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml index 582a506f5b..4e0771d049 100644 --- a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml @@ -26,7 +26,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxw4008/{$mac}.xml b/resources/templates/provision/grandstream/gxw4008/{$mac}.xml index 835a1e4725..99a5b06450 100644 --- a/resources/templates/provision/grandstream/gxw4008/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxw4008/{$mac}.xml @@ -26,7 +26,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml index e79d12eec1..667ebb2dc5 100644 --- a/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxw40xx/{$mac}.xml @@ -63,7 +63,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxw410x/{$mac}.xml b/resources/templates/provision/grandstream/gxw410x/{$mac}.xml index 895ea6cd13..03746c750d 100644 --- a/resources/templates/provision/grandstream/gxw410x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxw410x/{$mac}.xml @@ -43,7 +43,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml index e2b556976a..cec5dab2bc 100644 --- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml @@ -171,7 +171,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/ht502/{$mac}.xml b/resources/templates/provision/grandstream/ht502/{$mac}.xml index 4f849515a1..c6eba5a6e7 100644 --- a/resources/templates/provision/grandstream/ht502/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht502/{$mac}.xml @@ -53,7 +53,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/ht503/{$mac}.xml b/resources/templates/provision/grandstream/ht503/{$mac}.xml index e8ee007b2b..1c94f26119 100644 --- a/resources/templates/provision/grandstream/ht503/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht503/{$mac}.xml @@ -150,7 +150,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/ht701/{$mac}.xml b/resources/templates/provision/grandstream/ht701/{$mac}.xml index abcbef51d8..3d3ece9a50 100644 --- a/resources/templates/provision/grandstream/ht701/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht701/{$mac}.xml @@ -75,7 +75,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/ht702/{$mac}.xml b/resources/templates/provision/grandstream/ht702/{$mac}.xml index 8589ea4b32..344292f5dc 100644 --- a/resources/templates/provision/grandstream/ht702/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht702/{$mac}.xml @@ -86,7 +86,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/ht704/{$mac}.xml b/resources/templates/provision/grandstream/ht704/{$mac}.xml index 6e0727c8d8..119f449844 100644 --- a/resources/templates/provision/grandstream/ht704/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht704/{$mac}.xml @@ -81,7 +81,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/ht802/{$mac}.xml b/resources/templates/provision/grandstream/ht802/{$mac}.xml index 1478b0aedc..bae03d7ce1 100644 --- a/resources/templates/provision/grandstream/ht802/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht802/{$mac}.xml @@ -105,7 +105,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/ht818/{$mac}.xml b/resources/templates/provision/grandstream/ht818/{$mac}.xml index aef0fff087..c1520e6a0b 100644 --- a/resources/templates/provision/grandstream/ht818/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht818/{$mac}.xml @@ -94,7 +94,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/htx86/{$mac}.xml b/resources/templates/provision/grandstream/htx86/{$mac}.xml index 35e64e54f0..68441bc895 100644 --- a/resources/templates/provision/grandstream/htx86/{$mac}.xml +++ b/resources/templates/provision/grandstream/htx86/{$mac}.xml @@ -57,7 +57,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} - {else} + {elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} diff --git a/resources/templates/provision/grandstream/wp820/{$mac}.xml b/resources/templates/provision/grandstream/wp820/{$mac}.xml index ffa7d518cb..845c100845 100644 --- a/resources/templates/provision/grandstream/wp820/{$mac}.xml +++ b/resources/templates/provision/grandstream/wp820/{$mac}.xml @@ -2235,7 +2235,7 @@ {elseif isset($grandstream_config_server_path)} {$grandstream_config_server_path} -{else} +{elseif isset($domain_name)} {$domain_name}{$project_path}/app/provision {/if} From 3aa39634c9aac135d32bd4a1e5f8f74e97b7125c Mon Sep 17 00:00:00 2001 From: Greenbea Date: Sun, 18 Oct 2020 15:44:33 -0400 Subject: [PATCH 008/147] ivr menu add pin number --- app/ivr_menus/app_config.php | 4 ++ app/ivr_menus/app_languages.php | 42 +++++++++++++++++++ app/ivr_menus/ivr_menu_edit.php | 14 +++++++ .../scripts/configuration/ivr.conf.lua | 2 + 4 files changed, 62 insertions(+) diff --git a/app/ivr_menus/app_config.php b/app/ivr_menus/app_config.php index bb7b813c09..6b3841475f 100644 --- a/app/ivr_menus/app_config.php +++ b/app/ivr_menus/app_config.php @@ -271,6 +271,10 @@ $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "ivr_menu_pin_number"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; + $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "ivr_menu_confirm_macro"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; diff --git a/app/ivr_menus/app_languages.php b/app/ivr_menus/app_languages.php index 62e135c59f..6b1cc89727 100644 --- a/app/ivr_menus/app_languages.php +++ b/app/ivr_menus/app_languages.php @@ -631,6 +631,27 @@ $text['label-destination']['ru-ru'] = "Место назначения"; $text['label-destination']['sv-se'] = "Destination"; $text['label-destination']['uk-ua'] = ""; +$text['label-pin_number']['en-us'] = "Pin Number"; +$text['label-pin_number']['en-gb'] = "Pin Number"; +$text['label-pin_number']['ar-eg'] = ""; +$text['label-pin_number']['de-at'] = "PIN Nummer"; //copied from de-de +$text['label-pin_number']['de-ch'] = "PIN Nummer"; //copied from de-de +$text['label-pin_number']['de-de'] = "PIN Nummer"; +$text['label-pin_number']['es-cl'] = "Número Pin"; +$text['label-pin_number']['es-mx'] = "Número Pin"; //copied from es-cl +$text['label-pin_number']['fr-ca'] = "Code Pin"; //copied from fr-fr +$text['label-pin_number']['fr-fr'] = "Code Pin"; +$text['label-pin_number']['he-il'] = ""; +$text['label-pin_number']['it-it'] = "PIN"; +$text['label-pin_number']['nl-nl'] = "PIN"; +$text['label-pin_number']['pl-pl'] = ""; +$text['label-pin_number']['pt-br'] = "Código Pin"; //copied from pt-pt +$text['label-pin_number']['pt-pt'] = "Código Pin"; +$text['label-pin_number']['ro-ro'] = ""; +$text['label-pin_number']['ru-ru'] = "PIN Номер"; +$text['label-pin_number']['sv-se'] = "Pin Nummer"; +$text['label-pin_number']['uk-ua'] = ""; + $text['label-comfirm_macro']['en-us'] = "Confirm Macro"; $text['label-comfirm_macro']['en-gb'] = "Confirm Macro"; $text['label-comfirm_macro']['ar-eg'] = ""; @@ -1366,6 +1387,27 @@ $text['description-destination']['ru-ru'] = "Выберите пункт наз $text['description-destination']['sv-se'] = "Välj destination."; $text['description-destination']['uk-ua'] = ""; +$text['description-pin_number']['en-us'] = "Optional pin number to secure access to the menu."; +$text['description-pin_number']['en-gb'] = "Optional pin number to secure access to the menu."; +$text['description-pin_number']['ar-eg'] = ""; +$text['description-pin_number']['de-at'] = ""; +$text['description-pin_number']['de-ch'] = ""; +$text['description-pin_number']['de-de'] = ""; +$text['description-pin_number']['es-cl'] = ""; +$text['description-pin_number']['es-mx'] = ""; +$text['description-pin_number']['fr-ca'] = ""; +$text['description-pin_number']['fr-fr'] = ""; +$text['description-pin_number']['he-il'] = ""; +$text['description-pin_number']['it-it'] = ""; +$text['description-pin_number']['nl-nl'] = ""; +$text['description-pin_number']['pl-pl'] = ""; +$text['description-pin_number']['pt-br'] = ""; +$text['description-pin_number']['pt-pt'] = ""; +$text['description-pin_number']['ro-ro'] = ""; +$text['description-pin_number']['ru-ru'] = ""; +$text['description-pin_number']['sv-se'] = ""; +$text['description-pin_number']['uk-ua'] = ""; + $text['description-comfirm_macro']['en-us'] = "Enter the confirm macro."; $text['description-comfirm_macro']['en-gb'] = "Enter the confirm macro."; $text['description-comfirm_macro']['ar-eg'] = ""; diff --git a/app/ivr_menus/ivr_menu_edit.php b/app/ivr_menus/ivr_menu_edit.php index 093d49138a..78d2b86999 100644 --- a/app/ivr_menus/ivr_menu_edit.php +++ b/app/ivr_menus/ivr_menu_edit.php @@ -112,6 +112,7 @@ $ivr_menu_options = $_POST["ivr_menu_options"]; $ivr_menu_invalid_sound = $_POST["ivr_menu_invalid_sound"]; $ivr_menu_exit_sound = $_POST["ivr_menu_exit_sound"]; + $ivr_menu_pin_number = $_POST["ivr_menu_pin_number"]; $ivr_menu_confirm_macro = $_POST["ivr_menu_confirm_macro"]; $ivr_menu_confirm_key = $_POST["ivr_menu_confirm_key"]; $ivr_menu_tts_engine = $_POST["ivr_menu_tts_engine"]; @@ -260,6 +261,7 @@ $array['ivr_menus'][0]["ivr_menu_greet_short"] = $ivr_menu_greet_short; $array['ivr_menus'][0]["ivr_menu_invalid_sound"] = $ivr_menu_invalid_sound; $array['ivr_menus'][0]["ivr_menu_exit_sound"] = $ivr_menu_exit_sound; + $array['ivr_menus'][0]["ivr_menu_pin_number"] = $ivr_menu_pin_number; $array['ivr_menus'][0]["ivr_menu_confirm_macro"] = $ivr_menu_confirm_macro; $array['ivr_menus'][0]["ivr_menu_confirm_key"] = $ivr_menu_confirm_key; $array['ivr_menus'][0]["ivr_menu_tts_engine"] = $ivr_menu_tts_engine; @@ -456,6 +458,7 @@ $ivr_menu_greet_short = $row["ivr_menu_greet_short"]; $ivr_menu_invalid_sound = $row["ivr_menu_invalid_sound"]; $ivr_menu_exit_sound = $row["ivr_menu_exit_sound"]; + $ivr_menu_pin_number = $row["ivr_menu_pin_number"]; $ivr_menu_confirm_macro = $row["ivr_menu_confirm_macro"]; $ivr_menu_confirm_key = $row["ivr_menu_confirm_key"]; $ivr_menu_tts_engine = $row["ivr_menu_tts_engine"]; @@ -1406,6 +1409,17 @@ echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo " ".$text['label-pin_number']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo $text['description-pin_number']."\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo " ".$text['label-comfirm_macro']."\n"; diff --git a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua index 5492491ad5..62bc459e5f 100644 --- a/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua +++ b/app/scripts/resources/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua @@ -98,6 +98,7 @@ ivr_menu_greet_short = row["ivr_menu_greet_short"]; ivr_menu_invalid_sound = row["ivr_menu_invalid_sound"]; ivr_menu_exit_sound = row["ivr_menu_exit_sound"]; + ivr_menu_pin_number = row["ivr_menu_pin_number"]; ivr_menu_confirm_macro = row["ivr_menu_confirm_macro"]; ivr_menu_confirm_key = row["ivr_menu_confirm_key"]; ivr_menu_tts_engine = row["ivr_menu_tts_engine"]; @@ -248,6 +249,7 @@ table.insert(xml, [[ greet-short="]]..ivr_menu_greet_short..[[" ]]); table.insert(xml, [[ invalid-sound="]]..ivr_menu_invalid_sound..[[" ]]); table.insert(xml, [[ exit-sound="]]..ivr_menu_exit_sound..[[" ]]); + table.insert(xml, [[ pin="]]..ivr_menu_pin_number..[[" ]]); table.insert(xml, [[ confirm-macro="]]..ivr_menu_confirm_macro..[[" ]]); table.insert(xml, [[ confirm-key="]]..ivr_menu_confirm_key..[[" ]]); table.insert(xml, [[ tts-engine="]]..ivr_menu_tts_engine..[[" ]]); From b0bbae3a407b476d3121b904e1d888a2b1e56a25 Mon Sep 17 00:00:00 2001 From: demonspork Date: Mon, 19 Oct 2020 00:11:43 -0500 Subject: [PATCH 009/147] GXP17xx Template Improvements Various basic variables were missing like transport type and sip_port and basic things were wrong like Accept Incoming SIP from Proxy Only was disabled. This template P codes are almost identical to the GXP16XX except that the loops for button programming doesn't seem to work with it at least with my limited testing, so they are left out for now. Tested and working with firmware 1.0.1.89 --- app/provision/resources/classes/provision.php | 3 + .../provision/grandstream/gxp17xx/{$mac}.xml | 120 ++++++++++++++++-- 2 files changed, 111 insertions(+), 12 deletions(-) diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index 0d87cf90ce..a5e702093f 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -460,6 +460,9 @@ include "root.php"; $templates['HW GXP1620'] = 'grandstream/gxp16xx'; $templates['HW GXP1625'] = 'grandstream/gxp16xx'; $templates['HW GXP1630'] = 'grandstream/gxp16xx'; + $templates['HW GXP1760W'] = 'grandstream/gxp17xx'; + $templates['HW GXP1780'] = 'grandstream/gxp17xx'; + $templates['HW GXP1782'] = 'grandstream/gxp17xx'; $templates['HW GXP2124'] = 'grandstream/gxp2124'; $templates['HW GXP2130'] = 'grandstream/gxp2130'; $templates['HW GXP2135'] = 'grandstream/gxp2135'; diff --git a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml index fe878be725..d33990621b 100644 --- a/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp17xx/{$mac}.xml @@ -773,7 +773,7 @@ -{$account.1.server_address} +{$account.1.server_address}:{$account.1.sip_port} @@ -781,11 +781,19 @@ +{if isset($account.1.outbound_proxy_primary)} +{$account.1.outbound_proxy_primary}:{$account.1.sip_port} +{else} +{/if} +{if isset($account.1.outbound_proxy_secondary)} +{$account.1.outbound_proxy_secondary}:{$account.1.sip_port} +{else} +{/if} @@ -816,7 +824,11 @@ +{if isset($grandstream_dns_mode)} +{$grandstream_dns_mode} +{else} 0 +{/if} @@ -833,7 +845,11 @@ +{if isset($grandstream_nat_traversal)} +{$grandstream_nat_traversal} +{else} 0 +{/if} @@ -911,7 +927,12 @@ -0 +{$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} +{$tp} @@ -936,7 +957,12 @@ +{if isset($subscribe_mwi)} +1 +{else} 0 +{/if} + @@ -1017,7 +1043,9 @@ -0 +{if isset($grandstream_blf_call_pickup)} +{$grandstream_blf_call_pickup} +{/if} @@ -1146,7 +1174,7 @@ -0 +1 @@ -1217,7 +1245,11 @@ +{if isset($grandstream_srtp)} +{$grandstream_srtp} +{else} 0 +{/if} @@ -1448,11 +1480,11 @@ -{$display_name_2} +{$account.2.display_name} -{$server_address_2} +{$account.2.server_address}:{$account.2.sip_port} @@ -1460,11 +1492,19 @@ +{if isset($account.2.outbound_proxy_primary)} +{$account.2.outbound_proxy_primary}:{$account.2.sip_port} +{else} +{/if} +{if isset($account.2.outbound_proxy_secondary)} +{$account.2.outbound_proxy_secondary}:{$account.2.sip_port} +{else} +{/if} @@ -1472,7 +1512,7 @@ -{$account.2.user_id} + @@ -1495,7 +1535,11 @@ +{if isset($grandstream_dns_mode)} +{$grandstream_dns_mode} +{else} 0 +{/if} @@ -1512,7 +1556,11 @@ +{if isset($grandstream_nat_traversal)} +{$grandstream_nat_traversal} +{else} 0 +{/if} @@ -1590,7 +1638,12 @@ -0 +{$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} +{$tp} @@ -1615,7 +1668,12 @@ +{if isset($subscribe_mwi)} +1 +{else} 0 +{/if} + @@ -1696,7 +1754,9 @@ -0 +{if isset($grandstream_blf_call_pickup)} +{$grandstream_blf_call_pickup} +{/if} @@ -1895,7 +1955,11 @@ +{if isset($grandstream_srtp)} +{$grandstream_srtp} +{else} 0 +{/if} @@ -2120,7 +2184,7 @@ -{$account.3.server_address} +{$account.3.server_address}:{$account.3.sip_port} @@ -2128,11 +2192,19 @@ +{if isset($account.3.outbound_proxy_primary)} +{$account.3.outbound_proxy_primary}:{$account.3.sip_port} +{else} +{/if} +{if isset($account.3.outbound_proxy_secondary)} +{$account.3.outbound_proxy_secondary}:{$account.3.sip_port} +{else} +{/if} @@ -2163,7 +2235,11 @@ +{if isset($grandstream_dns_mode)} +{$grandstream_dns_mode} +{else} 0 +{/if} @@ -2180,7 +2256,11 @@ +{if isset($grandstream_nat_traversal)} +{$grandstream_nat_traversal} +{else} 0 +{/if} @@ -2258,7 +2338,12 @@ -0 +{$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} +{$tp} @@ -2283,7 +2368,12 @@ +{if isset($subscribe_mwi)} +1 +{else} 0 +{/if} + @@ -2364,7 +2454,9 @@ -0 +{if isset($grandstream_blf_call_pickup)} +{$grandstream_blf_call_pickup} +{/if} @@ -2562,7 +2654,11 @@ +{if isset($grandstream_srtp)} +{$grandstream_srtp} +{else} 0 +{/if} From 80fa9cfe7d52d9110c07cef3640669b4bd04c627 Mon Sep 17 00:00:00 2001 From: demonspork Date: Mon, 19 Oct 2020 18:46:38 -0500 Subject: [PATCH 010/147] Fix displaying array order for settings of type array the *_setting_order was missing from the SELECT queries for all 3 places I could find that use this mechanism. The device settings don't seem to use it. --- core/default_settings/default_setting_edit.php | 2 +- core/domain_settings/domain_setting_edit.php | 2 +- core/user_settings/user_setting_edit.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index 98976a9dc8..d273b10eb0 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -211,7 +211,7 @@ //pre-populate the form if (count($_GET) > 0 && $_POST["persistformvar"] != "true") { $default_setting_uuid = $_GET["id"]; - $sql = "select default_setting_uuid, default_setting_category, default_setting_subcategory, default_setting_name, default_setting_value, cast(default_setting_enabled as text), default_setting_description "; + $sql = "select default_setting_uuid, default_setting_category, default_setting_subcategory, default_setting_name, default_setting_value, default_setting_order, cast(default_setting_enabled as text), default_setting_description "; $sql .= "from v_default_settings "; $sql .= "where default_setting_uuid = :default_setting_uuid "; $parameters['default_setting_uuid'] = $default_setting_uuid; diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php index a464b5ab05..2cc544adee 100644 --- a/core/domain_settings/domain_setting_edit.php +++ b/core/domain_settings/domain_setting_edit.php @@ -325,7 +325,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { //pre-populate the form if (count($_GET)>0 && $_POST["persistformvar"] != "true" && is_uuid($_GET["id"])) { $domain_setting_uuid = $_GET["id"]; - $sql = "select domain_setting_uuid, domain_setting_category, domain_setting_subcategory, domain_setting_name, domain_setting_value, cast(domain_setting_enabled as text), domain_setting_description "; + $sql = "select domain_setting_uuid, domain_setting_category, domain_setting_subcategory, domain_setting_name, domain_setting_value, domain_setting_order, cast(domain_setting_enabled as text), domain_setting_description "; $sql .= "from v_domain_settings "; $sql .= "where domain_uuid = :domain_uuid "; $sql .= "and domain_setting_uuid = :domain_setting_uuid "; diff --git a/core/user_settings/user_setting_edit.php b/core/user_settings/user_setting_edit.php index 1c3a49a1ea..ba8baf699a 100644 --- a/core/user_settings/user_setting_edit.php +++ b/core/user_settings/user_setting_edit.php @@ -319,7 +319,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { //pre-populate the form if (is_uuid($_GET["id"]) && count($_GET) > 0 && $_POST["persistformvar"] != "true") { $user_setting_uuid = $_GET["id"]; - $sql = "select user_setting_category, user_setting_subcategory, user_setting_name, user_setting_value, cast(user_setting_enabled as text), user_setting_description "; + $sql = "select user_setting_category, user_setting_subcategory, user_setting_name, user_setting_value, user_setting_order, cast(user_setting_enabled as text), user_setting_description "; $sql .= "from v_user_settings "; $sql .= "where user_setting_uuid = :user_setting_uuid "; $sql .= "and user_uuid = :user_uuid "; From 5b6102de708eb13c93826e1ae645cc09b115f16a Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 19 Oct 2020 20:19:00 -0600 Subject: [PATCH 011/147] Update device_edit.php Show input text when details for select are not configured. --- app/devices/device_edit.php | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index 3040b537a9..a9875d7f02 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -1019,10 +1019,12 @@ $element['hidden'] = true; $element['visibility'] = "visibility:hidden;"; } + //add the primary key uuid if (is_uuid($row['device_line_uuid'])) { echo " \n"; } + //show each row in the array echo " \n"; echo " \n"; @@ -1046,10 +1048,7 @@ if (permission_exists('device_line_server_address_primary')) { echo " \n"; - if (is_uuid($_SESSION['provision']['server_address_primary']['uuid'])) { - echo " \n"; - } - else { + if (isset($_SESSION['provision']['server_address_primary']) && !isset($_SESSION['provision']['server_address_primary']['text'])) { echo " \n"; } + else { + echo " \n"; + } echo " \n"; } if (permission_exists('device_line_server_address_secondary')) { echo " \n"; - if (isset($_SESSION['provision']['server_address_secondary']['text'])) { - echo " \n"; - } - else { + if (isset($_SESSION['provision']['server_address_secondary']) && !isset($_SESSION['provision']['server_address_secondary']['text'])) { echo " \n"; } + else { + echo " \n"; + } echo " \n"; } if (permission_exists('device_line_outbound_proxy_primary')) { echo " \n"; - if (isset($_SESSION['provision']['outbound_proxy_primary']['text'])) { - echo " \n"; - } - else { + if (isset($_SESSION['provision']['outbound_proxy_primary']) && !isset($_SESSION['provision']['outbound_proxy_primary']['text'])) { echo " \n"; } + else { + echo " \n"; + } echo " \n"; } - + if (permission_exists('device_line_outbound_proxy_secondary')) { echo " \n"; - if (isset($_SESSION['provision']['outbound_proxy_secondary']['text'])) { - echo " \n"; - } - else { + if (isset($_SESSION['provision']['outbound_proxy_secondary']) && !isset($_SESSION['provision']['outbound_proxy_secondary']['text'])) { echo " \n"; } + else { + echo " \n"; + } echo " \n"; } From 2cb787c51cc24665c15c7b575c76f08f8488fed4 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Mon, 19 Oct 2020 22:30:33 -0600 Subject: [PATCH 012/147] Update app_config.php Change voicemail_id to numeric. --- app/voicemails/app_config.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/voicemails/app_config.php b/app/voicemails/app_config.php index 60a2d41e43..c357ce090a 100644 --- a/app/voicemails/app_config.php +++ b/app/voicemails/app_config.php @@ -317,7 +317,7 @@ $apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary"; $z++; $apps[$x]['db'][$y]['fields'][$z]['name'] = "voicemail_id"; - $apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['search'] = 'true'; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the voicemail id."; $z++; From b724852eff589c069dcf99e4e2a2ed47bd5b85e5 Mon Sep 17 00:00:00 2001 From: FusionPBX Date: Tue, 20 Oct 2020 09:41:08 -0600 Subject: [PATCH 013/147] Update device.php When deleting a device make sure it removes any related device_uuid_alternate. --- app/devices/resources/classes/device.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/devices/resources/classes/device.php b/app/devices/resources/classes/device.php index 3629450c0b..de813176cc 100644 --- a/app/devices/resources/classes/device.php +++ b/app/devices/resources/classes/device.php @@ -311,6 +311,12 @@ include "root.php"; //build the delete array foreach ($records as $x => $record) { if ($record['checked'] == 'true' && is_uuid($record['uuid'])) { + $sql = "update v_devices set device_uuid_alternate = null where device_uuid_alternate = :device_uuid_alternate; "; + $parameters['device_uuid_alternate'] = $record['uuid']; + $database = new database; + $database->execute($sql, $parameters); + unset($sql, $parameters); + $array[$this->table][$x][$this->uuid_prefix.'uuid'] = $record['uuid']; $array['device_settings'][$x]['device_uuid'] = $record['uuid']; $array['device_lines'][$x]['device_uuid'] = $record['uuid']; From 58531ac7b1ba11a4316efddbacb14b95ce434723 Mon Sep 17 00:00:00 2001 From: Nate Date: Tue, 20 Oct 2020 11:55:16 -0600 Subject: [PATCH 014/147] Group Manager - Permissions: Add filter for assigned/unassigned. --- core/groups/app_languages.php | 42 +++++++++++++++ core/groups/group_permissions.php | 86 +++++++++++++++++++------------ 2 files changed, 96 insertions(+), 32 deletions(-) diff --git a/core/groups/app_languages.php b/core/groups/app_languages.php index a703294a8c..f984c6967c 100644 --- a/core/groups/app_languages.php +++ b/core/groups/app_languages.php @@ -1681,6 +1681,48 @@ $text['label-12-hour']['ru-ru'] = "12-часовой"; $text['label-12-hour']['sv-se'] = "12-timmars"; $text['label-12-hour']['uk-ua'] = "12-годинний"; +$text['label-assigned']['en-us'] = "Assigned"; +$text['label-assigned']['en-gb'] = "Assigned"; +$text['label-assigned']['ar-eg'] = "Assigned"; +$text['label-assigned']['de-at'] = "Assigned"; +$text['label-assigned']['de-ch'] = "Assigned"; +$text['label-assigned']['de-de'] = "Assigned"; +$text['label-assigned']['es-cl'] = "Assigned"; +$text['label-assigned']['es-mx'] = "Assigned"; +$text['label-assigned']['fr-ca'] = "Assigned"; +$text['label-assigned']['fr-fr'] = "Assigned"; +$text['label-assigned']['he-il'] = "Assigned"; +$text['label-assigned']['it-it'] = "Assigned"; +$text['label-assigned']['nl-nl'] = "Assigned"; +$text['label-assigned']['pl-pl'] = "Assigned"; +$text['label-assigned']['pt-br'] = "Assigned"; +$text['label-assigned']['pt-pt'] = "Assigned"; +$text['label-assigned']['ro-ro'] = "Assigned"; +$text['label-assigned']['ru-ru'] = "Assigned"; +$text['label-assigned']['sv-se'] = "Assigned"; +$text['label-assigned']['uk-ua'] = "Assigned"; + +$text['label-unassigned']['en-us'] = "Unassigned"; +$text['label-unassigned']['en-gb'] = "Unassigned"; +$text['label-unassigned']['ar-eg'] = "Unassigned"; +$text['label-unassigned']['de-at'] = "Unassigned"; +$text['label-unassigned']['de-ch'] = "Unassigned"; +$text['label-unassigned']['de-de'] = "Unassigned"; +$text['label-unassigned']['es-cl'] = "Unassigned"; +$text['label-unassigned']['es-mx'] = "Unassigned"; +$text['label-unassigned']['fr-ca'] = "Unassigned"; +$text['label-unassigned']['fr-fr'] = "Unassigned"; +$text['label-unassigned']['he-il'] = "Unassigned"; +$text['label-unassigned']['it-it'] = "Unassigned"; +$text['label-unassigned']['nl-nl'] = "Unassigned"; +$text['label-unassigned']['pl-pl'] = "Unassigned"; +$text['label-unassigned']['pt-br'] = "Unassigned"; +$text['label-unassigned']['pt-pt'] = "Unassigned"; +$text['label-unassigned']['ro-ro'] = "Unassigned"; +$text['label-unassigned']['ru-ru'] = "Unassigned"; +$text['label-unassigned']['sv-se'] = "Unassigned"; +$text['label-unassigned']['uk-ua'] = "Unassigned"; + $text['header-user_setting-edit']['en-us'] = "User Setting"; $text['header-user_setting-edit']['en-gb'] = "User Setting"; $text['header-user_setting-edit']['ar-eg'] = ""; diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php index b8c92f8729..35a503f975 100644 --- a/core/groups/group_permissions.php +++ b/core/groups/group_permissions.php @@ -94,6 +94,9 @@ } } +//get the view preference + $view = $_REQUEST['view']; + //get the http post data if (is_array($_POST['group_permissions'])) { $action = $_POST['action']; @@ -233,7 +236,7 @@ $token = new token; if (!$token->validate($_SERVER['PHP_SELF'])) { message::add($text['message-invalid_token'],'negative'); - header('Location: group_permissions.php?group_uuid='.urlencode($group_uuid).'&search='.urlencode($search)); + header('Location: group_permissions.php?group_uuid='.urlencode($group_uuid).($view ? '&view='.urlencode($view) : null).($search ? '&search='.urlencode($search) : null)); exit; } @@ -264,10 +267,6 @@ exit; } -//get order and order by - //$order_by = $_GET["order_by"]; - //$order = $_GET["order"]; - //create token $object = new token; $token = $object->create($_SERVER['PHP_SELF']); @@ -287,7 +286,12 @@ } echo "