diff --git a/app/devices/app_config.php b/app/devices/app_config.php index 7a81f7c6bb..445240eaef 100644 --- a/app/devices/app_config.php +++ b/app/devices/app_config.php @@ -637,7 +637,11 @@ $apps[$x]['db'][$y]['fields'][$z]['name'] = "device_key_label"; $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the label."; - + $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "device_key_icon"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "ICON Name."; + $y++; $apps[$x]['db'][$y]['table']['name'] = "v_device_profiles"; $apps[$x]['db'][$y]['table']['parent'] = ""; @@ -2910,7 +2914,6 @@ $vendors[$y]['functions'][$z]['groups'][] = "superadmin"; $vendors[$y]['functions'][$z]['groups'][] = "admin"; $z++; - //algo $y++; $vendors[$y]['uuid'] = "dc5ffcb9-5195-4fb8-8b23-f4216ed7f0f6"; diff --git a/app/devices/app_languages.php b/app/devices/app_languages.php index 737958f166..f1b16072c6 100644 --- a/app/devices/app_languages.php +++ b/app/devices/app_languages.php @@ -2681,6 +2681,26 @@ $text['label-device_key_label']['ru-ru'] = "Метка"; $text['label-device_key_label']['sv-se'] = "Etikett"; $text['label-device_key_label']['uk-ua'] = ""; +$text['label-device_key_icon']['en-us'] = "ICON"; +$text['label-device_key_icon']['ar-eg'] = ""; +$text['label-device_key_icon']['de-at'] = ""; +$text['label-device_key_icon']['de-ch'] = ""; +$text['label-device_key_icon']['de-de'] = ""; +$text['label-device_key_icon']['es-cl'] = ""; +$text['label-device_key_icon']['es-mx'] = ""; +$text['label-device_key_icon']['fr-ca'] = ""; +$text['label-device_key_icon']['fr-fr'] = ""; +$text['label-device_key_icon']['he-il'] = ""; +$text['label-device_key_icon']['it-it'] = ""; +$text['label-device_key_icon']['nl-nl'] = ""; +$text['label-device_key_icon']['pl-pl'] = ""; +$text['label-device_key_icon']['pt-br'] = ""; +$text['label-device_key_icon']['pt-pt'] = ""; +$text['label-device_key_icon']['ro-ro'] = ""; +$text['label-device_key_icon']['ru-ru'] = ""; +$text['label-device_key_icon']['sv-se'] = ""; +$text['label-device_key_icon']['uk-ua'] = ""; + $text['label-device_key_id']['en-us'] = "Key"; $text['label-device_key_id']['ar-eg'] = ""; $text['label-device_key_id']['de-at'] = "Taste"; //copied from de-de diff --git a/app/devices/device_dashboard.php b/app/devices/device_dashboard.php index 39215eb1be..369ace80a6 100644 --- a/app/devices/device_dashboard.php +++ b/app/devices/device_dashboard.php @@ -173,6 +173,7 @@ if (strlen($row["device_key_type"]) > 25) { $save = false; echo "type "; } if (strlen($row["device_key_value"]) > 25) { $save = false; echo "value "; } if (strlen($row["device_key_label"]) > 25) { $save = false; echo "label "; } + if (strlen($row["device_key_icon"]) > 25) { $save = false; echo "icon "; } //escape characters in the string $device_uuid = check_str($row["device_uuid"]); @@ -182,6 +183,7 @@ $device_key_line = check_str($row["device_key_line"]); $device_key_value = check_str($row["device_key_value"]); $device_key_label = check_str($row["device_key_label"]); + $device_key_icon = check_str($row["device_key_icon"]); $device_key_category = check_str($row["device_key_category"]); $device_key_vendor = check_str($row["device_key_vendor"]); @@ -197,7 +199,8 @@ //determine what to do with the profile key if ($device_key_id == $database["device_key_id"] && $device_key_value == $database["device_key_value"] - && $device_key_label == $database["device_key_label"]) { + && $device_key_label == $database["device_key_label"] + && $device_key_icon == $database["device_key_icon"]) { //profile key unchanged don't save $save = false; } @@ -236,6 +239,7 @@ $sql .= "device_key_line, "; $sql .= "device_key_value, "; $sql .= "device_key_label, "; + $sql .= "device_key_icon, "; $sql .= "device_key_category, "; $sql .= "device_key_vendor "; $sql .= ") "; @@ -248,6 +252,7 @@ $sql .= "'".$device_key_line."', "; $sql .= "'".$device_key_value."', "; $sql .= "'".$device_key_label."', "; + $sql .= "'".$device_key_icon."', "; $sql .= "'".$device_key_category."', "; $sql .= "'".$device_key_vendor."' "; $sql .= ");"; @@ -267,7 +272,8 @@ } $sql .= "device_key_type = '".$device_key_type."', "; $sql .= "device_key_value = '".$device_key_value."', "; - $sql .= "device_key_label = '".$device_key_label."' "; + $sql .= "device_key_label = '".$device_key_label."', "; + $sql .= "device_key_icon = '".$device_key_icon."' "; $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; $sql .= "and device_key_uuid = '".$device_key_uuid."'; "; } @@ -406,6 +412,7 @@ $device_keys[$x]['device_key_value'] = ''; $device_keys[$x]['device_key_extension'] = ''; $device_keys[$x]['device_key_label'] = ''; + $device_keys[$x]['device_key_icon'] = ''; } //remove the keys the user is not allowed to edit based on the authorized vendor keys @@ -481,6 +488,7 @@ echo " ".$text['label-device_key_value']."\n"; //echo " ".$text['label-device_key_extension']."\n"; echo " ".$text['label-device_key_label']."\n"; + echo " ".$text['label-device_key_icon']."\n"; echo " \n"; } //determine whether to hide the element @@ -633,6 +641,7 @@ echo "\n"; echo " \n"; + echo " \n"; echo " \n"; echo "\n"; diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index a82ca1b666..a3d4ad66b3 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -177,6 +177,7 @@ $device_key_value = check_str($_POST["device_key_value"]); $device_key_extension = check_str($_POST["device_key_extension"]); $device_key_label = check_str($_POST["device_key_label"]); + $device_key_icon = check_str($_POST["device_key_icon"]); //settings //$device_setting_category = check_str($_POST["device_setting_category"]); $device_setting_subcategory = check_str($_POST["device_setting_subcategory"]); @@ -439,6 +440,7 @@ $device_keys[$x]['device_key_value'] = ''; $device_keys[$x]['device_key_extension'] = ''; $device_keys[$x]['device_key_label'] = ''; + $device_keys[$x]['device_key_icon'] = ''; //get the device vendors $sql = "SELECT name "; @@ -1127,6 +1129,7 @@ echo " ".$text['label-device_key_extension']."\n"; } echo " ".$text['label-device_key_label']."\n"; + echo " ".$text['label-device_key_icon']."\n"; echo "  \n"; echo " \n"; } @@ -1149,6 +1152,7 @@ echo " ".$text['label-device_key_extension']."\n"; } echo " ".$text['label-device_key_label']."\n"; + echo " ".$text['label-device_key_icon']."\n"; echo "  \n"; echo " \n"; } @@ -1303,6 +1307,10 @@ echo "\n"; echo " \n"; echo "\n"; + + echo "\n"; + echo " \n"; + echo "\n"; //echo " \n"; //echo " \n"; diff --git a/app/devices/device_key_edit.php b/app/devices/device_key_edit.php index 001bcfb34e..b074ed342e 100644 --- a/app/devices/device_key_edit.php +++ b/app/devices/device_key_edit.php @@ -61,6 +61,7 @@ else { $device_key_value = check_str($_POST["device_key_value"]); $device_key_extension = check_str($_POST["device_key_extension"]); $device_key_label = check_str($_POST["device_key_label"]); + $device_key_icon = check_str($_POST["device_key_icon"]); } if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { @@ -105,7 +106,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "device_key_line, "; $sql .= "device_key_value, "; $sql .= "device_key_extension, "; - $sql .= "device_key_label "; + $sql .= "device_key_label, "; + $sql .= "device_key_icon "; $sql .= ")"; $sql .= "values "; $sql .= "("; @@ -118,7 +120,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "'$device_key_line', "; $sql .= "'$device_key_value', "; $sql .= "'$device_key_extension', "; - $sql .= "'$device_key_label' "; + $sql .= "'$device_key_label', "; + $sql .= "'$device_key_icon' "; $sql .= ")"; $db->exec(check_sql($sql)); unset($sql); @@ -136,7 +139,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "device_key_line = '$device_key_line', "; $sql .= "device_key_value = '$device_key_value', "; $sql .= "device_key_extension = '$device_key_extension', "; - $sql .= "device_key_label = '$device_key_label' "; + $sql .= "device_key_label = '$device_key_label', "; + $sql .= "device_key_icon = '$device_key_icon' "; $sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "and device_key_uuid = '$device_key_uuid' "; $db->exec(check_sql($sql)); @@ -167,6 +171,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $device_key_value = $row["device_key_value"]; $device_key_extension = $row["device_key_extension"]; $device_key_label = $row["device_key_label"]; + $device_key_icon = $row["device_key_icon"]; } unset ($prep_statement); } @@ -543,6 +548,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo $text['description-device_key_label']."\n"; echo "\n"; echo "\n"; + + echo "\n"; + echo "\n"; + echo " ".$text['label-device_key_icon']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo $text['description-device_key_icon']."\n"; + echo "\n"; + echo "\n"; echo " \n"; echo " \n"; echo " \n"; @@ -559,4 +575,4 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //include the footer require_once "resources/footer.php"; -?> \ No newline at end of file +?> diff --git a/app/devices/device_profile_edit.php b/app/devices/device_profile_edit.php index 8f42e00f6d..e27168067a 100644 --- a/app/devices/device_profile_edit.php +++ b/app/devices/device_profile_edit.php @@ -63,6 +63,7 @@ $device_key_value = check_str($_POST["device_key_value"]); $device_key_extension = check_str($_POST["device_key_extension"]); $device_key_label = check_str($_POST["device_key_label"]); + $device_key_icon = check_str($_POST["device_key_icon"]); //$device_setting_category = check_str($_POST["device_setting_category"]); $device_setting_subcategory = check_str($_POST["device_setting_subcategory"]); @@ -241,6 +242,7 @@ $device_keys[$x]['device_key_extension'] = ''; $device_keys[$x]['device_key_protected'] = ''; $device_keys[$x]['device_key_label'] = ''; + $device_keys[$x]['device_key_icon'] = ''; //get the vendors $sql = "SELECT * "; @@ -367,6 +369,8 @@ } echo " ".$text['label-device_key_label']."\n"; echo "  \n"; + echo " ".$text['label-device_key_icon']."\n"; + echo "  \n"; echo " \n"; } @@ -399,6 +403,7 @@ echo " ".$text['label-device_key_protected']."\n"; } echo " ".$text['label-device_key_label']."\n"; + echo " ".$text['label-device_key_icon']."\n"; echo "  \n"; echo " \n"; } @@ -573,6 +578,10 @@ echo "\n"; echo " \n"; echo "\n"; + + echo "\n"; + echo " \n"; + echo "\n"; echo "\n"; if (strlen($row['device_key_uuid']) > 0) { diff --git a/app/fanvil/app_config.php b/app/fanvil/app_config.php index f118204bed..c3ff7bec51 100644 --- a/app/fanvil/app_config.php +++ b/app/fanvil/app_config.php @@ -534,5 +534,332 @@ $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; $apps[$x]['default_settings'][$y]['default_setting_description'] = "EGS Syslog Server Port"; $y++; - + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "68feb973-be9a-42ac-94a1-54263dfde589"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_lldp_tx_enable"; + $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'] = " LLDP Transmit. 0-Disabled, 1-Enabled"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "f0d1dd5b-7130-428c-bddb-a975d85587f5"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_lldp_refresh"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "60"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "LLDP Refresh Timer. Default 60 seconds"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "10af1d27-ef61-4c7c-94cf-8db797a84ebc"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_lldp_learn"; + $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'] = "Use LLDP learned information such as voip vlan"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b4cc791a-5389-4e1f-9f87-e8394b399d64"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_enable_vlan"; + $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'] = "Enable VLAN Support. 0 - NO, 1 - Yes"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "16d74bd9-7f44-4780-a202-3cfcbaa6ef5a"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_lan_port_vlan"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "256"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Default VLAN for phone LAN port."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "530564ac-17aa-4167-b047-bf764250d91a"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_pc_port_vlan"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "1"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Default VLAN for phone PC port."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "2b72e19b-2437-45c0-9df5-4fef6ac078c6"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_enable_diffserv"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "1"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable DiffServ(DSCP) Support. 0 - NO, 1 - Yes"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "86081f7e-af03-41b9-a5af-b5593182c9ff"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_qos_rtp_voice"; + $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'] = "Layer 2 QoS 802.1p Priority Value for RTP Voice media"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8050cfbd-44d1-46db-b553-2cc0defd5fc2"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_qos_rtp_video"; + $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'] = "Layer 2 QoS 802.1p Priority Value for RTP Video media"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "ddf89377-7303-435c-917a-bdd32579cf36"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_qos_sip"; + $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'] = "Layer 2 QoS 802.1p Priority Value for SIP signaling"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "b6a89aa6-2e21-489c-8f1f-e819e6ced17b"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_dscp_rtp_voice"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "46"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Layer 3 QoS DSCP Value for RTP Voice media"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "9a22bd5b-c2b0-4c06-bd19-63ef58837011"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_dscp_rtp_video"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "46"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Layer 3 QoS DSCP Value for RTP Video media"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "94effa7d-8c0f-4cca-b617-9d2d24748aa7"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_dscp_sip"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "-1"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Layer 3 QoS DSCP Value for SIP signaling (Disabled by default)"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "49f2ff3f-0628-44fa-a8d2-82cb38fbaf98"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_video_codec"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "H264"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable video codec on sip lines (Only h264 currently supported)"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "be8c1341-3cb6-4aa8-bef5-642ff11199e8"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_syslog_enable"; + $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'] = "Enable Syslog server"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8281507b-80fa-450a-94b7-6f58a7a9e6e1"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_syslog_server"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "0.0.0.0"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Syslog Server ip"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "db7595a1-318b-49d8-86a6-8ff4b44e30f5"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_syslog_server_port"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "514"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Syslog Server Port number"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "67a916be-35df-44f1-ab12-81756fd1f911"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_default_answer_mode"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "2"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Answer call as audio only or audio with video. 1-Audio, 2-Video"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "bbbdf01c-d760-43cf-958d-e47c54dd3997"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_default_dial_mode"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "1"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Dial call as audio only or audio with video. 1-Audio, 2-Video Note: If you set this to video, then video is offered in the first invite which can cause your call to hang or not complete if going through a sip trunk provider."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "37ddabf0-8d7c-494f-b381-5bc4e3048bff"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_enable_auto_upgrade"; + $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'] = "Enable firmware auto upgrade 0 - NO, 1 - Yes"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "5a2a79c3-befb-4b7a-998d-3f0bfc9fcde4"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_upgrade_server_1"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "https://server.yourdomain.com/app/fanvil/resources/firmware"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Auto upgrade firmware server 1."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "de60a8fb-628a-4ee3-a76a-ff3e0a7f045f"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_upgrade_server_2"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "https://server2.yourdomain.com/app/fanvil/resources/firmware"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Auto upgrade firmware server 2."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "09134520-647a-4a86-bffd-d927aff2b33b"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_upgrade_interval"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "24"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "true"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Check for firmware every X hours."; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3ca2b12b-21f1-4a6d-a0eb-8670105c77d9"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_i20s"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "i20S2.1.1.3664T20180809203309.z"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the i20S firmware ROM"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d07be0b3-a34b-4739-a227-766231e5bb52"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_i23s"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "i23S2.1.1.3664T20180809204215.z"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the i23S firmware ROM"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "6e0d313d-e44a-446f-9274-99e778d87cf5"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_i30"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "i302.1.1.3664T20180809203614.z"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the i30 firmware ROM"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "a3cf0c35-4f92-4607-84a6-b06b29d67134"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_i31s"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "i31S2.1.1.3664T20180809203916.z"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the i31S firmware ROM"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "235ccea6-5ed0-45ff-a03f-d0cbc6ebaf01"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_x2p"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "x2-mono2.8.0.6251T20181017203533.z"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the X2P firmware ROM"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "8912437c-7142-4a85-b4aa-f83c1e50ad30"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_x3"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "x3s2.8.0.6251T20181017202549.z"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the X3S/G firmware ROM"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "756059c7-b754-4285-be22-0d51c82d62b3"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_x4"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "x42.8.0.6251T20181017202853.z"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the X4/G firmware ROM"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "122ba840-7dee-4c8e-a93c-739681b4b1d4"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_x5s"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "x5s-6900-P0.13.3-1.8.0-2698T2018-09-30-15.23.04.z"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the X5S firmware ROM"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "32635e1c-dcb8-44e1-a0c4-5209b4f84392"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_firmware_x6"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "x6-6914-P0.13.3-1.8.0-2697T2018-09-30-15.10.00.z"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = " Filename of the X6 firmware ROM"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "4b7f56f3-31a9-46dd-b588-35b253024b1f"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_switch_mode"; + $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'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "0 - Monostable, 1 - Bistable"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "316ce083-69ba-4932-be02-845d3ed8f585"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_enable_card_reader"; + $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'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable RFID Card Reader. 0 - NO, 1 - Yes"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "7226d18c-7d49-449b-be7b-8cfb46c1ddb3"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_enable_indoor_open"; + $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'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Use indoor switch to unlock the door. 0 - NO, 1 - Yes"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "83dce10f-6254-490c-af89-a2a004890c47"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_enable_access_table"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "1"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Default: Enabled. 0 - NO, 1 - Yes"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "d4ffbf45-5abe-4ef3-9cf7-f222257d5633"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_opening_door_code_remote"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "*"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Default: *"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "c51013fc-765e-4758-99a9-2738cfe9a7dd"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_opening_door_code_local"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "6789"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Default: 6789"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "0c5fe247-0361-4c69-a247-d14b5417e53e"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_enable_syslog"; + $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'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "Enable EGS Syslog. 0 - NO, 1 - Yes"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "1a74a177-49fc-432e-b10e-39c7d0c7ddc4"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_log_server"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "text"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "0.0.0.0"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "EGS Syslog Server. Hostname or IP"; + $y++; + $apps[$x]['default_settings'][$y]['default_setting_uuid'] = "3fb2a87b-89b1-4d53-923d-c1478aec4f58"; + $apps[$x]['default_settings'][$y]['default_setting_category'] = "provision"; + $apps[$x]['default_settings'][$y]['default_setting_subcategory'] = "fanvil_egs_log_port"; + $apps[$x]['default_settings'][$y]['default_setting_name'] = "numeric"; + $apps[$x]['default_settings'][$y]['default_setting_value'] = "514"; + $apps[$x]['default_settings'][$y]['default_setting_enabled'] = "false"; + $apps[$x]['default_settings'][$y]['default_setting_description'] = "EGS Syslog Server Port"; + $y++; ?> diff --git a/app/provision/resources/classes/provision.php b/app/provision/resources/classes/provision.php index bf83c278c5..1e45f99926 100644 --- a/app/provision/resources/classes/provision.php +++ b/app/provision/resources/classes/provision.php @@ -1115,6 +1115,7 @@ include "root.php"; $device_keys[$k]['device_key_value'] = str_replace("\${".$name."}", $value, $field['device_key_value']); $device_keys[$k]['device_key_extension'] = str_replace("\${".$name."}", $value, $field['device_key_extension']); $device_keys[$k]['device_key_label'] = str_replace("\${".$name."}", $value, $field['device_key_label']); + $device_keys[$k]['device_key_icon'] = str_replace("\${".$name."}", $value, $field['device_key_icon']); } else { if (is_array($field)) { @@ -1122,6 +1123,7 @@ include "root.php"; $device_keys[$k][$key]['device_key_value'] = str_replace("\${".$name."}", $value, $row['device_key_value']); $device_keys[$k][$key]['device_key_extension'] = str_replace("\${".$name."}", $value, $row['device_key_extension']); $device_keys[$k][$key]['device_key_label'] = str_replace("\${".$name."}", $value, $row['device_key_label']); + $device_keys[$k][$key]['device_key_icon'] = str_replace("\${".$name."}", $value, $row['device_key_icon']); } } } @@ -1145,11 +1147,13 @@ include "root.php"; $device_key_value = $row['device_key_value']; //1 $device_key_extension = $row['device_key_extension']; $device_key_label = $row['device_key_label']; //label + $device_key_icon = $row['device_key_icon']; //icon //add general variables $device_key_value = str_replace("\${domain_name}", $domain_name, $device_key_value); $device_key_extension = str_replace("\${domain_name}", $domain_name, $device_key_extension); $device_key_label = str_replace("\${domain_name}", $domain_name, $device_key_label); + $device_key_icon = str_replace("\${domain_name}", $domain_name, $device_key_icon); //grandstream modes are different based on the category if ($device_vendor == "grandstream") { @@ -1199,6 +1203,7 @@ include "root.php"; $view->assign("key_value_".$device_key_id, $device_key_value); $view->assign("key_extension_".$device_key_id, $device_key_extension); $view->assign("key_label_".$device_key_id, $device_key_label); + $view->assign("key_icon_".$device_key_id, $device_key_icon); } else { $view->assign($device_key_category."_key_id_".$device_key_id, $device_key_id); @@ -1207,6 +1212,7 @@ include "root.php"; $view->assign($device_key_category."_key_value_".$device_key_id, $device_key_value); $view->assign($device_key_category."_key_extension_".$device_key_id, $device_key_extension); $view->assign($device_key_category."_key_label_".$device_key_id, $device_key_label); + $view->assign($device_key_category."_key_icon_".$device_key_id, $device_key_icon); } } } diff --git a/resources/templates/provision/fanvil/x6/{$mac}.cfg b/resources/templates/provision/fanvil/x6/{$mac}.cfg index 3fd2a22b25..579e2ad004 100644 --- a/resources/templates/provision/fanvil/x6/{$mac}.cfg +++ b/resources/templates/provision/fanvil/x6/{$mac}.cfg @@ -1776,7 +1776,7 @@ - {strip}{*-- Each Internal Index contains 12 keys --*}{/strip} +{strip}{*-- Each Internal Index contains 12 keys --*}{/strip} {foreach $keys["memory"] as $row} {if $row.device_key_id <= 12} @@ -1784,7 +1784,7 @@ 1 {$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type} {$row.device_key_label} - Blue + {$row.device_key_icon} {/if} {/foreach} @@ -1796,7 +1796,7 @@ 1 {$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type} {$row.device_key_label} - Green + {$row.device_key_icon} {/if} {/foreach} @@ -1808,7 +1808,7 @@ 1 {$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type} {$row.device_key_label} - Red + {$row.device_key_icon} {/if} {/foreach} @@ -1820,7 +1820,7 @@ 1 {$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type} {$row.device_key_label} - Purple + {$row.device_key_icon} {/if} {/foreach} @@ -1832,7 +1832,7 @@ 1 {$row.device_key_value}@{$row.device_key_line}/{$row.device_key_type} {$row.device_key_label} - Yellow + {$row.device_key_icon} {/if} {/foreach}