From 7782c00a64972834cfcf58ac95fa0a3c17507bf0 Mon Sep 17 00:00:00 2001 From: mattf Date: Wed, 13 Jan 2010 18:28:32 +0000 Subject: [PATCH] small bug fixes git-svn-id: svn://192.168.202.10@1303 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/branches/agc_2.2.0/agi/agi-VDAD_ALL_inbound.agi | 6 ++++-- agc_2-X/branches/agc_2.2.0/www/agc/vicidial.php | 2 +- agc_2-X/branches/agc_2.2.0/www/vicidial/admin.php | 2 +- agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi | 6 ++++-- agc_2-X/trunk/www/agc/vicidial.php | 2 +- agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php | 4 +--- agc_2-X/trunk/www/vicidial/admin.php | 2 +- 7 files changed, 13 insertions(+), 11 deletions(-) diff --git a/agc_2-X/branches/agc_2.2.0/agi/agi-VDAD_ALL_inbound.agi b/agc_2-X/branches/agc_2.2.0/agi/agi-VDAD_ALL_inbound.agi index f942a6e3..17cac24e 100644 --- a/agc_2-X/branches/agc_2.2.0/agi/agi-VDAD_ALL_inbound.agi +++ b/agc_2-X/branches/agc_2.2.0/agi/agi-VDAD_ALL_inbound.agi @@ -1537,7 +1537,7 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) ) if ($AGENTgrab > 0) { - $stmtA = "SELECT conf_exten,extension from vicidial_live_agents WHERE user='$AGENTuser';"; + $stmtA = "SELECT conf_exten,extension,server_ip from vicidial_live_agents WHERE user='$AGENTuser';"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; @@ -1549,6 +1549,7 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) ) $VDADconf_exten = $aryA[0]; $VDADextension = $aryA[1]; $VDADuser = $AGENTuser; + $VDADserver_ip = $aryA[2]; } $sthA->finish(); } @@ -1928,7 +1929,7 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) ) if ($AGENTgrab > 0) { - $stmtA = "SELECT conf_exten,extension from vicidial_live_agents WHERE user='$AGENTuser';"; + $stmtA = "SELECT conf_exten,extension,server_ip from vicidial_live_agents WHERE user='$AGENTuser';"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; @@ -1940,6 +1941,7 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) ) $VDADconf_exten = $aryA[0]; $VDADextension = $aryA[1]; $VDADuser = $AGENTuser; + $VDADserver_ip = $aryA[2]; } $sthA->finish(); } diff --git a/agc_2-X/branches/agc_2.2.0/www/agc/vicidial.php b/agc_2-X/branches/agc_2.2.0/www/agc/vicidial.php index 0aa557d8..8dd5bd2e 100644 --- a/agc_2-X/branches/agc_2.2.0/www/agc/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/www/agc/vicidial.php @@ -10518,7 +10518,7 @@ echo "\n"; height=460>
NEW MANUAL DIAL LEAD FOR :

Enter information below for the new lead you wish to call.
\n"; } diff --git a/agc_2-X/branches/agc_2.2.0/www/vicidial/admin.php b/agc_2-X/branches/agc_2.2.0/www/vicidial/admin.php index 08a33476..31b5ed07 100644 --- a/agc_2-X/branches/agc_2.2.0/www/vicidial/admin.php +++ b/agc_2-X/branches/agc_2.2.0/www/vicidial/admin.php @@ -23998,7 +23998,7 @@ if ($ADD==160000000000) $rslt=mysql_query($stmt, $link); $moh_to_print = mysql_num_rows($rslt); - echo "
TEXT-TO-SPEECH(TTS) LISTINGS:\n"; + echo "
MUSIC-ON-HOLD(MOH) LISTINGS:\n"; echo "
\n"; echo ""; echo ""; diff --git a/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi b/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi index f942a6e3..17cac24e 100644 --- a/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi +++ b/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi @@ -1537,7 +1537,7 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) ) if ($AGENTgrab > 0) { - $stmtA = "SELECT conf_exten,extension from vicidial_live_agents WHERE user='$AGENTuser';"; + $stmtA = "SELECT conf_exten,extension,server_ip from vicidial_live_agents WHERE user='$AGENTuser';"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; @@ -1549,6 +1549,7 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) ) $VDADconf_exten = $aryA[0]; $VDADextension = $aryA[1]; $VDADuser = $AGENTuser; + $VDADserver_ip = $aryA[2]; } $sthA->finish(); } @@ -1928,7 +1929,7 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) ) if ($AGENTgrab > 0) { - $stmtA = "SELECT conf_exten,extension from vicidial_live_agents WHERE user='$AGENTuser';"; + $stmtA = "SELECT conf_exten,extension,server_ip from vicidial_live_agents WHERE user='$AGENTuser';"; if ($AGILOG) {$agi_string = "|$stmtA|"; &agi_output;} $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; @@ -1940,6 +1941,7 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) ) $VDADconf_exten = $aryA[0]; $VDADextension = $aryA[1]; $VDADuser = $AGENTuser; + $VDADserver_ip = $aryA[2]; } $sthA->finish(); } diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 0aa557d8..8dd5bd2e 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -10518,7 +10518,7 @@ echo "\n";
MOH ID
height=460>
NEW MANUAL DIAL LEAD FOR :

Enter information below for the new lead you wish to call.
\n"; } diff --git a/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php b/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php index 99338a0b..3a306d95 100644 --- a/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php +++ b/agc_2-X/trunk/www/vicidial/AST_timeonVDADall.php @@ -124,13 +124,11 @@ $stmt = "SELECT use_non_latin,outbound_autodial_active FROM system_settings;"; $rslt=mysql_query($stmt, $link); if ($DB) {echo "$stmt\n";} $qm_conf_ct = mysql_num_rows($rslt); -$i=0; -while ($i < $qm_conf_ct) +if ($qm_conf_ct > 0) { $row=mysql_fetch_row($rslt); $non_latin = $row[0]; $outbound_autodial_active = $row[1]; - $i++; } ##### END SETTINGS LOOKUP ##### ########################################### diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 08a33476..31b5ed07 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -23998,7 +23998,7 @@ if ($ADD==160000000000) $rslt=mysql_query($stmt, $link); $moh_to_print = mysql_num_rows($rslt); - echo "
TEXT-TO-SPEECH(TTS) LISTINGS:\n"; + echo "
MUSIC-ON-HOLD(MOH) LISTINGS:\n"; echo "
\n"; echo ""; echo "";
MOH ID