fixed 3 translations bugs and rebuilt agc translations files

put new dbconnect.php in language translations builds

git-svn-id: svn://192.168.202.10@238 3d104415-ff17-0410-8863-d5cf3c621b8a

LANG_www/agc_br/dbconnect.php

@@ -1,15 +1,48 @@
 <?
+# 
+# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+#
+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);}
+	}
 
-$link=mysql_connect("localhost", "cron", "1234");
-mysql_select_db("asterisk");
+}
+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");
+mysql_select_db("$VARDB_database");
 
 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
 $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
-
-$WeBServeRRooT = '/usr/local/apache2/htdocs';
 $WeBRooTWritablE = '1';
 
 ?>

LANG_www/agc_br/manager_send.php

@@ -426,13 +426,13 @@ if ($ACTION=="RedirectVD")
 		if (strlen($call_server_ip)>6) {$server_ip = $call_server_ip;}
 			if (eregi("CLOSER",$campaign))
 				{
-				$stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='TRANFERENCIA' where lead_id='$lead_id' order by start_epoch desc limit 1;";
+				$stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='XFER' where lead_id='$lead_id' order by start_epoch desc limit 1;";
 					if ($format=='debug') {echo "\n<!-- $stmt -->";}
 				$rslt=mysql_query($stmt, $link);
 				}
 			if ($auto_dial_level < 1)
 				{
-				$stmt = "UPDATE vicidial_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='TRANFERENCIA' where uniqueid='$uniqueid';";
+				$stmt = "UPDATE vicidial_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='XFER' where uniqueid='$uniqueid';";
 					if ($format=='debug') {echo "\n<!-- $stmt -->";}
 				$rslt=mysql_query($stmt, $link);
 				}

LANG_www/agc_br/vdc_db_query.php

@@ -1236,7 +1236,7 @@ if ($ACTION == 'VDADcheckINCOMING')
 		$rslt=mysql_query($stmt, $link);
 
 		### If CHAMADABK, change vicidial_callback record to INACTIVE
