X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=515cf999322cd0adabcdc3169b49e0086c692b87;hb=a756adaebf1b5f9bd6265e6f2388a7f2f180f585;hp=d6533f901722f5999ef7d81386932fea61d954df;hpb=46c5f7a65a7659a44ae8254c63152074363d3987;p=fa-stable.git diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc index d6533f90..515cf999 100644 --- a/includes/ui/ui_controls.inc +++ b/includes/ui/ui_controls.inc @@ -49,15 +49,44 @@ 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, $hidden_fields; + + $_SESSION['csrf_token'] = hash('sha256', uniqid(mt_rand(), true)); if ($breaks) br($breaks); - echo "\n"; - echo "\n"; + hidden('_focus'); + hidden('_modified', get_post('_modified', 0)); + hidden('_token', $_SESSION['csrf_token']); + + output_hidden(); echo "\n"; + $Ajax->activate('_token'); +} + +function check_csrf_token() +{ + if ($_SESSION['csrf_token'] != @$_POST['_token']) + { + display_error(_("Request from outside of this page is forbidden.")); + error_log(_("CSRF attack detected from: ").@$_SERVER['HTTP_HOST'].' ('.@$_SERVER['HTTP_REFERER'].')'); + return false; + } + return true; } function start_table($class=false, $extra="", $padding='2', $spacing='0') @@ -71,12 +100,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); } @@ -94,7 +124,8 @@ function table_section($number=1, $width=false) if ($number > 1) { echo "\n"; - $width = ($width ? "width=$width" : ""); + output_hidden(); + $width = ($width ? "width='$width'" : ""); //echo "\n"; // outer table echo "\n"; // outer table } @@ -104,7 +135,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); } @@ -150,7 +184,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; @@ -161,17 +195,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) @@ -290,18 +324,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) @@ -357,13 +393,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 ""; } //----------------------------------------------------------------------------- @@ -411,10 +448,20 @@ 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 } +function tab_changed($name) +{ + $to = find_submit("{$name}_", false); + if (!$to) return null; + + return array('from' => $from = get_post("_{$name}_sel"), + 'to' => $to); +} + /* Table editor interfaces. Key is editor type 0 => url of editor page 1 => hotkey code @@ -422,13 +469,13 @@ function tabbed_content_end() { */ $popup_editors = array( 'customer' => array('/sales/manage/customers.php?debtor_no=', - 113, _("Customers")), + 113, _("Customers"), 900, 500), 'branch' => array('/sales/manage/customer_branches.php?SelectedBranch=', - 114, _("Branches")), + 114, _("Branches"), 900, 700), 'supplier' => array('/purchasing/manage/suppliers.php?supplier_id=', - 113, _("Suppliers")), + 113, _("Suppliers"), 900, 700), 'item' => array('/inventory/manage/items.php?stock_id=', - 115, _("Items")) + 115, _("Items"), 800, 600) ); /* Bind editors for various selectors. @@ -443,7 +490,8 @@ function set_editor($type, $input, $caller=true) $key = $caller===true ? $popup_editors[$type][1] : $caller; - $Editors[$key] = array( $path_to_root . $popup_editors[$type][0], $input); + $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];