X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=9dc24a4f4cb550d67bf1969fc51bbc78f2197d5e;hb=0388050f6d4c6c7c9a9db06d2f31aa8879da69a8;hp=afc02589bf78db1193b07d28e3655aa20efadc11;hpb=d1babda7c01b314d35fb89f2d195553b55936532;p=fa-stable.git

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index afc02589..9dc24a4f 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";
@@ -256,7 +255,7 @@ function viewer_link($label, $url='', $class='', $id='',  $icon=null)
 		$pars = access_string($label);
 		if (user_graphic_links() && $icon)
 			$pars[0] = set_icon($icon, $pars[0]);
--		$preview_str = "<a target='_blank' $class $id href='$path_to_root/$url' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
+		$preview_str = "<a target='_blank' $class $id href='$path_to_root/$url' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
 	}
 	else
 		$preview_str = $label;
@@ -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>";
 }
 
@@ -497,12 +503,14 @@ function tab_visible($name, $tab)
 */
 $popup_editors = array(
 	'customer' => array('/sales/manage/customers.php?debtor_no=', 
-		113,	_("Customers"), 900, 500),
+		113,	_("Customers"), 900, 600),
 	'branch' => array('/sales/manage/customer_branches.php?SelectedBranch=', 
 		114, _("Branches"), 900, 700),
 	'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;');