X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_controls.inc;h=748889d6b8ba55b6ba62420e4561832041239b2a;hb=a9e7141956ef0a60b58e9a627beee93cd35ed43c;hp=3d542f12bd9b99f5f99d7ddda641080e28b65194;hpb=b0de618b47d6ca975589b517217b862189e66780;p=fa-stable.git
diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 3d542f12..748889d6 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -22,7 +22,7 @@ function get_post($name, $dflt='')
$ret = array();
foreach($name as $key => $dflt)
if (!is_numeric($key)) {
- $ret[$key] = is_float($dflt) ? input_num($key, $dflt) : get_post($key, $dflt);
+ $ret[$key] = is_numeric($dflt) ? input_num($key, $dflt) : get_post($key, $dflt);
} else {
$ret[$dflt] = get_post($dflt, null);
}
@@ -60,7 +60,8 @@ function output_hidden()
{
global $hidden_fields;
- echo implode('', $hidden_fields);
+ if (is_array($hidden_fields))
+ echo implode('', $hidden_fields);
$hidden_fields = array();
}
//---------------------------------------------------------------------------------
@@ -71,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');
@@ -131,8 +132,8 @@ function table_section($number=1, $width=false)
if ($number > 1)
{
echo "\n";
+ output_hidden();
$width = ($width ? "width='$width'" : "");
- //echo "
";
}
-function meta_forward($forward_to, $params="", $timeout=0)
+function meta_forward($forward_to, $params="", $timeout=0, $return=false)
{
global $Ajax;
echo "\n";
@@ -161,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;
}
//-----------------------------------------------------------------------------------
@@ -251,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;
@@ -260,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 "";
}
@@ -394,13 +405,14 @@ function div_end()
{
global $ajax_divs, $Ajax;
+ output_hidden();
if (count($ajax_divs))
{
$div = array_pop($ajax_divs);
if ($div[1] !== null)
$Ajax->addUpdate($div[1], $div[0], ob_get_flush());
- echo "";
}
+ echo "";
}
//-----------------------------------------------------------------------------
@@ -448,6 +460,7 @@ function tabbed_content_start($name, $tabs, $dft='') {
}
function tabbed_content_end() {
+ output_hidden();
echo ""; // content box (don't change to div_end() unless div_start() is used above)
div_end(); // tabs widget
}
@@ -490,13 +503,15 @@ function tab_visible($name, $tab)
*/
$popup_editors = array(
'customer' => array('/sales/manage/customers.php?debtor_no=',
- 113, _("Customers"), 900, 500),
+ 113, _("Customers"), 900, 550),
'branch' => array('/sales/manage/customer_branches.php?SelectedBranch=',
- 114, _("Branches"), 900, 700),
+ 114, _("Branches"), 900, 650),
'supplier' => array('/purchasing/manage/suppliers.php?supplier_id=',
- 113, _("Suppliers"), 900, 700),
+ 113, _("Suppliers"), 1150, 550),
'item' => array('/inventory/manage/items.php?stock_id=',
- 115, _("Items"), 800, 600)
+ 115, _("Items"), 1000, 500),
+ 'fa_item' => array('/inventory/manage/items.php?FixedAsset=1&stock_id=',
+ 115, _("Items"), 1000, 500)
);
/*
Bind editors for various selectors.
@@ -656,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;');
|