X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=9dc24a4f4cb550d67bf1969fc51bbc78f2197d5e;hb=4acd1f93d4d8b7f86a6ca6560c22b387ec66e82a;hp=8687b336bc7e5bdc327ba9f6ccac01ac3fe0d70a;hpb=9f2275ba8099ba8c9d9b5b45231c9844d6dedaf2;p=fa-stable.git
diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 8687b336..9dc24a4f 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -28,14 +28,18 @@ function get_post($name, $dflt='')
}
return $ret;
} else
- return is_float($dflt) ? input_num($name, $dflt) :
- ((!isset($_POST[$name]) || $_POST[$name] === '') ? $dflt : $_POST[$name]);
+ return is_float($dflt) ? input_num($name, $dflt) :
+ ((!isset($_POST[$name]) /*|| $_POST[$name] === ''*/) ? $dflt : $_POST[$name]);
}
//---------------------------------------------------------------------------------
+$form_nested = -1;
function start_form($multi=false, $dummy=false, $action="", $name="")
{
// $dummy - leaved for compatibility with 2.0 API
+ global $form_nested;
+
+ if (++$form_nested) return;
if ($name != "")
$name = "name='$name'";
@@ -49,20 +53,37 @@ 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)
{
- global $Ajax;
+ global $Ajax, $form_nested, $hidden_fields;
+
+ 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');
hidden('_modified', get_post('_modified', 0));
+ hidden('_confirmed'); // helper for final form confirmation
hidden('_token', $_SESSION['csrf_token']);
+
+ output_hidden();
echo "\n";
- $Ajax->activate('token');
+ $Ajax->activate('_token');
+ $Ajax->activate('_confirmed');
}
function check_csrf_token()
@@ -87,12 +108,13 @@ function start_table($class=false, $extra="", $padding='2', $spacing='0')
echo " class='tablestyle'";
if ($extra != "")
echo " $extra";
- echo " cellpadding=$padding cellspacing=$spacing>\n";
+ echo " cellpadding='$padding' cellspacing='$spacing'>\n";
}
function end_table($breaks=0)
{
echo "\n";
+ output_hidden();
if ($breaks)
br($breaks);
}
@@ -110,8 +132,8 @@ function table_section($number=1, $width=false)
if ($number > 1)
{
echo "\n";
- $width = ($width ? "width=$width" : "");
- //echo "
\n"; // outer table
+ output_hidden();
+ $width = ($width ? "width='$width'" : "");
echo " | \n"; // outer table
}
echo "\n";
@@ -120,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);
}
@@ -132,10 +157,10 @@ function vertical_space($params='')
echo "";
}
-function meta_forward($forward_to, $params="")
+function meta_forward($forward_to, $params="", $timeout=0)
{
global $Ajax;
- echo "\n";
+ echo "\n";
echo " " . _("You should automatically be forwarded.");
echo " " . _("If this does not happen") . " " . "" . _("click here") . " " . _("to continue") . ".
\n";
if ($params !='') $params = '?'.$params;
@@ -166,7 +191,7 @@ function access_string($label, $clean=false)
return $clean ? $label : array($label, $access);
}
-function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0)
+function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0, $final=false)
{
global $path_to_root;
@@ -177,17 +202,17 @@ function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0)
{
include_once($path_to_root."/admin/db/attachments_db.inc");
$id = has_attachment($type_no, $trans_no);
+ $attach = get_attachment_string($type_no, $trans_no);
+ echo $attach;
}
$width = ($id != 0 ? "30%" : "20%");
- start_table(false, "width=$width");
+ start_table(false, "width='$width'");
start_row();
if ($no_menu)
{
- if ($id != 0)
- echo " | "._("View Attachment")." | \n";
echo ""._("Print")." | \n";
}
- echo "".($no_menu ? _("Close") : _("Back"))." | \n";
+ echo "".($no_menu ? _("Close") : _("Back"))." | \n";
end_row();
end_table();
if ($center)
@@ -239,16 +264,21 @@ 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 "";
}
function submenu_option($title, $url, $id=null)
{
- global $path_to_root;
- display_note(menu_link($path_to_root . $url, $title, $id), 0, 1);
+ display_note( menu_link($url, $title, $id), 0, 1);
}
function submenu_view($title, $type, $number, $id=null)
@@ -306,18 +336,20 @@ function hyperlink_params_separate_td($target, $label, $params)
//--------------------------------------------------------------------------------------------------
-function alt_table_row_color(&$k)
+function alt_table_row_color(&$k, $extra_class=null)
{
+ $classes = $extra_class ? array($extra_class) : array();
if ($k == 1)
{
- echo "
\n";
+ array_push($classes, 'oddrow');
$k = 0;
}
else
{
- echo "
\n";
+ array_push($classes, 'evenrow');
$k++;
}
+ echo "
\n";
}
function table_section_title($msg, $colspan=2)
@@ -373,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 "";
}
//-----------------------------------------------------------------------------
@@ -427,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
}
@@ -439,6 +473,28 @@ function tab_changed($name)
return array('from' => $from = get_post("_{$name}_sel"),
'to' => $to);
}
+/*
+ Check whether tab has been just switched on
+*/
+function tab_opened($name, $tab)
+{
+ return (get_post('_'.$name.'_sel') != $tab) && (find_submit($name.'_', false) == $tab);
+}
+/*
+ Check whether tab has been just switched off
+*/
+function tab_closed($name, $tab)
+{
+ return (get_post('_'.$name.'_sel') == $tab) && (find_submit($name.'_', false) != $tab);
+}
+/*
+ Check whether tab is visible on current page
+*/
+function tab_visible($name, $tab)
+{
+ $new = find_submit($name.'_', false);
+ return (get_post('_'.$name.'_sel') == $tab && !$new) || $new==$tab;
+}
/* Table editor interfaces. Key is editor type
0 => url of editor page
@@ -447,12 +503,14 @@ function tab_changed($name)
*/
$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)
);
/*
@@ -589,7 +647,22 @@ function confirm_dialog($submit, $msg) {
} else
return get_post('DialogConfirm', 0);
}
+/*
+ Confirm dialog to be used optionally in final form checking routine.
+ Displays warning conditionally unless it was displayed
+*/
+function display_confirmation($msg)
+{
+ global $Ajax;
+ if (!get_post('_confirmed'))
+ {
+ $_POST['_confirmed'] = 1;
+ display_warning($msg);
+ return false;
+ } else
+ return true;
+}
/*
Block menu/shortcut links during transaction procesing.
*/
@@ -598,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;');
@@ -618,5 +691,3 @@ function page_modified($status = true)
} else
add_js_source($js);
}
-
-?>
\ No newline at end of file