Index: openacs-4/packages/acs-subsite/lib/login.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/lib/login.tcl,v
diff -u -N -r1.36.2.4 -r1.36.2.5
--- openacs-4/packages/acs-subsite/lib/login.tcl	30 May 2016 13:06:11 -0000	1.36.2.4
+++ openacs-4/packages/acs-subsite/lib/login.tcl	30 May 2017 14:30:56 -0000	1.36.2.5
@@ -1,14 +1,19 @@
-# Present a login box
-#
-# Expects:
-#   subsite_id - optional, defaults to nearest subsite
-#   return_url - optional, defaults to Your Account
-# Optional:
-#   authority_id
-#   username
-#   email
-#
+ad_include_contract {
+    ADP include for presentin a login box
 
+    @param subsite_id - optional, defaults to nearest subsite
+    @param return_url - optional, defaults to Your Account
+    @param authority_id
+    @param username
+    @param email
+} {
+    {subsite_id:naturalnum ""}
+    {return_url:trim ""}
+    {authority_id:naturalnum ""}
+    {username ""}
+    {email ""}
+}
+
 # Redirect to HTTPS if so configured
 if { [security::RestrictLoginToSSLP] } {
     security::require_secure_conn
@@ -19,7 +24,7 @@
 			          -parameter AllowSelfRegister \
 			          -default 1]   
 
-if { ![info exists subsite_id] || $subsite_id eq "" } {
+if { $subsite_id eq "" } {
     set subsite_id [subsite::get_element -element object_id]
 }
 
@@ -28,14 +33,6 @@
                                     -package_id $subsite_id \
                                     -default 1]
 
-if { ![info exists username] } {
-    set username {}
-}
-
-if { ![info exists email] } {
-    set email {}
-}
-
 if { $email eq "" && $username eq "" && [ad_conn untrusted_user_id] != 0 } {
     acs_user::get -user_id [ad_conn untrusted_user_id] -array untrusted_user
     if { [auth::UseEmailForLoginP] } {
@@ -68,7 +65,7 @@
 set subsite_url [subsite::get_element -element url]
 set system_name [ad_system_name]
 
-if { [info exists return_url] && $return_url ne "" } {
+if { $return_url ne "" } {
     if { [util::external_url_p $return_url] } {
       ad_returnredirect -message "only urls without a host name are permitted" "."
       ad_script_abort
@@ -78,8 +75,7 @@
 }
 
 set authority_options [auth::authority::get_authority_options]
-
-if { ![info exists authority_id] || $authority_id eq "" } {
+if { $authority_id eq "" } {
     set authority_id [lindex $authority_options 0 1]
 }
 
@@ -196,11 +192,6 @@
         ad_script_abort
     }
 
-    if { ![info exists authority_id] || $authority_id eq "" } {
-        # Will be defaulted to local authority
-        set authority_id {}
-    }
-
     if { ![info exists persistent_p] || $persistent_p eq "" } {
         set persistent_p "f"
     }
@@ -285,8 +276,7 @@
                 -message $auth_info(account_message) \
                 -html \
                 [export_vars \
-                     -base "[subsite::get_element \
-                                -element url]register/account-closed"]
+                     -base "[subsite::get_element -element url]register/account-closed"]
 		ad_script_abort
 	    }
         }
@@ -299,12 +289,10 @@
     if { [info exists auth_info(account_message)] && $auth_info(account_message) ne "" } {
         ad_returnredirect [export_vars -base "[subsite::get_element -element url]register/account-message" { { message $auth_info(account_message) } return_url }]
         ad_script_abort
-    } else {
-	if {![info exists auth_info(element_messages)]} {
-	    # No message
-	    ad_returnredirect $return_url
-	    ad_script_abort
-	}
+    } elseif {![info exists auth_info(element_messages)]} {
+        # No message
+        ad_returnredirect $return_url
+        ad_script_abort
     }
 }