diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_db_query.php index b45d821e..7143c727 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vicidial.php index bd189ced..e7270fc7 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_br/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_db_query.php index d88f1f8f..16041e2f 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vicidial.php index e55a28ca..33b4a21b 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_de/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_db_query.php index a95e4f07..5a380a49 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vicidial.php index f4250380..7a4577f2 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_el/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Σελίδα\n"; @@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Σελίδα\n"; @@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_db_query.php index befb5107..f92889b4 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vicidial.php index aff22ce6..0bf8094f 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_es/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Formulario\n"; @@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Formulario\n"; @@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_db_query.php index 5616afa2..03dab10d 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vicidial.php index fe551f90..4c34d0bf 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_fr/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Formulaire\n"; @@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Formulaire\n"; @@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_db_query.php index d186768d..75ac9c8c 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vicidial.php index c8bdc2ee..edc05108 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_it/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_db_query.php index 5a505dde..20ee4845 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vicidial.php index abb5985b..270f252c 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_nl/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_db_query.php index 6930f5a9..b7276f38 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vicidial.php index 3c4069be..6a4fab70 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pl/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_db_query.php index de3025e9..42fc1ea2 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vicidial.php index a405637e..df3dab1e 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_pt/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Formulário\n"; @@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Formulário\n"; @@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_db_query.php index 20cf7d5f..e80f6112 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vicidial.php index 24c75182..5fdf271d 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_ru/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_se/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_se/vdc_db_query.php index f4db3a5d..b46dba44 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_se/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_se/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_se/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_se/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_se/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_se/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_se/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_se/vicidial.php index 609d5f49..044ce328 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_se/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_se/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5026,6 +5026,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5121,6 +5126,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Webformulär\"\n"; @@ -5442,6 +5452,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5537,6 +5552,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Webformulär\"\n"; @@ -6775,6 +6795,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6870,6 +6895,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7151,6 +7181,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7276,6 +7311,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_db_query.php index 3b1319a3..7a629a11 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vicidial.php index 7c2331e6..60c5d013 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_sk/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; @@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_db_query.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_db_query.php index 6b8003dc..729413b9 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_db_query.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_db_query.php @@ -514,7 +514,7 @@ if ($non_latin < 1) $pass=ereg_replace("[^-_0-9a-zA-Z]","",$pass); $length_in_sec = ereg_replace("[^0-9]","",$length_in_sec); $phone_code = ereg_replace("[^0-9]","",$phone_code); - $phone_number = ereg_replace("[^0-9]","",$phone_number); + $phone_number = ereg_replace("[^0-9a-zA-Z]","",$phone_number); } else { diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_script_display.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_script_display.php index 8c9bb87d..66308b73 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_script_display.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vdc_script_display.php @@ -262,6 +262,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 +281,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 +356,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); diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vicidial.php b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vicidial.php index 91de4031..fad724da 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vicidial.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/agc_tw/vicidial.php @@ -280,10 +280,10 @@ # 100315-1149 - fix for rare recording_log uniqueid issue on manual dial calls to same number # 100327-0902 - fix for manual dial answering machine message # 100413-1347 - Various fixes for logging and extended alt-dialing -# +# 100510-2014 - 2.2.1 release prep -$version = '2.2.0-258'; -$build = '100413-1347'; +$version = '2.2.1-259'; +$build = '100510-2014'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=64; $one_mysql_log=0; @@ -5025,6 +5025,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5120,6 +5125,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"表格\"\n"; @@ -5441,6 +5451,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -5536,6 +5551,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } document.getElementById("WebFormSpan").innerHTML = "\"表格\"\n"; @@ -6774,6 +6794,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } if (VDIC_web_form_address_two.match(regWFAcustom)) @@ -6869,6 +6894,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } @@ -7150,6 +7180,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars = '?' + web_form_vars} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAaavars, '&'); } @@ -7275,6 +7310,11 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} {web_form_vars_two = '?' + web_form_vars_two} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; + + var regWFAqavars = new RegExp("\\?&","ig"); + var regWFAaavars = new RegExp("&&","ig"); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAqavars, '?'); + TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAaavars, '&'); } diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/admin.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/admin.php index 209385a8..ac315ffa 100644 --- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/admin.php +++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/admin.php @@ -2048,11 +2048,12 @@ else # 100116-0718 - Added presets to script select list # 100319-1708 - Changed user/pass for users to 20 characters in length, highlighted conf file secret in phones # 100413-2328 - several small fixes, logging, removal of old SIP/IAX monitor/barge links +# 100510-2015 - prep for 2.2.1 release # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.2.0-236'; -$build = '100413-2328'; +$admin_version = '2.2.1-237'; +$build = '100510-2015'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -6151,6 +6152,8 @@ if ($ADD==7111111) ##### TEST VARIABLES ##### $vendor_lead_code = 'VENDOR:LEAD;CODE'; $list_id = 'LISTID'; + $list_name = 'LISTNAME'; + $list_description = 'LISTDESCRIPTION'; $gmt_offset_now = 'GMTOFFSET'; $phone_code = '1'; $phone_number = '7275551212'; @@ -6225,6 +6228,8 @@ if ($ADD==7111111) { $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); @@ -6287,6 +6292,8 @@ if ($ADD==7111111) $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); @@ -7356,6 +7363,8 @@ if ($ADD==1111111) echo ""; echo ""; echo ""; + echo ""; + echo ""; echo ""; echo ""; echo ""; @@ -24666,9 +24675,19 @@ if ($ADD==999999) } ?> 

-		";
+			echo "\n";
+			}
+		else
+			{
+			echo "";
+			echo "\n";
+			}
+
 		$o=0;
 		while ($servers_to_print > $o)
 			{
@@ -24696,12 +24715,42 @@ if ($ADD==999999)
 			echo "\n";
 			echo "\n";
 			echo "\n";
-			echo "\n";
-			echo "\n";
+			if ($stage == 'TIME')
+				{
+				$stmt="select last_update from server_updater where server_ip='$server_ip[$o]';";
+				$rslt=mysql_query($stmt, $link);
+				if ($DB) {echo "$stmt\n";}
+				$servertime_to_print = mysql_num_rows($rslt);
+				if ($servertime_to_print)
+					{
+					$row=mysql_fetch_row($rslt);
+					echo "";
+					}
+				}
+			else
+				{
+				echo "\n";
+				echo "\n";
+				}
 			echo "\n";
 			$o++;
 			}
 
+		if ($stage == 'TIME')
+			{
+			echo "";
+
+			$stmt="select NOW();";
+			$rslt=mysql_query($stmt, $link);
+			if ($DB) {echo "$stmt\n";}
+			$dbtime_to_print = mysql_num_rows($rslt);
+			if ($dbtime_to_print)
+				{
+				$row=mysql_fetch_row($rslt);
+				echo "";
+				}
+			}
+
 		echo "
SERVERDESCRIÇÃOIPACTLOADCHANDISKSAINTEENTRANTE

 		
SERVIDOR -DESCRIÇÃOIPACTLOADCHANDISKTIME
SERVIDOR +DESCRIÇÃOIPACTLOADCHANDISKSAINTEENTRANTE
$sysload[$o] - $cpu%$channels_total[$o]$diskLINKLINK$row[0]LINKLINK
   PHP Time   " . date("Y-m-d H:i:s") . "
   DB Time   $row[0]
\n";
 		}
 	else
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/call_report_export.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/call_report_export.php
index f4599238..55d62ebe 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/call_report_export.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/call_report_export.php
@@ -17,6 +17,7 @@
 # 100119-1039 - Filtered comments for \n newlines
 # 100214-1421 - Sort menu alphabetically
 # 100216-0042 - Added popup date selector
+# 100507-1413 - Added headers for export
 #
 
 require("dbconnect.php");
@@ -42,6 +43,8 @@ if (isset($_GET["DB"]))						{$DB=$_GET["DB"];}
 	elseif (isset($_POST["DB"]))			{$DB=$_POST["DB"];}
 if (isset($_GET["run_export"]))				{$run_export=$_GET["run_export"];}
 	elseif (isset($_POST["run_export"]))	{$run_export=$_POST["run_export"];}
