X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=ddef1bddf3491d083918f0ed8f03ef8433b0add8;hb=927ebef2443b6dda544056e33ec84b71d2bdb6c2;hp=0639124a5a236a4f6170ca70b57c0c7a5b637dd8;hpb=53d942f2a0d20cce5e9c409c6485867ce0869e4d;p=fa-stable.git

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 0639124a..ddef1bdd 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -69,7 +69,7 @@ function end_form($breaks=0)
 	hidden('_modified', get_post('_modified', 0));
 	hidden('_token', $_SESSION['csrf_token']);
 	echo "</form>\n";
-	$Ajax->activate('token');
+	$Ajax->activate('_token');
 }
 
 function check_csrf_token()
@@ -139,10 +139,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;
@@ -184,14 +184,14 @@ function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0, $f
 	{
 		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_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(".($final ? '-2' : '').");'>".($no_menu ? _("Close") : _("Back"))."</a></td>\n";
@@ -313,18 +313,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)
@@ -626,4 +628,3 @@ function page_modified($status = true)
 		add_js_source($js);
 }
 
-?>
\ No newline at end of file