diff --git a/agc_2-X/branches/agc_2.0.4/bin/ADMIN_keepalive_ALL.pl b/agc_2-X/branches/agc_2.0.4/bin/ADMIN_keepalive_ALL.pl index 6107dda8..bb01bae0 100644 --- a/agc_2-X/branches/agc_2.0.4/bin/ADMIN_keepalive_ALL.pl +++ b/agc_2-X/branches/agc_2.0.4/bin/ADMIN_keepalive_ALL.pl @@ -1,16 +1,17 @@ #!/usr/bin/perl # -# ADMIN_keepalive_ALL.pl version 0.2 +# ADMIN_keepalive_ALL.pl version 2.0.4.1 # # Designed to keep the astGUIclient processes alive and check every minute # Replaces all other ADMIN_keepalive scripts # Uses /etc/astguiclient.conf file to know which processes to keepalive # -# Copyright (C) 2006 Matt Florell LICENSE: GPLv2 +# Copyright (C) 2008 Matt Florell LICENSE: GPLv2 # # # 61011-1348 - first build # 61120-2011 - added option 7 for AST_VDauto_dial_FILL.pl +# 80330-0811 - added option 8 for ip_relay # $DB=0; # Debug flag @@ -83,6 +84,7 @@ foreach(@conf) # 5 - AST_VDadapt (If multi-server system, this must only be on one server)\n"; # 6 - FastAGI_log\n"; # 7 - AST_VDauto_dial_FILL\n"; +# 8 - ip_relay for blind monitoring\n"; if ($VARactive_keepalives =~ /X/) { @@ -97,6 +99,7 @@ $AST_VDremote_agents=0; $AST_VDadapt=0; $FastAGI_log=0; $AST_VDauto_dial_FILL=0; +$ip_relay=0; $runningAST_update=0; $runningAST_send=0; $runningAST_listen=0; @@ -105,6 +108,7 @@ $runningAST_VDremote_agents=0; $runningAST_VDadapt=0; $runningFastAGI_log=0; $runningAST_VDauto_dial_FILL=0; +$runningip_relay=0; if ($VARactive_keepalives =~ /1/) { @@ -141,6 +145,11 @@ if ($VARactive_keepalives =~ /7/) $AST_VDauto_dial_FILL=1; if ($DB) {print "AST_VDauto_dial_FILL set to keepalive\n";} } +if ($VARactive_keepalives =~ /8/) + { + $ip_relay=1; + if ($DB) {print "ip_relay set to keepalive\n";} + } $REGhome = $PATHhome; $REGhome =~ s/\//\\\//gi; @@ -208,6 +217,11 @@ if ($DBX) {print "$i|$psoutput[$i]| \n";} $runningAST_VDauto_dial_FILL++; if ($DB) {print "AST_VDauto_dial_FILL RUNNING: |$psline[1]|\n";} } + if ($psoutput[$i] =~ / ip_relay /) + { + $runningip_relay++; + if ($DB) {print "ip_relay RUNNING: |$psoutput[$i]|\n";} + } $i++; } @@ -276,7 +290,8 @@ if ( ( ($AST_VDremote_agents > 0) && ($runningAST_VDremote_agents < 1) ) || ( ($AST_VDadapt > 0) && ($runningAST_VDadapt < 1) ) || ( ($FastAGI_log > 0) && ($runningFastAGI_log < 1) ) || - ( ($AST_VDauto_dial_FILL > 0) && ($runningAST_VDauto_dial_FILL < 1) ) + ( ($AST_VDauto_dial_FILL > 0) && ($runningAST_VDauto_dial_FILL < 1) ) || + ( ($ip_relay > 0) && ($runningip_relay < 1) ) ) { @@ -338,6 +353,11 @@ foreach (@psoutput2) $runningAST_VDauto_dial_FILL++; if ($DB) {print "AST_VDauto_dial_FILL RUNNING: |$psline[1]|\n";} } + if ($psoutput2[$i] =~ / ip_relay /) + { + $runningip_relay++; + if ($DB) {print "ip_relay RUNNING: |$psoutput2[$i]|\n";} + } $i++; } @@ -390,6 +410,11 @@ if ( ($AST_VDauto_dial_FILL > 0) && ($runningAST_VDauto_dial_FILL < 1) ) # add a '-L' to the command below to activate logging `/usr/bin/screen -d -m -S ASTVDautoFILL $PATHhome/AST_VDauto_dial_FILL.pl`; } +if ( ($ip_relay > 0) && ($runningip_relay < 1) ) + { + if ($DB) {print "starting ip_relay through relay_control...\n";} + `$PATHhome/ip_relay/relay_control start 2>/dev/null 1>&2`; + } } diff --git a/agc_2-X/branches/agc_2.0.4/docs/SCRATCH_INSTALL.txt b/agc_2-X/branches/agc_2.0.4/docs/SCRATCH_INSTALL.txt index 8a490e59..702802e1 100644 --- a/agc_2-X/branches/agc_2.0.4/docs/SCRATCH_INSTALL.txt +++ b/agc_2-X/branches/agc_2.0.4/docs/SCRATCH_INSTALL.txt @@ -712,6 +712,8 @@ installation on another machine) - /usr/local/apache2/bin/apachectl start - go to http://your-new-asterisk-server-ipaddress/ to see if it worked - you are done + NOTE: If using PHP5 you may need to add the following line to php.ini: + short_open_tag = On OPTIONAL- Load eaccelerator PHP-caching application: - Go to http://eaccelerator.net and download the most recent package diff --git a/agc_2-X/branches/agc_2.0.4/www/agc/vicidial.php b/agc_2-X/branches/agc_2.0.4/www/agc/vicidial.php index dbec6692..e9ae42c9 100644 --- a/agc_2-X/branches/agc_2.0.4/www/agc/vicidial.php +++ b/agc_2-X/branches/agc_2.0.4/www/agc/vicidial.php @@ -172,10 +172,11 @@ # 71127-0408 - Added height and width settings for easier modification of screen size # 71129-2025 - restricted callbacks count and list to campaign only # 71226-1117 - added option to kick all calls from conference upon logout +# 80330-0823 - Added new AST_blind monitoring ability and minor cleanup for release # -$version = '2.0.4-143'; -$build = '71226-1117'; +$version = '2.0.4-144'; +$build = '80330-0823'; require("dbconnect.php"); @@ -2361,7 +2362,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { var chan_name_color = 'log_text'; } - if ( (HidEMonitoRSessionS==1) && (channelfieldA.match(/68600/)) ) + if ( (HidEMonitoRSessionS==1) && (channelfieldA.match(/ASTblind/)) ) { var hide_channel=1; } @@ -6758,7 +6759,7 @@ RECORD ID:
Customer Information: Title: -  First:   MI:   Last: +  First:   MI:   Last: Address1: diff --git a/agc_2-X/branches/agc_2.0.4/www/vicidial/admin.php b/agc_2-X/branches/agc_2.0.4/www/vicidial/admin.php index 15c08dbf..770c97d7 100644 --- a/agc_2-X/branches/agc_2.0.4/www/vicidial/admin.php +++ b/agc_2-X/branches/agc_2.0.4/www/vicidial/admin.php @@ -1141,12 +1141,13 @@ $list_mix_container = ereg_replace(";","",$list_mix_container); # 71116-0942 - Added campaign_rank and fewest_calls as methods for agent call routing # 71122-1135 - Added default transfer group for campaigns and inbound groups # 71125-1751 - Added allowable transfer groups to campaign detail screen +# 80330-0814 - Added CBHOLD block on selecting, added user stats/status links # # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.0.4-119'; -$build = '71125-1751'; +$admin_version = '2.0.4-120'; +$build = '80330-0814'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -3861,7 +3862,7 @@ $admin_home_url_LU = $row[0]; 1) { ?> ->>   > Show Users     |     > Add A New User     |     > Copy User     |     > Search For A User +>>   > Show Users     |     > Add A New User     |     > Copy User     |     > Search For A User     |     > User Stats     |     > User Status 1) { @@ -8839,6 +8840,7 @@ if ($ADD==31) $dial_status_d = $row[6]; $dial_status_e = $row[7]; $lead_order = $row[8]; + $web_form_address = $row[11]; $allow_closers = $row[12]; $hopper_level = $row[13]; $auto_dial_level = $row[14]; @@ -9039,7 +9041,7 @@ if ($ADD==31) echo "Campaign Login Date: $campaign_logindate   $NWB#vicidial_campaigns-campaign_logindate$NWE\n"; echo "Active: $NWB#vicidial_campaigns-active$NWE\n"; echo "Park Extension: - Filename: $NWB#vicidial_campaigns-park_ext$NWE\n"; - echo "Web Form: $NWB#vicidial_campaigns-web_form_address$NWE\n"; + echo "Web Form: $NWB#vicidial_campaigns-web_form_address$NWE\n"; echo "Allow Closers: $NWB#vicidial_campaigns-allow_closers$NWE\n"; echo "Allow Inbound and Blended: $NWB#vicidial_campaigns-campaign_allow_inbound$NWE\n"; @@ -9311,7 +9313,7 @@ if ($ADD==31) } - + ##### CAMPAIGN CUSTOM STATUSES ##### if ($SUB==22) { @@ -9391,7 +9393,7 @@ if ($ADD==31) echo "
\n"; } - + ##### CAMPAIGN HOTKEYS ##### if ($SUB==23) { echo "
CUSTOM HOT KEYS WITHIN THIS CAMPAIGN:   $NWB#vicidial_campaign_hotkeys$NWE
\n"; @@ -9441,7 +9443,7 @@ if ($ADD==31) echo "
\n"; } - + ##### CAMPAIGN LEAD RECYCLING ##### if ($SUB==25) { echo "

LEAD RECYCLING WITHIN THIS CAMPAIGN:   $NWB#vicidial_lead_recycle$NWE
\n"; @@ -9488,7 +9490,7 @@ if ($ADD==31) echo "
\n"; } - + ##### CAMPAIGN AUTO-ALT-NUMBER DIALING ##### if ($SUB==26) { echo "

AUTO ALT NUMBER DIALING FOR THIS CAMPAIGN:   $NWB#vicidial_auto_alt_dial_statuses$NWE
\n"; @@ -9525,7 +9527,7 @@ if ($ADD==31) echo "
\n"; } - + ##### CAMPAIGN PAUSE CODES ##### if ($SUB==27) { echo "

AGENT PAUSE CODES FOR THIS CAMPAIGN:   $NWB#vicidial_pause_codes$NWE
\n"; @@ -9954,6 +9956,7 @@ if ( ($ADD==34) or ($ADD==31) ) { if ($LOGmodify_campaigns==1) { + ##### CAMPAIGN LIST MIX SETTINGS ##### if ($SUB==29) { ##### get list_id listings for dynamic pulldown