Index: openacs-4/packages/lars-blogger/www/entry-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/lars-blogger/www/entry-chunk.tcl	27 Jan 2003 16:19:27 -0000	1.5
+++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl	28 Aug 2003 09:41:55 -0000	1.6
@@ -13,14 +13,14 @@
     set package_id [ad_conn package_id]
 }
 
-set admin_p [ad_permission_p $package_id admin]
-
 if { ![exists_and_not_null return_url] } {
     set return_url "[ad_conn url]?[ad_conn query]"
 }
 
 set package_url [lars_blog_public_package_url -package_id $package_id]
 
+set user_id [ad_conn user_id]
+
 set general_comments_package_url [general_comments_package_url]
 
 set show_poster_p [ad_parameter "ShowPosterP" "" "1"]
@@ -34,13 +34,18 @@
 
 set entry_id $blog(entry_id)
 
-set blog(edit_url) "${package_url}admin/entry-edit?[export_vars { entry_id return_url }]"
-set blog(delete_url) "${package_url}admin/entry-delete?[export_vars { entry_id return_url }]"
+set blog(edit_url) "${package_url}entry-edit?[export_vars { entry_id return_url }]"
+set blog(delete_url) "${package_url}entry-delete?[export_vars { entry_id return_url }]"
 
-set blog(publish_url) "${package_url}admin/entry-publish?[export_vars { entry_id return_url }]"
-set blog(revoke_url) "${package_url}admin/entry-revoke?[export_vars { entry_id return_url }]"
+set blog(publish_url) "${package_url}entry-publish?[export_vars { entry_id return_url }]"
+set blog(revoke_url) "${package_url}entry-revoke?[export_vars { entry_id return_url }]"
 
-set blog(entry_archive_url) "${package_url}one-entry?[export_vars { entry_id }]"
+if { [empty_string_p $screen_name] } {
+    set blog(entry_archive_url) "${package_url}one-entry?[export_vars { entry_id }]"
+} else {
+    set blog(entry_archive_url) "${package_url}user/$screen_name/one-entry?[export_vars { entry_id }]"
+}
+
 set blog(google_url) "http://www.google.com/search?[export_vars { {q $blog(title) } }]"
 
 if { ![empty_string_p $general_comments_package_url] } {
@@ -53,4 +58,4 @@
     set comments_html [general_comments_get_comments -print_content_p 1 $entry_id]
 }
 
-ad_return_template
\ No newline at end of file
+ad_return_template