Index: openacs-4/packages/lars-blogger/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.tcl,v
diff -u -r1.4.2.6 -r1.4.2.7
--- openacs-4/packages/lars-blogger/www/index.tcl	9 May 2003 22:43:19 -0000	1.4.2.6
+++ openacs-4/packages/lars-blogger/www/index.tcl	13 Jun 2003 09:15:01 -0000	1.4.2.7
@@ -4,34 +4,66 @@
     @author Lars Pind (lars@pinds.com)
     @creation-date February 2002
 } {
+    screen_name:optional
     year:optional,string_length_range(4|4)
     month:optional,string_length_range(2|2)
     day:optional,string_length_range(2|2)
-} -properties {
-    context_bar
-    page_title
 }
 
-set context_bar [ad_context_bar]
-
 set page_title [lars_blog_name]
 
-if { ![empty_string_p [parameter::get -parameter "rss_file_url"]] } {
-    set rss_file_url "[ad_url][lars_blog_public_package_url][parameter::get -parameter "rss_file_url"]"
+if {![exists_and_not_null screen_name]} {
+    set screen_name ""
+    set context_bar [ad_context_bar]
+} else {
+    set context_bar [ad_context_bar $screen_name]
 }
 
-set admin_p [ad_permission_p [ad_conn package_id] admin]
+if { ![empty_string_p [parameter::get -parameter "rss_file_name"]] } {
 
-if { [catch {
-    set notification_chunk [notification::display::request_widget \
-                                -type lars_blogger_notif \
-                                -object_id [ad_conn package_id] \
-                                -pretty_name [lars_blog_name] \
-                                -url [lars_blog_public_package_url]]
-}] } {
-    set notification_chunk {}
+    if {[exists_and_not_null screen_name]} {
+        set rss_file_url "[ad_url][lars_blog_public_package_url]user/$screen_name/[parameter::get -parameter "rss_file_name"]"
+    } else {
+        set rss_file_url "[ad_url][lars_blog_public_package_url][parameter::get -parameter "rss_file_name"]"
+    }
+
 }
 
+set package_id [ad_conn package_id]
+
+set package_url [ad_conn package_url]
+
+set write_p [ad_permission_p $package_id write]
+
+if {[parameter::get -parameter "AllowUsersToPost" -default 0] || $write_p} {
+    set registered_p [ad_conn user_id]
+} else {
+    set registered_p 0
+}
+
+set display_users_p [parameter::get -parameter "DisplayUsersP" -default 0]
+
+if {$display_users_p && ![exists_and_not_null screen_name]} {
+
+    set display_bloggers_p 1
+
+    db_multirow bloggers bloggers { *SQL* }
+
+    ad_return_template
+
+} else {
+
+    set display_bloggers_p 0
+
+}
+
+set notification_chunk [notification::display::request_widget \
+    -type lars_blogger_notif \
+    -object_id [ad_conn package_id] \
+    -pretty_name [lars_blog_name] \
+    -url [lars_blog_public_package_url] \
+]
+
 set header_background_color [lars_blog_header_background_color]
 
 if { [exists_and_not_null year] } {
@@ -43,11 +75,19 @@
     if { [exists_and_not_null day] } {
         set interval "day"
         db_1row archive_date_month_day { *SQL* }
-        set context_bar [ad_context_bar [list "[ad_conn package_url]archive/" "Archive"] [list "[ad_conn package_url]archive/$year/$month/" $archive_month_pretty] $archive_date_pretty]
+	if {[empty_string_p $screen_name]} {
+	    set context_bar [ad_context_bar [list "$package_url/archive/" "Archive"] [list "$package_url/archive/$year/$month/" $archive_month_pretty] $archive_date_pretty]
+	} else {
+	    set context_bar [ad_context_bar [list "$package_url/user/$screen_name/" "$screen_name"] [list "$package_url/user/$screen_name/archive/" "Archive"] [list "$package_url/user/$screen_name/archive/$year/$month/" $archive_month_pretty] $archive_date_pretty]
+	}
     } else {
         set interval "month"
         db_1row archive_date_month { *SQL* }
-        set context_bar [ad_context_bar [list "[ad_conn package_url]archive/" "Archive"] $archive_date_pretty]
+	if {[empty_string_p $screen_name]} {
+	    set context_bar [ad_context_bar [list "$package_url/archive/" "Archive"] $archive_date_pretty]
+	} else {
+	    set context_bar [ad_context_bar [list "$package_url/user/$screen_name/" "$screen_name"] [list "$package_url/user/$screen_name/archive/" "Archive"] $archive_date_pretty]
+	}
     }
 
     append page_title " Archive"