+if (isset($_GET["header_row"]))				{$header_row=$_GET["header_row"];}
+	elseif (isset($_POST["header_row"]))	{$header_row=$_POST["header_row"];}
 if (isset($_GET["submit"]))					{$submit=$_GET["submit"];}
 	elseif (isset($_POST["submit"]))		{$submit=$_POST["submit"];}
 if (isset($_GET["SUBMIT"]))					{$SUBMIT=$_GET["SUBMIT"];}
@@ -299,6 +302,11 @@ if ($run_export > 0)
 		ob_clean();
 		flush();
 
+		if ($header_row=='YES')
+			{
+			echo "call_date\tphone_number\tstatus\tuser\tfull_name\tcampaign_id\tvendor_lead_code\tsource_id\tlist_id\tgmt_offset_now\tphone_code\tphone_number\ttitle\tfirst_name\tmiddle_initial\tlast_name\taddress1\taddress2\taddress3\tcity\tstate\tprovince\tpostal_code\tcountry_code\tgender\tdate_of_birth\talt_phone\temail\tsecurity_phrase\tcomments\tlength_in_sec\tuser_group\talt_dial\trank\towner\tlead_id\tlist_name\tlist_description\tstatus_name\r\n";
+			}
+
 		$i=0;
 		while ($k > $i)
 			{
@@ -518,6 +526,11 @@ else
 	
 	

\n";
+
+	echo "Header Row:
\n";
+	echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/list_download.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/list_download.php
index 3ecaca97..7d64c22b 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/list_download.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/list_download.php
@@ -12,6 +12,7 @@
 # 90508-0644 - Changed to PHP long tags
 # 90721-1238 - Added rank and owner as vicidial_list fields
 # 100119-1039 - Filtered comments for \n newlines
+# 100508-1439 - Added header row to output
 #
 
 require("dbconnect.php");
@@ -112,6 +113,8 @@ header('Pragma: public');
 ob_clean();
 flush();
 
+echo "lead_id\tentry_date\tmodify_date\tstatus\tuser\tvendor_lead_code\tsource_id\tlist_id\tgmt_offset_now\tcalled_since_last_reset\tphone_code\tphone_number\ttitle\tfirst_name\tmiddle_initial\tlast_name\taddress1\taddress2\taddress3\tcity\tstate\tprovince\tpostal_code\tcountry_code\tgender\tdate_of_birth\talt_phone\temail\tsecurity_phrase\tcomments\tcalled_count\tlast_local_call_time\trank\towner\r\n";
+
 $stmt="select lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner from vicidial_list where list_id='$list_id';";
 $rslt=mysql_query($stmt, $link);
 if ($DB) {echo "$stmt\n";}
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/welcome_demo.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/welcome_demo.php
index 238cf5cf..3b48ee07 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/welcome_demo.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/welcome_demo.php
@@ -2,7 +2,7 @@
 # welcome_demo.php - VICIDIAL welcome Demo page
 # 
 # 
-# Copyright (C) 2009  Matt Florell     LICENSE: GPLv2
+# Copyright (C) 2010  Matt Florell     LICENSE: GPLv2
 #
 header ("Content-type: text/html; charset=utf-8");
 
@@ -56,6 +56,9 @@ echo "   \n";
 echo "";
 echo "    Chinese(T) Agent Login";
+echo "\n";
+echo "";
+echo "    Swedish Agent Login";
 echo "\n";
 
 echo "\n";
@@ -78,6 +81,9 @@ echo "   \n";
 echo "";
 echo "    French Administration";
+echo "\n";
+echo "";
+echo "    Brazilian Portuguese Administration";
 echo "\n";
 echo "   \n";
 echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/welcome_languages.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/welcome_languages.php
index d53707a9..4fe6d387 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/welcome_languages.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_br/welcome_languages.php
@@ -1,8 +1,8 @@
     LICENSE: GPLv2
+# Copyright (C) 2010  Matt Florell     LICENSE: GPLv2
 #
 header ("Content-type: text/html; charset=utf-8");
 
@@ -56,6 +56,9 @@ echo "   \n";
 echo "";
 echo "    Chinese(T) Agent Login";
+echo "\n";
+echo "";
+echo "    Swedish Agent Login";
 echo "\n";
 
 echo "\n";
@@ -78,6 +81,9 @@ echo "   \n";
 echo "";
 echo "    French Administration";
+echo "\n";
+echo "";
+echo "    Brazilian Portuguese Administration";
 echo "\n";
 echo "   \n";
 echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/admin.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/admin.php
index bf175ad9..04174b85 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/admin.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/admin.php
@@ -2048,11 +2048,12 @@ else
 # 100116-0718 - Added presets to script select list
 # 100319-1708 - Changed user/pass for users to 20 characters in length, highlighted conf file secret in phones
 # 100413-2328 - several small fixes, logging, removal of old SIP/IAX monitor/barge links
+# 100510-2015 - prep for 2.2.1 release
 #
 # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
 
-$admin_version = '2.2.0-236';
-$build = '100413-2328';
+$admin_version = '2.2.1-237';
+$build = '100510-2015';
 
 $STARTtime = date("U");
 $SQLdate = date("Y-m-d H:i:s");
@@ -6149,6 +6150,8 @@ if ($ADD==7111111)
 	##### TEST VARIABLES #####
 	$vendor_lead_code = 'VENDOR:LEAD;CODE';
 	$list_id = 'LISTID';
+	$list_name = 'LISTNAME';
+	$list_description = 'LISTDESCRIPTION';
 	$gmt_offset_now = 'GMTOFFSET';
 	$phone_code = '1';
 	$phone_number = '7275551212';
@@ -6223,6 +6226,8 @@ if ($ADD==7111111)
 		{
 		$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);
@@ -6285,6 +6290,8 @@ if ($ADD==7111111)
 
 	$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);
@@ -7354,6 +7361,8 @@ if ($ADD==1111111)
 		echo "";
 		echo "";
 		echo "";
+		echo "";
+		echo "";
 		echo "";
 		echo "";
 		echo "";
@@ -24664,9 +24673,19 @@ if ($ADD==999999)
 		}
 	?>
 		

-		";
+			echo "\n";
+			}
+		else
+			{
+			echo "";
+			echo "\n";
+			}
+
 		$o=0;
 		while ($servers_to_print > $o)
 			{
@@ -24694,12 +24713,42 @@ if ($ADD==999999)
 			echo "\n";
 			echo "\n";
 			echo "\n";
-			echo "\n";
-			echo "\n";
+			if ($stage == 'TIME')
+				{
+				$stmt="select last_update from server_updater where server_ip='$server_ip[$o]';";
+				$rslt=mysql_query($stmt, $link);
+				if ($DB) {echo "$stmt\n";}
+				$servertime_to_print = mysql_num_rows($rslt);
+				if ($servertime_to_print)
+					{
+					$row=mysql_fetch_row($rslt);
+					echo "";
+					}
+				}
+			else
+				{
+				echo "\n";
+				echo "\n";
+				}
 			echo "\n";
 			$o++;
 			}
 
+		if ($stage == 'TIME')
+			{
+			echo "";
+
+			$stmt="select NOW();";
+			$rslt=mysql_query($stmt, $link);
+			if ($DB) {echo "$stmt\n";}
+			$dbtime_to_print = mysql_num_rows($rslt);
+			if ($dbtime_to_print)
+				{
+				$row=mysql_fetch_row($rslt);
+				echo "";
+				}
+			}
+
 		echo "
SERVERBESCHREIBUNGIPACTLOADCHANDISKOUTBOUNDINBOUND

 		
BEDIENER-BESCHREIBUNGIPACTLOADCHANDISKTIME
BEDIENER+BESCHREIBUNGIPACTLOADCHANDISKOUTBOUNDINBOUND
$sysload[$o] - $cpu%$channels_total[$o]$diskLINKLINK$row[0]LINKLINK
   PHP Time   " . date("Y-m-d H:i:s") . "
   DB Time   $row[0]
