Added manual dial override as campaign option

Added agent blind monitoring alert campaign options Added inbound custom call id display options Added optional phone codec settings Added ability to block user information in the real-=time report by viewing user Update Italian agent build in trunk git-svn-id: svn://192.168.202.10@1417 3d104415-ff17-0410-8863-d5cf3c621b8a
2010-04-25 06:03:36 +00:00
parent 98eeddc290
commit f5f59f6eaa
21 changed files with 3828 additions and 2207 deletions
@@ -135,12 +135,12 @@ $rslt=mysql_query($stmt, $link);
 $row=mysql_fetch_row($rslt);
 $auth=$row[0];

-  if( (strlen($user)<2) or (strlen($pass)<2) or ($auth==0))
+if( (strlen($user)<2) or (strlen($pass)<2) or ($auth==0))
 	{
    echo "Username/Password non validi: |$user|$pass|\n";
    exit;
 	}
-  else
+else
 	{

 	if( (strlen($server_ip)<6) or (!isset($server_ip)) or ( (strlen($session_name)<12) or (!isset($session_name)) ) )
@@ -4,46 +4,49 @@
 #
 # database connection settings and some global web settings
 #
-# Copyright (C) 2009  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
+# Copyright (C) 2010  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 if ( file_exists("/etc/astguiclient.conf") )
-{
-$DBCagc = file("/etc/astguiclient.conf");
-foreach ($DBCagc as $DBCline) 
 	{
-	$DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline);
-	if (ereg("^PATHlogs", $DBCline))
-		{$PATHlogs = $DBCline;   $PATHlogs = preg_replace("/.*=/","",$PATHlogs);}
-	if (ereg("^PATHweb", $DBCline))
-		{$WeBServeRRooT = $DBCline;   $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);}
-	if (ereg("^VARDB_server", $DBCline))
-		{$VARDB_server = $DBCline;   $VARDB_server = preg_replace("/.*=/","",$VARDB_server);}
-	if (ereg("^VARDB_database", $DBCline))
-		{$VARDB_database = $DBCline;   $VARDB_database = preg_replace("/.*=/","",$VARDB_database);}
-	if (ereg("^VARDB_user", $DBCline))
-		{$VARDB_user = $DBCline;   $VARDB_user = preg_replace("/.*=/","",$VARDB_user);}
-	if (ereg("^VARDB_pass", $DBCline))
-		{$VARDB_pass = $DBCline;   $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);}
-	if (ereg("^VARDB_port", $DBCline))
-		{$VARDB_port = $DBCline;   $VARDB_port = preg_replace("/.*=/","",$VARDB_port);}
+	$DBCagc = file("/etc/astguiclient.conf");
+	foreach ($DBCagc as $DBCline) 
+		{
+		$DBCline = preg_replace("/ |>|\n|\r|\t|\#.*|;.*/","",$DBCline);
+		if (ereg("^PATHlogs", $DBCline))
+			{$PATHlogs = $DBCline;   $PATHlogs = preg_replace("/.*=/","",$PATHlogs);}
+		if (ereg("^PATHweb", $DBCline))
+			{$WeBServeRRooT = $DBCline;   $WeBServeRRooT = preg_replace("/.*=/","",$WeBServeRRooT);}
+		if (ereg("^VARserver_ip", $DBCline))
+			{$WEBserver_ip = $DBCline;   $WEBserver_ip = preg_replace("/.*=/","",$WEBserver_ip);}
+		if (ereg("^VARDB_server", $DBCline))
+			{$VARDB_server = $DBCline;   $VARDB_server = preg_replace("/.*=/","",$VARDB_server);}
+		if (ereg("^VARDB_database", $DBCline))
+			{$VARDB_database = $DBCline;   $VARDB_database = preg_replace("/.*=/","",$VARDB_database);}
+		if (ereg("^VARDB_user", $DBCline))
+			{$VARDB_user = $DBCline;   $VARDB_user = preg_replace("/.*=/","",$VARDB_user);}
+		if (ereg("^VARDB_pass", $DBCline))
+			{$VARDB_pass = $DBCline;   $VARDB_pass = preg_replace("/.*=/","",$VARDB_pass);}
+		if (ereg("^VARDB_port", $DBCline))
+			{$VARDB_port = $DBCline;   $VARDB_port = preg_replace("/.*=/","",$VARDB_port);}
+		}
+	}
+else
+	{
+	#defaults for DB connection
+	$VARDB_server = 'localhost';
+	$VARDB_port = '3306';
+	$VARDB_user = 'cron';
+	$VARDB_pass = '1234';
+	$VARDB_database = '1234';
+	$WeBServeRRooT = '/usr/local/apache2/htdocs';
 	}

-}
-else
-{
-#defaults for DB connection
-$VARDB_server = 'localhost';
-$VARDB_user = 'cron';
-$VARDB_pass = '1234';
-$VARDB_database = '1234';
-$WeBServeRRooT = '/usr/local/apache2/htdocs';
-}
-
-$link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass");
-if (!$link) {
+$link=mysql_connect("$VARDB_server:$VARDB_port", "$VARDB_user", "$VARDB_pass");
+if (!$link) 
+	{
    die('MySQL connect ERROR: ' . mysql_error());
-}
-mysql_select_db("$VARDB_database",$link);
+	}
+mysql_select_db("$VARDB_database");

 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
@@ -1,7 +1,7 @@
 <?php
 # manager_send.php    version 2.2.0
 # 
-# Copyright (C) 2009  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
+# Copyright (C) 2010  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 # This script is designed purely to insert records into the vicidial_manager table to signal Actions to an asterisk server
 # This script depends on the server_ip being sent and also needs to have a valid user/pass from the vicidial_users table
@@ -41,6 +41,7 @@
 #  - $agent_dialed_number - ('1','')
 #  - $agent_dialed_type - ('MANUAL_OVERRIDE','MANUAL_DIALNOW','MANUAL_PREVIEW',...)
 #  - $nodeletevdac - ('0','1')
+#  - $alertCID - ('0','1')
 #
 # CHANGELOG:
 # 50401-1002 - First build of script, Hangup function only
@@ -94,10 +95,12 @@
 # 91112-1110 - Added CALLOUTBOUND value to QM entry lookup
 # 91205-2103 - Code cleanup
 # 91213-1208 - Added queue_position to queue_log COMPLETE... records
+# 100327-0846 - Fix for list_id override answering machine message
+# 100423-2304 - Added alertCID
 #

-$version = '2.2.0-46';
-$build = '91213-1208';
+$version = '2.2.0-48';
+$build = '100423-2304';
 $mel=1;					# Mysql Error Log enabled = 1
 $mysql_log_count=85;
 $one_mysql_log=0;
@@ -185,6 +188,8 @@ if (isset($_GET["agent_dialed_type"]))				{$agent_dialed_type=$_GET["agent_diale
 	elseif (isset($_POST["agent_dialed_type"]))		{$agent_dialed_type=$_POST["agent_dialed_type"];}
 if (isset($_GET["nodeletevdac"]))				{$nodeletevdac=$_GET["nodeletevdac"];}
 	elseif (isset($_POST["nodeletevdac"]))		{$nodeletevdac=$_POST["nodeletevdac"];}
+if (isset($_GET["alertCID"]))				{$alertCID=$_GET["alertCID"];}
+	elseif (isset($_POST["alertCID"]))		{$alertCID=$_POST["alertCID"];}

 header ("Content-type: text/html; charset=utf-8");
 header ("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
@@ -390,7 +395,7 @@ if ($ACTION=="OriginateVDRelogin")

 if ($ACTION=="Originate")
 	{
-	if ( (strlen($exten)<1) or (strlen($channel)<1) or (strlen($ext_context)<1) or (strlen($queryCID)<10) )
+	if ( (strlen($exten)<1) or (strlen($channel)<1) or (strlen($ext_context)<1) or ( (strlen($queryCID)<10) && ($alertCID < 1) ) )
 		{
 		echo "ERROR Exten $exten non è valido or queryCID $queryCID non è valido, Originate comando non inserito\n";
 		}
@@ -734,39 +739,6 @@ if ($ACTION=="RedirectVD")
 			$rslt=mysql_query($stmt, $link);
 			if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02024',$user,$server_ip,$session_name,$one_mysql_log);}
 			}
-		else
-			{
-			if (strlen($lead_id) > 1)
-				{
-				$list_id='';
-				$stmt = "SELECT list_id FROM vicidial_list where lead_id='$lead_id';";
-				$rslt=mysql_query($stmt, $link);
-				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02084',$user,$server_ip,$session_name,$one_mysql_log);}
-				if ($DB) {echo "$stmt\n";}
-				$lio_ct = mysql_num_rows($rslt);
-				if ($lio_ct > 0)
-					{
-					$row=mysql_fetch_row($rslt);
-					$list_id =	$row[0];
-
-					if (strlen($list_id) > 1)
-						{
-						$stmt = "SELECT am_message_exten_override FROM vicidial_lists where list_id='$list_id';";
-						$rslt=mysql_query($stmt, $link);
-						if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'02085',$user,$server_ip,$session_name,$one_mysql_log);}
-						if ($DB) {echo "$stmt\n";}
-						$lio_ct = mysql_num_rows($rslt);
-						if ($lio_ct > 0)
-							{
-							$row=mysql_fetch_row($rslt);
-							$am_message_exten_override =	$row[0];
-							if (strlen($am_message_exten_override) > 0) {$exten = "$am_message_exten_override";}
-							}
-						}
-					}
-				}
-
-			}
 		$ACTION="Redirect";
 		}
 	}
@@ -11,10 +11,11 @@
 # 91204-1913 - Added recording_filename and recording_id variables
 # 91211-1103 - Added user_custom_... variables
 # 100116-0702 - Added preset variables
+# 100127-1611 - Added ignore_list_script_override option
 #

-$version = '2.2.0-5';
-$build = '100116-0702';
+$version = '2.2.0-6';
+$build = '100127-1611';

 require("dbconnect.php");

@@ -177,7 +178,6 @@ $CIDdate = date("mdHis");
 $ENTRYdate = date("YmdHis");
 $MT[0]='';
 $agents='@agents';
-
 $script_height = ($script_height - 20);

 $IFRAME=0;
@@ -252,6 +252,19 @@ if (strlen($in_script) < 1)
 else
 	{$call_script = $in_script;}

+$ignore_list_script_override='N';
+$stmt = "SELECT ignore_list_script_override FROM vicidial_inbound_groups where group_id='$group';";
+$rslt=mysql_query($stmt, $link);
+if ($DB) {echo "$stmt\n";}
+$ilso_ct = mysql_num_rows($rslt);
+if ($ilso_ct > 0)
+	{
+	$row=mysql_fetch_row($rslt);
+	$ignore_list_script_override =		$row[0];
+	}
+if ($ignore_list_script_override=='Y')
+	{$ignore_list_script=1;}
+
 if ($ignore_list_script < 1)
 	{
 	$stmt="SELECT agent_script_override from vicidial_lists where list_id='$list_id';";
@@ -262,6 +275,12 @@ if ($ignore_list_script < 1)
 		{$call_script = $agent_script_override;}
 	}

+$stmt="SELECT list_name,list_description from vicidial_lists where list_id='$list_id';";
+$rslt=mysql_query($stmt, $link);
+$row=mysql_fetch_row($rslt);
+$list_name =			$row[0];
+$list_description =		$row[1];
+
 $stmt="SELECT script_name,script_text from vicidial_scripts where script_id='$call_script';";
 $rslt=mysql_query($stmt, $link);
 $row=mysql_fetch_row($rslt);
@@ -275,6 +294,8 @@ if (eregi("iframe src",$script_text))
 	$vendor_id = eregi_replace(' ','+',$vendor_id);
 	$vendor_lead_code = eregi_replace(' ','+',$vendor_lead_code);
 	$list_id = eregi_replace(' ','+',$list_id);
+	$list_name = eregi_replace(' ','+',$list_name);
+	$list_description = eregi_replace(' ','+',$list_description);
 	$gmt_offset_now = eregi_replace(' ','+',$gmt_offset_now);
 	$phone_code = eregi_replace(' ','+',$phone_code);
 	$phone_number = eregi_replace(' ','+',$phone_number);
