Index: openacs-4/packages/file-storage/file-storage.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v
diff -u -r1.58.2.4 -r1.58.2.5
--- openacs-4/packages/file-storage/file-storage.info 1 Dec 2015 13:56:11 -0000 1.58.2.4
+++ openacs-4/packages/file-storage/file-storage.info 20 May 2016 20:37:03 -0000 1.58.2.5
@@ -7,7 +7,7 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="5.9.0" url="http://openacs.org/repository/download/apm/file-storage-5.9.0.apm">
+ <version name="5.9.1d1" url="http://openacs.org/repository/download/apm/file-storage-5.9.1d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>Collaborative document storage</summary>
<release-date>2015-10-04</release-date>
@@ -17,8 +17,9 @@
<maturity>2</maturity>
<package_instance_name>#file-storage.file-storage#</package_instance_name>
- <provides url="file-storage" version="5.9.0"/>
+ <provides url="file-storage" version="5.9.1d1"/>
<requires url="acs-kernel" version="5.9.0"/>
+ <requires url="acs-tcl" version="5.9.1d7"/>
<requires url="acs-content-repository" version="5.9.0"/>
<requires url="categories" version="1.1.2d3"/>
Index: openacs-4/packages/file-storage/www/delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/delete.tcl,v
diff -u -r1.8.2.1 -r1.8.2.2
--- openacs-4/packages/file-storage/www/delete.tcl 12 Sep 2015 11:06:18 -0000 1.8.2.1
+++ openacs-4/packages/file-storage/www/delete.tcl 20 May 2016 20:37:03 -0000 1.8.2.2
@@ -3,7 +3,7 @@
} {
object_id:multiple,naturalnum,notnull
{confirm_p:optional,boolean 0}
- {return_url ""}
+ {return_url:localurl ""}
}
Index: openacs-4/packages/file-storage/www/download-zip.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download-zip.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/file-storage/www/download-zip.tcl 12 Sep 2015 11:06:18 -0000 1.7.2.1
+++ openacs-4/packages/file-storage/www/download-zip.tcl 20 May 2016 20:37:03 -0000 1.7.2.2
@@ -3,7 +3,7 @@
} {
object_id:naturalnum,notnull,multiple
{confirm_p:optional,boolean 0}
- {return_url ""}
+ {return_url:localurl ""}
} -errors {object_id:,notnull,integer,multiple {Please select at least one item to download.}
}
Index: openacs-4/packages/file-storage/www/file-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-add.tcl,v
diff -u -r1.20.2.3 -r1.20.2.4
--- openacs-4/packages/file-storage/www/file-add.tcl 8 May 2016 10:19:35 -0000 1.20.2.3
+++ openacs-4/packages/file-storage/www/file-add.tcl 20 May 2016 20:37:03 -0000 1.20.2.4
@@ -8,7 +8,7 @@
file_id:naturalnum,optional,notnull
folder_id:naturalnum,optional,notnull
upload_file:trim,optional
- return_url:optional
+ return_url:localurl,optional
upload_file.tmpfile:tmpfile,optional
content_body:optional
{title ""}
Index: openacs-4/packages/file-storage/www/file-upload-confirm.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file-upload-confirm.tcl,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/file-storage/www/file-upload-confirm.tcl 12 Sep 2015 11:06:19 -0000 1.3.2.1
+++ openacs-4/packages/file-storage/www/file-upload-confirm.tcl 20 May 2016 20:37:03 -0000 1.3.2.2
@@ -6,7 +6,7 @@
} {
folder_id:naturalnum,notnull
cancel_url
- return_url
+ return_url:localurl
}
set package_id [ad_conn package_id]
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 -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/file-storage/www/folder-add.tcl 12 Sep 2015 11:06:19 -0000 1.5.2.1
+++ openacs-4/packages/file-storage/www/folder-add.tcl 20 May 2016 20:37:03 -0000 1.5.2.2
@@ -7,7 +7,7 @@
} {
folder_id:naturalnum,optional,notnull
upload_folder:trim,optional
- return_url:optional
+ return_url:localurl,optional
{lock_title_p:boolean 0}
} -properties {
Index: openacs-4/packages/file-storage/www/folder-zip-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-zip-add.tcl,v
diff -u -r1.7.2.3 -r1.7.2.4
--- openacs-4/packages/file-storage/www/folder-zip-add.tcl 13 May 2016 07:07:04 -0000 1.7.2.3
+++ openacs-4/packages/file-storage/www/folder-zip-add.tcl 20 May 2016 20:37:03 -0000 1.7.2.4
@@ -8,7 +8,7 @@
file_id:naturalnum,optional,notnull
folder_id:naturalnum,optional,notnull
upload_file:trim,optional,notnull
- return_url:optional
+ return_url:localurl,optional
upload_file.tmpfile:tmpfile,optional
{title ""}
{lock_title_p:boolean 0}
Index: openacs-4/packages/file-storage/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/index.tcl,v
diff -u -r1.32.2.2 -r1.32.2.3
--- openacs-4/packages/file-storage/www/index.tcl 20 Sep 2015 17:30:51 -0000 1.32.2.2
+++ openacs-4/packages/file-storage/www/index.tcl 20 May 2016 20:37:03 -0000 1.32.2.3
@@ -8,9 +8,9 @@
} {
{folder_id:naturalnum,notnull [fs_get_root_folder]}
{n_past_days:integer "99999"}
- {orderby:token,optional}
- {category_id:naturalnum ""}
- {return_url ""}
+ {orderby:token,notnull,optional}
+ {category_id:naturalnum,notnull ""}
+ {return_url:localurl ""}
} -validate {
valid_folder -requires {folder_id:integer} {
if {![fs_folder_p $folder_id]} {
Index: openacs-4/packages/file-storage/www/admin/upload-size-limit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/admin/upload-size-limit.tcl,v
diff -u -r1.7.2.1 -r1.7.2.2
--- openacs-4/packages/file-storage/www/admin/upload-size-limit.tcl 12 Sep 2015 11:06:21 -0000 1.7.2.1
+++ openacs-4/packages/file-storage/www/admin/upload-size-limit.tcl 20 May 2016 20:37:03 -0000 1.7.2.2
@@ -8,7 +8,7 @@
@cvs-id $Id$
} {
- {return_url ""}
+ {return_url:localurl ""}
}
set max_size [ns_config "ns/server/[ns_info server]/module/nssock" maxinput]