\n";
 		}
 	else
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/call_report_export.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/call_report_export.php
index f4599238..55d62ebe 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/call_report_export.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/call_report_export.php
@@ -17,6 +17,7 @@
 # 100119-1039 - Filtered comments for \n newlines
 # 100214-1421 - Sort menu alphabetically
 # 100216-0042 - Added popup date selector
+# 100507-1413 - Added headers for export
 #
 
 require("dbconnect.php");
@@ -42,6 +43,8 @@ if (isset($_GET["DB"]))						{$DB=$_GET["DB"];}
 	elseif (isset($_POST["DB"]))			{$DB=$_POST["DB"];}
 if (isset($_GET["run_export"]))				{$run_export=$_GET["run_export"];}
 	elseif (isset($_POST["run_export"]))	{$run_export=$_POST["run_export"];}
+if (isset($_GET["header_row"]))				{$header_row=$_GET["header_row"];}
+	elseif (isset($_POST["header_row"]))	{$header_row=$_POST["header_row"];}
 if (isset($_GET["submit"]))					{$submit=$_GET["submit"];}
 	elseif (isset($_POST["submit"]))		{$submit=$_POST["submit"];}
 if (isset($_GET["SUBMIT"]))					{$SUBMIT=$_GET["SUBMIT"];}
@@ -299,6 +302,11 @@ if ($run_export > 0)
 		ob_clean();
 		flush();
 
+		if ($header_row=='YES')
+			{
+			echo "call_date\tphone_number\tstatus\tuser\tfull_name\tcampaign_id\tvendor_lead_code\tsource_id\tlist_id\tgmt_offset_now\tphone_code\tphone_number\ttitle\tfirst_name\tmiddle_initial\tlast_name\taddress1\taddress2\taddress3\tcity\tstate\tprovince\tpostal_code\tcountry_code\tgender\tdate_of_birth\talt_phone\temail\tsecurity_phrase\tcomments\tlength_in_sec\tuser_group\talt_dial\trank\towner\tlead_id\tlist_name\tlist_description\tstatus_name\r\n";
+			}
+
 		$i=0;
 		while ($k > $i)
 			{
@@ -518,6 +526,11 @@ else
 	
 	

\n";
+
+	echo "Header Row:
\n";
+	echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/list_download.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/list_download.php
index 6d988fb0..8bbfa255 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/list_download.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/list_download.php
@@ -12,6 +12,7 @@
 # 90508-0644 - Changed to PHP long tags
 # 90721-1238 - Added rank and owner as vicidial_list fields
 # 100119-1039 - Filtered comments for \n newlines
+# 100508-1439 - Added header row to output
 #
 
 require("dbconnect.php");
@@ -112,6 +113,8 @@ header('Pragma: public');
 ob_clean();
 flush();
 
+echo "lead_id\tentry_date\tmodify_date\tstatus\tuser\tvendor_lead_code\tsource_id\tlist_id\tgmt_offset_now\tcalled_since_last_reset\tphone_code\tphone_number\ttitle\tfirst_name\tmiddle_initial\tlast_name\taddress1\taddress2\taddress3\tcity\tstate\tprovince\tpostal_code\tcountry_code\tgender\tdate_of_birth\talt_phone\temail\tsecurity_phrase\tcomments\tcalled_count\tlast_local_call_time\trank\towner\r\n";
+
 $stmt="select lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner from vicidial_list where list_id='$list_id';";
 $rslt=mysql_query($stmt, $link);
 if ($DB) {echo "$stmt\n";}
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/welcome_demo.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/welcome_demo.php
index 238cf5cf..3b48ee07 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/welcome_demo.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/welcome_demo.php
@@ -2,7 +2,7 @@
 # welcome_demo.php - VICIDIAL welcome Demo page
 # 
 # 
-# Copyright (C) 2009  Matt Florell     LICENSE: GPLv2
+# Copyright (C) 2010  Matt Florell     LICENSE: GPLv2
 #
 header ("Content-type: text/html; charset=utf-8");
 
@@ -56,6 +56,9 @@ echo "   \n";
 echo "";
 echo "    Chinese(T) Agent Login";
+echo "\n";
+echo "";
+echo "    Swedish Agent Login";
 echo "\n";
 
 echo "\n";
@@ -78,6 +81,9 @@ echo "   \n";
 echo "";
 echo "    French Administration";
+echo "\n";
+echo "";
+echo "    Brazilian Portuguese Administration";
 echo "\n";
 echo "   \n";
 echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/welcome_languages.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/welcome_languages.php
index d53707a9..4fe6d387 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/welcome_languages.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_de/welcome_languages.php
@@ -1,8 +1,8 @@
     LICENSE: GPLv2
+# Copyright (C) 2010  Matt Florell     LICENSE: GPLv2
 #
 header ("Content-type: text/html; charset=utf-8");
 
@@ -56,6 +56,9 @@ echo "   \n";
 echo "";
 echo "    Chinese(T) Agent Login";
+echo "\n";
+echo "";
+echo "    Swedish Agent Login";
 echo "\n";
 
 echo "\n";
@@ -78,6 +81,9 @@ echo "   \n";
 echo "";
 echo "    French Administration";
+echo "\n";
+echo "";
+echo "    Brazilian Portuguese Administration";
 echo "\n";
 echo "   \n";
 echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/admin.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/admin.php
index 8dde86f7..e68cd42e 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/admin.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/admin.php
@@ -2048,11 +2048,12 @@ else
 # 100116-0718 - Added presets to script select list
 # 100319-1708 - Changed user/pass for users to 20 characters in length, highlighted conf file secret in phones
 # 100413-2328 - several small fixes, logging, removal of old SIP/IAX monitor/barge links
+# 100510-2015 - prep for 2.2.1 release
 #
 # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
 
-$admin_version = '2.2.0-236';
-$build = '100413-2328';
+$admin_version = '2.2.1-237';
+$build = '100510-2015';
 
 $STARTtime = date("U");
 $SQLdate = date("Y-m-d H:i:s");
@@ -6153,6 +6154,8 @@ if ($ADD==7111111)
 	##### TEST VARIABLES #####
 	$vendor_lead_code = 'VENDOR:LEAD;CODE';
 	$list_id = 'LISTID';
+	$list_name = 'LISTNAME';
+	$list_description = 'LISTDESCRIPTION';
 	$gmt_offset_now = 'GMTOFFSET';
 	$phone_code = '1';
 	$phone_number = '7275551212';
@@ -6227,6 +6230,8 @@ if ($ADD==7111111)
 		{
 		$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);
@@ -6289,6 +6294,8 @@ if ($ADD==7111111)
 
 	$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);
@@ -7358,6 +7365,8 @@ if ($ADD==1111111)
 		echo "";
 		echo "";
 		echo "";
+		echo "";
+		echo "";
 		echo "";
 		echo "";
 		echo "";
@@ -24682,9 +24691,19 @@ if ($ADD==999999)
 		}
 	?>
 		

-		";
+			echo "\n";
+			}
+		else
+			{
+			echo "";
+			echo "\n";
+			}
+
 		$o=0;
 		while ($servers_to_print > $o)
 			{
@@ -24712,12 +24731,42 @@ if ($ADD==999999)
 			echo "\n";
 			echo "\n";
 			echo "\n";
-			echo "\n";
-			echo "\n";
+			if ($stage == 'TIME')
+				{
+				$stmt="select last_update from server_updater where server_ip='$server_ip[$o]';";
+				$rslt=mysql_query($stmt, $link);
+				if ($DB) {echo "$stmt\n";}
+				$servertime_to_print = mysql_num_rows($rslt);
+				if ($servertime_to_print)
+					{
+					$row=mysql_fetch_row($rslt);
+					echo "";
+					}
+				}
+			else
+				{
+				echo "\n";
+				echo "\n";
+				}
 			echo "\n";
 			$o++;
 			}
 
