bug fixes and translations updates

git-svn-id: svn://192.168.202.10@982 3d104415-ff17-0410-8863-d5cf3c621b8a
2008-10-21 11:53:23 +00:00
parent 137c788308
commit 0a04faf3c3
22 changed files with 173 additions and 62 deletions
@@ -1,6 +1,10 @@
 <?
 # 
-# Copyright (C) 2007  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+# dbconnect.php    version 2.0.5
+#
+# database connection settings and some global web settings
+#
+# Copyright (C) 2008  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 if ( file_exists("/etc/astguiclient.conf") )
 {
@@ -36,6 +40,9 @@ $WeBServeRRooT = '/usr/local/apache2/htdocs';
 }

 $link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass");
+if (!$link) {
+    die('MySQL connect ERROR: ' . mysql_error());
+}
 mysql_select_db("$VARDB_database",$link);

 $local_DEF = 'Local/';
@@ -44,6 +51,8 @@ $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
 $WeBRooTWritablE = '1';
-$non_latin = '0';	# set to 1 for UTF rules
+$non_latin = '0';	# set to 1 for UTF rules, overridden by system_settings
+$flag_channels=0;
+$flag_string = 'VICIast20';

 ?>
@@ -1,6 +1,10 @@
 <?
 # 
-# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+# dbconnect.php    version 2.0.5
+#
+# database connection settings and some global web settings
+#
+# Copyright (C) 2008  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 if ( file_exists("/etc/astguiclient.conf") )
 {
@@ -36,7 +40,10 @@ $WeBServeRRooT = '/usr/local/apache2/htdocs';
 }

 $link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass");
-mysql_select_db("$VARDB_database");
+if (!$link) {
+    die('MySQL connect ERROR: ' . mysql_error());
+}
+mysql_select_db("$VARDB_database",$link);

 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
@@ -44,5 +51,8 @@ $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
 $WeBRooTWritablE = '1';
+$non_latin = '0';	# set to 1 for UTF rules, overridden by system_settings
+$flag_channels=0;
+$flag_string = 'VICIast20';

 ?>
@@ -1,6 +1,10 @@
 <?
 # 
-# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+# dbconnect.php    version 2.0.5
+#
+# database connection settings and some global web settings
+#
+# Copyright (C) 2008  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 if ( file_exists("/etc/astguiclient.conf") )
 {
@@ -36,7 +40,10 @@ $WeBServeRRooT = '/usr/local/apache2/htdocs';
 }

 $link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass");
-mysql_select_db("$VARDB_database");
+if (!$link) {
+    die('MySQL connect ERROR: ' . mysql_error());
+}
+mysql_select_db("$VARDB_database",$link);

 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
@@ -44,5 +51,8 @@ $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
 $WeBRooTWritablE = '1';
+$non_latin = '0';	# set to 1 for UTF rules, overridden by system_settings
+$flag_channels=0;
+$flag_string = 'VICIast20';

 ?>
@@ -1,6 +1,10 @@
 <?
 # 
-# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+# dbconnect.php    version 2.0.5
+#
+# database connection settings and some global web settings
+#
+# Copyright (C) 2008  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 if ( file_exists("/etc/astguiclient.conf") )
 {
@@ -36,7 +40,10 @@ $WeBServeRRooT = '/usr/local/apache2/htdocs';
 }

 $link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass");
-mysql_select_db("$VARDB_database");
+if (!$link) {
+    die('MySQL connect ERROR: ' . mysql_error());
+}
+mysql_select_db("$VARDB_database",$link);

 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
@@ -44,5 +51,8 @@ $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
 $WeBRooTWritablE = '1';
+$non_latin = '0';	# set to 1 for UTF rules, overridden by system_settings
+$flag_channels=0;
+$flag_string = 'VICIast20';

 ?>
@@ -1,6 +1,10 @@
 <?
 # 
-# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+# dbconnect.php    version 2.0.5
+#
+# database connection settings and some global web settings
+#
+# Copyright (C) 2008  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 if ( file_exists("/etc/astguiclient.conf") )
 {
@@ -36,7 +40,10 @@ $WeBServeRRooT = '/usr/local/apache2/htdocs';
 }

 $link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass");
-mysql_select_db("$VARDB_database");
+if (!$link) {
+    die('MySQL connect ERROR: ' . mysql_error());
+}
+mysql_select_db("$VARDB_database",$link);

 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
