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

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 8687b336..62506205 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -62,7 +62,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()
@@ -166,7 +166,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 +177,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_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 +306,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)