From 14de02ce06c4effc1bd167e7729d144847cd34c3 Mon Sep 17 00:00:00 2001 From: mattf Date: Tue, 27 Dec 2016 03:27:36 +0000 Subject: [PATCH] Added conf_qualify servers option git-svn-id: svn://192.168.202.10@2655 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl | 20 ++++++++++++------- .../trunk/extras/MySQL_AST_CREATE_tables.sql | 5 +++-- agc_2-X/trunk/extras/upgrade_2.14.sql | 4 ++++ agc_2-X/trunk/www/vicidial/admin.php | 14 +++++++++---- agc_2-X/trunk/www/vicidial/help.php | 6 ++++++ 5 files changed, 36 insertions(+), 13 deletions(-) diff --git a/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl b/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl index bcf912db..79fbf729 100644 --- a/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl +++ b/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# ADMIN_keepalive_ALL.pl version 2.12 +# ADMIN_keepalive_ALL.pl version 2.14 # # Designed to keep the astGUIclient processes alive and check every minute # Replaces all other ADMIN_keepalive scripts @@ -112,9 +112,10 @@ # 160324-1655 - Added callback_useronly_move_minutes option # 161014-0839 - Added vicidial_user_list_new_lead daily reset # 161116-0658 - Added purge of vicidial_ajax_log records older than 7 days to end of day process +# 161226-2218 - Added conf_qualify option # -$build = '161116-0658'; +$build = '161226-2218'; $DB=0; # Debug flag $teodDB=0; # flag to log Timeclock End of Day processes to log file @@ -860,7 +861,7 @@ if ($sthArows > 0) $sthA->finish(); ##### Get the settings for this server's server_ip ##### -$stmtA = "SELECT active_asterisk_server,generate_vicidial_conf,rebuild_conf_files,asterisk_version,sounds_update,conf_secret,custom_dialplan_entry,auto_restart_asterisk,asterisk_temp_no_restart,gather_asterisk_output FROM servers where server_ip='$server_ip';"; +$stmtA = "SELECT active_asterisk_server,generate_vicidial_conf,rebuild_conf_files,asterisk_version,sounds_update,conf_secret,custom_dialplan_entry,auto_restart_asterisk,asterisk_temp_no_restart,gather_asterisk_output,conf_qualify FROM servers where server_ip='$server_ip';"; # print "$stmtA\n"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; @@ -878,6 +879,7 @@ if ($sthArows > 0) $auto_restart_asterisk = $aryA[7]; $asterisk_temp_no_restart = $aryA[8]; $gather_asterisk_output = $aryA[9]; + $conf_qualify = $aryA[10]; } $sthA->finish(); @@ -1955,7 +1957,8 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $Liax .= "permit=0.0.0.0/0.0.0.0\n"; $Liax .= "disallow=all\n"; $Liax .= "allow=ulaw\n"; - $Liax .= "qualify=yes\n"; + if ($conf_qualify =~ /Y/) + {$Liax .= "qualify=yes\n";} $Liax .= "\n"; $Liax .= "[ASTblind]\n"; @@ -1969,7 +1972,8 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $Liax .= "permit=0.0.0.0/0.0.0.0\n"; $Liax .= "disallow=all\n"; $Liax .= "allow=ulaw\n"; - $Liax .= "qualify=yes\n"; + if ($conf_qualify =~ /Y/) + {$Liax .= "qualify=yes\n";} $Liax .= "\n"; $Liax .= "[ASTplay]\n"; @@ -1983,7 +1987,8 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $Liax .= "permit=0.0.0.0/0.0.0.0\n"; $Liax .= "disallow=all\n"; $Liax .= "allow=ulaw\n"; - $Liax .= "qualify=yes\n"; + if ($conf_qualify =~ /Y/) + {$Liax .= "qualify=yes\n";} ##### Get the server_id for this server's server_ip ##### @@ -2052,7 +2057,8 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $Liax .= "permit=0.0.0.0/0.0.0.0\n"; $Liax .= "disallow=all\n"; $Liax .= "allow=ulaw\n"; - $Liax .= "qualify=yes\n"; + if ($conf_qualify =~ /Y/) + {$Liax .= "qualify=yes\n";} $i++; } 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 dd142c87..c9deb171 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -158,7 +158,8 @@ 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', -web_socket_url VARCHAR(255) default '' +web_socket_url VARCHAR(255) default '', +conf_qualify ENUM('Y','N') default 'Y' ) ENGINE=MyISAM; CREATE UNIQUE INDEX server_id on servers (server_id); @@ -3845,4 +3846,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='1483',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1484',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/agc_2-X/trunk/extras/upgrade_2.14.sql b/agc_2-X/trunk/extras/upgrade_2.14.sql index 8a473be2..d4694841 100644 --- a/agc_2-X/trunk/extras/upgrade_2.14.sql +++ b/agc_2-X/trunk/extras/upgrade_2.14.sql @@ -26,3 +26,7 @@ UPDATE system_settings SET db_schema_version='1482',db_schema_update_date=NOW() ALTER TABLE system_settings ADD agent_chat_screen_colors VARCHAR(20) default 'default'; UPDATE system_settings SET db_schema_version='1483',db_schema_update_date=NOW() where db_schema_version < 1483; + +ALTER TABLE servers ADD conf_qualify ENUM('Y','N') default 'Y'; + +UPDATE system_settings SET db_schema_version='1484',db_schema_update_date=NOW() where db_schema_version < 1484; diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 65983269..8b8687a2 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -2129,6 +2129,8 @@ if (isset($_GET["agent_script"])) {$agent_script=$_GET["agent_script"];} elseif (isset($_POST["agent_script"])) {$agent_script=$_POST["agent_script"];} if (isset($_GET["agent_chat_screen_colors"])) {$agent_chat_screen_colors=$_GET["agent_chat_screen_colors"];} elseif (isset($_POST["agent_chat_screen_colors"])) {$agent_chat_screen_colors=$_POST["agent_chat_screen_colors"];} +if (isset($_GET["conf_qualify"])) {$conf_qualify=$_GET["conf_qualify"];} + elseif (isset($_POST["conf_qualify"])) {$conf_qualify=$_POST["conf_qualify"];} if (isset($script_id)) {$script_id= strtoupper($script_id);} @@ -2642,6 +2644,7 @@ if ($non_latin < 1) $answering_machine = preg_replace('/[^NY]/','',$answering_machine); $manual_auto_show = preg_replace('/[^NY]/','',$manual_auto_show); $allow_required_fields = preg_replace('/[^NY]/','',$allow_required_fields); + $conf_qualify = preg_replace('/[^NY]/','',$conf_qualify); $qc_enabled = preg_replace('/[^0-9NY]/','',$qc_enabled); $active = preg_replace('/[^0-9NY]/','',$active); @@ -3904,12 +3907,13 @@ else # 161205-1650 - Added AGI container_type to settings containers # 161207-1953 - Added Agent DID Report # 161222-0841 - Added agent_chat_screen_colors +# 161226-2224 - Added conf_qualify servers option # # 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.14-582a'; -$build = '161222-0841'; +$admin_version = '2.14-583a'; +$build = '161226-2224'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -15192,7 +15196,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',web_socket_url='" . mysqli_real_escape_string($link, $web_socket_url) . "'$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',conf_qualify='$conf_qualify',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';"; @@ -31049,7 +31053,7 @@ if ($ADD==311111111111) echo "\n"; echo "\n"; echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/agc_2-X/trunk/www/vicidial/help.php b/agc_2-X/trunk/www/vicidial/help.php index e9e0873b..0675e42a 100644 --- a/agc_2-X/trunk/www/vicidial/help.php +++ b/agc_2-X/trunk/www/vicidial/help.php @@ -104,6 +104,7 @@ # 161126-1815 - Fixed several spelling errors # 161207-1958 - Added Agent DID Stats report entry # 161222-0843 - Added agent_chat_screen_colors entry +# 161226-2214 - Added conf_qualify entry # @@ -4677,6 +4678,11 @@ if ($SSoutbound_autodial_active > 0)
- +
+ +
+ - +

\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,web_socket_url 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,conf_qualify 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]; @@ -31101,6 +31105,7 @@ if ($ADD==311111111111) $voicemail_dump_exten_no_inst = $row[46]; $gather_asterisk_output = $row[47]; $web_socket_url = $row[48]; + $conf_qualify = $row[49]; $cpu = (100 - $cpu_idle_percent); @@ -31151,6 +31156,7 @@ 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("Conf Qualify").": $NWB#servers-conf_qualify$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