@@ -44,5 +51,8 @@ $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
 $WeBRooTWritablE = '1';
+$non_latin = '0';	# set to 1 for UTF rules, overridden by system_settings
+$flag_channels=0;
+$flag_string = 'VICIast20';

 ?>
@@ -1,6 +1,10 @@
 <?
 # 
-# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+# dbconnect.php    version 2.0.5
+#
+# database connection settings and some global web settings
+#
+# Copyright (C) 2008  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 if ( file_exists("/etc/astguiclient.conf") )
 {
@@ -36,7 +40,10 @@ $WeBServeRRooT = '/usr/local/apache2/htdocs';
 }

 $link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass");
-mysql_select_db("$VARDB_database");
+if (!$link) {
+    die('MySQL connect ERROR: ' . mysql_error());
+}
+mysql_select_db("$VARDB_database",$link);

 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
@@ -44,5 +51,8 @@ $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
 $WeBRooTWritablE = '1';
+$non_latin = '0';	# set to 1 for UTF rules, overridden by system_settings
+$flag_channels=0;
+$flag_string = 'VICIast20';

 ?>
@@ -1,6 +1,10 @@
 <?
 # 
-# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+# dbconnect.php    version 2.0.5
+#
+# database connection settings and some global web settings
+#
+# Copyright (C) 2008  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 if ( file_exists("/etc/astguiclient.conf") )
 {
@@ -36,7 +40,10 @@ $WeBServeRRooT = '/usr/local/apache2/htdocs';
 }

 $link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass");
-mysql_select_db("$VARDB_database");
+if (!$link) {
+    die('MySQL connect ERROR: ' . mysql_error());
+}
+mysql_select_db("$VARDB_database",$link);

 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
@@ -44,5 +51,8 @@ $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
 $WeBRooTWritablE = '1';
+$non_latin = '0';	# set to 1 for UTF rules, overridden by system_settings
+$flag_channels=0;
+$flag_string = 'VICIast20';

 ?>
@@ -1,6 +1,10 @@
 <?
 # 
-# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+# dbconnect.php    version 2.0.5
+#
+# database connection settings and some global web settings
+#
+# Copyright (C) 2008  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 if ( file_exists("/etc/astguiclient.conf") )
 {
@@ -36,7 +40,10 @@ $WeBServeRRooT = '/usr/local/apache2/htdocs';
 }

 $link=mysql_connect("$VARDB_server", "$VARDB_user", "$VARDB_pass");
-mysql_select_db("$VARDB_database");
+if (!$link) {
+    die('MySQL connect ERROR: ' . mysql_error());
+}
+mysql_select_db("$VARDB_database",$link);

 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
@@ -44,5 +51,8 @@ $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
 $WeBRooTWritablE = '1';
+$non_latin = '0';	# set to 1 for UTF rules, overridden by system_settings
+$flag_channels=0;
+$flag_string = 'VICIast20';

 ?>
@@ -921,7 +921,7 @@ if ($channel_status < 1)


 $vci=0;
-$INBOUNDcampsSQL='';
+$INBOUNDcampsSQL="''";
 $stmtA = "SELECT campaign_id FROM vicidial_campaigns where active='Y' and campaign_allow_inbound='Y';";
 $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 $sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
@@ -929,7 +929,7 @@ $sthArows=$sthA->rows;
 	while ($sthArows > $vci)
 	{
 	@aryA = $sthA->fetchrow_array;
-	if ($vci==0) {$INBOUNDcampsSQL	.= "'$aryA[0]'";}
+	if ($vci < 1) {$INBOUNDcampsSQL	= "'$aryA[0]'";}
 	else {$INBOUNDcampsSQL	.= ",'$aryA[0]'";}
 	$vci++;
 	}
@@ -1324,6 +1324,7 @@ if ($agent_search_method =~ /^LO|^LB/)
 			$stmtA = "UPDATE vicidial_live_agents set status='QUEUE',lead_id='$insert_lead_id',uniqueid='$unique_id', channel='$channel', callerid='$callerid', call_server_ip='$VARserver_ip',comments='INBOUND' where status IN('CLOSER','READY') and campaign_id IN($INBOUNDcampsSQL) and closer_campaigns LIKE \"% $channel_group %\" and last_update_time > '$BDtsSQLdate' $qp_groupWAIT_SQL $qp_groupWAIT_camp_SQL $agent_call_order limit 1;";
 			my $affected_rows = $dbhA->do($stmtA);
 			$found_agents=$affected_rows;
