diff --git a/README.md b/README.md index 6e4104093d..f511b25784 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ Commercial Support -------------------------------------- These options support the project and cover any kind of help you might need from architecture, installation, best practices, troubleshooting, custom feature programming, and training. -1. [Commercial Paid Support](http://fusionpbx.com/support.php) +1. [Commercial Paid Support](http://fusionpbx.com/support.php) 2. [Custom Feature Development](http://fusionpbx.com/support.php) 3. [Admin Training](http://fusionpbx.com) 4. [Advanced Training](http://fusionpbx.com) @@ -39,7 +39,7 @@ These options support the project and cover any kind of help you might need from Software Requirements -------------------------------------- -- [Debian Jessie](http://cdimage.debian.org/debian-cd/8.1.0/amd64/iso-cd/debian-8.1.0-amd64-netinst.iso) - Recommended +- [Debian Jessie](http://cdimage.debian.org/debian-cd/8.1.0/amd64/iso-cd/debian-8.1.0-amd64-netinst.iso) - Recommended This is the distribution recommended by the FreeSwitch team - Fusion will also install on Debian Wheezy, Ubuntu 10.10 LTS and is known to work on FreeBSD - [FusionPBX Installer](http://fusionpbx.com) @@ -50,14 +50,14 @@ Community We have a pretty thriving community if you know how to get to us: - [IRC](http://webchat.freenode.net/) in the fusionpbx channel -- [Twitter](http://twitter.com/fusionpbx) +- [Twitter](http://twitter.com/fusionpbx) - [Website](http://fusionpbx.com) Contributing --------------------------------------- ###Requirements -It's easy to contribute to FusionPBX the only thing we ask before accepting your pull request is that you sign a Contributor License Agreement. +It's easy to contribute to FusionPBX the only thing we ask before accepting your pull request is that you sign a Contributor License Agreement. We ask that you sign the Contributor License Agreement for the following reasons: 1. It protects FusionPBX by you gauranteeing that your contributions are yours to contribute and not the property of an employer or something found on the web. @@ -88,5 +88,5 @@ chmod 755 install_fusionpbx.sh ``` Installation Questions: -- During the install it will ask you to press continue after verifying that the command ran successfully. This is usually the case, so you can simply tell it to continue. The install also asks several questions. +- During the install it will ask you to press continue after verifying that the command ran successfully. This is usually the case, so you can simply tell it to continue. The install also asks several questions. - Unless you have a reason to choose otherwise, PostgreSQL and Nginx is probably your best path and is recommended by the developers of FusionPBX diff --git a/app/access_controls/access_control_edit.php b/app/access_controls/access_control_edit.php index d867fe507c..560c520824 100644 --- a/app/access_controls/access_control_edit.php +++ b/app/access_controls/access_control_edit.php @@ -96,7 +96,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { return; } //if ($action == "update") - } //if ($_POST["persistformvar"] != "true") + } //if ($_POST["persistformvar"] != "true") } //(count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) //pre-populate the form @@ -155,13 +155,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo " \n"; echo " \n"; - if ($node_type == "allow") { + if ($node_type == "allow") { echo " \n"; } else { echo " \n"; } - if ($node_type == "deny") { + if ($node_type == "deny") { echo " \n"; } else { diff --git a/app/access_controls/access_control_nodes.php b/app/access_controls/access_control_nodes.php index ab5f69ff43..8eb67b69e1 100644 --- a/app/access_controls/access_control_nodes.php +++ b/app/access_controls/access_control_nodes.php @@ -56,9 +56,9 @@ else { $rows_per_page = 1000; $param = ""; $page = $_GET['page']; - if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } - list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); - $offset = $rows_per_page * $page; + if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } + list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); + $offset = $rows_per_page * $page; //get the list $sql = "select * from v_access_control_nodes "; diff --git a/app/access_controls/access_controls.php b/app/access_controls/access_controls.php index 561eaf2d35..91d963650c 100644 --- a/app/access_controls/access_controls.php +++ b/app/access_controls/access_controls.php @@ -60,9 +60,9 @@ else { $rows_per_page = 10; $param = ""; $page = $_GET['page']; - if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } - list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); - $offset = $rows_per_page * $page; + if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } + list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); + $offset = $rows_per_page * $page; //get the list $sql = "select * from v_access_controls "; diff --git a/app/adminer/adminer.css b/app/adminer/adminer.css index 4d718c11e8..885a31c53d 100644 --- a/app/adminer/adminer.css +++ b/app/adminer/adminer.css @@ -314,7 +314,7 @@ fieldset { /*** Others ***/ #lang { background: transparent; - font-size: .9em; + font-size: .9em; left: auto; right: 90px; position:fixed; diff --git a/app/call_block/call_block.php b/app/call_block/call_block.php index 0890af6c80..b314f7345b 100644 --- a/app/call_block/call_block.php +++ b/app/call_block/call_block.php @@ -139,7 +139,7 @@ require_once "resources/require.php"; } echo " ".$tmp_date_added."\n"; echo " ".$row['call_block_action']."\n"; - echo " ".ucwords($row['call_block_enabled'])."\n"; + echo " ".$text['label-'.$row['call_block_enabled']]."\n"; echo " "; if (permission_exists('call_block_edit')) { echo "$v_link_label_edit"; diff --git a/app/call_centers/resources/classes/call_center.php b/app/call_centers/resources/classes/call_center.php index 9e40c3cb76..23723497ed 100644 --- a/app/call_centers/resources/classes/call_center.php +++ b/app/call_centers/resources/classes/call_center.php @@ -26,7 +26,7 @@ /** * cache class provides an abstracted cache - * + * * @method string dialplan - builds the dialplan for call center */ //define the call center class diff --git a/app/calls/resources/classes/call_forward.php b/app/calls/resources/classes/call_forward.php index 2886856180..af35bbed74 100644 --- a/app/calls/resources/classes/call_forward.php +++ b/app/calls/resources/classes/call_forward.php @@ -24,7 +24,7 @@ Mark J Crane Luis Daniel Lucio Quiroz Errol Samuels - + */ include "root.php"; diff --git a/app/click_to_call/app_languages.php b/app/click_to_call/app_languages.php index 2618da035b..9573234bf9 100644 --- a/app/click_to_call/app_languages.php +++ b/app/click_to_call/app_languages.php @@ -165,7 +165,7 @@ $text['opt-itring']['es-cl'] = "it-ring"; $text['opt-itring']['pt-pt'] = "it-ring"; $text['opt-itring']['fr-fr'] = "it-ring"; - + $text['opt-moh']['en-us'] = "music"; $text['opt-moh']['es-cl'] = "musica"; $text['opt-moh']['pt-pt'] = "música"; diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index 303c333476..742819ac03 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -165,7 +165,7 @@ else { echo " \n"; echo " ".$row['conference_center_extension']." \n"; //echo " ".$row['conference_center_order']." \n"; - echo " ".ucwords($row['conference_center_enabled'])." \n"; + echo " ".$text['label-'.$row['conference_center_enabled']]." \n"; echo " ".$row['conference_center_description']." \n"; echo " "; if (permission_exists('conference_center_edit')) { diff --git a/app/contacts/contact_extensions.php b/app/contacts/contact_extensions.php index 95148688ff..5064225441 100644 --- a/app/contacts/contact_extensions.php +++ b/app/contacts/contact_extensions.php @@ -98,7 +98,7 @@ else { echo $row['extension']; } echo " \n"; - echo " ".ucwords($row['enabled'])." \n"; + echo " ".$text['label-'.$row['enabled']]." \n"; echo " ".$row['description']." \n"; echo " "; if (permission_exists('extension_edit')) { diff --git a/app/contacts/contact_settings.php b/app/contacts/contact_settings.php index 66ff90ab30..ecc053eb8c 100644 --- a/app/contacts/contact_settings.php +++ b/app/contacts/contact_settings.php @@ -104,7 +104,7 @@ else { } echo "  \n"; echo " \n"; - echo " ".ucwords($row['contact_setting_enabled'])." \n"; + echo " ".$text['label-'.$row['contact_setting_enabled']]." \n"; echo " ".$row['contact_setting_description']." \n"; echo " "; if (permission_exists('contact_setting_edit')) { diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php index a8b6e99cf5..6bd8a315d0 100644 --- a/app/destinations/destinations.php +++ b/app/destinations/destinations.php @@ -179,7 +179,7 @@ else { echo " ".ucwords($row['destination_type'])."\n"; echo " ".format_phone($row['destination_number'])."\n"; echo " ".$row['destination_context']."\n"; - echo " ".ucwords($row['destination_enabled'])."\n"; + echo " ".$text['label-'.$row['destination_enabled']]."\n"; echo " ".$row['destination_description']." \n"; echo " "; if (permission_exists('destination_edit')) { diff --git a/app/dialplan/dialplans.php b/app/dialplan/dialplans.php index cd8d4c8ec7..531a38a1a5 100644 --- a/app/dialplan/dialplans.php +++ b/app/dialplan/dialplans.php @@ -316,7 +316,7 @@ else { echo " ".$row['dialplan_context']."\n"; echo " ".$row['dialplan_order']."\n"; echo " "; - echo " ".ucwords($row['dialplan_enabled'])."\n"; + echo " ".$text['label-'.$row['dialplan_enabled']]."\n"; echo " \n"; echo " ".((strlen($row['dialplan_description']) > 0) ? $row['dialplan_description'] : " ")."\n"; echo " \n"; diff --git a/app/dialplan/resources/classes/dialplan.php b/app/dialplan/resources/classes/dialplan.php index 35848c2353..4fddce35ad 100644 --- a/app/dialplan/resources/classes/dialplan.php +++ b/app/dialplan/resources/classes/dialplan.php @@ -485,7 +485,7 @@ include "root.php"; $dialplan_detail_data = str_replace("\$1", $regex_match_1, $dialplan_detail_data); $dialplan_detail_data = str_replace("\$2", $regex_match_2, $dialplan_detail_data); $dialplan_detail_data = str_replace("\$3", $regex_match_3, $dialplan_detail_data); - $this->bridges = $dialplan_detail_data; + $this->bridges = $dialplan_detail_data; } } } diff --git a/app/dialplan/resources/switch/conf/dialplan/310_att_xfer.xml b/app/dialplan/resources/switch/conf/dialplan/310_att_xfer.xml index dd4003baff..b68b56351c 100644 --- a/app/dialplan/resources/switch/conf/dialplan/310_att_xfer.xml +++ b/app/dialplan/resources/switch/conf/dialplan/310_att_xfer.xml @@ -1,4 +1,4 @@ - + diff --git a/app/dialplan/resources/switch/conf/dialplan/410_freeswitch_conference.xml b/app/dialplan/resources/switch/conf/dialplan/410_freeswitch_conference.xml index 8189b0a8fa..b6ff2d4f24 100644 --- a/app/dialplan/resources/switch/conf/dialplan/410_freeswitch_conference.xml +++ b/app/dialplan/resources/switch/conf/dialplan/410_freeswitch_conference.xml @@ -2,7 +2,7 @@ - diff --git a/app/dialplan/resources/switch/conf/dialplan/430_directory.xml b/app/dialplan/resources/switch/conf/dialplan/430_directory.xml index eb60633b39..88a57083aa 100644 --- a/app/dialplan/resources/switch/conf/dialplan/430_directory.xml +++ b/app/dialplan/resources/switch/conf/dialplan/430_directory.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/app/dialplan_inbound/app_defaults.php b/app/dialplan_inbound/app_defaults.php index 6055dd5090..918f0787d1 100644 --- a/app/dialplan_inbound/app_defaults.php +++ b/app/dialplan_inbound/app_defaults.php @@ -60,7 +60,7 @@ if (count($_SESSION["domains"]) > 1) { //make sure the public directory and xml file exist if (strlen($_SESSION['switch']['dialplan']['dir']) > 0) { - if (!is_dir($_SESSION['switch']['dialplan']['dir'].'/public'.$_SESSION['domains'][$domain_uuid]['domain_name'])) { + if (!is_dir($_SESSION['switch']['dialplan']['dir'].'/public'.$_SESSION['domains'][$domain_uuid]['domain_name'])) { mkdir($_SESSION['switch']['dialplan']['dir'].'/public/'.$_SESSION['domains'][$domain_uuid]['domain_name'],0777,true); } $file = $_SESSION['switch']['dialplan']['dir']."/public/".$_SESSION['domains'][$domain_uuid]['domain_name'].".xml"; diff --git a/app/edit/filedelete.php b/app/edit/filedelete.php index bcfcfff7b5..b4a7442cfb 100644 --- a/app/edit/filedelete.php +++ b/app/edit/filedelete.php @@ -57,7 +57,7 @@ else { echo ""; echo " "; echo " "; - echo " "; + echo " "; echo " "; echo " "; echo " "; diff --git a/app/extensions/extension_download.php b/app/extensions/extension_download.php index 3fa035b416..034ba2ed46 100644 --- a/app/extensions/extension_download.php +++ b/app/extensions/extension_download.php @@ -61,7 +61,7 @@ function download_send_headers($filename) { header("Cache-Control: max-age=0, no-cache, must-revalidate, proxy-revalidate"); header("Last-Modified: {$now} GMT"); - // force download + // force download header("Content-Type: application/force-download"); header("Content-Type: application/octet-stream"); header("Content-Type: application/download"); @@ -154,9 +154,9 @@ $row_style["1"] = "row_style1"; echo ""; echo ""; + echo ""; echo ""; + echo ""; echo ""; echo ""; foreach ($columns as $value) { @@ -164,9 +164,9 @@ $row_style["1"] = "row_style1"; echo " "; echo " "; + echo ""; echo " "; + echo ""; echo ""; if ($c==0) { $c=1; } else { $c=0; } } @@ -181,7 +181,7 @@ $row_style["1"] = "row_style1"; echo "
".$text['label-path']."
".$folder.$file."
"; echo " Column Name"; - echo " Description"; - echo "
"; echo " $value"; - echo ""; - echo "
"; echo "

"; echo ""; - + //include the footer require_once "resources/footer.php"; ?> \ No newline at end of file diff --git a/app/fax/fax_send.php b/app/fax/fax_send.php index 35b17e5a2b..7ba61f42c6 100644 --- a/app/fax/fax_send.php +++ b/app/fax/fax_send.php @@ -151,15 +151,15 @@ if(!function_exists('fax_enqueue')) { $date_utc_now_sql = "datetime('now')"; } $sql = <<prepare($sql); diff --git a/app/fax/resources/classes/fax.php b/app/fax/resources/classes/fax.php index 534e48fc1d..d20d842dca 100644 --- a/app/fax/resources/classes/fax.php +++ b/app/fax/resources/classes/fax.php @@ -26,7 +26,7 @@ /** * cache class provides an abstracted cache - * + * * @method string dialplan - builds the dialplan for the fax servers */ //define the fax class @@ -150,7 +150,7 @@ $dialplan["dialplan_details"][$y]["dialplan_detail_data"] = substr($data,8,strlen($data)); } elseif (substr($data,0,9) == "outbound:") {} - else { + else { $dialplan["dialplan_details"][$y]["dialplan_detail_data"] = $data; } $dialplan["dialplan_details"][$y]["dialplan_detail_group"] = "1"; diff --git a/app/fifo_list/fifo_interactive_inc.php b/app/fifo_list/fifo_interactive_inc.php index 0761c53436..3db0b39600 100644 --- a/app/fifo_list/fifo_interactive_inc.php +++ b/app/fifo_list/fifo_interactive_inc.php @@ -188,8 +188,8 @@ else { if ($c==0) { $c=1; } else { $c=0; } } echo "\n"; - - + + //Current logged members //set the alternating row styles $c = 0; @@ -201,33 +201,33 @@ else { echo "\n"; echo "

Logged in agents

\n"; - + //show the content echo "\n"; - - + + echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; - - + + //print_r($xml->fifo->outbound->member[0]); //print_r($xml->fifo->outbound->member[1]); - + foreach ($xml->fifo->outbound->member as $row) { - - + + $username=explode("@",$row); $username=explode("/",$username[0]); $username=$username[1]; - + $fifo_duration_formatted=$row["logged-on-since"]; $fifo_total_inbound_calls=$row["outbound-call-total-count"]; - + echo "\n"; echo "\n"; echo "\n"; diff --git a/app/ivr_menus/ivr_menus.php b/app/ivr_menus/ivr_menus.php index 624efb90ba..c945ec683a 100644 --- a/app/ivr_menus/ivr_menus.php +++ b/app/ivr_menus/ivr_menus.php @@ -127,7 +127,7 @@ else { echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; if (permission_exists('ring_group_forward')) { echo " \n"; } diff --git a/app/scripts/resources/classes/scripts.php b/app/scripts/resources/classes/scripts.php index c07bde2950..a322f55199 100644 --- a/app/scripts/resources/classes/scripts.php +++ b/app/scripts/resources/classes/scripts.php @@ -27,7 +27,7 @@ /** * scripts class provides methods for creating the config.lua and copying switch scripts - * + * * @method string correct_path * @method string copy_files * @method string write_config @@ -110,7 +110,7 @@ class scripts { global $db_path; global $db_username; global $db_password; - + //replace the backslash with a forward slash $db_path = str_replace("\\", "/", $db_path); diff --git a/app/services/resources/classes/lib_win.php b/app/services/resources/classes/lib_win.php index 6368893376..4469e4898c 100644 --- a/app/services/resources/classes/lib_win.php +++ b/app/services/resources/classes/lib_win.php @@ -154,7 +154,7 @@ if(function_exists('reg_open_key')){ HKEY_CLASSES_ROOT => "HKCR", HKEY_CURRENT_USER => "HKCU", HKEY_LOCAL_MACHINE => "HKLM", - HKEY_USERS => "HKU", + HKEY_USERS => "HKU", HKEY_CURRENT_CONFIG => "HKCC", ); diff --git a/app/sip_profiles/resources/xml/sip_profiles/default.xml b/app/sip_profiles/resources/xml/sip_profiles/default.xml index 9f7a0354ae..fcdb8e136b 100644 --- a/app/sip_profiles/resources/xml/sip_profiles/default.xml +++ b/app/sip_profiles/resources/xml/sip_profiles/default.xml @@ -1,5 +1,5 @@ - + diff --git a/app/sip_profiles/resources/xml/sip_profiles/external-ipv6.xml b/app/sip_profiles/resources/xml/sip_profiles/external-ipv6.xml index f48bc7ed0e..ae4083ebe9 100644 --- a/app/sip_profiles/resources/xml/sip_profiles/external-ipv6.xml +++ b/app/sip_profiles/resources/xml/sip_profiles/external-ipv6.xml @@ -1,8 +1,8 @@ - + - diff --git a/app/sip_profiles/resources/xml/sip_profiles/external.xml b/app/sip_profiles/resources/xml/sip_profiles/external.xml index f48bc7ed0e..ae4083ebe9 100644 --- a/app/sip_profiles/resources/xml/sip_profiles/external.xml +++ b/app/sip_profiles/resources/xml/sip_profiles/external.xml @@ -1,8 +1,8 @@ - + - diff --git a/app/sip_profiles/resources/xml/sip_profiles/internal-ipv6.xml b/app/sip_profiles/resources/xml/sip_profiles/internal-ipv6.xml index e35b3c515e..70a4db4a72 100644 --- a/app/sip_profiles/resources/xml/sip_profiles/internal-ipv6.xml +++ b/app/sip_profiles/resources/xml/sip_profiles/internal-ipv6.xml @@ -1,5 +1,5 @@ - + {v_sip_profile_settings} diff --git a/app/sip_profiles/resources/xml/sip_profiles/internal.xml b/app/sip_profiles/resources/xml/sip_profiles/internal.xml index 3df6f585b3..f277d833c2 100644 --- a/app/sip_profiles/resources/xml/sip_profiles/internal.xml +++ b/app/sip_profiles/resources/xml/sip_profiles/internal.xml @@ -1,5 +1,5 @@ - + - + diff --git a/app/sql_query/sql_query_pdo.php b/app/sql_query/sql_query_pdo.php index cd6fbee6fd..31fd525535 100644 --- a/app/sql_query/sql_query_pdo.php +++ b/app/sql_query/sql_query_pdo.php @@ -39,7 +39,7 @@ else { $db_path = $db_file_path; $db_name = $dbfilename; } - + //get the db connection information if (strlen($_REQUEST['id']) > 0) { $sql = "select * from v_databases "; diff --git a/app/time_conditions/app_defaults.php b/app/time_conditions/app_defaults.php index 2fa4411a74..7160318b06 100644 --- a/app/time_conditions/app_defaults.php +++ b/app/time_conditions/app_defaults.php @@ -64,7 +64,7 @@ if ($domains_processed == 1) { } } } - + //add the missing default settings foreach ($missing as $row) { //add the default settings @@ -84,7 +84,7 @@ if ($domains_processed == 1) { $array[$x]['default_setting_enabled'] = 'true'; $array[$x]['default_setting_description'] = 'What region to use by default when choosing Time Conditions'; $x++; - + //iterate and add each, if necessary foreach ($array as $index => $default_settings) { diff --git a/app/time_conditions/time_condition_edit.php b/app/time_conditions/time_condition_edit.php index 1a3178ddcb..e1870452e0 100644 --- a/app/time_conditions/time_condition_edit.php +++ b/app/time_conditions/time_condition_edit.php @@ -49,7 +49,7 @@ require_once "resources/header.php"; $available_presets[] = json_decode($json, true); } unset($preset_region); - + //set the action as an add or an update if (isset($_REQUEST["id"])) { $action = "update"; @@ -250,14 +250,14 @@ require_once "resources/header.php"; $is_preset = (in_array($group_id, $_REQUEST['preset'])) ? true : false; //set group and order number - + $dialplan_detail_group_user = check_str($_POST["group_$group_id"]); if($dialplan_detail_group_user!='') { $dialplan_detail_group = $dialplan_detail_group_user; } else { $dialplan_detail_group = $group_id; - } - + } + $dialplan_detail_order = 0; foreach ($conditions as $cond_num => $cond_var) { diff --git a/app/traffic_graph/svg_graph.php b/app/traffic_graph/svg_graph.php index 1fc6a2836e..9188c9c7da 100644 --- a/app/traffic_graph/svg_graph.php +++ b/app/traffic_graph/svg_graph.php @@ -2,21 +2,21 @@ /* graph.php part of m0n0wall (http://m0n0.ch/wall) - + Copyright (C) 2004-2006 T. Lechat , Manuel Kasper and Jonathan Watt . All rights reserved. - + Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE @@ -197,7 +197,7 @@ function fetch_data() { function plot_data(obj) { // Show datetimelegend var now = new Date(); - var datetime = (now.getMonth()+1) + "/" + now.getDate() + "/" + now.getFullYear() + ' ' + + var datetime = (now.getMonth()+1) + "/" + now.getDate() + "/" + now.getFullYear() + ' ' + LZ(now.getHours()) + ":" + LZ(now.getMinutes()) + ":" + LZ(now.getSeconds()); SVGDoc.getElementById('datetime').firstChild.data = datetime; @@ -223,7 +223,7 @@ function plot_data(obj) { last_ugmt = ugmt; last_ifin = ifin; last_ifout = ifout; - + switch (plot_in.length) { case 0: SVGDoc.getElementById("collect_initial").setAttributeNS(null, 'visibility', 'visible'); @@ -296,7 +296,7 @@ function plot_data(obj) { rmax *= 1.25; else rmax *= 2; - + if (i == 8) rmax *= 1.024; } diff --git a/app/vars/app_defaults.php b/app/vars/app_defaults.php index 1a0c840845..6f5a12dd23 100644 --- a/app/vars/app_defaults.php +++ b/app/vars/app_defaults.php @@ -121,7 +121,7 @@ EOD; if ( $country_iso===NULL ) { return; } - + if(isset($countries[$country_iso])){ $country = $countries[$country_iso]; @@ -133,7 +133,7 @@ EOD; if ($prep_statement) { $prep_statement->execute(); $row = $prep_statement->fetch(PDO::FETCH_ASSOC); - + if ($row['num_rows'] == 0) { $sql = "insert into v_vars "; $sql .= "("; @@ -161,7 +161,7 @@ EOD; } } unset($prep_statement, $sql); - + // Set default Country code $sql = "select count(*) as num_rows from v_vars "; $sql .= "where var_name = 'default_countrycode' "; @@ -197,7 +197,7 @@ EOD; } } unset($prep_statement, $sql); - + // Set default International Direct Dialing code $sql = "select count(*) as num_rows from v_vars "; $sql .= "where var_name = 'default_exitcode' "; @@ -229,11 +229,11 @@ EOD; $sql .= ");"; $db->exec(check_sql($sql)); unset($sql, $row); - $x++; + $x++; } } unset($prep_statement, $sql); - + unset($countries); } } diff --git a/app/voicemails/app_defaults.php b/app/voicemails/app_defaults.php index c5ecfd2c3a..8845132c68 100644 --- a/app/voicemails/app_defaults.php +++ b/app/voicemails/app_defaults.php @@ -79,7 +79,7 @@ if ($domains_processed == 1) { } } - //add that the directory structure for voicemail each domain and voicemail id is + //add that the directory structure for voicemail each domain and voicemail id is $sql = "select d.domain_name, v.voicemail_id "; $sql .= "from v_domains as d, v_voicemails as v "; $sql .= "where v.domain_uuid = d.domain_uuid "; diff --git a/app/voicemails/voicemails.php b/app/voicemails/voicemails.php index 4224259456..be0343e997 100644 --- a/app/voicemails/voicemails.php +++ b/app/voicemails/voicemails.php @@ -186,7 +186,7 @@ else { echo " ".$text['label-greetings']."\n"; } echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; if (permission_exists('voicemail_edit') || permission_exists('voicemail_delete')) { echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo " '); @@ -2192,14 +2192,14 @@ if (lf) label = lf(label, s); - + fragments.push( '' + ''); } if (rowStarted) fragments.push(''); - + if (fragments.length == 0) return; @@ -2243,10 +2243,10 @@ // interactive features - + var highlights = [], redrawTimeout = null; - + // returns the data item the mouse is over, or null if none is found function findNearbyItem(mouseX, mouseY, seriesFilter) { var maxDistance = options.grid.mouseActiveRadius, @@ -2256,7 +2256,7 @@ for (i = series.length - 1; i >= 0; --i) { if (!seriesFilter(series[i])) continue; - + var s = series[i], axisx = s.xaxis, axisy = s.yaxis, @@ -2273,13 +2273,13 @@ maxx = Number.MAX_VALUE; if (axisy.options.inverseTransform) maxy = Number.MAX_VALUE; - + if (s.lines.show || s.points.show) { for (j = 0; j < points.length; j += ps) { var x = points[j], y = points[j + 1]; if (x == null) continue; - + // For points and lines, the cursor must be within a // certain distance to the data point if (x - mx > maxx || x - mx < -maxx || @@ -2300,19 +2300,19 @@ } } } - + if (s.bars.show && !item) { // no other point can be nearby var barLeft = s.bars.align == "left" ? 0 : -s.bars.barWidth/2, barRight = barLeft + s.bars.barWidth; - + for (j = 0; j < points.length; j += ps) { var x = points[j], y = points[j + 1], b = points[j + 2]; if (x == null) continue; - + // for a bar graph, the cursor must be inside the bar - if (series[i].bars.horizontal ? - (mx <= Math.max(b, x) && mx >= Math.min(b, x) && + if (series[i].bars.horizontal ? + (mx <= Math.max(b, x) && mx >= Math.min(b, x) && my >= y + barLeft && my <= y + barRight) : (mx >= x + barLeft && mx <= x + barRight && my >= Math.min(b, y) && my <= Math.max(b, y))) @@ -2325,13 +2325,13 @@ i = item[0]; j = item[1]; ps = series[i].datapoints.pointsize; - + return { datapoint: series[i].datapoints.points.slice(j * ps, (j + 1) * ps), dataIndex: j, series: series[i], seriesIndex: i }; } - + return null; } @@ -2381,11 +2381,11 @@ h.point[1] == item.datapoint[1])) unhighlight(h.series, h.point); } - + if (item) highlight(item.series, item.datapoint, eventname); } - + placeholder.trigger(eventname, [ pos, item ]); } @@ -2401,7 +2401,7 @@ octx.save(); octx.clearRect(0, 0, canvasWidth, canvasHeight); octx.translate(plotOffset.left, plotOffset.top); - + var i, hi; for (i = 0; i < highlights.length; ++i) { hi = highlights[i]; @@ -2412,10 +2412,10 @@ drawPointHighlight(hi.series, hi.point); } octx.restore(); - + executeHooks(hooks.drawOverlay, [octx]); } - + function highlight(s, point, auto) { if (typeof s == "number") s = series[s]; @@ -2434,13 +2434,13 @@ else if (!auto) highlights[i].auto = false; } - + function unhighlight(s, point) { if (s == null && point == null) { highlights = []; triggerRedrawOverlay(); } - + if (typeof s == "number") s = series[s]; @@ -2454,7 +2454,7 @@ triggerRedrawOverlay(); } } - + function indexOfHighlight(s, p) { for (var i = 0; i < highlights.length; ++i) { var h = highlights[i]; @@ -2464,21 +2464,21 @@ } return -1; } - + function drawPointHighlight(series, point) { var x = point[0], y = point[1], axisx = series.xaxis, axisy = series.yaxis; - + if (x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max) return; - + var pointRadius = series.points.radius + series.points.lineWidth / 2; octx.lineWidth = pointRadius; octx.strokeStyle = $.color.parse(series.color).scale('a', 0.5).toString(); var radius = 1.5 * pointRadius, x = axisx.p2c(x), y = axisy.p2c(y); - + octx.beginPath(); if (series.points.symbol == "circle") octx.arc(x, y, radius, 0, 2 * Math.PI, false); @@ -2505,7 +2505,7 @@ // supports a simple vertical gradient properly, so that's // what we support too var gradient = ctx.createLinearGradient(0, top, 0, bottom); - + for (var i = 0, l = spec.colors.length; i < l; ++i) { var c = spec.colors[i]; if (typeof c != "string") { @@ -2518,7 +2518,7 @@ } gradient.addColorStop(i / (l - 1), c); } - + return gradient; } } @@ -2532,7 +2532,7 @@ }; $.plot.version = "0.7"; - + $.plot.plugins = []; // returns a string with the date d formatted according to fmt @@ -2541,7 +2541,7 @@ n = "" + n; return n.length == 1 ? "0" + n : n; }; - + var r = []; var escape = false, padNext = false; var hours = d.getUTCHours(); @@ -2558,7 +2558,7 @@ } for (var i = 0; i < fmt.length; ++i) { var c = fmt.charAt(i); - + if (escape) { switch (c) { case 'h': c = "" + hours; break; @@ -2590,10 +2590,10 @@ } return r.join(""); }; - + // round to nearby lower multiple of base function floorInBase(n, base) { return base * Math.floor(n / base); } - + })(jQuery); diff --git a/resources/jquery/flot/jquery.flot.time.js b/resources/jquery/flot/jquery.flot.time.js index b06cca72f0..81413058cf 100644 --- a/resources/jquery/flot/jquery.flot.time.js +++ b/resources/jquery/flot/jquery.flot.time.js @@ -158,7 +158,7 @@ API.txt for details. return makeUtcWrapper(new Date(ts)); } } - + // map of app. size of time units in milliseconds var timeUnitSize = { @@ -176,9 +176,9 @@ API.txt for details. var baseSpec = [ [1, "second"], [2, "second"], [5, "second"], [10, "second"], - [30, "second"], + [30, "second"], [1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"], - [30, "minute"], + [30, "minute"], [1, "hour"], [2, "hour"], [4, "hour"], [8, "hour"], [12, "hour"], [1, "day"], [2, "day"], [3, "day"], diff --git a/resources/jquery/jquery-ui.css b/resources/jquery/jquery-ui.css index df86d40fdf..e29302631a 100644 --- a/resources/jquery/jquery-ui.css +++ b/resources/jquery/jquery-ui.css @@ -53,8 +53,8 @@ .ui-button, .ui-button:link, .ui-button:visited, .ui-button:hover, .ui-button:active { text-decoration: none; } .ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ -.ui-button-icons-only { width: 3.4em; } -button.ui-button-icons-only { width: 3.7em; } +.ui-button-icons-only { width: 3.4em; } +button.ui-button-icons-only { width: 3.7em; } /*button text element */ .ui-button .ui-button-text { display: block; line-height: 1.4; } @@ -92,7 +92,7 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad .ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } .ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } .ui-datepicker select.ui-datepicker-month-year {width: 100%;} -.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-month, .ui-datepicker select.ui-datepicker-year { width: 49%;} .ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } .ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } diff --git a/resources/templates/conf/autoload_configs/cidlookup.conf.xml b/resources/templates/conf/autoload_configs/cidlookup.conf.xml index 264f754e92..03c7db0ce2 100644 --- a/resources/templates/conf/autoload_configs/cidlookup.conf.xml +++ b/resources/templates/conf/autoload_configs/cidlookup.conf.xml @@ -23,7 +23,7 @@ WHERE v_contact_phones.contact_uuid = v_contacts.contact_uuid AND (v_contact_pho LIMIT 1 "/> - - - + diff --git a/resources/templates/conf/autoload_configs/directory.conf.xml b/resources/templates/conf/autoload_configs/directory.conf.xml index 79c5b479da..c8ae57d406 100644 --- a/resources/templates/conf/autoload_configs/directory.conf.xml +++ b/resources/templates/conf/autoload_configs/directory.conf.xml @@ -18,4 +18,4 @@ - + diff --git a/resources/templates/conf/autoload_configs/easyroute.conf.xml b/resources/templates/conf/autoload_configs/easyroute.conf.xml index 350a50989b..2ae834be70 100644 --- a/resources/templates/conf/autoload_configs/easyroute.conf.xml +++ b/resources/templates/conf/autoload_configs/easyroute.conf.xml @@ -7,7 +7,7 @@ - + @@ -21,7 +21,7 @@ call_limit varchar(16) - contains optional call limit tech_prefix varchar(128) - tech prefix used to build dial string (ex: sofia/default ) acctcode varchar(128) - used to set channel variable acctcode for logging into the CDRs - destination_number varchar(16) - Number returning for the query for building the dial string. (ex: 18005551212) + destination_number varchar(16) - Number returning for the query for building the dial string. (ex: 18005551212) See Documentation on the Wiki for further information --> diff --git a/resources/templates/conf/autoload_configs/erlang_event.conf.xml b/resources/templates/conf/autoload_configs/erlang_event.conf.xml index 62deb84f67..9620809090 100644 --- a/resources/templates/conf/autoload_configs/erlang_event.conf.xml +++ b/resources/templates/conf/autoload_configs/erlang_event.conf.xml @@ -16,7 +16,7 @@ - + diff --git a/resources/templates/conf/autoload_configs/freetdm.conf.xml b/resources/templates/conf/autoload_configs/freetdm.conf.xml index d90d2d6ede..9e68e707f5 100644 --- a/resources/templates/conf/autoload_configs/freetdm.conf.xml +++ b/resources/templates/conf/autoload_configs/freetdm.conf.xml @@ -1,6 +1,6 @@ - - + - @@ -65,7 +65,7 @@ with the signaling protocols that you can run on top of your I/O interfaces. - @@ -76,7 +76,7 @@ with the signaling protocols that you can run on top of your I/O interfaces. --> - @@ -92,10 +92,10 @@ with the signaling protocols that you can run on top of your I/O interfaces. - - + - - - @@ -237,23 +237,23 @@ with the signaling protocols that you can run on top of your I/O interfaces. WARNING: advanced users only! I really mean it this parameter is commented by default because YOU DON'T NEED IT UNLESS YOU REALLY GROK MFC/R2 - READ COMMENTS on doc/r2proto.conf in openr2 package + READ COMMENTS on doc/r2proto.conf in openr2 package for more info --> - - - @@ -284,7 +284,7 @@ with the signaling protocols that you can run on top of your I/O interfaces. - @@ -478,7 +478,7 @@ with the signaling protocols that you can run on top of your I/O interfaces. CID Name transmit method How to transmit Caller ID Name - + Possible values: display-ie user-user-ie @@ -499,11 +499,11 @@ with the signaling protocols that you can run on top of your I/O interfaces. --> - - - @@ -537,13 +537,13 @@ with the signaling protocols that you can run on top of your I/O interfaces. - - + diff --git a/resources/templates/conf/autoload_configs/httapi.conf.xml b/resources/templates/conf/autoload_configs/httapi.conf.xml index c2fe584a02..27beaa31ec 100644 --- a/resources/templates/conf/autoload_configs/httapi.conf.xml +++ b/resources/templates/conf/autoload_configs/httapi.conf.xml @@ -29,20 +29,20 @@ - - @@ -58,15 +58,15 @@ - @@ -79,11 +79,11 @@ - + - + diff --git a/resources/templates/conf/autoload_configs/lcr.conf.xml b/resources/templates/conf/autoload_configs/lcr.conf.xml index a752591f85..45ca9bf3a4 100644 --- a/resources/templates/conf/autoload_configs/lcr.conf.xml +++ b/resources/templates/conf/autoload_configs/lcr.conf.xml @@ -15,7 +15,7 @@ - diff --git a/resources/templates/conf/autoload_configs/lua.conf.xml b/resources/templates/conf/autoload_configs/lua.conf.xml index 49326fea81..7f8bd7a3db 100644 --- a/resources/templates/conf/autoload_configs/lua.conf.xml +++ b/resources/templates/conf/autoload_configs/lua.conf.xml @@ -1,14 +1,14 @@ - - @@ -21,7 +21,7 @@ diff --git a/resources/templates/conf/autoload_configs/modules.conf.xml b/resources/templates/conf/autoload_configs/modules.conf.xml index b313579409..e9fb9d445a 100644 --- a/resources/templates/conf/autoload_configs/modules.conf.xml +++ b/resources/templates/conf/autoload_configs/modules.conf.xml @@ -1,6 +1,6 @@ - + @@ -113,7 +113,7 @@ - + diff --git a/resources/templates/conf/autoload_configs/mongo.conf.xml b/resources/templates/conf/autoload_configs/mongo.conf.xml index 8423645e95..175268857a 100644 --- a/resources/templates/conf/autoload_configs/mongo.conf.xml +++ b/resources/templates/conf/autoload_configs/mongo.conf.xml @@ -1,6 +1,6 @@ - diff --git a/resources/templates/conf/autoload_configs/portaudio.conf.xml b/resources/templates/conf/autoload_configs/portaudio.conf.xml index 02c21ef449..eac74271e7 100644 --- a/resources/templates/conf/autoload_configs/portaudio.conf.xml +++ b/resources/templates/conf/autoload_configs/portaudio.conf.xml @@ -1,7 +1,7 @@ - @@ -33,7 +33,7 @@ - - - @@ -74,13 +74,13 @@ - - - - - @@ -162,50 +162,50 @@ - - - - - - diff --git a/resources/templates/conf/autoload_configs/python.conf.xml b/resources/templates/conf/autoload_configs/python.conf.xml index d3a8fdc755..62c4d6229f 100644 --- a/resources/templates/conf/autoload_configs/python.conf.xml +++ b/resources/templates/conf/autoload_configs/python.conf.xml @@ -6,7 +6,7 @@ diff --git a/resources/templates/conf/autoload_configs/sangoma_codec.conf.xml b/resources/templates/conf/autoload_configs/sangoma_codec.conf.xml index eed9d673e1..0a75b534fa 100644 --- a/resources/templates/conf/autoload_configs/sangoma_codec.conf.xml +++ b/resources/templates/conf/autoload_configs/sangoma_codec.conf.xml @@ -2,17 +2,17 @@ - diff --git a/resources/templates/conf/autoload_configs/spandsp.conf.xml b/resources/templates/conf/autoload_configs/spandsp.conf.xml index 9306c46c5c..05bb70b0a5 100644 --- a/resources/templates/conf/autoload_configs/spandsp.conf.xml +++ b/resources/templates/conf/autoload_configs/spandsp.conf.xml @@ -1,7 +1,7 @@ @@ -45,7 +45,7 @@ - - - - diff --git a/resources/templates/conf/autoload_configs/tts_commandline.conf.xml b/resources/templates/conf/autoload_configs/tts_commandline.conf.xml index eb816431be..f0f4e28e56 100644 --- a/resources/templates/conf/autoload_configs/tts_commandline.conf.xml +++ b/resources/templates/conf/autoload_configs/tts_commandline.conf.xml @@ -6,7 +6,7 @@ ${rate}: sample rate (example: 8000) ${voice}: voice_name passed to TTS(quoted) ${file}: output file (quoted, including .wav extension) - + Example commands can be found at: http://wiki.freeswitch.org/wiki/Mod_tts_commandline#Example_commands --> diff --git a/resources/templates/conf/autoload_configs/voicemail.conf.xml b/resources/templates/conf/autoload_configs/voicemail.conf.xml index 3cd777ec4c..64db287868 100644 --- a/resources/templates/conf/autoload_configs/voicemail.conf.xml +++ b/resources/templates/conf/autoload_configs/voicemail.conf.xml @@ -67,4 +67,4 @@ - + diff --git a/resources/templates/conf/autoload_configs/voicemail_ivr.conf.xml b/resources/templates/conf/autoload_configs/voicemail_ivr.conf.xml index 529509a495..13214df322 100644 --- a/resources/templates/conf/autoload_configs/voicemail_ivr.conf.xml +++ b/resources/templates/conf/autoload_configs/voicemail_ivr.conf.xml @@ -150,7 +150,7 @@ - + diff --git a/resources/templates/conf/autoload_configs/xml_cdr.conf.xml b/resources/templates/conf/autoload_configs/xml_cdr.conf.xml index 336ea33486..56fee3aab9 100644 --- a/resources/templates/conf/autoload_configs/xml_cdr.conf.xml +++ b/resources/templates/conf/autoload_configs/xml_cdr.conf.xml @@ -22,7 +22,7 @@ - + @@ -30,15 +30,15 @@ - + - + - + @@ -18,7 +18,7 @@ - + diff --git a/resources/templates/conf/dialplan/features.xml.noload b/resources/templates/conf/dialplan/features.xml.noload index ac0d5eb73a..204a4b6fc8 100644 --- a/resources/templates/conf/dialplan/features.xml.noload +++ b/resources/templates/conf/dialplan/features.xml.noload @@ -54,7 +54,7 @@ - + diff --git a/resources/templates/conf/dialplan/public.xml.noload b/resources/templates/conf/dialplan/public.xml.noload index 4935b1f10d..8f6dd4a2ab 100644 --- a/resources/templates/conf/dialplan/public.xml.noload +++ b/resources/templates/conf/dialplan/public.xml.noload @@ -2,10 +2,10 @@ NOTICE: This context is usually accessed via the external sip profile listening on port 5080. - + It is recommended to have separate inbound and outbound contexts. Not only for security but clearing up why you would need to do such a thing. You don't want outside un-authenticated - callers hitting your default context which allows dialing calls thru your providers and results + callers hitting your default context which allows dialing calls thru your providers and results in Toll Fraud. --> @@ -22,8 +22,8 @@ diff --git a/resources/templates/conf/dialplan/public/00_inbound_did.xml.noload b/resources/templates/conf/dialplan/public/00_inbound_did.xml.noload index d40b3ab2c9..22b7223014 100644 --- a/resources/templates/conf/dialplan/public/00_inbound_did.xml.noload +++ b/resources/templates/conf/dialplan/public/00_inbound_did.xml.noload @@ -4,12 +4,12 @@ + --> diff --git a/resources/templates/conf/directory/default.xml.noload b/resources/templates/conf/directory/default.xml.noload index 8af7aea135..818586b509 100644 --- a/resources/templates/conf/directory/default.xml.noload +++ b/resources/templates/conf/directory/default.xml.noload @@ -1,9 +1,9 @@ @@ -41,7 +41,7 @@ diff --git a/resources/templates/conf/directory/default/brian.xml.noload b/resources/templates/conf/directory/default/brian.xml.noload index 05fe0c8324..2cbb68fc76 100644 --- a/resources/templates/conf/directory/default/brian.xml.noload +++ b/resources/templates/conf/directory/default/brian.xml.noload @@ -1,7 +1,7 @@ @@ -16,7 +16,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -74,7 +74,7 @@ - diff --git a/resources/templates/conf/directory/default/default.xml.noload b/resources/templates/conf/directory/default/default.xml.noload index 05eb1b4001..bdddab9cac 100644 --- a/resources/templates/conf/directory/default/default.xml.noload +++ b/resources/templates/conf/directory/default/default.xml.noload @@ -6,8 +6,8 @@ Let it be known that this user can register without a password but since we do not assign this user a user_context and we don't authenticate this user they will be put in context 'public'. - This isn't a security issue as the endpoint would be put into the same context 'public' as the - sofia profile that starts on 5080 by default. If you're paranoid just remove this file and + This isn't a security issue as the endpoint would be put into the same context 'public' as the + sofia profile that starts on 5080 by default. If you're paranoid just remove this file and remove the external profile also. --> diff --git a/resources/templates/conf/extensions.conf b/resources/templates/conf/extensions.conf index f2c922efce..c2f02f62db 100644 --- a/resources/templates/conf/extensions.conf +++ b/resources/templates/conf/extensions.conf @@ -15,7 +15,7 @@ exten => ~^(18(0{2}|8{2}|7{2}|6{2})\d{7})$,n,bridge(${enum_auto_route}) ; instead of exten, put anything about the call you would rather match on. ; either the names of a field in caller_profile or a string of variables to expand. -caller_id_number => 2137991400,n,Goto(default|music) +caller_id_number => 2137991400,n,Goto(default|music) ${sip_from_user} => bill,n,Goto(default|music) diff --git a/resources/templates/conf/freeswitch.xml b/resources/templates/conf/freeswitch.xml index e25bbc3f70..3988ea09be 100644 --- a/resources/templates/conf/freeswitch.xml +++ b/resources/templates/conf/freeswitch.xml @@ -1,24 +1,24 @@ - @@ -41,7 +41,7 @@
- +
diff --git a/resources/templates/conf/freetdm.conf b/resources/templates/conf/freetdm.conf index 6c73b4d011..04fa9e8307 100644 --- a/resources/templates/conf/freetdm.conf +++ b/resources/templates/conf/freetdm.conf @@ -6,7 +6,7 @@ ; whether to launch a thread for CPU usage monitoring cpu_monitor => no -; How often (in milliseconds) monitor CPU usage +; How often (in milliseconds) monitor CPU usage cpu_monitoring_interval => 1000 ; At what CPU percentage raise a CPU alarm diff --git a/resources/templates/conf/ivr_menus/demo_ivr.xml b/resources/templates/conf/ivr_menus/demo_ivr.xml index 0e2c074939..670aa3c294 100644 --- a/resources/templates/conf/ivr_menus/demo_ivr.xml +++ b/resources/templates/conf/ivr_menus/demo_ivr.xml @@ -27,7 +27,7 @@ - + diff --git a/resources/templates/conf/lang/en/ivr/sounds.xml b/resources/templates/conf/lang/en/ivr/sounds.xml index 03e0bf6d17..a1c9a56b81 100644 --- a/resources/templates/conf/lang/en/ivr/sounds.xml +++ b/resources/templates/conf/lang/en/ivr/sounds.xml @@ -18,7 +18,7 @@ - + @@ -85,7 +85,7 @@ - + diff --git a/resources/templates/conf/lang/he/demo/demo-ivr.xml b/resources/templates/conf/lang/he/demo/demo-ivr.xml index 3d91605de6..d95157fd3f 100644 --- a/resources/templates/conf/lang/he/demo/demo-ivr.xml +++ b/resources/templates/conf/lang/he/demo/demo-ivr.xml @@ -67,7 +67,7 @@ - + diff --git a/resources/templates/conf/lang/ru/demo/demo-ivr.xml b/resources/templates/conf/lang/ru/demo/demo-ivr.xml index 8c6f3f8624..71962c05a1 100644 --- a/resources/templates/conf/lang/ru/demo/demo-ivr.xml +++ b/resources/templates/conf/lang/ru/demo/demo-ivr.xml @@ -66,7 +66,7 @@ - + @@ -129,7 +129,7 @@ - + diff --git a/resources/templates/conf/lang/ru/vm/sounds.xml b/resources/templates/conf/lang/ru/vm/sounds.xml index ffd9ec5d8c..4e9c87a9fc 100644 --- a/resources/templates/conf/lang/ru/vm/sounds.xml +++ b/resources/templates/conf/lang/ru/vm/sounds.xml @@ -55,7 +55,7 @@ - + @@ -65,16 +65,16 @@ - + - + - + @@ -299,9 +299,9 @@ - + - + @@ -322,7 +322,7 @@ - + diff --git a/resources/templates/conf/lang/ru/vm/tts.xml b/resources/templates/conf/lang/ru/vm/tts.xml index 1fc877d50e..3264b33e8b 100644 --- a/resources/templates/conf/lang/ru/vm/tts.xml +++ b/resources/templates/conf/lang/ru/vm/tts.xml @@ -63,7 +63,7 @@ - @@ -73,7 +73,7 @@ - @@ -92,7 +92,7 @@ - @@ -101,7 +101,7 @@ - @@ -134,7 +134,7 @@ - diff --git a/resources/templates/conf/notify-voicemail.tpl b/resources/templates/conf/notify-voicemail.tpl index 365faa2921..470b900ff7 100644 --- a/resources/templates/conf/notify-voicemail.tpl +++ b/resources/templates/conf/notify-voicemail.tpl @@ -5,7 +5,7 @@ Subject: Voicemail from "${voicemail_caller_id_name}" <${voicemail_caller_id_num X-Priority: ${voicemail_priority} X-Mailer: FreeSWITCH -Content-Type: multipart/alternative; +Content-Type: multipart/alternative; boundary="000XXX000" --000XXX000 diff --git a/resources/templates/conf/sip_profiles/external-ipv6.xml.noload b/resources/templates/conf/sip_profiles/external-ipv6.xml.noload index fccbf724fe..f56d2f910c 100644 --- a/resources/templates/conf/sip_profiles/external-ipv6.xml.noload +++ b/resources/templates/conf/sip_profiles/external-ipv6.xml.noload @@ -1,9 +1,9 @@ - + - @@ -19,7 +19,7 @@ - + @@ -38,9 +38,9 @@ - diff --git a/resources/templates/conf/sip_profiles/external.xml.noload b/resources/templates/conf/sip_profiles/external.xml.noload index cebcdab4a8..6a612126d4 100644 --- a/resources/templates/conf/sip_profiles/external.xml.noload +++ b/resources/templates/conf/sip_profiles/external.xml.noload @@ -1,12 +1,12 @@ - + - @@ -22,7 +22,7 @@ - + @@ -41,9 +41,9 @@ - diff --git a/resources/templates/conf/sip_profiles/external/example.xml b/resources/templates/conf/sip_profiles/external/example.xml index 70668a9ce5..2a4df31aaf 100644 --- a/resources/templates/conf/sip_profiles/external/example.xml +++ b/resources/templates/conf/sip_profiles/external/example.xml @@ -9,7 +9,7 @@ - + diff --git a/resources/templates/conf/sip_profiles/internal.xml.noload b/resources/templates/conf/sip_profiles/internal.xml.noload index 56d21bc623..d864714911 100644 --- a/resources/templates/conf/sip_profiles/internal.xml.noload +++ b/resources/templates/conf/sip_profiles/internal.xml.noload @@ -24,7 +24,7 @@ - + @@ -34,7 +34,7 @@ --> @@ -51,7 +51,7 @@ - @@ -111,7 +111,7 @@ @@ -192,7 +192,7 @@ - @@ -223,7 +223,7 @@ - @@ -285,7 +285,7 @@ - @@ -294,7 +294,7 @@ - diff --git a/resources/templates/conf/sip_profiles/internal/example.xml b/resources/templates/conf/sip_profiles/internal/example.xml index fc061f96d1..10263b05a5 100644 --- a/resources/templates/conf/sip_profiles/internal/example.xml +++ b/resources/templates/conf/sip_profiles/internal/example.xml @@ -9,7 +9,7 @@ - + diff --git a/resources/templates/conf/vars.xml b/resources/templates/conf/vars.xml index 1095e7e218..4c19ef927f 100644 --- a/resources/templates/conf/vars.xml +++ b/resources/templates/conf/vars.xml @@ -1,6 +1,6 @@ @@ -9,8 +9,8 @@ @@ -21,18 +21,18 @@ - + used by: dingaling.conf.xml enum.conf.xml + --> - @@ -172,7 +172,7 @@ + --> diff --git a/resources/templates/conf/voicemail.tpl b/resources/templates/conf/voicemail.tpl index 2774b78a9e..8404f38edb 100644 --- a/resources/templates/conf/voicemail.tpl +++ b/resources/templates/conf/voicemail.tpl @@ -5,7 +5,7 @@ Subject: Voicemail from "${voicemail_caller_id_name}" <${voicemail_caller_id_num X-Priority: ${voicemail_priority} X-Mailer: FreeSWITCH -Content-Type: multipart/alternative; +Content-Type: multipart/alternative; boundary="000XXX000" --000XXX000 diff --git a/resources/templates/provision/atcom/ag198/{$mac}.cfg b/resources/templates/provision/atcom/ag198/{$mac}.cfg index 03ef25e8fd..34cc26b25b 100644 --- a/resources/templates/provision/atcom/ag198/{$mac}.cfg +++ b/resources/templates/provision/atcom/ag198/{$mac}.cfg @@ -1,4 +1,4 @@ -<>Version:2.0002 +<>Version:2.0002 Static IP : diff --git a/resources/templates/provision/cisco/7940/SIP{$mac}.cnf b/resources/templates/provision/cisco/7940/SIP{$mac}.cnf index 9c1258c199..c75a497c61 100644 --- a/resources/templates/provision/cisco/7940/SIP{$mac}.cnf +++ b/resources/templates/provision/cisco/7940/SIP{$mac}.cnf @@ -67,7 +67,7 @@ cnf_join_enable: "1" ; 0-Disabled, 1-Enabled (default) # Allow Transfer to be completed while target phone is still ringing semi_attended_transfer: "0" ; 0-Disabled, 1-Enabled (default) -# Telnet Level (enable or disable the ability to telnet into this phone +# Telnet Level (enable or disable the ability to telnet into this phone telnet_level: "2" ; 0-Disabled (default), 1-Enabled, 2-Privileged # Inband DTMF Settings (0-disable, 1-enable (default)) diff --git a/resources/templates/provision/cisco/7960/SIP{$mac}.cnf b/resources/templates/provision/cisco/7960/SIP{$mac}.cnf index 9c1258c199..c75a497c61 100644 --- a/resources/templates/provision/cisco/7960/SIP{$mac}.cnf +++ b/resources/templates/provision/cisco/7960/SIP{$mac}.cnf @@ -67,7 +67,7 @@ cnf_join_enable: "1" ; 0-Disabled, 1-Enabled (default) # Allow Transfer to be completed while target phone is still ringing semi_attended_transfer: "0" ; 0-Disabled, 1-Enabled (default) -# Telnet Level (enable or disable the ability to telnet into this phone +# Telnet Level (enable or disable the ability to telnet into this phone telnet_level: "2" ; 0-Disabled (default), 1-Enabled, 2-Privileged # Inband DTMF Settings (0-disable, 1-enable (default)) diff --git a/resources/templates/provision/cisco/spa122/{$mac}.xml b/resources/templates/provision/cisco/spa122/{$mac}.xml index 5b41c6b78c..e8dd878a97 100644 --- a/resources/templates/provision/cisco/spa122/{$mac}.xml +++ b/resources/templates/provision/cisco/spa122/{$mac}.xml @@ -647,7 +647,7 @@ Default No 2 - + dh diff --git a/resources/templates/provision/cisco/spa501g/{$mac}.xml b/resources/templates/provision/cisco/spa501g/{$mac}.xml index 083cfa3eeb..c50110fbb6 100644 --- a/resources/templates/provision/cisco/spa501g/{$mac}.xml +++ b/resources/templates/provision/cisco/spa501g/{$mac}.xml @@ -305,7 +305,7 @@ - + *017110 *027110 *017111 @@ -340,7 +340,7 @@ {$display_name_1} {$display_name_1} {$voicemail_number} - + {foreach $keys as $row} {if $row.device_key_category == "line"} {if $row.device_key_type == "line"} @@ -449,7 +449,7 @@ $NOTIFY $PROXY - + 0x68 3 0xb8 @@ -457,7 +457,7 @@ high up and down - + {$sip_transport_1|upper} {$sip_port_1} No @@ -557,7 +557,7 @@ Yes - + private 3600 @@ -920,7 +920,7 @@ Yes - + private 3600 @@ -1000,7 +1000,7 @@ Normal No - + {$display_name_5} {$user_id_5} {$user_password_5} @@ -1032,7 +1032,7 @@ No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes @@ -1041,20 +1041,20 @@ Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 0xb8 @@ -1062,7 +1062,7 @@ high up and down - + {$sip_transport_6|upper} {$sip_port_6} No @@ -1083,7 +1083,7 @@ No - + No No @@ -1121,7 +1121,7 @@ Normal No - + {$display_name_6} {$user_id_6} {$user_password_6} @@ -1133,7 +1133,7 @@ - + G711u No Unspecified @@ -1153,29 +1153,29 @@ No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 0xb8 @@ -1204,7 +1204,7 @@ No - + No No @@ -1225,7 +1225,7 @@ No No - + {$server_address_7} @@ -1254,7 +1254,7 @@ - + G711u No Unspecified @@ -1274,29 +1274,29 @@ No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes - + Yes - + private 3600 No - + No No $NOTIFY $PROXY - + 0x68 3 0xb8 @@ -1304,7 +1304,7 @@ high up and down - + {$sip_transport_8|upper} {$sip_port_8} No @@ -1325,7 +1325,7 @@ No - + No No @@ -1346,7 +1346,7 @@ No No - + {$server_address_8} @@ -1363,7 +1363,7 @@ Normal No - + {$display_name_8} {$user_id_8} {$user_password_8} @@ -1375,7 +1375,7 @@ - + G711u No Unspecified @@ -1395,7 +1395,7 @@ No Default - + (*xxxxxx|*xxxxx|*xxxx|*xxx|*xx|**xxx|**xxxx|**xxxxx|[3469]11|0|00|[2-9]xxxxxx|1xxx[2-9]xxxxxxS0|xxxxxxxxxxxx.) Yes @@ -1408,7 +1408,7 @@ 20 - + @@ -1418,7 +1418,7 @@ - + Yes No No @@ -1441,7 +1441,7 @@ Yes Yes - + 8 8 10 @@ -1450,7 +1450,7 @@ Default Yes - + 1800 30 Yes @@ -1466,7 +1466,7 @@ 10 7 - + diff --git a/resources/templates/provision/digium/d50/${mac}.cfg b/resources/templates/provision/digium/d50/${mac}.cfg index 7417600ec3..bff83639c5 100644 --- a/resources/templates/provision/digium/d50/${mac}.cfg +++ b/resources/templates/provision/digium/d50/${mac}.cfg @@ -48,12 +48,12 @@ - + - + diff --git a/resources/templates/provision/grandstream/dp715/{$mac}.xml b/resources/templates/provision/grandstream/dp715/{$mac}.xml index 101203753b..3834db49a2 100644 --- a/resources/templates/provision/grandstream/dp715/{$mac}.xml +++ b/resources/templates/provision/grandstream/dp715/{$mac}.xml @@ -81,11 +81,11 @@ 300 - + - + @@ -250,7 +250,7 @@ 0 - 1 + 1 0 @@ -350,7 +350,7 @@ 0 - 50 + 50 400 @@ -365,7 +365,7 @@ 100 - 0 + 0 0 @@ -387,7 +387,7 @@ 4 - 0 + 0 @@ -623,7 +623,7 @@ - + @@ -643,7 +643,7 @@ - + @@ -664,6 +664,6 @@ 0 - + \ No newline at end of file diff --git a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml index 8ab14b3527..35dae838e8 100644 --- a/resources/templates/provision/grandstream/gxp110x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp110x/{$mac}.xml @@ -3,9 +3,9 @@ - + - + @@ -22,7 +22,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -104,14 +104,14 @@ - + - + @@ -128,11 +128,11 @@ - + - + @@ -674,7 +674,7 @@ - + @@ -1005,7 +1005,7 @@ - + @@ -1049,11 +1049,11 @@ 86400 - + - + @@ -1205,8 +1205,8 @@ - - + + @@ -1288,7 +1288,7 @@ - + diff --git a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml index 30581c7da4..659f610c34 100644 --- a/resources/templates/provision/grandstream/gxp116x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp116x/{$mac}.xml @@ -2,781 +2,781 @@ - + - + - + - + - - - + + + 1 - - -{$display_name_1} + + +{$display_name_1} - - + + {$server_address_1} - - + + - - + + - - + + {$user_id_1} - - + + {$user_id_1} - - + + {$user_password_1} - - + + {$display_name_1} - - + + *97 - + - - - + + + 0 - - + + - - + + - - + + - - - + + + 0 - - + + - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 3 - - - + + + 0 - - - + + + 5060 - - - + + + 20 - - - - + + + + 50 - - - - + + + + 400 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - - + + + + 0 - - - - + + + + 0 - + - - - + + + - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 15 - - + + - - + + - - + + - - - + + + 0 - - - - + + + + 100 - + - - - + + + 180 - - - + + + 90 - - - + + + 0 - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - - + + + + 0 - + - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 101 - - - - - + + + + + 0 - - - + + + 8 - - - + + + 4 - - + + +18 --> - - - + + + 9 - - - + + + 98 - - - + + + 2 - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 2 - - - + + + 1 - - - + + + 0 - - - + + + 1 - - - + + + 97 - - - + + + 1 - - - - + + + + 2 - + - - - + + + 0 - - + + - - - + + + { x+ | *x+ | *xx*x+ } - - - + + + 20 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - + + - - - - + + + + 0 - - + + - - - - + + + + 0 - - + + - - - - + + + + 0 - - - + + + 60 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 4 - - - + + + 1 - + - - - + + + 0 - - - - + + + + - + - - + + - - - - - - + + + + + - - - + + + + - - - + + + - - + + - - - - + + + + 192 - + 168 - + 0 - + 160 - - + + 255 - + 255 - + 0 - + 0 - - + + 0 - + 0 - + 0 - + 0 - - + + 0 - + 0 - + 0 - + 0 - - + + 0 - + 0 - + 0 - + 0 - - + + 0 - + 0 - + 0 - + 0 - - - + + + 0 - - + + - - + + - - + + - - - + + + - - + + - - + + - - + + - + - - - + + + 0 - - + + - - + + - - + + - - + + - - - + + + 12 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 1 - + - - - + + + 0 - - + + {$user_password} - - + + {$admin_password} - - + - - - - - - + + + + + + + 0 - + @@ -885,7 +885,7 @@ - + @@ -925,11 +925,11 @@ 86400 - + - + @@ -992,7 +992,7 @@ - + 0 @@ -1322,13 +1322,13 @@ - + - + diff --git a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml index f9f042f407..4de0c158fb 100644 --- a/resources/templates/provision/grandstream/gxp1450/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp1450/{$mac}.xml @@ -1,2288 +1,2288 @@ - - - + - + - - - - + + + + + + - + - - - + + + - + - - - - + + + + - - - - + + + + - + - - - + + + - - - + + + - - - + + + - + - - + + - - + + - - + + - - + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + - - - - + + + + - - - + + + - - - + + + - + - - - - + + + + - + - - + + - + - + - + - + - + - - - + + + 1 - - - + + + - - + + {$server_address_1} - - + + - - + + - - + + {$user_id_1} - - + + {$user_id_1} - - + + {$user_password_1} - - + + {$display_name_1} - - + + *97 - + - - - + + + 0 - - + + - - + + - - + + - - - + + + 0 - - + + - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 3 - - - + + + 0 - - - + + + 5060 - - - + + + 20 - - - - + + + + 50 - - - - + + + + 400 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - - + + + + 0 - - - - + + + + 0 - + - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 15 - - + + - - + + - - + + - - - + + + ** - - - + + + 0 - - - - + + + + 100 - + - - - + + + 180 - - - + + + 90 - - - + + + 0 - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - - + + + + 0 - + - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 101 - - - - - + + + + + 0 - - - + + + 8 - - - + + + 4 - - - + + + 18 - - - + + + 9 - - - + + + 98 - - - + + + 2 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 2 - - - + + + 1 - - - + + + 0 - - - + + + 1 - - - + + + 97 - - - + + + 1 - - - - + + + + 2 - + - - - + + + 0 - - + + - - - + + + { x+ | *x+ | *xx*x+ } - - - + + + 20 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - + + - - - - + + + + 0 - - + + - - - - + + + + 0 - - - + + + - - - - + + + + 0 - - - + + + 60 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 4 - - - + + + 1 - - + + - - + + - + - + - - - + + + 1 - - - + + + - - + + {$server_address_2} - - + + - - + + - - + + {$user_id_2} - - -{$user_id_2} + + +{$user_id_2} - - -{$user_password_2} + + +{$user_password_2} - - -{$display_name_2} + + +{$display_name_2} - - -*97 + + +*97 - + - - - + + + 0 - - - + + + - - - + + + - - - + + + - - - -0 + + + +0 - - - + + + - + - - - -0 + + + +0 - - - -1 + + + +1 - - - -0 + + + +0 - - - + + + 3 - - - -0 + + + +0 - - - -5062 + + + +5062 - - - -20 + + + +20 - - - - -50 + + + + +50 - - - - -400 + + + + +400 - - - -0 + + + +0 - - - -1 + + + +1 - - - -0 + + + +0 - - - -0 + + + +0 - - - -1 + + + +1 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - + + + 0 - - - - - -0 - - - -0 + + + + +0 - + + + +0 - - - -0 + - - - + + + +0 + + + + 0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -15 + + + +15 - - - + + + - - - + + + - - - + + + - - - -** + + + +** - - - -0 + + + +0 - - - -100 + + + +100 - + - - - -180 + + + +180 - - - -90 + + + +90 - - - -0 + + + +0 - - - - -0 + + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -1 + + + +1 - - - - -0 + + + + +0 - + - - - - -0 + + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - + - - - -0 + + + +0 - - - -1 + + + +1 - - - -0 + + + +0 - - - -101 + + + +101 - - - - - -0 + + + + + +0 - - - -8 + + + +8 - - - -4 + + + +4 - - - -18 + + + +18 - - - -9 + + + +9 - - - -98 + + + +98 - - - -2 + + + +2 - - - -0 + + + +0 - - - - -0 + + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -2 + + + +2 - - - -1 + + + +1 - - - -0 + + + +0 - - - -1 + + + +1 - - - -97 + + + +97 - - - -1 + + + +1 - - - - -2 + + + + +2 - + - - - -0 + + + +0 - - - + + + - - - + + + { x+ | *x+ | *xx*x+ } - - - -20 - - - - -1 - - - - -0 - - - - -0 - - - - - - - - - -0 - - - - - - - - - -0 - - - - - - - - - -0 + + + +20 + + + + +1 + + + + +0 + + + + +0 + + + + + + + + + +0 + + + + + + + + + +0 + + + + + + + + + +0 - - - -60 + + + +60 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -4 + + + +4 - - - -1 + + + +1 - - - + + + - - - + + + - + - - - -0 + + + +0 - - - - + + + + - + - - - + + + - - - -Grandstream GXP1450 + + + +Grandstream GXP1450 - + - - - + + + - - - - + + + + - - - + + + - + - - -192 + + +192 - -168 + +168 - -0 + +0 - -160 + +160 - - -255 + + +255 - -255 + +255 - -0 + +0 - -0 + +0 - - -0 + + +0 - -0 + +0 - -0 + +0 - -0 + +0 - - -0 + + +0 - -0 + +0 - -0 + +0 - -0 + +0 - - -0 + + +0 - -0 + +0 - -0 + +0 - -0 + +0 - - -0 + + +0 - -0 + +0 - -0 + +0 - -0 + +0 - - - -0 + + + +0 - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - + - - - -0 + + + +0 - - - + + + - - - + + + - - - + + + - - - + + + - - - -12 + + + +12 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -1 + + + +1 - + - - -{$user_password} + + +{$user_password} - - -{$admin_password} + + +{$admin_password} - + - - - - - - -0 + + + + + + +0 - - - + + + - - - + + + - - - + + + - - - -2 + + + +2 - - -fm.grandstream.com/gs + + +fm.grandstream.com/gs - - -{$domain_name}{$project_path}/app/provision + + +{$domain_name}{$project_path}/app/provision - - - + + + - - - + + + - - - + + + - - - + + + - - - - -1 + + + + +1 - - - - -0 + + + + +0 - - - -0 + + + +0 - - - -10080 + + + +10080 - - -1 + + +1 - - -1 + + +1 - - - -0 + + + +0 - + - - - + + + - - - -0 + + + +0 - - - -0 + + + +0 - - - -1 + + + +1 - + - - - - - - - - - - - -auto + + + + + + + + + + + +auto - - - + + + - + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - -0 + + + +0 - - -86400 + + +86400 - - - + + + - - - + + + - - -0 + + +0 - - - + + + - - - + + + - + - - - -0 + + + +0 - - - -1 + + + +1 - - - + + + - - - + + + - - - + + + - - - + + + - - - -1 - - - -0 + + + +1 + + + +0 - + - - - -0 + + + +0 - - - - - + + + + + - - - -0 + + + +0 - - - -1 + + + +1 - - - -0 + + + +0 - + - - - - + + + + - - -389 + + +389 - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - -3 - - - - - - - - - - - - - - - - - - - -50 - - - - - -30 - - - - -0 - - - -0 - - -0 - - - - - - - - - - - -5004 - - - - -0 - - - - -20 - - - - - - - - - - - - -0 - - - - - - - - - - - -30 - - - - -0 - - - - -0 - - - - -0 - - - - -0 - - - - -0 - - - - -0 - - - - -0 + + + + + + + + +3 + + + + + + + + + + + + + + + + + + + +50 + + + + + +30 + + + + +0 + + + +0 + + +0 + + + + + + + + + + + +5004 + + + + +0 + + + + +20 + + + + + + + + + + + + +0 + + + + + + + + + + + +30 + + + + +0 + + + + +0 + + + + +0 + + + + +0 + + + + +0 + + + + +0 + + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - - - - - -0 - - - - -0 + + + + + + + +0 + + + + +0 - - - -0 + + + +0 - - - - -300 + + + + +300 - - - -200 - - - - + + + +200 + + + + - - - + + + - - - -f1=440,f2=480,c=200/400; + + + +f1=440,f2=480,c=200/400; - - - -f1=350,f2=440; + + + +f1=350,f2=440; - - - -f1=350,f2=440,c=10/10; - - - - -f1=440,f2=480,c=200/400; - - - - -f1=440,f2=440,c=25/525; - - - - -0 - - - - -f1=480,f2=620,c=50/50; - - - - -f1=480,f2=620,c=25/25; - - - - - - - - -0 - - - - -0 - - - - -0 - - - - -0 - - - - -0 - - - - - - - - - -6 - - - - -2 - - - - -10 - - - - -0 - - - - - - - -us.pool.ntp.org - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -auto - - - - - -1 - - - - -MTZ+6MDT+5,M4.1.0,M11.1.0 - - - - - - - - - -0 - - - - -0 - - - - - - - - - -1 - - - - - -1 - - - - - - - - -15 - - - - -auto - - - - - - - - - -0 - - - - -0 - - - - -0 - - - - - - - - - - - - - - - - - - -0 - - - - -0 + + + +f1=350,f2=440,c=10/10; + + + + +f1=440,f2=480,c=200/400; + + + + +f1=440,f2=440,c=25/525; + + + + +0 + + + + +f1=480,f2=620,c=50/50; + + + + +f1=480,f2=620,c=25/25; + + + + + + + + +0 + + + + +0 + + + + +0 + + + + +0 + + + + +0 + + + + + + + + + +6 + + + + +2 + + + + +10 + + + + +0 + + + + + + + +us.pool.ntp.org + + + + + +1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +auto + + + + + +1 + + + + +MTZ+6MDT+5,M4.1.0,M11.1.0 + + + + + + + + + +0 + + + + +0 + + + + + + + + + +1 + + + + + +1 + + + + + + + + +15 + + + + +auto + + + + + + + + + +0 + + + + +0 + + + + +0 + + + + + + + + + + + + + + + + + + +0 + + + + +0 - - - + + + - - - + + + - + - - - - - -0 + + + + + +0 - - - -0 + + + +0 - - - + + + - - + + diff --git a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml index 47d560bb54..1133323bca 100644 --- a/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp1450bk/{$mac}.xml @@ -1,2098 +1,2098 @@ - + - + - + - + - + - - - + + + 1 - - + + {$display_name_1} - - + + {$server_address_1} - - + + - - + + - - + + {$user_id_1} - - + + {$user_id_1} - - + + {$user_password_1} - - + + {$display_name_1} - - + + *97 - + - - - + + + 0 - - + + - - + + - - + + - - - + + + 0 - - + + - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 3 - - - + + + 0 - - - + + + 5060 - - - + + + 20 - - - - + + + + 50 - - - - + + + + 400 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - - + + + + 0 - - - - + + + + 0 - + - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 15 - - + + - - + + - - + + - - - + + + ** - - - + + + 0 - - - - + + + + 100 - + - - - + + + 180 - - - + + + 90 - - - + + + 0 - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - - + + + + 0 - + - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 101 - - - - - + + + + + 0 - - - + + + 8 - - - + + + 4 - - - + + + 18 - - - + + + 9 - - - + + + 98 - - - + + + 2 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 2 - - - + + + 1 - - - + + + 0 - - - + + + 1 - - - + + + 97 - - - + + + 1 - - - - + + + + 2 - + - - - + + + 0 - - + + - - - + + + { x+ | *x+ | *xx*x+ } - - - + + + 20 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - + + - - - - + + + + 0 - - + + - - - - + + + + 0 - - - + + + - - - - + + + + 0 - - - + + + 60 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 4 - - - + + + 1 - - + + - - + + - + - + - - - + + + 1 - - -{$display_name_2} + + +{$display_name_2} - - + + {$server_address_2} - - + + - - + + - - + + {$user_id_2} - - -{$user_id_2} + + +{$user_id_2} - - -{$user_password_2} + + +{$user_password_2} - - -{$display_name_2} + + +{$display_name_2} - - -*97 + + +*97 - + - - - + + + 0 - - - + + + - - - + + + - - - + + + - - - -0 + + + +0 - - - + + + - + - - - -0 + + + +0 - - - -1 + + + +1 - - - -0 + + + +0 - - - + + + 3 - - - -0 + + + +0 - - - -5062 + + + +5062 - - - -20 + + + +20 - - - - -50 + + + + +50 - - - - -400 + + + + +400 - - - -0 + + + +0 - - - -1 + + + +1 - - - -0 + + + +0 - - - -0 + + + +0 - - - -1 + + + +1 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - + + + 0 - - - - - -0 - - - -0 + + + + +0 - + + + +0 - - - -0 + - - - + + + +0 + + + + 0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -15 + + + +15 - - - + + + - - - + + + - - - + + + - - - -** + + + +** - - - -0 + + + +0 - - - -100 + + + +100 - + - - - -180 + + + +180 - - - -90 + + + +90 - - - -0 + + + +0 - - - - -0 + + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -1 + + + +1 - - - - -0 + + + + +0 - + - - - - -0 + + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - + - - - -0 + + + +0 - - - -1 + + + +1 - - - -0 + + + +0 - - - -101 + + + +101 - - - - - -0 + + + + + +0 - - - -8 + + + +8 - - - -4 + + + +4 - - - -18 + + + +18 - - - -9 + + + +9 - - - -98 + + + +98 - - - -2 + + + +2 - - - -0 + + + +0 - - - - -0 + + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -2 + + + +2 - - - -1 + + + +1 - - - -0 + + + +0 - - - -1 + + + +1 - - - -97 + + + +97 - - - -1 + + + +1 - - - - -2 + + + + +2 - + - - - -0 + + + +0 - - - + + + - - - + + + { x+ | *x+ | *xx*x+ } - - - -20 - - - - -1 - - - - -0 - - - - -0 - - - - - - - - - -0 - - - - - - - - - -0 - - - - - - - - - -0 + + + +20 + + + + +1 + + + + +0 + + + + +0 + + + + + + + + + +0 + + + + + + + + + +0 + + + + + + + + + +0 - - - -60 + + + +60 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -4 + + + +4 - - - -1 + + + +1 - - - + + + - - - + + + - + - - - -0 + + + +0 - - - - + + + + - + - - - + + + - - - -Grandstream GXP1450 + + + +Grandstream GXP1450 - + - - - + + + - - - - + + + + - - - + + + - + - - -192 + + +192 - -168 + +168 - -0 + +0 - -160 + +160 - - -255 + + +255 - -255 + +255 - -0 + +0 - -0 + +0 - - -0 + + +0 - -0 + +0 - -0 + +0 - -0 + +0 - - -0 + + +0 - -0 + +0 - -0 + +0 - -0 + +0 - - -0 + + +0 - -0 + +0 - -0 + +0 - -0 + +0 - - -0 + + +0 - -0 + +0 - -0 + +0 - -0 + +0 - - - -0 + + + +0 - - - + + + - - - + + + - - - + + + - - - + + + - - + + - - + + - - + + - + - - - -0 + + + +0 - - - + + + - - - + + + - - - + + + - - - + + + - - - -12 + + + +12 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -1 + + + +1 - + - - -{$user_password} + + +{$user_password} - - -{$admin_password} + + +{$admin_password} - + - - - - - - -0 + + + + + + +0 - - - + + + - - - + + + - - - + + + - - - -2 + + + +2 - - -fm.grandstream.com/gs + + +fm.grandstream.com/gs - - -{$domain_name}{$project_path}/app/provision + + +{$domain_name}{$project_path}/app/provision - - - + + + - - - + + + - - - + + + - - - + + + - - - - -1 + + + + +1 - - - - -0 + + + + +0 - - - -0 + + + +0 - - - -10080 + + + +10080 - - -1 + + +1 - - -1 + + +1 - - - -0 + + + +0 - + - - - + + + - - - -0 + + + +0 - - - -0 + + + +0 - - - -1 + + + +1 - + - - - - - - - - - - - -auto + + + + + + + + + + + +auto - - - + + + - + - - - - + + + + - - - + + + - - - + + + - - - + + + - - - -0 + + + +0 - - -86400 + + +86400 - - - + + + - - - + + + - - -0 + + +0 - - - + + + - - - + + + - + - - - -0 + + + +0 - - - -1 + + + +1 - - - + + + - - - + + + - - - + + + - - - + + + - - - -1 - - - -0 + + + +1 + + + +0 - + - - - -0 + + + +0 - - - - - + + + + + - - - -0 + + + +0 - - - -1 + + + +1 - - - -0 + + + +0 - + - - - - + + + + - - -389 + + +389 - - - - - + + + + + - - - + + + - - - + + + - - - - + + + + - - - - - - - - -3 - - - - - - - - - - - - - - - - - - - -50 - - - - - -30 - - - - -0 - - - -0 - - -0 - - - - - - - - - - - -5004 - - - - -0 - - - - -20 - - - - - - - - - - - - -0 - - - - - - - - - - - -30 - - - - -0 - - - - -0 - - - - -0 - - - - -0 - - - - -0 - - - - -0 - - - - -0 + + + + + + + + +3 + + + + + + + + + + + + + + + + + + + +50 + + + + + +30 + + + + +0 + + + +0 + + +0 + + + + + + + + + + + +5004 + + + + +0 + + + + +20 + + + + + + + + + + + + +0 + + + + + + + + + + + +30 + + + + +0 + + + + +0 + + + + +0 + + + + +0 + + + + +0 + + + + +0 + + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - -0 + + + +0 - - - - - - - -0 - - - - -0 + + + + + + + +0 + + + + +0 - - - -0 + + + +0 - - - - -300 + + + + +300 - - - -200 - - - - + + + +200 + + + + - - - + + + - - - -f1=440,f2=480,c=200/400; + + + +f1=440,f2=480,c=200/400; - - - -f1=350,f2=440; + + + +f1=350,f2=440; - - - -f1=350,f2=440,c=10/10; - - - - -f1=440,f2=480,c=200/400; - - - - -f1=440,f2=440,c=25/525; - - - - -0 - - - - -f1=480,f2=620,c=50/50; - - - - -f1=480,f2=620,c=25/25; - - - - - - - - -0 - - - - -0 - - - - -0 - - - - -0 - - - - -0 - - - - - - - - - -6 - - - - -2 - - - - -10 - - - - -0 - - - - - - - -us.pool.ntp.org - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -auto - - - - - -1 - - - - -MTZ+6MDT+5,M4.1.0,M11.1.0 - - - - - - - - - -0 - - - - -0 - - - - - - - - - -1 - - - - - -1 - - - - - - - - -15 - - - - -auto - - - - - - - - - -0 - - - - -0 - - - - -0 - - - - - - - - - - - - - - - - - - -0 - - - - -0 + + + +f1=350,f2=440,c=10/10; + + + + +f1=440,f2=480,c=200/400; + + + + +f1=440,f2=440,c=25/525; + + + + +0 + + + + +f1=480,f2=620,c=50/50; + + + + +f1=480,f2=620,c=25/25; + + + + + + + + +0 + + + + +0 + + + + +0 + + + + +0 + + + + +0 + + + + + + + + + +6 + + + + +2 + + + + +10 + + + + +0 + + + + + + + +us.pool.ntp.org + + + + + +1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +auto + + + + + +1 + + + + +MTZ+6MDT+5,M4.1.0,M11.1.0 + + + + + + + + + +0 + + + + +0 + + + + + + + + + +1 + + + + + +1 + + + + + + + + +15 + + + + +auto + + + + + + + + + +0 + + + + +0 + + + + +0 + + + + + + + + + + + + + + + + + + +0 + + + + +0 - - - + + + - - - + + + - + - - - - - -0 + + + + + +0 - - - -0 + + + +0 - - - + + + - - - + + + \ No newline at end of file diff --git a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml index b72e7accb5..59d0dc98c1 100644 --- a/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp20xx/{$mac}.xml @@ -49,7 +49,7 @@ 1 -5004 +5004 0 @@ -64,7 +64,7 @@ - + @@ -117,12 +117,12 @@ 0 - + - + 0 @@ -143,7 +143,7 @@ 0 - + 0 @@ -317,10 +317,10 @@ {$display_name_1} -{$server_address_1} +{$server_address_1} - + {$user_id_1} @@ -383,7 +383,7 @@ 0 - + @@ -452,7 +452,7 @@ 0 - + 0 @@ -475,25 +475,25 @@ 0 - - + + - + 0 8 - + 4 18 - + 2 - + 98 @@ -527,7 +527,7 @@ {$display_name_2} - + {$server_address_2} @@ -600,12 +600,12 @@ *97 - + 8 - + 0 @@ -689,28 +689,28 @@ - + 0 - + 8 - + 4 - + 18 - + 2 - + 98 9 - + 3 @@ -811,7 +811,7 @@ *97 - + @@ -881,7 +881,7 @@ 0 - + 0 @@ -901,22 +901,22 @@ - + 0 - + 8 - + 4 - + 18 - + 2 - + 98 @@ -936,7 +936,7 @@ - + 100 @@ -948,7 +948,7 @@ 1 -{$display_name_4} +{$display_name_4} {$server_address_4} @@ -960,13 +960,13 @@ {$user_id_4} -{$user_id_4} +{$user_id_4} -{$user_password_4} +{$user_password_4} -{$display_name_4} +{$display_name_4} 0 @@ -1023,7 +1023,7 @@ *97 - + @@ -1112,22 +1112,22 @@ - + 0 - + 8 - + 4 - -18 + +18 - + 2 - + 98 @@ -1234,7 +1234,7 @@ *97 - + @@ -1323,28 +1323,28 @@ - + 0 8 - + 4 - + 18 - + 2 - + 98 - + 9 - + 3 @@ -1368,7 +1368,7 @@ 1 -{$display_name_6} +{$display_name_6} {$server_address_6} @@ -1443,7 +1443,7 @@ *97 - + @@ -1532,28 +1532,28 @@ - + 0 - + 8 - + 4 - + 18 - + 2 - + 98 9 - + 3 @@ -1684,7 +1684,7 @@ - + @@ -1791,7 +1791,7 @@ - + @@ -1819,7 +1819,7 @@ - + @@ -2012,7 +2012,7 @@ - + @@ -2082,7 +2082,7 @@ - + @@ -2110,7 +2110,7 @@ - + @@ -2140,7 +2140,7 @@ - + @@ -2180,7 +2180,7 @@ - + @@ -2280,7 +2280,7 @@ - + @@ -2642,7 +2642,7 @@ - + @@ -2672,7 +2672,7 @@ - + @@ -2698,7 +2698,7 @@ - + @@ -2742,7 +2742,7 @@ - + @@ -3082,7 +3082,7 @@ - + @@ -3164,7 +3164,7 @@ - + @@ -3178,7 +3178,7 @@ - + diff --git a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml index d534b1bd28..019ab596a1 100644 --- a/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp21xx/{$mac}.xml @@ -2916,7 +2916,7 @@ 0 - 0 @@ -3120,7 +3120,7 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - 0 + 0 diff --git a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml index f5ff448552..82bb5c391b 100644 --- a/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxp21xxbk/{$mac}.xml @@ -2,7 +2,7 @@ - + @@ -90,391 +90,391 @@ 0 - - - - - + + + + + 1 - - + + {$display_name_1} - + {$server_address_1} - + - - + + - + {$user_id_1} - + {$user_id_1} - + {$user_password_1} - + {$display_name_1} - + *97 - + - + 0 - + - - + + - + - + 0 - - + + - + - + 0 - + 1 - + 0 - + 3 - + 0 - + 5060 - + 20 - - -50 + + +50 - - + + 400 - + 0 - + 1 - + 0 - + 0 - + 1 - + 0 - + 0 - + 0 - + 0 - - - - + + + + 0 - - - - + + + + 0 - + - - - -0 + + + +0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - -15 + + + +15 - - + + - - + + - - + + - - - + + + ** - - - -0 + + + +0 - - - - + + + + 100 - + - - - + + + 180 - - - + + + 90 - - - -0 + + + +0 - - - - + + + + 0 - - - -0 + + + +0 - - - + + + 0 - - - + + + 1 - - - - + + + + 0 - + - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - + - - - + + + 0 - - - + + + 1 - - - -0 + + + +0 - - - + + + 101 - - - - - + + + + + 0 - - - + + + 8 - - - + + + 4 - - - + + + 18 - - - + + + 9 - - - - + + + + 98 - - - + + + 2 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 2 - - - + + + 1 - - - + + + 0 - - - + + + 1 - - - + + + 97 - - - + + + 1 - - - - + + + + 2 - + - - - + + + 0 - - + + @@ -483,2407 +483,2407 @@ { x+ | *x+ | *xx*x+ } - - - + + + 20 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + - - - - + + + + 0 - - + + - - - - -0 + + + + +0 - - + + - - - - + + + + 0 - - - + + + 60 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 4 - - - + + + 1 - - + + - - + + - + - + - - - + + + 1 - - -{$display_name_2} + + +{$display_name_2} - - + + {$server_address_2} - - + + - + - - + + {$user_id_2} - - + + {$user_id_2} - - + + {$user_password_2} - - + + {$display_name_2} - - + + *97 - + - - - -0 + + + +0 - - + + - - + + - - + + - - - -0 + + + +0 - - + + - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 3 - - - + + + 0 - - - + + + 5062 - - - + + + 20 - - - - + + + + 50 - - - - + + + + 400 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - - + + + + 0 - - - + + + 0 - + - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 15 - - + + - - + + - - + + - - - -** + + + +** - - - + + + 0 - - - + + + 100 - + - - - + + + 180 - - - + + + 90 - - - + + + 0 - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - - + + + + 0 - + - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - -0 + + + +0 - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 101 - - - - - + + + + + 0 - - - + + + 8 - - - + + + 4 - - - + + + 18 - - - + + + 9 - - - + + + 98 - - - + + + 2 - - - + + + 0 - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 2 - - - + + + 1 - - - + + + 0 - - - + + + 1 - - - + + + 97 - - - + + + 1 - - - - + + + + 2 - + - - - + + + 0 - - + + - - - + + + { x+ | *x+ | *xx*x+ } - - - + + + 20 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - + + - - - - + + + + 0 - - + + - - - - + + + + 0 - - + + - - - - + + + + 0 - - - + + + 60 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 4 - - - + + + 1 - - + + - - + + - + - + - - - -1 + + + +1 - - -{$display_name_3} + + +{$display_name_3} - - + + {$server_address_3} - - + + - - + + - - + + {$user_id_3} - - + + {$user_id_3} - - + + {$user_password_3} - - + + {$display_name_3} - - + + *97 - + - - - + + + 0 - - + + - - + + - - + + - - - + + + 0 - - + + - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 3 - - - + + + 0 - - - + + + 5064 - - - + + + 20 - - - - + + + + 50 - - - - + + + + 400 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - - + + + + 0 - - - - + + + + 0 - + - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 15 - - - + + + - - + + - - + + - - - + + + ** - - - + + + 0 - - - + + + 100 - + - - - + + + 180 - - - + + + 90 - - - + + + 0 - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - + + + 0 - + - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 101 - - - - - + + + + + 0 - - - + + + 8 - - - + + + 4 - - - + + + 18 - - - + + + 9 - - - + + + 98 - - - + + + 2 - - - + + + 0 - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 2 - - - + + + 1 - - - + + + 0 - - - + + + 1 - - - + + + 97 - - - + + + 1 - - - + + + 2 - + - - - + + + 0 - - - + + + - - - + + + { x+ | *x+ | *xx*x+ } - - - + + + 20 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - + + - - - - + + + + 0 - - + + - - - - + + + + 0 - - + + - - - - + + + + 0 - - - + + + 60 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 4 - - - + + + 1 - - + + - - + + - + - + - - - + + + 1 - - + + {$display_name_4} - - + + {$server_address_4} - - + + - - + + - - + + {$user_id_4} - - + + {$user_id_4} - - + + {$user_password_4} - - + + {$display_name_4} - - -*97 + + +*97 - + - - - + + + 0 - - + + - - + + - - - + + + - - - + + + 0 - - - + + + - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 3 - - - + + + 0 - - - + + + 5066 - - - + + + 20 - - - - + + + + 50 - - - - + + + + 400 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - - + + + + 0 - - - - + + + + 0 - + - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 15 - - + + - - + + - - + + - - - + + + ** - - - + + + 0 - - - + + + 100 - + - - - + + + 180 - - - + + + 90 - - - + + + 0 - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - - + + + + 0 - + - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 101 - - - - + + + + 0 - - + + 8 - - + + 4 - - + + 18 - - + + 9 - - + + 98 - - + + 2 - - - + + + 0 - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 2 - - - + + + 1 - - - + + + 0 - - - + + + 1 - - - + + + 97 - - - + + + 1 - - - - + + + + 2 - - - - + + + + 0 - - + + - - - + + + { x+ | *x+ | *xx*x+ } - - - + + + 20 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - + + - - - - + + + + 0 - - - + + + - - - - + + + + 0 - - + + - - - - + + + + 0 - - - + + + 60 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 4 - - - + + + 1 - - + + - - + + - + - + - - - + + + 1 - - + + {$display_name_5} - - + + {$server_address_5} - - + + - - + + - - + + {$user_id_5} - - + + {$user_id_5} - - + + {$user_password_5} - - + + {$display_name_5} - - -*97 + + +*97 - + - - - -0 + + + +0 - - + + - - + + - - - + + + - - - + + + 0 - - + + - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 3 - - - + + + 0 - - - + + + 5068 - - - + + + 20 - - - - + + + + 50 - - - - + + + + 400 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - + - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 15 - - - + + + - - + + - - + + - - - + + + ** - - - + + + 0 - - - + + + 100 - + - - - + + + 180 - - - + + + 90 - - - + + + 0 - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 1 - - - + + + 0 - + - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 101 - - - - - + + + + + 0 - - - + + + 8 - - - + + + 4 - - - + + + 18 - - - + + + 9 - - - + + + 98 - - - + + + 2 - - - + + + 0 - - - - + + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 2 - - - + + + 1 - - - + + + 0 - - - + + + 1 - - - + + + 97 - - - + + + 1 - - - + + + 2 - + - - - -0 + + + +0 - - + + - - - + + + { x+ | *x+ | *xx*x+ } - - - + + + 20 - - - + + + 1 - - - + + + 0 - - - + + + 0 - - + + - - - - + + + + 0 - - + + - - - - + + + + 0 - - + + - - - - + + + + 0 - - - + + + 60 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 0 - - - + + + 4 - - - + + + 1 - - + + - - + + - + - + - - - -1 + + + +1 - - + + {$display_name_6} - - + + {$server_address_6} - - - + + + - - + + - - + + {$user_id_6} - - + + {$user_id_6} - - + + {$user_password_6} - - + + {$display_name_6} - - + + *97 - + - - - + + + 0 - - + + - - + + - - + + - - - + + + 0 - - - + + + - + - - - + + + 0 - - - + + + 1 - - - + + + 0 - - - + + + 3 - - - + + + 0 @@ -2971,7 +2971,7 @@ -0 +0 @@ -3205,7 +3205,7 @@ -97 +97 @@ -3363,7 +3363,7 @@ - + @@ -3409,11 +3409,11 @@ 86400 - + - + @@ -3502,7 +3502,7 @@ - + @@ -3515,7 +3515,7 @@ - + @@ -3573,7 +3573,7 @@ 0 - 0 @@ -3677,7 +3677,7 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> -0 +0 @@ -3908,7 +3908,7 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + 0 @@ -3932,7 +3932,7 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + 0 @@ -3999,7 +3999,7 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + @@ -4022,7 +4022,7 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + @@ -4041,7 +4041,7 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + @@ -4069,7 +4069,7 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + @@ -4093,7 +4093,7 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + @@ -4106,17 +4106,17 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> 0 - + - + - + @@ -4130,16 +4130,16 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + - + - + - + @@ -4153,11 +4153,11 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + - + @@ -4165,7 +4165,7 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + @@ -4179,16 +4179,16 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + - + - + @@ -4206,12 +4206,12 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + - + @@ -4225,16 +4225,16 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + - + - + @@ -4248,16 +4248,16 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + - + - + @@ -4271,11 +4271,11 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + - + @@ -4298,12 +4298,12 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + - + @@ -4317,39 +4317,39 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + - + - + 0 - + 0 - + - + - + @@ -4363,17 +4363,17 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + - + - + @@ -4387,16 +4387,16 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + - + - + @@ -4410,11 +4410,11 @@ Outgoing calls. 0 - No, 1 - Yes. Default is 0 --> - + - + \ No newline at end of file diff --git a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml index 38e320c60b..dc2c90fc43 100644 --- a/resources/templates/provision/grandstream/gxv300x/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv300x/{$mac}.xml @@ -5,7 +5,7 @@ {$admin_password} - + {$user_password} diff --git a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml index ecb5bda0ab..4a7099d388 100644 --- a/resources/templates/provision/grandstream/gxv3140/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3140/{$mac}.xml @@ -1,1577 +1,1577 @@ - - - + + + - + - - - + + + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - - + + 0 - - + + - - + + - - + + - + - - - + + + - - + + - - - + + + - + - + 1 - + - + {$server_address_1} - + {$user_id_1} - + {$user_id_1} - + {$user_password_1} - - + + *97 - + {$display_name_1} - + 0 - + - + - + - + - + 0 - + 2 - + - + - + 1 - + 0 - + 3 - + 20 - + 5060 - - + + 0 - + 180 - + 90 - + 0 - + 1 - - + + 0 - + 0 - - + + 0 - + 0 - -0 + +0 - + 0 - -0 + +0 - + 1 - + 0 - + 0 - + 0 - + 0 - - + + 50 - - - + + + 400 - + 0 - + - + 1 - + 0 - + 0 - + 1 - + 0 - + 101 - - - + + + - + 0 - + 8 - + 4 - + 18 - + 9 - + 3 - + 0 - + 0 - - + + 99 - + 99 - + 99 - + 0 - + 0 - + 99 - + 100 - - + + 98 - + 0 - + 0 - + 0 - - + + 2 - + 1 - + 1 - + 1 - + 0 - + - + - + { x+ | *x+ | *xx*x+ } - + 0 - + 0 - + 0 - + 0 - + 0 - + 100 - + 0 - + 1 - + 20 - -4 + +4 - + 60 - + 0 - + 1 - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + 1 - + - + - + - + - + - - + + - + - + 0 - + - + - + - + - + 0 - + 2 - + - + - + 1 - + 0 - + 3 - + 20 - + 5062 - - + + 0 - + 180 - + 90 - + 0 - + 1 - - + + 0 - + 0 - - + + 0 - - + + 0 - + 0 - + 0 - + 0 - + 1 - + 0 - + 0 - + 0 - + 0 - - + + 50 - - - + + + 400 - + 0 - + - + 1 - + 0 - + 0 - + 1 - + 0 - + 101 - - - + + + - + 0 - + 8 - + 4 - + 18 - + 9 - + 3 - + 0 - + 0 - - + + 99 - + 99 - + 99 - + 0 - + 0 - + 99 - + 100 - + 98 - + 0 - + 0 - + 0 - - + + 2 - + 1 - + 1 - + 1 - + 0 - + - + - + { x+ | *x+ | *xx*x+ } - + 0 - + 0 - + 0 - + 0 - + 0 - + 100 - + 1 - + 0 - + 20 - + 4 - + 60 - + 0 - + 1 - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - + 1 - + - + - - + + - + - + - - + + - - + + - + 0 - + - + - + - + - + 0 - + 2 - + - + - + 1 - + 0 - + 3 - + 20 - + 5064 - - + + 0 - + 180 - + 90 - + 0 - + 1 - - + + 0 - + 0 - - + + 0 - + 0 - + 0 - + 0 - + 0 - + 1 - + 0 - - + + 0 - + 0 - + 0 - - + + 50 - - - + + + 400 - + 0 - + - -1 + +1 - + 0 - + 0 - + 1 - + 0 - + 101 - - - + + + - + 0 - + 8 - + 4 - + 18 - + 9 - + 3 - + 0 - + 0 - - + + 99 - + 99 - + 99 - + 0 - + 0 - + 99 - + 100 - + 98 - + 0 - + 0 - + 0 - - -2 + + +2 - + 1 - + 1 - + 1 - + 0 - + - + - + { x+ | *x+ | *xx*x+ } - + 0 - + 0 - + 0 - + 0 - + 0 - + 100 - + 0 - + 1 - + 20 - + 4 - + 60 - + 0 - -1 + +1 - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + - + - -5004 + +5004 - + 0 - + 0 - + 20 - - + + - - + + - - + + - + - - + + - - + + 0 - + 0 - + 0 - + 0 - + 1 - + - + - -1 + +1 - + 15 - + 128 - + 1400 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 - - + + 1 - + - + - - + + - - + + - - + + - - + + - + - + - + GXV - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + 0 0 0 0 - + 46 - + 46 - + 46 - - + + 0 - - + + 0 - + 0 - - + + - - + + - - + + - + - - + + - + - - - - - - - - - - - + + + + + + + + + + + - + - - + + - - - + + + - - + + - - - - - + + - - + + - - - - - + + - - + + + + + + + + - + - - + + - - + + 1 - - + + 1 - + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - + + + + + + - - - - + + + + - + - + - - + + - + 1 - + 1 - + - + 0 - -0 + +0 - + 80 - + {$admin_password} - - + + {$user_password} - + - + 1 - + 0 - + 2 - - + + - - + + - - + + - + fw.ipvideotalk.com/gs - + {$domain_name}{$project_path}/app/provision - + - + - + - + - - + + 1 - + 1 - + 0 - + 10080 - + 1 - + 1 - - - - - + + + + + 0 - + - - + + - - + + 0 - + 0 - + - - - - + + + + - + - - - + + + - - + + - - + + - - + + - - + + - - + + - - + + - + 2 - + 7547 - + - - + + - - + + - - + + - + - + 0 - + 0 - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + 0 - + 8 - + 0 - + 0 - + 1 - + 0 - - - - - + + + + + 0 - - - - + + + + 0 - + 0 - + 2 - + - - + + 60 - + - + 0 - - + + - + - - + + diff --git a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml index e039e13f45..59fb446904 100644 --- a/resources/templates/provision/grandstream/gxv3175/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3175/{$mac}.xml @@ -2,3813 +2,3813 @@ - + - - + + - - + + - - + + - + - + - + 1 - + {$display_name_1} - + {$server_address_1} - -{$user_id_1} + +{$user_id_1} - -{$user_id_1} + +{$user_id_1} - + {$user_password_1} - - -*97 + + +*97 - -{$display_name_1} + +{$display_name_1} - -0 + +0 - + - - + + - - + + - -0 + +0 - -2 + +2 - - + + - + - -1 + +1 - -0 + +0 - -3 + +3 - -20 + +20 - -5060 + +5060 - - -0 + + +0 - -180 + +180 - -90 + +90 - -0 + +0 - -1 + +1 - - -0 + + +0 - -0 + +0 - - -0 + + +0 - -0 + +0 - -0 + +0 - -0 + +0 - -0 + +0 - -1 + +1 - -0 + +0 - - -50 + + +50 - - - -400 + + + +400 - -0 + +0 - + - -0 + +0 - -1 + +1 - -0 + +0 - -101 + +101 - - - + + + - -0 + +0 - -8 + +8 - -4 + +4 - -18 + +18 - -9 + +9 - -3 + +3 - -0 + +0 - -0 + +0 - - -99 + + +99 - -99 + +99 - -99 + +99 - -0 + +0 - - - -256 + + + +256 - -2 + +2 - -99 + +99 - -100 - - -98 + +100 - -0 + +98 - -0 + +0 - -0 + +0 - - -2 + +0 - -1 + + +2 - -1 + +1 - -1 + +1 - -0 - + +1 + +0 + - -1 - -0 + +1 - - + +0 - -{ x+ | *x+ | *xx*x+ } + + - -0 + +{ x+ | *x+ | *xx*x+ } - -0 + +0 - -0 + +0 - -0 + +0 - -0 + +0 - -100 + +0 - -0 + +100 - -1 + +0 - -20 + +1 - -4 + +20 - -60 + +4 - -0 + +60 - -1 + +0 - - + +1 - - + + - - + + - - + + - - + + - - + + - - + + - + + + - + - -1 - - + +1 - - + + - - + + - - + + - - + + - - - + + - - + + + - -0 + + - + +0 + - - - - + + - -0 + + - -2 + +0 - - + +2 - + + - -1 + - -0 + +1 - -3 + +0 - -20 + +3 - -5062 + +20 - - -0 + +5062 - -180 + + +0 - -90 + +180 - -0 + +90 - -1 + +0 - - -0 + +1 - -0 + + +0 - - -0 + +0 - - -0 + + +0 - -0 + + +0 - -0 + +0 - -0 + +0 - -1 + +0 - -0 + +1 - - -50 + +0 - - - -400 + + +50 - -0 + + + +400 - + +0 + - -0 - -1 + +0 - -0 + +1 - -101 + +0 - - - + +101 - -0 + + + - -8 + +0 - -4 + +8 - -18 + +4 - -9 + +18 - -3 + +9 - -0 + +3 - -0 + +0 - - -99 + +0 - -99 + + +99 - -99 + +99 - -0 + +99 - - - -256 + +0 - -2 + + + +256 - -99 + +2 - -100 + +99 - -98 + +100 - -0 + +98 - -0 + +0 - -0 + +0 - - -2 + +0 - -1 + + +2 - -1 + +1 - -1 + +1 - -0 + +1 - + +0 + - -1 - -0 + +1 - - + +0 - -{ x+ | *x+ | *xx*x+ } + + - -0 + +{ x+ | *x+ | *xx*x+ } - -0 + +0 - -0 + +0 - -0 + +0 - -0 + +0 - -100 + +0 - -0 + +100 - -1 + +0 - -20 + +1 - -4 + +20 - -60 + +4 - -0 + +60 - -1 + +0 - - + +1 - - + + - - + + - - + + - - + + - - + + - - + + - + + + - - -1 + - - + +1 - - + + - - + + - - + + - - + + - - - + + - - - + + + - -0 + + + - + +0 - - + - - + + - -0 + + - -2 + +0 - - + +2 - + + + - -1 - -0 + +1 - -3 + +0 - -20 + +3 - -5064 + +20 - - -0 + +5064 - -180 + + +0 - -90 + +180 - -0 + +90 - -1 + +0 - - -0 + +1 - -0 + + +0 - - -0 + +0 - -0 + + +0 - -0 + +0 - -0 + +0 - -0 + +0 - -1 + +0 - -0 - - - -50 + +1 - - - -400 + +0 - -0 + + +50 + + + +400 - + +0 - -0 + - -1 - -0 + +0 - -101 + +1 - - - + +0 - -0 + +101 - -8 + + + - -4 + +0 - -18 + +8 - -9 + +4 - -3 + +18 - -0 + +9 - -0 + +3 - - -99 + +0 - -99 + +0 - -99 + + +99 - -0 + +99 - - - -256 + +99 - -2 + +0 - -99 + + + +256 - -100 + +2 - -98 + +99 - -0 + +100 - -0 + +98 - -0 + +0 - - -2 + +0 - -1 + +0 - -1 + + +2 - -1 + +1 - -0 + +1 - + +1 + +0 - -1 + - -0 - - + +1 - -{ x+ | *x+ | *xx*x+ } + +0 - -0 + + - -0 + +{ x+ | *x+ | *xx*x+ } - -0 + +0 - -0 + +0 - -0 + +0 - -100 + +0 - -0 + +0 - -1 + +100 - -20 + +0 - -4 + +1 - -60 + +20 - -0 + +4 - -1 + +60 - - + +0 - - + +1 - - + + - - + + - - + + - - + + - - + + - + + - + + + - -5004 + - -0 - -20 + +5004 - - + +0 - - - + +20 - - + + - - + + + - - - + + + + - -0 + + + - -0 - -0 + +0 - - + +0 - -0 + +0 - -1 + + - - + +0 - + +1 + + - -1 + - -15 - -1400 + +1 - -0 + +15 - -0 + +1400 - -0 + +0 - + +0 + +0 - + - - - - + - - + + - - + + - - + + - - + + - -GXV + + - - - - - + + - - - - - + +GXV - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - -0 -0 -0 -0 + + + + + - - -0 + + + + + - - -0 + +0 +0 +0 +0 - - -0 + + +0 - -0 + + +0 - - + + +0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1 - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +1 + + + +1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - - - + + + + + - - - - + + + + - + - + - - - + + + - - + + - -1 + +1 - -1 + +1 - + - -0 + +0 - -0 + +0 - -80 + +80 {$admin_password} - + {$user_password} - - - - -1 + + + + +1 - -0 + +0 - - + + - - + + - - + + - -2 + +2 - -fw.ipvideotalk.com/gs + +fw.ipvideotalk.com/gs - -{$domain_name}{$project_path}/app/provision + +{$domain_name}{$project_path}/app/provision - - + + - - + + - - + + - - + + - - -1 + + +1 - -1 + +1 - -0 + +0 - -10080 + +10080 - -1 + +1 - -1 + +1 - - - - - -0 + + + + + +0 - -0 + +0 - + - - + + - - -0 + + +0 - -0 - + +0 + - - -0 - - -0 + +0 - + + +0 + - - - - - + + + + - + - - - + - - + + + - - + + - - + + - - + + - - + + - - + + - -2 + + - -7547 + +2 - + +7547 - - + - - + + - - + + - + + + - -0 - -0 + +0 - - - - - - - - - - - - - - - - - - - - - - -0 + +0 - -8 + + + + + + + + + + + + + + + + + + + + + + +0 - -0 + +8 - -0 + +0 - -1 + +0 - -0 + +1 - - - - - - -0 + +0 - + + + + + + +0 + - + - -0 - -0 + +0 - - + +0 - - + + - - -60 + + - + + +60 + - -0 - - + +0 - + + - + - - - -0 + - - -0 + + + +0 - - - + + +0 - - - + + + - + + + - - - -0 + - -0 + + + +0 - - - + +0 - - - + + + - - - - -0 + + + - - -0 + + + + +0 - - - + + +0 - - - + + + - + + + - - - -0 + - - -0 + + + +0 - - - + + +0 - - - + + + - - - - -0 + + + - - -0 + + + + +0 - - - + + +0 - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + P6221 = 0 - - - + + + - - - + + + - + - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - + + -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - -0 - - - -0 - - - - - - - - - - - - - -0 - - - -0 - - - - - - - - +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + +0 + + + +0 + + + + + + + + + + + + + +0 + + + +0 + + + + + + + + \ No newline at end of file diff --git a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml index a568f762f3..7955cb80d0 100644 --- a/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3175v2/{$mac}.xml @@ -460,9 +460,9 @@ - - - + + + @@ -722,7 +722,7 @@ {$user_password} - + 0 diff --git a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml index 033336ee33..6d4bac3774 100644 --- a/resources/templates/provision/grandstream/gxv3504/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxv3504/{$mac}.xml @@ -404,7 +404,7 @@ - + @@ -440,7 +440,7 @@ - + 0 @@ -463,7 +463,7 @@ - + 0 @@ -550,7 +550,7 @@ - + @@ -583,7 +583,7 @@ 1 - + 0 @@ -616,7 +616,7 @@ - + 0 @@ -637,7 +637,7 @@ - + 0 @@ -697,7 +697,7 @@ - + 0@15 @@ -759,7 +759,7 @@ - + @@ -1184,7 +1184,7 @@ - + 0 @@ -1313,7 +1313,7 @@ - + @@ -1322,7 +1322,7 @@ 0 - + 1 diff --git a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml index 74e77f0e2e..8b053e6bde 100644 --- a/resources/templates/provision/grandstream/gxw4004/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxw4004/{$mac}.xml @@ -1,4 +1,4 @@ - + @@ -14,7 +14,7 @@ 1 {$domain_name}{$project_path}/app/provision - + 1 @@ -37,7 +37,7 @@ {$user_id_1} {$user_id_1} - {$user_password_1} + {$user_password_1} {$display_name_1} 0 0 @@ -49,7 +49,7 @@ {$user_id_2} {$user_id_2} - {$user_password_2} + {$user_password_2} {$display_name_2} 0 0 @@ -73,7 +73,7 @@ {$user_id_4} {$user_id_4} - {$user_password_4} + {$user_password_4} {$display_name_4} 0 0 diff --git a/resources/templates/provision/grandstream/gxw4008/{$mac}.xml b/resources/templates/provision/grandstream/gxw4008/{$mac}.xml index d3f161799e..aa61d4a0ab 100644 --- a/resources/templates/provision/grandstream/gxw4008/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxw4008/{$mac}.xml @@ -1,4 +1,4 @@ - + @@ -14,7 +14,7 @@ 1 {$domain_name}{$project_path}/app/provision - + 1 @@ -37,7 +37,7 @@ {$user_id_1} {$user_id_1} - {$user_password_1} + {$user_password_1} {$display_name_1} 0 0 @@ -49,7 +49,7 @@ {$user_id_2} {$user_id_2} - {$user_password_2} + {$user_password_2} {$display_name_2} 0 0 @@ -73,7 +73,7 @@ {$user_id_4} {$user_id_4} - {$user_password_4} + {$user_password_4} {$display_name_4} 0 0 @@ -84,11 +84,11 @@ - + {$user_id_5} {$user_id_5} - {$user_password_5} + {$user_password_5} {$display_name_5} 0 0 @@ -100,7 +100,7 @@ {$user_id_6} {$user_id_6} - {$user_password_6} + {$user_password_6} {$display_name_6} 0 0 @@ -115,7 +115,7 @@ {$user_password_7} {$display_name_7} 0 - 0 + 0 1 diff --git a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml index d490c3c6d5..250b806619 100644 --- a/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml +++ b/resources/templates/provision/grandstream/gxw42xx/{$mac}.xml @@ -2,23 +2,23 @@ - + - + - - - + + + - - - - - + + + + + - + - + {$admin_password} @@ -26,137 +26,137 @@ {$user_password} - - - - + + + + 0 - - + + 0 0 0 0 - - + + - - + + - - + + GXW4200 - - + + - - + + - - - + + + - - - - - - - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - + + + + + + + 1 - - - - + + + + 12 - - - - + + + + 0 - - - - + + + + 0 - - - + + + 0 - - + + - - - + + + 3 - - - + + + 20 - + - - - + + + 0 - - - - - - - + + + + + + + 0 - - - + + + - + @@ -174,7 +174,7 @@ fm.grandstream.com/gs - + {$domain_name}{$project_path}/app/provision @@ -197,7 +197,7 @@ - + 1 @@ -207,7 +207,7 @@ - + 10080 @@ -217,11 +217,11 @@ - + 1 - + 0 @@ -241,7 +241,7 @@ - + 0 @@ -274,7 +274,7 @@ 0 - + 300 @@ -283,7 +283,7 @@ - + @@ -306,7 +306,7 @@ - + 1812 @@ -318,7 +318,7 @@ - + @@ -326,17 +326,17 @@ - + 1812 - + 1813 - + @@ -355,11 +355,11 @@ -us.pool.ntp.org +us.pool.ntp.org - + 60 @@ -408,7 +408,7 @@ - + @@ -418,20 +418,20 @@ 0 - + 0 - + c=2000/4000; - + @@ -442,23 +442,23 @@ f1=440@-19,f2=480@-19,c=2000/4000; - + f1=480@-24,f2=620@-24,c=500/500; - + f1=480@-24,f2=620@-24,c=250/250; - + f1=350@-11,f2=440@-11,c=100/100-100/100-100/100; - + f1=440@-13,c=300/10000-300/10000-0/0; - + f1=350@-13,f2=440@-13,c=0/0; @@ -471,7 +471,7 @@ 0 - + @@ -484,7 +484,7 @@ 0 - + @@ -495,16 +495,16 @@ - + 0 - + en - + @@ -521,7 +521,7 @@ {$server_address_1} - + @@ -530,7 +530,7 @@ 0 - + @@ -539,7 +539,7 @@ - + 0 @@ -553,14 +553,14 @@ - + 0 - + @@ -580,27 +580,27 @@ - + 1 - + 0 - + 1 - + 3 - + 30 @@ -610,12 +610,12 @@ - + 5060 - + 0 @@ -642,7 +642,7 @@ - + @@ -652,24 +652,24 @@ - + 0 - + 0 - + 180 - + 90 @@ -679,44 +679,44 @@ - + 0 - + 0 - + 0 - + 1 - + 0 - + 0 - -0 + +0 - + 0 @@ -729,27 +729,27 @@ - + 0 - + 0 - + 0 - + 1 - + 1 @@ -765,15 +765,15 @@ - + 100 - + 100 - + 0 @@ -785,7 +785,7 @@ - + 0 @@ -793,27 +793,27 @@ 8 - + 4 - - + + 18 - + 2 - + 98 - + 104 - + 100 @@ -828,42 +828,42 @@ - + 0 - + 0 - + 97 - + 100 - + 99 - + 104 - + 103 - + 0 @@ -876,7 +876,7 @@ - + 0 @@ -915,17 +915,17 @@ - + 0 - + 0 - + 200 @@ -940,7 +940,7 @@ 300 - + 1100 @@ -959,9 +959,9 @@ -0 +0 - + @@ -997,7 +997,7 @@ - + 1 @@ -1011,27 +1011,27 @@ - -1 + +1 - + 0 - + 0 - + 0 - + 0 @@ -1041,7 +1041,7 @@ - + 0 @@ -1051,17 +1051,17 @@ - + 0 - - + + 0 - + - + 0 @@ -1081,7 +1081,7 @@ - + 0 @@ -1091,13 +1091,13 @@ - + 20 - + 100 @@ -1107,7 +1107,7 @@ - + @@ -1129,7 +1129,7 @@ - + 0 @@ -1144,12 +1144,12 @@ c=2000/4000; - + c=2000/4000; - -c=2000/4000; + +c=2000/4000; @@ -1168,15 +1168,15 @@ c=2000/4000; - + c=2000/4000; - -c=2000/4000; + +c=2000/4000; - + c=2000/4000; @@ -1202,7 +1202,7 @@ 0 - + @@ -1211,7 +1211,7 @@ - + 0 @@ -1232,11 +1232,11 @@ 0 - + - + @@ -1257,22 +1257,22 @@ - + 0 - + 1 - + 3 - + 30 @@ -1282,12 +1282,12 @@ - + 5060 - + 0 @@ -1329,19 +1329,19 @@ - + 0 - + 180 - + 90 @@ -1351,12 +1351,12 @@ - + 0 - + 0 @@ -1366,32 +1366,32 @@ - + 1 - + 0 - + 0 - + 0 - + 0 - + 0 @@ -1401,27 +1401,27 @@ - + 0 - + 0 - + 0 - + 1 - + 1 @@ -1437,15 +1437,15 @@ - + 100 - + 100 - + 0 @@ -1457,35 +1457,35 @@ - + 0 - + 8 - + 4 - + 18 - + 2 - - + + 98 - + 104 - + 100 @@ -1505,37 +1505,37 @@ - + 0 - + 97 - + 100 - + 99 - + 104 - + 103 - + 0 @@ -1566,7 +1566,7 @@ - + 0 @@ -1582,22 +1582,22 @@ - + 0 - + 0 - + 0 - + 200 @@ -1618,7 +1618,7 @@ - + 400 @@ -1631,10 +1631,10 @@ - -0 + +0 - + @@ -1657,7 +1657,7 @@ - + 0 @@ -1670,7 +1670,7 @@ - + 1 @@ -1685,31 +1685,31 @@ -1 +1 - + 0 - + 0 - + 0 - + 0 - + 0 @@ -1724,7 +1724,7 @@ - + 0 @@ -1732,14 +1732,14 @@ 0 - + - + 0 - + 60 @@ -1749,12 +1749,12 @@ - + 0 - + 0 @@ -1764,13 +1764,13 @@ - + 20 - + 100 @@ -1780,7 +1780,7 @@ - + @@ -1797,12 +1797,12 @@ 0 - + - + 0 @@ -1817,15 +1817,15 @@ c=2000/4000; - + c=2000/4000; - -c=2000/4000; + +c=2000/4000; - + c=2000/4000; @@ -1833,7 +1833,7 @@ c=2000/4000; - + c=2000/4000; @@ -1841,15 +1841,15 @@ c=2000/4000; - + c=2000/4000; - -c=2000/4000; + +c=2000/4000; - + c=2000/4000; @@ -1884,7 +1884,7 @@ - + 0 @@ -1905,11 +1905,11 @@ 0 - + - + @@ -1925,12 +1925,12 @@ - + 1 - + 0 @@ -1940,12 +1940,12 @@ - + 3 - + 30 @@ -1955,12 +1955,12 @@ - + 5060 - + 0 @@ -1972,7 +1972,7 @@ - + 400 @@ -1987,7 +1987,7 @@ - + @@ -1997,74 +1997,74 @@ - + 0 - + 0 - + 180 - + 90 - + 0 - + 0 - + 0 - + 0 - + 1 - + 0 - + 0 - + 0 - + 0 - + 0 @@ -2074,34 +2074,34 @@ - + 0 - + 0 - + 0 - + 1 - + 1 - + @@ -2110,15 +2110,15 @@ - + 100 - + 100 - + 0 @@ -2130,35 +2130,35 @@ - + 0 - + 8 - + 4 - + 18 - + 2 - - + + 98 - + 104 - + 100 @@ -2168,7 +2168,7 @@ - + 0 @@ -2178,17 +2178,17 @@ - + 0 - + 97 - + 100 @@ -2198,17 +2198,17 @@ - + 104 - + 103 - + 0 @@ -2221,7 +2221,7 @@ - + 0 @@ -2239,7 +2239,7 @@ - + 0 @@ -2255,22 +2255,22 @@ - + 0 - + 0 - + 0 - + 200 @@ -2285,16 +2285,16 @@ 300 - + 1100 - + 400 - + @@ -2303,10 +2303,10 @@ - + 0 - + @@ -2315,7 +2315,7 @@ - + 0 @@ -2329,20 +2329,20 @@ - + 0 - + { x+ | *x+ } - + 1 @@ -2356,37 +2356,37 @@ - + 1 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 @@ -2396,7 +2396,7 @@ - + 0 @@ -2404,14 +2404,14 @@ 0 - + 0 - + 60 @@ -2421,12 +2421,12 @@ - + 0 - + 0 @@ -2436,13 +2436,13 @@ - + 20 - + 100 @@ -2469,12 +2469,12 @@ 0 - + - + 0 @@ -2489,12 +2489,12 @@ c=2000/4000; - + c=2000/4000; - -c=2000/4000; + +c=2000/4000; @@ -2505,7 +2505,7 @@ c=2000/4000; - + c=2000/4000; @@ -2517,11 +2517,11 @@ c=2000/4000; - -c=2000/4000; + +c=2000/4000; - + c=2000/4000; @@ -2534,7 +2534,7 @@ 1 - + {$server_address_4} @@ -2547,7 +2547,7 @@ 0 - + @@ -2556,7 +2556,7 @@ - + 0 @@ -2577,11 +2577,11 @@ 0 - + - + @@ -2602,7 +2602,7 @@ - + 0 @@ -2612,12 +2612,12 @@ - + 3 - + 30 @@ -2627,12 +2627,12 @@ - + 5060 - + 0 @@ -2644,7 +2644,7 @@ - + 400 @@ -2659,7 +2659,7 @@ - + @@ -2669,34 +2669,34 @@ - + 0 - + 0 - + 180 - + 90 - + 0 - + 0 @@ -2706,37 +2706,37 @@ - + 0 - + 1 - + 0 - + 0 - -0 + +0 - + 0 - + 0 @@ -2746,34 +2746,34 @@ - + 0 - + 0 - + 0 - + 1 - + 1 - + @@ -2782,15 +2782,15 @@ - + 100 - + 100 - + 0 @@ -2802,35 +2802,35 @@ - + 0 - + 8 - + 4 - + 18 - + 2 - + 98 - + 104 - + 100 @@ -2840,7 +2840,7 @@ - + 0 @@ -2850,17 +2850,17 @@ - + 0 - + 97 - + 100 @@ -2870,17 +2870,17 @@ - + 104 - + 103 - + 0 @@ -2893,7 +2893,7 @@ - + 0 @@ -2911,7 +2911,7 @@ - + 0 @@ -2927,22 +2927,22 @@ - + 0 - + 0 - + 0 - + 200 @@ -2957,12 +2957,12 @@ 300 - + 1100 - + 400 @@ -2975,10 +2975,10 @@ - + 0 - + @@ -2987,7 +2987,7 @@ - + 0 @@ -3001,14 +3001,14 @@ - + 0 - + { x+ | *x+ } @@ -3028,37 +3028,37 @@ - -1 + +1 - + 0 - + 0 - + 0 - + 0 - + 0 - + 0 @@ -3068,22 +3068,22 @@ - + 0 - - + + 0 - + - + 0 - + 60 @@ -3093,12 +3093,12 @@ - + 0 - + 0 @@ -3108,13 +3108,13 @@ - + 20 - + 100 @@ -3123,8 +3123,8 @@ - - + + @@ -3141,12 +3141,12 @@ 0 - + - + 0 @@ -3165,11 +3165,11 @@ c=2000/4000; - -c=2000/4000; + +c=2000/4000; - + c=2000/4000; @@ -3177,7 +3177,7 @@ c=2000/4000; - + c=2000/4000; @@ -3185,15 +3185,15 @@ c=2000/4000; - + c=2000/4000; - -c=2000/4000; + +c=2000/4000; - + c=2000/4000; @@ -3211,7 +3211,7 @@ - + diff --git a/resources/templates/provision/grandstream/ht502/{$mac}.xml b/resources/templates/provision/grandstream/ht502/{$mac}.xml index cfa7dd2cdc..eee21db083 100644 --- a/resources/templates/provision/grandstream/ht502/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht502/{$mac}.xml @@ -1,511 +1,511 @@ - + - - - - - - + + + + + + {$admin_password} {$user_password} - - - 12 - - - 0 - - - 0 - - - 0 + + + 12 + + + 0 + + + 0 + + + 0 - - - - - - 20 - - 0 - - - 5 + + + + + + 20 + + 0 + + + 5 - - - 2 - - fm.grandstream.com/gs - - {$domain_name}{$project_path}/app/provision - - - - - - - - - - - - - - - - - 1 - - 0 - - 10080 - - 1 - - 1 - - - - - - - - 0 - - - 0 - - - 0 - - - - - - - - - - - - - - - - - - - - 0 - - - 300 - - - - - - - - - 7547 - - - - - - - c=2000/4000; + + + 2 + + fm.grandstream.com/gs + + {$domain_name}{$project_path}/app/provision + + + + + + + + + + + + + + + + + 1 + + 0 + + 10080 + + 1 + + 1 + + + + + + + + 0 + + + 0 + + + 0 + + + + + + + + + + + + + + + + + + + + 0 + + + 300 + + + + + + + + + 7547 + + + + + + + c=2000/4000; - - - - f1=350@-13,f2=440@-13,c=0/0; - - - f1=440@-19,f2=480@-19,c=2000/4000; - - - f1=480@-24,f2=680@-24,c=500/500; - - - f1=480@-24,f2=620@-24,c=250/250; - - - f1=350@-11,f2=440@-11,c=100/100-100/100-100/100; - - - f1=440@-13,c=300/10000-300/10000-0/0; - - - f1=350@-13,f2=440@-13,c=0/0; - - - - 0 - - 0 - - 0 - - 0 - - us.pool.ntp.org - - - 1440 - - - - 0 - - 0 + + + + f1=350@-13,f2=440@-13,c=0/0; + + + f1=440@-19,f2=480@-19,c=2000/4000; + + + f1=480@-24,f2=680@-24,c=500/500; + + + f1=480@-24,f2=620@-24,c=250/250; + + + f1=350@-11,f2=440@-11,c=100/100-100/100-100/100; + + + f1=440@-13,c=300/10000-300/10000-0/0; + + + f1=350@-13,f2=440@-13,c=0/0; + + + + 0 + + 0 + + 0 + + 0 + + us.pool.ntp.org + + + 1440 + + + + 0 + + 0 - - - 1 - - {$server_address_1} - - - - 1 - - - - 0 - - 0 - - {$user_id_1} - - {$user_id_1} - - {$user_password_1} - - {$display_name_1} - - 0 - - - - - - - - 0 - - 1 - - 0 - - 1 - - 3 - - 0 - - 30 - - - 5060 - - - 5004 - - 0 - - 0 - - 0 - - 0 - - 0 - - 1 - - 0 - - 0 - - 0 - - - - 100 - - - - 400 - - 101 - - - - - 100 - - - 100 - - - 100 - - 0 - - 0 - - 1 - - - - - 0 - - - - - - - - - - - - 0 - - - - - 0 - - - - - 0 - - - - 0 - - 0 - - 0 - - 0 - - 0 - - 0 - - 60 - - 20 - - 4 - - 0 - - - - 1 - - { x+ | *x+ } - - 0 - - 0 - - 0 - - - - 100 - - 180 - - - 90 - - 0 - - 0 - - 0 - - 0 - - 0 - - 1 - - 0 - - 1 - - 0 + + + 1 + + {$server_address_1} + + + + 1 + + + + 0 + + 0 + + {$user_id_1} + + {$user_id_1} + + {$user_password_1} + + {$display_name_1} + + 0 + + + + + + + + 0 + + 1 + + 0 + + 1 + + 3 + + 0 + + 30 + + + 5060 + + + 5004 + + 0 + + 0 + + 0 + + 0 + + 0 + + 1 + + 0 + + 0 + + 0 + + + + 100 + + + + 400 + + 101 + + + + + 100 + + + 100 + + + 100 + + 0 + + 0 + + 1 + + + + + 0 + + + + + + + + + + + + 0 + + + + + 0 + + + + + 0 + + + + 0 + + 0 + + 0 + + 0 + + 0 + + 0 + + 60 + + 20 + + 4 + + 0 + + + + 1 + + { x+ | *x+ } + + 0 + + 0 + + 0 + + + + 100 + + 180 + + + 90 + + 0 + + 0 + + 0 + + 0 + + 0 + + 1 + + 0 + + 1 + + 0 - - - 0 - - - - - - 0 - - - 8 - - - 4 - - - 18 - - - 2 - - - 98 - - - 103 - - - 99 - - - 2 - - 0 - - 0 - - - 97 - - - 100 - - - 99 - - - 104 - - - 103 - - - 102 - - 0 - - 0 - - 0 - - 0 - - 1 - - 1 - - - 0 - - - - - 0 - - - - - - - - - - - - - 0 - - 0 - - 0 - - 200 - - 1 - - - 300 - - - 1100 - - - 400 - - - - - - - - - - 0 - - - - - - - - - 0 - - 0 - - c=2000/4000; - - c=2000/4000; - - c=2000/4000; - - c=2000/4000; - - c=2000/4000; - - c=2000/4000; - - c=2000/4000; - - c=2000/4000; - - c=2000/4000; - - c=2000/4000; - - - - - - - - - + + + 0 + + + + + + 0 + + + 8 + + + 4 + + + 18 + + + 2 + + + 98 + + + 103 + + + 99 + + + 2 + + 0 + + 0 + + + 97 + + + 100 + + + 99 + + + 104 + + + 103 + + + 102 + + 0 + + 0 + + 0 + + 0 + + 1 + + 1 + + + 0 + + + + + 0 + + + + + + + + + + + + + 0 + + 0 + + 0 + + 200 + + 1 + + + 300 + + + 1100 + + + 400 + + + + + + + + + + 0 + + + + + + + + + 0 + + 0 + + c=2000/4000; + + c=2000/4000; + + c=2000/4000; + + c=2000/4000; + + c=2000/4000; + + c=2000/4000; + + c=2000/4000; + + c=2000/4000; + + c=2000/4000; + + c=2000/4000; + + + + + + + + + @@ -513,7 +513,7 @@ {$server_address_2} - + 0 @@ -551,7 +551,7 @@ 0 - 30 + 30 5062 @@ -571,7 +571,7 @@ 0 - 0 + 0 0 @@ -612,7 +612,7 @@ - + 0 @@ -631,7 +631,7 @@ 0 - 0 + 0 0 @@ -677,7 +677,7 @@ 0 - 0 + 0 1 @@ -711,7 +711,7 @@ 98 - + 103 @@ -749,12 +749,12 @@ 1 0 - + 0 - + @@ -829,11 +829,11 @@ - - + + - - + + @@ -912,8 +912,8 @@ - - + + @@ -930,7 +930,7 @@ - + @@ -940,12 +940,12 @@ - + - - + + @@ -956,7 +956,7 @@ MTZ+6MDT+5,M3.2.0,M11.1.0 0 - + 0 @@ -991,7 +991,7 @@ 1 - + 100 199 @@ -1012,7 +1012,7 @@ - + @@ -1023,7 +1023,7 @@ - + @@ -1107,7 +1107,7 @@ - + diff --git a/resources/templates/provision/grandstream/ht503/{$mac}.xml b/resources/templates/provision/grandstream/ht503/{$mac}.xml index 615be11047..c22655a82a 100644 --- a/resources/templates/provision/grandstream/ht503/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht503/{$mac}.xml @@ -1,225 +1,225 @@ - + - + - + - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - + - - - - + + + + - - - - + + + + - + - - - - - + + + + + - + - + - - + + {$admin_password} {$user_password} - - - - -12 + + + + +12 - - - - -0 + + + + +0 - - - - -0 + + + + +0 - - - - -0 + + + + +0 -stun.mycompany.com +stun.mycompany.com -20 +20 -0 +0 -5 +5 -2 +2 -fm.grandstream.com/gs +fm.grandstream.com/gs -{$domain_name}{$project_path}/app/provision +{$domain_name}{$project_path}/app/provision - + - + - + - + - + - + - + -1 +1 -0 +0 -10080 +10080 -1 +1 -1 +1 - + -0 +0 - + -0 +0 - + -0 +0 - + - + @@ -228,7 +228,7 @@ - + @@ -239,307 +239,307 @@ - + - + -0 +0 -300 +300 - + - + -7547 +7547 - + - + -c=2000/4000; +c=2000/4000; -f1=350@-13,f2=440@-13,c=0/0; +f1=350@-13,f2=440@-13,c=0/0; -f1=440@-19,f2=480@-19,c=2000/4000; +f1=440@-19,f2=480@-19,c=2000/4000; -f1=480@-24,f2=680@-24,c=500/500; +f1=480@-24,f2=680@-24,c=500/500; -f1=480@-24,f2=620@-24,c=250/250; +f1=480@-24,f2=620@-24,c=250/250; -f1=350@-11,f2=440@-11,c=100/100-100/100-100/100; +f1=350@-11,f2=440@-11,c=100/100-100/100-100/100; -f1=440@-13,c=300/10000-300/10000-0/0; +f1=440@-13,c=300/10000-300/10000-0/0; -f1=350@-13,f2=440@-13,c=0/0; +f1=350@-13,f2=440@-13,c=0/0; - + -0 +0 -0 +0 -0 +0 -0 +0 -us.pool.ntp.org +us.pool.ntp.org -60 +60 - + -0 +0 -0 +0 -1 +1 -{$server_address_1} +{$server_address_1} - + -0 +0 -proxy.mycompany.com +proxy.mycompany.com -0 +0 -0 +0 -{$user_id_1} +{$user_id_1} -{$user_id_1} +{$user_id_1} -{$user_password_1} +{$user_password_1} -{$display_name_1} +{$display_name_1} -0 +0 - + - + - + -0 +0 -1 +1 -0 +0 -1 +1 -3 +3 -0 +0 -20 +20 -5060 +5060 -5004 +5004 -0 +0 -0 +0 -0 +0 -0 +0 -0 +0 -1 +1 -0 +0 -0 +0 -0 +0 - + -50 +50 - + -400 +400 -101 +101 - + -100 +100 @@ -549,217 +549,217 @@ -100 +100 - + -0 +0 - + -0 +0 - + -1 +1 - - + + -0 +0 - + - + - + - - + + -0 +0 - + -0 +0 - + -0 +0 - + -0 +0 -0 +0 -0 +0 -0 +0 -0 +0 -0 +0 -60 +60 -20 +20 -4 +4 -0 +0 - + -1 +1 - + -{ x+ | *x+ } +{ x+ | *x+ } -0 +0 -0 +0 -0 +0 - + -100 +100 -180 +180 -90 +90 -0 +0 -0 +0 -0 +0 -0 +0 -1 +1 -0 +0 -0 +0 -1 +1 -0 +0 -0 +0 @@ -767,116 +767,116 @@ -0 +0 -8 +8 - + -4 +4 - + -18 +18 - + -2 +2 -98 +98 - + -103 +103 - + -99 +99 -2 +2 -0 +0 -0 +0 -97 +97 -100 +100 -99 +99 -104 +104 -103 +103 -102 +102 -0 +0 -0 +0 -0 +0 -0 +0 -1 +1 -1 +1 @@ -884,19 +884,19 @@ -0 +0 - + -0 +0 - + - + @@ -905,51 +905,51 @@ - + -0 +0 --20 +-20 -0 +0 -0 +0 -200 +200 -1 +1 -300 +300 -1100 +1100 -400 +400 @@ -962,9 +962,9 @@ -0 +0 - + @@ -974,59 +974,59 @@ -0 +0 -0 +0 -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -1 +1 @@ -1034,397 +1034,397 @@ - + -0 +0 -proxy.mycompany.com +proxy.mycompany.com -0 +0 -0 +0 -{$user_id_1} +{$user_id_1} -{$user_id_1} +{$user_id_1} -{$user_password_1} +{$user_password_1} -{Display_name_1} +{Display_name_1} -0 +0 - + - + - + -0 +0 -1 +1 -0 +0 -1 +1 -3 +3 -0 +0 -20 +20 -5062 +5062 -5012 +5012 -0 +0 -0 +0 -1 +1 -0 +0 -0 +0 -0 +0 - + -50 +50 - + -400 +400 -101 +101 -100 +100 -100 +100 -100 +100 -0 +0 - + - + - + - + -60 +60 -0 +0 - + -1 +1 - + -{ x+ | *x+ } +{ x+ | *x+ } -0 +0 -0 +0 - + -100 +100 -180 +180 -90 +90 -0 +0 -0 +0 -0 +0 -0 +0 -0 +0 -1 +1 -40 +40 -0 +0 -0 +0 - -0 + +0 - + -8 +8 -4 +4 -18 +18 - + -2 +2 - + -98 +98 - + -103 +103 - + -99 +99 -2 +2 -0 +0 -0 +0 -97 +97 -100 +100 - -99 + +99 -104 +104 -103 +103 -102 +102 - + -0 +0 -0 +0 -0 +0 -0 +0 -1 +1 -1 +1 @@ -1432,11 +1432,11 @@ -0 +0 - + - + @@ -1448,40 +1448,40 @@ -0 +0 --40 +-40 -70 +70 -40 +40 -0 +0 -0 +0 -600 +600 - + @@ -1491,9 +1491,9 @@ -0 +0 - + @@ -1503,44 +1503,44 @@ -0 +0 -0 +0 -1 +1 -100 +100 -0 +0 - + -f1=480@-24,f2=620@-24,c=500/500; +f1=480@-24,f2=620@-24,c=500/500; -0 +0 - + -0 +0 @@ -1559,53 +1559,53 @@ - + -4 +4 -1 +1 -4 +4 -100 +100 -100 +100 -10 +10 -4 +4 -1 +1 -2 +2 @@ -1617,28 +1617,28 @@ -80 +80 -0 +0 - + -0 +0 - + -HT500 +HT500 @@ -1654,7 +1654,7 @@ - + @@ -1769,18 +1769,18 @@ -customize +customize -MTZ+6MDT+5,M3.2.0,M11.1.0 +MTZ+6MDT+5,M3.2.0,M11.1.0 -0 +0 @@ -1789,27 +1789,27 @@ -0 +0 -1024 +1024 -3600 +3600 -300 +300 - + @@ -1824,7 +1824,7 @@ -0 +0 @@ -1841,254 +1841,254 @@ -0 +0 -0 +0 -0 +0 -0 +0 - + - + - + - + - + - + -1 +1 - + -100 +100 -199 +199 -255.255.255.0 +255.255.255.0 -120 +120 - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - + + -*00 +*00 - + - + - + - + - + -5060 +5060 \ No newline at end of file diff --git a/resources/templates/provision/grandstream/ht701/{$mac}.xml b/resources/templates/provision/grandstream/ht701/{$mac}.xml index 1805fa7ace..30bbcb0632 100644 --- a/resources/templates/provision/grandstream/ht701/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht701/{$mac}.xml @@ -1,4 +1,4 @@ - + @@ -70,7 +70,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -110,29 +110,29 @@ -10080 +10080 -1 +1 -1 +1 -0 +0 - + @@ -151,552 +151,552 @@ - + - + -0 +0 -300 +300 - + - + - + - + c=2000/4000; --> - + -f1=350@-13,f2=440@-13,c=0/0; +f1=350@-13,f2=440@-13,c=0/0; -f1=440@-19,f2=480@-19,c=2000/4000; +f1=440@-19,f2=480@-19,c=2000/4000; -f1=480@-24,f2=620@-24,c=500/500; +f1=480@-24,f2=620@-24,c=500/500; -f1=480@-24,f2=620@-24,c=250/250; +f1=480@-24,f2=620@-24,c=250/250; -f1=350@-11,f2=440@-11,c=100/100-100/100-100/100; +f1=350@-11,f2=440@-11,c=100/100-100/100-100/100; -f1=440@-13,c=300/300-300/10000; +f1=440@-13,c=300/300-300/10000; -0 +0 -0 +0 -0 +0 -us.pool.ntp.org +us.pool.ntp.org -0 +0 - + - + -0 +0 -0 +0 - + -1 +1 -{$server_address_1} +{$server_address_1} - + -0 +0 - + -0 +0 -0 +0 -0 +0 -{$user_id_1} +{$user_id_1} -{$user_id_1} +{$user_id_1} -{$user_password_1} +{$user_password_1} -{$display_name_1} +{$display_name_1} -0 +0 -0 +0 -1 +1 -0 +0 -1 +1 -3 +3 -0 +0 -20 +20 -5060 +5060 -5004 +5004 -0 +0 -0 +0 -0 +0 -0 +0 -0 +0 -0 +0 -0 +0 -1 +1 -0 +0 -0 +0 -0 +0 -0 +0 -0 +0 -0 +0 -50 +50 -400 +400 -101 +101 -101 +101 -102 +102 -100 +100 -0 +0 -0 +0 -1 +1 - + -0 +0 - + - + - + - + -0 +0 - + -0 +0 - + -0 +0 - + -0 +0 -0 +0 -0 +0 -0 +0 -0 +0 -0 +0 -60 +60 -20 +20 -4 +4 -0 +0 - + -1 +1 -{ x+ | *x+ } +{ x+ | *x+ } -0 +0 -0 +0 -0 +0 - + -100 +100 -180 +180 -90 +90 -0 +0 -0 +0 -0 +0 -0 +0 -1 +1 -0 +0 -0 +0 -0 +0 -0 +0 - + -0 +0 -0 +0 -8 +8 - + -4 +4 - + -18 +18 - + -2 +2 - + 98 @@ -759,14 +759,14 @@ 0 - + 0 - + @@ -882,23 +882,23 @@ -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; @@ -914,12 +914,12 @@ -c=2000/4000; +c=2000/4000; c=2000/4000; - + @@ -984,7 +984,7 @@ -1 +1 @@ -1009,7 +1009,7 @@ -20 +20 @@ -1064,12 +1064,12 @@ -0 +0 -0 +0 @@ -1091,7 +1091,7 @@ 0 - + @@ -1124,17 +1124,17 @@ 100 - + 0 - + 0 - + 1 @@ -1143,7 +1143,7 @@ - + @@ -1152,7 +1152,7 @@ - + @@ -1209,7 +1209,7 @@ -0 +0 @@ -1259,7 +1259,7 @@ 0 - + 100 @@ -1267,7 +1267,7 @@ -180 +180 @@ -1319,7 +1319,7 @@ 0 - + @@ -1328,7 +1328,7 @@ - + 0 @@ -1348,12 +1348,12 @@ 18 - + 2 - + 98 @@ -1378,7 +1378,7 @@ 97 - + 0 @@ -1416,14 +1416,14 @@ 0 - + 0 - + @@ -1513,9 +1513,9 @@ -0 +0 - + @@ -1534,31 +1534,31 @@ -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; -c=2000/4000; +c=2000/4000; @@ -1572,7 +1572,7 @@ c=2000/4000; - + @@ -1652,7 +1652,7 @@ - + diff --git a/resources/templates/provision/grandstream/ht704/{$mac}.xml b/resources/templates/provision/grandstream/ht704/{$mac}.xml index 35f6b1cc7f..384e86d4c6 100644 --- a/resources/templates/provision/grandstream/ht704/{$mac}.xml +++ b/resources/templates/provision/grandstream/ht704/{$mac}.xml @@ -1,9 +1,9 @@ - + - + @@ -38,8 +38,8 @@ - - + + @@ -64,13 +64,13 @@ - + 2 fm.grandstream.com/gs - + {$domain_name}{$project_path}/app/provision @@ -189,7 +189,7 @@ c=2000/4000; - + @@ -304,7 +304,7 @@ 3 - + @@ -313,7 +313,7 @@ -{$server_address_1} +{$server_address_1} @@ -467,7 +467,7 @@ -50 +50 @@ -705,7 +705,7 @@ 0 - + @@ -960,7 +960,7 @@ c=2000/4000; - + @@ -988,7 +988,7 @@ 0 - + @@ -1163,7 +1163,7 @@ 1 - + @@ -1323,7 +1323,7 @@ -0 +0 @@ -1356,7 +1356,7 @@ 0 - + @@ -1429,7 +1429,7 @@ 0 - + @@ -1454,7 +1454,7 @@ 0 - + @@ -1633,7 +1633,7 @@ 0 -0 +0 1 @@ -1762,7 +1762,7 @@ - + @@ -1861,7 +1861,7 @@ - + diff --git a/resources/templates/provision/linksys/spa2102/{$mac}.xml b/resources/templates/provision/linksys/spa2102/{$mac}.xml index 958ea5994e..c7b739aada 100644 --- a/resources/templates/provision/linksys/spa2102/{$mac}.xml +++ b/resources/templates/provision/linksys/spa2102/{$mac}.xml @@ -25,7 +25,7 @@ G729a {$register_expires_1} -(1xxx[2-9]xxxxxxS0|[*#x]x.) +(1xxx[2-9]xxxxxxS0|[*#x]x.) yes @@ -37,7 +37,7 @@ G729a {$register_expires_2} -(1xxx[2-9]xxxxxxS0|[*#x]x.) +(1xxx[2-9]xxxxxxS0|[*#x]x.) @@ -47,7 +47,7 @@ G729 G729 -
".$text['label-username']."Total inbound callsLogged on since
$username  $fifo_total_inbound_calls  ".$row['ivr_menu_extension']." ".ucwords($row['ivr_menu_direct_dial'])."".ucwords($row['ivr_menu_enabled'])."".$text['label-'.$row['ivr_menu_enabled']]."".$row['ivr_menu_description']." "; if (permission_exists('ivr_menu_edit')) { diff --git a/app/ivr_menus/resources/classes/ivr_menu.php b/app/ivr_menus/resources/classes/ivr_menu.php index beaba4f804..6f8c8a9bb2 100644 --- a/app/ivr_menus/resources/classes/ivr_menu.php +++ b/app/ivr_menus/resources/classes/ivr_menu.php @@ -491,7 +491,7 @@ include "root.php"; $database->where[1]['operator'] = '='; $database->update(); - //delete the old dialplan details to prepare for new details + //delete the old dialplan details to prepare for new details $database = new database; $database->table = "v_dialplan_details"; $database->where[0]['name'] = 'domain_uuid'; @@ -828,7 +828,7 @@ include "root.php"; $sub_sql = "select * from v_ivr_menu_options "; $sub_sql .= "where ivr_menu_uuid = '$ivr_menu_uuid' "; $sub_sql .= "and domain_uuid = '".$_SESSION['domain_uuid']."' "; - $sub_sql .= "order by ivr_menu_option_order asc "; + $sub_sql .= "order by ivr_menu_option_order asc "; $sub_prep_statement = $db->prepare(check_sql($sub_sql)); $sub_prep_statement->execute(); $sub_result = $sub_prep_statement->fetchAll(PDO::FETCH_ASSOC); diff --git a/app/modules/resources/classes/modules.php b/app/modules/resources/classes/modules.php index a16352d34d..90f41e7374 100644 --- a/app/modules/resources/classes/modules.php +++ b/app/modules/resources/classes/modules.php @@ -627,6 +627,13 @@ echo $mod->dir."\n"; $mod['module_enabled'] = 'false'; $mod['module_default_enabled'] = 'false'; break; + case "mod_translate": + $mod['module_label'] = 'Translate'; + $mod['module_category'] = 'Applications'; + $mod['module_description'] = 'format numbers into a specified format.'; + $mod['module_enabled'] = 'true'; + $mod['module_default_enabled'] = 'true'; + break; case "mod_xml_cdr": $mod['module_label'] = 'XML CDR'; $mod['module_category'] = 'XML Interfaces'; @@ -694,7 +701,7 @@ echo $mod->dir."\n"; //get the list of modules public function get_modules() { $sql = " select * from v_modules "; - $sql .= "order by module_category, module_label"; + $sql .= "order by module_category, module_label"; $prep_statement = $this->db->prepare($sql); $prep_statement->execute(); $this->modules = $prep_statement->fetchAll(PDO::FETCH_ASSOC); diff --git a/app/operator_panel/resources/functions/get_call_activity.php b/app/operator_panel/resources/functions/get_call_activity.php index fd3b224ca1..bc1da3b574 100644 --- a/app/operator_panel/resources/functions/get_call_activity.php +++ b/app/operator_panel/resources/functions/get_call_activity.php @@ -166,9 +166,11 @@ function get_call_activity() { } //reindex array using extension instead of auto-incremented value + $result = array(); foreach ($array as $index => $subarray) { + $extension = $subarray['extension']; foreach ($subarray as $field => $value) { - $array[$subarray['extension']][$field] = $array[$index][$field]; + $result[$extension][$field] = $array[$index][$field]; unset($array[$index][$field]); } unset($array[$subarray['extension']]['extension']); @@ -176,5 +178,5 @@ function get_call_activity() { } //return array - return $array; + return $result; } diff --git a/app/provision/index.php b/app/provision/index.php index a0ef5de0ec..89ed9fa6ef 100644 --- a/app/provision/index.php +++ b/app/provision/index.php @@ -359,7 +359,7 @@ openlog("fusion-provisioning", LOG_PID | LOG_PERROR, LOG_LOCAL0); //deliver the customized config over HTTP/HTTPS //need to make sure content-type is correct if ($_REQUEST['content_type'] == 'application/octet-stream') { - //format the mac address and + //format the mac address and $mac = $prov->format_mac($mac, $device_vendor); //replace the variable name with the value diff --git a/app/ring_groups/ring_groups.php b/app/ring_groups/ring_groups.php index ab9d772622..a6f77cd75a 100644 --- a/app/ring_groups/ring_groups.php +++ b/app/ring_groups/ring_groups.php @@ -141,7 +141,7 @@ require_once "resources/paging.php"; } echo " ".$row['ring_group_extension']." ".ucwords($row['ring_group_enabled'])." ".$text['label-'.$row['ring_group_enabled']]." ".$text['link-call-forward']."".ucwords($row['voicemail_enabled'])." ".$text['label-'.$row['voicemail_enabled']]." ".$row['voicemail_description']." "; diff --git a/app/xml_cdr/v_xml_cdr_import.php b/app/xml_cdr/v_xml_cdr_import.php index 6e0a663c01..8903dbfdc8 100644 --- a/app/xml_cdr/v_xml_cdr_import.php +++ b/app/xml_cdr/v_xml_cdr_import.php @@ -80,10 +80,10 @@ global $debug; //fix the xml by escaping the contents of - $xml_string = preg_replace_callback("/<([^><]+)>(.*?[><].*?)<\/\g1>/", + $xml_string = preg_replace_callback("/<([^><]+)>(.*?[><].*?)<\/\g1>/", function ($matches) { return '<' . $matches[1] . '>' . - str_replace(">", ">", + str_replace(">", ">", str_replace("<", "<", $matches[2]) ) . ''; diff --git a/app/xml_cdr/xml_cdr_import_update.php b/app/xml_cdr/xml_cdr_import_update.php index 13b896a441..03c25b0f49 100644 --- a/app/xml_cdr/xml_cdr_import_update.php +++ b/app/xml_cdr/xml_cdr_import_update.php @@ -82,7 +82,7 @@ $db->beginTransaction(); //reset the count $x = 0; - } + } //parse the xml to get the call detail record info try { $xml = simplexml_load_string($xml_string); @@ -101,14 +101,14 @@ echo $sql."\n"; $db->exec($sql); $x++; - } + } } //save the transaction $db->commit(); //echo finished echo "completed\n"; } - if ($xml_cdr_archive == "dir") { + if ($xml_cdr_archive == "dir") { $xml_cdr_list = glob($_SESSION['switch']['log']['dir']."/xml_cdr/archive/*/*/*/*.xml"); echo "count: ".count($xml_cdr_list)."\n"; //print_r($xml_cdr_list); diff --git a/app/xml_cdr/xml_cdr_statistics_inc.php b/app/xml_cdr/xml_cdr_statistics_inc.php index c6d48c64a2..a5f4869b35 100644 --- a/app/xml_cdr/xml_cdr_statistics_inc.php +++ b/app/xml_cdr/xml_cdr_statistics_inc.php @@ -125,7 +125,7 @@ else { } else { $mos_comparison = ''; } - //$mos_comparison = check_str($_REQUEST["mos_comparison"]); + //$mos_comparison = check_str($_REQUEST["mos_comparison"]); $mos_score = check_str($_REQUEST["mos_score"]); } diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index d9d1052447..52293206ca 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -406,7 +406,7 @@ else { echo "  \n"; echo " \n"; - echo " ".ucwords($row['default_setting_enabled'])."\n"; + echo " ".$text['label-'.$row['default_setting_enabled']]."\n"; echo " ".$row['default_setting_description']." "; diff --git a/core/domain_settings/domain_settings.php b/core/domain_settings/domain_settings.php index 76a58c339d..0421f4bd3e 100644 --- a/core/domain_settings/domain_settings.php +++ b/core/domain_settings/domain_settings.php @@ -236,7 +236,7 @@ if (sizeof($_REQUEST) > 1) { echo "  \n"; echo " \n"; - echo " ".ucwords($row['domain_setting_enabled'])."\n"; + echo " ".$text['label-'.$row['domain_setting_enabled']]."\n"; echo " ".$row['domain_setting_description']." "; diff --git a/core/events/resources/classes/events.php b/core/events/resources/classes/events.php index 87ddde6276..72025e1480 100644 --- a/core/events/resources/classes/events.php +++ b/core/events/resources/classes/events.php @@ -2,7 +2,7 @@ /** * events class provides an event system - * + * * @method void load_plugins * @method dynamic __call */ @@ -94,8 +94,8 @@ class events { * @param string $args * */ - public function __call($method, $args) { - if (! key_exists($method, $this->methods)) { + public function __call($method, $args) { + if (! key_exists($method, $this->methods)) { throw new Exception ("Call to undefined method: " . $method); } array_unshift($args, $this); diff --git a/core/install/install.php b/core/install/install.php index a3e1189695..8863c433cd 100644 --- a/core/install/install.php +++ b/core/install/install.php @@ -53,8 +53,8 @@ require_once "resources/classes/text.php"; //TBD $locale = Locale::getDefault(); $timezone = 'UTC'; if (is_link('/etc/localtime')) { - // Mac OS X (and older Linuxes) - // /etc/localtime is a symlink to the + // Mac OS X (and older Linuxes) + // /etc/localtime is a symlink to the // timezone in /usr/share/zoneinfo. $filename = readlink('/etc/localtime'); if (strpos($filename, '/usr/share/zoneinfo/') === 0) { @@ -73,7 +73,7 @@ if (is_link('/etc/localtime')) { $timezone = $data['ZONE']; } } - + date_default_timezone_set($timezone); //detect install state diff --git a/core/install/resources/classes/detect_switch.php b/core/install/resources/classes/detect_switch.php index 9324840280..0232bbb715 100644 --- a/core/install/resources/classes/detect_switch.php +++ b/core/install/resources/classes/detect_switch.php @@ -22,7 +22,7 @@ Contributor(s): Matthew Vale - + */ require_once "root.php"; require_once "resources/classes/EventSocket.php"; @@ -151,14 +151,14 @@ require_once "resources/classes/EventSocket.php"; } return false; } - + protected function event_socket_request($cmd) { $esl = new EventSocket($this->event_socket); $result = $esl->request($cmd); $esl->reset_fp(); return $result; } - + public function restart_switch() { $this->connect_event_socket(); if(!$this->event_socket){ diff --git a/core/install/resources/classes/global_settings.php b/core/install/resources/classes/global_settings.php index 24d980d912..0c9c1c6120 100644 --- a/core/install/resources/classes/global_settings.php +++ b/core/install/resources/classes/global_settings.php @@ -22,7 +22,7 @@ Contributor(s): Matthew Vale - + */ require_once "root.php"; diff --git a/core/install/resources/classes/install_fusionpbx.php b/core/install/resources/classes/install_fusionpbx.php index 263d796241..2cdd85b44e 100644 --- a/core/install/resources/classes/install_fusionpbx.php +++ b/core/install/resources/classes/install_fusionpbx.php @@ -427,7 +427,7 @@ include "root.php"; //create the table, user and set the permissions only if the db_create_username was provided if ($this->global_settings->db_create()) { - $this->write_progress("\tCreating database"); + $this->write_progress("\tCreating database"); try { $this->dbh = new PDO($connect_string, $this->global_settings->db_create_username(), db_create_password, array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8')); $this->dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); diff --git a/core/install/resources/classes/install_switch.php b/core/install/resources/classes/install_switch.php index 8d6013c114..3467d00507 100644 --- a/core/install/resources/classes/install_switch.php +++ b/core/install/resources/classes/install_switch.php @@ -61,7 +61,7 @@ include "root.php"; echo "$message\n"; } } - + function write_progress($message) { if($this->echo_progress){ echo "$message\n"; diff --git a/core/install/resources/page_parts/install_config_detail.php b/core/install/resources/page_parts/install_config_detail.php index 6fd2c8ce05..e25889ac5c 100644 --- a/core/install/resources/page_parts/install_config_detail.php +++ b/core/install/resources/page_parts/install_config_detail.php @@ -68,7 +68,7 @@ echo "\n"; echo " \n"; - + echo "\n"; echo "\n"; echo "\n"; @@ -102,7 +102,7 @@ echo "\n"; - + foreach ($switch_detect->get_dirs() as $folder) { if($id % 2 == 0){ echo "\n"; } @@ -132,7 +132,7 @@ if($id % 2 == 1){ echo "\n"; } $id++; } - + echo "
".$text['title-detected_configuration']."
\n"; echo " ".$switch_detect->version()."\n"; echo "
"; } diff --git a/core/menu/app_config.php b/core/menu/app_config.php index 4df51814ad..e97287aab1 100644 --- a/core/menu/app_config.php +++ b/core/menu/app_config.php @@ -163,7 +163,7 @@ $z++; $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = "menu_item_description"; $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = "menu_item_desc"; - + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; $z++; diff --git a/core/users/app_config.php b/core/users/app_config.php index 1bebf83a0c..f47beab300 100644 --- a/core/users/app_config.php +++ b/core/users/app_config.php @@ -127,7 +127,7 @@ $y++; $apps[$x]['permissions'][$y]['name'] = "user_setting_category_edit"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; - + //schema details $y = 0; //table array index $z = 0; //field array index diff --git a/core/users/user_settings.php b/core/users/user_settings.php index a47f0cde5d..98d06cbeb8 100644 --- a/core/users/user_settings.php +++ b/core/users/user_settings.php @@ -206,7 +206,7 @@ else { echo "  \n"; echo " 		\n"; - echo " ".ucwords($row['user_setting_enabled'])."\n"; + echo " ".$text['label-'.$row['user_setting_enabled']]."\n"; echo " ".$row['user_setting_description']." "; diff --git a/resources/classes/cache.php b/resources/classes/cache.php index 077cfd9599..55fc8e039b 100644 --- a/resources/classes/cache.php +++ b/resources/classes/cache.php @@ -2,7 +2,7 @@ /** * cache class provides an abstracted cache - * + * * @method string set * @method string get * @method string delete diff --git a/resources/classes/directory.php b/resources/classes/directory.php index 1ba55de749..e6951a2a03 100644 --- a/resources/classes/directory.php +++ b/resources/classes/directory.php @@ -366,7 +366,7 @@ include "root.php"; $keys=array_keys($data); $values=array_values($data); for($i=0;$i<$count;$i++){ - $keys[$i]= str_replace("-", "_", $keys[$i]); + $keys[$i]= str_replace("-", "_", $keys[$i]); $this->{$keys[$i]}=$values[$i]; } } @@ -443,7 +443,7 @@ include "root.php"; $xml .= " auth_acl . "\"/>\n"; } $xml .= " \n"; - + $xml .= " \n"; if (strlen($this->hold_music)) { $xml .= " hold_music . "\"/>\n"; @@ -608,7 +608,7 @@ include "root.php"; $xml .= "\n"; $xml .= "\n"; $xml .= " \n"; - if ($extension_dir_name == "default") { + if ($extension_dir_name == "default") { $xml .= " \n"; } else { diff --git a/resources/classes/event/handler/syslog.php b/resources/classes/event/handler/syslog.php index ab5b98e67c..606c137c44 100644 --- a/resources/classes/event/handler/syslog.php +++ b/resources/classes/event/handler/syslog.php @@ -21,7 +21,7 @@ class Syslog extends Event_Handler{ if ($_SESSION['event']['syslog']['enable'] <> 0){ closelog(); } - } + } public function log_event($event_type, $params){ if ($_SESSION['event']['syslog']['enable'] <> 0){ diff --git a/resources/classes/fax.php b/resources/classes/fax.php index 195a0e8370..05dae4cbf4 100644 --- a/resources/classes/fax.php +++ b/resources/classes/fax.php @@ -323,7 +323,7 @@ include "root.php"; $database->add(); } - //delete the old dialplan details to prepare for new details + //delete the old dialplan details to prepare for new details $database = new database; $database->table = "v_dialplan_details"; $database->where[0]['name'] = 'domain_uuid'; diff --git a/resources/classes/orm.php b/resources/classes/orm.php index f5cebe317e..13a4f24f88 100644 --- a/resources/classes/orm.php +++ b/resources/classes/orm.php @@ -661,7 +661,7 @@ //define singular function to convert a word in english to singular private function singular($word) { - //"-es" is used for words that end in "-x", "-s", "-z", "-sh", "-ch" in which case you add + //"-es" is used for words that end in "-x", "-s", "-z", "-sh", "-ch" in which case you add if (substr($word, -2) == "es") { if (substr($word, -3, 1) == "x") { return substr($word,0,-2); diff --git a/resources/classes/permissions.php b/resources/classes/permissions.php index fa5ccb5055..c1ea8ee84a 100644 --- a/resources/classes/permissions.php +++ b/resources/classes/permissions.php @@ -23,7 +23,7 @@ /** * permission class - * + * * @method string add * @method string delete * @method string exists diff --git a/resources/classes/template.php b/resources/classes/template.php index dab07d44dc..5595cf3861 100644 --- a/resources/classes/template.php +++ b/resources/classes/template.php @@ -80,7 +80,7 @@ include "root.php"; $this->object->assign($key, $value); } if ($this->engine === 'twig') { - $this->var_array[$key] = $value; + $this->var_array[$key] = $value; } } diff --git a/resources/install/scripts/app/call_block/index.lua b/resources/install/scripts/app/call_block/index.lua index 91c7056b40..d193161bd2 100644 --- a/resources/install/scripts/app/call_block/index.lua +++ b/resources/install/scripts/app/call_block/index.lua @@ -74,7 +74,7 @@ This method causes the script to get its manadatory arguments directly from the session:setVariable("call_block", "") --send to the log - logger("D", "NOTICE", "params are: " .. string.format("'%s', '%s', '%s', '%s'", params["cid_num"], + logger("D", "NOTICE", "params are: " .. string.format("'%s', '%s', '%s', '%s'", params["cid_num"], params["cid_name"], params["userid"], params["domain_name"])); --get the cache @@ -91,7 +91,7 @@ This method causes the script to get its manadatory arguments directly from the require "resources.functions.database_handle"; dbh = database_handle('system'); - --log if not connect + --log if not connect if dbh:connected() == false then logger("W", "NOTICE", "db was not connected") end @@ -108,7 +108,7 @@ This method causes the script to get its manadatory arguments directly from the found_count = rows["call_block_count"]; end) -- dbh:affected_rows() doesn't do anything if using core:db so this is the workaround: - + --set the cache if (found_cid_num) then -- caller id exists if (found_enabled == "true") then diff --git a/resources/install/scripts/app/conference_center/index.lua b/resources/install/scripts/app/conference_center/index.lua index 09b6c9547f..6f25bb5628 100644 --- a/resources/install/scripts/app/conference_center/index.lua +++ b/resources/install/scripts/app/conference_center/index.lua @@ -26,7 +26,7 @@ -- -- Contributor(s): -- Mark J Crane --- Luis Daniel Lucio Quiroz +-- Luis Daniel Lucio Quiroz --set variables flags = ""; @@ -80,7 +80,7 @@ end --get the moderator_pin - sql = [[SELECT moderator_pin FROM v_meetings + sql = [[SELECT moderator_pin FROM v_meetings WHERE meeting_uuid = ']] .. meeting_uuid ..[[']]; freeswitch.consoleLog("notice", "[voicemail] sql: " .. sql .. "\n"); status = dbh:query(sql, function(row) @@ -159,7 +159,7 @@ --get the conference sessions if (conference_session_uuid) then - sql = [[SELECT count(*) as num_rows + sql = [[SELECT count(*) as num_rows FROM v_conference_sessions WHERE conference_session_uuid = ']] .. conference_session_uuid ..[[']]; status = dbh:query(sql, function(row) @@ -435,7 +435,7 @@ --define the function get_pin_number function get_pin_number(domain_uuid, prompt_audio_file) --if the pin number is provided then require it - if (not pin_number) then + if (not pin_number) then min_digits = 2; max_digits = 20; max_tries = 1; @@ -447,16 +447,16 @@ WHERE r.domain_uuid = ']] .. domain_uuid ..[[' AND r.meeting_uuid = m.meeting_uuid AND m.domain_uuid = ']] .. domain_uuid ..[[' - AND (m.moderator_pin = ']] .. pin_number ..[[' or m.participant_pin = ']] .. pin_number ..[[') + AND (m.moderator_pin = ']] .. pin_number ..[[' or m.participant_pin = ']] .. pin_number ..[[') AND r.enabled = 'true' AND m.enabled = 'true' AND ( - ( r.start_datetime <> '' AND r.start_datetime is not null AND r.start_datetime <= ']] .. os.date("%Y-%m-%d %X") .. [[' ) OR - ( r.start_datetime = '' OR r.start_datetime is null ) + ( r.start_datetime <> '' AND r.start_datetime is not null AND r.start_datetime <= ']] .. os.date("%Y-%m-%d %X") .. [[' ) OR + ( r.start_datetime = '' OR r.start_datetime is null ) ) AND ( - ( r.stop_datetime <> '' AND r.stop_datetime is not null AND r.stop_datetime > ']] .. os.date("%Y-%m-%d %X") .. [[' ) OR - ( r.stop_datetime = '' OR r.stop_datetime is null ) + ( r.stop_datetime <> '' AND r.stop_datetime is not null AND r.stop_datetime > ']] .. os.date("%Y-%m-%d %X") .. [[' ) OR + ( r.stop_datetime = '' OR r.stop_datetime is null ) ) ]]; if (debug["sql"]) then freeswitch.consoleLog("notice", "[conference center] SQL: " .. sql .. "\n"); @@ -496,7 +496,7 @@ AND r.conference_center_uuid = ']] .. conference_center_uuid ..[[' AND m.domain_uuid = ']] .. domain_uuid ..[[' AND (m.moderator_pin = ']] .. pin_number ..[[' or m.participant_pin = ']] .. pin_number ..[[') - AND r.enabled = 'true' + AND r.enabled = 'true' AND m.enabled = 'true' ]]; if (debug["sql"]) then diff --git a/resources/install/scripts/app/conference_center/resources/scripts/start_recording.lua b/resources/install/scripts/app/conference_center/resources/scripts/start_recording.lua index 047619cadb..c220b5d6ca 100644 --- a/resources/install/scripts/app/conference_center/resources/scripts/start_recording.lua +++ b/resources/install/scripts/app/conference_center/resources/scripts/start_recording.lua @@ -17,7 +17,7 @@ api = freeswitch.API(); --check if the conference exists - cmd = "conference "..meeting_uuid.."-"..domain_name.." xml_list"; + cmd = "conference "..meeting_uuid.."-"..domain_name.." xml_list"; freeswitch.consoleLog("INFO","" .. cmd .. "\n"); result = trim(api:executeString(cmd)); if (string.sub(result, -9) == "not found") then diff --git a/resources/install/scripts/app/failure_handler/index.lua b/resources/install/scripts/app/failure_handler/index.lua index 31883bd231..8ba677606e 100644 --- a/resources/install/scripts/app/failure_handler/index.lua +++ b/resources/install/scripts/app/failure_handler/index.lua @@ -52,7 +52,7 @@ file_subject = scripts_dir.."/app/missed_calls/resources/templates/en/us/email_subject.tpl"; file_body = scripts_dir.."/app/missed_calls/resources/templates/en/us/email_body.tpl"; end - + --prepare the headers headers = '{"X-FusionPBX-Domain-UUID":"'..domain_uuid..'",'; headers = headers..'"X-FusionPBX-Domain-Name":"'..domain_name..'",'; @@ -86,7 +86,7 @@ body = body:gsub("'", "'"); body = body:gsub([["]], """); body = trim(body); - + --send the email cmd = "luarun email.lua "..missed_call_data.." "..missed_call_data.." "..headers.." '"..subject.."' '"..body.."'"; if (debug["info"]) then @@ -188,7 +188,7 @@ end elseif (originate_disposition == "USER_NOT_REGISTERED") then - + --handle USER_NOT_REGISTERED forward_user_not_registered_enabled = session:getVariable("forward_user_not_registered_enabled"); if (forward_user_not_registered_enabled == "true") then @@ -204,7 +204,7 @@ --send missed call notification missed(); end - + --send missed call notification --missed(); diff --git a/resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua b/resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua index 628822955c..d0505fe0dd 100644 --- a/resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua +++ b/resources/install/scripts/app/fax/resources/scripts/hangup_rx.lua @@ -154,8 +154,8 @@ end --get the fax settings from the database - sql = [[SELECT * FROM v_fax - WHERE fax_uuid = ']] .. fax_uuid ..[[' + sql = [[SELECT * FROM v_fax + WHERE fax_uuid = ']] .. fax_uuid ..[[' AND domain_uuid = ']] .. domain_uuid ..[[']]; if (debug["sql"]) then freeswitch.consoleLog("notice", "[fax] SQL: " .. sql .. "\n"); @@ -196,7 +196,7 @@ cmd = quote(php_dir.."/"..php_bin).." "..quote(document_root.."/secure/fax_to_email.php").." "; cmd = cmd .. "email="..quote(fax_email).." "; cmd = cmd .. "extension="..quote(fax_extension).." "; - cmd = cmd .. "name="..quote(fax_file).." "; + cmd = cmd .. "name="..quote(fax_file).." "; cmd = cmd .. "messages=" .. quote("result:"..fax_result_text.." sender:"..fax_remote_station_id.." pages:"..fax_document_total_pages).." "; cmd = cmd .. "domain="..quote(domain_name).." "; cmd = cmd .. "caller_id_name=" .. quote(caller_id_name or '') .. " "; diff --git a/resources/install/scripts/app/fax/resources/scripts/queue/exec.lua b/resources/install/scripts/app/fax/resources/scripts/queue/exec.lua index 5ff3fab443..89c9864572 100644 --- a/resources/install/scripts/app/fax/resources/scripts/queue/exec.lua +++ b/resources/install/scripts/app/fax/resources/scripts/queue/exec.lua @@ -22,7 +22,7 @@ local task if fax_task_uuid then task = Tasks.select_task(fax_task_uuid) if not task then log.warningf("Can not found fax task: %q", tostring(fax_task_uuid)) - return + return end end diff --git a/resources/install/scripts/app/fax/resources/scripts/queue/next.lua b/resources/install/scripts/app/fax/resources/scripts/queue/next.lua index 874171cca7..a4eee7e7ab 100644 --- a/resources/install/scripts/app/fax/resources/scripts/queue/next.lua +++ b/resources/install/scripts/app/fax/resources/scripts/queue/next.lua @@ -55,7 +55,7 @@ local function next_task() local mode = (task.retry_counter % #FAX_OPTIONS) + 1 local dial_string = '{' .. task.dial_string .. "api_hangup_hook='lua app/fax/resources/scripts/queue/retry.lua'," .. - FAX_OPTIONS[mode] .. + FAX_OPTIONS[mode] .. '}' .. task.uri local originate = 'originate ' .. dial_string .. ' &lua(app/fax/resources/scripts/queue/exec.lua)' diff --git a/resources/install/scripts/app/fax/resources/scripts/queue/retry.lua b/resources/install/scripts/app/fax/resources/scripts/queue/retry.lua index 3cc20dbf43..464f995b47 100644 --- a/resources/install/scripts/app/fax/resources/scripts/queue/retry.lua +++ b/resources/install/scripts/app/fax/resources/scripts/queue/retry.lua @@ -12,12 +12,12 @@ local fax_task_uuid = env:getHeader('fax_task_uuid') if not fax_task_uuid then log.warning("No [fax_task_uuid] channel variable") - return + return end local task = Tasks.select_task(fax_task_uuid) if not task then log.warningf("Can not find fax task: %q", tostring(fax_task_uuid)) - return + return end -- show all channel variables diff --git a/resources/install/scripts/app/fax/resources/scripts/queue/tasks.lua b/resources/install/scripts/app/fax/resources/scripts/queue/tasks.lua index 6e78bffccb..f2f9621eea 100644 --- a/resources/install/scripts/app/fax/resources/scripts/queue/tasks.lua +++ b/resources/install/scripts/app/fax/resources/scripts/queue/tasks.lua @@ -37,7 +37,7 @@ select t1.fax_task_uuid as uuid, t1.fax_uuid as fax_uuid, t3.domain_name, - t3.domain_uuid, + t3.domain_uuid, t1.task_status as status, t1.task_uri as uri, t1.task_dial_string as dial_string, @@ -51,7 +51,7 @@ select t2.fax_send_greeting as greeting from v_fax_tasks t1 inner join v_fax t2 on t2.fax_uuid = t1.fax_uuid - inner join v_domains t3 on t2.domain_uuid = t3.domain_uuid + inner join v_domains t3 on t2.domain_uuid = t3.domain_uuid where t1.task_interrupted <> 'true' ]] diff --git a/resources/install/scripts/app/provision/index.lua b/resources/install/scripts/app/provision/index.lua index 5af12ce234..b304d7bdeb 100644 --- a/resources/install/scripts/app/provision/index.lua +++ b/resources/install/scripts/app/provision/index.lua @@ -128,7 +128,7 @@ --authentication failed if (authorized == 'false') then result = session:streamFile(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/voicemail/vm-fail_auth.wav"); - end + end --this device already has an alternate find the correct device_uuid and then override current one if (authorized == 'true' and action == "login" and device_uuid_alternate ~= nil and device_uuid ~= nil and domain_uuid ~= nil) then diff --git a/resources/install/scripts/app/ring_groups/index.lua b/resources/install/scripts/app/ring_groups/index.lua index 4b38a8ef98..0235f9c4d8 100644 --- a/resources/install/scripts/app/ring_groups/index.lua +++ b/resources/install/scripts/app/ring_groups/index.lua @@ -203,17 +203,17 @@ local log = require "resources.functions.log".ring_group else --get the strategy of the ring group, if random, we use random() to order the destinations sql = [[ - SELECT + SELECT r.ring_group_strategy - FROM + FROM v_ring_groups as r - WHERE - ring_group_uuid = ']]..ring_group_uuid..[[' - AND r.domain_uuid = ']]..domain_uuid..[[' - AND r.ring_group_enabled = 'true' + WHERE + ring_group_uuid = ']]..ring_group_uuid..[[' + AND r.domain_uuid = ']]..domain_uuid..[[' + AND r.ring_group_enabled = 'true' ]]; - + assert(dbh:query(sql, function(row) if (row.ring_group_strategy == "random") then if (database["type"] == "mysql") then @@ -223,23 +223,23 @@ local log = require "resources.functions.log".ring_group end else sql_order='d.destination_delay, d.destination_number asc' - end + end end)); - + --get the ring group destinations sql = [[ - SELECT - r.ring_group_strategy, r.ring_group_timeout_app, r.ring_group_distinctive_ring, - d.destination_number, d.destination_delay, d.destination_timeout, d.destination_prompt, + SELECT + r.ring_group_strategy, r.ring_group_timeout_app, r.ring_group_distinctive_ring, + d.destination_number, d.destination_delay, d.destination_timeout, d.destination_prompt, r.ring_group_timeout_data, r.ring_group_cid_name_prefix, r.ring_group_cid_number_prefix, r.ring_group_ringback, r.ring_group_skip_active - FROM + FROM v_ring_groups as r, v_ring_group_destinations as d - WHERE - d.ring_group_uuid = r.ring_group_uuid - AND d.ring_group_uuid = ']]..ring_group_uuid..[[' - AND r.domain_uuid = ']]..domain_uuid..[[' - AND r.ring_group_enabled = 'true' - ORDER BY + WHERE + d.ring_group_uuid = r.ring_group_uuid + AND d.ring_group_uuid = ']]..ring_group_uuid..[[' + AND r.domain_uuid = ']]..domain_uuid..[[' + AND r.ring_group_enabled = 'true' + ORDER BY ]]..sql_order..[[ ]]; --freeswitch.consoleLog("notice", "SQL:" .. sql .. "\n"); @@ -282,21 +282,21 @@ local log = require "resources.functions.log".ring_group --get the dialplan data and save it to a table if (external) then - sql = [[select * from v_dialplans as d, v_dialplan_details as s + sql = [[select * from v_dialplans as d, v_dialplan_details as s where (d.domain_uuid = ']] .. domain_uuid .. [[' or d.domain_uuid is null) - and d.app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' - and d.dialplan_enabled = 'true' - and d.dialplan_uuid = s.dialplan_uuid - order by - d.dialplan_order asc, - d.dialplan_name asc, - d.dialplan_uuid asc, - s.dialplan_detail_group asc, - CASE s.dialplan_detail_tag - WHEN 'condition' THEN 1 - WHEN 'action' THEN 2 - WHEN 'anti-action' THEN 3 - ELSE 100 END, + and d.app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' + and d.dialplan_enabled = 'true' + and d.dialplan_uuid = s.dialplan_uuid + order by + d.dialplan_order asc, + d.dialplan_name asc, + d.dialplan_uuid asc, + s.dialplan_detail_group asc, + CASE s.dialplan_detail_tag + WHEN 'condition' THEN 1 + WHEN 'action' THEN 2 + WHEN 'anti-action' THEN 3 + ELSE 100 END, s.dialplan_detail_order asc ]] --freeswitch.consoleLog("notice", "SQL:" .. sql .. "\n"); dialplans = {}; @@ -374,7 +374,7 @@ local log = require "resources.functions.log".ring_group end --set confirm - if (ring_group_strategy == "simultaneous" + if (ring_group_strategy == "simultaneous" or ring_group_strategy == "sequence" or ring_group_strategy == "rollover") then session:execute("set", "group_confirm_key=exec"); @@ -413,7 +413,7 @@ local log = require "resources.functions.log".ring_group --record the session if (record_session) then record_session = ",api_on_answer='uuid_record "..uuid.." start ".. record_file .. "'"; - else + else record_session = "" end row.record_session = record_session @@ -569,8 +569,8 @@ local log = require "resources.functions.log".ring_group --if the timeout was reached go to the timeout action if (x > 0) then - if (session:getVariable("originate_disposition") == "ALLOTTED_TIMEOUT" - or session:getVariable("originate_disposition") == "NO_ANSWER" + if (session:getVariable("originate_disposition") == "ALLOTTED_TIMEOUT" + or session:getVariable("originate_disposition") == "NO_ANSWER" or session:getVariable("originate_disposition") == "NO_USER_RESPONSE") then break; end @@ -609,12 +609,12 @@ local log = require "resources.functions.log".ring_group --timeout destination if (app_data ~= nil) then if session:ready() and ( - session:getVariable("originate_disposition") == "ALLOTTED_TIMEOUT" - or session:getVariable("originate_disposition") == "NO_ANSWER" - or session:getVariable("originate_disposition") == "NO_USER_RESPONSE" - or session:getVariable("originate_disposition") == "USER_NOT_REGISTERED" - or session:getVariable("originate_disposition") == "NORMAL_TEMPORARY_FAILURE" - or session:getVariable("originate_disposition") == "NO_ROUTE_DESTINATION" + session:getVariable("originate_disposition") == "ALLOTTED_TIMEOUT" + or session:getVariable("originate_disposition") == "NO_ANSWER" + or session:getVariable("originate_disposition") == "NO_USER_RESPONSE" + or session:getVariable("originate_disposition") == "USER_NOT_REGISTERED" + or session:getVariable("originate_disposition") == "NORMAL_TEMPORARY_FAILURE" + or session:getVariable("originate_disposition") == "NO_ROUTE_DESTINATION" or session:getVariable("originate_disposition") == "USER_BUSY" or session:getVariable("originate_disposition") == "failure" ) then diff --git a/resources/install/scripts/app/ring_groups/resources/scripts/destination.lua b/resources/install/scripts/app/ring_groups/resources/scripts/destination.lua index f754169b6d..1d63cfbe52 100644 --- a/resources/install/scripts/app/ring_groups/resources/scripts/destination.lua +++ b/resources/install/scripts/app/ring_groups/resources/scripts/destination.lua @@ -25,7 +25,7 @@ --include config.lua require "resources.functions.config"; - + --connect to the database require "resources.functions.database_handle"; dbh = database_handle('system'); @@ -96,7 +96,7 @@ -- if string.len(destination) == 0) then -- destination = session:playAndGetDigits(1, 1, max_tries, digit_timeout, "#", "ivr/ivr-enter_destination_telephone_number.wav", "", "\\d+"); -- freeswitch.consoleLog("NOTICE", "[ring_group] destination: "..destination.."\n"); -` -- end + -- end --end --login or logout @@ -109,7 +109,7 @@ SELECT COUNT(*) AS in_group FROM v_ring_group_destinations WHERE - domain_uuid = ']]..domain_uuid..[[' + domain_uuid = ']]..domain_uuid..[[' AND ring_group_uuid = ']]..ring_group_uuid..[[' AND destination_number = ']]..destination..[[' ]]; @@ -118,21 +118,21 @@ assert(dbh:query(sql, function(row) if (row.in_group == "0") then sql = [[ - INSERT INTO - v_ring_group_destinations + INSERT INTO + v_ring_group_destinations ( ring_group_destination_uuid, - domain_uuid, - ring_group_uuid, + domain_uuid, + ring_group_uuid, destination_number, destination_delay, destination_timeout - ) - VALUES + ) + VALUES ( ']]..ring_group_destination_uuid..[[', - ']]..domain_uuid..[[', - ']]..ring_group_uuid..[[', - ']]..destination..[[', - ]]..destination_delay..[[, + ']]..domain_uuid..[[', + ']]..ring_group_uuid..[[', + ']]..destination..[[', + ]]..destination_delay..[[, ]]..destination_timeout..[[ )]]; freeswitch.consoleLog("NOTICE", "[ring_group][destination] SQL "..sql.."\n"); @@ -148,11 +148,11 @@ end if (menu_selection == "2") then sql = [[ - DELETE FROM - v_ring_group_destinations - WHERE - domain_uuid =']]..domain_uuid..[[' - AND ring_group_uuid=']]..ring_group_uuid..[[' + DELETE FROM + v_ring_group_destinations + WHERE + domain_uuid =']]..domain_uuid..[[' + AND ring_group_uuid=']]..ring_group_uuid..[[' AND destination_number=']]..destination..[[' ]]; freeswitch.consoleLog("NOTICE", "[ring_group][destination] SQL "..sql.."\n"); diff --git a/resources/install/scripts/app/ring_groups/resources/scripts/ring_member.lua b/resources/install/scripts/app/ring_groups/resources/scripts/ring_member.lua index d928b60d6a..0af8e87058 100644 --- a/resources/install/scripts/app/ring_groups/resources/scripts/ring_member.lua +++ b/resources/install/scripts/app/ring_groups/resources/scripts/ring_member.lua @@ -25,7 +25,7 @@ --include config.lua require "resources.functions.config"; - + --connect to the database require "resources.functions.database_handle"; dbh = database_handle('system'); @@ -39,12 +39,12 @@ --define uuid function local random = math.random; - local function uuid(); - local template ='xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'; - return string.gsub(template, '[xy]', function (c) - local v = (c == 'x') and random(0, 0xf) or random(8, 0xb); - return string.format('%x', v); - end) + local function uuid() + local template ='xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'; + return string.gsub(template, '[xy]', function (c) + local v = (c == 'x') and random(0, 0xf) or random(8, 0xb); + return string.format('%x', v); + end) end --get session variables @@ -100,7 +100,7 @@ SELECT COUNT(*) AS in_group FROM v_ring_group_destinations WHERE - domain_uuid = ']]..domain_uuid..[[' + domain_uuid = ']]..domain_uuid..[[' AND ring_group_uuid = ']]..ring_group_uuid..[[' AND destination_number = ']]..destination_number..[[' ]]; @@ -109,21 +109,21 @@ assert(dbh:query(sql, function(row) if (row.in_group == "0") then sql = [[ - INSERT INTO - v_ring_group_destinations + INSERT INTO + v_ring_group_destinations ( ring_group_destination_uuid, - domain_uuid, - ring_group_uuid, + domain_uuid, + ring_group_uuid, destination_number, destination_delay, destination_timeout - ) - VALUES + ) + VALUES ( ']]..ring_group_destination_uuid..[[', - ']]..domain_uuid..[[', - ']]..ring_group_uuid..[[', - ']]..destination..[[', - ]]..destination_delay..[[, + ']]..domain_uuid..[[', + ']]..ring_group_uuid..[[', + ']]..destination..[[', + ]]..destination_delay..[[, ]]..destination_timeout..[[ )]]; freeswitch.consoleLog("NOTICE", "[ring_group][destination] SQL "..sql.."\n"); @@ -139,11 +139,11 @@ end if (menu_selection == "2") then sql = [[ - DELETE FROM - v_ring_group_destinations - WHERE - domain_uuid =']]..domain_uuid..[[' - AND ring_group_uuid=']]..ring_group_uuid..[[' + DELETE FROM + v_ring_group_destinations + WHERE + domain_uuid =']]..domain_uuid..[[' + AND ring_group_uuid=']]..ring_group_uuid..[[' AND destination_number=']]..destination..[[' ]]; freeswitch.consoleLog("NOTICE", "[ring_group][destination] SQL "..sql.."\n"); diff --git a/resources/install/scripts/app/voicemail/index.lua b/resources/install/scripts/app/voicemail/index.lua index 2cddb544c1..af2bcdce6f 100644 --- a/resources/install/scripts/app/voicemail/index.lua +++ b/resources/install/scripts/app/voicemail/index.lua @@ -183,7 +183,7 @@ if (voicemail_attach_file == nil) then voicemail_attach_file = "true"; end - + --valid voicemail if (voicemail_uuid ~= nil) then --answer the session @@ -340,7 +340,7 @@ end --get the voicemail destinations - sql = [[select * from v_voicemail_destinations + sql = [[select * from v_voicemail_destinations where voicemail_uuid = ']]..voicemail_uuid..[[']] --freeswitch.consoleLog("notice", "[voicemail][destinations] SQL:" .. sql .. "\n"); destinations = {}; @@ -361,7 +361,7 @@ --determine uuid if (y == 1) then voicemail_message_uuid = uuid; - else + else voicemail_message_uuid = api:execute("create_uuid"); end y = y + 1; @@ -506,7 +506,7 @@ --callback (works with DTMF) --http://wiki.freeswitch.org/wiki/Mod_fsv --mkdir(voicemail_dir.."/"..voicemail_id); - --session:recordFile(file_name, max_len_secs, silence_threshold, silence_secs) + --session:recordFile(file_name, max_len_secs, silence_threshold, silence_secs) --session:sayPhrase(macro_name [,macro_data] [,language]); --session:sayPhrase("voicemail_menu", "1:2:3:#", default_language); --session:streamFile("directory/dir-to_select_entry.wav"); --works with setInputCallback diff --git a/resources/install/scripts/app/voicemail/resources/functions/choose_greeting.lua b/resources/install/scripts/app/voicemail/resources/functions/choose_greeting.lua index 0e71727c6d..e290b8f97f 100644 --- a/resources/install/scripts/app/voicemail/resources/functions/choose_greeting.lua +++ b/resources/install/scripts/app/voicemail/resources/functions/choose_greeting.lua @@ -38,7 +38,7 @@ --check to see if the greeting file exists if (storage_type == "base64" or storage_type == "http_cache") then greeting_invalid = true; - sql = [[SELECT * FROM v_voicemail_greetings + sql = [[SELECT * FROM v_voicemail_greetings WHERE domain_uuid = ']] .. domain_uuid ..[[' AND voicemail_id = ']].. voicemail_id.. [[' AND greeting_id = ']].. greeting_id.. [[' ]]; @@ -59,20 +59,20 @@ end --validate the greeting_id - if (greeting_id == "0" - or greeting_id == "1" - or greeting_id == "2" - or greeting_id == "3" - or greeting_id == "4" - or greeting_id == "5" - or greeting_id == "6" - or greeting_id == "7" - or greeting_id == "8" + if (greeting_id == "0" + or greeting_id == "1" + or greeting_id == "2" + or greeting_id == "3" + or greeting_id == "4" + or greeting_id == "5" + or greeting_id == "6" + or greeting_id == "7" + or greeting_id == "8" or greeting_id == "9") then --valid greeting_id update the database if (session:ready()) then - if (greeting_id == "0") then + if (greeting_id == "0") then sql = [[UPDATE v_voicemails SET greeting_id = null ]]; else sql = [[UPDATE v_voicemails SET greeting_id = ']]..greeting_id..[[' ]]; @@ -87,7 +87,7 @@ --get the greeting from the database if (storage_type == "base64") then - sql = [[SELECT * FROM v_voicemail_greetings + sql = [[SELECT * FROM v_voicemail_greetings WHERE domain_uuid = ']] .. domain_uuid ..[[' AND voicemail_id = ']].. voicemail_id.. [[' AND greeting_id = ']].. greeting_id.. [[' ]]; diff --git a/resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua b/resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua index bc19858e5c..44c53259c7 100644 --- a/resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua +++ b/resources/install/scripts/app/voicemail/resources/functions/listen_to_recording.lua @@ -42,7 +42,7 @@ end --say the message number if (session:ready()) then - if (string.len(dtmf_digits) == 0) then + if (string.len(dtmf_digits) == 0) then dtmf_digits = macro(session, "message_number", 1, 100, ''); end end @@ -72,7 +72,7 @@ end --get the recordings from the database if (storage_type == "base64") then - sql = [[SELECT * FROM v_voicemail_messages + sql = [[SELECT * FROM v_voicemail_messages WHERE domain_uuid = ']] .. domain_uuid ..[[' AND voicemail_message_uuid = ']].. uuid.. [[' ]]; if (debug["sql"]) then diff --git a/resources/install/scripts/app/voicemail/resources/functions/macro.lua b/resources/install/scripts/app/voicemail/resources/functions/macro.lua index 969dc9d378..17d9aa5a9e 100644 --- a/resources/install/scripts/app/voicemail/resources/functions/macro.lua +++ b/resources/install/scripts/app/voicemail/resources/functions/macro.lua @@ -136,7 +136,7 @@ table.insert(actions, {app="streamFile",data="voicemail/vm-press.wav"}); table.insert(actions, {app="streamFile",data="digits/3.wav"}); end - --At the tone please record your name press any key or stop talking to end the recording + --At the tone please record your name press any key or stop talking to end the recording if (name == "record_name") then table.insert(actions, {app="streamFile",data="voicemail/vm-record_name1.wav"}); table.insert(actions, {app="tone_stream",data="L=1;%(1000, 0, 640)"}); diff --git a/resources/install/scripts/app/voicemail/resources/functions/message_waiting.lua b/resources/install/scripts/app/voicemail/resources/functions/message_waiting.lua index b1225075bc..0ad91817eb 100644 --- a/resources/install/scripts/app/voicemail/resources/functions/message_waiting.lua +++ b/resources/install/scripts/app/voicemail/resources/functions/message_waiting.lua @@ -29,7 +29,7 @@ local accounts = {} table.insert(accounts, voicemail_id); --get the voicemail id and all related mwi accounts - sql = [[SELECT extension, number_alias from v_extensions + sql = [[SELECT extension, number_alias from v_extensions WHERE domain_uuid = ']] .. domain_uuid ..[[' AND (mwi_account = ']]..voicemail_id..[[' or mwi_account = ']]..voicemail_id..[[@]]..domain_name..[[')]]; if (debug["sql"]) then @@ -47,7 +47,7 @@ sql = [[SELECT count(*) as message_count FROM v_voicemail_messages as m, v_voicemails as v WHERE v.domain_uuid = ']] .. domain_uuid ..[[' AND v.voicemail_uuid = m.voicemail_uuid - AND v.voicemail_id = ']] .. voicemail_id ..[[' + AND v.voicemail_id = ']] .. voicemail_id ..[[' AND (m.message_status is null or m.message_status = '') ]]; if (debug["sql"]) then freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "\n"); @@ -57,7 +57,7 @@ end); --send the message waiting event - for key,value in pairs(accounts) do + for key,value in pairs(accounts) do local event = freeswitch.Event("message_waiting"); if (message_count == "0") then if (debug["info"]) then diff --git a/resources/install/scripts/app/voicemail/resources/functions/on_dtmf.lua b/resources/install/scripts/app/voicemail/resources/functions/on_dtmf.lua index be2842c82b..bc52d55d74 100644 --- a/resources/install/scripts/app/voicemail/resources/functions/on_dtmf.lua +++ b/resources/install/scripts/app/voicemail/resources/functions/on_dtmf.lua @@ -26,7 +26,7 @@ --define on_dtmf call back function function on_dtmf(s, type, obj, arg) if (type == "dtmf") then - freeswitch.console_log("info", "[voicemail] dtmf digit: " .. obj['digit'] .. ", duration: " .. obj['duration'] .. "\n"); + freeswitch.console_log("info", "[voicemail] dtmf digit: " .. obj['digit'] .. ", duration: " .. obj['duration'] .. "\n"); if (obj['digit'] == "#") then return 0; else diff --git a/resources/install/scripts/app/voicemail/resources/functions/play_greeting.lua b/resources/install/scripts/app/voicemail/resources/functions/play_greeting.lua index f30917e63e..9ff95f5cab 100644 --- a/resources/install/scripts/app/voicemail/resources/functions/play_greeting.lua +++ b/resources/install/scripts/app/voicemail/resources/functions/play_greeting.lua @@ -43,7 +43,7 @@ --get the greeting from the database if (storage_type == "base64") then - sql = [[SELECT * FROM v_voicemail_greetings + sql = [[SELECT * FROM v_voicemail_greetings WHERE domain_uuid = ']] .. domain_uuid ..[[' AND voicemail_id = ']].. voicemail_id.. [[' AND greeting_id = ']].. greeting_id.. [[' ]]; diff --git a/resources/install/scripts/app/voicemail/resources/functions/record_greeting.lua b/resources/install/scripts/app/voicemail/resources/functions/record_greeting.lua index 183134cc96..9a5badeb12 100644 --- a/resources/install/scripts/app/voicemail/resources/functions/record_greeting.lua +++ b/resources/install/scripts/app/voicemail/resources/functions/record_greeting.lua @@ -39,14 +39,14 @@ end --validate the greeting_id - if (greeting_id == "1" - or greeting_id == "2" - or greeting_id == "3" - or greeting_id == "4" - or greeting_id == "5" - or greeting_id == "6" - or greeting_id == "7" - or greeting_id == "8" + if (greeting_id == "1" + or greeting_id == "2" + or greeting_id == "3" + or greeting_id == "4" + or greeting_id == "5" + or greeting_id == "6" + or greeting_id == "7" + or greeting_id == "8" or greeting_id == "9") then --record your greeting at the tone press any key or stop talking to end the recording if (session:ready()) then @@ -59,7 +59,7 @@ freeswitch.consoleLog("notice", "[voicemail] ".. storage_type .. " ".. storage_path .."\n"); storage_path = storage_path:gsub("${domain_name}", domain_name); session:execute("record", storage_path .."/"..recording_name); - else + else --prepare to record the greeting if (session:ready()) then max_len_seconds = 30; @@ -101,12 +101,12 @@ end end end - + --clean up any tmp greeting files for gid = 1, 9, 1 do if (file_exists(voicemail_dir.."/"..voicemail_id.."/greeting_"..gid..".tmp.wav")) then os.remove(voicemail_dir.."/"..voicemail_id.."/greeting_"..gid..".tmp.wav"); end end - + end \ No newline at end of file diff --git a/resources/install/scripts/app/voicemail/resources/functions/record_menu.lua b/resources/install/scripts/app/voicemail/resources/functions/record_menu.lua index f176d0d3ea..249325ffb7 100644 --- a/resources/install/scripts/app/voicemail/resources/functions/record_menu.lua +++ b/resources/install/scripts/app/voicemail/resources/functions/record_menu.lua @@ -170,7 +170,7 @@ --remove temporary greeting file, if any if (file_exists(tmp_file)) then os.remove(tmp_file); - end + end record_greeting(greeting_id); end if (type == "name") then @@ -181,8 +181,8 @@ --remove temporary greeting file, if any if (file_exists(tmp_file)) then os.remove(tmp_file); - end - end + end + end --hangup if (session:ready()) then dtmf_digits = ''; @@ -205,7 +205,7 @@ --remove temporary greeting file, if any if (file_exists(tmp_file)) then os.remove(tmp_file); - end + end advanced(); end if (type == "name") then diff --git a/resources/install/scripts/app/voicemail/resources/functions/record_message.lua b/resources/install/scripts/app/voicemail/resources/functions/record_message.lua index 397e52c32e..b4d0292cb1 100644 --- a/resources/install/scripts/app/voicemail/resources/functions/record_message.lua +++ b/resources/install/scripts/app/voicemail/resources/functions/record_message.lua @@ -40,7 +40,7 @@ if (dtmf_digits == nil) then dtmf_digits = session:getDigits(max_digits, "#", 1000); else - dtmf_digits = dtmf_digits .. session:getDigits(max_digits, "#", 1000); + dtmf_digits = dtmf_digits .. session:getDigits(max_digits, "#", 1000); end end if (dtmf_digits) then @@ -166,10 +166,10 @@ --delete the wav file, if mp3 exists if (file_exists(voicemail_dir.."/"..voicemail_id.."/msg_"..uuid..".mp3")) then os.remove(voicemail_dir.."/"..voicemail_id.."/msg_"..uuid..".wav"); - else + else vm_message_ext = "wav"; end - else + else freeswitch.consoleLog("notice", "neither mod_shout or lame found, defaulting to wav\n"); vm_message_ext = "wav"; end diff --git a/resources/install/scripts/app/voicemail/resources/functions/send_email.lua b/resources/install/scripts/app/voicemail/resources/functions/send_email.lua index 0480f8c9dd..1534dde247 100644 --- a/resources/install/scripts/app/voicemail/resources/functions/send_email.lua +++ b/resources/install/scripts/app/voicemail/resources/functions/send_email.lua @@ -189,7 +189,7 @@ os.remove(file); end end - + end - + end \ No newline at end of file diff --git a/resources/install/scripts/app/voicemail/resources/scripts/mwi.lua b/resources/install/scripts/app/voicemail/resources/scripts/mwi.lua index 33d48e8068..be2fa5f02b 100644 --- a/resources/install/scripts/app/voicemail/resources/scripts/mwi.lua +++ b/resources/install/scripts/app/voicemail/resources/scripts/mwi.lua @@ -36,7 +36,7 @@ debug["sql"] = false; debug["info"] = false; ---only run the script a single time +--only run the script a single time runonce = true --connect to the database require "resources.functions.database_handle"; @@ -65,10 +65,10 @@ end --Send MWI events for voicemail boxes with messages - sql = [[SELECT v.voicemail_id, v.voicemail_uuid, v.domain_uuid, d.domain_name, COUNT(*) AS message_count - FROM v_voicemail_messages as m, v_voicemails as v, v_domains as d - WHERE v.voicemail_uuid = m.voicemail_uuid - AND v.domain_uuid = d.domain_uuid + sql = [[SELECT v.voicemail_id, v.voicemail_uuid, v.domain_uuid, d.domain_name, COUNT(*) AS message_count + FROM v_voicemail_messages as m, v_voicemails as v, v_domains as d + WHERE v.voicemail_uuid = m.voicemail_uuid + AND v.domain_uuid = d.domain_uuid GROUP BY v.voicemail_id, v.voicemail_uuid, v.domain_uuid, d.domain_name;]]; if (debug["sql"]) then freeswitch.consoleLog("notice", "[voicemail] SQL: " .. sql .. "\n"); @@ -120,5 +120,5 @@ --slow the loop down os.execute("sleep "..sleep); end - + end diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua index ad2252ad83..bf4730d3e1 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/conference.conf.lua @@ -59,7 +59,7 @@ table.insert(xml, [[ ]]); table.insert(xml, [[ ]]); table.insert(xml, [[ ]]); - table.insert(xml, [[ ]]); + table.insert(xml, [[ ]]); table.insert(xml, [[ ]]); table.insert(xml, [[ ]]); table.insert(xml, [[ ]]); diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua index df90f0206d..fc3bd1babe 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/configuration/ivr.conf.lua @@ -44,7 +44,7 @@ assert(dbh:connected()); --get the ivr menu from the database - sql = [[SELECT * FROM v_ivr_menus + sql = [[SELECT * FROM v_ivr_menus WHERE ivr_menu_uuid = ']] .. ivr_menu_uuid ..[[' AND ivr_menu_enabled = 'true' ]]; if (debug["sql"]) then @@ -86,7 +86,7 @@ --greet long if (string.len(ivr_menu_greet_long) > 1) then if (not file_exists(recordings_dir.."/"..domain_name.."/"..ivr_menu_greet_long)) then - sql = [[SELECT * FROM v_recordings + sql = [[SELECT * FROM v_recordings WHERE domain_uuid = ']]..domain_uuid..[[' AND recording_filename = ']]..ivr_menu_greet_long..[[' ]]; if (debug["sql"]) then @@ -110,7 +110,7 @@ --greet short if (string.len(ivr_menu_greet_short) > 1) then if (not file_exists(recordings_dir.."/"..domain_name.."/"..ivr_menu_greet_short)) then - sql = [[SELECT * FROM v_recordings + sql = [[SELECT * FROM v_recordings WHERE domain_uuid = ']]..domain_uuid..[[' AND recording_filename = ']]..ivr_menu_greet_short..[[' ]]; if (debug["sql"]) then @@ -134,7 +134,7 @@ --invalid sound if (string.len(ivr_menu_invalid_sound) > 1) then if (not file_exists(recordings_dir.."/"..domain_name.."/"..ivr_menu_invalid_sound)) then - sql = [[SELECT * FROM v_recordings + sql = [[SELECT * FROM v_recordings WHERE domain_uuid = ']]..domain_uuid..[[' AND recording_filename = ']]..ivr_menu_invalid_sound..[[' ]]; if (debug["sql"]) then @@ -158,7 +158,7 @@ --exit sound if (string.len(ivr_menu_exit_sound) > 1) then if (not file_exists(recordings_dir.."/"..domain_name.."/"..ivr_menu_exit_sound)) then - sql = [[SELECT * FROM v_recordings + sql = [[SELECT * FROM v_recordings WHERE domain_uuid = ']]..domain_uuid..[[' AND recording_filename = ']]..ivr_menu_exit_sound..[[' ]]; if (debug["sql"]) then diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua b/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua index 31611c0150..c0ae747b44 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/dialplan/dialplan.lua @@ -170,27 +170,27 @@ --determine the type of condition if (dialplan_detail_type == "hour") then condition_type = 'time'; - elseif (dialplan_detail_type == "minute") then + elseif (dialplan_detail_type == "minute") then condition_type = 'time'; - elseif (dialplan_detail_type == "minute-of-day") then + elseif (dialplan_detail_type == "minute-of-day") then condition_type = 'time'; - elseif (dialplan_detail_type == "mday") then + elseif (dialplan_detail_type == "mday") then condition_type = 'time'; - elseif (dialplan_detail_type == "mweek") then + elseif (dialplan_detail_type == "mweek") then condition_type = 'time'; - elseif (dialplan_detail_type == "mon") then + elseif (dialplan_detail_type == "mon") then condition_type = 'time'; - elseif (dialplan_detail_type == "time-of-day") then + elseif (dialplan_detail_type == "time-of-day") then condition_type = 'time'; - elseif (dialplan_detail_type == "yday") then + elseif (dialplan_detail_type == "yday") then condition_type = 'time'; - elseif (dialplan_detail_type == "year") then + elseif (dialplan_detail_type == "year") then condition_type = 'time'; - elseif (dialplan_detail_type == "wday") then + elseif (dialplan_detail_type == "wday") then condition_type = 'time'; - elseif (dialplan_detail_type == "week") then + elseif (dialplan_detail_type == "week") then condition_type = 'time'; - elseif (dialplan_detail_type == "date-time") then + elseif (dialplan_detail_type == "date-time") then condition_type = 'time'; else condition_type = 'default'; diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/group_call.lua b/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/group_call.lua index 458c6d02c9..a201cb3409 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/group_call.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/directory/action/group_call.lua @@ -57,9 +57,9 @@ --build the call group array sql = [[ - select * from v_extensions - where domain_uuid = ']]..domain_uuid..[[' - order by call_group asc + select * from v_extensions + where domain_uuid = ']]..domain_uuid..[[' + order by call_group asc ]]; if (debug["sql"]) then freeswitch.consoleLog("notice", "[xml_handler] SQL: " .. sql .. "\n"); diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua b/resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua index 1ecf561ae2..63e18d658b 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/directory/directory.lua @@ -26,7 +26,7 @@ -- -- Contributor(s): -- Mark J Crane --- Luis Daniel Lucio Quiroz +-- Luis Daniel Lucio Quiroz --set the default continue = true; @@ -46,7 +46,7 @@ number_alias_string = ""; vm_mailto = ""; --- event source +-- event source local event_calling_function = params:getHeader("Event-Calling-Function") local event_calling_file = params:getHeader("Event-Calling-File") @@ -67,7 +67,7 @@ dofile(scripts_dir.."/app/xml_handler/resources/scripts/directory/action/directory.lua"); else --handle action - --all other directory actions: sip_auth, user_call + --all other directory actions: sip_auth, user_call --except for the action: group_call if (user == nil) then diff --git a/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua b/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua index f12817b03a..941748aada 100644 --- a/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua +++ b/resources/install/scripts/app/xml_handler/resources/scripts/languages/languages.lua @@ -161,7 +161,7 @@ file_handle:close(); end --iterate array of file paths, get contents of other xml macro files - for key, xml_file_path in pairs(xml_file_paths) do + for key, xml_file_path in pairs(xml_file_paths) do if (file_exists(xml_file_path)) then xml_file = io.open(xml_file_path, "r"); if (xml_file ~= nil) then @@ -170,7 +170,7 @@ xml_file_content = string.gsub(xml_file_content, "", ''); table.insert(xml, xml_file_content); --freeswitch.consoleLog("notice", "file contents...\n\n"..xml_file_content.."\n"); - end + end xml_file:close(); end end diff --git a/resources/install/scripts/call_flow.lua b/resources/install/scripts/call_flow.lua index 2b51b6d33b..b8cd5f90a9 100644 --- a/resources/install/scripts/call_flow.lua +++ b/resources/install/scripts/call_flow.lua @@ -125,7 +125,7 @@ if (session:ready()) then --hangup the call session:hangup(); - else + else log.notice("execute " .. app .. " " .. data); --exucute the application diff --git a/resources/install/scripts/call_forward.lua b/resources/install/scripts/call_forward.lua index bd1dd11142..2c1fc34ff9 100644 --- a/resources/install/scripts/call_forward.lua +++ b/resources/install/scripts/call_forward.lua @@ -176,7 +176,7 @@ local forward_caller_id = "" if enabled == "true" and not empty(forward_caller_id_uuid) then local sql = "select destination_number, destination_description,".. - "destination_caller_id_number, destination_caller_id_name " .. + "destination_caller_id_number, destination_caller_id_name " .. "from v_destinations where domain_uuid = '" .. domain_uuid .. "' and " .. "destination_type = 'inbound' and destination_uuid = '" .. forward_caller_id_uuid .. "'"; local row = dbh:first_row(sql) diff --git a/resources/install/scripts/cidlookup.lua b/resources/install/scripts/cidlookup.lua index b45a319d49..d6c4e31b32 100644 --- a/resources/install/scripts/cidlookup.lua +++ b/resources/install/scripts/cidlookup.lua @@ -23,7 +23,7 @@ -- Luis Daniel Lucio Quiroz -- Riccardo Granchi -- --- add this in Inbound Routes before transfer to use it: +-- add this in Inbound Routes before transfer to use it: -- action set caller_id_name=${luarun cidlookup.lua ${uuid}} --debug @@ -47,16 +47,16 @@ countryCode = api:executeString("uuid_getvar " .. uuid .. " default_countrycode"); if ((countryCode ~= nil) and (string.len(countryCode) > 0)) then - + countryPrefix = "+" .. countryCode; - + if (string.sub(caller, 1, string.len(countryPrefix)) == countryPrefix) then cleanCaller = string.sub(caller, string.len(countryPrefix)+1); freeswitch.consoleLog("NOTICE", "[cidlookup] ignoring local international prefix " .. countryPrefix .. ": " .. caller .. " ==> " .. cleanCaller .. "\n"); caller = cleanCaller; else if ((exitCode ~= nil) and (string.len(exitCode) > 0)) then - + countryPrefix = exitCode .. countryCode; if (string.sub(caller, 1, string.len(countryPrefix)) == countryPrefix) then @@ -65,7 +65,7 @@ caller = cleanCaller; end; end; - end; + end; end; --include config.lua @@ -104,7 +104,7 @@ if ((name == nil) or (string.len(name) == 0)) then name = api:executeString("cidlookup " .. caller); end - + freeswitch.consoleLog("NOTICE", "[cidlookup] uuid_setvar " .. uuid .. " caller_id_name " .. name); api:executeString("uuid_setvar " .. uuid .. " caller_id_name " .. name); diff --git a/resources/install/scripts/directory.lua b/resources/install/scripts/directory.lua index b59d74bcc5..61430c9e9d 100644 --- a/resources/install/scripts/directory.lua +++ b/resources/install/scripts/directory.lua @@ -165,7 +165,7 @@ --check if a file exists require "resources.functions.file_exists" ---define select_entry function +--define select_entry function function select_entry() dtmf_digits = ""; digit_timeout = "500"; @@ -182,7 +182,7 @@ return dtmf_digits; end ---define prompt_for_name function +--define prompt_for_name function function prompt_for_name() dtmf_digits = ""; min_digits=0; max_digits=3; max_tries=3; digit_timeout = "5000"; @@ -196,7 +196,7 @@ --get the digits for the name dtmf_digits = prompt_for_name(); - --show the dtmf digits + --show the dtmf digits freeswitch.consoleLog("notice", "[directory] first 3 letters of first or last name: " .. dtmf_digits .. "\n"); --loop through the extensions to find matches @@ -214,7 +214,7 @@ if (row.first_name) then --play the recorded name if (storage_type == "base64") then - sql = [[SELECT * FROM v_voicemails + sql = [[SELECT * FROM v_voicemails WHERE domain_uuid = ']] .. domain_uuid ..[[' AND voicemail_id = ']].. row.extension.. [[' ]]; if (debug["sql"]) then diff --git a/resources/install/scripts/disa.callback.loopback.lua b/resources/install/scripts/disa.callback.loopback.lua index d0fb1b8923..6692c130be 100644 --- a/resources/install/scripts/disa.callback.loopback.lua +++ b/resources/install/scripts/disa.callback.loopback.lua @@ -59,7 +59,7 @@ freeswitch.consoleLog("info", "[disa.callback] calling " .. aleg_number .. "\n") freeswitch.msleep(2000); while (session1:ready() and not session1:answered()) do - if os.time() > t_started + 30 then + if os.time() > t_started + 30 then freeswitch.consoleLog("info", "[disa.callback] timed out for " .. aleg_number .. "\n"); session1:hangup(); else @@ -78,7 +78,7 @@ if session1:ready() and session1:answered() then session2 = freeswitch.Session(b_dialstring); while (session2:ready() and not session2:answered()) do - if os.time() > t_started2 + 30 then + if os.time() > t_started2 + 30 then freeswitch.consoleLog("info", "[disa.callback] timed out for " .. bleg_number .. "\n"); session2:hangup(); else diff --git a/resources/install/scripts/disa.callback.lua b/resources/install/scripts/disa.callback.lua index ab471109bc..336e7a8da7 100644 --- a/resources/install/scripts/disa.callback.lua +++ b/resources/install/scripts/disa.callback.lua @@ -63,21 +63,21 @@ if (a_user_exists == "true") then extension_uuid = trim(api:executeString(cmd)); a_dialstring = "[origination_caller_id_number=*3472,outbound_caller_id_number=*3472,call_timeout=30,context="..context..",sip_invite_domain="..context..",domain_name="..context..",domain="..context..",accountcode="..accountcode..",domain_uuid="..domain_uuid.."]user/"..aleg_number.."@"..context; else - sql = [[select * from v_dialplans as d, v_dialplan_details as s + sql = [[select * from v_dialplans as d, v_dialplan_details as s where (d.domain_uuid = ']] .. domain_uuid .. [[' or d.domain_uuid is null) - and d.app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' - and d.dialplan_enabled = 'true' - and d.dialplan_uuid = s.dialplan_uuid - order by - d.dialplan_order asc, - d.dialplan_name asc, - d.dialplan_uuid asc, - s.dialplan_detail_group asc, - CASE s.dialplan_detail_tag - WHEN 'condition' THEN 1 - WHEN 'action' THEN 2 - WHEN 'anti-action' THEN 3 - ELSE 100 END, + and d.app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' + and d.dialplan_enabled = 'true' + and d.dialplan_uuid = s.dialplan_uuid + order by + d.dialplan_order asc, + d.dialplan_name asc, + d.dialplan_uuid asc, + s.dialplan_detail_group asc, + CASE s.dialplan_detail_tag + WHEN 'condition' THEN 1 + WHEN 'action' THEN 2 + WHEN 'anti-action' THEN 3 + ELSE 100 END, s.dialplan_detail_order asc ]] if (debug["sql"]) then freeswitch.consoleLog("notice", "[disa ] sql for dialplans:" .. sql .. "\n"); @@ -88,7 +88,7 @@ else dialplans[x] = row; x = x + 1; end)); - + y = 0; previous_dialplan_uuid = ''; for k, r in pairs(dialplans) do @@ -151,7 +151,7 @@ freeswitch.consoleLog("info", "[disa.callback] calling " .. aleg_number .. "\n") freeswitch.msleep(2000); while (session1:ready() and not session1:answered()) do - if os.time() > t_started + 30 then + if os.time() > t_started + 30 then freeswitch.consoleLog("info", "[disa.callback] timed out for " .. aleg_number .. "\n"); session1:hangup(); else @@ -176,21 +176,21 @@ if session1:ready() and session1:answered() then extension_uuid = trim(api:executeString(cmd)); b_dialstring = "[origination_caller_id_number=*3472,outbound_caller_id_number=*3472,call_timeout=30,context="..context..",sip_invite_domain="..context..",domain_name="..context..",domain="..context..",accountcode="..accountcode..",domain_uuid="..domain_uuid.."]user/"..bleg_number.."@"..context; else - sql = [[select * from v_dialplans as d, v_dialplan_details as s + sql = [[select * from v_dialplans as d, v_dialplan_details as s where (d.domain_uuid = ']] .. domain_uuid .. [[' or d.domain_uuid is null) - and d.app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' - and d.dialplan_enabled = 'true' - and d.dialplan_uuid = s.dialplan_uuid - order by - d.dialplan_order asc, - d.dialplan_name asc, - d.dialplan_uuid asc, - s.dialplan_detail_group asc, - CASE s.dialplan_detail_tag - WHEN 'condition' THEN 1 - WHEN 'action' THEN 2 - WHEN 'anti-action' THEN 3 - ELSE 100 END, + and d.app_uuid = '8c914ec3-9fc0-8ab5-4cda-6c9288bdc9a3' + and d.dialplan_enabled = 'true' + and d.dialplan_uuid = s.dialplan_uuid + order by + d.dialplan_order asc, + d.dialplan_name asc, + d.dialplan_uuid asc, + s.dialplan_detail_group asc, + CASE s.dialplan_detail_tag + WHEN 'condition' THEN 1 + WHEN 'action' THEN 2 + WHEN 'anti-action' THEN 3 + ELSE 100 END, s.dialplan_detail_order asc ]] if (debug["sql"]) then freeswitch.consoleLog("notice", "[disa ] sql for dialplans:" .. sql .. "\n"); @@ -200,7 +200,7 @@ if session1:ready() and session1:answered() then assert(dbh:query(sql, function(row) dialplans[x] = row; x = x + 1; - end)); + end)); y = 0; previous_dialplan_uuid = ''; for k, r in pairs(dialplans) do @@ -258,7 +258,7 @@ if session1:ready() and session1:answered() then session2 = freeswitch.Session(b_dialstring); while (session2:ready() and not session2:answered()) do - if os.time() > t_started2 + 30 then + if os.time() > t_started2 + 30 then freeswitch.consoleLog("info", "[disa.callback] timed out for " .. bleg_number .. "\n"); session2:hangup(); else diff --git a/resources/install/scripts/disa.lua b/resources/install/scripts/disa.lua index 893b33b5a6..9f173bc7d2 100644 --- a/resources/install/scripts/disa.lua +++ b/resources/install/scripts/disa.lua @@ -102,7 +102,7 @@ if ( session:ready() ) then else caller_id_number = session:getVariable("effective_caller_id_number"); end - else + else if (caller_id_name) then --caller id name provided do nothing else diff --git a/resources/install/scripts/disa.plus.lua b/resources/install/scripts/disa.plus.lua index 575fd06385..4f92687686 100644 --- a/resources/install/scripts/disa.plus.lua +++ b/resources/install/scripts/disa.plus.lua @@ -195,7 +195,7 @@ if ( session:ready() ) then end --contact exists - --looks for caller_id_name and caller_id_name + --looks for caller_id_name and caller_id_name end --if a predefined_destination is provided then set the number to the predefined_destination @@ -221,7 +221,7 @@ if ( session:ready() ) then else caller_id_number = session:getVariable("effective_caller_id_number"); end - else + else if (caller_id_name) then --caller id name provided do nothing else @@ -244,7 +244,7 @@ if ( session:ready() ) then freeswitch.consoleLog("notice", "[disa] cmd "..cmd.."\n"); api:executeString(cmd); session:hangup("NORMAL_CLEARING"); - return; + return; end diff --git a/resources/install/scripts/extension_queue.lua b/resources/install/scripts/extension_queue.lua index 2f8ed817ab..12d3a96269 100644 --- a/resources/install/scripts/extension_queue.lua +++ b/resources/install/scripts/extension_queue.lua @@ -47,29 +47,29 @@ if (session:ready()) then fifo_count = api:executeString("fifo count " .. extension_queue); -- freeswitch.consoleLog("notice", "fifo count " .. fifo_count .. "]\n"); - + -- Parsing queue info i = 0; - v = {}; + v = {}; for w in string.gmatch(fifo_count,"[^:]+") do v[i] = w; i = i + 1; end - + fifo_name = v[0]; consumer_count = v[1]; caller_count = v[2]; member_count = v[3]; ring_consumer_count = v[4]; idle_consumer_count = v[5]; - + if( not (member_count == "0") ) then - freeswitch.consoleLog("notice", "Adding member [" .. extension .. "] to fifo " .. extension_queue .. " \n"); + freeswitch.consoleLog("notice", "Adding member [" .. extension .. "] to fifo " .. extension_queue .. " \n"); session:execute("set", "fifo_member_add_result=${fifo_member(add " .. extension_queue .." {fifo_member_wait=nowait}user/" .. extension .. " " ..fifo_simo .. " " ..fifo_timeout .. " " .. fifo_lag .. "} )"); --simo timeout lag end; - - -- Answerinf the call + + -- Answerinf the call session:answer(); session:execute( "fifo", extension_queue .. " in" ); end diff --git a/resources/install/scripts/fax_retry.lua b/resources/install/scripts/fax_retry.lua index 9c136f93c3..54b576652a 100644 --- a/resources/install/scripts/fax_retry.lua +++ b/resources/install/scripts/fax_retry.lua @@ -393,12 +393,12 @@ --to keep the originate command shorter these are things we always send. One place to adjust for all. originate_same = "for_fax=1,accountcode='"..accountcode.."',domain_uuid="..domain_uuid..",domain_name="..domain_name..",mailto_address='"..email_address.."',mailfrom_address='"..from_address.."',origination_caller_id_name='"..origination_caller_id_name.. "',origination_caller_id_number="..origination_caller_id_number..",fax_uri="..fax_uri..",fax_retry_limit="..fax_retry_limit..",fax_retry_sleep="..fax_retry_sleep..",fax_verbose=true,fax_file='"..fax_file.."'"; - if (fax_retry_attempts < fax_retry_limit) then + if (fax_retry_attempts < fax_retry_limit) then --timed out waitng for comm or on first message, or busy code if (fax_result_code == "2" or fax_result_code == "3" or hangup_cause_q850 == 17) then --do nothing. don't want to increment - freeswitch.consoleLog("INFO","[FAX] Last Fax was probably Busy, don't increment retry_attempts. \n"); + freeswitch.consoleLog("INFO","[FAX] Last Fax was probably Busy, don't increment retry_attempts. \n"); fax_busy_attempts = fax_busy_attempts + 1; if (fax_busy_attempts > fax_busy_limit) then fax_retry_attempts = 17; diff --git a/resources/install/scripts/intercept.lua b/resources/install/scripts/intercept.lua index 326d93b985..54ea5a9f7c 100644 --- a/resources/install/scripts/intercept.lua +++ b/resources/install/scripts/intercept.lua @@ -306,7 +306,7 @@ else log.noticef("Found child call on remote machine `%s`.", call_hostname) - -- we can not find parent on this box because channel on other box so we have to + -- we can not find parent on this box because channel on other box so we have to -- forward call to this box session:execute("export", "sip_h_X-child_intercept_uuid="..uuid); return make_proxy_call(pickup_number, call_hostname) diff --git a/resources/install/scripts/ivr_menu.lua b/resources/install/scripts/ivr_menu.lua index 16a71c9ce7..f5adcfe403 100644 --- a/resources/install/scripts/ivr_menu.lua +++ b/resources/install/scripts/ivr_menu.lua @@ -95,7 +95,7 @@ api = freeswitch.API(); --get the ivr menu from the database - sql = [[SELECT * FROM v_ivr_menus + sql = [[SELECT * FROM v_ivr_menus WHERE ivr_menu_uuid = ']] .. ivr_menu_uuid ..[[' AND ivr_menu_enabled = 'true' ]]; if (debug["sql"]) then @@ -435,11 +435,11 @@ if (storage_type == "base64") then if (ivr_menu_greet_long_is_base64 and file_exists(ivr_menu_greet_long)) then --os.remove(ivr_menu_greet_long); - end + end if (ivr_menu_greet_short_is_base64 and file_exists(ivr_menu_greet_short)) then --os.remove(ivr_menu_greet_short); - end + end if (ivr_menu_invalid_sound_is_base64 and file_exists(ivr_menu_invalid_sound)) then --os.remove(ivr_menu_invalid_sound); - end + end end \ No newline at end of file diff --git a/resources/install/scripts/page.lua b/resources/install/scripts/page.lua index 5ce7b63813..a1db34d103 100644 --- a/resources/install/scripts/page.lua +++ b/resources/install/scripts/page.lua @@ -43,7 +43,7 @@ if ( session:ready() ) then sounds_dir = session:getVariable("sounds_dir"); destinations = session:getVariable("destinations"); if (destinations == nil) then - destinations = session:getVariable("extension_list"); + destinations = session:getVariable("extension_list"); end destination_table = explode(",",destinations); caller_id_name = session:getVariable("caller_id_name"); diff --git a/resources/install/scripts/pin_number.lua b/resources/install/scripts/pin_number.lua index fa2cb4bcbf..265e9dc226 100644 --- a/resources/install/scripts/pin_number.lua +++ b/resources/install/scripts/pin_number.lua @@ -35,7 +35,7 @@ tries = 0; function check_pin_number() --sleep - session:sleep(500); + session:sleep(500); --increment the number of tries tries = tries + 1; --get the user pin number @@ -58,7 +58,7 @@ function check_pin_number() if (not auth) then if (tries < max_tries) then session:streamFile("phrase:voicemail_fail_auth:#"); - + check_pin_number(); else session:streamFile("phrase:voicemail_fail_auth:#"); diff --git a/resources/install/scripts/resources/functions/base64_alex.lua b/resources/install/scripts/resources/functions/base64_alex.lua index 4eb02d20b1..1e9735a751 100644 --- a/resources/install/scripts/resources/functions/base64_alex.lua +++ b/resources/install/scripts/resources/functions/base64_alex.lua @@ -7,7 +7,7 @@ local b='ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' -- encoding function base64.enc(data) - return ((data:gsub('.', function(x) + return ((data:gsub('.', function(x) local r,b='',x:byte() for i=8,1,-1 do r=r..(b%2^i-b%2^(i-1)>0 and '1' or '0') end return r; diff --git a/resources/install/scripts/resources/functions/cache.lua b/resources/install/scripts/resources/functions/cache.lua index a110927e85..f84762ee48 100644 --- a/resources/install/scripts/resources/functions/cache.lua +++ b/resources/install/scripts/resources/functions/cache.lua @@ -8,7 +8,7 @@ require "resources.functions.trim"; -local api = api +local api = api if not api then if freeswitch then api = freeswitch.API() @@ -92,7 +92,7 @@ function Cache._self_test() local ok, err = Cache.get("a") assert(nil == ok) assert(err == "NOT FOUND") - + local s = "hello \\ ' world" assert(true == Cache.set("a", s)) assert(s == Cache.get("a")) diff --git a/resources/install/scripts/resources/functions/database.lua b/resources/install/scripts/resources/functions/database.lua index 478dbdb55b..518dde3bd9 100644 --- a/resources/install/scripts/resources/functions/database.lua +++ b/resources/install/scripts/resources/functions/database.lua @@ -1,10 +1,10 @@ --- --- @usage +-- @usage -- -- Use default backend -- dbh = Database.new("system") -- ..... -- --- @usage +-- @usage -- -- Use LuaSQL backend -- dbh = Database.backend.luasql("system") -- ..... @@ -163,7 +163,7 @@ end ----------------------------------------------------------- ----------------------------------------------------------- -local Database = {} do +local Database = {} do local backend_loader = setmetatable({}, {__index = function(self, backend) local class = require("resources.functions.database." .. backend) diff --git a/resources/install/scripts/resources/functions/database/odbc.lua b/resources/install/scripts/resources/functions/database/odbc.lua index 0e1bf9fac5..7a9f29c3f2 100644 --- a/resources/install/scripts/resources/functions/database/odbc.lua +++ b/resources/install/scripts/resources/functions/database/odbc.lua @@ -8,7 +8,7 @@ local odbc = require "odbc.dba" local function remove_null(row, null, null_value) local o = {} for k, v in pairs(row) do - if v == null then + if v == null then o[k] = null_value else o[k] = tostring(v) diff --git a/resources/install/scripts/resources/functions/database/odbcpool.lua b/resources/install/scripts/resources/functions/database/odbcpool.lua index 9f46635696..db6fafc017 100644 --- a/resources/install/scripts/resources/functions/database/odbcpool.lua +++ b/resources/install/scripts/resources/functions/database/odbcpool.lua @@ -9,7 +9,7 @@ local odbcpool = require "odbc.dba.pool" local function remove_null(row, null, null_value) local o = {} for k, v in pairs(row) do - if v == null then + if v == null then o[k] = null_value else o[k] = tostring(v) diff --git a/resources/install/scripts/resources/functions/explode.lua b/resources/install/scripts/resources/functions/explode.lua index f6965f79df..c65657b73e 100644 --- a/resources/install/scripts/resources/functions/explode.lua +++ b/resources/install/scripts/resources/functions/explode.lua @@ -1,6 +1,6 @@ --add the explode function - function explode ( seperator, str ) + function explode ( seperator, str ) local pos, arr = 0, {} if (seperator ~= nil and str ~= nil) then for st, sp in function() return string.find( str, seperator, pos, true ) end do -- for each divider found diff --git a/resources/install/scripts/resources/functions/lazy_settings.lua b/resources/install/scripts/resources/functions/lazy_settings.lua index c6950b4d4e..de7d60ee97 100644 --- a/resources/install/scripts/resources/functions/lazy_settings.lua +++ b/resources/install/scripts/resources/functions/lazy_settings.lua @@ -95,7 +95,7 @@ function Settings:_load(category, subcategory, name) if type(self._db) == 'string' then db = Database.new(self._db) end - + local found = false --get the domain settings if domain_uuid then diff --git a/resources/install/scripts/resources/functions/settings.lua b/resources/install/scripts/resources/functions/settings.lua index 8c5952cdd1..676b5f95f0 100644 --- a/resources/install/scripts/resources/functions/settings.lua +++ b/resources/install/scripts/resources/functions/settings.lua @@ -41,7 +41,7 @@ return max; end ---define select_entry function +--define select_entry function function settings(domain_uuid) --define the table @@ -124,7 +124,7 @@ subcategory = row.domain_setting_subcategory; name = row.domain_setting_name; value = row.domain_setting_value; - + --add the category array if (array[category] == nil) then array[category] = {} diff --git a/resources/install/scripts/resources/functions/text.lua b/resources/install/scripts/resources/functions/text.lua index 11bf0933a2..09a3736feb 100644 --- a/resources/install/scripts/resources/functions/text.lua +++ b/resources/install/scripts/resources/functions/text.lua @@ -1,11 +1,11 @@ ---- +--- -- @tparam table dict Dictionary -- @tparam[opt='en'] string language default language -- @tparam[opt='us'] string dialect default language -- @return[1] nil if key is unknown -- @return[2] empty string if language/dialect unknown or there no appropriate value for default language/dialect -- @return[3] translated value accordint dictionary/language/dialect --- +-- -- @usage -- local dict = { -- ['label-text'] = { diff --git a/resources/install/scripts/streamfile.lua b/resources/install/scripts/streamfile.lua index 772167210a..a5d0410f27 100644 --- a/resources/install/scripts/streamfile.lua +++ b/resources/install/scripts/streamfile.lua @@ -63,7 +63,7 @@ function on_dtmf(s, type, obj, arg) if (type == "dtmf") then session:setVariable("dtmf_digits", obj['digit']); - freeswitch.console_log("info", "[streamfile] dtmf digit: " .. obj['digit'] .. ", duration: " .. obj['duration'] .. "\n"); + freeswitch.console_log("info", "[streamfile] dtmf digit: " .. obj['digit'] .. ", duration: " .. obj['duration'] .. "\n"); if (obj['digit'] == "*") then return("false"); --return to previous elseif (obj['digit'] == "0") then @@ -92,7 +92,7 @@ --if base64, get from db, create temp file if (storage_type == "base64") then if (not file_exists(recordings_dir.."/"..file_name_only)) then - sql = [[SELECT * FROM v_recordings + sql = [[SELECT * FROM v_recordings WHERE domain_uuid = ']] .. domain_uuid ..[[' AND recording_filename = ']].. file_name_only.. [[' ]]; if (debug["sql"]) then @@ -110,13 +110,13 @@ file:close(); end end); - else + else file_name = recordings_dir.."/"..file_name_only; end - end + end --adjust file path - if (not file_exists(file_name)) then + if (not file_exists(file_name)) then if (file_exists(sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/"..file_name_only)) then file_name = sounds_dir.."/"..default_language.."/"..default_dialect.."/"..default_voice.."/"..file_name_only; elseif (file_exists(recordings_dir.."/"..file_name_only)) then @@ -128,10 +128,10 @@ if (session:ready()) then session:answer(); slept = session:getVariable("slept"); - if (slept == nil or slept == "false") then + if (slept == nil or slept == "false") then freeswitch.consoleLog("notice", "[ivr_menu] sleeping (1s)\n"); session:sleep(1000); - if (slept == "false") then + if (slept == "false") then session:setVariable("slept", "true"); end end @@ -144,5 +144,5 @@ if (storage_type == "base64") then if (file_exists(file_name)) then --os.remove(file_name); - end + end end diff --git a/resources/jquery/flot/jquery.flot.js b/resources/jquery/flot/jquery.flot.js index aabc544e9a..89e391773f 100644 --- a/resources/jquery/flot/jquery.flot.js +++ b/resources/jquery/flot/jquery.flot.js @@ -8,9 +8,9 @@ // for convenience /* Plugin for jQuery for working with colors. - * + * * Version 1.1. - * + * * Inspiration from jQuery color animation plugin by John Resig. * * Released under the MIT license by Ole Laursen, October 2009. @@ -27,7 +27,7 @@ * * V. 1.1: Fix error handling so e.g. parsing an empty string does * produce a color rather than just crashing. - */ + */ (function(B){B.color={};B.color.make=function(F,E,C,D){var G={};G.r=F||0;G.g=E||0;G.b=C||0;G.a=D!=null?D:1;G.add=function(J,I){for(var H=0;H=1){return"rgb("+[G.r,G.g,G.b].join(",")+")"}else{return"rgba("+[G.r,G.g,G.b,G.a].join(",")+")"}};G.normalize=function(){function H(J,K,I){return KI?I:K)}G.r=H(0,parseInt(G.r),255);G.g=H(0,parseInt(G.g),255);G.b=H(0,parseInt(G.b),255);G.a=H(0,G.a,1);return G};G.clone=function(){return B.color.make(G.r,G.b,G.g,G.a)};return G.normalize()};B.color.extract=function(D,C){var E;do{E=D.css(C).toLowerCase();if(E!=""&&E!="transparent"){break}D=D.parent()}while(!B.nodeName(D.get(0),"body"));if(E=="rgba(0, 0, 0, 0)"){E="transparent"}return B.color.parse(E)};B.color.parse=function(F){var E,C=B.color.make;if(E=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10))}if(E=/rgba\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseInt(E[1],10),parseInt(E[2],10),parseInt(E[3],10),parseFloat(E[4]))}if(E=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55)}if(E=/rgba\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\s*\)/.exec(F)){return C(parseFloat(E[1])*2.55,parseFloat(E[2])*2.55,parseFloat(E[3])*2.55,parseFloat(E[4]))}if(E=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(F)){return C(parseInt(E[1],16),parseInt(E[2],16),parseInt(E[3],16))}if(E=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(F)){return C(parseInt(E[1]+E[1],16),parseInt(E[2]+E[2],16),parseInt(E[3]+E[3],16))}var D=B.trim(F).toLowerCase();if(D=="transparent"){return C(255,255,255,0)}else{E=A[D]||[0,0,0];return C(E[0],E[1],E[2])}};var A={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0]}})(jQuery); // the actual Flot code @@ -37,7 +37,7 @@ // [ series1, series2 ... ] // where series is either just the data as [ [x1, y1], [x2, y2], ... ] // or { data: [ [x1, y1], [x2, y2], ... ], label: "some label", ... } - + var series = [], options = { // the color theme used for graphs @@ -71,7 +71,7 @@ reserveSpace: null, // whether to reserve space even if axis isn't shown tickLength: null, // size in pixels of ticks, or "full" for whole line alignTicksWithAxis: null, // axis number or null for no sync - + // mode specific options tickDecimals: null, // no. of decimals, null means auto tickSize: null, // number or [number, "unit"] @@ -97,7 +97,7 @@ }, lines: { // we don't put in show: false so we can see - // whether lines were actively disabled + // whether lines were actively disabled lineWidth: 2, // in pixels fill: false, fillColor: null, @@ -109,7 +109,7 @@ barWidth: 1, // in units of the x axis fill: true, fillColor: null, - align: "left", // or "center" + align: "left", // or "center" horizontal: false }, shadowSize: 3 @@ -203,7 +203,7 @@ // public attributes plot.hooks = hooks; - + // initialize initPlugins(plot); parseOptions(options_); @@ -228,17 +228,17 @@ $.extend(true, options, p.options); } } - + function parseOptions(opts) { var i; - + $.extend(true, options, opts); - + if (options.xaxis.color == null) options.xaxis.color = options.grid.color; if (options.yaxis.color == null) options.yaxis.color = options.grid.color; - + if (options.xaxis.tickColor == null) // backwards-compatibility options.xaxis.tickColor = options.grid.tickColor; if (options.yaxis.tickColor == null) // backwards-compatibility @@ -248,7 +248,7 @@ options.grid.borderColor = options.grid.color; if (options.grid.tickColor == null) options.grid.tickColor = $.color.parse(options.grid.color).scale('a', 0.22).toString(); - + // fill in defaults in axes, copy at least always the // first as the rest of the code assumes it'll be there for (i = 0; i < Math.max(1, options.xaxes.length); ++i) @@ -301,7 +301,7 @@ fillInSeriesOptions(); processData(); } - + function parseData(d) { var res = []; for (var i = 0; i < d.length; ++i) { @@ -322,7 +322,7 @@ return res; } - + function axisNumber(obj, coord) { var a = obj[coord + "axis"]; if (typeof a == "object") // if we got a real axis, extract number @@ -336,9 +336,9 @@ // return flat array without annoying null entries return $.grep(xaxes.concat(yaxes), function (a) { return a; }); } - + function canvasToAxisCoords(pos) { - // return an object with x/y corresponding to all used axes + // return an object with x/y corresponding to all used axes var res = {}, i, axis; for (i = 0; i < xaxes.length; ++i) { axis = xaxes[i]; @@ -351,7 +351,7 @@ if (axis && axis.used) res["y" + axis.n] = axis.c2p(pos.top); } - + if (res.x1 !== undefined) res.x = res.x1; if (res.y1 !== undefined) @@ -359,7 +359,7 @@ return res; } - + function axisToCanvasCoords(pos) { // get canvas coords from the first pair of x/y found in pos var res = {}, i, axis, key; @@ -377,7 +377,7 @@ } } } - + for (i = 0; i < yaxes.length; ++i) { axis = yaxes[i]; if (axis && axis.used) { @@ -391,10 +391,10 @@ } } } - + return res; } - + function getOrCreateAxis(axes, number) { if (!axes[number - 1]) axes[number - 1] = { @@ -402,13 +402,13 @@ direction: axes == xaxes ? "x" : "y", options: $.extend(true, {}, axes == xaxes ? options.xaxis : options.yaxis) }; - + return axes[number - 1]; } function fillInSeriesOptions() { var i; - + // collect what we already got of colors var neededColors = series.length, usedColors = [], @@ -423,7 +423,7 @@ usedColors.push($.color.parse(series[i].color)); } } - + // we might need to generate more colors if higher indices // are assigned for (i = 0; i < assignedColors.length; ++i) { @@ -447,7 +447,7 @@ // FIXME: if we're getting to close to something else, // we should probably skip this one colors.push(c); - + ++i; if (i >= options.colors.length) { i = 0; @@ -459,7 +459,7 @@ var colori = 0, s; for (i = 0; i < series.length; ++i) { s = series[i]; - + // assign colors if (s.color == null) { s.color = colors[colori].toString(); @@ -485,7 +485,7 @@ s.yaxis = getOrCreateAxis(yaxes, axisNumber(s, "y")); } } - + function processData() { var topSentry = Number.POSITIVE_INFINITY, bottomSentry = Number.NEGATIVE_INFINITY, @@ -506,14 +506,14 @@ axis.datamax = bottomSentry; axis.used = false; }); - + for (i = 0; i < series.length; ++i) { s = series[i]; s.datapoints = { points: [] }; - + executeHooks(hooks.processRawData, [ s, s.data, s.datapoints ]); } - + // first pass: clean and copy data for (i = 0; i < series.length; ++i) { s = series[i]; @@ -533,7 +533,7 @@ format[format.length - 1].x = true; } } - + s.datapoints.format = format; } @@ -541,13 +541,13 @@ continue; // already filled in s.datapoints.pointsize = format.length; - + ps = s.datapoints.pointsize; points = s.datapoints.points; insertSteps = s.lines.show && s.lines.steps; s.xaxis.used = s.yaxis.used = true; - + for (j = k = 0; j < data.length; ++j, k += ps) { p = data[j]; @@ -571,16 +571,16 @@ if (val == null) { if (f.required) nullify = true; - + if (f.defaultValue != null) val = f.defaultValue; } } - + points[k + m] = val; } } - + if (nullify) { for (m = 0; m < ps; ++m) { val = points[k + m]; @@ -620,7 +620,7 @@ // give the hooks a chance to run for (i = 0; i < series.length; ++i) { s = series[i]; - + executeHooks(hooks.processDatapoints, [ s, s.datapoints]); } @@ -632,7 +632,7 @@ var xmin = topSentry, ymin = topSentry, xmax = bottomSentry, ymax = bottomSentry; - + for (j = 0; j < points.length; j += ps) { if (points[j] == null) continue; @@ -642,7 +642,7 @@ f = format[m]; if (!f || val == fakeInfinity || val == -fakeInfinity) continue; - + if (f.x) { if (val < xmin) xmin = val; @@ -657,7 +657,7 @@ } } } - + if (s.bars.show) { // make sure we got room for the bar on the dancing floor var delta = s.bars.align == "left" ? 0 : -s.bars.barWidth/2; @@ -670,7 +670,7 @@ xmax += delta + s.bars.barWidth; } } - + updateAxis(s.xaxis, xmin, xmax); updateAxis(s.yaxis, ymin, ymax); } @@ -688,25 +688,25 @@ c.className = cls; c.width = canvasWidth; c.height = canvasHeight; - + if (!skipPositioning) $(c).css({ position: 'absolute', left: 0, top: 0 }); - + $(c).appendTo(placeholder); - + if (!c.getContext) // excanvas hack c = window.G_vmlCanvasManager.initElement(c); // used for resetting in case we get replotted c.getContext("2d").save(); - + return c; } function getCanvasDimensions() { canvasWidth = placeholder.width(); canvasHeight = placeholder.height(); - + if (canvasWidth <= 0 || canvasHeight <= 0) throw "Invalid dimensions for plot, width = " + canvasWidth + ", height = " + canvasHeight; } @@ -728,7 +728,7 @@ // and save again cctx.save(); } - + function setupCanvases() { var reused, existingCanvas = placeholder.children("canvas.base"), @@ -736,16 +736,16 @@ if (existingCanvas.length == 0 || existingOverlay == 0) { // init everything - + placeholder.html(""); // make sure placeholder is clear - + placeholder.css({ padding: 0 }); // padding messes up the positioning - + if (placeholder.css("position") == 'static') placeholder.css("position", "relative"); // for positioning labels and overlay getCanvasDimensions(); - + canvas = makeCanvas(true, "base"); overlay = makeCanvas(false, "overlay"); // overlay canvas for interactive features @@ -773,10 +773,10 @@ // reset reused canvases plot.resize(); - + // make sure overlay pixels are cleared (canvas is cleared when we redraw) octx.clearRect(0, 0, canvasWidth, canvasHeight); - + // then whack any remaining obvious garbage left eventHolder.unbind(); placeholder.children().not([canvas, overlay]).remove(); @@ -802,23 +802,23 @@ function shutdown() { if (redrawTimeout) clearTimeout(redrawTimeout); - + eventHolder.unbind("mousemove", onMouseMove); eventHolder.unbind("mouseleave", onMouseLeave); eventHolder.unbind("click", onClick); - + executeHooks(hooks.shutdown, [eventHolder]); } function setTransformationHelpers(axis) { // set helper functions on the axis, assumes plot area // has been computed already - + function identity(x) { return x; } - + var s, m, t = axis.options.transform || identity, it = axis.options.inverseTransform; - + // precompute how much the axis is scaling a point // in canvas space if (axis.direction == "x") { @@ -853,7 +853,7 @@ + labels.join("") + '') .appendTo(placeholder); } - + if (axis.direction == "x") { // to avoid measuring the widths of the labels (it's slow), we // construct fixed-size boxes and put the labels inside @@ -888,7 +888,7 @@ if (l) labels.push('
' + l + '
'); } - + if (labels.length > 0) { dummyDiv = makeDummyDiv(labels, ""); if (w == null) @@ -940,14 +940,14 @@ var innermost = $.inArray(axis, sameDirection) == 0; if (!innermost && tickLength == "full") tickLength = 5; - + if (!isNaN(+tickLength)) padding += +tickLength; // compute box if (axis.direction == "x") { lh += padding; - + if (pos == "bottom") { plotOffset.bottom += lh + axismargin; axis.box = { top: canvasHeight - plotOffset.bottom, height: lh }; @@ -959,7 +959,7 @@ } else { lw += padding; - + if (pos == "left") { axis.box = { left: plotOffset.left + axismargin, width: lw }; plotOffset.left += lw + axismargin; @@ -988,7 +988,7 @@ axis.box.height = plotHeight; } } - + function setupGrid() { var i, axes = allAxes(); @@ -998,7 +998,7 @@ axis.show = axis.options.show; if (axis.show == null) axis.show = axis.used; // by default an axis is visible if it's got data - + axis.reserveSpace = axis.show || axis.options.reserveSpace; setRange(axis); @@ -1031,13 +1031,13 @@ for (i = 0; i < series.length; ++i) minMargin = Math.max(minMargin, series[i].points.radius + series[i].points.lineWidth/2); } - + for (var a in plotOffset) { plotOffset[a] += options.grid.borderWidth; plotOffset[a] = Math.max(minMargin, plotOffset[a]); } } - + plotWidth = canvasWidth - plotOffset.left - plotOffset.right; plotHeight = canvasHeight - plotOffset.bottom - plotOffset.top; @@ -1053,10 +1053,10 @@ insertAxisLabels(); } - + insertLegend(); } - + function setRange(axis) { var opts = axis.options, min = +(opts.min != null ? opts.min : axis.datamin), @@ -1098,7 +1098,7 @@ function setupTickGeneration(axis) { var opts = axis.options; - + // estimate number of ticks var noTicks; if (typeof opts.ticks == "number" && opts.ticks > 0) @@ -1113,7 +1113,7 @@ if (opts.mode == "time") { // pretty handling of time - + // map of app. size of time units in milliseconds var timeUnitSize = { "second": 1000, @@ -1129,9 +1129,9 @@ // an integer algorithm var spec = [ [1, "second"], [2, "second"], [5, "second"], [10, "second"], - [30, "second"], + [30, "second"], [1, "minute"], [2, "minute"], [5, "minute"], [10, "minute"], - [30, "minute"], + [30, "minute"], [1, "hour"], [2, "hour"], [4, "hour"], [8, "hour"], [12, "hour"], [1, "day"], [2, "day"], [3, "day"], @@ -1155,7 +1155,7 @@ break; size = spec[i][0]; unit = spec[i][1]; - + // special-case the possibility of several years if (unit == "year") { magn = Math.pow(10, Math.floor(Math.log(delta / timeUnitSize.year) / Math.LN10)); @@ -1173,12 +1173,12 @@ } axis.tickSize = opts.tickSize || [size, unit]; - + generator = function(axis) { var ticks = [], tickSize = axis.tickSize[0], unit = axis.tickSize[1], d = new Date(axis.min); - + var step = tickSize * timeUnitSize[unit]; if (unit == "second") @@ -1191,7 +1191,7 @@ d.setUTCMonth(floorInBase(d.getUTCMonth(), tickSize)); if (unit == "year") d.setUTCFullYear(floorInBase(d.getUTCFullYear(), tickSize)); - + // reset smaller components d.setUTCMilliseconds(0); if (step >= timeUnitSize.minute) @@ -1243,11 +1243,11 @@ // first check global format if (opts.timeformat != null) return $.plot.formatDate(d, opts.timeformat, opts.monthNames); - + var t = axis.tickSize[0] * timeUnitSize[axis.tickSize[1]]; var span = axis.max - axis.min; var suffix = (opts.twelveHourClock) ? " %p" : ""; - + if (t < timeUnitSize.minute) fmt = "%h:%M:%S" + suffix; else if (t < timeUnitSize.day) { @@ -1266,7 +1266,7 @@ } else fmt = "%y"; - + return $.plot.formatDate(d, fmt, opts.monthNames); }; } @@ -1279,7 +1279,7 @@ magn = Math.pow(10, -dec); norm = delta / magn; // norm is between 1.0 and 10.0 - + if (norm < 1.5) size = 1; else if (norm < 3) { @@ -1296,7 +1296,7 @@ size = 10; size *= magn; - + if (opts.minTickSize != null && size < opts.minTickSize) size = opts.minTickSize; @@ -1334,7 +1334,7 @@ if (opts.max == null && niceTicks.length > 1) axis.max = Math.max(axis.max, niceTicks[niceTicks.length - 1]); } - + generator = function (axis) { // copy ticks, scaled to this axis var ticks = [], v, i; @@ -1345,7 +1345,7 @@ } return ticks; }; - + // we might need an extra decimal since forced // ticks don't necessarily fit naturally if (axis.mode != "time" && opts.tickDecimals == null) { @@ -1367,7 +1367,7 @@ else axis.tickFormatter = formatter; } - + function setTicks(axis) { var oticks = axis.options.ticks, ticks = []; if (oticks == null || (typeof oticks == "number" && oticks > 0)) @@ -1409,7 +1409,7 @@ axis.max = Math.max(axis.max, ticks[ticks.length - 1].v); } } - + function draw() { ctx.clearRect(0, 0, canvasWidth, canvasHeight); @@ -1418,7 +1418,7 @@ // draw background, if any if (grid.show && grid.backgroundColor) drawBackground(); - + if (grid.show && !grid.aboveData) drawGrid(); @@ -1428,7 +1428,7 @@ } executeHooks(hooks.draw, [ctx]); - + if (grid.show && grid.aboveData) drawGrid(); } @@ -1463,10 +1463,10 @@ from = to; to = tmp; } - + return { from: from, to: to, axis: axis }; } - + function drawBackground() { ctx.save(); ctx.translate(plotOffset.left, plotOffset.top); @@ -1478,7 +1478,7 @@ function drawGrid() { var i; - + ctx.save(); ctx.translate(plotOffset.left, plotOffset.top); @@ -1493,7 +1493,7 @@ axes.xmax = axes.xaxis.max; axes.ymin = axes.yaxis.min; axes.ymax = axes.yaxis.max; - + markings = markings(axes); } @@ -1530,7 +1530,7 @@ xrange.to = xrange.axis.p2c(xrange.to); yrange.from = yrange.axis.p2c(yrange.from); yrange.to = yrange.axis.p2c(yrange.to); - + if (xrange.from == xrange.to || yrange.from == yrange.to) { // draw line ctx.beginPath(); @@ -1549,7 +1549,7 @@ } } } - + // draw the ticks var axes = allAxes(), bw = options.grid.borderWidth; @@ -1558,7 +1558,7 @@ t = axis.tickLength, x, y, xoff, yoff; if (!axis.show || axis.ticks.length == 0) continue - + ctx.strokeStyle = axis.options.tickColor || $.color.parse(axis.options.color).scale('a', 0.22).toString(); ctx.lineWidth = 1; @@ -1577,7 +1577,7 @@ else x = box.left - plotOffset.left + (axis.position == "left" ? box.width : 0); } - + // draw tick bar if (!axis.innermost) { ctx.beginPath(); @@ -1586,7 +1586,7 @@ xoff = plotWidth; else yoff = plotHeight; - + if (ctx.lineWidth == 1) { x = Math.floor(x) + 0.5; y = Math.floor(y) + 0.5; @@ -1601,7 +1601,7 @@ ctx.beginPath(); for (i = 0; i < axis.ticks.length; ++i) { var v = axis.ticks[i].v; - + xoff = yoff = 0; if (v < axis.min || v > axis.max @@ -1613,14 +1613,14 @@ if (axis.direction == "x") { x = axis.p2c(v); yoff = t == "full" ? -plotHeight : t; - + if (axis.position == "top") yoff = -yoff; } else { y = axis.p2c(v); xoff = t == "full" ? -plotWidth : t; - + if (axis.position == "left") xoff = -xoff; } @@ -1635,11 +1635,11 @@ ctx.moveTo(x, y); ctx.lineTo(x + xoff, y + yoff); } - + ctx.stroke(); } - - + + // draw border if (bw) { ctx.lineWidth = bw; @@ -1652,7 +1652,7 @@ function insertAxisLabels() { placeholder.find(".tickLabels").remove(); - + var html = ['
']; var axes = allAxes(); @@ -1668,7 +1668,7 @@ continue; var pos = {}, align; - + if (axis.direction == "x") { align = "center"; pos.left = Math.round(plotOffset.left + axis.p2c(tick.v) - axis.labelWidth/2); @@ -1694,7 +1694,7 @@ var style = ["position:absolute", "text-align:" + align ]; for (var a in pos) style.push(a + ":" + pos[a] + "px") - + html.push('
' + tick.label + '
'); } html.push('
'); @@ -1713,18 +1713,18 @@ if (series.points.show) drawSeriesPoints(series); } - + function drawSeriesLines(series) { function plotLine(datapoints, xoffset, yoffset, axisx, axisy) { var points = datapoints.points, ps = datapoints.pointsize, prevx = null, prevy = null; - + ctx.beginPath(); for (var i = ps; i < points.length; i += ps) { var x1 = points[i - ps], y1 = points[i - ps + 1], x2 = points[i], y2 = points[i + 1]; - + if (x1 == null || x2 == null) continue; @@ -1787,7 +1787,7 @@ if (x1 != prevx || y1 != prevy) ctx.moveTo(axisx.p2c(x1) + xoffset, axisy.p2c(y1) + yoffset); - + prevx = x2; prevy = y2; ctx.lineTo(axisx.p2c(x2) + xoffset, axisy.p2c(y2) + yoffset); @@ -1839,7 +1839,7 @@ continue; // clip x values - + // clip with xmin if (x1 <= x2 && x1 < axisx.min) { if (x2 < axisx.min) @@ -1874,7 +1874,7 @@ ctx.moveTo(axisx.p2c(x1), axisy.p2c(bottom)); areaOpen = true; } - + // now first check the case where both is outside if (y1 >= axisy.max && y2 >= axisy.max) { ctx.lineTo(axisx.p2c(x1), axisy.p2c(axisy.max)); @@ -1886,7 +1886,7 @@ ctx.lineTo(axisx.p2c(x2), axisy.p2c(axisy.min)); continue; } - + // else it's a bit more complicated, there might // be a flat maxed out rectangle first, then a // triangular cutout or reverse; to find these @@ -1895,7 +1895,7 @@ // clip the y values, without shortcutting, we // go through all cases in turn - + // clip with ymin if (y1 <= y2 && y1 < axisy.min && y2 >= axisy.min) { x1 = (axisy.min - y1) / (y2 - y1) * (x2 - x1) + x1; @@ -1922,7 +1922,7 @@ ctx.lineTo(axisx.p2c(x1old), axisy.p2c(y1)); // it goes to (x1, y1), but we fill that below } - + // fill triangular section, this sometimes result // in redundant points if (x1, y1) hasn't changed // from previous line to, but we just ignore that @@ -1976,7 +1976,7 @@ var x = points[i], y = points[i + 1]; if (x == null || x < axisx.min || x > axisx.max || y < axisy.min || y > axisy.max) continue; - + ctx.beginPath(); x = axisx.p2c(x); y = axisy.p2c(y) + offset; @@ -1985,7 +1985,7 @@ else symbol(ctx, x, y, radius, shadow); ctx.closePath(); - + if (fillStyle) { ctx.fillStyle = fillStyle; ctx.fill(); @@ -1993,7 +1993,7 @@ ctx.stroke(); } } - + ctx.save(); ctx.translate(plotOffset.left, plotOffset.top); @@ -2064,12 +2064,12 @@ drawTop = false; } } - + // clip if (right < axisx.min || left > axisx.max || top < axisy.min || bottom > axisy.max) return; - + if (left < axisx.min) { left = axisx.min; drawLeft = false; @@ -2084,7 +2084,7 @@ bottom = axisy.min; drawBottom = false; } - + if (top > axisy.max) { top = axisy.max; drawTop = false; @@ -2094,7 +2094,7 @@ bottom = axisy.p2c(bottom); right = axisx.p2c(right); top = axisy.p2c(top); - + // fill the bar if (fillStyleCallback) { c.beginPath(); @@ -2131,11 +2131,11 @@ c.stroke(); } } - + function drawSeriesBars(series) { function plotBars(datapoints, barLeft, barRight, offset, fillStyleCallback, axisx, axisy) { var points = datapoints.points, ps = datapoints.pointsize; - + for (var i = 0; i < points.length; i += ps) { if (points[i] == null) continue; @@ -2162,19 +2162,19 @@ if (filloptions.fillColor) return getColorOrGradient(filloptions.fillColor, bottom, top, seriesColor); - + var c = $.color.parse(seriesColor); c.a = typeof fill == "number" ? fill : 0.4; c.normalize(); return c.toString(); } - + function insertLegend() { placeholder.find(".legend").remove(); if (!options.legend.show) return; - + var fragments = [], rowStarted = false, lf = options.legend.labelFormatter, s, label; for (var i = 0; i < series.length; ++i) { @@ -2182,7 +2182,7 @@ label = s.label; if (!label) continue; - + if (i % options.legend.noColumns == 0) { if (rowStarted) fragments.push('
' + label + '