X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=616d99b65502f2c130d3dba692b114b5107ab82f;hb=17b390efcf904072b02ec866b2a427490471a260;hp=8687b336bc7e5bdc327ba9f6ccac01ac3fe0d70a;hpb=9f2275ba8099ba8c9d9b5b45231c9844d6dedaf2;p=fa-stable.git

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 8687b336..616d99b6 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -32,10 +32,15 @@ function get_post($name, $dflt='')
 				((!isset($_POST[$name]) || $_POST[$name] === '') ? $dflt : $_POST[$name]);
 }
 //---------------------------------------------------------------------------------
+$form_nested = -1;
 
 function start_form($multi=false, $dummy=false, $action="", $name="")
 {
 	// $dummy - leaved for compatibility with 2.0 API
+	global $form_nested;
+
+	if (++$form_nested) return;
+
 
 	if ($name != "")
 		$name = "name='$name'";
@@ -53,7 +58,9 @@ function start_form($multi=false, $dummy=false, $action="", $name="")
 
 function end_form($breaks=0)
 {
-	global $Ajax;
+	global $Ajax, $form_nested, $hidden_fields;
+
+	if ($form_nested-- > 0) return;
 
 	$_SESSION['csrf_token'] = hash('sha256', uniqid(mt_rand(), true));
 	if ($breaks)
@@ -61,8 +68,9 @@ function end_form($breaks=0)
 	hidden('_focus');
 	hidden('_modified', get_post('_modified', 0));
 	hidden('_token', $_SESSION['csrf_token']);
-	echo "</form>\n";
-	$Ajax->activate('token');
+
+	echo implode('', $hidden_fields)."</form>\n";
+	$Ajax->activate('_token');
 }
 
 function check_csrf_token()
@@ -87,7 +95,7 @@ function start_table($class=false, $extra="", $padding='2', $spacing='0')
 		echo " class='tablestyle'";
 	if ($extra != "")
 		echo " $extra";
-	echo " cellpadding=$padding cellspacing=$spacing>\n";
+	echo " cellpadding='$padding' cellspacing='$spacing'>\n";
 }
 
 function end_table($breaks=0)
@@ -110,7 +118,7 @@ function table_section($number=1, $width=false)
 	if ($number > 1)
 	{
 		echo "</table>\n";
-		$width = ($width ? "width=$width" : "");
+		$width = ($width ? "width='$width'" : "");
 		//echo "</td><td class='tableseparator' $width>\n"; // outer table
 		echo "</td><td style='border-left:1px solid #cccccc;' $width>\n"; // outer table
 	}
@@ -132,10 +140,10 @@ function vertical_space($params='')
 	echo "</td></tr><tr><td valign=center $params>";
 }
 
-function meta_forward($forward_to, $params="")
+function meta_forward($forward_to, $params="", $timeout=0)
 {
     global $Ajax;
-	echo "<meta http-equiv='Refresh' content='0; url=$forward_to?$params'>\n";
+	echo "<meta http-equiv='Refresh' content='".$timeout."; url=$forward_to?$params'>\n";
 	echo "<center><br>" . _("You should automatically be forwarded.");
 	echo " " . _("If this does not happen") . " " . "<a href='$forward_to?$params'>" . _("click here") . "</a> " . _("to continue") . ".<br><br></center>\n";
 	if ($params !='') $params = '?'.$params;
@@ -166,7 +174,7 @@ function access_string($label, $clean=false)
 	return $clean ? $label : array($label, $access);
 }
 
-function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0)
+function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0, $final=false)
 {
 	global $path_to_root;
 
@@ -177,17 +185,17 @@ function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0)
 	{
 		include_once($path_to_root."/admin/db/attachments_db.inc");
 		$id = has_attachment($type_no, $trans_no);
-	}
+		$attach = get_attachment_string($type_no, $trans_no);
+    	echo $attach;	
+    }
 	$width = ($id != 0 ? "30%" : "20%");	
-	start_table(false, "width=$width");
+	start_table(false, "width='$width'");
 	start_row();
 	if ($no_menu)
 	{
-		if ($id != 0)
-			echo "<td align=center><a href='$path_to_root/admin/attachments.php?vw=$id' target='blanc_'>"._("View Attachment")."</a></td>\n";
 		echo "<td align=center><a href='javascript:window.print();'>"._("Print")."</a></td>\n";
-	}	
-	echo "<td align=center><a href='javascript:goBack();'>".($no_menu ? _("Close") : _("Back"))."</a></td>\n";
+	}
+	echo "<td align=center><a href='javascript:goBack(".($final ? '-2' : '').");'>".($no_menu ? _("Close") : _("Back"))."</a></td>\n";
 	end_row();
 	end_table();
 	if ($center)
@@ -306,18 +314,20 @@ function hyperlink_params_separate_td($target, $label, $params)
 
 //--------------------------------------------------------------------------------------------------
 
-function alt_table_row_color(&$k)
+function alt_table_row_color(&$k, $extra_class=null)
 {
+	$classes = $extra_class ? array($extra_class) : array();
 	if ($k == 1)
 	{
-		echo "<tr class='oddrow'>\n";
+		array_push($classes, 'oddrow');
 		$k = 0;
 	}
 	else
 	{
-		echo "<tr class='evenrow'>\n";
+		array_push($classes, 'evenrow');
 		$k++;
 	}
+	echo "<tr class='".implode(' ', $classes)."'>\n";
 }
 
 function table_section_title($msg, $colspan=2)
@@ -470,7 +480,7 @@ function set_editor($type, $input, $caller=true)
 
 	$Editors[$key] = array( $path_to_root . $popup_editors[$type][0], $input, 
 		$popup_editors[$type][3], $popup_editors[$type][4]);
-	
+
 	$help = 'F' . ($key - 111) . ' - ';
 	$help .= $popup_editors[$type][2];
 	$Pagehelp[] = $help;
@@ -619,4 +629,3 @@ function page_modified($status = true)
 		add_js_source($js);
 }
 
-?>
\ No newline at end of file