dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enhance [master] - update Aastra provision templates (#2997) 

* Enhance update Aastra provision templates

add default settings for time format, date format and timezone
hide include folders (they are not provision templates)
update links to documents
add note to 6xxx templates

* Aastra - the descriptions for the time settings are useful.
This commit is contained in:
Mafoo 2018-02-25 08:58:17 +00:00 committed by FusionPBX
parent 282ffb13e3
commit 73d0085dcc
14 changed files with 78 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/devices/device_edit.php
View File

@ -707,7 +707,7 @@
if(is_dir($dh_sub)) { if(is_dir($dh_sub)) {
$templates_sub = scandir($dh_sub); $templates_sub = scandir($dh_sub);
foreach($templates_sub as $dir_sub) { foreach($templates_sub as $dir_sub) {
if($file_sub != '.' && $dir_sub != '..' && $dir_sub[0] != '.') { if($file_sub != '.' && $dir_sub != '..' && $dir_sub[0] != '.' && $dir_sub[0] != 'include') {
if(is_dir($template_dir . '/' . $dir .'/'. $dir_sub)) { if(is_dir($template_dir . '/' . $dir .'/'. $dir_sub)) {
if ($device_template == $dir."/".$dir_sub) { if ($device_template == $dir."/".$dir_sub) {
echo "<option value='".$dir."/".$dir_sub."' selected='selected'>".$dir."/".$dir_sub."</option>\n"; echo "<option value='".$dir."/".$dir_sub."' selected='selected'>".$dir."/".$dir_sub."</option>\n";

24
app/provision/app_config.php
View File

@ -438,5 +438,29 @@
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "spa secure call No or Yes"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "spa secure call No or Yes";
$y++; $y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c471163a-12fa-11e8-b642-0ed5f89f718b";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "aastra_gmt_offset";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Aastra timezone offset in minutes (e.g. 300 = GMT-5 = Eastern Standard Time)";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c47117a2-12fa-11e8-b642-0ed5f89f718b";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "aastra_time_format";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Aastra clock format";
$y++;
$apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c47119aa-12fa-11e8-b642-0ed5f89f718b";
$apps[$x]['default_settings'][$y]['default_setting_category'] = "provision";
$apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "aastra_date_format";
$apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric";
$apps[$x]['default_settings'][$y]['default_setting_value'] = "0";
$apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true";
$apps[$x]['default_settings'][$y]['default_setting_description'] = "Aastra date format";
$y++;
?> ?>

18
core/default_settings/default_setting_edit.php
View File

@ -479,6 +479,24 @@
echo " <option value='superfine' ".(($default_setting_value == 'superfine') ? 'selected' : null).">".$text['label-superfine']."</option>"; echo " <option value='superfine' ".(($default_setting_value == 'superfine') ? 'selected' : null).">".$text['label-superfine']."</option>";
echo " </select>"; echo " </select>";
} }
elseif ($category == "provision" && $subcategory == "aastra_time_format" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='1' ".(($default_setting_value == "1") ? "selected='selected'" : null).">".$text['label-24-hour']."</option>\n";
echo " <option value='0' ".(($default_setting_value == "0") ? "selected='selected'" : null).">".$text['label-12-hour']."</option>\n";
echo " </select>\n";
}
elseif ($category == "provision" && $subcategory == "aastra_date_format" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='0' ".(($default_setting_value == "0") ? "selected='selected'" : null).">WWW MMM DD</option>\n";
echo " <option value='1' ".(($default_setting_value == "1") ? "selected='selected'" : null).">DD-MMM-YY</option>\n";
echo " <option value='2' ".(($default_setting_value == "2") ? "selected='selected'" : null).">YYYY-MM-DD</option>\n";
echo " <option value='3' ".(($default_setting_value == "3") ? "selected='selected'" : null).">DD/MM/YYYY</option>\n";
echo " <option value='4' ".(($default_setting_value == "4") ? "selected='selected'" : null).">DD/MM/YY</option>\n";
echo " <option value='5' ".(($default_setting_value == "5") ? "selected='selected'" : null).">DD-MM-YY</option>\n";
echo " <option value='6' ".(($default_setting_value == "6") ? "selected='selected'" : null).">MM/DD/YY</option>\n";
echo " <option value='7' ".(($default_setting_value == "7") ? "selected='selected'" : null).">MMM DD</option>\n";
echo " </select>\n";
}
elseif ($category == "theme" && $subcategory == "domain_visible" && $name == "text" ) { elseif ($category == "theme" && $subcategory == "domain_visible" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n"; echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='false' ".(($default_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n"; echo " <option value='false' ".(($default_setting_value == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";

18
core/domain_settings/domain_setting_edit.php
View File

@ -586,6 +586,24 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
echo " <option value='superfine' ".(($row['domain_setting_value'] == 'superfine') ? 'selected' : null).">".$text['label-superfine']."</option>"; echo " <option value='superfine' ".(($row['domain_setting_value'] == 'superfine') ? 'selected' : null).">".$text['label-superfine']."</option>";
echo " </select>"; echo " </select>";
} }
elseif ($category == "provision" && $subcategory == "aastra_time_format" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='1' ".(($domain_setting_value == "1") ? "selected='selected'" : null).">".$text['label-24-hour']."</option>\n";
echo " <option value='0' ".(($domain_setting_value == "0") ? "selected='selected'" : null).">".$text['label-12-hour']."</option>\n";
echo " </select>\n";
}
elseif ($category == "provision" && $subcategory == "aastra_date_format" && $name == "text" ) {
echo " <select class='formfld' id='default_setting_value' name='default_setting_value'>\n";
echo " <option value='0' ".(($domain_setting_value == "0") ? "selected='selected'" : null).">WWW MMM DD</option>\n";
echo " <option value='1' ".(($domain_setting_value == "1") ? "selected='selected'" : null).">DD-MMM-YY</option>\n";
echo " <option value='2' ".(($domain_setting_value == "2") ? "selected='selected'" : null).">YYYY-MM-DD</option>\n";
echo " <option value='3' ".(($domain_setting_value == "3") ? "selected='selected'" : null).">DD/MM/YYYY</option>\n";
echo " <option value='4' ".(($domain_setting_value == "4") ? "selected='selected'" : null).">DD/MM/YY</option>\n";
echo " <option value='5' ".(($domain_setting_value == "5") ? "selected='selected'" : null).">DD-MM-YY</option>\n";
echo " <option value='6' ".(($domain_setting_value == "6") ? "selected='selected'" : null).">MM/DD/YY</option>\n";
echo " <option value='7' ".(($domain_setting_value == "7") ? "selected='selected'" : null).">MMM DD</option>\n";
echo " </select>\n";
}
elseif ($category == "theme" && $subcategory == "domain_visible" && $name == "text" ) { elseif ($category == "theme" && $subcategory == "domain_visible" && $name == "text" ) {
echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n"; echo " <select class='formfld' id='domain_setting_value' name='domain_setting_value'>\n";
echo " <option value='false' ".(($row['domain_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n"; echo " <option value='false' ".(($row['domain_setting_value'] == "false") ? "selected='selected'" : null).">".$text['label-false']."</option>\n";

2
resources/templates/provision/aastra/480i/aastra.cfg
View File

@ -1,5 +1,5 @@
# ################# # #################
# Reference Documenation # Reference Documenation
# ################# # #################
# http://miteldocs.com/cps/rde/aadownload/?proj=prod&dl_type=asset&dl_mode=1&dl_id=6425&hash=03e866dd58bfcca3c58ffaa67162d53a&fpart=_P06_XML&dsproject=aastra # https://www.mitel.com/open-solutions-documents/480i
# note: This file must contain something or the phone will not then grab the {$mac}.cfg # note: This file must contain something or the phone will not then grab the {$mac}.cfg

2
resources/templates/provision/aastra/480i/{$mac}.cfg
View File

@ -1,7 +1,7 @@
# ################# # #################
# Reference Documenation # Reference Documenation
# ################# # #################
# http://miteldocs.com/cps/rde/aadownload/?proj=prod&dl_type=asset&dl_mode=1&dl_id=6425&hash=03e866dd58bfcca3c58ffaa67162d53a&fpart=_P06_XML&dsproject=aastra # https://www.mitel.com/open-solutions-documents/480i
{include file='../include/general'} {include file='../include/general'}

1
resources/templates/provision/aastra/673x/aastra.cfg
View File

@ -0,0 +1 @@
# note: This file must contain something or the phone will not then grab the {$mac}.cfg

1
resources/templates/provision/aastra/675x/aastra.cfg
View File

@ -0,0 +1 @@
# note: This file must contain something or the phone will not then grab the {$mac}.cfg

1
resources/templates/provision/aastra/686x/aastra.cfg
View File

@ -0,0 +1 @@
# note: This file must contain something or the phone will not then grab the {$mac}.cfg

2
resources/templates/provision/aastra/9112i/aastra.cfg
View File

@ -1,5 +1,5 @@
# ################# # #################
# Reference Documenation # Reference Documenation
# ################# # #################
# http://miteldocs.com/cps/rde/aadownload/?proj=prod&dl_type=asset&dl_mode=1&dl_id=6425&hash=03e866dd58bfcca3c58ffaa67162d53a&fpart=_P06_XML&dsproject=aastra # https://www.mitel.com/open-solutions-documents/9112i
# note: This file must contain something or the phone will not then grab the {$mac}.cfg # note: This file must contain something or the phone will not then grab the {$mac}.cfg

2
resources/templates/provision/aastra/9112i/{$mac}.cfg
View File

@ -1,7 +1,7 @@
# ################# # #################
# Reference Documenation # Reference Documenation
# ################# # #################
# http://miteldocs.com/cps/rde/aadownload/?proj=prod&dl_type=asset&dl_mode=1&dl_id=6425&hash=03e866dd58bfcca3c58ffaa67162d53a&fpart=_P06_XML&dsproject=aastra # https://www.mitel.com/open-solutions-documents/9112i
{include file='../include/general'} {include file='../include/general'}

2
resources/templates/provision/aastra/9133i/aastra.cfg
View File

@ -1,5 +1,5 @@
# ################# # #################
# Reference Documenation # Reference Documenation
# ################# # #################
# http://miteldocs.com/cps/rde/aadownload/?proj=prod&dl_type=asset&dl_mode=1&dl_id=6425&hash=03e866dd58bfcca3c58ffaa67162d53a&fpart=_P06_XML&dsproject=aastra # https://www.mitel.com/open-solutions-documents/9133i
# note: This file must contain something or the phone will not then grab the {$mac}.cfg # note: This file must contain something or the phone will not then grab the {$mac}.cfg

2
resources/templates/provision/aastra/9133i/{$mac}.cfg
View File

@ -1,7 +1,7 @@
# ################# # #################
# Reference Documenation # Reference Documenation
# ################# # #################
# http://miteldocs.com/cps/rde/aadownload/?proj=prod&dl_type=asset&dl_mode=1&dl_id=6425&hash=03e866dd58bfcca3c58ffaa67162d53a&fpart=_P06_XML&dsproject=aastra # https://www.mitel.com/open-solutions-documents/9133i
{include file='../include/general'} {include file='../include/general'}

11
resources/templates/provision/aastra/include/general
View File

@ -12,11 +12,14 @@
tone set: UK # Australia, Europe (generic tones), France, Germany, Italy, UK, US (also used in Canada) tone set: UK # Australia, Europe (generic tones), France, Germany, Italy, UK, US (also used in Canada)
# === display date and time === # === display date and time ===
time format: 0 # 1 for 24 hr format #time format: 0 # 1 for 24 hr format
date format: 3 # 0 == WWW MMM DD, 1 == DD-MMM-YY, 2 == YYYY-MM-DD, see reference for others #date format: 3 # 0 == WWW MMM DD, 1 == DD-MMM-YY, 2 == YYYY-MM-DD, see reference for others
time zone name: GB-London # Check reference for list of named time zones on page A-27, or set offset below #time zone name: GB-London # Check reference for list of named time zones on page A-27, or set offset below
time zone code: GMT # Check reference for list of named time zones on page A-27, or set offset below #time zone code: GMT # Check reference for list of named time zones on page A-27, or set offset below
#time zone minutes: 300 # Offset in minutes from GMT, 300 = GMT-5 = Eastern Standard Time, -120 = GMT+2 = Eastern European Time #time zone minutes: 300 # Offset in minutes from GMT, 300 = GMT-5 = Eastern Standard Time, -120 = GMT+2 = Eastern European Time
{if isset($aastra_time_format)}time format: ${aastra_time_format}{"\n"}{/if}
{if isset($aastra_date_format)}date format: ${aastra_date_format}{"\n"}{/if}
{if isset($aastra_gmt_offset)}time zone minutes: ${aastra_gmt_offset}{"\n"}{/if}
dst config: 3 # Day Light Savings, 0 == off, 1 == 30 min summertime, 2 == 1 hr summertime, 3 (default) == automatic dst config: 3 # Day Light Savings, 0 == off, 1 == 30 min summertime, 2 == 1 hr summertime, 3 (default) == automatic
dst minutes: 60 # amount of time to offset the clock in minutes dst minutes: 60 # amount of time to offset the clock in minutes
dst start relative date: 1 # Specifies how to interpret the start day, month, and week parameters, 0 - absolute, 1 - relative dst start relative date: 1 # Specifies how to interpret the start day, month, and week parameters, 0 - absolute, 1 - relative