Index: openacs-4/packages/file-storage/www/folder-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-add.adp,v diff -u -N --- openacs-4/packages/file-storage/www/folder-add.adp 28 Jul 2006 07:57:28 -0000 1.1.2.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,7 +0,0 @@ - -@title;noquote@ -@context;noquote@ - -
- -
\ No newline at end of file Index: openacs-4/packages/file-storage/www/folder-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-add.tcl,v diff -u -N --- openacs-4/packages/file-storage/www/folder-add.tcl 28 Jul 2006 08:09:37 -0000 1.1.2.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,151 +0,0 @@ -ad_page_contract { - page to add a new file to the system - - @author Kevin Scaldeferri (kevin@arsdigita.com) - @creation-date 6 Nov 2000 - @cvs-id $Id: folder-add.tcl,v 1.1.2.2 2006/07/28 08:09:37 maltes Exp $ -} { - folder_id:integer,optional,notnull - upload_folder:trim,optional - return_url:optional - {lock_title_p 0} - -} -properties { - folder_id:onevalue - context:onevalue - title:onevalue - lock_title_p:onevalue -} -validate { - folder { - if {![fs_folder_p $folder_id]} { - ad_complain "The specified parent folder is not valid." - } - } -} - -set user_id [ad_conn user_id] - -if {![acs_user::site_wide_admin_p]} { - ad_returnredirect "./?[export_url_vars folder_id]" -} - -set package_id [ad_conn package_id] -# check for write permission on the folder or item - -permission::require_permission \ - -object_id $folder_id \ - -party_id $user_id \ - -privilege "write" - -set context [fs_context_bar_list -final "[_ file-storage.Add_File]" $folder_id] -set title "[_ file-storage.Add_File]" - -ad_form -name file_add -html { enctype multipart/form-data } -export { folder_id lock_title_p } -form { - {upload_folder:text(text) {label \#file-storage.Upload_a_folder#} {html "size 30"} {help_text "[_ file-storage.Upload_folder_help]"}} -} - -if {[exists_and_not_null return_url]} { - ad_form -extend -name file_add -form { - {return_url:text(hidden) {value $return_url}} - } -} - - -ad_form -extend -name file_add -form {} -on_submit { - - foreach file [ad_find_all_files "$upload_folder"] { - lappend upload_files [regsub "^$upload_folder\/" $file {}] - lappend upload_tmpfiles $file - } - - if { [empty_string_p [lindex $upload_files 0]]} { - ad_return_complaint 1 "You have to upload a file" - ad_script_abort - } - - set i 0 - set number_upload_files [llength $upload_files] - foreach upload_file $upload_files tmpfile $upload_tmpfiles { - # upload a new file - # if the user choose upload from the folder view - # and the file with the same name already exists - # we create a new revision - - # check if this is in a folder inside the zip and create - # the folders if they don't exist - set p_f_id $folder_id - set file_paths [file split [file dirname $upload_file]] - - if {![string equal "." $file_paths] && [llength $file_paths]} { - # make sure every folder exists - set path "" - foreach p $file_paths { - append path /${p} - if {![info exists paths($path)]} { - set f_id [content::item::get_id -item_path $path -root_folder_id $p_f_id] - if {[string equal "" $f_id]} { - set p_f_id [content::folder::new -parent_id $p_f_id -name $p -label $p] - set paths($path) $p_f_id - } - } else { - set p_f_id $paths($path) - } - - } - set upload_file [file tail $upload_file] - } - - set this_folder_id $p_f_id - set this_title $upload_file - - set existing_item_id [fs::get_item_id -name $upload_file -folder_id $this_folder_id] - - if {![empty_string_p $existing_item_id]} { - # file with the same name already exists - # in this folder, create a new revision - set this_file_id $existing_item_id - permission::require_permission \ - -object_id $this_file_id \ - -party_id $user_id \ - -privilege write - } - - set rev_id [fs::add_file \ - -name $upload_file \ - -parent_id $this_folder_id \ - -tmp_filename $tmpfile \ - -creation_user $user_id \ - -creation_ip [ad_conn peeraddr] \ - -title $this_title \ - -package_id $package_id] - - incr i - - if {![empty_string_p $rev_id]} { - set this_file_id [db_string get_item_id { - select item_id - from cr_revisions - where revision_id = :rev_id - } -default 0] - } - - if {$i < $number_upload_files} { - set file_id [db_nextval "acs_object_id_seq"] - } - - } - -} -after_submit { - - if {[exists_and_not_null return_url]} { - ad_returnredirect $return_url - } else { - ad_returnredirect "./?[export_url_vars folder_id]" - } - ad_script_abort - -} - -set unpack_available_p [expr ![empty_string_p [string trim [parameter::get -parameter UnzipBinary]]]] - -ad_return_template \ No newline at end of file Index: openacs-4/packages/file-storage/www/folder-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v diff -u -N -r1.31.2.21 -r1.31.2.22 --- openacs-4/packages/file-storage/www/folder-chunk.tcl 28 Jul 2006 07:57:28 -0000 1.31.2.21 +++ openacs-4/packages/file-storage/www/folder-chunk.tcl 2 Aug 2006 01:03:12 -0000 1.31.2.22 @@ -93,7 +93,6 @@ lappend actions "#file-storage.Delete_this_folder#" ${fs_url}folder-delete?[export_vars folder_id] "#file-storage.Delete_this_folder#" } if {$admin_p} { - lappend actions "#file-storage.Folder_Add#" "${fs_url}folder-add?folder_id=$folder_id" "#file-storage.Add_folder_from_fs#" lappend actions "#file-storage.Edit_Folder#" "${fs_url}folder-edit?folder_id=$folder_id" "#file-storage.Rename_this_folder#" lappend actions "#file-storage.lt_Modify_permissions_on_1#" "${fs_url}permissions?[export_vars -override {{object_id $folder_id}} {{return_url "[ad_conn url]"}}]" "#file-storage.lt_Modify_permissions_on_1#" if { $expose_rss_p } { Index: openacs-4/packages/forums-portlet/www/forums-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.tcl,v diff -u -N -r1.12.2.1 -r1.12.2.2 --- openacs-4/packages/forums-portlet/www/forums-portlet.tcl 27 Jul 2006 12:34:48 -0000 1.12.2.1 +++ openacs-4/packages/forums-portlet/www/forums-portlet.tcl 2 Aug 2006 01:03:12 -0000 1.12.2.2 @@ -18,8 +18,6 @@ set shaded_p $config(shaded_p) set list_of_package_ids $config(package_id) - -ns_log Notice "$list_of_package_ids" set one_instance_p [ad_decode [llength $list_of_package_ids] 1 1 0] set query select_forums @@ -32,12 +30,4 @@ set user_id [ad_conn user_id] -set old_list_of_package_ids $list_of_package_ids -set list_of_package_ids [list] -foreach package_id $old_list_of_package_ids { - if {[permission::permission_p -object_id $package_id -privilege "read"]} { - lappend list_of_package_ids $package_id - } -} - db_multirow forums $query {}