diff --git a/www/agc/vdc_db_query.php b/www/agc/vdc_db_query.php
index 3e91fc18..914a5ead 100644
--- a/www/agc/vdc_db_query.php
+++ b/www/agc/vdc_db_query.php
@@ -216,10 +216,11 @@
# 90917-2246 - Fixed auto-alt-dial DNC check bug
# 90924-1544 - Added List callerid override option
# 90930-1638 - Added agent_territories feature
+# 91012-0535 - Fixed User territory no-hopper dial bug
#
-$version = '2.2.0-125';
-$build = '90930-1638';
+$version = '2.2.0-126';
+$build = '91012-0535';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=256;
$one_mysql_log=0;
@@ -1413,9 +1414,27 @@ if ($ACTION == 'manDiaLnextCaLL')
$territory = $row[1];
}
+ $agent_territories='';
+ $stmt="SELECT agent_territories FROM vicidial_live_agents where user='$user';";
+ $rslt=mysql_query($stmt, $link);
+ if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00XXX',$user,$server_ip,$session_name,$one_mysql_log);}
+ $userterrVLA_ct = mysql_num_rows($rslt);
+ if ($DB) {echo "$userterrVLA_ct|$stmt\n";}
+ if ($userterrVLA_ct > 0)
+ {
+ $row=mysql_fetch_row($rslt);
+ $agent_territories = $row[0];
+ }
+ if (strlen($agent_territories) > 3)
+ {
+ $agent_territoriesSQL = preg_replace('/-$/','',$agent_territories);
+ $agent_territoriesSQL = preg_replace('/ $|^ /','',$agent_territoriesSQL);
+ $territory = preg_replace('/ /',"','",$agent_territoriesSQL);
+ }
+
$adooSQL = '';
if (eregi("USER",$agent_dial_owner_only)) {$adooSQL = "and owner='$user'";}
- if (eregi("TERRITORY",$agent_dial_owner_only)) {$adooSQL = "and owner='$territory'";}
+ if (eregi("TERRITORY",$agent_dial_owner_only)) {$adooSQL = "and owner IN('$territory')";}
if (eregi("USER_GROUP",$agent_dial_owner_only)) {$adooSQL = "and owner='$user_group'";}
$order_stmt = '';
diff --git a/www/vicidial/user_status.php b/www/vicidial/user_status.php
index 42c29907..23a62362 100644
--- a/www/vicidial/user_status.php
+++ b/www/vicidial/user_status.php
@@ -11,6 +11,7 @@
# 90208-0511 - Added link to user multi-day status report
# 90310-0741 - Added admin header
# 90508-0644 - Changed to PHP long tags
+# 91012-0536 - Added selected territories display
#
header ("Content-type: text/html; charset=utf-8");
@@ -67,35 +68,35 @@ $ip = getenv("REMOTE_ADDR");
if (!isset($begin_date)) {$begin_date = $TODAY;}
if (!isset($end_date)) {$end_date = $TODAY;}
- $stmt="SELECT count(*) from vicidial_users where user='$PHP_AUTH_USER' and pass='$PHP_AUTH_PW' and user_level > 7 and view_reports='1';";
- if ($non_latin > 0) { $rslt=mysql_query("SET NAMES 'UTF8'");}
- $rslt=mysql_query($stmt, $link);
- $row=mysql_fetch_row($rslt);
- $auth=$row[0];
+$stmt="SELECT count(*) from vicidial_users where user='$PHP_AUTH_USER' and pass='$PHP_AUTH_PW' and user_level > 7 and view_reports='1';";
+if ($non_latin > 0) { $rslt=mysql_query("SET NAMES 'UTF8'");}
+$rslt=mysql_query($stmt, $link);
+$row=mysql_fetch_row($rslt);
+$auth=$row[0];
$fp = fopen ("./project_auth_entries.txt", "a");
$date = date("r");
$ip = getenv("REMOTE_ADDR");
$browser = getenv("HTTP_USER_AGENT");
- if( (strlen($PHP_AUTH_USER)<2) or (strlen($PHP_AUTH_PW)<2) or (!$auth))
+if( (strlen($PHP_AUTH_USER)<2) or (strlen($PHP_AUTH_PW)<2) or (!$auth))
{
Header("WWW-Authenticate: Basic realm=\"VICI-PROJECTS\"");
Header("HTTP/1.0 401 Unauthorized");
echo "Invalid Username/Password: |$PHP_AUTH_USER|$PHP_AUTH_PW|\n";
exit;
}
- else
+else
{
if($auth>0)
{
- $stmt="SELECT full_name,change_agent_campaign,modify_timeclock_log from vicidial_users where user='$PHP_AUTH_USER' and pass='$PHP_AUTH_PW'";
- $rslt=mysql_query($stmt, $link);
- $row=mysql_fetch_row($rslt);
- $LOGfullname = $row[0];
- $change_agent_campaign = $row[1];
- $modify_timeclock_log = $row[2];
+ $stmt="SELECT full_name,change_agent_campaign,modify_timeclock_log from vicidial_users where user='$PHP_AUTH_USER' and pass='$PHP_AUTH_PW'";
+ $rslt=mysql_query($stmt, $link);
+ $row=mysql_fetch_row($rslt);
+ $LOGfullname = $row[0];
+ $change_agent_campaign = $row[1];
+ $modify_timeclock_log = $row[2];
if ($webroot_writable > 0)
{
fwrite ($fp, "VICIDIAL|GOOD|$date|$PHP_AUTH_USER|$PHP_AUTH_PW|$ip|$browser|$LOGfullname|\n");
@@ -119,7 +120,7 @@ $browser = getenv("HTTP_USER_AGENT");
$full_name = $row[0];
$user_group = $row[1];
- $stmt="SELECT * from vicidial_live_agents where user='" . mysql_real_escape_string($user) . "';";
+ $stmt="SELECT live_agent_id,user,server_ip,conf_exten,extension,status,lead_id,campaign_id,uniqueid,callerid,channel,random_id,last_call_time,last_update_time,last_call_finish,closer_campaigns,call_server_ip,user_level,comments,campaign_weight,calls_today,external_hangup,external_status,external_pause,external_dial,agent_log_id,last_state_change,agent_territories from vicidial_live_agents where user='" . mysql_real_escape_string($user) . "';";
$rslt=mysql_query($stmt, $link);
if ($DB) {echo "$stmt\n";}
$agents_to_print = mysql_num_rows($rslt);
@@ -134,6 +135,7 @@ $browser = getenv("HTTP_USER_AGENT");
$Acampaign = $row[7];
$Alast_call = $row[14];
$Acl_campaigns = $row[15];
+ $agent_territories = $row[27];
$i++;
}
@@ -286,8 +288,8 @@ if ( ( ($stage == "tc_log_user_OUT") or ($stage == "tc_log_user_IN") ) and ($mod
$stmt="INSERT INTO vicidial_timeclock_status set status='START', user='$user', user_group='$user_group', event_epoch='$StarTtimE', ip_address='$ip';";
if ($DB) {echo "$stmt\n";}
$rslt=mysql_query($stmt, $link);
- $status='START';
- $totTIME_HMS='0:00:00';
+ $status='START';
+ $totTIME_HMS='0:00:00';
$affected_rows = mysql_affected_rows($link);
print "\n";
}
@@ -409,6 +411,10 @@ if ($agents_to_print > 0)
echo "| status: | $Astatus |
\n";
echo "| hungup last call at: | $Alast_call |
\n";
echo "| Closer groups: | $Acl_campaigns |
\n";
+ if ($user_territories_active > 0)
+ {
+ echo "| Selected Territories: | $agent_territories |
\n";
+ }
echo "\n
\n";
@@ -419,17 +425,16 @@ if ($agents_to_print > 0)
echo "\n";
echo "\n";
echo "Current Campaign: \n";
echo "
\n";
-
echo "