diff --git a/UPGRADE b/UPGRADE index 30491339..62803c3a 100644 --- a/UPGRADE +++ b/UPGRADE @@ -195,6 +195,19 @@ NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom 43. Added INBOUND_MAN dial method to allow for inbound call handling by agents that are also placing manual dial list calls through their campaign lists +44. Added option to see the inbound group call stats in the Real-time screen + +45. Added ability for agents to dial in to an AGI script(agi-AGENT_dial_in.agi) + to log their phone into the session instead of having VICIDIAL call them. + The user ID and password for the agent must be digits only for this to work! + This requires the following to be added to the dialplan on the dial-in DID + or extension that you want to use: + exten => 2345,1,Answer ; Answer the line + exten => 2345,2,AGI(agi-AGENT_dial_in.agi) + exten => 2345,3,Hangup + + + diff --git a/agi/agi-AGENT_dial_in.agi b/agi/agi-AGENT_dial_in.agi new file mode 100644 index 00000000..aae8bf06 --- /dev/null +++ b/agi/agi-AGENT_dial_in.agi @@ -0,0 +1,463 @@ +#!/usr/bin/perl +# +# agi-AGENT_dial_in.agi version 0.1 +# +# This script is designed to allow agents the ability to dial in to an extension +# to establish the phone connection to their VICIDIAL session. The user login +# and password must be only digits and nothing but digits to use this utility. +# +# user is prompted for their user ID then press # +# user is prompted for their passcode then press # +# then the user is forwarded to the active vicidial agent session +# +# ;agent dial-in: +#exten => 2345,1,Answer ; Answer the line +#exten => 2345,2,AGI(agi-AGENT_dial_in.agi) +#exten => 2345,3,Hangup +# +# +# Copyright (C) 2008 Matt Florell LICENSE: AGPLv2 +# +# CHANGELOG +# 81022-2115 - First build +# + +&get_time_now; + $start_epoch = $now_date_epoch; + +$script = 'agi-AGENT_dial_in.agi'; + +$now_date_epoch = time(); +$now_date = "$year-$mon-$mday $hour:$min:$sec"; + +($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) {$Fhour = "0$hour";} +if ($min < 10) {$min = "0$min";} +if ($sec < 10) {$sec = "0$sec";} + +$US='_'; + + +# 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 =~ /^PATHlogs/) && ($CLIlogs < 1) ) + {$PATHlogs = $line; $PATHlogs =~ 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/ivrout.$year-$mon-$mday";} + +use DBI; +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; + + +$|=1; +while() +{ + chomp; + last unless length($_); + if ($V) + { + if (/^agi_(\w+)\:\s+(.*)$/) + { + $AGI{$1} = $2; + } + } + + if (/^agi_uniqueid\:\s+(.*)$/) {$unique_id = $1;} + if (/^agi_extension\:\s+(.*)$/) {$extension = $1;} + if (/^agi_channel\:\s+(.*)$/) {$channel = $1;} + if (/^agi_callerid\:\s+(.*)$/) {$callerid = $1;} + if (/^agi_calleridname\:\s+(.*)$/) {$calleridname = $1;} +} + +if ( ($callerid =~ /\".*\"/) && ( (!$calleridname) or ($calleridname =~ /unknown/) ) ) + { + $calleridname = $callerid; + $calleridname =~ s/\<\d\d\d\d\d\d\d\d\d\d\>//gi; + $calleridname =~ s/\"|\" //gi; + } + + $callerid =~ s/\D//gi; + $calleridname =~ s/unknown//gi; +if ( (!$callerid) or ($callerid =~ /unknown/) ) + {$callerid = $calleridname;} +$phone_number=$callerid; + +### Grab Server values from the database +$stmtA = "SELECT ext_context,agi_output 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; + $rec_count=0; +while ($sthArows > $rec_count) + { + @aryA = $sthA->fetchrow_array; + $DBext_context = "$aryA[0]"; + $DBagi_output = "$aryA[1]"; + if ($DBext_context) {$ext_context = $DBext_context;} + if ($DBagi_output =~ /STDERR/) {$AGILOG = '1';} + if ($DBagi_output =~ /FILE/) {$AGILOG = '2';} + if ($DBagi_output =~ /BOTH/) {$AGILOG = '3';} + $rec_count++; + } +$sthA->finish(); + + + +$AGI->stream_file('sip-silence'); +$AGI->stream_file('sip-silence'); + + +$entry_chances=0; +$VALID_login=0; +$ACTIVE_login=0; +$VDADremDIALstr=''; +while ( ($entry_chances < 3) && ($VALID_login < 1) ) + { + $entry_chances++; + + + &user_password_gather; + + + ###### Check userID and password against vicidial_users table + $stmtA = "SELECT count(*) FROM vicidial_users where user='$PIN_number' and pass='$PASS_word';"; + $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; + $VALID_login = "$aryA[0]"; + } + $sthA->finish(); + + + if ($VALID_login > 0) + { + $AGI->stream_file('pin-number-accepted'); + } + else + { + $AGI->stream_file('pin-invalid'); + } + } + + + +if ($VALID_login < 1) + { + if ($AGILOG) {$agi_string = "DIAL-IN END: Invalid Login |$VALID_login|$PIN_number|$PASS_word|"; &agi_output;} + + $AGI->stream_file('vm-goodbye'); + + $AGI->hangup(); + + $dbhA->disconnect(); + exit; + } +else + { + $secX = time(); + $PDtarget = ($secX - 30); + ($Psec,$Pmin,$Phour,$Pmday,$Pmon,$Pyear,$Pwday,$Pyday,$Pisdst) = localtime($PDtarget); + $Pyear = ($Pyear + 1900); + $Pmon++; + if ($Pmon < 10) {$Pmon = "0$Pmon";} + if ($Pmday < 10) {$Pmday = "0$Pmday";} + if ($Phour < 10) {$Phour = "0$Phour";} + if ($Pmin < 10) {$Pmin = "0$Pmin";} + if ($Psec < 10) {$Psec = "0$Psec";} + $PDtsSQLdate = "$Pyear$Pmon$Pmday$Phour$Pmin$Psec"; + + ###### Check if user is logged in, vicidial_live_agents table + $stmtA = "SELECT count(*) FROM vicidial_live_agents where user='$PIN_number' and last_update_time > \"$PDtsSQLdate\";"; + $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; + $ACTIVE_login = "$aryA[0]"; + } + $sthA->finish(); + + if ($ACTIVE_login < 1) + { + if ($AGILOG) {$agi_string = "DIAL-IN END: Inactive Login |$VALID_login|$PIN_number|$PASS_word| |$ACTIVE_login|$PDtsSQLdate|"; &agi_output;} + + $AGI->stream_file('login-fail'); + $AGI->stream_file('you-must-be-logged-in'); + $AGI->stream_file('vm-goodbye'); + + $AGI->hangup(); + + $dbhA->disconnect(); + exit; + } + else + { + $stmtA = "SELECT conf_exten,extension,server_ip from vicidial_live_agents WHERE user='$PIN_number' limit 1;"; + if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} + $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; + $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; + $sthArows=$sthA->rows; + $rec_countCUSTDATA=0; + if ($sthArows > 0) + { + @aryA = $sthA->fetchrow_array; + + $VDADconf_exten = "$aryA[0]"; + $VDADextension = "$aryA[1]"; + $VDADserver_ip = "$aryA[2]"; + } + $sthA->finish(); + + ### format the remote server dialstring to get the call to the overflow agent meetme room + $S='*'; + if( $VDADserver_ip =~ m/(\S+)\.(\S+)\.(\S+)\.(\S+)/ ) + { + $a = leading_zero($1); + $b = leading_zero($2); + $c = leading_zero($3); + $d = leading_zero($4); + $VDADremDIALstr = "$a$S$b$S$c$S$d$S"; + } + $VDADremDIALstr .= "$VDADconf_exten"; + + if ($AGILOG) {$agi_string = "Agent $PIN_number sent to $VDADremDIALstr"; &agi_output;} + + print "SET CONTEXT $ext_context\n"; + checkresult($result); + print "SET EXTENSION $VDADremDIALstr\n"; + checkresult($result); + print "SET PRIORITY 1\n"; + checkresult($result); + } + } + + + +$dbhA->disconnect(); + +exit; + + + + + +################################################################################ +##### SUBROUTINES ############################################################## +################################################################################ + + +##### BEGIN collect the user and password ###################################### +sub user_password_gather +{ +################################################################################ +# please enter the pin number followed by the pound key + +$interrupt_digit=''; + +$interrupt_digit = $AGI->stream_file('ld_welcome_pin_number','0123456789'); + + print STDERR "interrupt_digit |$interrupt_digit|\n"; + +$digits_being_entered=1; +$PIN_number=''; +if ($interrupt_digit > 0) + { +# if ($interrupt_digit == 35) {$interrupt_digit='#';} +# if ($interrupt_digit == 42) {$interrupt_digit='*';} + if ($interrupt_digit == 48) {$interrupt_digit=0;} + if ($interrupt_digit == 49) {$interrupt_digit=1;} + if ($interrupt_digit == 50) {$interrupt_digit=2;} + if ($interrupt_digit == 51) {$interrupt_digit=3;} + if ($interrupt_digit == 52) {$interrupt_digit=4;} + if ($interrupt_digit == 53) {$interrupt_digit=5;} + if ($interrupt_digit == 54) {$interrupt_digit=6;} + if ($interrupt_digit == 55) {$interrupt_digit=7;} + if ($interrupt_digit == 56) {$interrupt_digit=8;} + if ($interrupt_digit == 57) {$interrupt_digit=9;} + + $PIN_number=$interrupt_digit; + } + +$digit_loop_counter=0; +while ( ($digits_being_entered > 0) && ($digit_loop_counter < 20) ) + { + $digit = chr($AGI->wait_for_digit('10000')); # wait 10 seconds for input or until the pound key is pressed + if ($digit =~ /\d/) + { + $PIN_number = "$PIN_number$digit"; + print STDERR "digit |$digit| PIN_number |$PIN_number|\n"; +# $AGI->say_digits("$digit"); + undef $digit; + } + else + { + $digits_being_entered=0; + } + + $digit_loop_counter++; + } + +$PIN_number =~ s/\D//gi; +if ($PIN_number) {print STDERR "digit |$digit| PIN_number |$PIN_number|\n";} + + + +################################################################################ +# please enter your password followed by the pound key + +$interrupt_digit=''; + +$interrupt_digit = $AGI->stream_file('enter-password','0123456789'); + + print STDERR "interrupt_digit |$interrupt_digit|\n"; + +$digits_being_entered=1; +$PASS_word=''; +if ($interrupt_digit > 0) + { +# if ($interrupt_digit == 35) {$interrupt_digit='#';} +# if ($interrupt_digit == 42) {$interrupt_digit='*';} + if ($interrupt_digit == 48) {$interrupt_digit=0;} + if ($interrupt_digit == 49) {$interrupt_digit=1;} + if ($interrupt_digit == 50) {$interrupt_digit=2;} + if ($interrupt_digit == 51) {$interrupt_digit=3;} + if ($interrupt_digit == 52) {$interrupt_digit=4;} + if ($interrupt_digit == 53) {$interrupt_digit=5;} + if ($interrupt_digit == 54) {$interrupt_digit=6;} + if ($interrupt_digit == 55) {$interrupt_digit=7;} + if ($interrupt_digit == 56) {$interrupt_digit=8;} + if ($interrupt_digit == 57) {$interrupt_digit=9;} + + $PASS_word=$interrupt_digit; + } + +$digit_loop_counter=0; +while ( ($digits_being_entered > 0) && ($digit_loop_counter < 20) ) + { + $digit = chr($AGI->wait_for_digit('10000')); # wait 10 seconds for input or until the pound key is pressed + if ($digit =~ /\d/) + { + $PASS_word = "$PASS_word$digit"; + print STDERR "digit |$digit| PASS_word |$PASS_word|\n"; +# $AGI->say_digits("$digit"); + undef $digit; + } + else + { + $digits_being_entered=0; + } + + $digit_loop_counter++; + } + +$PASS_word =~ s/\D//gi; +if ($PASS_word) {print STDERR "digit |$digit| PASS_word |$PASS_word| PIN_number |$PIN_number|\n";} + +} +##### END collect the user and password ############################################### + + + + + +sub get_time_now #get the current date and time and epoch for logging call lengths and datetimes +{ +($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) {$Fhour = "0$hour";} +if ($min < 10) {$min = "0$min";} +if ($sec < 10) {$sec = "0$sec";} + +$now_date_epoch = time(); +$now_date = "$year-$mon-$mday $hour:$min:$sec"; +$filedate = "$year$mon$mday$hour$min$sec"; +} + + + +sub checkresult { + my ($res) = @_; + my $retval; + $tests++; + chomp $res; + if ($res =~ /^200/) { + $res =~ /result=(-?\d+)/; + if (!length($1)) { + print STDERR "FAIL ($res)\n"; + $fail++; + } else { + print STDERR "PASS ($1)\n"; + $pass++; + } + } else { + print STDERR "FAIL (unexpected result '$res')\n"; + $fail++; + } +} + +sub agi_output +{ +if ($AGILOG >=2) + { + ### open the log file for writing ### + open(Lout, ">>$AGILOGfile") + || die "Can't open $AGILOGfile: $!\n"; + print Lout "$now_date|$script|$agi_string\n"; + close(Lout); + } + ### send to STDERR writing ### +if ( ($AGILOG == '1') || ($AGILOG == '3') ) + {print STDERR "$now_date|$script|$agi_string\n";} +$agi_string=''; +} + +sub leading_zero($) +{ + $_ = $_[0]; + s/^(\d)$/0$1/; + s/^(\d\d)$/0$1/; + return $_; +} # End of the leading_zero() routine. diff --git a/docs/conf_examples/extensions.conf.sample b/docs/conf_examples/extensions.conf.sample index cc22ac1f..38a7cfc7 100644 --- a/docs/conf_examples/extensions.conf.sample +++ b/docs/conf_examples/extensions.conf.sample @@ -14,6 +14,12 @@ TRUNKloop = IAX2/ASTloop:test@127.0.0.1:40569 ; used for blind monitoring TRUNKblind = IAX2/ASTblind:test@127.0.0.1:41569 ; used for testing [testtrunkinbound] +; agent dial-in: +exten => 2345,1,Answer ; Answer the line +exten => 2345,2,AGI(agi-AGENT_dial_in.agi) +exten => 2345,3,Hangup + +; DID call routing process exten => _X.,1,AGI(agi-DID_route.agi) [default] diff --git a/docs/conf_examples/extensions.conf.sample-1.4 b/docs/conf_examples/extensions.conf.sample-1.4 index 6ea41905..749738b5 100644 --- a/docs/conf_examples/extensions.conf.sample-1.4 +++ b/docs/conf_examples/extensions.conf.sample-1.4 @@ -14,6 +14,12 @@ TRUNKloop = IAX2/ASTloop:test@127.0.0.1:40569 ; used for blind monitoring TRUNKblind = IAX2/ASTblind:test@127.0.0.1:41569 ; used for testing [testtrunkinbound] +; agent dial-in: +exten => 2345,1,Answer ; Answer the line +exten => 2345,2,AGI(agi-AGENT_dial_in.agi) +exten => 2345,3,Hangup + +; DID call routing process exten => _X.,1,AGI(agi-DID_route.agi) [default] diff --git a/extras/first_server_install.sql b/extras/first_server_install.sql index 136f0b9f..b90de772 100644 --- a/extras/first_server_install.sql +++ b/extras/first_server_install.sql @@ -3,6 +3,7 @@ INSERT INTO servers (server_id,server_description,server_ip,active,asterisk_vers INSERT INTO server_updater values('10.10.10.15',''); INSERT INTO phones (extension, dialplan_number, voicemail_id, phone_ip, computer_ip, server_ip, login, pass, status, active, phone_type, fullname, company, picture, messages, old_messages, protocol) values('gs102','102','102','10.10.10.16','10.10.9.16','10.10.10.15','gs102','test', 'ADMIN','Y','Grandstream BT 102','Test Admin Phone','TEST','','0','0','SIP'); +INSERT INTO phones (extension, dialplan_number, voicemail_id, phone_ip, computer_ip, server_ip, login, pass, status, active, phone_type, fullname, company, protocol) values('callin','8300','8300','10.10.10.15','10.10.10.15','10.10.10.15','callin','test', 'ACTIVE','Y','Dial-in agent phone','Dial-in Agent Phone','TEST','EXTERNAL'); INSERT INTO vicidial_users (user,pass,full_name,user_level,user_group,load_leads,campaign_detail,ast_admin_access,modify_users) values('6666','1234','Admin','9','ADMIN','1','1','1','1'); diff --git a/sounds/enter-password.gsm b/sounds/enter-password.gsm new file mode 100644 index 00000000..00feba18 Binary files /dev/null and b/sounds/enter-password.gsm differ diff --git a/sounds/login-fail.gsm b/sounds/login-fail.gsm new file mode 100644 index 00000000..3bafc2f9 Binary files /dev/null and b/sounds/login-fail.gsm differ diff --git a/sounds/pin-invalid.gsm b/sounds/pin-invalid.gsm new file mode 100644 index 00000000..d3108f89 Binary files /dev/null and b/sounds/pin-invalid.gsm differ diff --git a/sounds/pin-number-accepted.gsm b/sounds/pin-number-accepted.gsm new file mode 100644 index 00000000..8faf8f92 Binary files /dev/null and b/sounds/pin-number-accepted.gsm differ diff --git a/sounds/you-must-be-logged-in.gsm b/sounds/you-must-be-logged-in.gsm new file mode 100644 index 00000000..e98a9710 Binary files /dev/null and b/sounds/you-must-be-logged-in.gsm differ diff --git a/www/agc/manager_send.php b/www/agc/manager_send.php index 4f66771e..4e469b97 100644 --- a/www/agc/manager_send.php +++ b/www/agc/manager_send.php @@ -791,6 +791,11 @@ if ($ACTION=="RedirectXtraCXNeW") $row=mysql_fetch_row($rslt); $exten = $row[0]; + if ( (ereg("^8300",$extension)) and ($protocol == 'Local') ) + { + $extension = "$extension$user"; + } + $stmtD="UPDATE vicidial_conferences set extension='$protocol/$extension' where server_ip='$server_ip' and conf_exten='$exten' limit 1;"; if ($format=='debug') {echo "\n";} $rslt=mysql_query($stmtD, $link); diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index 96ae411a..a0a90fa2 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -199,10 +199,11 @@ # 81015-0405 - Fixed bug related to hangups on 3way calls # 81016-0703 - Changed leave 3way to allow function at any time transfer-conf is available # 81020-1501 - Fixed bugs in queue_log logging +# 81023-0411 - Added compatibility for dial-in agents using AGI, bug fixes # -$version = '2.0.5-178'; -$build = '81020-1501'; +$version = '2.0.5-179'; +$build = '81023-0411'; require("dbconnect.php"); @@ -1237,6 +1238,11 @@ else $extension = "$dialplan_number$AT$ext_context"; } $SIP_user = "$protocol/$extension"; + $SIP_user_DiaL = "$protocol/$extension"; + if ( (ereg('8300',$dialplan_number)) and (strlen($dialplan_number)<5) and ($protocol == 'Local') ) + { + $SIP_user = "$protocol/$extension$VD_login"; + } $stmt="SELECT asterisk_version from servers where server_ip='$server_ip';"; if ($DB) {echo "|$stmt|\n";} @@ -1405,11 +1411,11 @@ else } ### insert a NEW record to the vicidial_manager table to be processed - $stmt="INSERT INTO vicidial_manager values('','','$NOW_TIME','NEW','N','$server_ip','','Originate','$SIqueryCID','Channel: $SIP_user','Context: $ext_context','Exten: $session_id','Priority: 1','Callerid: $SIqueryCID','','','','','');"; + $stmt="INSERT INTO vicidial_manager values('','','$NOW_TIME','NEW','N','$server_ip','','Originate','$SIqueryCID','Channel: $SIP_user_DiaL','Context: $ext_context','Exten: $session_id','Priority: 1','Callerid: $SIqueryCID','','','','','');"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $affected_rows = mysql_affected_rows($link); - print "\n"; + print "\n"; if ($auto_dial_level > 0) { @@ -2266,7 +2272,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (taskFromConf == 'YES') {basic_originate_call(manual_string,'NO','YES',dial_conf_exten,'NO',taskFromConf,threeway_cid);} else - {basic_originate_call(manual_string,'NO','NO');} + {basic_originate_call(manual_string,'NO','NO','','','','1');} MD_ring_secondS=0; } @@ -3396,7 +3402,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (MDDiaLOverridEform.length > 0) { - basic_originate_call(session_id,'NO','YES',MDDiaLOverridEform,'YES'); + basic_originate_call(session_id,'NO','YES',MDDiaLOverridEform,'YES','','1'); } else { @@ -5617,13 +5623,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} { document.vicidial_form.conf_dtmf.value = CalL_XC_a_Dtmf; document.vicidial_form.xfernumber.value = CalL_XC_a_NuMber; - basic_originate_call(CalL_XC_a_NuMber,'NO','YES',session_id,'YES'); + basic_originate_call(CalL_XC_a_NuMber,'NO','YES',session_id,'YES','','1'); } function DtMf_PreSet_b_DiaL() { document.vicidial_form.conf_dtmf.value = CalL_XC_b_Dtmf; document.vicidial_form.xfernumber.value = CalL_XC_b_NuMber; - basic_originate_call(CalL_XC_b_NuMber,'NO','YES',session_id,'YES'); + basic_originate_call(CalL_XC_b_NuMber,'NO','YES',session_id,'YES','','1'); } // ################################################################################ diff --git a/www/vicidial/AST_CLOSERstats.php b/www/vicidial/AST_CLOSERstats.php index b00eee31..03765e4f 100644 --- a/www/vicidial/AST_CLOSERstats.php +++ b/www/vicidial/AST_CLOSERstats.php @@ -460,8 +460,11 @@ while ($i < $statuses_to_print) } $TOTALcalls = ($TOTALcalls + $row[0]); - $STATUSrate = ($STATUScount / ($TOTALsec / 3600) ); - $STATUSrate = sprintf("%.2f", $STATUSrate); + if ( ($STATUScount < 1) or ($TOTALsec < 1) ) + {$STATUSrate = 0;} + else + {$STATUSrate = ($STATUScount / ($TOTALsec / 3600) );} + $STATUSrate = sprintf("%.2f", $STATUSrate); $STATUShours_H = ($row[2] / 3600); $STATUShours_H_int = round($STATUShours_H, 2); @@ -526,8 +529,11 @@ if ($TOTALcalls < 1) } else { - $TOTALrate = ($TOTALcalls / ($TOTALsec / 3600) ); - $TOTALrate = sprintf("%.2f", $TOTALrate); + if ( ($TOTALcalls < 1) or ($TOTALsec < 1) ) + {$TOTALrate = 0;} + else + {$TOTALrate = ($TOTALcalls / ($TOTALsec / 3600) );} + $TOTALrate = sprintf("%.2f", $TOTALrate); $TOTALhours_H = ($TOTALsec / 3600); $TOTALhours_H_int = round($TOTALhours_H, 2);