Added IGNORENOSCROLL option to force scroll bars in script tabs with an iframe

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

agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt

@@ -836,6 +836,7 @@ Inventory Report||
 If the Inventory Report is enabled on your system, this option will determine whether this list is included in the report or not. Default is Y for yes||
 Report Rank||
 This option allows you to rank shifts in selected reports that support this option||
+You can also use a special variable IGNORENOSCROLL to force scroll bars on the script tab even if you are using an iframe within it||
 
 
 lead_report_export.php

agc_2-X/trunk/www/agc/vdc_script_display.php

@@ -1,7 +1,7 @@
 <?php
 # vdc_script_display.php
 # 
-# Copyright (C) 2011  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
+# Copyright (C) 2012  Matt Florell <vicidial@gmail.com>    LICENSE: AGPLv2
 #
 # This script is designed display the contents of the SCRIPT tab in the agent interface
 #
@@ -16,10 +16,11 @@
 # 100902-1344 - Added closecallid, xfercallid, agent_log_id variables
 # 110420-1201 - Added web_vars variable
 # 110730-2339 - Added call_id variable
+# 120227-2017 - Added parsing of IGNORENOSCROLL option in script to force scroll
 #
 
-$version = '2.4-10';
-$build = '110730-2339';
+$version = '2.4-11';
+$build = '120227-2017';
 
 require("dbconnect.php");
 
@@ -509,12 +510,12 @@ $script_text = stripslashes($script_text);
 echo "<!-- IFRAME$IFRAME -->\n";
 echo "<!-- $script_id -->\n";
 echo "<TABLE WIDTH=$script_width><TR><TD>\n";
-if ( ($IFRAME < 1) and ($ScrollDIV > 0) )
-	{ echo "<div class=\"scroll_script\" id=\"NewScriptContents\">";}
+if ( ( ($IFRAME < 1) and ($ScrollDIV > 0) ) or (eregi("IGNORENOSCROLL",$script_text)) )
+	{echo "<div class=\"scroll_script\" id=\"NewScriptContents\">";}
 echo "<center><B>$script_name</B><BR></center>\n";
 echo "$script_text\n";
-if ( ($IFRAME < 1) and ($ScrollDIV > 0) )
-	{ echo "</div>";}
+if ( ( ($IFRAME < 1) and ($ScrollDIV > 0) ) or (eregi("IGNORENOSCROLL",$script_text)) )
+	{echo "</div>";}
 echo "</TD></TR></TABLE>\n";
 
 exit;

agc_2-X/trunk/www/vicidial/admin.php

@@ -6875,6 +6875,8 @@ if ($ADD==99999)
 	<iframe src="http://astguiclient.sf.net/test_VICIDIAL_output.php?lead_id=--A--lead_id--B--&vendor_id=--A--vendor_lead_code--B--&list_id=--A--list_id--B--&gmt_offset_now=--A--gmt_offset_now--B--&phone_code=--A--phone_code--B--&phone_number=--A--phone_number--B--&title=--A--title--B--&first_name=--A--first_name--B--&middle_initial=--A--middle_initial--B--&last_name=--A--last_name--B--&address1=--A--address1--B--&address2=--A--address2--B--&address3=--A--address3--B--&city=--A--city--B--&state=--A--state--B--&province=--A--province--B--&postal_code=--A--postal_code--B--&country_code=--A--country_code--B--&gender=--A--gender--B--&date_of_birth=--A--date_of_birth--B--&alt_phone=--A--alt_phone--B--&email=--A--email--B--&security_phrase=--A--security_phrase--B--&comments=--A--comments--B--&user=--A--user--B--&campaign=--A--campaign--B--&phone_login=--A--phone_login--B--&fronter=--A--fronter--B--&closer=--A--user--B--&group=--A--group--B--&channel_group=--A--group--B--&SQLdate=--A--SQLdate--B--&epoch=--A--epoch--B--&uniqueid=--A--uniqueid--B--&customer_zap_channel=--A--customer_zap_channel--B--&server_ip=--A--server_ip--B--&SIPexten=--A--SIPexten--B--&session_id=--A--session_id--B--&dialed_number=--A--dialed_number--B--&dialed_label=--A--dialed_label--B--&rank=--A--rank--B--&owner=--A--owner--B--&phone=--A--phone--B--&camp_script=--A--camp_script--B--&in_script=--A--in_script--B--&script_width=--A--script_width--B--&script_height=--A--script_height--B--&recording_filename=--A--recording_filename--B--&recording_id=--A--recording_id--B--&user_custom_one=--A--user_custom_one--B--&user_custom_two=--A--user_custom_two--B--&user_custom_three=--A--user_custom_three--B--&user_custom_four=--A--user_custom_four--B--&user_custom_five=--A--user_custom_five--B--&preset_number_a=--A--preset_number_a--B--&preset_number_b=--A--preset_number_b--B--&preset_number_c=--A--preset_number_c--B--&preset_number_d=--A--preset_number_d--B--&preset_number_e=--A--preset_number_e--B--&preset_number_f=--A--preset_number_f--B--&preset_dtmf_a=--A--preset_dtmf_a--B--&preset_dtmf_b=--A--preset_dtmf_b--B--&did_id=--A--did_id--B--&did_extension=--A--did_extension--B--&did_pattern=--A--did_pattern--B--&did_description=--A--did_description--B--&closecallid=--A--closecallid--B--&xfercallid=--A--xfercallid--B--&agent_log_id=--A--agent_log_id--B--&entry_list_id=--A--entry_list_id--B--&call_id=--A--call_id--B--&&" style="width:580;height:290;background-color:transparent;" scrolling="auto" frameborder="0" allowtransparency="true" id="popupFrame" name="popupFrame" width="460" height="290" STYLE="z-index:17">
 	</iframe>
 	</DIV>
+	<BR>
+	You can also use a special variable IGNORENOSCROLL to force scroll bars on the script tab even if you are using an iframe within it.
 
 	<BR>
 	<A NAME="vicidial_scripts-active">