From 9d204f6e60e372b793fa5d2bb28b02eb7ae6db37 Mon Sep 17 00:00:00 2001 From: mattf Date: Sun, 6 Mar 2016 17:04:52 +0000 Subject: [PATCH] Added new webphone options Added option to define a carrier across all servers git-svn-id: svn://192.168.202.10@2488 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/UPGRADE | 2 + agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl | 7 +-- .../trunk/extras/MySQL_AST_CREATE_tables.sql | 9 +++- agc_2-X/trunk/extras/upgrade_2.12.sql | 9 ++++ agc_2-X/trunk/www/agc/vicidial.php | 22 +++++++-- agc_2-X/trunk/www/vicidial/admin.php | 49 +++++++++++++++---- agc_2-X/trunk/www/vicidial/help.php | 32 ++++++++++-- 7 files changed, 108 insertions(+), 22 deletions(-) diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE index 491f9441..66464522 100644 --- a/agc_2-X/trunk/UPGRADE +++ b/agc_2-X/trunk/UPGRADE @@ -246,6 +246,8 @@ OTHER CHANGES: 64. Added Alternate IVR(Call Menu) Logging options +65. Added option to define a carrier across all active asterisk servers + diff --git a/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl b/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl index f05a4fe9..3fb49473 100644 --- a/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl +++ b/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl @@ -108,9 +108,10 @@ # 151229-1623 - Added asterisk output logger launching, tied to server setting, runs every 5 minutes if active # 160305-2253 - Added --teod flag to log Timeclock End of Day processes to log file # Limited max-stats process to only run on voicemail server, also added alt-logging flags to cm.agi calls +# 160306-1040 - Added option for carriers to be defined for all active asterisk servers # -$build = '160305-2253'; +$build = '160306-1040'; $DB=0; # Debug flag $teodDB=0; # flag to log Timeclock End of Day processes to log file @@ -2112,7 +2113,7 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r ##### BEGIN Generate the IAX carriers for this server_ip ##### - $stmtA = "SELECT carrier_id,carrier_name,registration_string,template_id,account_entry,globals_string,dialplan_entry,carrier_description FROM vicidial_server_carriers where server_ip='$server_ip' and active='Y' and protocol='IAX2' order by carrier_id;"; + $stmtA = "SELECT carrier_id,carrier_name,registration_string,template_id,account_entry,globals_string,dialplan_entry,carrier_description FROM vicidial_server_carriers where server_ip IN('$server_ip','0.0.0.0') and active='Y' and protocol='IAX2' order by carrier_id;"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; $sthArows=$sthA->rows; @@ -2169,7 +2170,7 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r ##### BEGIN Generate the SIP carriers for this server_ip ##### - $stmtA = "SELECT carrier_id,carrier_name,registration_string,template_id,account_entry,globals_string,dialplan_entry,carrier_description FROM vicidial_server_carriers where server_ip='$server_ip' and active='Y' and protocol='SIP' order by carrier_id;"; + $stmtA = "SELECT carrier_id,carrier_name,registration_string,template_id,account_entry,globals_string,dialplan_entry,carrier_description FROM vicidial_server_carriers where server_ip IN('$server_ip','0.0.0.0') and active='Y' and protocol='SIP' order by carrier_id;"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; $sthArows=$sthA->rows; diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql index 81a975c5..36242761 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -95,6 +95,10 @@ nva_error_filename VARCHAR(255) default '', nva_new_list_id BIGINT(14) UNSIGNED default '995', nva_new_phone_code VARCHAR(10) default '1', nva_new_status VARCHAR(6) default 'NVAINS', +webphone_dialbox ENUM('Y','N') default 'Y', +webphone_mute ENUM('Y','N') default 'Y', +webphone_volume ENUM('Y','N') default 'Y', +webphone_debug ENUM('Y','N') default 'N', index (server_ip), index (voicemail_id), index (dialplan_number), @@ -152,7 +156,8 @@ system_uptime VARCHAR(255) default '', auto_restart_asterisk ENUM('Y','N') default 'N', asterisk_temp_no_restart ENUM('Y','N') default 'N', voicemail_dump_exten_no_inst VARCHAR(20) default '85026666666667', -gather_asterisk_output ENUM('Y','N') default 'N' +gather_asterisk_output ENUM('Y','N') default 'N', +web_socket_url VARCHAR(255) default '' ) ENGINE=MyISAM; CREATE UNIQUE INDEX server_id on servers (server_id); @@ -3737,4 +3742,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version'; UPDATE system_settings set vdc_agent_api_active='1'; -UPDATE system_settings SET db_schema_version='1454',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1455',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/agc_2-X/trunk/extras/upgrade_2.12.sql b/agc_2-X/trunk/extras/upgrade_2.12.sql index ea94f79d..160e80ac 100644 --- a/agc_2-X/trunk/extras/upgrade_2.12.sql +++ b/agc_2-X/trunk/extras/upgrade_2.12.sql @@ -545,3 +545,12 @@ ALTER TABLE vicidial_call_menu ADD alt_dtmf_log ENUM('0','1') default '0'; ALTER TABLE vicidial_call_menu ADD question INT(11) DEFAULT NULL; UPDATE system_settings SET db_schema_version='1454',db_schema_update_date=NOW() where db_schema_version < 1454; + +ALTER TABLE servers ADD web_socket_url VARCHAR(255) default ''; + +ALTER TABLE phones ADD webphone_dialbox ENUM('Y','N') default 'Y'; +ALTER TABLE phones ADD webphone_mute ENUM('Y','N') default 'Y'; +ALTER TABLE phones ADD webphone_volume ENUM('Y','N') default 'Y'; +ALTER TABLE phones ADD webphone_debug ENUM('Y','N') default 'N'; + +UPDATE system_settings SET db_schema_version='1455',db_schema_update_date=NOW() where db_schema_version < 1455; diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 2f26346e..d4b93ef2 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -516,10 +516,11 @@ # 160101-1131 - Added code to handle routing initiated recordings # 160104-1237 - Added images for live chat and email, and dead chat # 160106-2215 - Deactivated several call action buttons while Email/Chat handling +# 160306-1019 - Added more webphone options # -$version = '2.12-485c'; -$build = '160106-2215'; +$version = '2.12-486c'; +$build = '160306-1019'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=87; $one_mysql_log=0; @@ -2599,7 +2600,7 @@ else ##### END phone login load balancing functions ##### echo "Agent web client\n"; - $stmt="SELECT extension,dialplan_number,voicemail_id,phone_ip,computer_ip,server_ip,login,pass,status,active,phone_type,fullname,company,picture,messages,old_messages,protocol,local_gmt,ASTmgrUSERNAME,ASTmgrSECRET,login_user,login_pass,login_campaign,park_on_extension,conf_on_extension,VICIDIAL_park_on_extension,VICIDIAL_park_on_filename,monitor_prefix,recording_exten,voicemail_exten,voicemail_dump_exten,ext_context,dtmf_send_extension,call_out_number_group,client_browser,install_directory,local_web_callerID_URL,VICIDIAL_web_URL,AGI_call_logging_enabled,user_switching_enabled,conferencing_enabled,admin_hangup_enabled,admin_hijack_enabled,admin_monitor_enabled,call_parking_enabled,updater_check_enabled,AFLogging_enabled,QUEUE_ACTION_enabled,CallerID_popup_enabled,voicemail_button_enabled,enable_fast_refresh,fast_refresh_rate,enable_persistant_mysql,auto_dial_next_number,VDstop_rec_after_each_call,DBX_server,DBX_database,DBX_user,DBX_pass,DBX_port,DBY_server,DBY_database,DBY_user,DBY_pass,DBY_port,outbound_cid,enable_sipsak_messages,email,template_id,conf_override,phone_context,phone_ring_timeout,conf_secret,is_webphone,use_external_server_ip,codecs_list,webphone_dialpad,phone_ring_timeout,on_hook_agent,webphone_auto_answer from phones where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; + $stmt="SELECT extension,dialplan_number,voicemail_id,phone_ip,computer_ip,server_ip,login,pass,status,active,phone_type,fullname,company,picture,messages,old_messages,protocol,local_gmt,ASTmgrUSERNAME,ASTmgrSECRET,login_user,login_pass,login_campaign,park_on_extension,conf_on_extension,VICIDIAL_park_on_extension,VICIDIAL_park_on_filename,monitor_prefix,recording_exten,voicemail_exten,voicemail_dump_exten,ext_context,dtmf_send_extension,call_out_number_group,client_browser,install_directory,local_web_callerID_URL,VICIDIAL_web_URL,AGI_call_logging_enabled,user_switching_enabled,conferencing_enabled,admin_hangup_enabled,admin_hijack_enabled,admin_monitor_enabled,call_parking_enabled,updater_check_enabled,AFLogging_enabled,QUEUE_ACTION_enabled,CallerID_popup_enabled,voicemail_button_enabled,enable_fast_refresh,fast_refresh_rate,enable_persistant_mysql,auto_dial_next_number,VDstop_rec_after_each_call,DBX_server,DBX_database,DBX_user,DBX_pass,DBX_port,DBY_server,DBY_database,DBY_user,DBY_pass,DBY_port,outbound_cid,enable_sipsak_messages,email,template_id,conf_override,phone_context,phone_ring_timeout,conf_secret,is_webphone,use_external_server_ip,codecs_list,webphone_dialpad,phone_ring_timeout,on_hook_agent,webphone_auto_answer,webphone_dialbox,webphone_mute,webphone_volume,webphone_debug from phones where login='$phone_login' and pass='$phone_pass' and active = 'Y';"; if ($DB) {echo "|$stmt|\n";} $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01025',$VD_login,$server_ip,$session_name,$one_mysql_log);} @@ -2674,6 +2675,10 @@ else $phone_ring_timeout=$row[77]; $on_hook_agent=$row[78]; $webphone_auto_answer=$row[79]; + $webphone_dialbox=$row[80]; + $webphone_mute=$row[81]; + $webphone_volume=$row[82]; + $webphone_debug=$row[83]; $login_context = $ext_context; if (strlen($meetme_enter_login_filename) > 0) @@ -2706,12 +2711,13 @@ else $local_gmt = ($local_gmt + $isdst); } - $stmt="SELECT asterisk_version from servers where server_ip='$server_ip';"; + $stmt="SELECT asterisk_version,web_socket_url from servers where server_ip='$server_ip';"; if ($DB) {echo "|$stmt|\n";} $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01028',$VD_login,$server_ip,$session_name,$one_mysql_log);} $row=mysqli_fetch_row($rslt); $asterisk_version=$row[0]; + $web_socket_url=$row[1]; if ($protocol == 'EXTERNAL') { @@ -3069,6 +3075,14 @@ else if ($webphone_dialpad == 'TOGGLE_OFF') {$webphone_options .= "--DIALPAD_OFF_TOGGLE";} if ($webphone_auto_answer == 'Y') {$webphone_options .= "--AUTOANSWER_Y";} if ($webphone_auto_answer == 'N') {$webphone_options .= "--AUTOANSWER_N";} + if ($webphone_dialbox == 'Y') {$webphone_options .= "--DIALBOX_Y";} + if ($webphone_dialbox == 'N') {$webphone_options .= "--DIALBOX_N";} + if ($webphone_mute == 'Y') {$webphone_options .= "--MUTE_Y";} + if ($webphone_mute == 'N') {$webphone_options .= "--MUTE_N";} + if ($webphone_volume == 'Y') {$webphone_options .= "--VOLUME_Y";} + if ($webphone_volume == 'N') {$webphone_options .= "--VOLUME_N";} + if ($webphone_debug == 'Y') {$webphone_options .= "--DEBUG";} + if (strlen($web_socket_url) > 5) {$webphone_options .= "--WEBSOCKETURL$web_socket_url";} ### base64 encode variables $b64_phone_login = base64_encode($extension); diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index a1aec165..3ea2c105 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -2040,6 +2040,16 @@ if (isset($_GET["question"])) {$question=$_GET["question"];} elseif (isset($_POST["question"])) {$question=$_POST["question"];} if (isset($_GET["alt_dtmf_log"])) {$alt_dtmf_log=$_GET["alt_dtmf_log"];} elseif (isset($_POST["alt_dtmf_log"])) {$alt_dtmf_log=$_POST["alt_dtmf_log"];} +if (isset($_GET["web_socket_url"])) {$web_socket_url=$_GET["web_socket_url"];} + elseif (isset($_POST["web_socket_url"])) {$web_socket_url=$_POST["web_socket_url"];} +if (isset($_GET["webphone_dialbox"])) {$webphone_dialbox=$_GET["webphone_dialbox"];} + elseif (isset($_POST["webphone_dialbox"])) {$webphone_dialbox=$_POST["webphone_dialbox"];} +if (isset($_GET["webphone_mute"])) {$webphone_mute=$_GET["webphone_mute"];} + elseif (isset($_POST["webphone_mute"])) {$webphone_mute=$_POST["webphone_mute"];} +if (isset($_GET["webphone_volume"])) {$webphone_volume=$_GET["webphone_volume"];} + elseif (isset($_POST["webphone_volume"])) {$webphone_volume=$_POST["webphone_volume"];} +if (isset($_GET["webphone_debug"])) {$webphone_debug=$_GET["webphone_debug"];} + elseif (isset($_POST["webphone_debug"])) {$webphone_debug=$_POST["webphone_debug"];} if (isset($script_id)) {$script_id= strtoupper($script_id);} @@ -2526,6 +2536,10 @@ if ($non_latin < 1) $gather_asterisk_output = preg_replace('/[^NY]/','',$gather_asterisk_output); $routing_initiated_recordings = preg_replace('/[^NY]/','',$routing_initiated_recordings); $manual_dial_hopper_check = preg_replace('/[^NY]/','',$manual_dial_hopper_check); + $webphone_dialbox = preg_replace('/[^NY]/','',$webphone_dialbox); + $webphone_mute = preg_replace('/[^NY]/','',$webphone_mute); + $webphone_volume = preg_replace('/[^NY]/','',$webphone_volume); + $webphone_debug = preg_replace('/[^NY]/','',$webphone_debug); $qc_enabled = preg_replace('/[^0-9NY]/','',$qc_enabled); $active = preg_replace('/[^0-9NY]/','',$active); @@ -3129,7 +3143,7 @@ if ($non_latin < 1) $agent_status_viewable_groups = preg_replace('/\\\\/', '',$agent_status_viewable_groups); $agent_allowed_chat_groups = preg_replace('/\\\\/', '',$agent_allowed_chat_groups); $agent_allowed_chat_groups = preg_replace('/\\\\/', '',$agent_allowed_chat_groups); - ### VARIABLES TO BE mysql_real_escape_string ### + ### VARIABLES TO BE mysqli_real_escape_string ### # $web_form_address # $queuemetrics_url # $admin_home_url @@ -3147,6 +3161,7 @@ if ($non_latin < 1) # $web_form_address_three # $container_entry # $nva_call_url + # $web_socket_url ### VARIABLES not filtered at all ### # $script_text @@ -3717,12 +3732,13 @@ else # 160122-1401 - Added report_default_format system setting, added agent count per server on reports page # 160304-2348 - Added link to API log report # 160305-2048 - Added alternate ivr(call menu) dtmf logging +# 160306-1053 - Added new webphone options, added option to have carriers on all active asterisk servers # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time -$admin_version = '2.12-540a'; -$build = '160305-2048'; +$admin_version = '2.12-541a'; +$build = '160306-1053'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -11123,6 +11139,8 @@ if ($ADD==240111111111) $rslt=mysql_to_mysqli($stmt, $link); $stmtA="UPDATE servers SET rebuild_conf_files='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y' and server_ip='$server_ip';"; + if ($server_ip == '0.0.0.0') + {$stmtA="UPDATE servers SET rebuild_conf_files='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y';";} $rslt=mysql_to_mysqli($stmtA, $link); ### LOG INSERTION Admin Log Table ### @@ -14731,7 +14749,7 @@ if ($ADD==41111111111) if ( ($voicemail_greeting == '') and (strlen($old_voicemail_greeting) > 0) ) {$voicemail_greeting = '---DELETE---';} - $stmt="UPDATE phones set extension='$extension', dialplan_number='$dialplan_number', voicemail_id='$voicemail_id', phone_ip='$phone_ip', computer_ip='$computer_ip', server_ip='$server_ip', login='$login', pass='$pass', status='$status', active='$active', phone_type='$phone_type', fullname='$fullname', company='$company', picture='$picture', protocol='$protocol', local_gmt='$local_gmt', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', login_user='$login_user', login_pass='$login_pass', login_campaign='$login_campaign', park_on_extension='$park_on_extension', conf_on_extension='$conf_on_extension', VICIDIAL_park_on_extension='$VICIDIAL_park_on_extension', VICIDIAL_park_on_filename='$VICIDIAL_park_on_filename', monitor_prefix='$monitor_prefix', recording_exten='$recording_exten', voicemail_exten='$voicemail_exten', voicemail_dump_exten='$voicemail_dump_exten', ext_context='$ext_context', dtmf_send_extension='$dtmf_send_extension', call_out_number_group='$call_out_number_group', client_browser='$client_browser', install_directory='$install_directory', local_web_callerID_URL='" . mysqli_real_escape_string($link, $local_web_callerID_URL) . "', VICIDIAL_web_URL='" . mysqli_real_escape_string($link, $VICIDIAL_web_URL) . "', AGI_call_logging_enabled='$AGI_call_logging_enabled', user_switching_enabled='$user_switching_enabled', conferencing_enabled='$conferencing_enabled', admin_hangup_enabled='$admin_hangup_enabled', admin_hijack_enabled='$admin_hijack_enabled', admin_monitor_enabled='$admin_monitor_enabled', call_parking_enabled='$call_parking_enabled', updater_check_enabled='$updater_check_enabled', AFLogging_enabled='$AFLogging_enabled', QUEUE_ACTION_enabled='$QUEUE_ACTION_enabled', CallerID_popup_enabled='$CallerID_popup_enabled', voicemail_button_enabled='$voicemail_button_enabled', enable_fast_refresh='$enable_fast_refresh', fast_refresh_rate='$fast_refresh_rate', enable_persistant_mysql='$enable_persistant_mysql', auto_dial_next_number='$auto_dial_next_number', VDstop_rec_after_each_call='$VDstop_rec_after_each_call', DBX_server='$DBX_server', DBX_database='$DBX_database', DBX_user='$DBX_user', DBX_pass='$DBX_pass', DBX_port='$DBX_port', DBY_server='$DBY_server', DBY_database='$DBY_database', DBY_user='$DBY_user', DBY_pass='$DBY_pass', DBY_port='$DBY_port', outbound_cid='$outbound_cid', enable_sipsak_messages='$enable_sipsak_messages', email='$email', template_id='$template_id', conf_override='$conf_override',phone_context='$phone_context',phone_ring_timeout='$phone_ring_timeout',conf_secret='$conf_secret', delete_vm_after_email='$delete_vm_after_email',is_webphone='$is_webphone',use_external_server_ip='$use_external_server_ip',codecs_list='$codecs_list',codecs_with_template='$codecs_with_template',webphone_dialpad='$webphone_dialpad',on_hook_agent='$on_hook_agent',webphone_auto_answer='$webphone_auto_answer',voicemail_timezone='$voicemail_timezone',voicemail_options='$voicemail_options',user_group='$user_group',voicemail_greeting='$voicemail_greeting',voicemail_dump_exten_no_inst='$voicemail_dump_exten_no_inst',voicemail_instructions='$voicemail_instructions',on_login_report='$show_vm_on_summary',unavail_dialplan_fwd_exten='$unavail_dialplan_fwd_exten',unavail_dialplan_fwd_context='$unavail_dialplan_fwd_context', nva_call_url='" . mysqli_real_escape_string($link, $nva_call_url) . "', nva_search_method='$nva_search_method', nva_error_filename='$nva_error_filename',nva_new_list_id='$nva_new_list_id',nva_new_phone_code='$nva_new_phone_code',nva_new_status='$nva_new_status' where extension='$old_extension' and server_ip='$old_server_ip';"; + $stmt="UPDATE phones set extension='$extension', dialplan_number='$dialplan_number', voicemail_id='$voicemail_id', phone_ip='$phone_ip', computer_ip='$computer_ip', server_ip='$server_ip', login='$login', pass='$pass', status='$status', active='$active', phone_type='$phone_type', fullname='$fullname', company='$company', picture='$picture', protocol='$protocol', local_gmt='$local_gmt', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', login_user='$login_user', login_pass='$login_pass', login_campaign='$login_campaign', park_on_extension='$park_on_extension', conf_on_extension='$conf_on_extension', VICIDIAL_park_on_extension='$VICIDIAL_park_on_extension', VICIDIAL_park_on_filename='$VICIDIAL_park_on_filename', monitor_prefix='$monitor_prefix', recording_exten='$recording_exten', voicemail_exten='$voicemail_exten', voicemail_dump_exten='$voicemail_dump_exten', ext_context='$ext_context', dtmf_send_extension='$dtmf_send_extension', call_out_number_group='$call_out_number_group', client_browser='$client_browser', install_directory='$install_directory', local_web_callerID_URL='" . mysqli_real_escape_string($link, $local_web_callerID_URL) . "', VICIDIAL_web_URL='" . mysqli_real_escape_string($link, $VICIDIAL_web_URL) . "', AGI_call_logging_enabled='$AGI_call_logging_enabled', user_switching_enabled='$user_switching_enabled', conferencing_enabled='$conferencing_enabled', admin_hangup_enabled='$admin_hangup_enabled', admin_hijack_enabled='$admin_hijack_enabled', admin_monitor_enabled='$admin_monitor_enabled', call_parking_enabled='$call_parking_enabled', updater_check_enabled='$updater_check_enabled', AFLogging_enabled='$AFLogging_enabled', QUEUE_ACTION_enabled='$QUEUE_ACTION_enabled', CallerID_popup_enabled='$CallerID_popup_enabled', voicemail_button_enabled='$voicemail_button_enabled', enable_fast_refresh='$enable_fast_refresh', fast_refresh_rate='$fast_refresh_rate', enable_persistant_mysql='$enable_persistant_mysql', auto_dial_next_number='$auto_dial_next_number', VDstop_rec_after_each_call='$VDstop_rec_after_each_call', DBX_server='$DBX_server', DBX_database='$DBX_database', DBX_user='$DBX_user', DBX_pass='$DBX_pass', DBX_port='$DBX_port', DBY_server='$DBY_server', DBY_database='$DBY_database', DBY_user='$DBY_user', DBY_pass='$DBY_pass', DBY_port='$DBY_port', outbound_cid='$outbound_cid', enable_sipsak_messages='$enable_sipsak_messages', email='$email', template_id='$template_id', conf_override='$conf_override',phone_context='$phone_context',phone_ring_timeout='$phone_ring_timeout',conf_secret='$conf_secret', delete_vm_after_email='$delete_vm_after_email',is_webphone='$is_webphone',use_external_server_ip='$use_external_server_ip',codecs_list='$codecs_list',codecs_with_template='$codecs_with_template',webphone_dialpad='$webphone_dialpad',on_hook_agent='$on_hook_agent',webphone_auto_answer='$webphone_auto_answer',voicemail_timezone='$voicemail_timezone',voicemail_options='$voicemail_options',user_group='$user_group',voicemail_greeting='$voicemail_greeting',voicemail_dump_exten_no_inst='$voicemail_dump_exten_no_inst',voicemail_instructions='$voicemail_instructions',on_login_report='$show_vm_on_summary',unavail_dialplan_fwd_exten='$unavail_dialplan_fwd_exten',unavail_dialplan_fwd_context='$unavail_dialplan_fwd_context', nva_call_url='" . mysqli_real_escape_string($link, $nva_call_url) . "', nva_search_method='$nva_search_method', nva_error_filename='$nva_error_filename',nva_new_list_id='$nva_new_list_id',nva_new_phone_code='$nva_new_phone_code',nva_new_status='$nva_new_status',webphone_dialbox='$webphone_dialbox',webphone_mute='$webphone_mute',webphone_volume='$webphone_volume',webphone_debug='$webphone_debug' where extension='$old_extension' and server_ip='$old_server_ip';"; $rslt=mysql_to_mysqli($stmt, $link); $stmtA="UPDATE servers SET rebuild_conf_files='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y' and server_ip='$server_ip';"; @@ -14868,7 +14886,7 @@ if ($ADD==411111111111) $custom_dialplanSQL=''; if ($LOGmodify_custom_dialplans > 0) {$custom_dialplanSQL = ",custom_dialplan_entry='$custom_dialplan_entry'";} - $stmt="UPDATE servers set server_id='$server_id',server_description='$server_description',server_ip='$server_ip',active='$active',asterisk_version='$asterisk_version', max_vicidial_trunks='$max_vicidial_trunks', telnet_host='$telnet_host', telnet_port='$telnet_port', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', ASTmgrUSERNAMEupdate='$ASTmgrUSERNAMEupdate', ASTmgrUSERNAMElisten='$ASTmgrUSERNAMElisten', ASTmgrUSERNAMEsend='$ASTmgrUSERNAMEsend', local_gmt='$local_gmt', voicemail_dump_exten='$voicemail_dump_exten', answer_transfer_agent='$answer_transfer_agent', ext_context='$ext_context', sys_perf_log='$sys_perf_log', vd_server_logs='$vd_server_logs', agi_output='$agi_output', vicidial_balance_active='$vicidial_balance_active',balance_trunks_offlimits='$balance_trunks_offlimits',recording_web_link='$recording_web_link',alt_server_ip='$alt_server_ip',active_asterisk_server='$active_asterisk_server',generate_vicidial_conf='$generate_vicidial_conf',rebuild_conf_files='$rebuild_conf_files',outbound_calls_per_second='$outbound_calls_per_second',sounds_update='$sounds_update',vicidial_recording_limit='$vicidial_recording_limit',carrier_logging_active='$carrier_logging_active',vicidial_balance_rank='$vicidial_balance_rank',rebuild_music_on_hold='$rebuild_music_on_hold',active_agent_login_server='$active_agent_login_server',conf_secret='$conf_secret',external_server_ip='$external_server_ip',active_twin_server_ip='$active_twin_server_ip',user_group='$user_group',auto_restart_asterisk='$auto_restart_asterisk',asterisk_temp_no_restart='$asterisk_temp_no_restart',voicemail_dump_exten_no_inst='$voicemail_dump_exten_no_inst',gather_asterisk_output='$gather_asterisk_output'$custom_dialplanSQL where server_id='$old_server_id';"; + $stmt="UPDATE servers set server_id='$server_id',server_description='$server_description',server_ip='$server_ip',active='$active',asterisk_version='$asterisk_version', max_vicidial_trunks='$max_vicidial_trunks', telnet_host='$telnet_host', telnet_port='$telnet_port', ASTmgrUSERNAME='$ASTmgrUSERNAME', ASTmgrSECRET='$ASTmgrSECRET', ASTmgrUSERNAMEupdate='$ASTmgrUSERNAMEupdate', ASTmgrUSERNAMElisten='$ASTmgrUSERNAMElisten', ASTmgrUSERNAMEsend='$ASTmgrUSERNAMEsend', local_gmt='$local_gmt', voicemail_dump_exten='$voicemail_dump_exten', answer_transfer_agent='$answer_transfer_agent', ext_context='$ext_context', sys_perf_log='$sys_perf_log', vd_server_logs='$vd_server_logs', agi_output='$agi_output', vicidial_balance_active='$vicidial_balance_active',balance_trunks_offlimits='$balance_trunks_offlimits',recording_web_link='$recording_web_link',alt_server_ip='$alt_server_ip',active_asterisk_server='$active_asterisk_server',generate_vicidial_conf='$generate_vicidial_conf',rebuild_conf_files='$rebuild_conf_files',outbound_calls_per_second='$outbound_calls_per_second',sounds_update='$sounds_update',vicidial_recording_limit='$vicidial_recording_limit',carrier_logging_active='$carrier_logging_active',vicidial_balance_rank='$vicidial_balance_rank',rebuild_music_on_hold='$rebuild_music_on_hold',active_agent_login_server='$active_agent_login_server',conf_secret='$conf_secret',external_server_ip='$external_server_ip',active_twin_server_ip='$active_twin_server_ip',user_group='$user_group',auto_restart_asterisk='$auto_restart_asterisk',asterisk_temp_no_restart='$asterisk_temp_no_restart',voicemail_dump_exten_no_inst='$voicemail_dump_exten_no_inst',gather_asterisk_output='$gather_asterisk_output',web_socket_url='" . mysqli_real_escape_string($link, $web_socket_url) . "'$custom_dialplanSQL where server_id='$old_server_id';"; $rslt=mysql_to_mysqli($stmt, $link); $stmtA="UPDATE servers SET rebuild_conf_files='Y',rebuild_music_on_hold='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y';"; @@ -15010,6 +15028,8 @@ if ($ADD==441111111111) $rslt=mysql_to_mysqli($stmt, $link); $stmtA="UPDATE servers SET rebuild_conf_files='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y' and server_ip='$server_ip';"; + if ($server_ip == '0.0.0.0') + {$stmtA="UPDATE servers SET rebuild_conf_files='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y';";} $rslt=mysql_to_mysqli($stmtA, $link); echo "
"._QXZ("CARRIER MODIFIED").": $carrier_id\n"; @@ -18376,6 +18396,8 @@ if ($ADD==641111111111) $rslt=mysql_to_mysqli($stmt, $link); $stmtA="UPDATE servers SET rebuild_conf_files='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y' and server_ip='$CARRIERserver_ip';"; + if ($CARRIERserver_ip == '0.0.0.0') + {$stmtA="UPDATE servers SET rebuild_conf_files='Y' where generate_vicidial_conf='Y' and active_asterisk_server='Y';";} $rslt=mysql_to_mysqli($stmtA, $link); ### LOG INSERTION Admin Log Table ### @@ -30130,7 +30152,7 @@ if ($ADD==31111111111) echo "\n"; echo "\n"; echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -30461,7 +30487,7 @@ if ($ADD==311111111111) echo "
\n"; echo ""; - $stmt="SELECT extension,dialplan_number,voicemail_id,phone_ip,computer_ip,server_ip,login,pass,status,active,phone_type,fullname,company,picture,messages,old_messages,protocol,local_gmt,ASTmgrUSERNAME,ASTmgrSECRET,login_user,login_pass,login_campaign,park_on_extension,conf_on_extension,VICIDIAL_park_on_extension,VICIDIAL_park_on_filename,monitor_prefix,recording_exten,voicemail_exten,voicemail_dump_exten,ext_context,dtmf_send_extension,call_out_number_group,client_browser,install_directory,local_web_callerID_URL,VICIDIAL_web_URL,AGI_call_logging_enabled,user_switching_enabled,conferencing_enabled,admin_hangup_enabled,admin_hijack_enabled,admin_monitor_enabled,call_parking_enabled,updater_check_enabled,AFLogging_enabled,QUEUE_ACTION_enabled,CallerID_popup_enabled,voicemail_button_enabled,enable_fast_refresh,fast_refresh_rate,enable_persistant_mysql,auto_dial_next_number,VDstop_rec_after_each_call,DBX_server,DBX_database,DBX_user,DBX_pass,DBX_port,DBY_server,DBY_database,DBY_user,DBY_pass,DBY_port,outbound_cid,enable_sipsak_messages,email,template_id,conf_override,phone_context,phone_ring_timeout,conf_secret,delete_vm_after_email,is_webphone,use_external_server_ip,codecs_list,codecs_with_template,webphone_dialpad,on_hook_agent,webphone_auto_answer,voicemail_timezone,voicemail_options,user_group,voicemail_greeting,voicemail_dump_exten_no_inst,voicemail_instructions,on_login_report,unavail_dialplan_fwd_exten,unavail_dialplan_fwd_context,nva_call_url,nva_search_method,nva_error_filename,nva_new_list_id,nva_new_phone_code,nva_new_status from phones where extension='$extension' and server_ip='$server_ip' $LOGadmin_viewable_groupsSQL;"; + $stmt="SELECT extension,dialplan_number,voicemail_id,phone_ip,computer_ip,server_ip,login,pass,status,active,phone_type,fullname,company,picture,messages,old_messages,protocol,local_gmt,ASTmgrUSERNAME,ASTmgrSECRET,login_user,login_pass,login_campaign,park_on_extension,conf_on_extension,VICIDIAL_park_on_extension,VICIDIAL_park_on_filename,monitor_prefix,recording_exten,voicemail_exten,voicemail_dump_exten,ext_context,dtmf_send_extension,call_out_number_group,client_browser,install_directory,local_web_callerID_URL,VICIDIAL_web_URL,AGI_call_logging_enabled,user_switching_enabled,conferencing_enabled,admin_hangup_enabled,admin_hijack_enabled,admin_monitor_enabled,call_parking_enabled,updater_check_enabled,AFLogging_enabled,QUEUE_ACTION_enabled,CallerID_popup_enabled,voicemail_button_enabled,enable_fast_refresh,fast_refresh_rate,enable_persistant_mysql,auto_dial_next_number,VDstop_rec_after_each_call,DBX_server,DBX_database,DBX_user,DBX_pass,DBX_port,DBY_server,DBY_database,DBY_user,DBY_pass,DBY_port,outbound_cid,enable_sipsak_messages,email,template_id,conf_override,phone_context,phone_ring_timeout,conf_secret,delete_vm_after_email,is_webphone,use_external_server_ip,codecs_list,codecs_with_template,webphone_dialpad,on_hook_agent,webphone_auto_answer,voicemail_timezone,voicemail_options,user_group,voicemail_greeting,voicemail_dump_exten_no_inst,voicemail_instructions,on_login_report,unavail_dialplan_fwd_exten,unavail_dialplan_fwd_context,nva_call_url,nva_search_method,nva_error_filename,nva_new_list_id,nva_new_phone_code,nva_new_status,webphone_dialbox,webphone_mute,webphone_volume,webphone_debug from phones where extension='$extension' and server_ip='$server_ip' $LOGadmin_viewable_groupsSQL;"; $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); @@ -30163,6 +30185,10 @@ if ($ADD==31111111111) echo "
"._QXZ("Set As Webphone").": $NWB#phones-is_webphone$NWE
"._QXZ("Webphone Dialpad").": $NWB#phones-webphone_dialpad$NWE
"._QXZ("Webphone Auto-Answer").": $NWB#phones-webphone_auto_answer$NWE
"._QXZ("Webphone Dialbox").": $NWB#phones-webphone_dialbox$NWE
"._QXZ("Webphone Mute").": $NWB#phones-webphone_mute$NWE
"._QXZ("Webphone Volume").": $NWB#phones-webphone_volume$NWE
"._QXZ("Webphone Debug").": $NWB#phones-webphone_debug$NWE
"._QXZ("Use External Server IP").": $NWB#phones-use_external_server_ip$NWE
"._QXZ("Status").": $NWB#phones-status$NWE
"._QXZ("Active Account").": $NWB#phones-active$NWE
\n"; echo "\n"; echo "\n"; - echo "\n"; echo "\n"; echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; @@ -30644,7 +30671,7 @@ if ($ADD==311111111111) $active_carriers = 0; $inactive_carriers = 0; - $stmt="SELECT carrier_id,carrier_name,registration_string,active from vicidial_server_carriers where server_ip='$row[2]' $LOGadmin_viewable_groupsSQL;"; + $stmt="SELECT carrier_id,carrier_name,registration_string,active from vicidial_server_carriers where server_ip IN('$row[2]','0.0.0.0') $LOGadmin_viewable_groupsSQL;"; $rsltx=mysql_to_mysqli($stmt, $link); $carriers_to_print = mysqli_num_rows($rsltx); $camp_lists=''; @@ -30975,8 +31002,9 @@ if ($ADD==341111111111) echo "\n"; + echo "(0.0.0.0 "._QXZ("is all servers").")$NWB#server_carriers-server_ip$NWE\n"; echo "\n"; echo "\n"; echo "
\n"; echo ""; - $stmt="SELECT server_id,server_description,server_ip,active,asterisk_version,max_vicidial_trunks,telnet_host,telnet_port,ASTmgrUSERNAME,ASTmgrSECRET,ASTmgrUSERNAMEupdate,ASTmgrUSERNAMElisten,ASTmgrUSERNAMEsend,local_gmt,voicemail_dump_exten,answer_transfer_agent,ext_context,sys_perf_log,vd_server_logs,agi_output,vicidial_balance_active,balance_trunks_offlimits,recording_web_link,alt_server_ip,active_asterisk_server,generate_vicidial_conf,rebuild_conf_files,outbound_calls_per_second,sysload,channels_total,cpu_idle_percent,disk_usage,sounds_update,vicidial_recording_limit,carrier_logging_active,vicidial_balance_rank,rebuild_music_on_hold,active_agent_login_server,conf_secret,external_server_ip,custom_dialplan_entry,active_twin_server_ip,user_group,system_uptime,auto_restart_asterisk,asterisk_temp_no_restart,voicemail_dump_exten_no_inst,gather_asterisk_output from servers where ( (server_id='$server_id') or (server_ip='$server_ip') ) $LOGadmin_viewable_groupsSQL;"; + $stmt="SELECT server_id,server_description,server_ip,active,asterisk_version,max_vicidial_trunks,telnet_host,telnet_port,ASTmgrUSERNAME,ASTmgrSECRET,ASTmgrUSERNAMEupdate,ASTmgrUSERNAMElisten,ASTmgrUSERNAMEsend,local_gmt,voicemail_dump_exten,answer_transfer_agent,ext_context,sys_perf_log,vd_server_logs,agi_output,vicidial_balance_active,balance_trunks_offlimits,recording_web_link,alt_server_ip,active_asterisk_server,generate_vicidial_conf,rebuild_conf_files,outbound_calls_per_second,sysload,channels_total,cpu_idle_percent,disk_usage,sounds_update,vicidial_recording_limit,carrier_logging_active,vicidial_balance_rank,rebuild_music_on_hold,active_agent_login_server,conf_secret,external_server_ip,custom_dialplan_entry,active_twin_server_ip,user_group,system_uptime,auto_restart_asterisk,asterisk_temp_no_restart,voicemail_dump_exten_no_inst,gather_asterisk_output,web_socket_url from servers where ( (server_id='$server_id') or (server_ip='$server_ip') ) $LOGadmin_viewable_groupsSQL;"; $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); $server_id = $row[0]; @@ -30512,6 +30538,7 @@ if ($ADD==311111111111) $asterisk_temp_no_restart = $row[45]; $voicemail_dump_exten_no_inst = $row[46]; $gather_asterisk_output = $row[47]; + $web_socket_url = $row[48]; $cpu = (100 - $cpu_idle_percent); @@ -30562,10 +30589,10 @@ if ($ADD==311111111111) echo "
"._QXZ("AGI Output").": $NWB#servers-agi_output$NWE
"._QXZ("Carrier Logging Active").": $NWB#servers-carrier_logging_active$NWE
"._QXZ("Gather Asterisk Output").": $NWB#servers-gather_asterisk_output$NWE
"._QXZ("Recording Web Link").": $NWB#servers-recording_web_link$NWE
"._QXZ("Alternate Recording Server IP").": $NWB#servers-alt_server_ip$NWE
"._QXZ("External Server IP").": $NWB#servers-external_server_ip$NWE
"._QXZ("Web Socket URL").": $NWB#servers-web_socket_url$NWE
"._QXZ("Active Twin Server IP").": $NWB#servers-active_twin_server_ip$NWE
"._QXZ("Active Asterisk Server").": $NWB#servers-active_asterisk_server$NWE
"._QXZ("Auto-Restart Asterisk").":     $NWB#servers-auto_restart_asterisk$NWE
"._QXZ("Server IP").": $NWB#server_carriers-server_ip$NWE
"._QXZ("Active").": $NWB#server_carriers-active$NWE
\n"; @@ -34567,6 +34595,7 @@ if ($ADD==140000000000) while (strlen($row[4])>14) {$row[4] = preg_replace("/.$/",'',$row[4]);} $row[4] .= '...'; } + if ($row[2] == '0.0.0.0') {$row[2]='ALL SERVERS';} if (preg_match('/1$|3$|5$|7$|9$/i', $o)) {$bgcolor='bgcolor="#B9CBFD"';} else diff --git a/agc_2-X/trunk/www/vicidial/help.php b/agc_2-X/trunk/www/vicidial/help.php index 4c0c96e2..689dd057 100644 --- a/agc_2-X/trunk/www/vicidial/help.php +++ b/agc_2-X/trunk/www/vicidial/help.php @@ -82,6 +82,7 @@ # 160121-2155 - Added settings-report_default_format entry and help text for several reports # 160211-2255 - Added help text for remaining reports # 160305-2115 - Added Alt IVR(call menu) DTMF logging +# 160306-1201 - Added new webphone options and server options # @@ -3914,6 +3915,26 @@ if ($SSoutbound_autodial_active > 0)
- +
+ +
+ - + +
+ +
+ - + +
+ +
+ - + +
+ +
+ - +

@@ -4516,9 +4537,14 @@ if ($SSoutbound_autodial_active > 0) -
- +
- - + - + +
+ +
+ -
@@ -4666,7 +4692,7 @@ if ($SSoutbound_autodial_active > 0)

- - + -