-		if (eregi("CALLBK|CBHVELHO", $dispo))
+		if (eregi("CALLBK|CBHOLD", $dispo))
 			{
 			$stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');";
 				if ($format=='debug') {echo "\n<!-- $stmt -->";}
@@ -1372,7 +1372,7 @@ if ($ACTION == 'updateDISPO')
 	$agent_log_id = mysql_insert_id();
 
 	### CHAMADABACK ENTRY
-	if ( ($dispo_choice == 'CBHVELHO') and (strlen($CallBackDatETimE)>10) )
+	if ( ($dispo_choice == 'CBHOLD') and (strlen($CallBackDatETimE)>10) )
 		{
 		$stmt="INSERT INTO vicidial_callbacks (lead_id,list_id,campaign_id,status,entry_time,callback_time,user,recipient,comments) values('$lead_id','$list_id','$campaign','ACTIVE','$NOW_TIME','$CallBackDatETimE','$user','$recipient','$comments');";
 		if ($DB) {echo "$stmt\n";}

LANG_www/agc_br/vicidial.php

@@ -1526,7 +1526,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 			var manual_number = document.vicidial_form.xfernumber.value;
 			var manual_string = manual_number.toString();
 			}
-		var regXFvars = new RegExp("TRANFERENCIA","g");
+		var regXFvars = new RegExp("XFER","g");
 		if (manual_string.match(regXFvars))
 			{
 			var donothing=1;
@@ -1582,7 +1582,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 			}
 		if (xmlhttp) 
 			{
-			var regCXFvars = new RegExp("CTRANFERENCIA","g");
+			var regCXFvars = new RegExp("CXFER","g");
 			var tasknum_string = tasknum.toString();
 			if (tasknum_string.match(regCXFvars))
 				{
@@ -1592,7 +1592,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				var closerxfercamptail = '_L' + document.vicidial_form.xfercode.value;
 				tasknum = Ctasknum + "*CL_" + campaign + '' + closerxfercamptail + '**' + document.vicidial_form.lead_id.value + '**' + document.vicidial_form.phone_number.value + '*' + user + '*';
 				}
-			var regAXFvars = new RegExp("ATRANFERENCIA","g");
+			var regAXFvars = new RegExp("AXFER","g");
 			if (tasknum_string.match(regAXFvars))
 				{
 				var Ctasknum = tasknum_string.replace(regAXFvars, '');
@@ -1984,7 +1984,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 
 // ################################################################################
 // Send Redirect command for live call to Manager sends phone name where call is going to
-// Covers the following types: TRANFERENCIA, VMAIL, ENTRY, CONF, ESPERA, FROMESPERA, XfeRLOCAL, XfeRINTERNAL, XfeRBLIND, VfeRVMAIL
+// Covers the following types: XFER, VMAIL, ENTRY, CONF, ESPERA, FROMESPERA, XfeRLOCAL, XfeRINTERNAL, XfeRBLIND, VfeRVMAIL
 	function mainxfer_send_redirect(taskvar,taskxferconf,taskserverip) 
 		{
 		var xmlhttp=false;
@@ -2016,10 +2016,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				{
 				var queryCID = "XBvdcW" + epoch_sec + user_abb;
 				var blindxferdialstring = document.vicidial_form.xfernumber.value;
-				var regXFvars = new RegExp("TRANFERENCIA","g");
+				var regXFvars = new RegExp("XFER","g");
 				if (blindxferdialstring.match(regXFvars))
 					{
-					var regAXFvars = new RegExp("ATRANFERENCIA","g");
+					var regAXFvars = new RegExp("AXFER","g");
 					if (blindxferdialstring.match(regAXFvars))
 						{
 						var Ctasknum = blindxferdialstring.replace(regAXFvars, '');
@@ -2105,7 +2105,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				var redirectXTRAvalue = XDchannel;
 				var redirecttype_test = document.vicidial_form.xfernumber.value;
 				var closerxfercamptail = '_L' + document.vicidial_form.xfercode.value;
-				var regRXFvars = new RegExp("CTRANFERENCIA","g");
+				var regRXFvars = new RegExp("CXFER","g");
 				if ( (redirecttype_test.match(regRXFvars)) && (local_consult_xfers > 0) )
 					{var redirecttype = 'RedirectXtraCX';}
 				else
@@ -4611,7 +4611,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 
 		//	alert(CallBackDatETimE + "|" + CallBackCommenTs);
 
-			document.vicidial_form.DispoSelection.value = 'CBHVELHO';
+			document.vicidial_form.DispoSelection.value = 'CBHOLD';
 			hideDiv('CallBackSelectBox');
 			DispoSelect_submit();
 			}

LANG_www/agc_de/dbconnect.php

@@ -1,15 +1,48 @@
 <?
+# 
+# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+#
+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);}
+	}
 
-$link=mysql_connect("localhost", "cron", "1234");
-mysql_select_db("asterisk");
+}
+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");
+mysql_select_db("$VARDB_database");
 
 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
 $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
-
-$WeBServeRRooT = '/usr/local/apache2/htdocs';
 $WeBRooTWritablE = '1';
 
 ?>

LANG_www/agc_de/vdc_db_query.php

@@ -1236,7 +1236,7 @@ if ($ACTION == 'VDADcheckINCOMING')
 		$rslt=mysql_query($stmt, $link);
 
 		### If ANRUFBK, change vicidial_callback record to INACTIVE
-		if (eregi("CALLBK|CBHALT", $dispo))
+		if (eregi("CALLBK|CBHOLD", $dispo))
 			{
 			$stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');";
 				if ($format=='debug') {echo "\n<!-- $stmt -->";}
@@ -1372,7 +1372,7 @@ if ($ACTION == 'updateDISPO')
 	$agent_log_id = mysql_insert_id();
 
 	### ANRUFBACK ENTRY
-	if ( ($dispo_choice == 'CBHALT') and (strlen($CallBackDatETimE)>10) )
+	if ( ($dispo_choice == 'CBHOLD') and (strlen($CallBackDatETimE)>10) )
 		{
 		$stmt="INSERT INTO vicidial_callbacks (lead_id,list_id,campaign_id,status,entry_time,callback_time,user,recipient,comments) values('$lead_id','$list_id','$campaign','ACTIVE','$NOW_TIME','$CallBackDatETimE','$user','$recipient','$comments');";
 		if ($DB) {echo "$stmt\n";}

LANG_www/agc_de/vicidial.php

@@ -4611,7 +4611,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 
 		//	alert(CallBackDatETimE + "|" + CallBackCommenTs);
 
-			document.vicidial_form.DispoSelection.value = 'CBHALT';
+			document.vicidial_form.DispoSelection.value = 'CBHOLD';
 			hideDiv('CallBackSelectBox');
 			DispoSelect_submit();
 			}

LANG_www/agc_el/dbconnect.php

@@ -1,15 +1,48 @@
 <?
+# 
+# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+#
+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);}
+	}
 
-$link=mysql_connect("localhost", "cron", "1234");
-mysql_select_db("asterisk");
+}
+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");
+mysql_select_db("$VARDB_database");
 
 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
 $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
-
-$WeBServeRRooT = '/usr/local/apache2/htdocs';
 $WeBRooTWritablE = '1';
 
 ?>

LANG_www/agc_el/vdc_db_query.php

@@ -1236,7 +1236,7 @@ if ($ACTION == 'VDADcheckINCOMING')
 		$rslt=mysql_query($stmt, $link);
 
 		### If ΚΛΗΣΗBK, change vicidial_callback record to INACTIVE
-		if (eregi("CALLBK|CBHΠΑΛΑΙΟ", $dispo))
+		if (eregi("CALLBK|CBHOLD", $dispo))
 			{
 			$stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');";
 				if ($format=='debug') {echo "\n<!-- $stmt -->";}
@@ -1372,7 +1372,7 @@ if ($ACTION == 'updateDISPO')
 	$agent_log_id = mysql_insert_id();
 
 	### ΚΛΗΣΗBACK ENTRY
-	if ( ($dispo_choice == 'CBHΠΑΛΑΙΟ') and (strlen($CallBackDatETimE)>10) )
+	if ( ($dispo_choice == 'CBHOLD') and (strlen($CallBackDatETimE)>10) )
 		{
 		$stmt="INSERT INTO vicidial_callbacks (lead_id,list_id,campaign_id,status,entry_time,callback_time,user,recipient,comments) values('$lead_id','$list_id','$campaign','ACTIVE','$NOW_TIME','$CallBackDatETimE','$user','$recipient','$comments');";
 		if ($DB) {echo "$stmt\n";}

LANG_www/agc_el/vicidial.php

@@ -4611,7 +4611,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 
 		//	alert(CallBackDatETimE + "|" + CallBackCommenTs);
 
-			document.vicidial_form.DispoSelection.value = 'CBHΠΑΛΑΙΟ';
+			document.vicidial_form.DispoSelection.value = 'CBHOLD';
 			hideDiv('CallBackSelectBox');
 			DispoSelect_submit();
 			}

LANG_www/agc_en/dbconnect.php

@@ -1,15 +1,48 @@
 <?
+# 
+# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+#
+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);}
+	}
 
