Index: openacs-4/packages/ecommerce/www/admin/audit-table.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/admin/audit-table.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/ecommerce/www/admin/audit-table.tcl	9 Mar 2004 00:59:45 -0000	1.3
+++ openacs-4/packages/ecommerce/www/admin/audit-table.tcl	25 Aug 2008 12:06:52 -0000	1.4
@@ -15,98 +15,62 @@
   @cvs-id $Id$
   @author ported by Jerry Asher (jerry@theashergroup.com)
 } {
-
   table_names_and_id_column:notnull
   start_date:array,date
   start_time:array,time
   end_date:array,date
   end_time:array,time
-
 } -validate {
-
-  start_timestamp_valid {
-      if { [exists_and_not_null start_time(time)]  &&
-	  ![exists_and_not_null start_date(date)]  ||
-	   [exists_and_not_null end_time(time)]  &&
-	  ![exists_and_not_null end_date(date)] } {
-
-	ad_complain "You cannot leave date field empty if you're entered
-	             something in the time field.  Reverse is, however,
-		     acceptable."
-      }
-  }
+    start_timestamp_valid {
+        if { [exists_and_not_null start_time(time)]  &&
+             ![exists_and_not_null start_date(date)]  ||
+             [exists_and_not_null end_time(time)]  &&
+             ![exists_and_not_null end_date(date)] } {
+            ad_complain "<li>Date field cannot be empty if you are entering
+ something in the time field.  Time fields can be left blank.</li>"
+        }
+    }
 }
 
 ad_require_permission [ad_conn package_id] admin
 
-set main_table_name  [lindex $table_names_and_id_column 0]
-set audit_table_name [lindex $table_names_and_id_column 1]
-set id_column [lindex $table_names_and_id_column 2]
+set main_table_name [string trim [lindex $table_names_and_id_column 0]]
+set audit_table_name [string trim [lindex $table_names_and_id_column 1]]
+set id_column [string trim [lindex $table_names_and_id_column 2]]
 
 if { ![empty_string_p $start_date(date)]  &&
-      [empty_string_p $start_time(time)] } {
+     [empty_string_p $start_time(time)] } {
     set start_time(time) "00:00:00"
-}
+ }
 
 if { ![empty_string_p $end_date(date)]  &&
-      [empty_string_p $end_time(time)] } {
+     [empty_string_p $end_time(time)] } {
     set end_time(time) "00:00:00"
-}
+ }
+
 # Not compare the time (assuming usually the time boxes are left blank)
 
-if {![empty_string_p $start_date(date)] && ![empty_string_p $end_date(date)]} {
-    if {[db_0or1row select_one "
-    select 1
+if { ![empty_string_p $start_date(date)] && ![empty_string_p $end_date(date)] } { 
+    if { [db_0or1row select_one "select 1
       from dual
-     where to_date('$start_date(date)','YYYY-MM-DD HH24:MI:SS')  > to_date('$end_date(date)', 'YYYY-MM-DD HH24:MI:SS')
-    "] ==1} {
-
-	ad_return_complaint 1 "Please enter a start date before end date."
+     where to_date('$start_date(date)','YYYY-MM-DD HH24:MI:SS')  > to_date('$end_date(date)', 'YYYY-MM-DD HH24:MI:SS')"] == 1 } { 
+        ad_return_complaint 1 "Please enter a start date before end date."
     }
 }
 
-doc_body_append "
-[ad_admin_header "[ec_system_name] Audit Table"]
+set title "Audit Table"
+set context [list $title]
 
-<h2>[ec_system_name] Audit for $main_table_name</h2>
+set export_form_vars_html [export_form_vars table_names_and_id_column]
+set start_date_html "[ad_dateentrywidget start_date $start_date(date)]&nbsp;[ec_timeentrywidget start_time $start_time(time)]"
+set end_date_html "[ad_dateentrywidget end_date $end_date(date)]&nbsp;[ec_timeentrywidget end_time $end_time(time)]"
 
-[ad_context_bar [list "index.tcl" Ecommerce([ec_system_name])] [list "audit-tables" "Audit Table"] "Audit $main_table_name"]
-
-<hr>
-
-<form method=post action=\"audit-table\">
-[export_form_vars table_names_and_id_column]
-<table>
-<tr>
-  <td>From:</td>
-  <td>[ad_dateentrywidget start_date $start_date(date)]&nbsp;[ec_timeentrywidget start_time $start_time(time)]</td>
-</tr>
-<tr>
-  <td>To:</td>
-  <td>[ad_dateentrywidget end_date $end_date(date)]&nbsp;[ec_timeentrywidget end_time $end_time(time)]</td>
-</tr>
-<tr>
-<td></td>
-<td><input type=submit value=\"Alter Date Range\"></td>
-</tr>
-</table>
-</form>
-
-<h3>$main_table_name</h3>
-"
-
-if { ![empty_string_p $start_date(date)] } {
+if { ![empty_string_p $start_date(date)] } { 
     append start_date(date) " $start_time(time)"
 }
 
-if { ![empty_string_p $end_date(date)] } {
+if { ![empty_string_p $end_date(date)] } { 
     append end_date(date) " $end_time(time)"
 }
-
-doc_body_append "
-    <blockquote>
-      [ec_audit_trail_for_table $main_table_name $audit_table_name $id_column $start_date(date) $end_date(date) "audit-one-id" ""]
-    </blockquote>
-
-[ad_admin_footer]
-"
+ns_log Notice ",$main_table_name,$audit_table_name,$id_column,$start_date(date),$end_date(date),"
+set main_table_html [ec_audit_trail_for_table ${main_table_name} ${audit_table_name} ${id_column} $start_date(date) $end_date(date) "audit-one-id" ""]