From afe3d9d59dae1659d2af3c4c75746073795c13b6 Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Mon, 19 Oct 2009 06:38:23 +0000
Subject: [PATCH] Missing closing tag in button helper [0000176]

---
 CHANGELOG.txt            | 6 ++++--
 includes/ui/ui_input.inc | 8 ++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index a78c2d1..7f6e1c9 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,9 +19,11 @@ Legend:
 ! -> Note
 $ -> Affected files
 
-18-Oct-2009 Joe Hunt
-# Fixed double escaping gl account name on add/update.
+18-Oct-2009 Janusz Dobrowolski
+# [0000175] Fixed double escaping gl account name on add/update.
 $ /gl/includes/db/gl_db_accounts.inc
+# [0000176] Missing closing tag in button helper 
+$ /includes/ui/ui_input.inc
 
 ------------------------------- Release 2.1.7 ----------------------------------
 ! Seccurity release 2.1.7. We strongly encourage to update to this release.
diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index f5a127c..5a21af3 100644
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -65,7 +65,11 @@ function simple_page_mode($numeric_id = true)
 			if (strpos($p, $m) === 0) {
 //				$selected_id = strtr(substr($p, strlen($m)), array('%2E'=>'.'));
 				unset($_POST['_focus']); // focus on first form entry
-				$selected_id = quoted_printable_decode(substr($p, strlen($m)));
+
+//				$selected_id = strtr(html_entity_decode(substr($p, strlen($m)), ENT_QUOTES), 
+				$selected_id = strtr(substr($p, strlen($m)), 
+					array('=2E'=>'.','=20'=>' ','=3D'=>'=','=5B'=>'['));
+//				$selected_id = quoted_printable_decode(substr($p, strlen($m)));
 				$Ajax->activate('_page_body');
 				$Mode = $m;
 				return;
@@ -232,7 +236,7 @@ function button($name, $value, $title=false, $icon=false)
 			$icon = ICON_DELETE;
 		return "<button type='submit' class='editbutton' name='".
 			htmlentities(strtr($name, array('.'=>'=2E',' '=>'=20','='=>'=3D','['=>'=5B'))).
-			"' value='1'" . ($title ? " title='$title'":" title='$value'")." />".set_icon($icon)."\n";
+			"' value='1'" . ($title ? " title='$title'":" title='$value'")." />".set_icon($icon)."</button>\n";
 	}
 	else
 		return "<input type='submit' class='editbutton' name='"
-- 
2.30.2