diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php index 8b0bb08c75..8e6c7d12ff 100644 --- a/app/contacts/contact_phone_edit.php +++ b/app/contacts/contact_phone_edit.php @@ -66,7 +66,7 @@ if (strlen($_GET["contact_uuid"]) > 0) { $phone_description = check_str($_POST["phone_description"]); //remove any phone number formatting - $phone_number = preg_replace('{\D}', '', $phone_number); + $phone_number = preg_replace('{(?!^\+)[\D]}', '', $phone_number); //use custom label if set $phone_label = ($phone_label_custom != '') ? $phone_label_custom : $phone_label; diff --git a/resources/templates/provision/escene/e3xx/{$mac}.xml b/resources/templates/provision/escene/e3xx/{$mac}.xml index cf9428310d..4d1b59b1e6 100644 --- a/resources/templates/provision/escene/e3xx/{$mac}.xml +++ b/resources/templates/provision/escene/e3xx/{$mac}.xml @@ -1,4 +1,5 @@ + {if $smarty.server.HTTPS == "on"}{$https=true}{else}{$https=false}{/if} + {foreach $contacts as $contact} + {$contact_groups[$contact.contact_category]=true} + {/foreach} + + + {$i=0} + {foreach $contact_groups as $name => $true} + + {$i=$i+1} + {/foreach} + + + + {$i=0} + {foreach $contacts as $contact} + + {$i=$i+1} + {/foreach} + +