X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=e184277f6ce0d06ff01f3855c21ea43f79b067af;hb=fbf51ab0febfd0885620abcab8738339d156ff45;hp=a6fd2ef6f1e4d36757940b2227334a294b5edd6c;hpb=179ace0dcf68e4b8a51c199127627daac252a5d5;p=fa-stable.git
diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index a6fd2ef6..e184277f 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -32,10 +32,15 @@ function get_post($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'";
@@ -53,10 +58,29 @@ function start_form($multi=false, $dummy=false, $action="", $name="")
function end_form($breaks=0)
{
+ global $Ajax, $form_nested;
+
+ if ($form_nested-- > 0) return;
+
+ $_SESSION['csrf_token'] = hash('sha256', uniqid(mt_rand(), true));
if ($breaks)
br($breaks);
- echo "\n";
+ hidden('_focus');
+ hidden('_modified', get_post('_modified', 0));
+ hidden('_token', $_SESSION['csrf_token']);
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')
@@ -149,7 +173,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;
@@ -160,17 +184,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_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)
@@ -236,12 +260,12 @@ function submenu_option($title, $url, $id=null)
function submenu_view($title, $type, $number, $id=null)
{
- display_note(get_trans_view_str($type, $number, $title, false, 'menu_option', $id), 0, 1);
+ display_note(get_trans_view_str($type, $number, $title, false, 'viewlink', $id), 0, 1);
}
function submenu_print($title, $type, $number, $id=null, $email=0, $extra=0)
{
- display_note(print_document_link($number, $title, true, $type, false, 'menu_option', $id, $email, $extra), 0, 1);
+ display_note(print_document_link($number, $title, true, $type, false, 'printlink', $id, $email, $extra), 0, 1);
}
//-----------------------------------------------------------------------------------
@@ -289,18 +313,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)
@@ -414,6 +440,15 @@ function tabbed_content_end() {
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
@@ -421,13 +456,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.
@@ -442,8 +477,9 @@ 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];
$Pagehelp[] = $help;
@@ -561,6 +597,35 @@ function confirm_dialog($submit, $msg) {
return 0;
} else
return get_post('DialogConfirm', 0);
-}
+}
+
+/*
+ Block menu/shortcut links during transaction procesing.
+*/
+function page_processing($msg = false)
+{
+ global $Ajax;
+
+ if ($msg === true)
+ $msg = _('Entered data has not been saved yet.\nDo you want to abandon changes?');
+
+ $js = "_validate._processing=" . (
+ $msg ? '\''.strtr($msg, array("\n"=>'\\n')) . '\';' : 'null;');
+ if (in_ajax()) {
+ $Ajax->addScript(true, $js);
+ } else
+ add_js_source($js);
+}
+
+function page_modified($status = true)
+{
+ global $Ajax;
+
+ $js = "_validate._modified=" . ($status ? 1:0).';';
+ if (in_ajax()) {
+ $Ajax->addScript(true, $js);
+ } else
+ add_js_source($js);
+}
?>
\ No newline at end of file