X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_controls.inc;h=4b6d11cd8ef2891557f6e1663b814697d1cdd455;hb=9a1b3abd5371ad7f6315db1d56f8356587444314;hp=616d99b65502f2c130d3dba692b114b5107ab82f;hpb=17b390efcf904072b02ec866b2a427490471a260;p=fa-stable.git
diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 616d99b6..4b6d11cd 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -28,8 +28,8 @@ 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;
@@ -41,7 +41,6 @@ function start_form($multi=false, $dummy=false, $action="", $name="")
if (++$form_nested) return;
-
if ($name != "")
$name = "name='$name'";
if ($action == "")
@@ -54,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)
@@ -67,10 +77,13 @@ function end_form($breaks=0)
br($breaks);
hidden('_focus');
hidden('_modified', get_post('_modified', 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');
}
function check_csrf_token()
@@ -101,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);
}
@@ -118,6 +132,7 @@ 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
@@ -128,7 +143,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);
}
@@ -186,15 +204,15 @@ function hyperlink_back($center=true, $no_menu=true, $type_no=0, $trans_no=0, $f
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;
- }
+ echo $attach;
+ }
$width = ($id != 0 ? "30%" : "20%");
start_table(false, "width='$width'");
start_row();
if ($no_menu)
{
echo ""._("Print")." | \n";
- }
+ }
echo "".($no_menu ? _("Close") : _("Back"))." | \n";
end_row();
end_table();
@@ -238,7 +256,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;
@@ -247,16 +265,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)
@@ -383,13 +406,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 "";
}
//-----------------------------------------------------------------------------
@@ -437,6 +461,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
}
@@ -449,6 +474,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
@@ -480,7 +527,7 @@ function set_editor($type, $input, $caller=true)
$Editors[$key] = array( $path_to_root . $popup_editors[$type][0], $input,
$popup_editors[$type][3], $popup_editors[$type][4]);
-
+
$help = 'F' . ($key - 111) . ' - ';
$help .= $popup_editors[$type][2];
$Pagehelp[] = $help;
@@ -599,7 +646,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.
*/
@@ -628,4 +690,3 @@ function page_modified($status = true)
} else
add_js_source($js);
}
-