From 71105fde7e1e2dbab036268c6e1433e66fbda604 Mon Sep 17 00:00:00 2001 From: mattf Date: Wed, 23 Sep 2009 17:16:32 +0000 Subject: [PATCH] Rolled back vicidial.php window.open changes for web forms git-svn-id: svn://192.168.202.10@1237 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/www/agc/vicidial.php | 49 +++++++++++++----------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 23044eec..405430be 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -255,10 +255,11 @@ # 90916-1144 - Added Second web form button, Answering Machine Message change # 90917-1325 - Fixed script loading bug with customer webform at the same time # 90920-2108 - Changed web forms to use window.open instead of traditional links(IE7 compatibility issue) +# 90923-1310 - Rolled back last change # -$version = '2.2.0-232'; -$build = '90920-2108'; +$version = '2.2.0-233'; +$build = '90923-1310'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=61; $one_mysql_log=0; @@ -4806,14 +4807,10 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; } - document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; - - // document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; + document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; if (enable_second_webform > 0) { - document.getElementById("WebFormSpanTwo").innerHTML = "\"Web\n"; - - // document.getElementById("WebFormSpanTwo").innerHTML = "\"Web\n"; + document.getElementById("WebFormSpanTwo").innerHTML = "\"Web\n"; } if (LeaDPreVDispO == 'CALLBK') @@ -6021,15 +6018,12 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} TEMP_VDIC_web_form_address_two = VDIC_web_form_address_two + "" + web_form_vars_two; } - document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; - // document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; + document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; if (enable_second_webform > 0) { - document.getElementById("WebFormSpanTwo").innerHTML = "\"Web\n"; - - // document.getElementById("WebFormSpanTwo").innerHTML = "\"Web\n"; + document.getElementById("WebFormSpanTwo").innerHTML = "\"Web\n"; } if ( (LIVE_campaign_recording == 'ALLCALLS') || (LIVE_campaign_recording == 'ALLFORCE') ) @@ -6145,7 +6139,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} // ################################################################################ // refresh the content of the web form URL - function WebFormRefresH(taskrefresh,submittask,taskopen) + function WebFormRefresH(taskrefresh,submittask) { if (VDCL_group_id.length > 1) {var group = VDCL_group_id;} @@ -6242,19 +6236,21 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} TEMP_VDIC_web_form_address = VDIC_web_form_address + "" + web_form_vars; } - document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; - if (taskopen == 'YES') + if (taskrefresh == 'OUT') { - window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; + } + else + { + document.getElementById("WebFormSpan").innerHTML = "\"Web\n"; } - } // ################################################################################ // refresh the content of the second web form URL - function WebFormTwoRefresH(taskrefresh,submittask,taskopen) + function WebFormTwoRefresH(taskrefresh,submittask) { if (VDCL_group_id.length > 1) {var group = VDCL_group_id;} @@ -6354,11 +6350,13 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";} if (enable_second_webform > 0) { - document.getElementById("WebFormSpanTwo").innerHTML = "\"Web\n"; - - if (taskopen == 'YES') + if (taskrefresh == 'OUT') { - window.open(TEMP_VDIC_web_form_address_two, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); + document.getElementById("WebFormSpanTwo").innerHTML = "\"Web\n"; + } + else + { + document.getElementById("WebFormSpanTwo").innerHTML = "\"Web\n"; } } } @@ -9912,8 +9910,3 @@ return $errno; } ?> - - - - -