+				if ($AGILOG) {$agi_string = "$affected_rows|$stmtA|";   &agi_output;}
 			}
 		if ($AGILOG) {$agi_string = "--    VDAD get agent: |$DROP_TIME|$drop_timer|$affected_rows|$found_agents|update of vla table: $channel_group|\n|$stmtA|";   &agi_output;}
 		if ($found_agents > 0)
@@ -41,6 +41,7 @@
 # 80525-1040 - Added IVR vac status compatibility for inbound calls
 # 80830-0035 - Added auto alt dialing for EXTERNAL leads for each lead
 # 80909-0843 - Added support for campaign-speccific DNC lists
+# 81021-0306 - Added Local channel logging support and while-to-if changes
 #


@@ -368,6 +369,8 @@ sub process_request {
 		### call start stage
 		if ($stage =~ /START/)
 			{
+			$channel_group='';
+
 			if ($AGILOG) {$agi_string = "+++++ CALL LOG START : $now_date";   &agi_output;}

 			if ($channel =~ /^SIP/) {$channel =~ s/-.*//gi;}
@@ -383,17 +386,45 @@ sub process_request {
 				$sthArows=$sthA->rows;
 				@aryA = $sthA->fetchrow_array;
 				$is_client_phone	 = "$aryA[0]";
-				if ($AGILOG) {$agi_string = "Local Zap phone: $aryA[0]|$channel_line|";   &agi_output;}
 				$sthA->finish();

 				if ($is_client_phone < 1)
 					{
 					$channel_group = 'Zap Trunk Line';
-					$number_dialed = $callerid;
+					$number_dialed = $extension;
 					}
+				else
+					{
+					$channel_group = 'Zap Client Phone';
+					}
+				if ($AGILOG) {$agi_string = $channel_group . ": $aryA[0]|$channel_line|";   &agi_output;}
+				}
+			if ($channel =~ /^Local\//)
+				{
+				$channel_line = $channel;
+				$channel_line =~ s/^Local\/|\@.*//gi;
+
+				$stmtA = "SELECT count(*) FROM phones where server_ip='$VARserver_ip' and dialplan_number='$channel_line' and protocol='EXTERNAL';";
+				$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
+				$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
+				$sthArows=$sthA->rows;
+				@aryA = $sthA->fetchrow_array;
+				$is_client_phone	 = "$aryA[0]";
+				$sthA->finish();
+
+				if ($is_client_phone < 1)
+					{
+					$channel_group = 'Local Channel Line';
+					$number_dialed = $extension;
+					}
+				else
+					{
+					$channel_group = 'EXTERNAL Client Phone';
+					}
+				if ($AGILOG) {$agi_string = $channel_group . ": $aryA[0]|$channel_line|";   &agi_output;}
 				}
 			### This section breaks the outbound dialed number down(or builds it up) to a 10 digit number and gives it a description
-			if ( ($channel =~ /^SIP|^IAX2/) or ($is_client_phone > 0) )
+			if ( ($channel =~ /^SIP|^IAX2/) || ( ($is_client_phone > 0) && (length($channel_group) < 1) ) )
 				{
 				if ( ($extension =~ /^901144/) && (length($extension)==16) )  #test 207 608 6400 
 					{$extension =~ s/^9//gi;	$channel_group = 'Outbound Intl UK';}
@@ -408,9 +439,9 @@ sub process_request {
 				if ( ($extension =~ /^91/) && (length($extension)==12) )
 					{$extension =~ s/^91//gi;	$channel_group = 'Outbound Long Distance';}
 				if ($is_client_phone > 0)
-					{$channel_group = 'Zap Client Phone';}
+					{$channel_group = 'Client Phone';}
 				
-				$SIP_ext = $channel;	$SIP_ext =~ s/SIP\/|IAX2\/|Zap\///gi;
+				$SIP_ext = $channel;	$SIP_ext =~ s/SIP\/|IAX2\/|Zap\/|Local\///gi;

 				$number_dialed = $extension;
 				$extension = $SIP_ext;
@@ -423,7 +454,7 @@ sub process_request {
 				$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
 				$sthArows=$sthA->rows;
 				$rec_count=0;
-				while ($sthArows > $rec_count)
+				if ($sthArows > 0)
 					{
 					@aryA = $sthA->fetchrow_array;
 					$cmd_line_b	=	"$aryA[0]";
@@ -505,7 +536,7 @@ sub process_request {
 			$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
 			$sthArows=$sthA->rows;
 			$rec_count=0;
-			while ($sthArows > $rec_count)
+			if ($sthArows > 0)
 				{
 				@aryA = $sthA->fetchrow_array;
 				$parked_time	=			"$aryA[0]";
@@ -615,7 +646,7 @@ sub process_request {
 				$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
 				$sthArows=$sthA->rows;
 				 $rec_countCUSTDATA=0;
-				while ($sthArows > $rec_countCUSTDATA)
+				if ($sthArows > 0)
 					{
 					@aryA = $sthA->fetchrow_array;
 					$VD_lead_id	=		"$aryA[0]";
@@ -716,7 +747,7 @@ sub process_request {
 						$sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr;
 						$sthA->execute or die "executing: $stmtA ", $dbhA->errstr;
 						$sthArows=$sthA->rows;
-						while ($sthArows > $epc_countCUSTDATA)
+						if ($sthArows > 0)
 							{
 							@aryA = $sthA->fetchrow_array;
 							$VD_start_epoch	=	"$aryA[0]";
@@ -751,7 +782,7 @@ sub process_request {
 						$sthArows=$sthA->rows;
 						 $epc_countCUSTDATA=0;
 						 $VD_closecallid='';
-						while ($sthArows > $epc_countCUSTDATA)
+						if ($sthArows > 0)
 							{
 							@aryA = $sthA->fetchrow_array;
 							$VD_start_epoch	=	"$aryA[0]";
@@ -278,8 +278,8 @@ DISPOSITION CALL|SELEÇÃO DE STATUS|
 session ID|ID da sessão|
 to campaign|para a campanha|
 Select a CallBack Date|Selecione uma data para o retorno|
-maximize|maximizar|
-minimize|minimizar|
+ maximize | maximizar |
+ minimize | minimizar |
 You must choose a date|Você deve selecionar uma data|
 Select a Date Below|Selecione uma data abaixo|
 Click on a callback below to call the customer back now. If you click on a record below to call it, it will be removed from the list|Clique em um dos contatos abaixo para ligar. Se você clicar em um contatos abaixo o mesmo será removido da lista de Agendamentos|
@@ -252,8 +252,8 @@ DISPOSITION CALL|ANRUF ABSCHLIESSEN|
 session ID| Session ID|
 to campaign| zur Kampagne|
 Select a CallBack Date|Wählen Sie ein Rückrufdatum|
-maximize|maximieren|
-minimize|minimieren|
+ maximize | maximieren |
+ minimize | minimieren |
 You must choose a date|Sie müssen ein Datum wählen|
 Select a Date Below|Wählen Sie unten ein Datum|
 Click on a callback below to call the customer back now. If you click on a record below to call it, it will be removed from the list|Klicken Sie jetzt unten auf eine Wiedervorlage, um den Kunden zurückzurufen. Danach wird die Wiedervorlage aus der Liste gelöscht.|
@@ -279,8 +279,8 @@ DISPOSITION CALL|Τερματισμός Κλήσης|
 session ID| ID εργασίας|
 to campaign| στην εκστρατεία|
 Select a CallBack Date|Επιλέξτε μια ημερομηνία CallBack|
-maximize|μεγιστοποιήστε|
-minimize|ελαχιστοποιήστε|
+ maximize | μεγιστοποιήστε |
+ minimize | ελαχιστοποιήστε |
 You must choose a date|Πρέπει να επιλέξετε μια ημερομηνία|
 Select a Date Below|Επιλέξτε μια ημερομηνία κατωτέρω|
 Click on a callback below to call the customer back now. If you click on a record below to call it, it will be removed from the list|Επιλέξτε μία επανάκληση παρακάτω για να καλέσετε τον πελάτη τώρα. Εάν επιλέξετε μία εγγραφή παρακάτω, θα διαγραφεί από την λίστα|
@@ -279,8 +279,8 @@ DISPOSITION CALL|DISPOSITION CALL|
 session ID| sesión ID|
 to campaign| a la campaña|
 Select a CallBack Date|Seleccione una fecha del servicio repetido|
-maximize|maximice|
-minimize|reduzca al mínimo|
+ maximize | maximice |
+ minimize | reduzca al mínimo |
 You must choose a date|Usted debe elegir una fecha|
 Select a Date Below|Seleccione una fecha abajo|
 Click on a callback below to call the customer back now. If you click on a record below to call it, it will be removed from the list|Chasque encendido un servicio repetido abajo ahora para llamar la parte posteriora del cliente. Si usted chasca encendido un expediente abajo para llamarlo, será quitado de la lista|
@@ -279,8 +279,8 @@ DISPOSITION CALL|STATUER L'APPEL|
 session ID| Id de session|
 to campaign| Campagne:|
 Select a CallBack Date|Choisissez une date de Rappel|
-maximize|agrandir|
-minimize|réduire|
+ maximize | agrandir |
+ minimize | réduire |
 You must choose a date|Vous devez choisir une date|
 Select a Date Below|Choisissez une date ci-dessous|
 Click on a callback below to call the customer back now. If you click on a record below to call it, it will be removed from the list|Selectionnez un rappel a éffectuer immédiatement. Une fois éffectué, ce rappel diparaitra de la liste|
@@ -279,8 +279,8 @@ DISPOSITION CALL|ESITO CHIAMATA|
 session ID| ID sessione|
 to campaign| nella campagna|
 Select a CallBack Date|Selezionare una data di richiamo!|
-maximize|ingrandisci|
-minimize|minimizza|
+ maximize | ingrandisci |
+ minimize | minimizza |
 You must choose a date|Devi scegliere una data|
 Select a Date Below|Seleziona una data qui sotto|
 Click on a callback below to call the customer back now. If you click on a record below to call it, it will be removed from the list.|Selezionare una callback per chiamare il cliente ora. Una volta fatto click, il record sara` rimosso dalla lista.|
@@ -279,8 +279,8 @@ DISPOSITION CALL|REZULTAT ROZMOWY|
 session ID| ID sesji|
 to campaign| do kampani|
 Select a CallBack Date|Wybierz datę oddzwonienia|
-maximize|maksymalizuj|
-minimize|minimalizuj|
+ maximize | maksymalizuj |
+ minimize | minimalizuj |
 You must choose a date|Musisz wybrać datę|
 Select a Date Below|Wybierz datę poniżej|
 Click on a callback below to call the customer back now. If you click on a record below to call it, it will be removed from the list|Kliknij poniżej na Inne terminy żeby teraz zadzwonić do klienta. Jeżeli klikniesz na rekordzie by zadzwonić, rekord zostanie usunięty z listy|
@@ -279,8 +279,8 @@ DISPOSITION CALL|CHAMADA DA DISPOSIÇÃO|
 session ID| sessão ID|
 to campaign| à campanha|
 Select a CallBack Date|Selecione uma data da rechamada|
-maximize|maximize|
-minimize|minimize|
+ maximize | maximize |
+ minimize | minimize |
 You must choose a date|Você deve escolher uma data|
 Select a Date Below|Selecione uma data abaixo|
 Click on a callback below to call the customer back now. If you click on a record below to call it, it will be removed from the list|Estale sobre uma rechamada abaixo para chamar agora a parte traseira do cliente. Se você estalar sobre um registro abaixo para o chamar, estará removido da lista|
@@ -279,8 +279,8 @@ DISPOSITION CALL|VYKONANIE HOVORU|
 session ID| ID relácie|
 to campaign| do kampane|
 Select a CallBack Date|Vyberte dátum preplánovania hovoru|
-maximize|maximalizovať|
-minimize|minimalizovať|
+ maximize | maximalizovať |
+ minimize | minimalizovať |
 You must choose a date|Musíte zmeniť dátum|
 Select a Date Below|Vyberte dátum nižšie|
 Click on a callback below to call the customer back now. If you click on a record below to call it, it will be removed from the list|Kliknite na preplánovanie hovoru na volanie zákaznikovi znova. Ak kliknete na záznam nižšie budete ho volať a bude odstránený zo zoznamu|
@@ -247,7 +247,7 @@ if (isset($_GET["relogin"]))					{$relogin=$_GET["relogin"];}
 	$phone_pass=ereg_replace("[^0-9a-zA-Z]","",$phone_pass);
 	$VD_login=ereg_replace("[^0-9a-zA-Z]","",$VD_login);
 	$VD_pass=ereg_replace("[^0-9a-zA-Z]","",$VD_pass);
-	$VD_campaign=ereg_replace("[^0-9a-zA-Z_]","",$VD_campaign);
+	$VD_campaign = ereg_replace("[^-\_0-9a-zA-Z]","",$VD_campaign);


 $forever_stop=0;
@@ -5506,7 +5506,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				hideDiv('DispoButtonHideB');
 				hideDiv('DispoButtonHideC');
 				document.getElementById("DispoSelectBox").style.top = 1;
-				document.getElementById("DispoSelectMaxMin").innerHTML = "<a href=\"#\" onclick=\"DispoMinimize()\">minimize</a>";
+				document.getElementById("DispoSelectMaxMin").innerHTML = "<a href=\"#\" onclick=\"DispoMinimize()\"> minimize </a>";
 				document.getElementById("DispoSelectHAspan").innerHTML = "<a href=\"#\" onclick=\"DispoHanguPAgaiN()\">Hangup Again</a>";

 				CBcommentsBoxhide();
@@ -6355,7 +6355,7 @@ function phone_number_format(formatphone) {
 			showDiv('DispoButtonHideB');
 			showDiv('DispoButtonHideC');
 		document.getElementById("DispoSelectBox").style.top = 340;
-		document.getElementById("DispoSelectMaxMin").innerHTML = "<a href=\"#\" onclick=\"DispoMaximize()\">maximize</a>";
+		document.getElementById("DispoSelectMaxMin").innerHTML = "<a href=\"#\" onclick=\"DispoMaximize()\"> maximize </a>";
 		}


@@ -6364,7 +6364,7 @@ function phone_number_format(formatphone) {
 	function DispoMaximize()
 		{
 		document.getElementById("DispoSelectBox").style.top = 1;
-		document.getElementById("DispoSelectMaxMin").innerHTML = "<a href=\"#\" onclick=\"DispoMinimize()\">minimize</a>";
+		document.getElementById("DispoSelectMaxMin").innerHTML = "<a href=\"#\" onclick=\"DispoMinimize()\"> minimize </a>";
 			hideDiv('DispoButtonHideA');
 			hideDiv('DispoButtonHideB');
 			hideDiv('DispoButtonHideC');
@@ -7430,7 +7430,7 @@ Your Status: <span id="AgentStatusStatus"></span> <BR>Calls Dialing: <span id="A
    <table border=0 bgcolor="#FFFFCC" width=<?=$HCwidth ?> height=70>
 	<TR bgcolor="#FFFF66">
 	<TD align=left><font class="sh_text"> Extended Alt Phone Information: </font></td>
-	<TD align=right><font class="sk_text"> <a href="#" onclick="EAcommentsBoxhide('YES');return false;">minimize</a> </font></td>
+	<TD align=right><font class="sk_text"> <a href="#" onclick="EAcommentsBoxhide('YES');return false;"> minimize </a> </font></td>
 	</tr><tr>
 	<TD VALIGN=top><font class="sk_text">
 	<span id="EAcommentsBoxC"></span><BR>
@@ -7446,7 +7446,7 @@ Your Status: <span id="AgentStatusStatus"></span> <BR>Calls Dialing: <span id="A
 <span style="position:absolute;left:695px;top:<?=$HTheight ?>px;z-index:27;" id="EAcommentsMinBox">
    <table border=0 bgcolor="#FFFFCC" width=40 height=20>
 	<TR bgcolor="#FFFF66">
-	<TD align=left><font class="sk_text"><a href="#" onclick="EAcommentsBoxshow();return false;">maximize</a> <BR>Alt Phone Info</font></td>
+	<TD align=left><font class="sk_text"><a href="#" onclick="EAcommentsBoxshow();return false;"> maximize </a> <BR>Alt Phone Info</font></td>
 	</tr></TABLE>
 </span>

@@ -7498,7 +7498,7 @@ Your Status: <span id="AgentStatusStatus"></span> <BR>Calls Dialing: <span id="A
 </span>

 <span style="position:absolute;left:0px;top:0px;z-index:36;" id="DispoSelectBox">
-    <table border=1 bgcolor="#CCFFCC" width=<?=$CAwidth ?> height=460><TR><TD align=center VALIGN=top> DISPOSITION CALL :<span id="DispoSelectPhonE"></span> &nbsp; &nbsp; &nbsp; <span id="DispoSelectHAspan"><a href="#" onclick="DispoHanguPAgaiN()">Hangup Again</a></span> &nbsp; &nbsp; &nbsp; <span id="DispoSelectMaxMin"><a href="#" onclick="DispoMinimize()">minimize</a></span><BR>
+    <table border=1 bgcolor="#CCFFCC" width=<?=$CAwidth ?> height=460><TR><TD align=center VALIGN=top> DISPOSITION CALL :<span id="DispoSelectPhonE"></span> &nbsp; &nbsp; &nbsp; <span id="DispoSelectHAspan"><a href="#" onclick="DispoHanguPAgaiN()">Hangup Again</a></span> &nbsp; &nbsp; &nbsp; <span id="DispoSelectMaxMin"><a href="#" onclick="DispoMinimize()"> minimize </a></span><BR>
 	<span id="DispoSelectContent"> End-of-call Disposition Selection </span>
 	<input type=hidden name=DispoSelection><BR>
 	<input type=checkbox name=DispoSelectStop size=1 value="0"> PAUSE AGENT DIALING <BR>
@@ -981,12 +981,12 @@ $calls_to_list = mysql_num_rows($rslt);
 		if (eregi("INCALL",$Lstatus)) 
 			{
 	### temporarily deactivate DEAD calls display until bug is fixed
-	#		if (!ereg("$Acallerid[$i]\|",$callerids))
-	#			{
-	#			$Astatus[$i] =	'DEAD';
-	#			$Lstatus =		'DEAD';
-	#			$status =		' DEAD ';
-	#			}
+			if (!ereg("$Acallerid[$i]\|",$callerids))
+				{
+				$Astatus[$i] =	'DEAD';
+				$Lstatus =		'DEAD';
+				$status =		' DEAD ';
+				}

 			if ( (eregi("AUTO",$comments)) or (strlen($comments)<1) )
 				{$CM='A';}
@@ -6708,7 +6708,7 @@ if ($ADD==2311)
 			{echo "<br>DID NOT ADDED - there is already a DID in the system with this extension\n";}
 		else
 			{
-			 if ( (strlen($did_pattern) < 1) or (strlen($did_pattern) < 1) or (eregi(' ',$did_pattern)) or (eregi(' ',$did_pattern)) or (eregi("\+",$did_pattern)) )
+			 if ( (strlen($source_did) < 1) or (strlen($did_pattern) < 1) or (eregi(' ',$source_did)) or (eregi(' ',$did_pattern)) or (eregi("\+",$source_did)) )
 				{
 				 echo "<br>DID NOT ADDED - Please go back and look at the data you entered\n";
 				 echo "<br>DID Extension must be between 2 and 20 characters in length and contain no ' -+'.\n";
@@ -6723,7 +6723,7 @@ if ($ADD==2311)
 				$row=mysql_fetch_row($rslt);
 				$did_id = $row[0];

-				echo "<br><B>DID ADDED: $did_pattern     - $did_id</B>\n";
+				echo "<br><B>DID ADDED: $did_pattern $did_description    - $did_id</B>\n";

 				### LOG CHANGES TO LOG FILE ###
 				if ($WeBRooTWritablE > 0)
@@ -13858,7 +13858,7 @@ if ($ADD==3311)
 	echo "<tr bgcolor=#B6D3FC><td align=right>User Route Settings In-Group: </td><td align=left><select size=1 name=user_route_settings_ingroup>";
 	echo "$Xgroups_menu";
 	echo "</select>$NWB#vicidial_inbound_dids-user_route_settings_ingroup$NWE</td></tr>\n";
-	echo "<tr bgcolor=#B6D3FC><td align=right>In-Group ID: </td><td align=left><select size=1 name=group_id>";
+	echo "<tr bgcolor=#B6D3FC><td align=right><a href=\"$PHP_SELF?ADD=3111&group_id=$group_id\">In-Group ID</a>: </td><td align=left><select size=1 name=group_id>";
 	echo "$Dgroups_menu";
 	echo "</select>$NWB#vicidial_inbound_dids-group_id$NWE</td></tr>\n";
 	echo "<tr bgcolor=#B6D3FC><td align=right>In-Group Call Handle Method: </td><td align=left><select size=1 name=call_handle_method><option>CID</option><option>CIDLOOKUP</option><option>CIDLOOKUPRL</option><option>CIDLOOKUPRC</option><option>ANI</option><option>ANILOOKUP</option><option>ANILOOKUPRL</option><option>CLOSER</option><option>3DIGITID</option><option>4DIGITID</option><option>5DIGITID</option><option>10DIGITID</option><option SELECTED>$call_handle_method</option></select>$NWB#vicidial_inbound_dids-call_handle_method$NWE</td></tr>\n";