X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fui_input.inc;h=588f867c31ddd381387a3c6a90478d6457a6cc24;hb=4e31fd74b18825d8ac35f4a38b96ef33a08c2025;hp=08a4035b518fa3d06a8ab7a0feff03bc20cd22a0;hpb=ffd442f32ffafa3a6a9264727eab25030470f136;p=fa-stable.git

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 08a4035b..588f867c 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -1,4 +1,14 @@
 <?php
+/**********************************************************************
+    Copyright (C) FrontAccounting, LLC.
+	Released under the terms of the GNU Affero General Public License,
+	AGPL, as published by the Free Software Foundation, either version 
+	3 of the License, or (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+***********************************************************************/
 
 function get_post($name, $dflt='')
 {
@@ -71,7 +81,7 @@ function simple_page_mode($numeric_id = true)
 //
 function input_num($postname=null, $dflt=null)
 {
-	if (!isset($_POST[$postname]))
+	if (!isset($_POST[$postname]) || $_POST[$postname] == "")
 	  	return $dflt;
 
     return user_numeric($_POST[$postname]);
@@ -107,7 +117,7 @@ function submit($name, $value, $echo=true, $title=false, $async=false, $icon=fal
 	    ." name=\"$name\"  id=\"$name\" value=\"$value\""
 	    .($title ? " title='$title'" : '')
 	    ."><span>$value</span>"
-		.($icon ? "<img src='$path_to_root/themes/default/images/$icon'>" : '')
+		.($icon ? "<img src='$path_to_root/themes/".user_theme()."/images/$icon'>" : '')
 		."</button>\n";
 	if ($echo)
 		echo $submit_str;
@@ -193,23 +203,49 @@ function submit_return($name, $value, $title=false, $async=false)
 		submit($name, $value, true, $title, $async);
 	}
 }
-//---------------------------------------------------------------------------------
+//-----------------------------------------------------------------------------------
 
-function button($name, $value, $onclick, $title=false)
+function set_icon($icon, $title=false)
 {
-  	default_focus($name);
-  	echo "<input type=\"button\" class=\"inputsubmit\" name=\"$name\" value=\"$value\" onclick=\"$onclick\""
-	    .($title ? " title='$title'" : '')
-	    ." />\n";
+	global $path_to_root;
+	return "<img src='$path_to_root/themes/".user_theme()."/images/$icon' width='14' height='14' border='0'".($title ? " title='$title'" : "")." />\n";	
+}
+
+function button($name, $value, $title=false, $icon=false)
+{
+	// php silently changes dots,spaces,'[' and characters 128-159
+	// to underscore in POST names, to maintain compatibility with register_globals
+	if (user_graphic_links() && $icon)
+	{
+		if ($value == _("Delete")) // Helper during implementation
+			$icon = ICON_DELETE;
+		return "<button type='submit' class='editbutton' name='".
+			htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B'))).
+			"' value=''" . ($title ? " title='$title'":" title='$value'")." />".set_icon($icon)."\n";
+	}
+	else
+		return "<input type='submit' class='editbutton' name='"
+			.htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B')))
+			."' value='$value'"
+			.($title ? " title='$title'":'')." />\n";
 }
 
-function button_cell($name, $value, $onclick, $title=false)
+function button_cell($name, $value, $title=false, $icon=false)
 {
 	echo "<td>";
-	button($name, $value, $onclick, $title);
-	echo "</td>\n";
+	echo button($name, $value, $title, $icon);
+	echo "</td>";
 }
 
+function delete_button_cell($name, $value, $title=false)
+{
+	button_cell($name, $value, $title, ICON_DELETE);
+}
+
+function edit_button_cell($name, $value, $title=false)
+{
+	button_cell($name, $value, $title, ICON_EDIT);
+}
 //-----------------------------------------------------------------------------------
 
 function check_value($name)
@@ -276,6 +312,11 @@ function label_cell($label, $params="", $id=null)
 	return $label;
 }
 
+function email_cell($label, $params="", $id=null)
+{
+	label_cell("<a href='mailto:$label'>$label</a>", $params, $id);
+}
+
 function amount_cell($label, $bold=false, $params="", $id=null)
 {
 	if ($bold)
@@ -294,7 +335,7 @@ function percent_cell($label, $bold=false, $id=null)
 // 2008-06-15. Changed
 function qty_cell($label, $bold=false, $dec=null, $id=null)
 {
-	if ($dec == null)
+	if (!isset($dec))
 		$dec = get_qty_dec();
 	if ($bold)
 		label_cell("<b>".number_format2($label, $dec)."</b>", "nowrap align=right", $id);
@@ -392,6 +433,17 @@ function text_row_ex($label, $name, $size, $max=null, $title=null, $value=null,
 	echo "</tr>\n";
 }
 
+//-----------------------------------------------------------------------------------
+function email_row($label, $name, $value, $size, $max, $title=null, $params="", $post_label="")
+{
+	text_row("<a href='Mailto:".$_POST[$name]."'>$label</a>", $name, $value, $size, $max, $title, $params, $post_label);
+}
+
+function email_row_ex($label, $name, $size, $max=null, $title=null, $value=null, $params=null, $post_label=null)
+{
+	text_row_ex("<a href='Mailto:".$_POST[$name]."'>$label</a>", $name, $size, $max, $title, $value, $params, $post_label);
+}
+
 //-----------------------------------------------------------------------------------
 
 function date_cells($label, $name, $title = null, $init=null, $inc_days=0, 
@@ -484,13 +536,17 @@ function amount_cells_ex($label, $name, $size, $max=null, $init=null, $params=nu
 	if (!isset($max))
 		$max = $size;
 
-	echo "<td>";
+	if ($label != null)
+		echo "<td>";
+	else
+		echo "<td align='right'>";
 
 	echo "<input class='amount' type=\"text\" name=\"$name\" size=\"$size\" maxlength=\"$max\" dec=\"$dec\" value=\"" . $_POST[$name]. "\">";
 
-	if ($post_label)
-		echo " " . $post_label;
-
+	if ($post_label) {
+		echo "<span id='_{$name}_label'> $post_label</span>";
+		$Ajax->addUpdate($name, '_'.$name.'_label', $post_label);
+	}
 	echo "</td>\n";
 	$Ajax->addUpdate($name, $name, $_POST[$name]);
 	$Ajax->addAssign($name, $name, 'dec', $dec);