-$link=mysql_connect("localhost", "cron", "1234");
-mysql_select_db("asterisk");
+}
+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");
+mysql_select_db("$VARDB_database");
 
 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
 $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
-
-$WeBServeRRooT = '/usr/local/apache2/htdocs';
 $WeBRooTWritablE = '1';
 
 ?>

LANG_www/agc_es/dbconnect.php

@@ -1,15 +1,48 @@
 <?
+# 
+# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+#
+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);}
+	}
 
-$link=mysql_connect("localhost", "cron", "1234");
-mysql_select_db("asterisk");
+}
+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");
+mysql_select_db("$VARDB_database");
 
 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
 $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
-
-$WeBServeRRooT = '/usr/local/apache2/htdocs';
 $WeBRooTWritablE = '1';
 
 ?>

LANG_www/agc_es/manager_send.php

@@ -426,13 +426,13 @@ if ($ACTION=="RedirectVD")
 		if (strlen($call_server_ip)>6) {$server_ip = $call_server_ip;}
 			if (eregi("CLOSER",$campaign))
 				{
-				$stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='TRANSFERENCIA' where lead_id='$lead_id' order by start_epoch desc limit 1;";
+				$stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='XFER' where lead_id='$lead_id' order by start_epoch desc limit 1;";
 					if ($format=='debug') {echo "\n<!-- $stmt -->";}
 				$rslt=mysql_query($stmt, $link);
 				}
 			if ($auto_dial_level < 1)
 				{
-				$stmt = "UPDATE vicidial_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='TRANSFERENCIA' where uniqueid='$uniqueid';";
+				$stmt = "UPDATE vicidial_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='XFER' where uniqueid='$uniqueid';";
 					if ($format=='debug') {echo "\n<!-- $stmt -->";}
 				$rslt=mysql_query($stmt, $link);
 				}

LANG_www/agc_es/vdc_db_query.php

@@ -1236,7 +1236,7 @@ if ($ACTION == 'VDADcheckINCOMING')
 		$rslt=mysql_query($stmt, $link);
 
 		### If LLAMADABK, change vicidial_callback record to INACTIVE
