Index: openacs-4/packages/bookmarks/www/bookmark-header.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bookmarks/www/bookmark-header.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/bookmarks/www/bookmark-header.tcl 6 Feb 2004 08:11:49 -0000 1.1 +++ openacs-4/packages/bookmarks/www/bookmark-header.tcl 29 Jun 2004 10:17:48 -0000 1.2 @@ -38,6 +38,7 @@ return_url_urlenc:onevalue } +set package_id [ad_conn package_id] set browsing_user_id [ad_conn user_id] # Is the user viewing his own bookmarks? @@ -47,28 +48,13 @@ set context {} } -set this_url_urlenc [ad_urlencode [ad_conn url]] - - -# To enable non-registered users to view registered users bookmarks (if they have -# permission) we use the session_id of these users as the id in the bm_in_closed_p -# table -set in_closed_p_id [ad_decode $browsing_user_id "0" [ad_conn session_id] $browsing_user_id] - - -# In case this is the first time the user views this bookmark tree -# we need to populate the table keeping track of which bookmarks are in -# closed folders -bm_initialize_in_closed_p $viewed_user_id $in_closed_p_id - # When we are adding a bookmark we need to know which url to return to # A bookmark can also be added via a Bookmarklet in which case return url # will be the page that the user is browsing. set return_url_urlenc [ad_urlencode [ad_conn url]?[export_url_vars viewed_user_id]] set user_name [db_string user_name "select first_names || ' ' || last_name from cc_users where object_id = :viewed_user_id" -bind "viewed_user_id $viewed_user_id" -default ""] -set package_id [ad_conn package_id] if { ![string equal $viewed_user_id "0"] } { set root_folder_id [bm_get_root_folder_id [ad_conn package_id] $viewed_user_id] } else {