Index: openacs.org-dev/packages/attachments/tcl/attachments-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/packages/attachments/tcl/attachments-procs.tcl,v
diff -u -N -r1.1.1.2 -r1.1.1.3
--- openacs.org-dev/packages/attachments/tcl/attachments-procs.tcl	25 Jul 2002 18:46:57 -0000	1.1.1.2
+++ openacs.org-dev/packages/attachments/tcl/attachments-procs.tcl	31 Jul 2002 16:31:01 -0000	1.1.1.3
@@ -84,29 +84,35 @@
         db_dml delete_attachment {}
     }
 
+    ad_proc -public get_package_key {} {
+        return attachments
+    }
+
     ad_proc -public get_url {
     } {
         return [parameter::get  \
-            -package_id [apm_package_id_from_key attachments] \
+            -package_id [apm_package_id_from_key [get_package_key]] \
             -parameter RelativeUrl
         ]
     }
 
     ad_proc -public add_attachment_url {
+        {-folder_id ""}
         {-package_id ""}
         {-object_id:required}
         {-return_url ""}
         {-pretty_name ""}
     } {
-        return "[attachments::get_url]/attach?pretty_object_name=[ns_urlencode $pretty_name]&object_id=$object_id&return_url=[ns_urlencode $return_url]"
+        return "[attachments::get_url]/attach?pretty_object_name=[ns_urlencode $pretty_name]&folder_id=$folder_id&object_id=$object_id&return_url=[ns_urlencode $return_url]"
     }
 
     ad_proc -public goto_attachment_url {
         {-package_id ""}
         {-object_id:required}
         {-attachment_id:required}
+        {-base_url ""}
     } {
-        return "[attachments::get_url]/go-to-attachment?object_id=$object_id&attachment_id=$attachment_id"
+        return "${base_url}[attachments::get_url]/go-to-attachment?object_id=$object_id&attachment_id=$attachment_id"
     }
 
     ad_proc -public graphic_url {
@@ -117,14 +123,15 @@
 
     ad_proc -public get_attachments {
         {-object_id:required}
+        {-base_url ""}
     } {
         returns a list of attachment ids and names
     } {
         set lst [db_list_of_lists select_attachments {}]
         set lst_with_urls [list]
 
         foreach el $lst {
-            set append_lst [list [goto_attachment_url -object_id $object_id -attachment_id [lindex $el 0]]]
+            set append_lst [list [goto_attachment_url -object_id $object_id -attachment_id [lindex $el 0] -base_url $base_url]]
             lappend lst_with_urls [concat $el $append_lst]
         }
 
@@ -140,8 +147,12 @@
 
         set cbar_list [fs_context_bar_list -extra_vars $extra_vars -folder_url "attach" -file_url "attach" -root_folder_id $root_folder_id -final $final $folder_id]
 
-        set cbar_html "<a href=\"attach?${extra_vars}&folder_id=$root_folder_id\">Top</a> &gt; "
-        
+        if {![empty_string_p $root_folder_id]} {
+            set cbar_html "<a href=\"attach?${extra_vars}&folder_id=$root_folder_id\">Top</a> &gt; "
+        } else {
+            set cbar_html "Top &gt; "
+        }
+
         foreach el $cbar_list {
             if {[llength $el] < 2} {
                 append cbar_html "$el"