2006-06-08 snapshot

git-svn-id: svn://192.168.202.10@8 3d104415-ff17-0410-8863-d5cf3c621b8a
2006-07-07 15:25:20 +00:00
parent 487f7108d4
commit 36f070cc92
129 changed files with 3248 additions and 109 deletions
@@ -108,6 +108,7 @@
 # 60504-1032 - Fixed manual dial display bug and transfer dispo alert bug
 #            - Fixed recording filename display to not overrun 25 characters
 # 60510-1051 - Added Wrapup timer and wrapup message on wrapup screen after dispo
+# 60608-1453 - Added CLOSER campaign allowable in-groups limitations
 #

 require("dbconnect.php");
@@ -144,8 +145,8 @@ if (isset($_GET["relogin"]))					{$relogin=$_GET["relogin"];}

 $forever_stop=0;

-$version = '1.1.82';
-$build = '60510-1051';
+$version = '1.1.83';
+$build = '60608-1453';

 if ($force_logout)
 {
@@ -499,28 +500,8 @@ $VDloginDISPLAY=0;
 			$HKstatuses = substr("$HKstatuses", 0, -1); 
 			$HKstatusnames = substr("$HKstatusnames", 0, -1); 

-			##### grab the inbound groups to choose from if campaign contains CLOSER
-			$VARingroups="''";
-			if (eregi("CLOSER", $VD_campaign))
-				{
-				$VARingroups='';
-				$stmt="select group_id from vicidial_inbound_groups where active = 'Y' order by group_id limit 20;";
-				$rslt=mysql_query($stmt, $link);
-				if ($DB) {echo "$stmt\n";}
-				$closer_ct = mysql_num_rows($rslt);
-				$INgrpCT=0;
-				while ($INgrpCT < $closer_ct)
-					{
-					$row=mysql_fetch_row($rslt);
-					$closer_groups[$INgrpCT] =$row[0];
-					$VARingroups = "$VARingroups'$closer_groups[$INgrpCT]',";
-					$INgrpCT++;
-					}
-				$VARingroups = substr("$VARingroups", 0, -1); 
-				}
-
 			##### grab the statuses to be dialed for your campaign as well as other campaign settings
-			$stmt="SELECT dial_status_a,dial_status_b,dial_status_c,dial_status_d,dial_status_e,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 FROM vicidial_campaigns where campaign_id = '$VD_campaign';";
+			$stmt="SELECT dial_status_a,dial_status_b,dial_status_c,dial_status_d,dial_status_e,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 FROM vicidial_campaigns where campaign_id = '$VD_campaign';";
 			$rslt=mysql_query($stmt, $link);
 			if ($DB) {echo "$stmt\n";}
 			$row=mysql_fetch_row($rslt);
@@ -552,6 +533,7 @@ $VDloginDISPLAY=0;
 			   $VC_scheduled_callbacks=$row[25];
 			   $wrapup_seconds=$row[26];
 			   $wrapup_message=$row[27];
+			   $closer_campaigns=$row[28];

 			if ( ($VC_scheduled_callbacks=='Y') and ($VU_scheduled_callbacks=='1') )
 				{$scheduled_callbacks='1';}
@@ -561,6 +543,29 @@ $VDloginDISPLAY=0;
 				{$alt_phone_dialing='1';}
 			else
 				{$alt_phone_dialing='0';}
+			$closer_campaigns = preg_replace("/^ | -$/","",$closer_campaigns);
+			$closer_campaigns = preg_replace("/ /","','",$closer_campaigns);
+			$closer_campaigns = "'$closer_campaigns'";
+
+			##### grab the inbound groups to choose from if campaign contains CLOSER
+			$VARingroups="''";
+			if (eregi("CLOSER", $VD_campaign))
+				{
+				$VARingroups='';
+				$stmt="select group_id from vicidial_inbound_groups where active = 'Y' and group_id IN($closer_campaigns) order by group_id limit 20;";
+				$rslt=mysql_query($stmt, $link);
+				if ($DB) {echo "$stmt\n";}
+				$closer_ct = mysql_num_rows($rslt);
+				$INgrpCT=0;
+				while ($INgrpCT < $closer_ct)
+					{
+					$row=mysql_fetch_row($rslt);
+					$closer_groups[$INgrpCT] =$row[0];
+					$VARingroups = "$VARingroups'$closer_groups[$INgrpCT]',";
+					$INgrpCT++;
+					}
+				$VARingroups = substr("$VARingroups", 0, -1); 
+				}

 			##### grab the number of leads in the hopper for this campaign
 			$stmt="SELECT count(*) FROM vicidial_hopper where campaign_id = '$VD_campaign' and status='READY';";