Index: openacs-4/packages/xowiki/www/xinha/file-selector.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/xinha/file-selector.tcl,v
diff -u -N -r1.21.2.1 -r1.21.2.2
--- openacs-4/packages/xowiki/www/xinha/file-selector.tcl 25 Jun 2019 12:56:19 -0000 1.21.2.1
+++ openacs-4/packages/xowiki/www/xinha/file-selector.tcl 25 Jun 2019 12:57:42 -0000 1.21.2.2
@@ -3,13 +3,13 @@
@author Gustaf Neumann neumann@wu-wien.ac.at
@creation-date 13.10.2005
@cvs-id $Id$
-} {
+} {
{fs_package_id:naturalnum,notnull,optional}
{folder_id:naturalnum,optional}
{orderby:token,optional}
{selector_type "image"}
{file_types "*"}
-}
+}
set HTML_NothingSelected [_ acs-templating.HTMLArea_SelectImageNothingSelected]
switch -- $selector_type {
@@ -89,7 +89,7 @@
ad_complain $error_msg
return
}
- set folder_id [fs_get_root_folder -package_id $fs_package_id]
+ set folder_id [fs_get_root_folder -package_id $fs_package_id]
set root_folder_id $folder_id
}
@@ -121,12 +121,12 @@
set parent_folder_id [fs::get_parent -item_id $folder_id]
set up_name [fs::get_object_name -object_id $parent_folder_id]
set up_url [export_vars -base file-selector \
- {fs_package_id {folder_id $parent_folder_id}
+ {fs_package_id {folder_id $parent_folder_id}
selector_type file_types}]
}
-# if user has write permission, create image upload form,
+# if user has write permission, create image upload form,
if {[permission::permission_p -party_id $user_id -object_id $folder_id \
-privilege "write"]} {
set write_p 1
@@ -148,31 +148,31 @@
break
}
- if {[info exists folder_size]} {
- # check per folder quota
- set maximum_folder_size [parameter::get -parameter "MaximumFolderSize"]
-
- if { $maximum_folder_size ne "" } {
- if { $folder_size+[file size ${upload_file.tmpfile}] > $maximum_folder_size } {
- template::form::set_error upload_form upload_file \
- [_ file-storage.out_of_space]
- break
- }
- }
- }
-
+ if {[info exists folder_size]} {
+ # check per folder quota
+ set maximum_folder_size [parameter::get -parameter "MaximumFolderSize"]
+
+ if { $maximum_folder_size ne "" } {
+ if { $folder_size+[file size ${upload_file.tmpfile}] > $maximum_folder_size } {
+ template::form::set_error upload_form upload_file \
+ [_ file-storage.out_of_space]
+ break
+ }
+ }
+ }
+
set file_name [template::util::file::get_property filename $upload_file]
set upload_tmpfile [template::util::file::get_property tmp_filename $upload_file]
set mime_type [template::util::file::get_property mime_type $upload_file]
-
+
if {$selector_type eq "image" && ![string match "image/*" $mime_type]} {
template::form::set_error upload_form upload_file \
[_ acs-templating.HTMLArea_SelectImageUploadNoImage]
break
- }
-
+ }
+
set existing_file_id [fs::get_item_id -name $file_name -folder_id $folder_id]
-
+
if {$existing_file_id ne ""} {
# write new revision
fs::add_file \
@@ -184,7 +184,7 @@
-creation_ip [ad_conn peeraddr] \
-package_id $fs_package_id
} else {
- # write file
+ # write file
fs::add_file \
-name $file_name \
-parent_id $folder_id \
@@ -193,7 +193,7 @@
-creation_ip [ad_conn peeraddr] \
-package_id $fs_package_id
}
-
+
}
}
@@ -206,7 +206,7 @@
-item_id $folder_id \
-root_folder_id $root_folder_id]
-# -pass_to_urls {c}
+# -pass_to_urls {c}
template::list::create \
-name contents \
@@ -220,25 +220,25 @@
label "[_ file-storage.Name]"
display_template {
-
-
-
-
-
+
@contents.name@
}
orderby_desc {name desc}
orderby_asc {name asc}
- html {nowrap ""}
+ html {nowrap ""}
}
content_size_pretty {
label "[_ file-storage.Size]"
- orderby_desc {content_size desc}
+ orderby_desc {content_size desc}
orderby_asc {content_size asc}
}
type {
@@ -284,8 +284,8 @@
$filter_clause
$order_by_clause"
-db_multirow -extend {
- icon last_modified_pretty content_size_pretty
+db_multirow -extend {
+ icon last_modified_pretty content_size_pretty
properties_link properties_url folder_p title
} contents get_fs_contents $fs_sql {
set last_modified_ansi [lc_time_system_to_conn $last_modified_ansi]
@@ -302,15 +302,15 @@
set file_upload_name [ad_sanitize_filename \
-tolower \
$file_upload_name]
-
+
set name [lang::util::localize $name]
-
+
switch -- $type {
folder {
set folder_p 1
set icon /resources/file-storage/folder.gif
set file_url [export_vars -base file-selector \
- {fs_package_id {folder_id $object_id}
+ {fs_package_id {folder_id $object_id}
selector_type file_types}]
}
url {
@@ -324,8 +324,8 @@
set file_url ${fs_url}view/$file_url
}
}
-
- # We need to encode the hashes in any i18n message keys (.LRN plays
+
+ # We need to encode the hashes in any i18n message keys (.LRN plays
# this trick on some of its folders). If we don't, the hashes will cause
# the path to be chopped off (by ns_conn url) at the leftmost hash.
regsub -all {\#} $file_url {%23} file_url
Index: openacs-4/packages/file-storage/lib/folder-links.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/lib/folder-links.tcl,v
diff -u -N -r1.5.2.3 -r1.5.2.4
--- openacs-4/packages/file-storage/lib/folder-links.tcl 25 Jun 2019 13:02:19 -0000 1.5.2.3
+++ openacs-4/packages/file-storage/lib/folder-links.tcl 25 Jun 2019 13:03:30 -0000 1.5.2.4
@@ -55,12 +55,12 @@
properties_url download_url target_tag
} contents select_folder_contents {} {
set last_modified_ansi [lc_time_system_to_conn $last_modified_ansi]
-
+
set last_modified_pretty [lc_time_fmt $last_modified_ansi "%x %X"]
# if {$description ne ""} {
# set description " - $description"
# }
-
+
if {$type eq "folder"} {
set content_size_pretty [lc_numeric $content_size]
append content_size_pretty " [_ file-storage.items]"
Index: openacs-4/packages/file-storage/www/file.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.tcl,v
diff -u -N -r1.39.2.2 -r1.39.2.3
--- openacs-4/packages/file-storage/www/file.tcl 25 Jun 2019 13:02:19 -0000 1.39.2.2
+++ openacs-4/packages/file-storage/www/file.tcl 25 Jun 2019 13:03:30 -0000 1.39.2.3
@@ -9,9 +9,9 @@
{show_all_versions_p:boolean,notnull "f"}
} -validate {
valid_file -requires {file_id} {
- if {![fs_file_p $file_id]} {
- ad_complain "[_ file-storage.lt_The_specified_file_is]"
- }
+ if {![fs_file_p $file_id]} {
+ ad_complain "[_ file-storage.lt_The_specified_file_is]"
+ }
}
} -properties {
title:onevalue
@@ -41,8 +41,8 @@
parent_id,
coalesce(url,file_upload_name) as name,
live_revision
- from fs_objects f
- where f.object_id = :file_id
+ from fs_objects f
+ where f.object_id = :file_id
}
set write_p [permission::permission_p -party_id $user_id -object_id $file_id -privilege "write"]
@@ -89,7 +89,7 @@
# add button only when available folders for copy exist. We settle for
# a lazy check on write permissions for folder because a rigorous
# check of available destinations would not be performant.
-if {$folder_write_p} {
+if {$folder_write_p} {
lappend actions \
[_ file-storage.Copy_File] \
[export_vars -base copy {{object_id $file_id} return_url}] \
@@ -120,30 +120,30 @@
-multirow version \
-actions $actions \
-elements {
- title {
- label \#file-storage.Title\#
- link_url_col version_url
- link_html {title "\#file-storage.show_version_title\#"}
- }
- author { label \#file-storage.Author\#
- display_template {@version.author_link;noquote@}
+ title {
+ label \#file-storage.Title\#
+ link_url_col version_url
+ link_html {title "\#file-storage.show_version_title\#"}
}
- content_size {
- label \#file-storage.Size\#
- display_col content_size_pretty
- }
- type { label \#file-storage.Type\#
- display_col pretty_type }
- last_modified_ansi {
- label \#file-storage.Last_Modified\#
- display_col last_modified_pretty
- }
- description { label \#file-storage.Version_Notes\#}
- version_delete {
- label ""
- link_url_col version_delete_url
- link_html {title "\#file-storage.Delete_Version\#"}
- }
+ author { label \#file-storage.Author\#
+ display_template {@version.author_link;noquote@}
+ }
+ content_size {
+ label \#file-storage.Size\#
+ display_col content_size_pretty
+ }
+ type { label \#file-storage.Type\#
+ display_col pretty_type }
+ last_modified_ansi {
+ label \#file-storage.Last_Modified\#
+ display_col last_modified_pretty
+ }
+ description { label \#file-storage.Version_Notes\#}
+ version_delete {
+ label ""
+ link_url_col version_delete_url
+ link_html {title "\#file-storage.Delete_Version\#"}
+ }
}
db_multirow -unclobber -extend {
@@ -180,7 +180,7 @@
set last_modified_pretty [lc_time_fmt $last_modified_ansi "%x %X"]
set content_size_pretty [util::content_size_pretty -size $content_size]
if {$title eq ""} {
- set title "[_ file-storage.untitled]"
+ set title "[_ file-storage.untitled]"
}
if {$version_id ne $live_revision } {
set version_url [export_vars -base "download/$title" {version_id}]