From 732989e9d33246f22e7e933ed5d4fe18b71979e1 Mon Sep 17 00:00:00 2001 From: mattf Date: Fri, 6 Aug 2010 04:09:50 +0000 Subject: [PATCH] updated Spanish and Italian builds of agent interface git-svn-id: svn://192.168.202.10@1495 3d104415-ff17-0410-8863-d5cf3c621b8a --- .../trunk/LANG_www/agc_es/vdc_db_query.php | 16 ++++++-- agc_2-X/trunk/LANG_www/agc_es/vicidial.php | 37 +++++++------------ .../trunk/LANG_www/agc_it/vdc_db_query.php | 16 ++++++-- agc_2-X/trunk/LANG_www/agc_it/vicidial.php | 37 +++++++------------ 4 files changed, 54 insertions(+), 52 deletions(-) diff --git a/agc_2-X/trunk/LANG_www/agc_es/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_es/vdc_db_query.php index 1ba01e66..90c3c3a8 100644 --- a/agc_2-X/trunk/LANG_www/agc_es/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_es/vdc_db_query.php @@ -250,10 +250,11 @@ # 100624-1401 - Fix for dispo call url bug related to dialed number and label # 100625-0915 - Fix for auto-dial bug for presets and timer actions # 100712-1447 - Added entry_list_id field to vicidial_list to preserve link to custom fields if any +# 100803-0822 - Added CAMPLISTS_ALL for manual_dial_filter(issue #369 # -$version = '2.4-157'; -$build = '100712-1447'; +$version = '2.4-158'; +$build = '100803-0822'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=333; $one_mysql_log=0; @@ -1163,7 +1164,16 @@ if ($ACTION == 'manDiaLnextCaLL') { $rowx=mysql_fetch_row($rslt); if (ereg("Y", $rowx[1])) {$active_lists++; $camp_lists .= "'$rowx[0]',";} - if (ereg("N", $rowx[1])) {$inactive_lists++;} + if (ereg("ALL",$manual_dial_filter)) + { + if (ereg("N", $rowx[1])) + {$inactive_lists++; $camp_lists .= "'$rowx[0]',";} + } + else + { + if (ereg("N", $rowx[1])) + {$inactive_lists++;} + } $o++; } $camp_lists = eregi_replace(".$","",$camp_lists); diff --git a/agc_2-X/trunk/LANG_www/agc_es/vicidial.php b/agc_2-X/trunk/LANG_www/agc_es/vicidial.php index 5df0a1ea..195c62f8 100644 --- a/agc_2-X/trunk/LANG_www/agc_es/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_es/vicidial.php @@ -303,10 +303,11 @@ # 100712-1441 - Added entry_list_id field to vicidial_list to preserve link to custom fields if any # 100723-1522 - Added LOCKED options for quick transfer button feature # 100726-1233 - Added HANGUP, CALLMENU, EXTENSION, IN_GROUP timer actions +# 100803-2324 - Cleanup of URLDecode (issue #375) # -$version = '2.4-281'; -$build = '100726-1233'; +$version = '2.4-282'; +$build = '100803-2324'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=66; $one_mysql_log=0; @@ -2669,7 +2670,6 @@ $CCAL_OUT .= ""; $h++; } ?> - var decoded = ''; var view_scripts = ''; var LOGfullname = ''; var recLIST = ''; @@ -5373,8 +5373,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var regWFAcustom = new RegExp("^VAR","ig"); if (VDIC_web_form_address.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address,'YES'); - TEMP_VDIC_web_form_address = decoded; + TEMP_VDIC_web_form_address = URLDecode(VDIC_web_form_address,'YES'); TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAcustom, ''); } else @@ -5473,8 +5472,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (VDIC_web_form_address_two.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address_two,'YES'); - TEMP_VDIC_web_form_address_two = decoded; + TEMP_VDIC_web_form_address_two = URLDecode(VDIC_web_form_address_two,'YES'); TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAcustom, ''); } else @@ -5801,8 +5799,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var regWFAcustom = new RegExp("^VAR","ig"); if (VDIC_web_form_address.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address,'YES'); - TEMP_VDIC_web_form_address = decoded; + TEMP_VDIC_web_form_address = URLDecode(VDIC_web_form_address,'YES'); TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAcustom, ''); } else @@ -5901,8 +5898,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (VDIC_web_form_address_two.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address_two,'YES'); - TEMP_VDIC_web_form_address_two = decoded; + TEMP_VDIC_web_form_address_two = URLDecode(VDIC_web_form_address_two,'YES'); TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAcustom, ''); } else @@ -7180,8 +7176,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var regWFAcustom = new RegExp("^VAR","ig"); if (VDIC_web_form_address.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address,'YES'); - TEMP_VDIC_web_form_address = decoded; + TEMP_VDIC_web_form_address = URLDecode(VDIC_web_form_address,'YES'); TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAcustom, ''); } else @@ -7280,8 +7275,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (VDIC_web_form_address_two.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address_two,'YES'); - TEMP_VDIC_web_form_address_two = decoded; + TEMP_VDIC_web_form_address_two = URLDecode(VDIC_web_form_address_two,'YES'); TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAcustom, ''); } else @@ -7571,8 +7565,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var regWFAcustom = new RegExp("^VAR","ig"); if (VDIC_web_form_address.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address,'YES'); - TEMP_VDIC_web_form_address = decoded; + TEMP_VDIC_web_form_address = URLDecode(VDIC_web_form_address,'YES'); TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAcustom, ''); } else @@ -7704,8 +7697,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var regWFAcustom = new RegExp("^VAR","ig"); if (VDIC_web_form_address_two.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address_two,'YES'); - TEMP_VDIC_web_form_address_two = decoded; + TEMP_VDIC_web_form_address_two = URLDecode(VDIC_web_form_address_two,'YES'); TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAcustom, ''); } else @@ -9462,7 +9454,7 @@ else // Put [ERR] in output if %ZZ is invalid. var HEXCHAR = "0123456789ABCDEFabcdef"; var encoded = encodedvar; - decoded = ''; + var decoded = ''; var i = 0; var RGnl = new RegExp("[\r]\n","g"); var RGplus = new RegExp(" ","g"); @@ -9765,7 +9757,7 @@ else // } // while // decoded = decoded.replace(RGnl, "
"); // - return false; + return decoded; }; @@ -10719,8 +10711,7 @@ else if ( (crm_popup_login == 'Y') && (crm_login_address.length > 4) ) { var regWFAcustom = new RegExp("^VAR","ig"); - URLDecode(crm_login_address,'YES'); - var TEMP_crm_login_address = decoded; + var TEMP_crm_login_address = URLDecode(crm_login_address,'YES'); TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); var CRMwin = 'CRMwin'; diff --git a/agc_2-X/trunk/LANG_www/agc_it/vdc_db_query.php b/agc_2-X/trunk/LANG_www/agc_it/vdc_db_query.php index 82ede71d..18c816f0 100644 --- a/agc_2-X/trunk/LANG_www/agc_it/vdc_db_query.php +++ b/agc_2-X/trunk/LANG_www/agc_it/vdc_db_query.php @@ -250,10 +250,11 @@ # 100624-1401 - Fix for dispo call url bug related to dialed number and label # 100625-0915 - Fix for auto-dial bug for presets and timer actions # 100712-1447 - Added entry_list_id field to vicidial_list to preserve link to custom fields if any +# 100803-0822 - Added CAMPLISTS_ALL for manual_dial_filter(issue #369 # -$version = '2.4-157'; -$build = '100712-1447'; +$version = '2.4-158'; +$build = '100803-0822'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=333; $one_mysql_log=0; @@ -1163,7 +1164,16 @@ if ($ACTION == 'manDiaLnextCaLL') { $rowx=mysql_fetch_row($rslt); if (ereg("Y", $rowx[1])) {$active_lists++; $camp_lists .= "'$rowx[0]',";} - if (ereg("N", $rowx[1])) {$inactive_lists++;} + if (ereg("ALL",$manual_dial_filter)) + { + if (ereg("N", $rowx[1])) + {$inactive_lists++; $camp_lists .= "'$rowx[0]',";} + } + else + { + if (ereg("N", $rowx[1])) + {$inactive_lists++;} + } $o++; } $camp_lists = eregi_replace(".$","",$camp_lists); diff --git a/agc_2-X/trunk/LANG_www/agc_it/vicidial.php b/agc_2-X/trunk/LANG_www/agc_it/vicidial.php index fd09cedc..711e89ca 100644 --- a/agc_2-X/trunk/LANG_www/agc_it/vicidial.php +++ b/agc_2-X/trunk/LANG_www/agc_it/vicidial.php @@ -303,10 +303,11 @@ # 100712-1441 - Added entry_list_id field to vicidial_list to preserve link to custom fields if any # 100723-1522 - Added LOCKED options for quick transfer button feature # 100726-1233 - Added HANGUP, CALLMENU, EXTENSION, IN_GROUP timer actions +# 100803-2324 - Cleanup of URLDecode (issue #375) # -$version = '2.4-281'; -$build = '100726-1233'; +$version = '2.4-282'; +$build = '100803-2324'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=66; $one_mysql_log=0; @@ -2669,7 +2670,6 @@ $CCAL_OUT .= ""; $h++; } ?> - var decoded = ''; var view_scripts = ''; var LOGfullname = ''; var recLIST = ''; @@ -5373,8 +5373,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var regWFAcustom = new RegExp("^VAR","ig"); if (VDIC_web_form_address.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address,'YES'); - TEMP_VDIC_web_form_address = decoded; + TEMP_VDIC_web_form_address = URLDecode(VDIC_web_form_address,'YES'); TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAcustom, ''); } else @@ -5473,8 +5472,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (VDIC_web_form_address_two.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address_two,'YES'); - TEMP_VDIC_web_form_address_two = decoded; + TEMP_VDIC_web_form_address_two = URLDecode(VDIC_web_form_address_two,'YES'); TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAcustom, ''); } else @@ -5801,8 +5799,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var regWFAcustom = new RegExp("^VAR","ig"); if (VDIC_web_form_address.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address,'YES'); - TEMP_VDIC_web_form_address = decoded; + TEMP_VDIC_web_form_address = URLDecode(VDIC_web_form_address,'YES'); TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAcustom, ''); } else @@ -5901,8 +5898,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (VDIC_web_form_address_two.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address_two,'YES'); - TEMP_VDIC_web_form_address_two = decoded; + TEMP_VDIC_web_form_address_two = URLDecode(VDIC_web_form_address_two,'YES'); TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAcustom, ''); } else @@ -7180,8 +7176,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var regWFAcustom = new RegExp("^VAR","ig"); if (VDIC_web_form_address.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address,'YES'); - TEMP_VDIC_web_form_address = decoded; + TEMP_VDIC_web_form_address = URLDecode(VDIC_web_form_address,'YES'); TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAcustom, ''); } else @@ -7280,8 +7275,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (VDIC_web_form_address_two.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address_two,'YES'); - TEMP_VDIC_web_form_address_two = decoded; + TEMP_VDIC_web_form_address_two = URLDecode(VDIC_web_form_address_two,'YES'); TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAcustom, ''); } else @@ -7571,8 +7565,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var regWFAcustom = new RegExp("^VAR","ig"); if (VDIC_web_form_address.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address,'YES'); - TEMP_VDIC_web_form_address = decoded; + TEMP_VDIC_web_form_address = URLDecode(VDIC_web_form_address,'YES'); TEMP_VDIC_web_form_address = TEMP_VDIC_web_form_address.replace(regWFAcustom, ''); } else @@ -7704,8 +7697,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} var regWFAcustom = new RegExp("^VAR","ig"); if (VDIC_web_form_address_two.match(regWFAcustom)) { - URLDecode(VDIC_web_form_address_two,'YES'); - TEMP_VDIC_web_form_address_two = decoded; + TEMP_VDIC_web_form_address_two = URLDecode(VDIC_web_form_address_two,'YES'); TEMP_VDIC_web_form_address_two = TEMP_VDIC_web_form_address_two.replace(regWFAcustom, ''); } else @@ -9462,7 +9454,7 @@ else // Put [ERR] in output if %ZZ is invalid. var HEXCHAR = "0123456789ABCDEFabcdef"; var encoded = encodedvar; - decoded = ''; + var decoded = ''; var i = 0; var RGnl = new RegExp("[\r]\n","g"); var RGplus = new RegExp(" ","g"); @@ -9765,7 +9757,7 @@ else // } // while // decoded = decoded.replace(RGnl, "
"); // - return false; + return decoded; }; @@ -10719,8 +10711,7 @@ else if ( (crm_popup_login == 'Y') && (crm_login_address.length > 4) ) { var regWFAcustom = new RegExp("^VAR","ig"); - URLDecode(crm_login_address,'YES'); - var TEMP_crm_login_address = decoded; + var TEMP_crm_login_address = URLDecode(crm_login_address,'YES'); TEMP_crm_login_address = TEMP_crm_login_address.replace(regWFAcustom, ''); var CRMwin = 'CRMwin';