diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE index 320a4c6d..cc36bddf 100644 --- a/agc_2-X/trunk/UPGRADE +++ b/agc_2-X/trunk/UPGRADE @@ -123,6 +123,9 @@ OTHER CHANGES: 24. Added option to User Status report to only show call logs with a specified call status. +25. Added experimental Agent Whisper Monitoring from the Real-time Report. + Must be enabled in System Settings. + diff --git a/agc_2-X/trunk/agi/getAGENTchannel.agi b/agc_2-X/trunk/agi/getAGENTchannel.agi new file mode 100644 index 00000000..f844e04f --- /dev/null +++ b/agc_2-X/trunk/agi/getAGENTchannel.agi @@ -0,0 +1,170 @@ +#!/usr/bin/perl + +# getAGENTchannel.agi by Omar Rodriguez www.ItContinental.com +# Copyright (C) 2015 Matt Florell LICENSE: AGPLv2 +# This script is able to return the name of the channel that belongs to the agent, +# to allow administrators to whisper to the agents +# Has been made using Vicidial code as Base + +# CHANGELOG: +# 150728-1315 - First build +# 150804-0944 - Rewritten to work on multi-server systems and with different dialplan +# + +$script = 'getAGENTchannel.agi'; + +($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime(time); +$year = ($year + 1900); +$mon++; +if ($mon < 10) {$mon = "0$mon";} +if ($mday < 10) {$mday = "0$mday";} +if ($hour < 10) {$hour = "0$hour";} +if ($min < 10) {$min = "0$min";} +if ($sec < 10) {$sec = "0$sec";} + +# default path to astguiclient configuration file: +$PATHconf = '/etc/astguiclient.conf'; + +open(conf, "$PATHconf") || die "can't open $PATHconf: $!\n"; +@conf = ; +close(conf); +$i=0; +foreach(@conf) + { + $line = $conf[$i]; + $line =~ s/ |>|\n|\r|\t|\#.*|;.*//gi; + if ( ($line =~ /^PATHhome/) && ($CLIhome < 1) ) + {$PATHhome = $line; $PATHhome =~ s/.*=//gi;} + if ( ($line =~ /^PATHlogs/) && ($CLIlogs < 1) ) + {$PATHlogs = $line; $PATHlogs =~ s/.*=//gi;} + if ( ($line =~ /^PATHagi/) && ($CLIagi < 1) ) + {$PATHagi = $line; $PATHagi =~ s/.*=//gi;} + if ( ($line =~ /^PATHweb/) && ($CLIweb < 1) ) + {$PATHweb = $line; $PATHweb =~ s/.*=//gi;} + if ( ($line =~ /^PATHsounds/) && ($CLIsounds < 1) ) + {$PATHsounds = $line; $PATHsounds =~ s/.*=//gi;} + if ( ($line =~ /^PATHmonitor/) && ($CLImonitor < 1) ) + {$PATHmonitor = $line; $PATHmonitor =~ s/.*=//gi;} + if ( ($line =~ /^VARserver_ip/) && ($CLIserver_ip < 1) ) + {$VARserver_ip = $line; $VARserver_ip =~ s/.*=//gi;} + if ( ($line =~ /^VARDB_server/) && ($CLIDB_server < 1) ) + {$VARDB_server = $line; $VARDB_server =~ s/.*=//gi;} + if ( ($line =~ /^VARDB_database/) && ($CLIDB_database < 1) ) + {$VARDB_database = $line; $VARDB_database =~ s/.*=//gi;} + if ( ($line =~ /^VARDB_user/) && ($CLIDB_user < 1) ) + {$VARDB_user = $line; $VARDB_user =~ s/.*=//gi;} + if ( ($line =~ /^VARDB_pass/) && ($CLIDB_pass < 1) ) + {$VARDB_pass = $line; $VARDB_pass =~ s/.*=//gi;} + if ( ($line =~ /^VARDB_port/) && ($CLIDB_port < 1) ) + {$VARDB_port = $line; $VARDB_port =~ s/.*=//gi;} + $i++; + } + +if (!$VARDB_port) {$VARDB_port='3306';} +if (!$AGILOGfile) {$AGILOGfile = "$PATHlogs/agiout.$year-$mon-$mday";} + +use DBI; +use Time::HiRes ('gettimeofday','usleep','sleep'); # necessary to have perl sleep command of less than one second +use Asterisk::AGI; +$AGI = new Asterisk::AGI; + +$dbhA = DBI->connect("DBI:mysql:$VARDB_database:$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass") + or die "Couldn't connect to database: " . DBI->errstr; + +### Grab Server values from the database +$stmtA = "SELECT agi_output,local_gmt FROM servers where server_ip = '$VARserver_ip';"; +$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; +$sthA->execute or die "executing: $stmtA ", $dbhA->errstr; +$sthArows=$sthA->rows; +if ($sthArows > 0) + { + $AGILOG = '0'; + @aryA = $sthA->fetchrow_array; + $DBagi_output = $aryA[0]; + $local_gmt = $aryA[1]; + if ($DBagi_output =~ /STDERR/) {$AGILOG = '1';} + if ($DBagi_output =~ /FILE/) {$AGILOG = '2';} + if ($DBagi_output =~ /BOTH/) {$AGILOG = '3';} + } +$sthA->finish(); + +$agent_zap_channel = "101"; +########## FIND playfilename ########## + +$|=1; +while() + { + chomp; + last unless length($_); + if ($AGILOG) + { + if (/^agi_(\w+)\:\s+(.*)$/) + { + $AGI{$1} = $2; + } + } + + if (/^agi_uniqueid\:\s+(.*)$/) {$unique_id = $1; $uniqueid = $unique_id;} + if (/^agi_channel\:\s+(.*)$/) {$channel = $1;} + if (/^agi_extension\:\s+(.*)$/) {$extension = $1;} + if (/^agi_type\:\s+(.*)$/) {$type = $1;} + if (/^agi_callerid\:\s+(.*)$/) {$callerid = $1;} + if (/^agi_calleridname\:\s+(.*)$/) {$calleridname = $1;} + } + +if (length($extension) > 7) + {$extension = substr($extension, -7);} +if ($AGILOG) {$agi_string = "Agent session: $extension| Channel: $channel| CID: $calleridname <$callerid>|"; &agi_output;} + + +#$stmtA = "SELECT channel FROM vicidial_live_agents WHERE conf_exten = '$canal' AND ifnull(trim(channel), '') <> '' and (channel in (select channel from live_channels) or comments='MANUAL') LIMIT 1"; + +$stmtA = "SELECT channel FROM live_sip_channels WHERE server_ip='$VARserver_ip' AND extension=right('$extension',7) AND ifnull(trim(channel), '') <> '' limit 1;"; + +#$AGI->verbose($stmtA); + +$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; +$sthA->execute or die "executing: $stmtA ", $dbhA->errstr; +$sthArows=$sthA->rows; +if ($sthArows > 0) + { + @aryA = $sthA->fetchrow_array; + $agent_zap_channel = $aryA[0]; + + $sthA->finish(); + } +else + { + $agent_zap_channel = "101"; + } +if ($AGILOG) {$agi_string = "$sthArows|$agent_zap_channel|$stmtA|"; &agi_output;} + +#$AGI->verbose("agent_zap_channel: $agent_zap_channel"); + +$AGI->set_variable('agent_zap_channel', $agent_zap_channel); + +exit; + + + +sub agi_output + { + ($Lsec,$Lmin,$Lhour,$Lmday,$Lmon,$Lyear,$Lwday,$Lyday,$Lisdst) = localtime(time); + if ($Lhour < 10) {$Lhour = "0$Lhour";} + if ($Lmin < 10) {$Lmin = "0$Lmin";} + if ($Lsec < 10) {$Lsec = "0$Lsec";} + $LOGtime = "$Lhour:$Lmin:$Lsec"; + + if ($AGILOG >=2) + { + ### open the log file for writing ### + open(Lout, ">>$AGILOGfile") + || die "Can't open $AGILOGfile: $!\n"; + print Lout "$LOGtime|$LOGtime|$script|$agi_string\n"; + close(Lout); + } + ### send to STDERR writing ### + if ( ($AGILOG == '1') || ($AGILOG == '3') ) + {print STDERR "$LOGtime|$LOGtime|$script|$agi_string\n";} + $agi_string=''; + } diff --git a/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl b/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl index 4000e65b..771605eb 100644 --- a/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl +++ b/agc_2-X/trunk/bin/ADMIN_keepalive_ALL.pl @@ -100,9 +100,10 @@ # 150112-2018 - Added flag to delete voicemail greeting when changed from an audio file to empty # 150307-1738 - Added custom meetme enter sounds(only works with Asterisk 1.8) # 150724-0835 - Added purge of vicidial_ajax_log records older than 7 days to end of day process +# 150804-0919 - Added whisper extensions # -$build = '150724-0835'; +$build = '150804-0919'; $DB=0; # Debug flag @@ -1766,6 +1767,14 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $Lext .= "exten => 473782138521111,1,Answer\n"; $Lext .= "exten => 473782138521111,n,Wait(5)\n"; $Lext .= "exten => 473782138521111,n,Hangup()\n"; + $Lext .= "; Whisper to agent meetme entry\n"; + $Lext .= "exten => _473782188600XXX,1,Answer\n"; + $Lext .= "exten => _473782188600XXX,n,Wait(1)\n"; + $Lext .= "exten => _473782188600XXX,n,AGI(getAGENTchannel.agi)\n"; + $Lext .= "exten => _473782188600XXX,n,NoOp(\${agent_zap_channel})\n"; + $Lext .= "exten => _473782188600XXX,n,GotoIf(\$[ \"\${agent_zap_channel}\" = \"101\" ]?fin)\n"; + $Lext .= "exten => _473782188600XXX,n,ChanSpy(\${agent_zap_channel},qw)\n"; + $Lext .= "exten => _473782188600XXX,n(fin),Hangup()\n"; } else { @@ -1787,6 +1796,14 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r $Lext .= "exten => 473782138521111,1,Answer\n"; $Lext .= "exten => 473782138521111,n,Wait(5)\n"; $Lext .= "exten => 473782138521111,n,Hangup()\n"; + $Lext .= "; Whisper to agent meetme entry\n"; + $Lext .= "exten => _473782188600XXX,1,Answer\n"; + $Lext .= "exten => _473782188600XXX,n,Wait(1)\n"; + $Lext .= "exten => _473782188600XXX,n,AGI(getAGENTchannel.agi)\n"; + $Lext .= "exten => _473782188600XXX,n,NoOp(\${agent_zap_channel})\n"; + $Lext .= "exten => _473782188600XXX,n,GotoIf(\$[ \"\${agent_zap_channel}\" = \"101\" ]?fin)\n"; + $Lext .= "exten => _473782188600XXX,n,ChanSpy(\${agent_zap_channel},qw)\n"; + $Lext .= "exten => _473782188600XXX,n(fin),Hangup()\n"; } $Liax .= "\n"; 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 abf774e4..e55aca2a 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -1602,7 +1602,8 @@ enable_third_webform ENUM('0','1') default '0', chat_url VARCHAR(255) COLLATE utf8_unicode_ci DEFAULT NULL, chat_timeout INT(3) unsigned DEFAULT NULL, agent_debug_logging VARCHAR(20) default '0', -default_language VARCHAR(100) default 'default English' +default_language VARCHAR(100) default 'default English', +agent_whisper_enabled ENUM('0','1') default '0' ) ENGINE=MyISAM; CREATE TABLE vicidial_campaigns_list_mix ( @@ -3546,4 +3547,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='1424',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1425',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 12d7d780..0ec1ac57 100644 --- a/agc_2-X/trunk/extras/upgrade_2.12.sql +++ b/agc_2-X/trunk/extras/upgrade_2.12.sql @@ -247,3 +247,9 @@ UPDATE system_settings SET db_schema_version='1423',db_schema_update_date=NOW() ALTER TABLE vicidial_campaigns MODIFY lead_order_secondary ENUM('LEAD_ASCEND','LEAD_DESCEND','CALLTIME_ASCEND','CALLTIME_DESCEND','VENDOR_ASCEND','VENDOR_DESCEND') default 'LEAD_ASCEND'; UPDATE system_settings SET db_schema_version='1424',db_schema_update_date=NOW() where db_schema_version < 1424; + +ALTER TABLE system_settings ADD agent_whisper_enabled ENUM('0','1') default '0'; + +UPDATE servers SET rebuild_conf_files='Y' where active_asterisk_server='Y'; + +UPDATE system_settings SET db_schema_version='1425',db_schema_update_date=NOW() where db_schema_version < 1425; diff --git a/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php b/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php index 2835da8f..d5c5e79a 100644 --- a/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php +++ b/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php @@ -92,10 +92,11 @@ # 141230-0030 - Added code for on-the-fly language translations display # 150211-2342 - Added hopper link, issue #825 # 150307-0825 - small cosmetic fix +# 150804-0956 - Added WHISPER option agent monitoring # -$version = '2.10-81'; -$build = '150307-0825'; +$version = '2.12-82'; +$build = '150804-0956'; header ("Content-type: text/html; charset=utf-8"); @@ -178,7 +179,7 @@ $db_source = 'M'; ############################################# ##### START SYSTEM_SETTINGS LOOKUP ##### -$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; +$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,agent_whisper_enabled FROM system_settings;"; $rslt=mysql_to_mysqli($stmt, $link); if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysqli_num_rows($rslt); @@ -191,6 +192,7 @@ if ($qm_conf_ct > 0) $reports_use_slave_db = $row[3]; $SSenable_languages = $row[4]; $SSlanguage_method = $row[5]; + $agent_whisper_enabled = $row[6]; } ##### END SETTINGS LOOKUP ##### ########################################### @@ -438,7 +440,7 @@ if ( (!preg_match('/\-\-ALL\-\-/i',$LOGadmin_viewable_groups)) and (strlen($LOGa else {$admin_viewable_groupsALL=1;} -# and (preg_match("/MONITOR|BARGE|HIJACK/",$monitor_active) ) ) +# and (preg_match("/MONITOR|BARGE|HIJACK|WHISPER/",$monitor_active) ) ) if ( (!isset($monitor_phone)) or (strlen($monitor_phone)<1) ) { $stmt="select phone_login from vicidial_users where user='$PHP_AUTH_USER';"; @@ -673,6 +675,12 @@ $select_list .= ">"._QXZ("MONITOR").""; $select_list .= ""; $select_list .= "