X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_controls.inc;h=748889d6b8ba55b6ba62420e4561832041239b2a;hb=a9e7141956ef0a60b58e9a627beee93cd35ed43c;hp=89decab4d1e928062794204f74ce9afe989e4caa;hpb=3b431d909abc53e4a4d712cbafa39ca556409d0e;p=fa-stable.git

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 89decab4..748889d6 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -22,7 +22,7 @@ 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);
 			}
@@ -53,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)
@@ -61,7 +72,7 @@ function end_form($breaks=0)
 
 	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');
@@ -69,7 +80,8 @@ function end_form($breaks=0)
 	hidden('_confirmed'); // helper for final form confirmation
 	hidden('_token', $_SESSION['csrf_token']);
 
-	echo implode('', $hidden_fields)."</form>\n";
+	output_hidden();
+	echo "</form>\n";
 	$Ajax->activate('_token');
 	$Ajax->activate('_confirmed');
 }
@@ -102,6 +114,7 @@ function start_table($class=false, $extra="", $padding='2', $spacing='0')
 function end_table($breaks=0)
 {
 	echo "</table></center>\n";
+	output_hidden();
 	if ($breaks)
 		br($breaks);
 }
@@ -119,8 +132,8 @@ function table_section($number=1, $width=false)
 	if ($number > 1)
 	{
 		echo "</table>\n";
+		output_hidden();
 		$width = ($width ? "width='$width'" : "");
-		//echo "</td><td class='tableseparator' $width>\n"; // outer table
 		echo "</td><td style='border-left:1px solid #cccccc;' $width>\n"; // outer table
 	}
 	echo "<table class='tablestyle_inner'>\n";
@@ -129,7 +142,10 @@ function table_section($number=1, $width=false)
 function end_outer_table($breaks=0, $close_table=true)
 {
 	if ($close_table)
+	{
 		echo "</table>\n";
+		output_hidden();
+	}
 	echo "</td></tr>\n";
 	end_table($breaks);
 }
@@ -141,7 +157,7 @@ function vertical_space($params='')
 	echo "</td></tr><tr><td valign=center $params>";
 }
 
-function meta_forward($forward_to, $params="", $timeout=0)
+function meta_forward($forward_to, $params="", $timeout=0, $return=false)
 {
     global $Ajax;
 	echo "<meta http-equiv='Refresh' content='".$timeout."; url=$forward_to?$params'>\n";
@@ -149,7 +165,7 @@ function meta_forward($forward_to, $params="", $timeout=0)
 	echo " " . _("If this does not happen") . " " . "<a href='$forward_to?$params'>" . _("click here") . "</a> " . _("to continue") . ".<br><br></center>\n";
 	if ($params !='') $params = '?'.$params;
 	$Ajax->redirect($forward_to.$params);
-	exit;
+	if (!$return) exit;
 }
 
 //-----------------------------------------------------------------------------------
@@ -239,7 +255,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 = "<a target='_blank' $class $id href='$path_to_root/$url' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
+		$preview_str = "<a target='_blank' $class $id href='$path_to_root/$url' onclick=\"javascript:openWindow(this.href,this.target); return false;\"$pars[1]>$pars[0]</a>";
 	}
 	else
 		$preview_str = $label;
@@ -248,8 +264,15 @@ 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 "<a href='$url' class='menu_option' id='$id' $pars[1]>$pars[0]</a>";
 }
 
@@ -382,13 +405,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 "</div>";
     }
+	echo "</div>";
 }
 
 //-----------------------------------------------------------------------------
@@ -436,6 +460,7 @@ function tabbed_content_start($name, $tabs, $dft='') {
 }
 
 function tabbed_content_end() {
+	output_hidden();
 	echo "</div>"; // content box (don't change to div_end() unless div_start() is used above)
 	div_end(); // tabs widget
 }
@@ -478,13 +503,15 @@ function tab_visible($name, $tab)
 */
 $popup_editors = array(
 	'customer' => array('/sales/manage/customers.php?debtor_no=', 
-		113,	_("Customers"), 900, 500),
+		113,	_("Customers"), 900, 550),
 	'branch' => array('/sales/manage/customer_branches.php?SelectedBranch=', 
-		114, _("Branches"), 900, 700),
+		114, _("Branches"), 900, 650),
 	'supplier' => array('/purchasing/manage/suppliers.php?supplier_id=', 
-		113, _("Suppliers"), 900, 700),
+		113, _("Suppliers"), 1150, 550),
 	'item' => array('/inventory/manage/items.php?stock_id=', 
-		115, _("Items"), 800, 600)
+		115, _("Items"), 1000, 500),
+	'fa_item' => array('/inventory/manage/items.php?FixedAsset=1&stock_id=', 
+		115, _("Items"), 1000, 500)
 );
 /*
 	Bind editors for various selectors.
@@ -644,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;');