Index: openacs-4/packages/acs-subsite/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/index.tcl,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/acs-subsite/www/index.tcl	31 Mar 2004 21:45:40 -0000	1.20
+++ openacs-4/packages/acs-subsite/www/index.tcl	10 Jan 2007 21:22:06 -0000	1.21
@@ -22,20 +22,20 @@
 
 # We may have to redirect to some application page
 set redirect_url [parameter::get -parameter IndexRedirectUrl -default {}]
-if { [empty_string_p $redirect_url] && $main_site_p } {
+if { $redirect_url eq "" && $main_site_p } {
     set redirect_url [parameter::get_from_package_key -package_key acs-kernel -parameter IndexRedirectUrl]
 }
-if { ![empty_string_p $redirect_url] } {
+if { $redirect_url ne "" } {
     ad_returnredirect $redirect_url
     ad_script_abort
 }
 
 # Handle IndexInternalRedirectUrl
 set redirect_url [parameter::get -parameter IndexInternalRedirectUrl -default {}]
-if { [empty_string_p $redirect_url] && $main_site_p } {
+if { $redirect_url eq "" && $main_site_p } {
     set redirect_url [parameter::get_from_package_key -package_key acs-kernel -parameter IndexInternalRedirectUrl]
 }
-if { ![empty_string_p $redirect_url] } {
+if { $redirect_url ne "" } {
     rp_internal_redirect $redirect_url
     ad_script_abort
 }
@@ -53,8 +53,8 @@
 
 set show_members_list_to [parameter::get -parameter "ShowMembersListTo" -default 2]
 set show_members_page_link_p \
-	[expr $admin_p || ($user_id != 0 && $show_members_list_to ==1) || \
-	$show_members_list_to == 0 ]
+	[expr {$admin_p || ($user_id != 0 && $show_members_list_to ==1) || \
+	$show_members_list_to == 0 }]
 
 # User's group membership
 
@@ -64,4 +64,4 @@
 set group_member_p [group::member_p -group_id $group_id -user_id $user_id]
 set group_admin_p [group::admin_p -group_id $group_id -user_id $user_id]
 
-set can_join_p [expr !$group_admin_p && $group_member_p == 0 && $user_id != 0 && ![string equal $group_join_policy "closed"]]
+set can_join_p [expr {!$group_admin_p && $group_member_p == 0 && $user_id != 0 && $group_join_policy ne "closed" }]