+		if ($stage == 'TIME')
+			{
+			echo "";
+
+			$stmt="select NOW();";
+			$rslt=mysql_query($stmt, $link);
+			if ($DB) {echo "$stmt\n";}
+			$dbtime_to_print = mysql_num_rows($rslt);
+			if ($dbtime_to_print)
+				{
+				$row=mysql_fetch_row($rslt);
+				echo "";
+				}
+			}
+
 		echo "
SERVERΠΕΡΙΓΡΑΦΗIPACTLOADCHANDISKΕΞΕΡΧΟΜΕΝΟΕισερχόμενα

 		
ΔΙΑΚΟΜΙΣΤΗΣ -ΠΕΡΙΓΡΑΦΗIPACTLOADCHANDISKTIME
ΔΙΑΚΟΜΙΣΤΗΣ +ΠΕΡΙΓΡΑΦΗIPACTLOADCHANDISKΕΞΕΡΧΟΜΕΝΟΕισερχόμενα
$sysload[$o] - $cpu%$channels_total[$o]$diskLINKLINK$row[0]LINKLINK
   PHP Time   " . date("Y-m-d H:i:s") . "
   DB Time   $row[0]
\n";
 		}
 	else
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/call_report_export.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/call_report_export.php
index f4599238..55d62ebe 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/call_report_export.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/call_report_export.php
@@ -17,6 +17,7 @@
 # 100119-1039 - Filtered comments for \n newlines
 # 100214-1421 - Sort menu alphabetically
 # 100216-0042 - Added popup date selector
+# 100507-1413 - Added headers for export
 #
 
 require("dbconnect.php");
@@ -42,6 +43,8 @@ if (isset($_GET["DB"]))						{$DB=$_GET["DB"];}
 	elseif (isset($_POST["DB"]))			{$DB=$_POST["DB"];}
 if (isset($_GET["run_export"]))				{$run_export=$_GET["run_export"];}
 	elseif (isset($_POST["run_export"]))	{$run_export=$_POST["run_export"];}
+if (isset($_GET["header_row"]))				{$header_row=$_GET["header_row"];}
+	elseif (isset($_POST["header_row"]))	{$header_row=$_POST["header_row"];}
 if (isset($_GET["submit"]))					{$submit=$_GET["submit"];}
 	elseif (isset($_POST["submit"]))		{$submit=$_POST["submit"];}
 if (isset($_GET["SUBMIT"]))					{$SUBMIT=$_GET["SUBMIT"];}
@@ -299,6 +302,11 @@ if ($run_export > 0)
 		ob_clean();
 		flush();
 
+		if ($header_row=='YES')
+			{
+			echo "call_date\tphone_number\tstatus\tuser\tfull_name\tcampaign_id\tvendor_lead_code\tsource_id\tlist_id\tgmt_offset_now\tphone_code\tphone_number\ttitle\tfirst_name\tmiddle_initial\tlast_name\taddress1\taddress2\taddress3\tcity\tstate\tprovince\tpostal_code\tcountry_code\tgender\tdate_of_birth\talt_phone\temail\tsecurity_phrase\tcomments\tlength_in_sec\tuser_group\talt_dial\trank\towner\tlead_id\tlist_name\tlist_description\tstatus_name\r\n";
+			}
+
 		$i=0;
 		while ($k > $i)
 			{
@@ -518,6 +526,11 @@ else
 	
 	

\n";
+
+	echo "Header Row:
\n";
+	echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/list_download.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/list_download.php
index 8604d872..7749235d 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/list_download.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/list_download.php
@@ -12,6 +12,7 @@
 # 90508-0644 - Changed to PHP long tags
 # 90721-1238 - Added rank and owner as vicidial_list fields
 # 100119-1039 - Filtered comments for \n newlines
+# 100508-1439 - Added header row to output
 #
 
 require("dbconnect.php");
@@ -112,6 +113,8 @@ header('Pragma: public');
 ob_clean();
 flush();
 
+echo "lead_id\tentry_date\tmodify_date\tstatus\tuser\tvendor_lead_code\tsource_id\tlist_id\tgmt_offset_now\tcalled_since_last_reset\tphone_code\tphone_number\ttitle\tfirst_name\tmiddle_initial\tlast_name\taddress1\taddress2\taddress3\tcity\tstate\tprovince\tpostal_code\tcountry_code\tgender\tdate_of_birth\talt_phone\temail\tsecurity_phrase\tcomments\tcalled_count\tlast_local_call_time\trank\towner\r\n";
+
 $stmt="select lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner from vicidial_list where list_id='$list_id';";
 $rslt=mysql_query($stmt, $link);
 if ($DB) {echo "$stmt\n";}
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/welcome_demo.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/welcome_demo.php
index 238cf5cf..3b48ee07 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/welcome_demo.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/welcome_demo.php
@@ -2,7 +2,7 @@
 # welcome_demo.php - VICIDIAL welcome Demo page
 # 
 # 
-# Copyright (C) 2009  Matt Florell     LICENSE: GPLv2
+# Copyright (C) 2010  Matt Florell     LICENSE: GPLv2
 #
 header ("Content-type: text/html; charset=utf-8");
 
@@ -56,6 +56,9 @@ echo "   \n";
 echo "";
 echo "    Chinese(T) Agent Login";
+echo "\n";
+echo "";
+echo "    Swedish Agent Login";
 echo "\n";
 
 echo "\n";
@@ -78,6 +81,9 @@ echo "   \n";
 echo "";
 echo "    French Administration";
+echo "\n";
+echo "";
+echo "    Brazilian Portuguese Administration";
 echo "\n";
 echo "   \n";
 echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/welcome_languages.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/welcome_languages.php
index d53707a9..4fe6d387 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/welcome_languages.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_el/welcome_languages.php
@@ -1,8 +1,8 @@
     LICENSE: GPLv2
+# Copyright (C) 2010  Matt Florell     LICENSE: GPLv2
 #
 header ("Content-type: text/html; charset=utf-8");
 
@@ -56,6 +56,9 @@ echo "   \n";
 echo "";
 echo "    Chinese(T) Agent Login";
+echo "\n";
+echo "";
+echo "    Swedish Agent Login";
 echo "\n";
 
 echo "\n";
@@ -78,6 +81,9 @@ echo "   \n";
 echo "";
 echo "    French Administration";
+echo "\n";
+echo "";
+echo "    Brazilian Portuguese Administration";
 echo "\n";
 echo "   \n";
 echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/admin.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/admin.php
index 632a9129..845acc21 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/admin.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/admin.php
@@ -2048,11 +2048,12 @@ else
 # 100116-0718 - Added presets to script select list
 # 100319-1708 - Changed user/pass for users to 20 characters in length, highlighted conf file secret in phones
 # 100413-2328 - several small fixes, logging, removal of old SIP/IAX monitor/barge links
+# 100510-2015 - prep for 2.2.1 release
 #
 # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
 
-$admin_version = '2.2.0-236';
-$build = '100413-2328';
+$admin_version = '2.2.1-237';
+$build = '100510-2015';
 
 $STARTtime = date("U");
 $SQLdate = date("Y-m-d H:i:s");
@@ -6149,6 +6150,8 @@ if ($ADD==7111111)
 	##### TEST VARIABLES #####
 	$vendor_lead_code = 'VENDOR:LEAD;CODE';
 	$list_id = 'LISTID';
+	$list_name = 'LISTNAME';
+	$list_description = 'LISTDESCRIPTION';
 	$gmt_offset_now = 'GMTOFFSET';
 	$phone_code = '1';
 	$phone_number = '7275551212';
@@ -6223,6 +6226,8 @@ if ($ADD==7111111)
 		{
 		$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);
@@ -6285,6 +6290,8 @@ if ($ADD==7111111)
 
 	$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);
@@ -7354,6 +7361,8 @@ if ($ADD==1111111)
 		echo "";
 		echo "";
 		echo "";
