X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=c2dbae05a715440633230fafe231d2850d931d24;hb=df660a601cabb0afe7f3246884f16207b9a0c314;hp=515cf999322cd0adabcdc3169b49e0086c692b87;hpb=4507cd0059703d39f3e31230c9abe7494334ef4f;p=fa-stable.git diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc index 515cf999..c2dbae05 100644 --- a/includes/ui/ui_controls.inc +++ b/includes/ui/ui_controls.inc @@ -22,20 +22,24 @@ 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); } 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'"; @@ -64,18 +68,22 @@ function output_hidden() function end_form($breaks=0) { - global $Ajax, $hidden_fields; + 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('_confirmed'); } function check_csrf_token() @@ -126,7 +134,6 @@ function table_section($number=1, $width=false) echo "\n"; output_hidden(); $width = ($width ? "width='$width'" : ""); - //echo "\n"; // outer table echo "\n"; // outer table } echo "\n"; @@ -150,15 +157,15 @@ function vertical_space($params='') echo "\n"; - } + } echo "\n"; end_row(); end_table(); @@ -257,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 "$pars[0]"; } 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) @@ -461,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 @@ -469,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) ); /* @@ -611,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. */ @@ -620,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;'); @@ -640,5 +691,3 @@ function page_modified($status = true) } else add_js_source($js); } - -?> \ No newline at end of file
"; } -function meta_forward($forward_to, $params="") +function meta_forward($forward_to, $params="", $timeout=0, $return=false) { 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; $Ajax->redirect($forward_to.$params); - exit; + if (!$return) exit; } //----------------------------------------------------------------------------------- @@ -196,15 +203,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")."".($no_menu ? _("Close") : _("Back"))."