Index: openacs-4/packages/dotlrn/tcl/community-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/community-procs.tcl,v
diff -u -r1.22 -r1.23
--- openacs-4/packages/dotlrn/tcl/community-procs.tcl	13 Nov 2001 16:21:01 -0000	1.22
+++ openacs-4/packages/dotlrn/tcl/community-procs.tcl	13 Nov 2001 17:57:30 -0000	1.23
@@ -109,7 +109,7 @@
 	{ -community_id "" }
     } {
 	if {[empty_string_p $community_type]} {
-	    set community_type [get_community_type_from_community_id $community_id]
+	    set community_type [get_toplevel_community_type_from_community_id $community_id]
 	}
 	
 	if {$community_type == "dotlrn_class"} {
Index: openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl	7 Nov 2001 22:22:09 -0000	1.4
+++ openacs-4/packages/dotlrn/tcl/dotlrn-main-portlet-procs.tcl	13 Nov 2001 17:57:30 -0000	1.5
@@ -61,9 +61,12 @@
 	# This is not templated. OH NO. I am a horrible, horrible, little man. (ben)
 
 	set return_html "
-	<ul>
-	<li><a href=classes>subscribe to a new class</a>"
+	<ul>"
 
+	if {[dotlrn::user_can_browse_p $user_id]} {
+	    append return_html "<li><a href=classes>subscribe to a new class</a><p>"
+	}
+
 	set communities [dotlrn_community::get_all_communities_by_user $user_id]
 
 	foreach community $communities {
Index: openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	10 Nov 2001 19:09:12 -0000	1.9
+++ openacs-4/packages/dotlrn/tcl/dotlrn-procs.tcl	13 Nov 2001 17:57:30 -0000	1.10
@@ -75,4 +75,19 @@
 	return $new_package_id
     }
 	
+    ad_proc -public render_page {
+	{-user_id  ""}
+	page_id
+    } {
+	render a page in a user's favorite style
+    } {
+	if {[empty_string_p $user_id]} {
+	    set user_id [ad_conn user_id]
+	}
+
+	set theme_id [db_string select_user_theme_id "select theme_id from dotlrn_users where user_id= :user_id"]
+
+	return [portal::render $page_id $theme_id]
+    }
+
 }
Index: openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl	10 Nov 2001 18:03:23 -0000	1.4
+++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.tcl	13 Nov 2001 17:57:30 -0000	1.5
@@ -87,20 +87,39 @@
     } {
 	Check is a user can browse dotLRN
     } {
+	if {[empty_string_p $user_id]} {
+	    set user_id [ad_conn user_id]
+	}
+
+	if {[user_get_role $user_id] == "guest"} {
+	    return 0
+	} else {
+	    return 1
+	}
     }
 
     ad_proc -public require_user_browse {
 	{user_id ""}
     } {
 	Require that a user be able to browse dotLRN
     } {
+
     }
 
     ad_proc -public user_can_read_sensitive_data_p {
 	{user_id ""}
     } {
 	Check if a user can read sensitive data in dotLRN
     } {
+	if {[empty_string_p $user_id]} {
+	    set user_id [ad_conn user_id]
+	}
+
+	if {[user_get_role $user_id] == "guest"} {
+	    return 0
+	} else {
+	    return 1
+	}
     }
 
     ad_proc -public require_user_read_sensitive_data {
Index: openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.xql,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.xql	10 Nov 2001 18:03:23 -0000	1.2
+++ openacs-4/packages/dotlrn/tcl/dotlrn-security-procs.xql	13 Nov 2001 17:57:30 -0000	1.3
@@ -10,7 +10,7 @@
 
 <fullquery name="dotlrn::user_add.update_user_page_id">
 <querytext>
-update dotlrn_users set page_id= :page_id
+update dotlrn_users set page_id= :page_id where user_id= :user_id
 </querytext>
 </fullquery>
 
Index: openacs-4/packages/dotlrn/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.adp,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/index.adp	9 Nov 2001 03:38:42 -0000	1.7
+++ openacs-4/packages/dotlrn/www/index.adp	13 Nov 2001 17:57:30 -0000	1.8
@@ -1,6 +1,7 @@
 <master src="master">
 <property name="title">dotLRN</property>
 
+<a href=preferences>Edit your preferences</a>. 
 <a href=configure>Configure</a> this page.
 
 <p>
Index: openacs-4/packages/dotlrn/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/index.tcl,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/dotlrn/www/index.tcl	7 Nov 2001 22:22:10 -0000	1.8
+++ openacs-4/packages/dotlrn/www/index.tcl	13 Nov 2001 17:57:30 -0000	1.9
@@ -29,7 +29,7 @@
 if {[empty_string_p $page_id]} {
     # do something
 } else {
-    set rendered_page [portal::render $page_id]
+    set rendered_page [dotlrn::render_page $page_id]
 }
 
 
Index: openacs-4/packages/dotlrn/www/one-community.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/dotlrn/www/one-community.tcl	9 Nov 2001 15:24:57 -0000	1.5
+++ openacs-4/packages/dotlrn/www/one-community.tcl	13 Nov 2001 17:57:30 -0000	1.6
@@ -29,7 +29,7 @@
 
     # Possible that there is no portal page for non-members
     if {! [empty_string_p $page_id]} {
-	set rendered_page [portal::render $page_id]
+	set rendered_page [dotlrn::render_page $page_id]
     } else {
 	set rendered_page ""
     }
@@ -40,7 +40,7 @@
     # Pull out the NPP page ID and render it!
     set page_id [dotlrn_community::get_page_id $community_id $user_id]
 
-    set rendered_page [portal::render $page_id]
+    set rendered_page [dotlrn::render_page $page_id]
 
     set context_bar {View}
 
Index: openacs-4/packages/dotlrn/www/preferences.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/preferences.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/preferences.tcl	10 Nov 2001 18:03:23 -0000	1.1
+++ openacs-4/packages/dotlrn/www/preferences.tcl	13 Nov 2001 17:57:30 -0000	1.2
@@ -13,7 +13,8 @@
 form create preferences
 
 element create preferences theme_id \
-	-label "Portal Theme" -datatype text -widget select
+	-label "Portal Theme" -datatype text -widget select \
+	-options [concat {{{(don't override)} {}}} [db_list_of_lists select_themes "select name,theme_id from portal_element_themes"]]
 
 if {[form is_valid preferences]} {
     template::form get_values preferences theme_id