X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=52f417bb486f92f253faa84594079cda1a71759b;hb=c5677263c637016991f99e1b63f067280da75163;hp=54712f9c8ab76bb2f902943be21b14476abaa043;hpb=a2ae0e35302270ae811db2e6acb44c16b186a970;p=fa-stable.git
diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 54712f9c..52f417bb 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');
@@ -157,7 +157,7 @@ function vertical_space($params='')
echo "
";
}
-function meta_forward($forward_to, $params="", $timeout=0)
+function meta_forward($forward_to, $params="", $timeout=0, $return=false)
{
global $Ajax;
echo "\n";
@@ -165,7 +165,7 @@ function meta_forward($forward_to, $params="", $timeout=0)
echo " " . _("If this does not happen") . " " . "" . _("click here") . " " . _("to continue") . ".
\n";
if ($params !='') $params = '?'.$params;
$Ajax->redirect($forward_to.$params);
- exit;
+ if (!$return) exit;
}
//-----------------------------------------------------------------------------------
@@ -255,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 = "$pars[0]";
+ $preview_str = "$pars[0]";
}
else
$preview_str = $label;
@@ -503,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)
);
/*
|