X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=e575fd15d8a071382cafe07c12811b221084e1ec;hb=5bdeff963d434637f3ad2e4c82dd00b9780e7fcc;hp=afc02589bf78db1193b07d28e3655aa20efadc11;hpb=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0;p=fa-stable.git

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index afc02589..e575fd15 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -72,7 +72,7 @@ function end_form($breaks=0)
 
 	if ($form_nested-- > 0) return;
 
-	$_SESSION['csrf_token'] = hash('sha256', uniqid(mt_rand(), true));
+	$_SESSION['csrf_token'] = random_id();
 	if ($breaks)
 		br($breaks);
 	hidden('_focus');
@@ -134,7 +134,6 @@ function table_section($number=1, $width=false)
 		echo "</table>\n";
 		output_hidden();
 		$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
 	}
 	echo "<table class='tablestyle_inner'>\n";
@@ -265,8 +264,15 @@ function viewer_link($label, $url='', $class='', $id='',  $icon=null)
 
 function menu_link($url, $label, $id=null)
 {
+	global $path_to_root;
+
 	$id = default_focus($id);
 	$pars = access_string($label);
+
+	if ($url[0] != '/')
+		$url = '/'.$url;
+	$url = $path_to_root.$url;
+
 	return "<a href='$url' class='menu_option' id='$id' $pars[1]>$pars[0]</a>";
 }
 
@@ -503,6 +509,8 @@ $popup_editors = array(
 	'supplier' => array('/purchasing/manage/suppliers.php?supplier_id=', 
 		113, _("Suppliers"), 900, 700),
 	'item' => array('/inventory/manage/items.php?stock_id=', 
+		115, _("Items"), 800, 600),
+	'fa_item' => array('/inventory/manage/items.php?FixedAsset=1&stock_id=', 
 		115, _("Items"), 800, 600)
 );
 /*
@@ -663,7 +671,7 @@ function page_processing($msg = false)
 	global $Ajax;
 
 	if ($msg === true)
-		$msg = _('Entered data has not been saved yet.\nDo you want to abandon changes?');
+		$msg = _("Entered data has not been saved yet.\nDo you want to abandon changes?");
 
 	$js = "_validate._processing=" . (
 		$msg ? '\''.strtr($msg, array("\n"=>'\\n')) . '\';' : 'null;');