+		echo "";
+		echo "";
 		echo "";
 		echo "";
 		echo "";
@@ -24664,9 +24673,19 @@ if ($ADD==999999)
 		}
 	?>
 		

-		";
+			echo "\n";
+			}
+		else
+			{
+			echo "";
+			echo "\n";
+			}
+
 		$o=0;
 		while ($servers_to_print > $o)
 			{
@@ -24694,12 +24713,42 @@ if ($ADD==999999)
 			echo "\n";
 			echo "\n";
 			echo "\n";
-			echo "\n";
-			echo "\n";
+			if ($stage == 'TIME')
+				{
+				$stmt="select last_update from server_updater where server_ip='$server_ip[$o]';";
+				$rslt=mysql_query($stmt, $link);
+				if ($DB) {echo "$stmt\n";}
+				$servertime_to_print = mysql_num_rows($rslt);
+				if ($servertime_to_print)
+					{
+					$row=mysql_fetch_row($rslt);
+					echo "";
+					}
+				}
+			else
+				{
+				echo "\n";
+				echo "\n";
+				}
 			echo "\n";
 			$o++;
 			}
 
+		if ($stage == 'TIME')
+			{
+			echo "";
+
+			$stmt="select NOW();";
+			$rslt=mysql_query($stmt, $link);
+			if ($DB) {echo "$stmt\n";}
+			$dbtime_to_print = mysql_num_rows($rslt);
+			if ($dbtime_to_print)
+				{
+				$row=mysql_fetch_row($rslt);
+				echo "";
+				}
+			}
+
 		echo "
SERVERDESCRIPCIÓNIPACTLOADCHANDISKSALIENTEEntrantes

 		
SERVIDOR -DESCRIPCIÓNIPACTLOADCHANDISKTIME
SERVIDOR +DESCRIPCIÓNIPACTLOADCHANDISKSALIENTEEntrantes
$sysload[$o] - $cpu%$channels_total[$o]$diskLINKLINK$row[0]LINKLINK
   PHP Time   " . date("Y-m-d H:i:s") . "
   DB Time   $row[0]
\n";
 		}
 	else
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/call_report_export.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/call_report_export.php
index f4599238..55d62ebe 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/call_report_export.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/call_report_export.php
@@ -17,6 +17,7 @@
 # 100119-1039 - Filtered comments for \n newlines
 # 100214-1421 - Sort menu alphabetically
 # 100216-0042 - Added popup date selector
+# 100507-1413 - Added headers for export
 #
 
 require("dbconnect.php");
@@ -42,6 +43,8 @@ if (isset($_GET["DB"]))						{$DB=$_GET["DB"];}
 	elseif (isset($_POST["DB"]))			{$DB=$_POST["DB"];}
 if (isset($_GET["run_export"]))				{$run_export=$_GET["run_export"];}
 	elseif (isset($_POST["run_export"]))	{$run_export=$_POST["run_export"];}
+if (isset($_GET["header_row"]))				{$header_row=$_GET["header_row"];}
+	elseif (isset($_POST["header_row"]))	{$header_row=$_POST["header_row"];}
 if (isset($_GET["submit"]))					{$submit=$_GET["submit"];}
 	elseif (isset($_POST["submit"]))		{$submit=$_POST["submit"];}
 if (isset($_GET["SUBMIT"]))					{$SUBMIT=$_GET["SUBMIT"];}
@@ -299,6 +302,11 @@ if ($run_export > 0)
 		ob_clean();
 		flush();
 
+		if ($header_row=='YES')
+			{
+			echo "call_date\tphone_number\tstatus\tuser\tfull_name\tcampaign_id\tvendor_lead_code\tsource_id\tlist_id\tgmt_offset_now\tphone_code\tphone_number\ttitle\tfirst_name\tmiddle_initial\tlast_name\taddress1\taddress2\taddress3\tcity\tstate\tprovince\tpostal_code\tcountry_code\tgender\tdate_of_birth\talt_phone\temail\tsecurity_phrase\tcomments\tlength_in_sec\tuser_group\talt_dial\trank\towner\tlead_id\tlist_name\tlist_description\tstatus_name\r\n";
+			}
+
 		$i=0;
 		while ($k > $i)
 			{
@@ -518,6 +526,11 @@ else
 	
 	

\n";
+
+	echo "Header Row:
\n";
+	echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/list_download.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/list_download.php
index a0156bcf..433f6ffb 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/list_download.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/list_download.php
@@ -12,6 +12,7 @@
 # 90508-0644 - Changed to PHP long tags
 # 90721-1238 - Added rank and owner as vicidial_list fields
 # 100119-1039 - Filtered comments for \n newlines
+# 100508-1439 - Added header row to output
 #
 
 require("dbconnect.php");
@@ -112,6 +113,8 @@ header('Pragma: public');
 ob_clean();
 flush();
 
+echo "lead_id\tentry_date\tmodify_date\tstatus\tuser\tvendor_lead_code\tsource_id\tlist_id\tgmt_offset_now\tcalled_since_last_reset\tphone_code\tphone_number\ttitle\tfirst_name\tmiddle_initial\tlast_name\taddress1\taddress2\taddress3\tcity\tstate\tprovince\tpostal_code\tcountry_code\tgender\tdate_of_birth\talt_phone\temail\tsecurity_phrase\tcomments\tcalled_count\tlast_local_call_time\trank\towner\r\n";
+
 $stmt="select lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner from vicidial_list where list_id='$list_id';";
 $rslt=mysql_query($stmt, $link);
 if ($DB) {echo "$stmt\n";}
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/welcome_demo.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/welcome_demo.php
index 238cf5cf..3b48ee07 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/welcome_demo.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/welcome_demo.php
@@ -2,7 +2,7 @@
 # welcome_demo.php - VICIDIAL welcome Demo page
 # 
 # 
-# Copyright (C) 2009  Matt Florell     LICENSE: GPLv2
+# Copyright (C) 2010  Matt Florell     LICENSE: GPLv2
 #
 header ("Content-type: text/html; charset=utf-8");
 
@@ -56,6 +56,9 @@ echo "   \n";
 echo "";
 echo "    Chinese(T) Agent Login";
+echo "\n";
+echo "";
+echo "    Swedish Agent Login";
 echo "\n";
 
 echo "\n";
@@ -78,6 +81,9 @@ echo "   \n";
 echo "";
 echo "    French Administration";
+echo "\n";
+echo "";
+echo "    Brazilian Portuguese Administration";
 echo "\n";
 echo "   \n";
 echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/welcome_languages.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/welcome_languages.php
index d53707a9..4fe6d387 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/welcome_languages.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_es/welcome_languages.php
@@ -1,8 +1,8 @@
     LICENSE: GPLv2
+# Copyright (C) 2010  Matt Florell     LICENSE: GPLv2
 #
 header ("Content-type: text/html; charset=utf-8");
 
@@ -56,6 +56,9 @@ echo "   \n";
 echo "";
 echo "    Chinese(T) Agent Login";
+echo "\n";
+echo "";
+echo "    Swedish Agent Login";
 echo "\n";
 
 echo "\n";
@@ -78,6 +81,9 @@ echo "   \n";
 echo "";
 echo "    French Administration";
+echo "\n";
+echo "";
+echo "    Brazilian Portuguese Administration";
 echo "\n";
 echo "   \n";
 echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/admin.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/admin.php
index a327ee00..ae13a898 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/admin.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/admin.php
@@ -2048,11 +2048,12 @@ else
 # 100116-0718 - Added presets to script select list
 # 100319-1708 - Changed user/pass for users to 20 characters in length, highlighted conf file secret in phones
 # 100413-2328 - several small fixes, logging, removal of old SIP/IAX monitor/barge links
+# 100510-2015 - prep for 2.2.1 release
 #
 # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
 
-$admin_version = '2.2.0-236';
-$build = '100413-2328';
+$admin_version = '2.2.1-237';
+$build = '100510-2015';
 
 $STARTtime = date("U");
 $SQLdate = date("Y-m-d H:i:s");
@@ -6149,6 +6150,8 @@ if ($ADD==7111111)
 	##### TEST VARIABLES #####
 	$vendor_lead_code = 'VENDOR:LEAD;CODE';
 	$list_id = 'LISTID';
+	$list_name = 'LISTNAME';
+	$list_description = 'LISTDESCRIPTION';
 	$gmt_offset_now = 'GMTOFFSET';
 	$phone_code = '1';
 	$phone_number = '7275551212';
@@ -6223,6 +6226,8 @@ if ($ADD==7111111)
 		{
 		$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);
@@ -6285,6 +6290,8 @@ if ($ADD==7111111)
 
 	$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);