@@ -348,6 +369,8 @@ $script_text = eregi_replace('--A--lead_id--B--',"$lead_id",$script_text);
 $script_text = eregi_replace('--A--vendor_id--B--',"$vendor_id",$script_text);
 $script_text = eregi_replace('--A--vendor_lead_code--B--',"$vendor_lead_code",$script_text);
 $script_text = eregi_replace('--A--list_id--B--',"$list_id",$script_text);
+$script_text = eregi_replace('--A--list_name--B--',"$list_name",$script_text);
+$script_text = eregi_replace('--A--list_description--B--',"$list_description",$script_text);
 $script_text = eregi_replace('--A--gmt_offset_now--B--',"$gmt_offset_now",$script_text);
 $script_text = eregi_replace('--A--phone_code--B--',"$phone_code",$script_text);
 $script_text = eregi_replace('--A--phone_number--B--',"$phone_number",$script_text);
@@ -66,7 +66,8 @@ OTHER CHANGES:
 	consultative transfer sessions

 13. Added AGENTONLY Scheduled Callbacks display options to allow the Callbacks
-	link line in the agent interface to show as red and/or blink
+	link line in the agent interface to show as red and/or blink. Also, 
+	added option to have callbacks count display only triggered callbacks

 14. Added carrier log display option to Real-time report to show the hangup
 	causes for the last 24/6/1 hours and 15/5/1 minutes of outbound calls
@@ -112,6 +113,26 @@ OTHER CHANGES:

 23. Added ability to search logs from admin search lead page

+24. Added more login information to the User Stats page including session,
+	server, phone and computer IP
+
+25. Added Manual Dial override option to campaigns to allow overriding of 
+	user options for manual dial permissions
+
+26. Added campaign option for alerting the agent when they are being blind
+	monitored. Options include an alert, a notice and an audio alert
+
+27. Added inbound custom call ID display and logging feature, also added 
+	vicidial_log_extended which stores more useful call log info
+
+28. Added optional phone codecs definitions as well as system-wide defaults
+	for codec definition. Default for both is blank which will keep 
+	whatever is set at the top of the iax.conf or sip.conf files
+
+29. Added option to allow user information to be blocked form the real-time
+	report by user login(the user viewing the report)
+
+



@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# agi-VDAD_ALL_inbound.agi version 2.2.0
+# agi-VDAD_ALL_inbound.agi version 2.4
 # 
 # runs when a call comes in from an inbound call. This script will 
 # send the calls out to the closers that are logged in.
@@ -68,7 +68,7 @@
 #exten => _99909*.,2,AGI(agi-VDAD_ALL_inbound.agi)
 #exten => _99909*.,3,Hangup
 #
-# Copyright (C) 2009  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
+# Copyright (C) 2010  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 # changes:
 # 70828-0924 - First Build
@@ -124,6 +124,7 @@
 # 100226-0927 - Fixed reinsert issue in vicidial_auto_calls table with auto_call_id
 # 100319-0614 - Added extension group remote agent feature
 # 100414-2046 - Added extension_appended_cidname option
+# 100424-1234 - Added unique status options and extended logging
 #

 $script = 'agi-VDAD_ALL_inbound.agi';
@@ -134,7 +135,7 @@ $start_moh=1;
 $at='@';
 $S='*';
 $mel=1;					# Mysql Error Log enabled = 1
-$mysql_log_count=143;
+$mysql_log_count=149;
 $one_mysql_log=0;


@@ -308,6 +309,20 @@ if ( (!$callerid) or ($callerid =~ /unknown/) )
 	{$callerid = $calleridname;}
 $originalCID = $callerid;

+##### find out if this call is already in the vicidial_log_extended table
+$VLEcount=0;
+$stmtA = "SELECT count(*) FROM vicidial_log_extended where uniqueid='$uniqueid';";
+$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
+$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
+$sthArows=$sthA->rows;
+	$dbhP=$dbhA;   $mysql_count='02144';   $MEL_aff_rows=$sthArows;   &mysql_error_logging;
+if ($sthArows > 0)
+	{
+	@aryA = $sthA->fetchrow_array;
+	$VLEcount = 			$aryA[0];
+	}
+$sthA->finish();
+
 $user_unavailable_action='';
 ##### special processing for DID forwarded calls  "99909*1*"
 if ($extension =~ /^999\d\d\*/)
@@ -529,7 +544,7 @@ $sthA->finish();

 ### Grab inbound groups values from the database
 $cbc=0;
-$stmtA = "SELECT call_time_id,after_hours_action,after_hours_message_filename,after_hours_exten,after_hours_voicemail,welcome_message_filename,moh_context,onhold_prompt_filename,prompt_interval,agent_alert_exten,agent_alert_delay,drop_call_seconds,drop_action,drop_exten,next_agent_call,voicemail_ext,queue_priority,drop_inbound_group,afterhours_xfer_group,play_place_in_line,play_estimate_hold_time,hold_time_option,hold_time_option_seconds,hold_time_option_exten,hold_time_option_voicemail,hold_time_option_xfer_group,hold_time_option_callback_filename,hold_time_option_callback_list_id,hold_recall_xfer_group,no_delay_call_route,play_welcome_message,no_agent_no_queue,no_agent_action,no_agent_action_value,extension_appended_cidname FROM vicidial_inbound_groups where group_id = '$channel_group';";
+$stmtA = "SELECT call_time_id,after_hours_action,after_hours_message_filename,after_hours_exten,after_hours_voicemail,welcome_message_filename,moh_context,onhold_prompt_filename,prompt_interval,agent_alert_exten,agent_alert_delay,drop_call_seconds,drop_action,drop_exten,next_agent_call,voicemail_ext,queue_priority,drop_inbound_group,afterhours_xfer_group,play_place_in_line,play_estimate_hold_time,hold_time_option,hold_time_option_seconds,hold_time_option_exten,hold_time_option_voicemail,hold_time_option_xfer_group,hold_time_option_callback_filename,hold_time_option_callback_list_id,hold_recall_xfer_group,no_delay_call_route,play_welcome_message,no_agent_no_queue,no_agent_action,no_agent_action_value,extension_appended_cidname,uniqueid_status_display,uniqueid_status_prefix FROM vicidial_inbound_groups where group_id = '$channel_group';";
 $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 $sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
 $sthArows=$sthA->rows;
@@ -577,7 +592,14 @@ while ($sthArows > $cbc)
 	$no_agent_action =					$aryA[32];
 	$no_agent_action_value =			$aryA[33];
 	$extension_appended_cidname =		$aryA[34];
-
+	$uniqueid_status_display =			$aryA[35];
+	$uniqueid_status_prefix =			$aryA[36];
+	
+	$custom_call_id='';
+	if ($uniqueid_status_display =~ /ENABLED/)
+		{$custom_call_id = "$uniqueid";}
+	if ($uniqueid_status_display =~ /ENABLED_PREFIX/)
+		{$custom_call_id = "$uniqueid_status_prefix$uniqueid";}
 	$cbc++;
 	}
 $sthA->finish();
@@ -803,6 +825,15 @@ if ( ($hm < $ct_default_start) || ($hm > $ct_default_stop) )
 	$sthA->finish();
 	if ($AGILOG) {$agi_string = "--  AH VDCL vcl insert: |$affected_rows|$insert_lead_id|$insert_close_id|\n|$stmtA|";   &agi_output;}

+	if ($VLEcount < 1)
+		{
+		$stmtA = "INSERT INTO vicidial_log_extended set uniqueid='$uniqueid',server_ip='$VARserver_ip',call_date='$now_date',lead_id = '$insert_lead_id',caller_code='$callerid',custom_call_id='$custom_call_id';";
+		$affected_rows = $dbhA->do($stmtA);
+			$dbhP=$dbhA;   $mysql_count='02145';   $MEL_aff_rows=$affected_rows;   &mysql_error_logging;
+		if ($AGILOG) {$agi_string = "--  AH VLE insert: |$affected_rows|\n|$stmtA|";   &agi_output;}
+		$VLEcount++;
+		}
+
 	$stmtA = "UPDATE vicidial_list set status='AFTHRS' where lead_id = '$insert_lead_id';";
 	$affected_rows = $dbhA->do($stmtA);
 		$dbhP=$dbhA;   $mysql_count='02018';   $MEL_aff_rows=$affected_rows;   &mysql_error_logging;
@@ -978,6 +1009,15 @@ if ($no_agent_no_queue =~ /Y|NO_PAUSED/)
 		$sthA->finish();
 		if ($AGILOG) {$agi_string = "--  NA VDCL vcl insert: |$affected_rows|$insert_lead_id|$insert_close_id|\n|$stmtA|";   &agi_output;}

+		if ($VLEcount < 1)
+			{
+			$stmtA = "INSERT INTO vicidial_log_extended set uniqueid='$uniqueid',server_ip='$VARserver_ip',call_date='$now_date',lead_id = '$insert_lead_id',caller_code='$callerid',custom_call_id='$custom_call_id';";
+			$affected_rows = $dbhA->do($stmtA);
+				$dbhP=$dbhA;   $mysql_count='02146';   $MEL_aff_rows=$affected_rows;   &mysql_error_logging;
+			if ($AGILOG) {$agi_string = "--  AH VLE insert: |$affected_rows|\n|$stmtA|";   &agi_output;}
+			$VLEcount++;
+			}
+
 		$stmtA = "UPDATE vicidial_list set status='NANQUE' where lead_id = '$insert_lead_id';";
 		$affected_rows = $dbhA->do($stmtA);
 			$dbhP=$dbhA;   $mysql_count='02106';   $MEL_aff_rows=$affected_rows;   &mysql_error_logging;
@@ -1374,6 +1414,15 @@ if ($sthArows > 0)
 $sthA->finish();
 if ($AGILOG) {$agi_string = "--    VDCL : |$insert_lead_id|$insert_xfer_id|$insert_close_id|insert to vicidial_closer_log";   &agi_output;}

+if ($VLEcount < 1)
+	{
+	$stmtA = "INSERT INTO vicidial_log_extended set uniqueid='$uniqueid',server_ip='$VARserver_ip',call_date='$now_date',lead_id = '$insert_lead_id',caller_code='$callerid',custom_call_id='$custom_call_id';";
+	$affected_rows = $dbhA->do($stmtA);
+		$dbhP=$dbhA;   $mysql_count='02147';   $MEL_aff_rows=$affected_rows;   &mysql_error_logging;
+	if ($AGILOG) {$agi_string = "--  AH VLE insert: |$affected_rows|\n|$stmtA|";   &agi_output;}
+	$VLEcount++;
+	}
+



@@ -1974,7 +2023,7 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) )
 						$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 						$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
 						$sthArows=$sthA->rows;
