Added a routine to sanitize the CGI variables. Needed for some CSV exports routines.

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1978 4979c152-3d1c-0410-bac9-87ea11338e46

3 files changed, 23 insertions, 22 deletions

diff --git a/UI/payments/check_job.html b/UI/payments/check_job.html
index 18f786cc..b59caeab 100644
--- a/UI/payments/check_job.html
+++ b/UI/payments/check_job.html
@@ -6,7 +6,7 @@
 		]
 		titlebar = text('Checking Job') # '
 		refresh = {
-			url = "payment.pl?job_id=${job_id}&account_class=${account_class}"
+			url = "payment.pl?job_id=${job_id}&account_class=${account_class}&action=check_job"
 			delay = 20
 		}
 ?>
@@ -18,19 +18,17 @@
 	ELSE;
 		text('Status: Complete');
 	END ?></div>
-   <?lsmb IF job.completed ?>
+   <?lsmb IF ! job.completed ?>
    <div class="info">
 	<?lsmb IF job.success;
 		text('Completed Successfully');
 	ELSE;
 		text('Job Failed');
 	END ?></div>
-	<?lsmb IF ! job.success ?>
   <div class="info">
 	<?lsmb text('Error:') ?><br />
 	<?lsmb job.error_condition ?>
   </div>
-	<?lsmb END # if ! job.success ?>
   <?lsmb END # if job.completed ?>
 </body>
 </html>
diff --git a/UI/payments/payments_detail.html b/UI/payments/payments_detail.html
index f926c041..0e931ddc 100644
--- a/UI/payments/payments_detail.html
+++ b/UI/payments/payments_detail.html
@@ -137,14 +137,18 @@
 	<?lsmb END # foreach b ?></span>
     </div>
     <?lsmb END # if business ?>
-    <div class="input" id="cash_account_div">
-	<select name="cash_accno" id="cash_account">
-	<?lsmb FOREACH a = cash_accounts ?>
-	<option value="<?lsmb a.accno ?>">
-		<?lsmb a.accno ?>--<?lsmb a.description ?>
-	</option>
-	<?lsmb END # foreach a ?>
-	</select>
+    <div class="info" id="cash_account_div">
+	<?lsmb INCLUDE input element_data = {
+		type = "hidden"
+		name = "cash_accno"
+		value = cash_accno
+	} ?>
+	<label><?lsmb text('Pay From') ?></label>
+	<?lsmb FOR c = cash_accounts -?>
+		<?lsmb IF c.accno == cash_accno -?>
+		<?lsmb c.accno ?>--<?lsmb c.description ?>
+		<?lsmb END # if c.accno -?>
+	<?lsmb END # for c -?>
     </div>
     <table id="payments_table">
     <tr class="listheading">
@@ -270,6 +274,12 @@
 	class = "submit"
 	name = 'action'
 	} ?>
+    <?lsmb INCLUDE button element_data = {
+	text = text('Add Payment Fees') # '
+	value = 'paycom_add_fees'
+	class = 'submit'
+	name = 'action'
+	} ?>
   </form>
  </body>
 </html>
diff --git a/UI/payments/payments_filter.html b/UI/payments/payments_filter.html
index 6ae341dd..c92a57c2 100644
--- a/UI/payments/payments_filter.html
+++ b/UI/payments/payments_filter.html
@@ -105,22 +105,15 @@
 </select>
 </div>
 </div>
-<div class="listtop">
-	<!-- <?lsmb INCLUDE select element_data = {
+<div class="listtop"><?lsmb text('Payment Processing') ?></div>
+	<?lsmb INCLUDE select element_data = {
 		name = "cash_accno"
 		default_values = [cash_accno]
 		options = cash_accounts
 		value_attr = "accno"
 		text_attr = "text"
 		label = text('Pay From:') # '
-	} ?> -->
-	<select name="cash_accno" id="cash_account">
-	<?lsmb FOREACH a = cash_accounts ?>
-	<option value="<?lsmb a.accno ?>">
-		<?lsmb a.accno ?>--<?lsmb a.description ?>
-	</option>
-	<?lsmb END # foreach a ?>
-	</select>
+	} ?> 
 <div class = "input">
 <?lsmb INCLUDE input element_data = {
 	type = "text"