X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=311180c6e30b710936f4964c1dd4e269ee0e8ad8;hb=fa43a9c974d05b77517a0d8e3e510ef4a088632e;hp=961798155c66bd0bbd8655fdf7fed6712e880c8c;hpb=cb7da60bef5f27507540f827e4a03ede8d08f684;p=fa-stable.git

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 96179815..311180c6 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,7 +58,9 @@ function start_form($multi=false, $dummy=false, $action="", $name="")
 
 function end_form($breaks=0)
 {
-	global $Ajax;
+	global $Ajax, $form_nested;
+
+	if ($form_nested-- > 0) return;
 
 	$_SESSION['csrf_token'] = hash('sha256', uniqid(mt_rand(), true));
 	if ($breaks)
@@ -62,7 +69,7 @@ function end_form($breaks=0)
 	hidden('_modified', get_post('_modified', 0));
 	hidden('_token', $_SESSION['csrf_token']);
 	echo "</form>\n";
-	$Ajax->activate('token');
+	$Ajax->activate('_token');
 }
 
 function check_csrf_token()
@@ -472,7 +479,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;