-							$dbhP=$dbhA;   $mysql_count='02XXX';   $MEL_aff_rows=$sthArows;   &mysql_error_logging;
+							$dbhP=$dbhA;   $mysql_count='02148';   $MEL_aff_rows=$sthArows;   &mysql_error_logging;
 						while ($sthArows > $eac_cbc)
 							{
 							@aryA = $sthA->fetchrow_array;
@@ -2474,7 +2523,7 @@ while ( ($drop_timer <= $DROP_TIME) && ($wait_in_queue > 0) )
 						$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 						$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
 						$sthArows=$sthA->rows;
-							$dbhP=$dbhA;   $mysql_count='02XXX';   $MEL_aff_rows=$sthArows;   &mysql_error_logging;
+							$dbhP=$dbhA;   $mysql_count='02149';   $MEL_aff_rows=$sthArows;   &mysql_error_logging;
 						while ($sthArows > $eac_cbc)
 							{
 							@aryA = $sthA->fetchrow_array;
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# agi-VDAD_ALL_outbound.agi version 2.2.0
+# agi-VDAD_ALL_outbound.agi version 2.4
 # 
 # runs when an outbound call is answered. This script will 
 # send the calls out to the agents that are logged in.
@@ -74,12 +74,13 @@
 # 100205-1024 - Fixed CPD send to message
 # 100319-0610 - Added extension group remote agent feature
 # 100414-2156 - Added extension_appended_cidname option
+# 100424-1341 - Added extended logging
 #

 $script = 'agi-VDAD_ALL_outbound.agi';
 $AGILOG = '0';
 $mel=1;					# Mysql Error Log enabled = 1
-$mysql_log_count=67;
+$mysql_log_count=69;
 $one_mysql_log=0;


@@ -625,6 +626,12 @@ if ($affected_rows > 0)

 	if ($AGILOG) {$agi_string = "--    VDAD : |$VDADlead_id|$CIDlead_id|insert to vicidial_log: $uniqueid";   &agi_output;}

+	$stmtA = "INSERT INTO vicidial_log_extended set uniqueid='$uniqueid',server_ip='$VARserver_ip',call_date='$SQLdate',lead_id = '$CIDlead_id',caller_code='$callerid',custom_call_id='';";
+	$affected_rows = $dbhA->do($stmtA);
+		$dbhP=$dbhA;   $mysql_count='01067';   $MEL_aff_rows=$affected_rows;   &mysql_error_logging;
+	if ($AGILOG) {$agi_string = "--  VDAD VLE insert: |$affected_rows|\n|$stmtA|";   &agi_output;}
+
+
 	#############################################
 	##### START QUEUEMETRICS LOGGING LOOKUP #####
 	$stmtA = "SELECT enable_queuemetrics_logging,queuemetrics_server_ip,queuemetrics_dbname,queuemetrics_login,queuemetrics_pass,queuemetrics_log_id,queuemetrics_eq_prepend FROM system_settings;";
@@ -1560,7 +1567,7 @@ while ($drop_timer <= $DROP_TIME)
 						$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 						$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
 						$sthArows=$sthA->rows;
-							$dbhP=$dbhA;   $mysql_count='01XXX';   $MEL_aff_rows=$sthArows;   &mysql_error_logging;
+							$dbhP=$dbhA;   $mysql_count='01068';   $MEL_aff_rows=$sthArows;   &mysql_error_logging;
 						while ($sthArows > $eac_cbc)
 							{
 							@aryA = $sthA->fetchrow_array;
@@ -1849,7 +1856,7 @@ while ($drop_timer <= $DROP_TIME)
 						$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 						$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
 						$sthArows=$sthA->rows;
-							$dbhP=$dbhA;   $mysql_count='01XXX';   $MEL_aff_rows=$sthArows;   &mysql_error_logging;
+							$dbhP=$dbhA;   $mysql_count='01069';   $MEL_aff_rows=$sthArows;   &mysql_error_logging;
 						while ($sthArows > $eac_cbc)
 							{
 							@aryA = $sthA->fetchrow_array;
@@ -50,6 +50,7 @@
 # 100220-1410 - Added System Settings and Servers custom dialplan entries
 # 100225-2020 - Change voicemail configuration to use voicemail.conf
 # 100312-1012 - Changed TIMEOUT Call Menu function to work with AGI routes
+# 100424-2121 - Added codecs options for phones
 #

 $DB=0; # Debug flag
@@ -94,6 +95,11 @@ if (length($ARGV[0])>1)
 			$DBX=1;
 			print "\n----- SUPER-DUPER DEBUGGING -----\n\n";
 			}
+		if ($args =~ /--debugXXX/i)
+			{
+			$DBXXX=1;
+			print "\n----- TRIPLE DEBUGGING -----\n\n";
+			}
 		if ($args =~ /-t/i)
 			{
 			$TEST=1;
@@ -742,7 +748,7 @@ if ($timeclock_end_of_day_NOW > 0)
 ################################################################################

 ##### Get the settings from system_settings #####
-$stmtA = "SELECT sounds_central_control_active,active_voicemail_server,custom_dialplan_entry FROM system_settings;";
+$stmtA = "SELECT sounds_central_control_active,active_voicemail_server,custom_dialplan_entry,default_codecs FROM system_settings;";
 #	print "$stmtA\n";
 $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 $sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
@@ -753,8 +759,10 @@ if ($sthArows > 0)
 	$sounds_central_control_active =	$aryA[0];
 	$active_voicemail_server =			$aryA[1];
 	$SScustom_dialplan_entry =			$aryA[2];
+	$SSdefault_codecs =					$aryA[3];
 	}
 $sthA->finish();
+if ($DBXXX > 0) {print "SYSTEM SETTINGS:     $sounds_central_control_active|$active_voicemail_server|$SScustom_dialplan_entry|$SSdefault_codecs\n";}
 if ( ($active_voicemail_server =~ /$server_ip/) && ((length($active_voicemail_server)) eq (length($server_ip))) )
 	{
 	$THISserver_voicemail=1;
@@ -1218,7 +1226,7 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r


 	##### BEGIN Generate the IAX phone entries #####
-	$stmtA = "SELECT extension,dialplan_number,voicemail_id,pass,template_id,conf_override,email,template_id,conf_override,outbound_cid,fullname,phone_context,phone_ring_timeout,conf_secret,delete_vm_after_email FROM phones where server_ip='$server_ip' and protocol='IAX2' and active='Y' order by extension;";
+	$stmtA = "SELECT extension,dialplan_number,voicemail_id,pass,template_id,conf_override,email,template_id,conf_override,outbound_cid,fullname,phone_context,phone_ring_timeout,conf_secret,delete_vm_after_email,codecs_list,codecs_with_template FROM phones where server_ip='$server_ip' and protocol='IAX2' and active='Y' order by extension;";
 	#	print "$stmtA\n";
 	$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 	$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
@@ -1242,6 +1250,11 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r
 		$phone_ring_timeout[$i] =		$aryA[12];
 		$conf_secret[$i] =				$aryA[13];
 		$delete_vm_after_email[$i] =	$aryA[14];
+		$codecs_list[$i] =				$aryA[15];
+		$codecs_with_template[$i] =		$aryA[16];
+		if ( (length($SSdefault_codecs) > 2) && (length($codecs_list[$i]) < 3) )
+			{$codecs_list[$i] = $SSdefault_codecs;}
+		
 		$i++;
 		}
 	$sthA->finish();
@@ -1251,6 +1264,25 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r
 		{
 		$conf_entry_written=0;
 		$template_contents[$i]='';
+		$Pcodec='';
+		if (length($codecs_list[$i]) > 2)
+			{
+			if ($codecs_list[$i] =~ /gsm/i)			{$Pcodec .= "allow=gsm\n";}
+			if ($codecs_list[$i] =~ /ulaw|u-law/i)	{$Pcodec .= "allow=ulaw\n";}
+			if ($codecs_list[$i] =~ /alaw|a-law/i)	{$Pcodec .= "allow=alaw\n";}
+			if ($codecs_list[$i] =~ /g722|g\.722/i)	{$Pcodec .= "allow=g722\n";}
+			if ($codecs_list[$i] =~ /g723|g\.723/i)	{$Pcodec .= "allow=g723.1\n";}
+			if ($codecs_list[$i] =~ /g726|g\.726/i)	{$Pcodec .= "allow=g726\n";}
+			if ($codecs_list[$i] =~ /g729|g\.729/i)	{$Pcodec .= "allow=g729\n";}
+			if ($codecs_list[$i] =~ /ilbc/i)		{$Pcodec .= "allow=ilbc\n";}
+			if ($codecs_list[$i] =~ /lpc10/i)		{$Pcodec .= "allow=lpc10\n";}
+			if ($codecs_list[$i] =~ /speex/i)		{$Pcodec .= "allow=speex\n";}
+			if ($codecs_list[$i] =~ /adpcm/i)		{$Pcodec .= "allow=adpcm\n";}
+			if (length($Pcodec) > 2)
+				{$Pcodec = "disallow=all\n$Pcodec";}
+			}
+		if ($DBXXX > 0) {print "IAX|$extension[$i]|$codecs_list[$i]|$Pcodec\n";}
+
 		if ( (length($template_id[$i]) > 1) && ($template_id[$i] !~ /--NONE--/) ) 
 			{
 			$stmtA = "SELECT template_contents FROM vicidial_conf_templates where template_id='$template_id[$i]';";
@@ -1267,6 +1299,8 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r
 				$Piax .= "secret=$conf_secret[$i]\n";
 				$Piax .= "callerid=\"$fullname[$i]\" <$outbound_cid[$i]>\n";
 				$Piax .= "mailbox=$voicemail[$i]\n";
+				if ($codecs_with_template[$i] > 0) 
+					{$Piax .= "$Pcodec";}
 				$Piax .= "$template_contents[$i]\n";
 				
 				$conf_entry_written++;
@@ -1288,6 +1322,7 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r
 			$Piax .= "mailbox=$voicemail[$i]\n";
 			$Piax .= "requirecalltoken=no\n";
 			$Piax .= "context=$phone_context[$i]\n";
+			$Piax .= "$Pcodec";
 			$Piax .= "type=friend\n";
 			$Piax .= "auth=md5\n";
 			$Piax .= "host=dynamic\n";
@@ -1307,7 +1342,7 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r


 	##### BEGIN Generate the SIP phone entries #####
-	$stmtA = "SELECT extension,dialplan_number,voicemail_id,pass,template_id,conf_override,email,template_id,conf_override,outbound_cid,fullname,phone_context,phone_ring_timeout,conf_secret,delete_vm_after_email FROM phones where server_ip='$server_ip' and protocol='SIP' and active='Y' order by extension;";
+	$stmtA = "SELECT extension,dialplan_number,voicemail_id,pass,template_id,conf_override,email,template_id,conf_override,outbound_cid,fullname,phone_context,phone_ring_timeout,conf_secret,delete_vm_after_email,codecs_list,codecs_with_template FROM phones where server_ip='$server_ip' and protocol='SIP' and active='Y' order by extension;";
 	#	print "$stmtA\n";
 	$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 	$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
@@ -1331,6 +1366,11 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r
 		$phone_ring_timeout[$i] =		$aryA[12];
 		$conf_secret[$i] =				$aryA[13];
 		$delete_vm_after_email[$i] =	$aryA[14];
+		$codecs_list[$i] =				$aryA[15];
+		$codecs_with_template[$i] =		$aryA[16];
+		if ( (length($SSdefault_codecs) > 2) && (length($codecs_list[$i]) < 3) )
+			{$codecs_list[$i] = $SSdefault_codecs;}
+
 		$i++;
 		}
 	$sthA->finish();
@@ -1340,6 +1380,25 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r
 		{
 		$conf_entry_written=0;
 		$template_contents[$i]='';
+		$Pcodec='';
+		if (length($codecs_list[$i]) > 2)
+			{
+			if ($codecs_list[$i] =~ /gsm/i)			{$Pcodec .= "allow=gsm\n";}
+			if ($codecs_list[$i] =~ /ulaw|u-law/i)	{$Pcodec .= "allow=ulaw\n";}
+			if ($codecs_list[$i] =~ /alaw|a-law/i)	{$Pcodec .= "allow=alaw\n";}
+			if ($codecs_list[$i] =~ /g722|g\.722/i)	{$Pcodec .= "allow=g722\n";}
+			if ($codecs_list[$i] =~ /g723|g\.723/i)	{$Pcodec .= "allow=g723.1\n";}
+			if ($codecs_list[$i] =~ /g726|g\.726/i)	{$Pcodec .= "allow=g726\n";}
+			if ($codecs_list[$i] =~ /g729|g\.729/i)	{$Pcodec .= "allow=g729\n";}
+			if ($codecs_list[$i] =~ /ilbc/i)		{$Pcodec .= "allow=ilbc\n";}
+			if ($codecs_list[$i] =~ /lpc10/i)		{$Pcodec .= "allow=lpc10\n";}
+			if ($codecs_list[$i] =~ /speex/i)		{$Pcodec .= "allow=speex\n";}
+			if ($codecs_list[$i] =~ /adpcm/i)		{$Pcodec .= "allow=adpcm\n";}
+			if (length($Pcodec) > 2)
+				{$Pcodec = "disallow=all\n$Pcodec";}
+			}
+		if ($DBXXX > 0) {print "SIP|$extension[$i]|$codecs_list[$i]|$Pcodec\n";}
+
 		if ( (length($template_id[$i]) > 1) && ($template_id[$i] !~ /--NONE--/) ) 
 			{
 			$stmtA = "SELECT template_contents FROM vicidial_conf_templates where template_id='$template_id[$i]';";
@@ -1356,6 +1415,8 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r
 				$Psip .= "secret=$conf_secret[$i]\n";
 				$Psip .= "callerid=\"$fullname[$i]\" <$outbound_cid[$i]>\n";
 				$Psip .= "mailbox=$voicemail[$i]\n";
+				if ($codecs_with_template[$i] > 0) 
+					{$Piax .= "$Pcodec";}
 				$Psip .= "$template_contents[$i]\n";
 				
 				$conf_entry_written++;
@@ -1376,6 +1437,7 @@ if ( ($active_asterisk_server =~ /Y/) && ($generate_vicidial_conf =~ /Y/) && ($r
 			$Psip .= "callerid=\"$fullname[$i]\" <$outbound_cid[$i]>\n";
 			$Psip .= "mailbox=$voicemail[$i]\n";
 			$Psip .= "context=$phone_context[$i]\n";
+			$Piax .= "$Pcodec";
 			$Psip .= "type=friend\n";
 			$Psip .= "host=dynamic\n";
 			}
@@ -75,6 +75,8 @@ conf_secret VARCHAR(20) default 'test',
 delete_vm_after_email ENUM('N','Y') default 'N',
 is_webphone ENUM('Y','N') default 'N',
 use_external_server_ip ENUM('Y','N') default 'N',
+codecs_list VARCHAR(100) default '',
+codecs_with_template ENUM('0','1') default '0',
 index (server_ip),
 unique index extenserver (extension, server_ip)
 );
@@ -548,7 +550,8 @@ custom_five VARCHAR(100) default '',
 voicemail_id VARCHAR(10),
 agent_call_log_view_override ENUM('DISABLED','Y','N') default 'DISABLED',
 callcard_admin ENUM('1','0') default '0',
-agent_choose_blended ENUM('0','1') default '1'
+agent_choose_blended ENUM('0','1') default '1',
+realtime_block_user_info ENUM('0','1') default '0'
 );

 CREATE UNIQUE INDEX user ON vicidial_users (user);
@@ -561,6 +564,12 @@ campaign_id VARCHAR(8),
 event_date DATETIME,
 event_epoch INT(10) UNSIGNED,
 user_group VARCHAR(20),
+session_id VARCHAR(20),
+server_ip VARCHAR(15),
+extension VARCHAR(50),
+computer_ip VARCHAR(15),
+browser VARCHAR(255),
+data VARCHAR(255),
 index (user)
 );

@@ -732,7 +741,11 @@ use_custom_cid ENUM('Y','N') default 'N',
 scheduled_callbacks_alert ENUM('NONE','BLINK','RED','BLINK_RED') default 'NONE',
 queuemetrics_callstatus_override ENUM('DISABLED','NO','YES') default 'DISABLED',
 extension_appended_cidname ENUM('Y','N') default 'N',
-scheduled_callbacks_count ENUM('LIVE','ALL_ACTIVE') default 'ALL_ACTIVE'
+scheduled_callbacks_count ENUM('LIVE','ALL_ACTIVE') default 'ALL_ACTIVE',
+manual_dial_override ENUM('NONE','ALLOW_ALL','DISABLE_ALL') default 'NONE',
+blind_monitor_warning ENUM('DISABLED','ALERT','NOTICE','AUDIO','ALERT_NOTICE','ALERT_AUDIO','NOTICE_AUDIO','ALL') default 'DISABLED',
+blind_monitor_message VARCHAR(255) default 'Someone is blind monitoring your session',
+blind_monitor_filename VARCHAR(100) default ''
 );

 CREATE TABLE vicidial_lists (
@@ -883,7 +896,9 @@ xferconf_c_number VARCHAR(50) default '',
 xferconf_d_number VARCHAR(50) default '',
 xferconf_e_number VARCHAR(50) default '',
 ignore_list_script_override ENUM('Y','N') default 'N',
-extension_appended_cidname ENUM('Y','N') default 'N'
+extension_appended_cidname ENUM('Y','N') default 'N',
+uniqueid_status_display ENUM('DISABLED','ENABLED','ENABLED_PREFIX') default 'DISABLED',
+uniqueid_status_prefix VARCHAR(50) default ''
 );

 CREATE TABLE vicidial_stations (
@@ -1234,7 +1249,8 @@ enable_agc_dispo_log ENUM('0','1') default '0',
 custom_dialplan_entry TEXT,
 queuemetrics_loginout ENUM('STANDARD','CALLBACK') default 'STANDARD',
 callcard_enabled ENUM('1','0') default '0',
-queuemetrics_callstatus ENUM('0','1') default '1'
+queuemetrics_callstatus ENUM('0','1') default '1',
+default_codecs VARCHAR(100) default ''
 );

 CREATE TABLE vicidial_campaigns_list_mix (
@@ -2041,6 +2057,15 @@ index (extension),
 index (phone_number)
 );

+CREATE TABLE vicidial_log_extended (
+uniqueid VARCHAR(50) PRIMARY KEY NOT NULL,
+server_ip VARCHAR(15),
+call_date DATETIME,
+lead_id INT(9) UNSIGNED,
+caller_code VARCHAR(30) NOT NULL,
+custom_call_id VARCHAR(100)
+);
+

 ALTER TABLE vicidial_campaign_server_stats ENGINE=HEAP;

@@ -2180,7 +2205,7 @@ ALTER TABLE vicidial_agent_log_archive MODIFY agent_log_id INT(9) UNSIGNED NOT N

 CREATE TABLE vicidial_carrier_log_archive LIKE vicidial_carrier_log;

-UPDATE system_settings SET db_schema_version='1213',db_schema_update_date=NOW();
+UPDATE system_settings SET db_schema_version='1215',db_schema_update_date=NOW();

 GRANT RELOAD ON *.* TO cron@'%';
 GRANT RELOAD ON *.* TO cron@localhost;
@@ -236,3 +236,35 @@ ALTER TABLE vicidial_campaigns ADD scheduled_callbacks_count ENUM('LIVE','ALL_AC

 UPDATE system_settings SET db_schema_version='1214',db_schema_update_date=NOW();

+ALTER TABLE vicidial_user_log ADD session_id VARCHAR(20);
+ALTER TABLE vicidial_user_log ADD server_ip VARCHAR(15);
+ALTER TABLE vicidial_user_log ADD extension VARCHAR(50);
+ALTER TABLE vicidial_user_log ADD computer_ip VARCHAR(15);
+ALTER TABLE vicidial_user_log ADD browser VARCHAR(255);
+ALTER TABLE vicidial_user_log ADD data VARCHAR(255);
+
+ALTER TABLE vicidial_campaigns ADD manual_dial_override ENUM('NONE','ALLOW_ALL','DISABLE_ALL') default 'NONE';
+ALTER TABLE vicidial_campaigns ADD blind_monitor_warning ENUM('DISABLED','ALERT','NOTICE','AUDIO','ALERT_NOTICE','ALERT_AUDIO','NOTICE_AUDIO','ALL') default 'DISABLED';
+ALTER TABLE vicidial_campaigns ADD blind_monitor_message VARCHAR(255) default 'Someone is blind monitoring your session';
+ALTER TABLE vicidial_campaigns ADD blind_monitor_filename VARCHAR(100) default '';
+
+ALTER TABLE vicidial_users ADD realtime_block_user_info ENUM('0','1') default '0';
+
+ALTER TABLE vicidial_inbound_groups ADD uniqueid_status_display ENUM('DISABLED','ENABLED','ENABLED_PREFIX') default 'DISABLED';
+ALTER TABLE vicidial_inbound_groups ADD uniqueid_status_prefix VARCHAR(50) default '';
+
+CREATE TABLE vicidial_log_extended (
+uniqueid VARCHAR(50) PRIMARY KEY NOT NULL,
+server_ip VARCHAR(15),
+call_date DATETIME,
+lead_id INT(9) UNSIGNED,
+caller_code VARCHAR(30) NOT NULL,
+custom_call_id VARCHAR(100)
+);
+
+ALTER TABLE system_settings ADD default_codecs VARCHAR(100) default '';
+
+ALTER TABLE phones ADD codecs_list VARCHAR(100) default '';
+ALTER TABLE phones ADD codecs_with_template ENUM('0','1') default '0';
+
+UPDATE system_settings SET db_schema_version='1215',db_schema_update_date=NOW();
@@ -502,3 +502,4 @@ CONSULTATIVE|CONSULTIVO|
 Close Message|Chiudi Messaggio|
 TIMER NOTIFICATION|NOTIFICA TIMER|
 >AGENTS<|>OPERATORI<|
+ Call ID | ID chiamata |
@@ -97,6 +97,26 @@ If enabled, the calls placed from this campaign will have a space and the phone
 If enabled, the calls coming in from this in-group will have a space and the phone extension of the agent appended to the end of the CallerID name for the call before it is sent to the agent. Default is N for disabled||
 Scheduled Callbacks Count||
 This option allows you to set whether only LIVE callbacks, user-only scheduled callbacks that have hit their trigger date and time, or ALL_ACTIVE callbacks, user-only callbacks that are active in the system as well as LIVE callbacks, should be3 counted int he agent callback alert section on the agent screen. Default is ALL_ACTIVE||
+Realtime Block User Info||
+This setting if set to 1 will block user and station information from being displayed in the Real-time report. Default is 0 for disabled||
+Manual Dial Override||
+The setting can override the Users setting for manual dial ability for agents when they are logged into this campaign. NONE will follow the Users setting, ALLOW_ALL will allow any agent logged into this campaign to place manual dial calls, DISABLE_ALL will not allow anyone logged into this campaign to place manual dial calls. Default is NONE||
+Blind Monitor Warning||
+This option if enabled will let the agent know in various optional ways if they are being blind monitored by someone. DISABLED means this feature is not active, ALERT will only pop an alert up on the agent screen, NOTICE will post a note that stays up on the agent screen as long as theya re being monitored, AUDIO will play the filename defined below when an agent is starting to be monitored and the other options are combibnations of the above options. Default is DISABLED||
+Blind Monitor Notice||
+This is the message that will show on the agent screen while they are being monitored if the NOTICE option is selected. Default is||
+Blind Monitor Filename||
+This is the audio file that will play in the agents session at the start of someone blind monitoring them. This prompt will be played for everyone in the session including the customer if any is present. Default is empty||
+Uniqueid Status Display||
+If enabled, when an agent receives a call through this in-group they will see the uniqueid of the call added to the status line in their agent interface. The PREFIX option will add the prefix defined blow to the beginning of the uniqueid in the display. Default is DISABLED. If there was already a Uniqueid defined on a call entering this in-group, then the original uniqueid will be displayed||
+Uniqueid Status Prefix||
+If PREFIX option is selected above then this is the value of that prefix. Default is empty||
+Default Codecs||
+You can define a comma delimited list of codecs to be set as the default codecs for all systems. Options for codecs include ulaw, alaw, gsm, g729, speex, g722, g723, g726, ilbc, ... Default is empty||
+Allowed Codecs||
+You can define a comma delimited list of codecs to be set as the default codecs for this phone. Options for codecs include ulaw, alaw, gsm, g729, speex, g722, g723, g726, ilbc, ... Some of these codecs might not be available on your system, like g729 or g726. If the field is empty, then the system default codecs or the phone entry above this one will be used for the allowable codecs. Default is empty||
+Allowed Codecs With Template||
+Setting this option to 1 will include the codecs defined above even if a conf file template is used. Default is 0||


 AST_VICIDIAL_ingrouplist.php
@@ -41,6 +41,7 @@
 #  - $agent_dialed_number - ('1','')
 #  - $agent_dialed_type - ('MANUAL_OVERRIDE','MANUAL_DIALNOW','MANUAL_PREVIEW',...)
 #  - $nodeletevdac - ('0','1')
+#  - $alertCID - ('0','1')
 #
 # CHANGELOG:
 # 50401-1002 - First build of script, Hangup function only
@@ -95,9 +96,11 @@
 # 91205-2103 - Code cleanup
 # 91213-1208 - Added queue_position to queue_log COMPLETE... records
 # 100327-0846 - Fix for list_id override answering machine message
+# 100423-2304 - Added alertCID
+#

-$version = '2.2.0-47';
-$build = '100327-0846';
+$version = '2.2.0-48';
+$build = '100423-2304';
 $mel=1;					# Mysql Error Log enabled = 1
 $mysql_log_count=85;
 $one_mysql_log=0;
@@ -185,6 +188,8 @@ if (isset($_GET["agent_dialed_type"]))				{$agent_dialed_type=$_GET["agent_diale
 	elseif (isset($_POST["agent_dialed_type"]))		{$agent_dialed_type=$_POST["agent_dialed_type"];}
 if (isset($_GET["nodeletevdac"]))				{$nodeletevdac=$_GET["nodeletevdac"];}
 	elseif (isset($_POST["nodeletevdac"]))		{$nodeletevdac=$_POST["nodeletevdac"];}
+if (isset($_GET["alertCID"]))				{$alertCID=$_GET["alertCID"];}
+	elseif (isset($_POST["alertCID"]))		{$alertCID=$_POST["alertCID"];}

 header ("Content-type: text/html; charset=utf-8");
 header ("Cache-Control: no-cache, must-revalidate");  // HTTP/1.1
@@ -390,7 +395,7 @@ if ($ACTION=="OriginateVDRelogin")

 if ($ACTION=="Originate")
 	{
-	if ( (strlen($exten)<1) or (strlen($channel)<1) or (strlen($ext_context)<1) or (strlen($queryCID)<10) )
+	if ( (strlen($exten)<1) or (strlen($channel)<1) or (strlen($ext_context)<1) or ( (strlen($queryCID)<10) && ($alertCID < 1) ) )
 		{
 		echo "ERROR Exten $exten is not valid or queryCID $queryCID is not valid, Originate command not inserted\n";
 		}
@@ -245,12 +245,13 @@
 # 100405-1430 - Added queuemetrics_callstatus option
 # 100413-1341 - Fixes for extended alt-dial
 # 100420-1006 - Added option for LIVE-only callback count
+# 100424-1630 - Added uniqueid display options
 #

-$version = '2.4-152';
-$build = '100420-1006';
+$version = '2.4-153';
+$build = '100424-1630';
 $mel=1;					# Mysql Error Log enabled = 1
-$mysql_log_count=332;
+$mysql_log_count=333;
 $one_mysql_log=0;

 require("dbconnect.php");
@@ -4028,6 +4029,19 @@ if ($ACTION == 'VDADcheckINCOMING')
 			$rslt=mysql_query($stmt, $link);
 				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00110',$user,$server_ip,$session_name,$one_mysql_log);}

+			### gather custom_call_id from vicidial_log_extended table
+			$custom_call_id='';
+			$stmt="SELECT custom_call_id FROM vicidial_log_extended where uniqueid='$uniqueid';";
+			$rslt=mysql_query($stmt, $link);
+			if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00333',$user,$server_ip,$session_name,$one_mysql_log);}
+			if ($DB) {echo "$stmt\n";}
+			$vle_record_ct = mysql_num_rows($rslt);
+			if ($vle_record_ct > 0)
+				{
+				$row=mysql_fetch_row($rslt);
+				$custom_call_id =		$row[0];
+				}
+
 			### update the log status to INCALL
 			$user_group='';
 			$stmt="SELECT user_group FROM vicidial_users where user='$user' LIMIT 1;";
@@ -4041,7 +4055,6 @@ if ($ACTION == 'VDADcheckINCOMING')
 				$user_group =		trim("$row[0]");
 				}

-
 			$stmt = "SELECT campaign_id,phone_number,alt_dial,call_type from vicidial_auto_calls where callerid = '$callerid' order by call_time desc limit 1;";
 			if ($DB) {echo "$stmt\n";}
 			$rslt=mysql_query($stmt, $link);
@@ -4255,7 +4268,7 @@ if ($ACTION == 'VDADcheckINCOMING')
 					$script_recording_delay = $row[0];
 					}

-				$stmt = "select group_name,group_color,web_form_address,fronter_display,ingroup_script,get_call_launch,xferconf_a_dtmf,xferconf_a_number,xferconf_b_dtmf,xferconf_b_number,default_xfer_group,ingroup_recording_override,ingroup_rec_filename,default_group_alias,web_form_address_two,timer_action,timer_action_message,timer_action_seconds,start_call_url,dispo_call_url,xferconf_c_number,xferconf_d_number,xferconf_e_number from vicidial_inbound_groups where group_id='$VDADchannel_group';";
+				$stmt = "select group_name,group_color,web_form_address,fronter_display,ingroup_script,get_call_launch,xferconf_a_dtmf,xferconf_a_number,xferconf_b_dtmf,xferconf_b_number,default_xfer_group,ingroup_recording_override,ingroup_rec_filename,default_group_alias,web_form_address_two,timer_action,timer_action_message,timer_action_seconds,start_call_url,dispo_call_url,xferconf_c_number,xferconf_d_number,xferconf_e_number,uniqueid_status_display from vicidial_inbound_groups where group_id='$VDADchannel_group';";
 				if ($DB) {echo "$stmt\n";}
 				$rslt=mysql_query($stmt, $link);
 				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00119',$user,$server_ip,$session_name,$one_mysql_log);}
@@ -4286,6 +4299,7 @@ if ($ACTION == 'VDADcheckINCOMING')
 					$VDCL_xferconf_c_number =			$row[20];
 					$VDCL_xferconf_d_number =			$row[21];
 					$VDCL_xferconf_e_number =			$row[22];
+					$VDCL_uniqueid_status_display =		$row[23];

 					$stmt = "select campaign_script,xferconf_a_dtmf,xferconf_a_number,xferconf_b_dtmf,xferconf_b_number,default_group_alias,timer_action,timer_action_message,timer_action_seconds,start_call_url,dispo_call_url,xferconf_c_number,xferconf_d_number,xferconf_e_number from vicidial_campaigns where campaign_id='$campaign';";
 					if ($DB) {echo "$stmt\n";}
@@ -4465,8 +4479,8 @@ if ($ACTION == 'VDADcheckINCOMING')
 					}

 				### if web form is set then send on to vicidial.php for override of WEB_FORM address
-				if ( (strlen($VDCL_group_web)>5) or (strlen($VDCL_group_name)>0) ) {echo "$VDCL_group_web|$VDCL_group_name|$VDCL_group_color|$VDCL_fronter_display|$VDADchannel_group|$VDCL_ingroup_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|$VDCL_ingroup_recording_override|$VDCL_ingroup_rec_filename|$VDCL_default_group_alias|$VDCL_caller_id_number|$VDCL_group_web_vars|$VDCL_group_web_two|$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number|\n";}
-				else {echo "X|$VDCL_group_name|$VDCL_group_color|$VDCL_fronter_display|$VDADchannel_group|$VDCL_ingroup_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|$VDCL_ingroup_recording_override|$VDCL_ingroup_rec_filename|$VDCL_default_group_alias|$VDCL_caller_id_number|$VDCL_group_web_vars|$VDCL_group_web_two|$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number|\n";}
+				if ( (strlen($VDCL_group_web)>5) or (strlen($VDCL_group_name)>0) ) {echo "$VDCL_group_web|$VDCL_group_name|$VDCL_group_color|$VDCL_fronter_display|$VDADchannel_group|$VDCL_ingroup_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|$VDCL_ingroup_recording_override|$VDCL_ingroup_rec_filename|$VDCL_default_group_alias|$VDCL_caller_id_number|$VDCL_group_web_vars|$VDCL_group_web_two|$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number|$VDCL_uniqueid_status_display|$custom_call_id|\n";}
+				else {echo "X|$VDCL_group_name|$VDCL_group_color|$VDCL_fronter_display|$VDADchannel_group|$VDCL_ingroup_script|$VDCL_get_call_launch|$VDCL_xferconf_a_dtmf|$VDCL_xferconf_a_number|$VDCL_xferconf_b_dtmf|$VDCL_xferconf_b_number|$VDCL_default_xfer_group|$VDCL_ingroup_recording_override|$VDCL_ingroup_rec_filename|$VDCL_default_group_alias|$VDCL_caller_id_number|$VDCL_group_web_vars|$VDCL_group_web_two|$VDCL_timer_action|$VDCL_timer_action_message|$VDCL_timer_action_seconds|$VDCL_xferconf_c_number|$VDCL_xferconf_d_number|$VDCL_xferconf_e_number|$VDCL_uniqueid_status_display|$custom_call_id|\n";}

 				$stmt = "SELECT full_name from vicidial_users where user='$tsr';";
 				if ($DB) {echo "$stmt\n";}
@@ -290,12 +290,13 @@
 # 100401-0019 - Added agent_choose_blended option
 # 100413-1349 - Various small logging fixes and extended alt-dial fixes
 # 100420-1009 - Added scheduled_callbacks_count option
+# 100423-1156 - Added more user logging data and manual_dial_override, blind monitor warnings, uniqueid display and codec features
 #

-$version = '2.4-268';
-$build = '100420-1009';
+$version = '2.4-269';
+$build = '100423-1156';
 $mel=1;					# Mysql Error Log enabled = 1
-$mysql_log_count=64;
+$mysql_log_count=66;
 $one_mysql_log=0;

 require("dbconnect.php");
@@ -1177,7 +1178,7 @@ else
 				$HKstatusnames = substr("$HKstatusnames", 0, -1); 

 				##### grab the campaign settings
-				$stmt="SELECT park_ext,park_file_name,web_form_address,allow_closers,auto_dial_level,dial_timeout,dial_prefix,campaign_cid,campaign_vdad_exten,campaign_rec_exten,campaign_recording,campaign_rec_filename,campaign_script,get_call_launch,am_message_exten,xferconf_a_dtmf,xferconf_a_number,xferconf_b_dtmf,xferconf_b_number,alt_number_dialing,scheduled_callbacks,wrapup_seconds,wrapup_message,closer_campaigns,use_internal_dnc,allcalls_delay,omit_phone_code,agent_pause_codes_active,no_hopper_leads_logins,campaign_allow_inbound,manual_dial_list_id,default_xfer_group,xfer_groups,disable_alter_custphone,display_queue_count,manual_dial_filter,agent_clipboard_copy,use_campaign_dnc,three_way_call_cid,dial_method,three_way_dial_prefix,web_form_target,vtiger_screen_login,agent_allow_group_alias,default_group_alias,quick_transfer_button,prepopulate_transfer_preset,view_calls_in_queue,view_calls_in_queue_launch,call_requeue_button,pause_after_each_call,no_hopper_dialing,agent_dial_owner_only,agent_display_dialable_leads,web_form_address_two,agent_select_territories,crm_popup_login,crm_login_address,timer_action,timer_action_message,timer_action_seconds,start_call_url,dispo_call_url,xferconf_c_number,xferconf_d_number,xferconf_e_number,use_custom_cid,scheduled_callbacks_alert,scheduled_callbacks_count FROM vicidial_campaigns where campaign_id = '$VD_campaign';";
+				$stmt="SELECT park_ext,park_file_name,web_form_address,allow_closers,auto_dial_level,dial_timeout,dial_prefix,campaign_cid,campaign_vdad_exten,campaign_rec_exten,campaign_recording,campaign_rec_filename,campaign_script,get_call_launch,am_message_exten,xferconf_a_dtmf,xferconf_a_number,xferconf_b_dtmf,xferconf_b_number,alt_number_dialing,scheduled_callbacks,wrapup_seconds,wrapup_message,closer_campaigns,use_internal_dnc,allcalls_delay,omit_phone_code,agent_pause_codes_active,no_hopper_leads_logins,campaign_allow_inbound,manual_dial_list_id,default_xfer_group,xfer_groups,disable_alter_custphone,display_queue_count,manual_dial_filter,agent_clipboard_copy,use_campaign_dnc,three_way_call_cid,dial_method,three_way_dial_prefix,web_form_target,vtiger_screen_login,agent_allow_group_alias,default_group_alias,quick_transfer_button,prepopulate_transfer_preset,view_calls_in_queue,view_calls_in_queue_launch,call_requeue_button,pause_after_each_call,no_hopper_dialing,agent_dial_owner_only,agent_display_dialable_leads,web_form_address_two,agent_select_territories,crm_popup_login,crm_login_address,timer_action,timer_action_message,timer_action_seconds,start_call_url,dispo_call_url,xferconf_c_number,xferconf_d_number,xferconf_e_number,use_custom_cid,scheduled_callbacks_alert,scheduled_callbacks_count,manual_dial_override,blind_monitor_warning,blind_monitor_message,blind_monitor_filename FROM vicidial_campaigns where campaign_id = '$VD_campaign';";
 				$rslt=mysql_query($stmt, $link);
 				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01013',$VD_login,$server_ip,$session_name,$one_mysql_log);}
 				if ($DB) {echo "$stmt\n";}
@@ -1251,7 +1252,15 @@ else
 				$use_custom_cid =			$row[66];
 				$scheduled_callbacks_alert = $row[67];
 				$scheduled_callbacks_count = $row[68];
+				$manual_dial_override =		$row[69];
+				$blind_monitor_warning =	$row[70];
+				$blind_monitor_message =	$row[71];
+				$blind_monitor_filename =	$row[72];

+				if ($manual_dial_override == 'ALLOW_ALL')
+					{$agentcall_manual = 1;}
+				if ($manual_dial_override == 'DISABLE_ALL')
+					{$agentcall_manual = 0;}
 				if ($user_territories_active < 1)
 					{$agent_select_territories = 0;}
 				if (preg_match("/Y/",$agent_select_territories))
@@ -1695,7 +1704,7 @@ else
 			echo "<!-- Phones balance selection: $phone_login|$pb_server_ip|$past_minutes_date|     |$pb_log -->\n";
 			}
 		echo "<title>Agent web client</title>\n";
-		$stmt="SELECT extension,dialplan_number,voicemail_id,phone_ip,computer_ip,server_ip,login,pass,status,active,phone_type,fullname,company,picture,messages,old_messages,protocol,local_gmt,ASTmgrUSERNAME,ASTmgrSECRET,login_user,login_pass,login_campaign,park_on_extension,conf_on_extension,VICIDIAL_park_on_extension,VICIDIAL_park_on_filename,monitor_prefix,recording_exten,voicemail_exten,voicemail_dump_exten,ext_context,dtmf_send_extension,call_out_number_group,client_browser,install_directory,local_web_callerID_URL,VICIDIAL_web_URL,AGI_call_logging_enabled,user_switching_enabled,conferencing_enabled,admin_hangup_enabled,admin_hijack_enabled,admin_monitor_enabled,call_parking_enabled,updater_check_enabled,AFLogging_enabled,QUEUE_ACTION_enabled,CallerID_popup_enabled,voicemail_button_enabled,enable_fast_refresh,fast_refresh_rate,enable_persistant_mysql,auto_dial_next_number,VDstop_rec_after_each_call,DBX_server,DBX_database,DBX_user,DBX_pass,DBX_port,DBY_server,DBY_database,DBY_user,DBY_pass,DBY_port,outbound_cid,enable_sipsak_messages,email,template_id,conf_override,phone_context,phone_ring_timeout,conf_secret,is_webphone,use_external_server_ip from phones where login='$phone_login' and pass='$phone_pass' and active = 'Y';";
+		$stmt="SELECT extension,dialplan_number,voicemail_id,phone_ip,computer_ip,server_ip,login,pass,status,active,phone_type,fullname,company,picture,messages,old_messages,protocol,local_gmt,ASTmgrUSERNAME,ASTmgrSECRET,login_user,login_pass,login_campaign,park_on_extension,conf_on_extension,VICIDIAL_park_on_extension,VICIDIAL_park_on_filename,monitor_prefix,recording_exten,voicemail_exten,voicemail_dump_exten,ext_context,dtmf_send_extension,call_out_number_group,client_browser,install_directory,local_web_callerID_URL,VICIDIAL_web_URL,AGI_call_logging_enabled,user_switching_enabled,conferencing_enabled,admin_hangup_enabled,admin_hijack_enabled,admin_monitor_enabled,call_parking_enabled,updater_check_enabled,AFLogging_enabled,QUEUE_ACTION_enabled,CallerID_popup_enabled,voicemail_button_enabled,enable_fast_refresh,fast_refresh_rate,enable_persistant_mysql,auto_dial_next_number,VDstop_rec_after_each_call,DBX_server,DBX_database,DBX_user,DBX_pass,DBX_port,DBY_server,DBY_database,DBY_user,DBY_pass,DBY_port,outbound_cid,enable_sipsak_messages,email,template_id,conf_override,phone_context,phone_ring_timeout,conf_secret,is_webphone,use_external_server_ip,codecs_list from phones where login='$phone_login' and pass='$phone_pass' and active = 'Y';";
 		if ($DB) {echo "|$stmt|\n";}
 		$rslt=mysql_query($stmt, $link);
 				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01025',$VD_login,$server_ip,$session_name,$one_mysql_log);}
@@ -1765,6 +1774,7 @@ else
 		$conf_secret=$row[72];
 		$is_webphone=$row[73];
 		$use_external_server_ip=$row[74];
+		$codecs_list=$row[75];

 		$no_empty_session_warnings=0;
 		if ($phone_login == 'nophone')
@@ -1883,12 +1893,6 @@ else

 		if ( ( ($campaign_allow_inbound == 'Y') and ($dial_method != 'MANUAL') ) || ($campaign_leads_to_call > 0) || (ereg('Y',$no_hopper_leads_logins)) )
 			{
-			### insert an entry into the user log for the login event
-			$stmt = "INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group) values('$VD_login','LOGIN','$VD_campaign','$NOW_TIME','$StarTtimE','$VU_user_group')";
-			if ($DB) {echo "|$stmt|\n";}
-			$rslt=mysql_query($stmt, $link);
-				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01031',$VD_login,$server_ip,$session_name,$one_mysql_log);}
-
 			##### check to see if the user has a conf extension already, this happens if they previously exited uncleanly
 			$stmt="SELECT conf_exten FROM vicidial_conferences where extension='$SIP_user' and server_ip = '$server_ip' LIMIT 1;";
 			$rslt=mysql_query($stmt, $link);
@@ -1934,29 +1938,36 @@ else
 			if ($DB) {echo "$stmt\n";}
 			$rslt=mysql_query($stmt, $link);
 				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01036',$VD_login,$server_ip,$session_name,$one_mysql_log);}
-			$affected_rows = mysql_affected_rows($link);
-			echo "<!-- old QUEUE and INCALL reverted list:   |$affected_rows| -->\n";
+			$vlERIaffected_rows = mysql_affected_rows($link);
+			echo "<!-- old QUEUE and INCALL reverted list:   |$vlERIaffected_rows| -->\n";

 			$stmt="DELETE from vicidial_hopper where status IN('QUEUE','INCALL','DONE') and user ='$VD_login';";
 			if ($DB) {echo "$stmt\n";}
 			$rslt=mysql_query($stmt, $link);
 				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01037',$VD_login,$server_ip,$session_name,$one_mysql_log);}
-			$affected_rows = mysql_affected_rows($link);
-			echo "<!-- old QUEUE and INCALL reverted hopper: |$affected_rows| -->\n";
+			$vhICaffected_rows = mysql_affected_rows($link);
+			echo "<!-- old QUEUE and INCALL reverted hopper: |$vhICaffected_rows| -->\n";

 			$stmt="DELETE from vicidial_live_agents where user ='$VD_login';";
 			if ($DB) {echo "$stmt\n";}
 			$rslt=mysql_query($stmt, $link);
 				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01038',$VD_login,$server_ip,$session_name,$one_mysql_log);}
-			$affected_rows = mysql_affected_rows($link);
-			echo "<!-- old vicidial_live_agents records cleared: |$affected_rows| -->\n";
+			$vlaLIaffected_rows = mysql_affected_rows($link);
+			echo "<!-- old vicidial_live_agents records cleared: |$vlaLIaffected_rows| -->\n";

 			$stmt="DELETE from vicidial_live_inbound_agents where user ='$VD_login';";
 			if ($DB) {echo "$stmt\n";}
 			$rslt=mysql_query($stmt, $link);
 				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01039',$VD_login,$server_ip,$session_name,$one_mysql_log);}
-			$affected_rows = mysql_affected_rows($link);
-			echo "<!-- old vicidial_live_inbound_agents records cleared: |$affected_rows| -->\n";
+			$vliaLIaffected_rows = mysql_affected_rows($link);
+			echo "<!-- old vicidial_live_inbound_agents records cleared: |$vliaLIaffected_rows| -->\n";
+
+			### insert an entry into the user log for the login event
+			$vul_data = "$vlERIaffected_rows|$vhICaffected_rows|$vlaLIaffected_rows|$vliaLIaffected_rows";
+			$stmt = "INSERT INTO vicidial_user_log (user,event,campaign_id,event_date,event_epoch,user_group,session_id,server_ip,extension,computer_ip,browser,data) values('$VD_login','LOGIN','$VD_campaign','$NOW_TIME','$StarTtimE','$VU_user_group','$session_id','$server_ip','$protocol/$extension','$ip','$browser','$vul_data')";
+			if ($DB) {echo "|$stmt|\n";}
+			$rslt=mysql_query($stmt, $link);
+				if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01031',$VD_login,$server_ip,$session_name,$one_mysql_log);}

 		#	echo "<B>You have logged in as user: $VD_login on phone: $SIP_user to campaign: $VD_campaign</B><BR>\n";
 			$VICIDiaL_is_logged_in=1;
@@ -2009,13 +2020,16 @@ else
 			else
 				{
 				### build Iframe variable content for webphone here
+				$codecs_list = preg_replace("/ /",'',$codecs_list);
+				$codecs_list = preg_replace("/-/",'',$codecs_list);
+				$codecs_list = preg_replace("/&/",'',$codecs_list);
 				$webphone_server_ip = $server_ip;
 				if ($use_external_server_ip=='Y')
 					{
 					##### find external_server_ip if enabled for this phone account
 					$stmt="SELECT external_server_ip FROM servers where server_ip='$server_ip' LIMIT 1;";
 					$rslt=mysql_query($stmt, $link);
-						if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01XXX',$VD_login,$server_ip,$session_name,$one_mysql_log);}
+						if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01065',$VD_login,$server_ip,$session_name,$one_mysql_log);}
 					if ($DB) {echo "$stmt\n";}
 					$exip_ct = mysql_num_rows($rslt);
 					if ($exip_ct > 0)
@@ -2027,7 +2041,7 @@ else
 				##### find webphone_url in system_settings and generate IFRAME code for it #####
 				$stmt="SELECT webphone_url FROM system_settings LIMIT 1;";
 				$rslt=mysql_query($stmt, $link);
-					if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01XXX',$VD_login,$server_ip,$session_name,$one_mysql_log);}
+					if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01066',$VD_login,$server_ip,$session_name,$one_mysql_log);}
 				if ($DB) {echo "$stmt\n";}
 				$wu_ct = mysql_num_rows($rslt);
 				if ($wu_ct > 0)
@@ -2043,8 +2057,9 @@ else
 				$b64_server_ip =		base64_encode($webphone_server_ip);
 				$b64_callerid =			base64_encode($outbound_cid);
 				$b64_protocol =			base64_encode($protocol);
+				$b64_codecs =			base64_encode($codecs_list);

-				$WebPhonEurl = "$webphone_url?phone_login=$b64_phone_login&phone_login=$b64_phone_login&phone_pass=$b64_phone_pass&server_ip=$b64_server_ip&callerid=$b64_callerid&protocol=$b64_protocol";
+				$WebPhonEurl = "$webphone_url?phone_login=$b64_phone_login&phone_login=$b64_phone_login&phone_pass=$b64_phone_pass&server_ip=$b64_server_ip&callerid=$b64_callerid&protocol=$b64_protocol&codecs=$b64_codecs";
 				$webphone_content = "<iframe src=\"$WebPhonEurl\" style=\"width:200;height:500;background-color:transparent;z-index:17;\" scrolling=\"auto\" frameborder=\"0\" allowtransparency=\"true\" id=\"webphone\" name=\"webphone\" width=\"200\" height=\"500\"> </iframe>";
 				}

@@ -2881,6 +2896,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 	var EAalt_phone_notes='';
 	var EAalt_phone_active='';
 	var EAalt_phone_count='';
+	var blind_monitor_warning='<?php echo $blind_monitor_warning ?>';
+	var blind_monitor_message='<?php echo $blind_monitor_message ?>';
+	var blind_monitor_filename='<?php echo $blind_monitor_filename ?>';
+	var blind_monitoring_now=0;
+	var blind_monitoring_now_trigger=0;
+	var no_blind_monitors=0;
+	var uniqueid_status_display='';
+	var custom_call_id='';
 	var DiaLControl_auto_HTML = "<IMG SRC=\"./images/vdc_LB_pause_OFF.gif\" border=0 alt=\" Pause \"><a href=\"#\" onclick=\"AutoDial_ReSume_PauSe('VDADready');\"><IMG SRC=\"./images/vdc_LB_resume.gif\" border=0 alt=\"Resume\"></a>";
 	var DiaLControl_auto_HTML_ready = "<a href=\"#\" onclick=\"AutoDial_ReSume_PauSe('VDADpause');\"><IMG SRC=\"./images/vdc_LB_pause.gif\" border=0 alt=\" Pause \"></a><IMG SRC=\"./images/vdc_LB_resume_OFF.gif\" border=0 alt=\"Resume\">";
 	var DiaLControl_auto_HTML_OFF = "<IMG SRC=\"./images/vdc_LB_pause_OFF.gif\" border=0 alt=\" Pause \"><IMG SRC=\"./images/vdc_LB_resume_OFF.gif\" border=0 alt=\"Resume\">";
@@ -3206,8 +3229,17 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}

 // ################################################################################
 // Send Originate command to manager to place a phone call
-	function basic_originate_call(tasknum,taskprefix,taskreverse,taskdialvalue,tasknowait,taskconfxfer,taskcid,taskusegroupalias) 
+	function basic_originate_call(tasknum,taskprefix,taskreverse,taskdialvalue,tasknowait,taskconfxfer,taskcid,taskusegroupalias,taskalert) 
 		{
+		if (taskalert == '1')
+			{
+			var TAqueryCID = tasknum;
+			tasknum = '83047777777777';
+			taskdialvalue = '7' + taskdialvalue;
+			var alertquery = 'alertCID=1';
+			}
+		else
+			{var alertquery = 'alertCID=0';}
 		var usegroupalias=0;
 		var consultativexfer_checked = 0;
 		if (document.vicidial_form.consultativexfer.checked==true)
@@ -3306,6 +3338,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 			else
 				{var queryCID = "DVagcW" + epoch_sec + user_abb;}

+			if (taskalert == '1')
+				{
+				queryCID = TAqueryCID;
+				}
+
 			if (cid_choice.length > 3) 
 				{
 				var call_cid = cid_choice;
@@ -3319,7 +3356,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 					{var call_cid = campaign_cid;}
 				}

-			VMCoriginate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&user=" + user + "&pass=" + pass + "&ACTION=Originate&format=text&channel=" + originatevalue + "&queryCID=" + queryCID + "&exten=" + call_prefix + "" + dialnum + "&ext_context=" + ext_context + "&ext_priority=1&outbound_cid=" + call_cid + "&usegroupalias=" + usegroupalias + "&account=" + active_group_alias + "&agent_dialed_number=" + agent_dialed_number + "&agent_dialed_type=" + agent_dialed_type;
+			VMCoriginate_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&user=" + user + "&pass=" + pass + "&ACTION=Originate&format=text&channel=" + originatevalue + "&queryCID=" + queryCID + "&exten=" + call_prefix + "" + dialnum + "&ext_context=" + ext_context + "&ext_priority=1&outbound_cid=" + call_cid + "&usegroupalias=" + usegroupalias + "&account=" + active_group_alias + "&agent_dialed_number=" + agent_dialed_number + "&agent_dialed_type=" + agent_dialed_type + "&" + alertquery;
 			xmlhttp.open('POST', 'manager_send.php'); 
 			xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8');
 			xmlhttp.send(VMCoriginate_query); 
@@ -3669,6 +3706,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 							{
 							if (live_conf_calls > 0)
 								{
+								var temp_blind_monitors=0;
 								var loop_ct=0;
 								var ARY_ct=0;
 								var LMAalter=0;
@@ -3705,6 +3743,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 									if ( (HidEMonitoRSessionS==1) && (channelfieldA.match(/ASTblind/)) )
 										{
 										var hide_channel=1;
+										blind_monitoring_now++;
+										temp_blind_monitors++;
+										if (blind_monitoring_now==1)
+											{blind_monitoring_now_trigger=1;}
 										}
 									else
 										{
@@ -3796,6 +3838,12 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 										{document.getElementById("outboundcallsspan").innerHTML = live_conf_HTML;}
 									}
 								nochannelinsession=0;
+								if (temp_blind_monitors < 1)
+									{
+									no_blind_monitors++;
+									if (no_blind_monitors > 2)
+										{blind_monitoring_now=0;}
+									}
 								}
 							else
 								{
@@ -3810,6 +3858,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 									}
 								custchannellive = -99;
 								nochannelinsession++;
+
+								no_blind_monitors++;
+								if (no_blind_monitors > 2)
+									{blind_monitoring_now=0;}
 								}
 							}
 							xmlhttprequestcheckconf = undefined; 
@@ -6597,6 +6649,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 							CalL_XC_c_NuMber			= VDIC_data_VDIG[21];
 							CalL_XC_d_NuMber			= VDIC_data_VDIG[22];
 							CalL_XC_e_NuMber			= VDIC_data_VDIG[23];
+							CalL_XC_e_NuMber			= VDIC_data_VDIG[23];
+							uniqueid_status_display		= VDIC_data_VDIG[24];
+							if ( (uniqueid_status_display=='ENABLED') || (uniqueid_status_display=='ENABLED_PREFIX') )
+								{custom_call_id			= " Call ID " + VDIC_data_VDIG[25];}

 							var VDIC_data_VDFR=check_VDIC_array[3].split("|");
 							if ( (VDIC_data_VDFR[1].length > 1) && (VDCL_fronter_display == 'Y') )
@@ -6686,7 +6742,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 							var callnum = dialed_number;
 							var dial_display_number = phone_number_format(callnum);

-							document.getElementById("MainStatuSSpan").innerHTML = " Incoming: " + dial_display_number + " UID: " + CIDcheck + " &nbsp; " + VDIC_fronter; 
+							document.getElementById("MainStatuSSpan").innerHTML = " Incoming: " + dial_display_number + " " + custom_call_id + " UID: " + CIDcheck + " &nbsp; " + VDIC_fronter; 

 							if (LeaDPreVDispO == 'CALLBK')
 								{
@@ -6732,7 +6788,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 								var callnum = dialed_number;
 								var dial_display_number = phone_number_format(callnum);

-								document.getElementById("MainStatuSSpan").innerHTML = " Incoming: " + dial_display_number + " Group- " + VDIC_data_VDIG[1] + " &nbsp; " + VDIC_fronter; 
+								document.getElementById("MainStatuSSpan").innerHTML = " Incoming: " + dial_display_number + " " + custom_call_id + " Group- " + VDIC_data_VDIG[1] + " &nbsp; " + VDIC_fronter; 
 								}

 							document.getElementById("ParkControl").innerHTML ="<a href=\"#\" onclick=\"mainxfer_send_redirect('ParK','" + lastcustchannel + "','" + lastcustserverip + "');return false;\"><IMG SRC=\"./images/vdc_LB_parkcall.gif\" border=0 alt=\"Park Call\"></a>";
@@ -8213,6 +8269,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				XD_live_call_secondS = 0;
 				MD_channel_look=0;
 				MD_ring_secondS=0;
+				uniqueid_status_display='';
+				custom_call_id='';

 				if (manual_dial_in_progress==1)
 					{
@@ -10114,6 +10172,7 @@ else
 			hideDiv('CalLLoGDisplaYBox');
 			hideDiv('LeaDInfOBox');
 			hideDiv('agentdirectlink');
+			hideDiv('blind_monitor_notice_span');
 			if (is_webphone!='Y')
 				{hideDiv('webphoneSpan');}
 			if (view_calls_in_queue_launch != '1')
@@ -10401,6 +10460,33 @@ else
 				//	check_for_live_calls();
 					check_s = check_n.toString();
 					}
+				if ( (blind_monitoring_now > 0) && ( (blind_monitor_warning=='ALERT') || (blind_monitor_warning=='NOTICE') ||  (blind_monitor_warning=='AUDIO') || (blind_monitor_warning=='ALERT_NOTICE') || (blind_monitor_warning=='ALERT_AUDIO') || (blind_monitor_warning=='NOTICE_AUDIO') || (blind_monitor_warning=='ALL') ) )
+					{
+					if ( (blind_monitor_warning=='NOTICE') || (blind_monitor_warning=='ALERT_NOTICE') || (blind_monitor_warning=='NOTICE_AUDIO') || (blind_monitor_warning=='ALL') )
+						{
+						document.getElementById("blind_monitor_notice_span_contents").innerHTML = blind_monitor_message + "<BR>";
+						showDiv('blind_monitor_notice_span');
+						}
+					if (blind_monitoring_now_trigger > 0)
+						{
+						if ( (blind_monitor_warning=='ALERT') || (blind_monitor_warning=='ALERT_NOTICE')|| (blind_monitor_warning=='ALERT_AUDIO') || (blind_monitor_warning=='ALL') )
+							{
+							document.getElementById("blind_monitor_alert_span_contents").innerHTML = blind_monitor_message;
+							showDiv('blind_monitor_alert_span');
+							}
+						if ( (blind_monitor_filename.length > 0) && ( (blind_monitor_warning=='AUDIO') || (blind_monitor_warning=='ALERT_AUDIO')|| (blind_monitor_warning=='NOTICE_AUDIO') || (blind_monitor_warning=='ALL') ) )
+							{
+							basic_originate_call(blind_monitor_filename,'NO','YES',session_id,'YES','','1','0','1');
+							}
+						blind_monitoring_now_trigger=0;
+						}
+					}
+				else
+					{
+					hideDiv('blind_monitor_notice_span');
+					document.getElementById("blind_monitor_notice_span_contents").innerHTML = '';
+					hideDiv('blind_monitor_alert_span');
+					}
 				if (wrapup_seconds > 0)	
 					{
 					document.getElementById("WrapupTimer").innerHTML = (wrapup_seconds - wrapup_counter);
@@ -11141,6 +11227,7 @@ $zi=1;
 </font></span>

 <span style="position:absolute;left:0px;top:<?php echo $HKheight ?>px;z-index:<?php $zi++; echo $zi ?>;" id="MaiNfooterspan">
+<span id="blind_monitor_notice_span"><B><FONT COLOR=RED> &nbsp; &nbsp; <span id="blind_monitor_notice_span_contents"></span></FONT></B></span>
 	<TABLE BGCOLOR="<?php echo $MAIN_COLOR ?>" id="MaiNfooter" width=<?php echo $MNwidth ?>><tr height=32><td height=32><font face="Arial,Helvetica" size=1>Agent web-client version: <?php echo $version ?> &nbsp; &nbsp; BUILD: <?php echo $build ?> &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; Server: <?php echo $server_ip ?>  &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</font><BR>
 	<font class="body_small">
 	<span id="busycallsdisplay"><a href="#"  onclick="conf_channels_detail('SHOW');">Show conference call channel information</a>
@@ -11635,6 +11722,14 @@ Available Agents Transfer: <span id="AgentXferViewSelect"></span></CENTER></font
 	</TD></TR></TABLE>
 </span>

+<span style="position:absolute;left:0px;top:0px;z-index:<?php $zi++; echo $zi ?>;" id="blind_monitor_alert_span">
+    <TABLE border=1 bgcolor="#CCFFCC" width=<?php echo $CAwidth ?> height=<?php echo $WRheight ?>><TR><TD align=center VALIGN=top> ALERT :<BR>
+	<B><FONT COLOR=RED SIZE=5> &nbsp; &nbsp; <span id="blind_monitor_alert_span_contents"></span></B></FONT>
+	<BR><BR> <a href="#" onclick="hideDiv('blind_monitor_alert_span');return false;">Go Back</a>
+	</TD></TR></TABLE>
+</span>
+
+
 <span style="position:absolute;left:0px;top:1500px;z-index:<?php $zi++; echo $zi ?>;" id="GENDERhideFORieALT"></span>

 <span style="position:absolute;left:0px;top:700px;z-index:<?php $zi++; echo $zi ?>;" id="debugbottomspan"></span>
@@ -9,9 +9,11 @@
 # $server_ip - the server that you are to login to
 # $callerid - the callerid number
 # $protocol - IAX or SIP
+# $codecs - list of codecs to use
 #
 # CHANGELOG
 # 100130-2359 - First Build of VICIDIAL web client basic login process finished
+# 100424-2102 - Added codecs option and updated zoiperweb code reference
 #

 if (isset($_GET["DB"]))							{$DB=$_GET["DB"];}
@@ -26,12 +28,15 @@ if (isset($_GET["callerid"]))					{$callerid=$_GET["callerid"];}
        elseif (isset($_POST["callerid"]))		{$callerid=$_POST["callerid"];}
 if (isset($_GET["protocol"]))					{$protocol=$_GET["protocol"];}
        elseif (isset($_POST["protocol"]))		{$protocol=$_POST["protocol"];}
+if (isset($_GET["codecs"]))						{$codecs=$_GET["codecs"];}
+        elseif (isset($_POST["codecs"]))		{$codecs=$_POST["codecs"];}

 $b64_phone_login =		base64_decode($phone_login);
 $b64_phone_pass =		base64_decode($phone_pass);
 $b64_server_ip =		base64_decode($server_ip);
 $b64_callerid =			base64_decode($callerid);
 $b64_protocol =			base64_decode($protocol);
+$b64_codecs =			base64_decode($codecs);
 if ($b64_protocol != 'SIP')
 	{$b64_protocol = 'IAX';}

@@ -108,6 +113,16 @@ function OnZoiperReady(phone)
 	Account.UserName = "<?php echo $b64_phone_login ?>";
 	Account.Password = "<?php echo $b64_phone_pass ?>";

+
+	<?php
+	if (preg_match("/gsm/i",$b64_codecs))	{echo "Account.AddCodec(\"GSM\")\n";}
+	if (preg_match("/ulaw/i",$b64_codecs))	{echo "Account.AddCodec(\"u-law\")\n";}
+	if (preg_match("/alaw/i",$b64_codecs))	{echo "Account.AddCodec(\"a-law\")\n";}
+	if (preg_match("/speex/i",$b64_codecs)) {echo "Account.AddCodec(\"Speex\")\n";}
+	if (preg_match("/ilbc/i",$b64_codecs))	{echo "Account.AddCodec(\"iLBC 30\")\n";}
+	if (preg_match("/ilbc/i",$b64_codecs))	{echo "Account.AddCodec(\"iLBC 20\")\n";}
+	?>
+
 	Account.Apply();
 	Account.Register();

@@ -206,7 +221,7 @@ function OnZoiperContactStatus(contact,status)
 <div id="supportedBrowsersScreen" style="display:block;">	   
        <!--CODEBASE="Activextest.ocx"    -->
 		<div style="background:url(http://www.zoiper.com/images/loader.gif) 50% 50% no-repeat;width:434px;height:236px;float:left;"> 
-		<object id="ZoiperA" classid="clsid:BCCA9B64-41B3-4A20-8D8B-E69FE61F1F8B" align="center" width="434" height="236" CODEBASE="http://www.zoiper.com/webphone/InstallerWeb.cab#Version=1,14,0,6132">
+		<object id="ZoiperA" classid="clsid:BCCA9B64-41B3-4A20-8D8B-E69FE61F1F8B" align="center" width="434" height="236" CODEBASE="http://www.zoiper.com/webphone/InstallerWeb.cab#Version=1,17,0,6802">
 			<embed id="ZoiperN" type="application/x-zoiper-plugin" align="center" width="434" height="236" />
 		</object> 
 		</div>
@@ -61,10 +61,11 @@
 # 100214-1127 - Added no-dialable-leads alert and in-groups stats option
 # 100301-1229 - Added 3-WAY status for consultative transfer agents
 # 100303-0930 - Added carrier stats display option
+# 100424-0943 - Added realtime_block_user_info option
 #

-$version = '2.2.0-52';
-$build = '100303-0930';
+$version = '2.2.0-53';
+$build = '100424-0943';

 header ("Content-type: text/html; charset=utf-8");

@@ -260,6 +261,13 @@ if ( (!isset($monitor_phone)) or (strlen($monitor_phone)<1) )
 	$monitor_phone = $row[0];
 	}

+$stmt="SELECT realtime_block_user_info from vicidial_users where user='$PHP_AUTH_USER' and pass='$PHP_AUTH_PW' and user_level > 6 and view_reports='1' and active='Y';";
+if ($DB) {echo "|$stmt|\n";}
+if ($non_latin > 0) {$rslt=mysql_query("SET NAMES 'UTF8'");}
+$rslt=mysql_query($stmt, $link);
+$row=mysql_fetch_row($rslt);
+$realtime_block_user_info=$row[0];
+
 $stmt="select campaign_id,campaign_name from vicidial_campaigns where active='Y' order by campaign_id;";
 $rslt=mysql_query($stmt, $link);
 if ($DB) {echo "$stmt\n";}
@@ -1877,9 +1885,16 @@ if ($SERVdisplay < 1)
 	}


-
-$Aline  = "$HDbegin$HDstation$HDphone$HDuser$HDusergroup$HDsessionid$HDbarge$HDstatus$HDpause$HDcustphone$HDserver_ip$HDcall_server_ip$HDtime$HDcampaign$HDcalls$HDigcall\n";
-$Bline  = "$HTbegin$HTstation$HTphone$HTuser$HTusergroup$HTsessionid$HTbarge$HTstatus$HTpause$HTcustphone$HTserver_ip$HTcall_server_ip$HTtime$HTcampaign$HTcalls$HTigcall\n";
+if ($realtime_block_user_info > 0)
+	{
+	$Aline  = "$HDbegin$HDusergroup$HDsessionid$HDbarge$HDstatus$HDpause$HDcustphone$HDserver_ip$HDcall_server_ip$HDtime$HDcampaign$HDcalls$HDigcall\n";
+	$Bline  = "$HTbegin$HTusergroup$HTsessionid$HTbarge$HTstatus$HTpause$HTcustphone$HTserver_ip$HTcall_server_ip$HTtime$HTcampaign$HTcalls$HTigcall\n";
+	}
+else
+	{
+	$Aline  = "$HDbegin$HDstation$HDphone$HDuser$HDusergroup$HDsessionid$HDbarge$HDstatus$HDpause$HDcustphone$HDserver_ip$HDcall_server_ip$HDtime$HDcampaign$HDcalls$HDigcall\n";
+	$Bline  = "$HTbegin$HTstation$HTphone$HTuser$HTusergroup$HTsessionid$HTbarge$HTstatus$HTpause$HTcustphone$HTserver_ip$HTcall_server_ip$HTtime$HTcampaign$HTcalls$HTigcall\n";
+	}
 $Aecho .= "$Aline";
 $Aecho .= "$Bline";
 $Aecho .= "$Aline";
@@ -2293,8 +2308,14 @@ $calls_to_list = mysql_num_rows($rslt);

 		$agentcount++;

-		$Aecho .= "| $G$extension$EG |$phoneD<a href=\"./user_status.php?user=$Luser\" target=\"_blank\">$G$user$EG</a> <a href=\"javascript:ingroup_info('$Luser','$j');\">+</a> |$UGD $G$sessionid$EG$L$R | $G$status$EG $CM $pausecode| $CP$SVD$G$call_time_MS$EG | $G$campaign_id$EG | $G$calls_today$EG |$INGRP\n";
-
+		if ($realtime_block_user_info > 0)
+			{
+			$Aecho .= "|$UGD $G$sessionid$EG$L$R | $G$status$EG $CM $pausecode| $CP$SVD$G$call_time_MS$EG | $G$campaign_id$EG | $G$calls_today$EG |$INGRP\n";
+			}
+		if ($realtime_block_user_info < 1)
+			{
+			$Aecho .= "| $G$extension$EG |$phoneD<a href=\"./user_status.php?user=$Luser\" target=\"_blank\">$G$user$EG</a> <a href=\"javascript:ingroup_info('$Luser','$j');\">+</a> |$UGD $G$sessionid$EG$L$R | $G$status$EG $CM $pausecode| $CP$SVD$G$call_time_MS$EG | $G$campaign_id$EG | $G$calls_today$EG |$INGRP\n";
+			}
 		$j++;
 		}

@@ -23,6 +23,7 @@
 # 100126-0847 - Added DID log display options
 # 100203-1008 - Added agent activity log section
 # 100216-0042 - Added popup date selector
+# 100425-0115 - Added more login data
 #

 header ("Content-type: text/html; charset=utf-8");
@@ -349,10 +350,10 @@ if ($did < 1)
 	echo "<center>\n";

 	echo "<B>AGENT LOGIN/LOGOUT TIME:</B>\n";
-	echo "<TABLE width=500 cellspacing=0 cellpadding=1>\n";
-	echo "<tr><td><font size=2>EVENT </td><td align=right><font size=2> DATE</td><td align=right><font size=2> CAMPAIGN</td><td align=right><font size=2> GROUP</td><td align=right><font size=2>HOURS:MM:SS</td></tr>\n";
+	echo "<TABLE width=750 cellspacing=0 cellpadding=1>\n";
+	echo "<tr><td><font size=2>EVENT </td><td align=right><font size=2> DATE</td><td align=right><font size=2> CAMPAIGN</td><td align=right><font size=2> GROUP</td><td align=right><font size=2>HOURS:MM:SS</td><td align=right><font size=2>SESSION</td><td align=right><font size=2>SERVER</td><td align=right><font size=2>PHONE</td><td align=right><font size=2>COMPUTER</td></tr>\n";

-		$stmt="SELECT event,event_epoch,event_date,campaign_id,user_group from vicidial_user_log where user='" . mysql_real_escape_string($user) . "' and event_date >= '" . mysql_real_escape_string($begin_date) . " 0:00:01'  and event_date <= '" . mysql_real_escape_string($end_date) . " 23:59:59'";
+		$stmt="SELECT event,event_epoch,event_date,campaign_id,user_group,session_id,server_ip,extension,computer_ip from vicidial_user_log where user='" . mysql_real_escape_string($user) . "' and event_date >= '" . mysql_real_escape_string($begin_date) . " 0:00:01'  and event_date <= '" . mysql_real_escape_string($end_date) . " 23:59:59'";
 		$rslt=mysql_query($stmt, $link);
 		$events_to_print = mysql_num_rows($rslt);

@@ -374,7 +375,11 @@ if ($did < 1)
 				echo "<td align=right><font size=2> $row[2]</td>\n";
 				echo "<td align=right><font size=2> $row[3]</td>\n";
 				echo "<td align=right><font size=2> $row[4]</td>\n";
-				echo "<td align=right><font size=2> </td></tr>\n";
+				echo "<td align=right><font size=2> </td>\n";
+				echo "<td align=right><font size=2> $row[5] </td>\n";
+				echo "<td align=right><font size=2> $row[6] </td>\n";
+				echo "<td align=right><font size=2> $row[7] </td>\n";
+				echo "<td align=right><font size=2> $row[8] </td></tr>\n";
 				}
 			if (ereg("LOGOUT", $row[0]))
 				{
@@ -390,7 +395,8 @@ if ($did < 1)
 					echo "<td align=right><font size=2> $row[2]</td>\n";
 					echo "<td align=right><font size=2> $row[3]</td>\n";
 					echo "<td align=right><font size=2> $row[4]</td>\n";
-					echo "<td align=right><font size=2> $event_hours_minutes</td></tr>\n";
+					echo "<td align=right><font size=2> $event_hours_minutes</td>\n";
+					echo "<td align=right colspan=4><font size=2> &nbsp;</td></tr>\n";
 					$event_start_seconds='';
 					$event_stop_seconds='';
 					}
@@ -399,7 +405,8 @@ if ($did < 1)
 					echo "<tr $bgcolor><td><font size=2>$row[0]</td>";
 					echo "<td align=right><font size=2> $row[2]</td>\n";
 					echo "<td align=right><font size=2> $row[3]</td>\n";
-					echo "<td align=right><font size=2> </td></tr>\n";
+					echo "<td align=right><font size=2> </td>\n";
+					echo "<td align=right colspan=5><font size=2> &nbsp;</td></tr>\n";
 					}
 				}