X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=52f417bb486f92f253faa84594079cda1a71759b;hb=f5a86be183c6023b189199c69ac409df1b7116df;hp=89decab4d1e928062794204f74ce9afe989e4caa;hpb=3b431d909abc53e4a4d712cbafa39ca556409d0e;p=fa-stable.git
diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 89decab4..52f417bb 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -53,6 +53,17 @@ function start_form($multi=false, $dummy=false, $action="", $name="")
}
+/*
+ Flush hidden fields buffer.
+*/
+function output_hidden()
+{
+ global $hidden_fields;
+
+ if (is_array($hidden_fields))
+ echo implode('', $hidden_fields);
+ $hidden_fields = array();
+}
//---------------------------------------------------------------------------------
function end_form($breaks=0)
@@ -61,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');
@@ -69,7 +80,8 @@ function end_form($breaks=0)
hidden('_confirmed'); // helper for final form confirmation
hidden('_token', $_SESSION['csrf_token']);
- echo implode('', $hidden_fields)."\n";
+ output_hidden();
+ echo "\n";
$Ajax->activate('_token');
$Ajax->activate('_confirmed');
}
@@ -102,6 +114,7 @@ function start_table($class=false, $extra="", $padding='2', $spacing='0')
function end_table($breaks=0)
{
echo "\n";
+ output_hidden();
if ($breaks)
br($breaks);
}
@@ -119,8 +132,8 @@ function table_section($number=1, $width=false)
if ($number > 1)
{
echo "\n";
+ output_hidden();
$width = ($width ? "width='$width'" : "");
- //echo "
\n"; // outer table
echo " | \n"; // outer table
}
echo "\n";
@@ -129,7 +142,10 @@ function table_section($number=1, $width=false)
function end_outer_table($breaks=0, $close_table=true)
{
if ($close_table)
+ {
echo " \n";
+ output_hidden();
+ }
echo " | \n";
end_table($breaks);
}
@@ -141,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";
@@ -149,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;
}
//-----------------------------------------------------------------------------------
@@ -239,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;
@@ -248,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 "";
}
@@ -382,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 "";
}
//-----------------------------------------------------------------------------
@@ -436,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
}
@@ -478,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)
);
/*
@@ -644,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;');
|