X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=includes%2Fui%2Fui_controls.inc;h=7934730c0629dfbb97f0d79739fe4cf4f52b9b3f;hb=303eb17e9cdd9702eee9fdfcaee51e654a1da541;hp=7b518e57108cb567944bd59937a8809a52c18001;hpb=f018643dc04ce130f1729e16a65458af443308a0;p=fa-stable.git

diff --git a/includes/ui/ui_controls.inc b/includes/ui/ui_controls.inc
index 7b518e57..7934730c 100644
--- a/includes/ui/ui_controls.inc
+++ b/includes/ui/ui_controls.inc
@@ -9,9 +9,27 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
     See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
+/*
+	Retrieve value of POST variable(s).
+	For $name passed as array $dflt is not used, 
+	default values can be passed as values with non-numeric keys instead.
+	If some field have user formatted numeric value, pass float default value to
+	convert automatically to POSIX.
+*/
 function get_post($name, $dflt='')
 {
-	return ((!isset($_POST[$name]) || $_POST[$name] === '') ? $dflt : $_POST[$name]);
+	if (is_array($name)) {
+		$ret = array();
+		foreach($name as $key => $dflt)
+			if (!is_numeric($key)) {
+				$ret[$key] = is_float($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]);
 }
 //---------------------------------------------------------------------------------
 
@@ -70,9 +88,10 @@ function table_section($number=1, $width=false)
 	{
 		echo "</table>\n";
 		$width = ($width ? "width=$width" : "");
-		echo "</td><td class='tableseparator' $width>\n"; // outer table
+		//echo "</td><td class='tableseparator' $width>\n"; // outer table
+		echo "</td><td style='border-left:1px solid #cccccc;' $width>\n"; // outer table
 	}
-	echo "<table>\n";
+	echo "<table class='tablestyle_inner'>\n";
 }	
 
 function end_outer_table($breaks=0, $close_table=true)
@@ -124,11 +143,17 @@ function access_string($label, $clean=false)
 	return $clean ? $label : array($label, $access);
 }
 
-function hyperlink_back($center=true)
+function hyperlink_back($center=true, $no_menu=true)
 {
 	if ($center)
 		echo "<center>";
-	echo "<p><a href='javascript:goBack();'>"._("Back")."</a></p>\n";
+	start_table("width=20%");
+	start_row();
+	if ($no_menu)
+		echo "<td align=center><a href='javascript:window.print();'>"._("Print")."</a></td>\n";
+	echo "<td align=center><a href='javascript:goBack();'>".($no_menu ? _("Close") : _("Back"))."</a></td>\n";
+	end_row();
+	end_table();
 	if ($center)
 		echo "</center>";
 	echo "<br>";
@@ -142,7 +167,7 @@ function hyperlink_no_params($target, $label, $center=true)
 		$target = $_SERVER['PHP_SELF'];
 	if ($center)
 		echo "<br><center>";
-	echo "<a href='$target' $id='$id' $pars[1]>$pars[0]</a>\n";
+	echo "<a href='$target' id='$id' $pars[1]>$pars[0]</a>\n";
 	if ($center)
 		echo "</center>";
 }
@@ -196,9 +221,9 @@ function submenu_view($title, $type, $number, $id=null)
 	display_note(get_trans_view_str($type, $number, $title, false, 'menu_option', $id), 0, 1);
 }
 
-function submenu_print($title, $type, $number, $id=null)
+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), 0, 1);
+	display_note(print_document_link($number, $title, true, $type, false, 'menu_option', $id, $email, $extra), 0, 1);
 }
 //-----------------------------------------------------------------------------------
 
@@ -232,7 +257,7 @@ function hyperlink_params_separate($target, $label, $params, $center=false)
 	$pars = access_string($label);
 	if ($center)
 		echo "<br><center>";
-	echo "<a target='_blank' $id='$id' href='$target?$params' $pars[1]>$pars[0]</a>\n";
+	echo "<a target='_blank' id='$id' href='$target?$params' $pars[1]>$pars[0]</a>\n";
 	if ($center)
 		echo "</center>";
 }
@@ -322,40 +347,39 @@ function div_end()
     }
 }
 
+/* Table editor interfaces. Key is editor type
+	0 => url of editor page
+	1 => hotkey code
+	2 => context help
+*/
+$popup_editors = array(
+	'customer' => array('/sales/manage/customers.php?debtor_no=', 
+		113,	_("Customers")),
+	'branch' => array('/sales/manage/customer_branches.php?SelectedBranch=', 
+		114, _("Branches")),
+	'supplier' => array('/purchasing/manage/suppliers.php?supplier_id=', 
+		113, _("Suppliers")),
+	'item' => array('/inventory/manage/items.php?stock_id=', 
+		115, _("Items"))
+);
 /*
 	Bind editors for various selectors.
 	$type - type of editor
-	$input - array org_input => editor_input
-	$focus - focus after selection
+	$input - name of related input field
+	$caller - optional function key code (available values F1-F12: 112-123,
+		true: default)
 */
-function set_editor($type, $input, $focus=null) 
+function set_editor($type, $input, $caller=true)
 {
-	global $path_to_root, $Editors;
-	// table of table editor interfaces.
-	// key is editor type, values contain:
-	// 0 => url of editor page
-	// 1 => array of names of parameters returned back from editor interface
-	// 2 => hotkey code
+	global $path_to_root, $Editors, $popup_editors, $Pagehelp;
 
-	if($focus === null) {
-		$focus = $caller;
-	}
-	$urls = array(
-		'customer' => array('/sales/manage/customers.php?debtor_no=', 
-			113,	_("F2 - Customers")),
-		'branch' => array('/sales/manage/customer_branches.php?SelectedBranch=', 
-			114, _("F3 - Branches")),
-		'supplier' => array('/purchasing/manage/suppliers.php?supplier_id=', 
-			113, _("F2 - Suppliers")),
-		'item' => array('/inventory/manage/items.php?stock_id=', 
-			115, _("F4 - Items"))
-	);
-	$back = array();
-	$caller = $urls[$type][1];
-	$Editors[$caller] = array( $path_to_root . $urls[$type][0], $input, $focus);
-
-// FIX status comments
+	$key = $caller===true ? $popup_editors[$type][1] : $caller;
 
+	$Editors[$key] = array( $path_to_root . $popup_editors[$type][0], $input);
+	
+	$help = 'F' . ($key - 111) . ' - ';
+	$help .= $popup_editors[$type][2];
+	$Pagehelp[] = $help;
 }
 //------------------------------------------------------------------------------
 // Procedures below are now obsolete. Preserved for eventual future use.
@@ -461,4 +485,15 @@ function editor_return($vars, $restore_fun='') {
 	}
 }
 
+function confirm_dialog($submit, $msg) {
+	if (find_post($submit)) {
+		display_warning($msg);
+		br();
+		submit_center_first('DialogConfirm', _("Proceed"), '', true);
+		submit_center_last('DialogCancel', _("Cancel"), '', 'cancel');
+		return 0;
+	} else
+		return get_post('DialogConfirm', 0);
+}	
+
 ?>
\ No newline at end of file