-		if (eregi("CALLBK|CBHVIEJO", $dispo))
+		if (eregi("CALLBK|CBHOLD", $dispo))
 			{
 			$stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');";
 				if ($format=='debug') {echo "\n<!-- $stmt -->";}
@@ -1372,7 +1372,7 @@ if ($ACTION == 'updateDISPO')
 	$agent_log_id = mysql_insert_id();
 
 	### LLAMADABACK ENTRY
-	if ( ($dispo_choice == 'CBHVIEJO') and (strlen($CallBackDatETimE)>10) )
+	if ( ($dispo_choice == 'CBHOLD') and (strlen($CallBackDatETimE)>10) )
 		{
 		$stmt="INSERT INTO vicidial_callbacks (lead_id,list_id,campaign_id,status,entry_time,callback_time,user,recipient,comments) values('$lead_id','$list_id','$campaign','ACTIVE','$NOW_TIME','$CallBackDatETimE','$user','$recipient','$comments');";
 		if ($DB) {echo "$stmt\n";}

LANG_www/agc_es/vicidial.php

@@ -1526,7 +1526,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 			var manual_number = document.vicidial_form.xfernumber.value;
 			var manual_string = manual_number.toString();
 			}
-		var regXFvars = new RegExp("TRANSFERENCIA","g");
+		var regXFvars = new RegExp("XFER","g");
 		if (manual_string.match(regXFvars))
 			{
 			var donothing=1;
@@ -1582,7 +1582,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 			}
 		if (xmlhttp) 
 			{
-			var regCXFvars = new RegExp("CTRANSFERENCIA","g");
+			var regCXFvars = new RegExp("CXFER","g");
 			var tasknum_string = tasknum.toString();
 			if (tasknum_string.match(regCXFvars))
 				{
@@ -1592,7 +1592,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				var closerxfercamptail = '_L' + document.vicidial_form.xfercode.value;
 				tasknum = Ctasknum + "*CL_" + campaign + '' + closerxfercamptail + '**' + document.vicidial_form.lead_id.value + '**' + document.vicidial_form.phone_number.value + '*' + user + '*';
 				}
-			var regAXFvars = new RegExp("ATRANSFERENCIA","g");
+			var regAXFvars = new RegExp("AXFER","g");
 			if (tasknum_string.match(regAXFvars))
 				{
 				var Ctasknum = tasknum_string.replace(regAXFvars, '');
@@ -1984,7 +1984,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 
 // ################################################################################
 // Send Redirect command for live call to Manager sends phone name where call is going to
-// Covers the following types: TRANSFERENCIA, VMAIL, ENTRY, CONF, PARKING, FROMPARKING, XfeRLOCAL, XfeRINTERNAL, XfeRBLIND, VfeRVMAIL
+// Covers the following types: XFER, VMAIL, ENTRY, CONF, PARKING, FROMPARKING, XfeRLOCAL, XfeRINTERNAL, XfeRBLIND, VfeRVMAIL
 	function mainxfer_send_redirect(taskvar,taskxferconf,taskserverip) 
 		{
 		var xmlhttp=false;
@@ -2016,10 +2016,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				{
 				var queryCID = "XBvdcW" + epoch_sec + user_abb;
 				var blindxferdialstring = document.vicidial_form.xfernumber.value;
-				var regXFvars = new RegExp("TRANSFERENCIA","g");
+				var regXFvars = new RegExp("XFER","g");
 				if (blindxferdialstring.match(regXFvars))
 					{
-					var regAXFvars = new RegExp("ATRANSFERENCIA","g");
+					var regAXFvars = new RegExp("AXFER","g");
 					if (blindxferdialstring.match(regAXFvars))
 						{
 						var Ctasknum = blindxferdialstring.replace(regAXFvars, '');
@@ -2105,7 +2105,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				var redirectXTRAvalue = XDchannel;
 				var redirecttype_test = document.vicidial_form.xfernumber.value;
 				var closerxfercamptail = '_L' + document.vicidial_form.xfercode.value;
-				var regRXFvars = new RegExp("CTRANSFERENCIA","g");
+				var regRXFvars = new RegExp("CXFER","g");
 				if ( (redirecttype_test.match(regRXFvars)) && (local_consult_xfers > 0) )
 					{var redirecttype = 'RedirectXtraCX';}
 				else
@@ -4611,7 +4611,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 
 		//	alert(CallBackDatETimE + "|" + CallBackCommenTs);
 
-			document.vicidial_form.DispoSelection.value = 'CBHVIEJO';
+			document.vicidial_form.DispoSelection.value = 'CBHOLD';
 			hideDiv('CallBackSelectBox');
 			DispoSelect_submit();
 			}

LANG_www/agc_fr/dbconnect.php

@@ -1,15 +1,48 @@
 <?
+# 
+# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+#
+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);}
+	}
 
-$link=mysql_connect("localhost", "cron", "1234");
-mysql_select_db("asterisk");
+}
+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");
+mysql_select_db("$VARDB_database");
 
 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
 $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
-
-$WeBServeRRooT = '/usr/local/apache2/htdocs';
 $WeBRooTWritablE = '1';
 
 ?>

LANG_www/agc_fr/vdc_db_query.php

@@ -1236,7 +1236,7 @@ if ($ACTION == 'VDADcheckINCOMING')
 		$rslt=mysql_query($stmt, $link);
 
 		### If APPELBK, change vicidial_callback record to INACTIVE
-		if (eregi("CALLBK|CBHVIEUX", $dispo))
+		if (eregi("CALLBK|CBHOLD", $dispo))
 			{
 			$stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');";
 				if ($format=='debug') {echo "\n<!-- $stmt -->";}
@@ -1372,7 +1372,7 @@ if ($ACTION == 'updateDISPO')
 	$agent_log_id = mysql_insert_id();
 
 	### APPELBACK ENTRY
-	if ( ($dispo_choice == 'CBHVIEUX') and (strlen($CallBackDatETimE)>10) )
+	if ( ($dispo_choice == 'CBHOLD') and (strlen($CallBackDatETimE)>10) )
 		{
 		$stmt="INSERT INTO vicidial_callbacks (lead_id,list_id,campaign_id,status,entry_time,callback_time,user,recipient,comments) values('$lead_id','$list_id','$campaign','ACTIVE','$NOW_TIME','$CallBackDatETimE','$user','$recipient','$comments');";
 		if ($DB) {echo "$stmt\n";}

LANG_www/agc_fr/vicidial.php

@@ -4611,7 +4611,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 
 		//	alert(CallBackDatETimE + "|" + CallBackCommenTs);
 
-			document.vicidial_form.DispoSelection.value = 'CBHVIEUX';
+			document.vicidial_form.DispoSelection.value = 'CBHOLD';
 			hideDiv('CallBackSelectBox');
 			DispoSelect_submit();
 			}

LANG_www/agc_it/dbconnect.php

@@ -1,15 +1,48 @@
 <?
+# 
+# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+#
+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);}
+	}
 
-$link=mysql_connect("localhost", "cron", "1234");
-mysql_select_db("asterisk");
+}
+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");
+mysql_select_db("$VARDB_database");
 
 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
 $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
-
-$WeBServeRRooT = '/usr/local/apache2/htdocs';
 $WeBRooTWritablE = '1';
 
 ?>

LANG_www/agc_it/manager_send.php

@@ -426,13 +426,13 @@ if ($ACTION=="RedirectVD")
 		if (strlen($call_server_ip)>6) {$server_ip = $call_server_ip;}
 			if (eregi("CLOSER",$campaign))
 				{
-				$stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='TRASF' where lead_id='$lead_id' order by start_epoch desc limit 1;";
+				$stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='XFER' where lead_id='$lead_id' order by start_epoch desc limit 1;";
 					if ($format=='debug') {echo "\n<!-- $stmt -->";}
 				$rslt=mysql_query($stmt, $link);
 				}
 			if ($auto_dial_level < 1)
 				{
-				$stmt = "UPDATE vicidial_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='TRASF' where uniqueid='$uniqueid';";
+				$stmt = "UPDATE vicidial_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='XFER' where uniqueid='$uniqueid';";
 					if ($format=='debug') {echo "\n<!-- $stmt -->";}
 				$rslt=mysql_query($stmt, $link);
 				}