@@ -7354,6 +7361,8 @@ if ($ADD==1111111)
 		echo "";
 		echo "";
 		echo "";
+		echo "";
+		echo "";
 		echo "";
 		echo "";
 		echo "";
@@ -24664,9 +24673,19 @@ if ($ADD==999999)
 		}
 	?>
 		

-		";
+			echo "\n";
+			}
+		else
+			{
+			echo "";
+			echo "\n";
+			}
+
 		$o=0;
 		while ($servers_to_print > $o)
 			{
@@ -24694,12 +24713,42 @@ if ($ADD==999999)
 			echo "\n";
 			echo "\n";
 			echo "\n";
-			echo "\n";
-			echo "\n";
+			if ($stage == 'TIME')
+				{
+				$stmt="select last_update from server_updater where server_ip='$server_ip[$o]';";
+				$rslt=mysql_query($stmt, $link);
+				if ($DB) {echo "$stmt\n";}
+				$servertime_to_print = mysql_num_rows($rslt);
+				if ($servertime_to_print)
+					{
+					$row=mysql_fetch_row($rslt);
+					echo "";
+					}
+				}
+			else
+				{
+				echo "\n";
+				echo "\n";
+				}
 			echo "\n";
 			$o++;
 			}
 
+		if ($stage == 'TIME')
+			{
+			echo "";
+
+			$stmt="select NOW();";
+			$rslt=mysql_query($stmt, $link);
+			if ($DB) {echo "$stmt\n";}
+			$dbtime_to_print = mysql_num_rows($rslt);
+			if ($dbtime_to_print)
+				{
+				$row=mysql_fetch_row($rslt);
+				echo "";
+				}
+			}
+
 		echo "
SERVERDESCRIPTIONIPACTLOADCHANDISKSORTANTENTRANT

 		
SERVEUR -DESCRIPTIONIPACTLOADCHANDISKTIME
SERVEUR +DESCRIPTIONIPACTLOADCHANDISKSORTANTENTRANT
$sysload[$o] - $cpu%$channels_total[$o]$diskLINKLINK$row[0]LINKLINK
   PHP Time   " . date("Y-m-d H:i:s") . "
   DB Time   $row[0]
\n";
 		}
 	else
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/call_report_export.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/call_report_export.php
index f4599238..55d62ebe 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/call_report_export.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/call_report_export.php
@@ -17,6 +17,7 @@
 # 100119-1039 - Filtered comments for \n newlines
 # 100214-1421 - Sort menu alphabetically
 # 100216-0042 - Added popup date selector
+# 100507-1413 - Added headers for export
 #
 
 require("dbconnect.php");
@@ -42,6 +43,8 @@ if (isset($_GET["DB"]))						{$DB=$_GET["DB"];}
 	elseif (isset($_POST["DB"]))			{$DB=$_POST["DB"];}
 if (isset($_GET["run_export"]))				{$run_export=$_GET["run_export"];}
 	elseif (isset($_POST["run_export"]))	{$run_export=$_POST["run_export"];}
+if (isset($_GET["header_row"]))				{$header_row=$_GET["header_row"];}
+	elseif (isset($_POST["header_row"]))	{$header_row=$_POST["header_row"];}
 if (isset($_GET["submit"]))					{$submit=$_GET["submit"];}
 	elseif (isset($_POST["submit"]))		{$submit=$_POST["submit"];}
 if (isset($_GET["SUBMIT"]))					{$SUBMIT=$_GET["SUBMIT"];}
@@ -299,6 +302,11 @@ if ($run_export > 0)
 		ob_clean();
 		flush();
 
+		if ($header_row=='YES')
+			{
+			echo "call_date\tphone_number\tstatus\tuser\tfull_name\tcampaign_id\tvendor_lead_code\tsource_id\tlist_id\tgmt_offset_now\tphone_code\tphone_number\ttitle\tfirst_name\tmiddle_initial\tlast_name\taddress1\taddress2\taddress3\tcity\tstate\tprovince\tpostal_code\tcountry_code\tgender\tdate_of_birth\talt_phone\temail\tsecurity_phrase\tcomments\tlength_in_sec\tuser_group\talt_dial\trank\towner\tlead_id\tlist_name\tlist_description\tstatus_name\r\n";
+			}
+
 		$i=0;
 		while ($k > $i)
 			{
@@ -518,6 +526,11 @@ else
 	
 	

\n";
+
+	echo "Header Row:
\n";
+	echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/list_download.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/list_download.php
index 8dfb9682..6e21d73c 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/list_download.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/list_download.php
@@ -12,6 +12,7 @@
 # 90508-0644 - Changed to PHP long tags
 # 90721-1238 - Added rank and owner as vicidial_list fields
 # 100119-1039 - Filtered comments for \n newlines
+# 100508-1439 - Added header row to output
 #
 
 require("dbconnect.php");
@@ -112,6 +113,8 @@ header('Pragma: public');
 ob_clean();
 flush();
 
+echo "lead_id\tentry_date\tmodify_date\tstatus\tuser\tvendor_lead_code\tsource_id\tlist_id\tgmt_offset_now\tcalled_since_last_reset\tphone_code\tphone_number\ttitle\tfirst_name\tmiddle_initial\tlast_name\taddress1\taddress2\taddress3\tcity\tstate\tprovince\tpostal_code\tcountry_code\tgender\tdate_of_birth\talt_phone\temail\tsecurity_phrase\tcomments\tcalled_count\tlast_local_call_time\trank\towner\r\n";
+
 $stmt="select lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner from vicidial_list where list_id='$list_id';";
 $rslt=mysql_query($stmt, $link);
 if ($DB) {echo "$stmt\n";}
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/welcome_demo.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/welcome_demo.php
index 238cf5cf..3b48ee07 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/welcome_demo.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/welcome_demo.php
@@ -2,7 +2,7 @@
 # welcome_demo.php - VICIDIAL welcome Demo page
 # 
 # 
-# Copyright (C) 2009  Matt Florell     LICENSE: GPLv2
+# Copyright (C) 2010  Matt Florell     LICENSE: GPLv2
 #
 header ("Content-type: text/html; charset=utf-8");
 
@@ -56,6 +56,9 @@ echo "   \n";
 echo "";
 echo "    Chinese(T) Agent Login";
+echo "\n";
+echo "";
+echo "    Swedish Agent Login";
 echo "\n";
 
 echo "\n";
@@ -78,6 +81,9 @@ echo "   \n";
 echo "";
 echo "    French Administration";
+echo "\n";
+echo "";
+echo "    Brazilian Portuguese Administration";
 echo "\n";
 echo "   \n";
 echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/welcome_languages.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/welcome_languages.php
index d53707a9..4fe6d387 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/welcome_languages.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_fr/welcome_languages.php
@@ -1,8 +1,8 @@
     LICENSE: GPLv2
+# Copyright (C) 2010  Matt Florell     LICENSE: GPLv2
 #
 header ("Content-type: text/html; charset=utf-8");
 
@@ -56,6 +56,9 @@ echo "   \n";
 echo "";
 echo "    Chinese(T) Agent Login";
+echo "\n";
+echo "";
+echo "    Swedish Agent Login";
 echo "\n";
 
 echo "\n";
@@ -78,6 +81,9 @@ echo "   \n";
 echo "";
 echo "    French Administration";
+echo "\n";
+echo "";
+echo "    Brazilian Portuguese Administration";
 echo "\n";
 echo "   \n";
 echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/admin.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/admin.php
index c17e1df5..aaee710c 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/admin.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/admin.php
@@ -2048,11 +2048,12 @@ else
 # 100116-0718 - Added presets to script select list
 # 100319-1708 - Changed user/pass for users to 20 characters in length, highlighted conf file secret in phones
 # 100413-2328 - several small fixes, logging, removal of old SIP/IAX monitor/barge links
+# 100510-2015 - prep for 2.2.1 release
 #
 # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
 
-$admin_version = '2.2.0-236';
-$build = '100413-2328';
+$admin_version = '2.2.1-237';
+$build = '100510-2015';
 
 $STARTtime = date("U");
 $SQLdate = date("Y-m-d H:i:s");
@@ -6149,6 +6150,8 @@ if ($ADD==7111111)
 	##### TEST VARIABLES #####
 	$vendor_lead_code = 'VENDOR:LEAD;CODE';
 	$list_id = 'LISTID';
+	$list_name = 'LISTNAME';
+	$list_description = 'LISTDESCRIZIONE';
 	$gmt_offset_now = 'GMTOFFSET';
 	$phone_code = '1';
 	$phone_number = '7275551212';
@@ -6223,6 +6226,8 @@ if ($ADD==7111111)
 		{
 		$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);
@@ -6285,6 +6290,8 @@ if ($ADD==7111111)
 
 	$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);
