Index: openacs-4/packages/dotlrn/www/admin/term-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term-edit.tcl,v
diff -u -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/dotlrn/www/admin/term-edit.tcl	31 May 2005 23:13:07 -0000	1.10.2.1
+++ openacs-4/packages/dotlrn/www/admin/term-edit.tcl	15 Jun 2005 10:51:15 -0000	1.10.2.2
@@ -72,6 +72,10 @@
         { [template::util::date::compare $start_date $end_date] <= 0 }
         "The term must start before it ends"
     }
+    {end_date
+        { [template::util::date::compare [template::util::date::from_ansi [clock format [clock seconds] -format "%Y-%m-%d"]] $end_date] <= 0 }
+        "The term must end in the future"
+    }
 } -edit_data {
 
     # Setting the rigth format to send to the procedures
Index: openacs-4/packages/dotlrn/www/admin/term-new.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term-new.tcl,v
diff -u -r1.11.2.1 -r1.11.2.2
--- openacs-4/packages/dotlrn/www/admin/term-new.tcl	31 May 2005 23:13:07 -0000	1.11.2.1
+++ openacs-4/packages/dotlrn/www/admin/term-new.tcl	15 Jun 2005 10:51:15 -0000	1.11.2.2
@@ -55,6 +55,10 @@
         { [template::util::date::compare $start_date $end_date] <= 0 }
         "The term must start before it ends"
     }
+    {end_date
+        { [template::util::date::compare [template::util::date::from_ansi [clock format [clock seconds] -format "%Y-%m-%d"]] $end_date] <= 0 }
+        "The term must end in the future"
+    }
 } -on_submit {
     
     # Setting the rigth format to send to the procedures
Index: openacs-4/packages/ecommerce/www/address-international-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/ecommerce/www/address-international-2.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/ecommerce/www/address-international-2.tcl	31 May 2005 23:13:14 -0000	1.7.2.1
+++ openacs-4/packages/ecommerce/www/address-international-2.tcl	15 Jun 2005 10:51:15 -0000	1.7.2.2
@@ -53,7 +53,7 @@
 
 # We need them to be logged in
 
-set user_id [ad_verify_and_get_user_id]
+set user_id [ad_conn user_id]
 if {$user_id == 0} {
     set return_url "[ad_conn url]?[export_entire_form_as_url_vars]"
     ad_returnredirect "/register?[export_url_vars return_url]"