LANG_www/agc_it/vdc_db_query.php

@@ -1236,7 +1236,7 @@ if ($ACTION == 'VDADcheckINCOMING')
 		$rslt=mysql_query($stmt, $link);
 
 		### If CHIAMATABK, change vicidial_callback record to INACTIVE
-		if (eregi("CALLBK|CBHVECCHIO", $dispo))
+		if (eregi("CALLBK|CBHOLD", $dispo))
 			{
 			$stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');";
 				if ($format=='debug') {echo "\n<!-- $stmt -->";}
@@ -1372,7 +1372,7 @@ if ($ACTION == 'updateDISPO')
 	$agent_log_id = mysql_insert_id();
 
 	### CHIAMATABACK ENTRY
-	if ( ($dispo_choice == 'CBHVECCHIO') and (strlen($CallBackDatETimE)>10) )
+	if ( ($dispo_choice == 'CBHOLD') and (strlen($CallBackDatETimE)>10) )
 		{
 		$stmt="INSERT INTO vicidial_callbacks (lead_id,list_id,campaign_id,status,entry_time,callback_time,user,recipient,comments) values('$lead_id','$list_id','$campaign','ACTIVE','$NOW_TIME','$CallBackDatETimE','$user','$recipient','$comments');";
 		if ($DB) {echo "$stmt\n";}

LANG_www/agc_it/vicidial.php

@@ -1526,7 +1526,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 			var manual_number = document.vicidial_form.xfernumber.value;
 			var manual_string = manual_number.toString();
 			}
-		var regXFvars = new RegExp("TRASF","g");
+		var regXFvars = new RegExp("XFER","g");
 		if (manual_string.match(regXFvars))
 			{
 			var donothing=1;
@@ -1582,7 +1582,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 			}
 		if (xmlhttp) 
 			{
-			var regCXFvars = new RegExp("CTRASF","g");
+			var regCXFvars = new RegExp("CXFER","g");
 			var tasknum_string = tasknum.toString();
 			if (tasknum_string.match(regCXFvars))
 				{
@@ -1592,7 +1592,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				var closerxfercamptail = '_L' + document.vicidial_form.xfercode.value;
 				tasknum = Ctasknum + "*CL_" + campaign + '' + closerxfercamptail + '**' + document.vicidial_form.lead_id.value + '**' + document.vicidial_form.phone_number.value + '*' + user + '*';
 				}
-			var regAXFvars = new RegExp("ATRASF","g");
+			var regAXFvars = new RegExp("AXFER","g");
 			if (tasknum_string.match(regAXFvars))
 				{
 				var Ctasknum = tasknum_string.replace(regAXFvars, '');
@@ -1984,7 +1984,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 
 // ################################################################################
 // Send Redirect command for live call to Manager sends phone name where call is going to
-// Covers the following types: TRASF, VMAIL, ENTRY, CONF, PARK, FROMPARK, XfeRLOCAL, XfeRINTERNAL, XfeRBLIND, VfeRVMAIL
+// Covers the following types: XFER, VMAIL, ENTRY, CONF, PARK, FROMPARK, XfeRLOCAL, XfeRINTERNAL, XfeRBLIND, VfeRVMAIL
 	function mainxfer_send_redirect(taskvar,taskxferconf,taskserverip) 
 		{
 		var xmlhttp=false;
@@ -2016,10 +2016,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				{
 				var queryCID = "XBvdcW" + epoch_sec + user_abb;
 				var blindxferdialstring = document.vicidial_form.xfernumber.value;
-				var regXFvars = new RegExp("TRASF","g");
+				var regXFvars = new RegExp("XFER","g");
 				if (blindxferdialstring.match(regXFvars))
 					{
-					var regAXFvars = new RegExp("ATRASF","g");
+					var regAXFvars = new RegExp("AXFER","g");
 					if (blindxferdialstring.match(regAXFvars))
 						{
 						var Ctasknum = blindxferdialstring.replace(regAXFvars, '');
@@ -2105,7 +2105,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				var redirectXTRAvalue = XDchannel;
 				var redirecttype_test = document.vicidial_form.xfernumber.value;
 				var closerxfercamptail = '_L' + document.vicidial_form.xfercode.value;
-				var regRXFvars = new RegExp("CTRASF","g");
+				var regRXFvars = new RegExp("CXFER","g");
 				if ( (redirecttype_test.match(regRXFvars)) && (local_consult_xfers > 0) )
 					{var redirecttype = 'RedirectXtraCX';}
 				else
@@ -4611,7 +4611,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 
 		//	alert(CallBackDatETimE + "|" + CallBackCommenTs);
 
-			document.vicidial_form.DispoSelection.value = 'CBHVECCHIO';
+			document.vicidial_form.DispoSelection.value = 'CBHOLD';
 			hideDiv('CallBackSelectBox');
 			DispoSelect_submit();
 			}

LANG_www/agc_pl/dbconnect.php

@@ -1,16 +1,48 @@
 <?
+# 
+# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+#
+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);}
+	}
 
-$link=mysql_connect("10.10.11.10", "astcron", "astcron");
-mysql_select_db("asterisk");
+}
+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");
+mysql_select_db("$VARDB_database");
 
 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
 $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
-
-$WeBServeRRooT = '/home/www/htdocs';
-#$WeBServeRRooT = '/usr/local/apache2/htdocs';
 $WeBRooTWritablE = '1';
 
 ?>

LANG_www/agc_pl/manager_send.php

@@ -426,13 +426,13 @@ if ($ACTION=="RedirectVD")
 		if (strlen($call_server_ip)>6) {$server_ip = $call_server_ip;}
 			if (eregi("CLOSER",$campaign))
 				{
-				$stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='TRANSFER' where lead_id='$lead_id' order by start_epoch desc limit 1;";
+				$stmt = "UPDATE vicidial_closer_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='XFER' where lead_id='$lead_id' order by start_epoch desc limit 1;";
 					if ($format=='debug') {echo "\n<!-- $stmt -->";}
 				$rslt=mysql_query($stmt, $link);
 				}
 			if ($auto_dial_level < 1)
 				{
-				$stmt = "UPDATE vicidial_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='TRANSFER' where uniqueid='$uniqueid';";
+				$stmt = "UPDATE vicidial_log set end_epoch='$StarTtime', length_in_sec='$secondS',status='XFER' where uniqueid='$uniqueid';";
 					if ($format=='debug') {echo "\n<!-- $stmt -->";}
 				$rslt=mysql_query($stmt, $link);
 				}

LANG_www/agc_pl/vdc_db_query.php

@@ -1236,7 +1236,7 @@ if ($ACTION == 'VDADcheckINCOMING')
 		$rslt=mysql_query($stmt, $link);
 
 		### If RozmowaBK, change vicidial_callback record to INACTIVE
-		if (eregi("CALLBK|CBHSTARY", $dispo))
+		if (eregi("CALLBK|CBHOLD", $dispo))
 			{
 			$stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');";
 				if ($format=='debug') {echo "\n<!-- $stmt -->";}
@@ -1372,7 +1372,7 @@ if ($ACTION == 'updateDISPO')
 	$agent_log_id = mysql_insert_id();
 
 	### RozmowaBACK ENTRY
-	if ( ($dispo_choice == 'CBHSTARY') and (strlen($CallBackDatETimE)>10) )
+	if ( ($dispo_choice == 'CBHOLD') and (strlen($CallBackDatETimE)>10) )
 		{
 		$stmt="INSERT INTO vicidial_callbacks (lead_id,list_id,campaign_id,status,entry_time,callback_time,user,recipient,comments) values('$lead_id','$list_id','$campaign','ACTIVE','$NOW_TIME','$CallBackDatETimE','$user','$recipient','$comments');";
 		if ($DB) {echo "$stmt\n";}

LANG_www/agc_pl/vicidial.php

@@ -1526,7 +1526,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 			var manual_number = document.vicidial_form.xfernumber.value;
 			var manual_string = manual_number.toString();
 			}
-		var regXFvars = new RegExp("TRANSFER","g");
+		var regXFvars = new RegExp("XFER","g");
 		if (manual_string.match(regXFvars))
 			{
 			var donothing=1;
@@ -1582,7 +1582,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 			}
 		if (xmlhttp) 
 			{
-			var regCXFvars = new RegExp("CTRANSFER","g");
+			var regCXFvars = new RegExp("CXFER","g");
 			var tasknum_string = tasknum.toString();
 			if (tasknum_string.match(regCXFvars))
 				{
@@ -1592,7 +1592,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				var closerxfercamptail = '_L' + document.vicidial_form.xfercode.value;
 				tasknum = Ctasknum + "*CL_" + campaign + '' + closerxfercamptail + '**' + document.vicidial_form.lead_id.value + '**' + document.vicidial_form.phone_number.value + '*' + user + '*';
 				}
-			var regAXFvars = new RegExp("ATRANSFER","g");
+			var regAXFvars = new RegExp("AXFER","g");
 			if (tasknum_string.match(regAXFvars))
 				{
 				var Ctasknum = tasknum_string.replace(regAXFvars, '');
@@ -1984,7 +1984,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 
 // ################################################################################
 // Send Redirect command for live call to Manager sends phone name where call is going to
-// Covers the following types: TRANSFER, VMAIL, ENTRY, CONF, PARKING, FROMPARKING, XfeRLOCAL, XfeRINTERNAL, XfeRBLIND, VfeRVMAIL
+// Covers the following types: XFER, VMAIL, ENTRY, CONF, PARKING, FROMPARKING, XfeRLOCAL, XfeRINTERNAL, XfeRBLIND, VfeRVMAIL
 	function mainxfer_send_redirect(taskvar,taskxferconf,taskserverip) 
 		{
 		var xmlhttp=false;
@@ -2016,10 +2016,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				{
 				var queryCID = "XBvdcW" + epoch_sec + user_abb;
 				var blindxferdialstring = document.vicidial_form.xfernumber.value;
-				var regXFvars = new RegExp("TRANSFER","g");
+				var regXFvars = new RegExp("XFER","g");
 				if (blindxferdialstring.match(regXFvars))
 					{
-					var regAXFvars = new RegExp("ATRANSFER","g");
+					var regAXFvars = new RegExp("AXFER","g");
 					if (blindxferdialstring.match(regAXFvars))
 						{
 						var Ctasknum = blindxferdialstring.replace(regAXFvars, '');
@@ -2105,7 +2105,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 				var redirectXTRAvalue = XDchannel;
 				var redirecttype_test = document.vicidial_form.xfernumber.value;
 				var closerxfercamptail = '_L' + document.vicidial_form.xfercode.value;
-				var regRXFvars = new RegExp("CTRANSFER","g");
+				var regRXFvars = new RegExp("CXFER","g");
 				if ( (redirecttype_test.match(regRXFvars)) && (local_consult_xfers > 0) )
 					{var redirecttype = 'RedirectXtraCX';}
 				else
@@ -4611,7 +4611,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 
 		//	alert(CallBackDatETimE + "|" + CallBackCommenTs);
 
-			document.vicidial_form.DispoSelection.value = 'CBHSTARY';
+			document.vicidial_form.DispoSelection.value = 'CBHOLD';
 			hideDiv('CallBackSelectBox');
 			DispoSelect_submit();
 			}

LANG_www/agc_pt/dbconnect.php

@@ -1,15 +1,48 @@
 <?
+# 
+# Copyright (C) 2006  Matt Florell <vicidial@gmail.com>    LICENSE: GPLv2
+#
+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);}
+	}
 
-$link=mysql_connect("localhost", "cron", "1234");
-mysql_select_db("asterisk");
+}
+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");
+mysql_select_db("$VARDB_database");
 
 $local_DEF = 'Local/';
 $conf_silent_prefix = '7';
 $local_AMP = '@';
 $ext_context = 'demo';
 $recording_exten = '8309';
-
-$WeBServeRRooT = '/usr/local/apache2/htdocs';
 $WeBRooTWritablE = '1';
 
 ?>

LANG_www/agc_pt/vdc_db_query.php

@@ -1236,7 +1236,7 @@ if ($ACTION == 'VDADcheckINCOMING')
 		$rslt=mysql_query($stmt, $link);
 
 		### If CHAMADABK, change vicidial_callback record to INACTIVE
-		if (eregi("CALLBK|CBHVELHO", $dispo))
+		if (eregi("CALLBK|CBHOLD", $dispo))
 			{
 			$stmt="UPDATE vicidial_callbacks set status='INACTIVE' where lead_id='$lead_id' and status NOT IN('INACTIVE','DEAD','ARCHIVE');";
 				if ($format=='debug') {echo "\n<!-- $stmt -->";}
@@ -1372,7 +1372,7 @@ if ($ACTION == 'updateDISPO')
 	$agent_log_id = mysql_insert_id();
 
 	### CHAMADABACK ENTRY
-	if ( ($dispo_choice == 'CBHVELHO') and (strlen($CallBackDatETimE)>10) )
+	if ( ($dispo_choice == 'CBHOLD') and (strlen($CallBackDatETimE)>10) )
 		{
 		$stmt="INSERT INTO vicidial_callbacks (lead_id,list_id,campaign_id,status,entry_time,callback_time,user,recipient,comments) values('$lead_id','$list_id','$campaign','ACTIVE','$NOW_TIME','$CallBackDatETimE','$user','$recipient','$comments');";
 		if ($DB) {echo "$stmt\n";}

LANG_www/agc_pt/vicidial.php

@@ -4611,7 +4611,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
 
 		//	alert(CallBackDatETimE + "|" + CallBackCommenTs);
 
-			document.vicidial_form.DispoSelection.value = 'CBHVELHO';
+			document.vicidial_form.DispoSelection.value = 'CBHOLD';
 			hideDiv('CallBackSelectBox');
 			DispoSelect_submit();
 			}

translations/br_language.txt

@@ -328,7 +328,7 @@ BUILD|CONFIGURAÇÃO|
 Server|Servidor|
 RECORD|REGISTRO|
 HANGUP|DESLIGAR|
-XFER|TRANFERENCIA|
+>XFER|>TRANFERENCIA|
 PARK|ESPERA|
 IN-NUMBER|NUMERO ENTRANTE|
 NUMBER|NUMERO|
@@ -352,8 +352,8 @@ Recording|Gravando|
 Record|Gravar|
 Welcome|Bem vindo|
 VOICEMAIL|CAIXA POSTAL|
-NEW|NOVO|
-OLD|VELHO|
+ NEW| NOVO|
+ OLD| VELHO|
 PAUSE|PAUSAR|
 START|INICIAR|
 Pause|Pausa|

translations/de_language.txt

@@ -39,7 +39,6 @@ agc|htglobalize.php|1
 BORDER|Border|
 VALUE=SUBMIT|VALUE=SUBMIT|
 TYPE=SUBMIT|TYPE=Submit|
-XFER|XFER|
 MAXLENGTH|maxlength|
 ### BEGIN translation phrases through 1.1.11 release ###
 English|Englisch|
@@ -332,6 +331,7 @@ BUILD|BAU|
 Server|Bediener|
 RECORD|SATZ|
 HANGUP|HÄNGEZUSTAND|
+>XFER|>XFER|
 PARK|PARK|
 IN-NUMBER|IN-NUMBER|
 NUMBER|ZAHL|
@@ -354,8 +354,8 @@ Recording|Aufnahme|
 Record|Aufzeichnung|
 Welcome|Willkommen|
 VOICEMAIL|VOICEMAIL|
-NEW|NEU|
-OLD|ALT|
+ NEW| NEU|
+ OLD| ALT|
 PAUSE|PAUSE|
 START|ANFANG|
 Pause|Pause|

translations/el_language.txt

@@ -39,7 +39,6 @@ agc|htglobalize.php|1
 BORDER|Border|
 VALUE=SUBMIT|VALUE=SUBMIT|
 TYPE=SUBMIT|TYPE=Submit|
-XFER|XFER|
 MAXLENGTH|maxlength|
 ### BEGIN translation phrases through 1.1.11 release ###
 English|Αγγλικά|
@@ -330,6 +329,7 @@ BUILD|ΔΗΜΙΟΥΡΓΙΑ|
 Server|Κεντρικός υπολογιστής|
 RECORD|ΕΓΓΡΑΦΗ|
 HANGUP|ΚΛΕΙΣΙΜΟ|
+>XFER|>XFER|
 PARK|ΣΤΑΘΜΕΥΣΗ|
 IN-NUMBER|ΣΕ-ΑΡΙΘΜΟ|
 NUMBER|ΑΡΙΘΜΟΣ|
@@ -352,8 +352,8 @@ Recording|Καταγραφή|
 Record|Εγγραφή|
 Welcome|Χρήστης|
 VOICEMAIL|ΦΩΝ.ΤΑΧ.|
-NEW|ΝΕΟ|
-OLD|ΠΑΛΑΙΟ|
+ NEW| ΝΕΟ|
+ OLD| ΠΑΛΑΙΟ|
 PAUSE|ΠΑΥΣΗ|
 START|ΕΝΑΡΞΗ|
 Pause|Παύση|

translations/es_language.txt

@@ -331,7 +331,7 @@ BUILD|CONSTRUCCION|
 Server|Servidor|
 RECORD|GRABACIÓN|
 HANGUP|COLGAR|
-XFER|TRANSFERENCIA|
+>XFER|>TRANSFERENCIA|
 PARK|PARKING|
 IN-NUMBER|NÚMERO-ENTRANTE|
 NUMBER|NÚMERO|
@@ -354,8 +354,8 @@ Recording|GRABANDO|
 Record|Grabar|
 Welcome|Bienvenido|
 VOICEMAIL|BUZÓN DE VOZ|
-NEW|NUEVO|
-OLD|VIEJO|
+ NEW| NUEVO|
+ OLD| VIEJO|
 PAUSE|PAUSA|
 START|COMIENZO|
 Pause|Pausa|

translations/fr_language.txt

@@ -331,7 +331,7 @@ BUILD|CONSTRUCTION|
 Server|Serveur|
 RECORD|DISQUE|
 HANGUP|DÉCROCHEMENT|
-XFER|XFER|
+>XFER|>XFER|
 PARK|PARC|
 IN-NUMBER|IN-NUMBER|
 NUMBER|NOMBRE|
@@ -354,8 +354,8 @@ Recording|Enregistrement|
 Record|Disque|
 Welcome|Bienvenue|
 VOICEMAIL|VOICEMAIL|
-NEW|NOUVEAU|
-OLD|VIEUX|
+ NEW| NOUVEAU|
+ OLD| VIEUX|
 PAUSE|PAUSE|
 START|DÉBUT|
 Pause|Pause|

translations/it_language.txt

@@ -331,7 +331,7 @@ BUILD|CONFIGURAZIONE|
 Server|Server|
 RECORD|Registrazione|
 HANGUP|ATTACCA|
-XFER|TRASF|
+>XFER|>TRASF|
 PARK|PARK|
 IN-NUMBER|IN-NUMBER|
 NUMBER|NUMERO|
@@ -354,8 +354,8 @@ Recording|Registrazione|
 Record|Registrazione|
 Welcome|Benvenuto|
 VOICEMAIL|VOICEMAIL|
-NEW|NUOVO|
-OLD|VECCHIO|
+ NEW| NUOVO|
+ OLD| VECCHIO|
 PAUSE|PAUSA|
 START|INIZIO|
 Pause|Pausa|

translations/pl_language.txt

@@ -331,7 +331,7 @@ BUILD|KOMPILACJA|
 Server|Serwer|
 RECORD|NAGRYWAJ|
 HANGUP|ROZŁĄCZ|
-XFER|TRANSFER|
+>XFER|>TRANSFER|
 PARK|PARKING|
 IN-NUMBER|IN-NUMBER|
 NUMBER|NUMER|
@@ -354,8 +354,8 @@ Recording|Nagrywanie|
 Record|Record|
 Welcome|Witaj|
 VOICEMAIL|POCZTAGŁOSOWA|
-NEW|NOWY|
-OLD|STARY|
+ NEW| NOWY|
+ OLD| STARY|
 PAUSE|PRZERWA|
 START|START|
 Pause|Przerwa|

translations/pt_language.txt

@@ -331,7 +331,7 @@ BUILD|CONFIGURAÇÃO|
 Server|Usuário|
 RECORD|REGISTRO|
 HANGUP|HANGUP|
-XFER|XFER|
+>XFER|>XFER|
 PARK|PARQUE|
 IN-NUMBER|IN-NUMBER|
 NUMBER|NÚMERO|
@@ -354,8 +354,8 @@ Recording|Gravação|
 Record|Registro|
 Welcome|Boa vinda|
 VOICEMAIL|VOICEMAIL|
-NEW|NOVO|
-OLD|VELHO|
+ NEW| NOVO|
+ OLD| VELHO|
 PAUSE|PAUSA|
 START|COMEÇO|
 Pause|Pausa|