@@ -7354,6 +7361,8 @@ if ($ADD==1111111)
 		echo "";
 		echo "";
 		echo "";
+		echo "";
+		echo "";
 		echo "";
 		echo "";
 		echo "";
@@ -24664,9 +24673,19 @@ if ($ADD==999999)
 		}
 	?>
 		

-		";
+			echo "\n";
+			}
+		else
+			{
+			echo "";
+			echo "\n";
+			}
+
 		$o=0;
 		while ($servers_to_print > $o)
 			{
@@ -24694,12 +24713,42 @@ if ($ADD==999999)
 			echo "\n";
 			echo "\n";
 			echo "\n";
-			echo "\n";
-			echo "\n";
+			if ($stage == 'TIME')
+				{
+				$stmt="select last_update from server_updater where server_ip='$server_ip[$o]';";
+				$rslt=mysql_query($stmt, $link);
+				if ($DB) {echo "$stmt\n";}
+				$servertime_to_print = mysql_num_rows($rslt);
+				if ($servertime_to_print)
+					{
+					$row=mysql_fetch_row($rslt);
+					echo "";
+					}
+				}
+			else
+				{
+				echo "\n";
+				echo "\n";
+				}
 			echo "\n";
 			$o++;
 			}
 
+		if ($stage == 'TIME')
+			{
+			echo "";
+
+			$stmt="select NOW();";
+			$rslt=mysql_query($stmt, $link);
+			if ($DB) {echo "$stmt\n";}
+			$dbtime_to_print = mysql_num_rows($rslt);
+			if ($dbtime_to_print)
+				{
+				$row=mysql_fetch_row($rslt);
+				echo "";
+				}
+			}
+
 		echo "
SERVERDESCRIZIONEIPACTLOADCHANDISKOUTBOUNDINBOUND

 		
SERVER -DESCRIZIONEIPACTLOADCHANDISKTIME
SERVER +DESCRIZIONEIPACTLOADCHANDISKOUTBOUNDINBOUND
$sysload[$o] - $cpu%$channels_total[$o]$diskLINKLINK$row[0]LINKLINK
   PHP Time   " . date("Y-m-d H:i:s") . "
   DB Time   $row[0]
\n";
 		}
 	else
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/call_report_export.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/call_report_export.php
index f4599238..55d62ebe 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/call_report_export.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/call_report_export.php
@@ -17,6 +17,7 @@
 # 100119-1039 - Filtered comments for \n newlines
 # 100214-1421 - Sort menu alphabetically
 # 100216-0042 - Added popup date selector
+# 100507-1413 - Added headers for export
 #
 
 require("dbconnect.php");
@@ -42,6 +43,8 @@ if (isset($_GET["DB"]))						{$DB=$_GET["DB"];}
 	elseif (isset($_POST["DB"]))			{$DB=$_POST["DB"];}
 if (isset($_GET["run_export"]))				{$run_export=$_GET["run_export"];}
 	elseif (isset($_POST["run_export"]))	{$run_export=$_POST["run_export"];}
+if (isset($_GET["header_row"]))				{$header_row=$_GET["header_row"];}
+	elseif (isset($_POST["header_row"]))	{$header_row=$_POST["header_row"];}
 if (isset($_GET["submit"]))					{$submit=$_GET["submit"];}
 	elseif (isset($_POST["submit"]))		{$submit=$_POST["submit"];}
 if (isset($_GET["SUBMIT"]))					{$SUBMIT=$_GET["SUBMIT"];}
@@ -299,6 +302,11 @@ if ($run_export > 0)
 		ob_clean();
 		flush();
 
+		if ($header_row=='YES')
+			{
+			echo "call_date\tphone_number\tstatus\tuser\tfull_name\tcampaign_id\tvendor_lead_code\tsource_id\tlist_id\tgmt_offset_now\tphone_code\tphone_number\ttitle\tfirst_name\tmiddle_initial\tlast_name\taddress1\taddress2\taddress3\tcity\tstate\tprovince\tpostal_code\tcountry_code\tgender\tdate_of_birth\talt_phone\temail\tsecurity_phrase\tcomments\tlength_in_sec\tuser_group\talt_dial\trank\towner\tlead_id\tlist_name\tlist_description\tstatus_name\r\n";
+			}
+
 		$i=0;
 		while ($k > $i)
 			{
@@ -518,6 +526,11 @@ else
 	
 	

\n";
+
+	echo "Header Row:
\n";
+	echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/list_download.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/list_download.php
index c9115190..4934763e 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/list_download.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/list_download.php
@@ -12,6 +12,7 @@
 # 90508-0644 - Changed to PHP long tags
 # 90721-1238 - Added rank and owner as vicidial_list fields
 # 100119-1039 - Filtered comments for \n newlines
+# 100508-1439 - Added header row to output
 #
 
 require("dbconnect.php");
@@ -112,6 +113,8 @@ header('Pragma: public');
 ob_clean();
 flush();
 
+echo "lead_id\tentry_date\tmodify_date\tstatus\tuser\tvendor_lead_code\tsource_id\tlist_id\tgmt_offset_now\tcalled_since_last_reset\tphone_code\tphone_number\ttitle\tfirst_name\tmiddle_initial\tlast_name\taddress1\taddress2\taddress3\tcity\tstate\tprovince\tpostal_code\tcountry_code\tgender\tdate_of_birth\talt_phone\temail\tsecurity_phrase\tcomments\tcalled_count\tlast_local_call_time\trank\towner\r\n";
+
 $stmt="select lead_id,entry_date,modify_date,status,user,vendor_lead_code,source_id,list_id,gmt_offset_now,called_since_last_reset,phone_code,phone_number,title,first_name,middle_initial,last_name,address1,address2,address3,city,state,province,postal_code,country_code,gender,date_of_birth,alt_phone,email,security_phrase,comments,called_count,last_local_call_time,rank,owner from vicidial_list where list_id='$list_id';";
 $rslt=mysql_query($stmt, $link);
 if ($DB) {echo "$stmt\n";}
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/welcome_demo.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/welcome_demo.php
index 238cf5cf..3b48ee07 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/welcome_demo.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/welcome_demo.php
@@ -2,7 +2,7 @@
 # welcome_demo.php - VICIDIAL welcome Demo page
 # 
 # 
-# Copyright (C) 2009  Matt Florell     LICENSE: GPLv2
+# Copyright (C) 2010  Matt Florell     LICENSE: GPLv2
 #
 header ("Content-type: text/html; charset=utf-8");
 
@@ -56,6 +56,9 @@ echo "   \n";
 echo "";
 echo "    Chinese(T) Agent Login";
+echo "\n";
+echo "";
+echo "    Swedish Agent Login";
 echo "\n";
 
 echo "\n";
@@ -78,6 +81,9 @@ echo "   \n";
 echo "";
 echo "    French Administration";
+echo "\n";
+echo "";
+echo "    Brazilian Portuguese Administration";
 echo "\n";
 echo "   \n";
 echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/welcome_languages.php b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/welcome_languages.php
index d53707a9..4fe6d387 100644
--- a/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/welcome_languages.php
+++ b/agc_2-X/branches/agc_2.2.0/LANG_www/vicidial_it/welcome_languages.php
@@ -1,8 +1,8 @@
     LICENSE: GPLv2
+# Copyright (C) 2010  Matt Florell     LICENSE: GPLv2
 #
 header ("Content-type: text/html; charset=utf-8");
 
@@ -56,6 +56,9 @@ echo "   \n";
 echo "";
 echo "    Chinese(T) Agent Login";
+echo "\n";
+echo "";
+echo "    Swedish Agent Login";
 echo "\n";
 
 echo "\n";
@@ -78,6 +81,9 @@ echo "   \n";
 echo "";
 echo "    French Administration";
+echo "\n";
+echo "";
+echo "    Brazilian Portuguese Administration";
 echo "\n";
 echo "   \n";
 echo "\n";
diff --git a/agc_2-X/branches/agc_2.2.0/docs/BASE_INSTALL.txt b/agc_2-X/branches/agc_2.2.0/docs/BASE_INSTALL.txt
index 9a415f39..e92fd3c6 100644
--- a/agc_2-X/branches/agc_2.2.0/docs/BASE_INSTALL.txt
+++ b/agc_2-X/branches/agc_2.2.0/docs/BASE_INSTALL.txt
@@ -1,4 +1,4 @@
-Asterisk/astguiclient install from existing server.    v.2.2.0        2010-01-07
+Asterisk/astguiclient install from existing server.    v.2.2.1        2010-05-10
    By the VICIDIAL group                                      info@vicidial.com
 
 
@@ -11,11 +11,15 @@ End-user Manuals for Agents and Managers are available from http://www.eflo.net
 
 There is also an easier Ubuntu install doc: Ubuntu_Install.txt
 
+
+
 If you want to skip the experience of installing step-by-step completely, take
 a look at our ISO installer: http://www.vicibox.com
 
 
 
+
+
 REQUIREMENTS:
 - root access on the server you want to install asGUIclient/VICIDIAL on to.
 - Zap trunks(T1/E1 or PSTN lines), IAX2 trunks or SIP trunks required
@@ -159,12 +163,12 @@ VICIDIAL components to the system.
 There are two methods for downloading astGUIclient/VICIDIAL, a release and SVN
 
 1. Go to http://astguiclient.sf.net/ and download the latest astguiclient 
-package(as of this writing it is 2.2.0)
+package(as of this writing it is 2.2.1)
    - for 2.0.X release:
 	mkdir /usr/src/astguiclient
 	cd /usr/src/astguiclient
-	wget http://internap.dl.sourceforge.net/sourceforge/astguiclient/astguiclient_2.2.0.zip
-	unzip astguiclient_2.2.0.zip
+	wget http://internap.dl.sourceforge.net/sourceforge/astguiclient/astguiclient_2.2.1.zip
+	unzip astguiclient_2.2.1.zip
 	perl install.pl
    - for SVN 2.2.0 branch:
 	mkdir /usr/src/astguiclient
diff --git a/agc_2-X/branches/agc_2.2.0/docs/REQUIRED_APPS_INSTALL.txt b/agc_2-X/branches/agc_2.2.0/docs/REQUIRED_APPS_INSTALL.txt
index 96244e4e..9d11934b 100644
--- a/agc_2-X/branches/agc_2.2.0/docs/REQUIRED_APPS_INSTALL.txt
+++ b/agc_2-X/branches/agc_2.2.0/docs/REQUIRED_APPS_INSTALL.txt
@@ -1,4 +1,4 @@
-# Quick install of required apps    v.2.2.0               2009-03-15
+# Quick install of required apps    v.2.2.1               2010-05-10
 # This file is a supplement to the BASE_INSTALL document giving you simple copy/
 # paste installation shell commands for required and helper apps for VICIDIAL
 # might need:   echo '/* Linuxthreads */' >> /usr/include/pthread.h
diff --git a/agc_2-X/branches/agc_2.2.0/docs/SCRATCH_INSTALL.txt b/agc_2-X/branches/agc_2.2.0/docs/SCRATCH_INSTALL.txt
index f5f31054..ba28175b 100644
--- a/agc_2-X/branches/agc_2.2.0/docs/SCRATCH_INSTALL.txt
+++ b/agc_2-X/branches/agc_2.2.0/docs/SCRATCH_INSTALL.txt
@@ -1,4 +1,4 @@
-Asterisk/astguiclient install from scratch.    v.2.2.0               2010-01-07
+Asterisk/astguiclient install from scratch.    v.2.2.1               2010-05-10
    By the VICIDIAL group                                      info@vicidial.com
 
 **** IMPORTANT - In order for vicidial/astguiclient to function correctly please
@@ -8,11 +8,15 @@ End-user Manuals for Agents and Managers are available from http://www.eflo.net
 
 There is also an easier Ubuntu install doc: Ubuntu_Install.txt
 
+
+
 If you want to skip the experience of installing step-by-step completely, take
 a look at our ISO installer: http://www.vicibox.com
 
 
-This document will be depricated and not supported after the 2.2.0 release.
+
+
+This document will be depricated and not supported anymore.
 
 
 
diff --git a/agc_2-X/branches/agc_2.2.0/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/branches/agc_2.2.0/extras/MySQL_AST_CREATE_tables.sql
index 1ec01a00..220de9b1 100644
--- a/agc_2-X/branches/agc_2.2.0/extras/MySQL_AST_CREATE_tables.sql
+++ b/agc_2-X/branches/agc_2.2.0/extras/MySQL_AST_CREATE_tables.sql
@@ -1913,7 +1913,7 @@ INSERT INTO vicidial_inbound_groups(group_id,group_name,group_color,active,queue
 INSERT INTO vicidial_lists SET list_id='999',list_name='Default inbound list',campaign_id='TESTCAMP',active='N';
 INSERT INTO vicidial_lists SET list_id='998',list_name='Default Manual list',campaign_id='TESTCAMP',active='N';
 
-INSERT INTO system_settings (version,install_date) values('2.2.0rc8', CURDATE());
+INSERT INTO system_settings (version,install_date) values('2.2.1', CURDATE());
 
 INSERT INTO vicidial_status_categories (vsc_id,vsc_name) values('UNDEFINED','Default Category');
 
diff --git a/agc_2-X/branches/agc_2.2.0/extras/upgrade_2.2.0.sql b/agc_2-X/branches/agc_2.2.0/extras/upgrade_2.2.0.sql
index 8e4d713a..22ac290a 100644
--- a/agc_2-X/branches/agc_2.2.0/extras/upgrade_2.2.0.sql
+++ b/agc_2-X/branches/agc_2.2.0/extras/upgrade_2.2.0.sql
@@ -734,4 +734,4 @@ CREATE TABLE vicidial_carrier_log_archive LIKE vicidial_carrier_log;
 
 UPDATE system_settings SET db_schema_version='1193',db_schema_update_date=NOW();
 
-UPDATE system_settings SET version='2.2.0rc8',db_schema_update_date=NOW();
+UPDATE system_settings SET version='2.2.1',db_schema_update_date=NOW();
diff --git a/agc_2-X/branches/agc_2.2.0/version b/agc_2-X/branches/agc_2.2.0/version
index 4c2e6a55..c043eea7 100644
--- a/agc_2-X/branches/agc_2.2.0/version
+++ b/agc_2-X/branches/agc_2.2.0/version
@@ -1 +1 @@
-2.2.0rc8
+2.2.1