Index: openacs-4/packages/file-storage/www/simple-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-add.tcl,v
diff -u -r1.17.2.2 -r1.17.2.3
--- openacs-4/packages/file-storage/www/simple-add.tcl	9 Mar 2021 10:13:37 -0000	1.17.2.2
+++ openacs-4/packages/file-storage/www/simple-add.tcl	9 Mar 2021 10:24:33 -0000	1.17.2.3
@@ -1,7 +1,7 @@
 ad_page_contract {
     page to add a new nonversioned object to the system
 
-    @author Ben Adida (ben@openforce.net)    
+    @author Ben Adida (ben@openforce.net)
     @author arjun (arjun@openforce.net)
     @creation-date 01 April 2002
     @cvs-id $Id$
@@ -12,9 +12,9 @@
     {lock_title_p:boolean 0}
 } -validate {
     valid_folder -requires {folder_id:integer} {
-	if {![fs_folder_p $folder_id]} {
-	    ad_complain "[_ file-storage.lt_The_specified_parent_]"
-	}
+        if {![fs_folder_p $folder_id]} {
+            ad_complain "[_ file-storage.lt_The_specified_parent_]"
+        }
     }
 } -properties {
     folder_id:onevalue
@@ -32,7 +32,9 @@
     return -code error "[_ file-storage.No_such_type]"
 }
 
-set context [fs_context_bar_list -final [_ file-storage.Add_pretty_name [list pretty_name $pretty_name]] $folder_id]
+set context [fs_context_bar_list -final \
+                [_ file-storage.Add_pretty_name \
+                    [list pretty_name $pretty_name]] $folder_id]
 
 # Should probably generate the item_id and version_id now for
 # double-click protection
@@ -62,8 +64,14 @@
 set submit_label [_ file-storage.Create]
 
 ad_form -extend -form {
-    {url:text(url) {label \#file-storage.URL\#} {value "https://"}}
-    {description:text(textarea),optional {html {rows 5 cols 50}} {label \#file-storage.Description\#}}
+    {url:text(url)
+        {label \#file-storage.URL\#}
+        {value "https://"}
+    }
+    {description:text(textarea),optional
+        {html {rows 5 cols 50}}
+        {label \#file-storage.Description\#}
+    }
 } -validate {
     {url
         {[string match "data:*" [string trim $url]] == 0}
@@ -74,37 +82,60 @@
 
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
-if { [parameter::get -parameter CategoriesP -package_id $package_id -default 0] } {
+if { [parameter::get \
+        -parameter CategoriesP \
+        -package_id $package_id -default 0]
+} {
     category::ad_form::add_widgets \
-	 -container_object_id $package_id \
-	 -categorized_object_id $folder_id \
-	 -form_name simple-add
+         -container_object_id $package_id \
+         -categorized_object_id $folder_id \
+         -form_name simple-add
 }
 
 ad_form -extend -form {
     {submit:text(submit) {label $submit_label}}
 } -on_request {
 } -on_submit {
-    set item_id [content::extlink::new -url $url -label $title -description $description -parent_id $folder_id]
-
-    # Analogous as for files (see file-add-2) we know the user has write permission to this folder, 
-    # but they may not have admin privileges.
-    # They should always be able to admin their own url (item) by default, so they can delete it, control
-    # who can read it, etc.
-    
-    if { [string is false [permission::permission_p -party_id $user_id -object_id $folder_id -privilege admin]] } {
-	permission::grant -party_id $user_id -object_id $item_id -privilege admin
+    set item_id [content::extlink::new \
+                    -url $url \
+                    -label $title \
+                    -description $description \
+                    -parent_id $folder_id]
+    #
+    # Analogous as for files (see file-add-2) we know the user has write
+    # permission to this folder,  but they may not have admin privileges.
+    # They should always be able to admin their own url (item) by default, so
+    # they can delete it, control who can read it, etc.
+    #
+    if { [string is false [permission::permission_p \
+                                -party_id $user_id \
+                                -object_id $folder_id \
+                                -privilege admin]]
+    } {
+        permission::grant \
+            -party_id $user_id \
+            -object_id $item_id \
+            -privilege admin
     }
 
-    if { [parameter::get -parameter CategoriesP -package_id $package_id -default 0] } {
-	category::map_object -remove_old -object_id $item_id [category::ad_form::get_categories \
-								       -container_object_id $package_id \
-								       -element_name category_id]
+    if { [parameter::get -parameter CategoriesP \
+            -package_id $package_id \
+            -default 0]
+    } {
+        category::map_object \
+            -remove_old \
+            -object_id $item_id \
+            [category::ad_form::get_categories \
+                -container_object_id $package_id \
+                -element_name category_id]
     }
 
+    fs::do_notifications \
+        -folder_id $folder_id \
+        -filename $url \
+        -item_id $item_id \
+        -action "new_url"
 
-    fs::do_notifications -folder_id $folder_id -filename $url -item_id $item_id -action "new_url"
-
 } -after_submit {
 
     ad_returnredirect "?folder_id=$folder_id"
Index: openacs-4/packages/file-storage/www/simple-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/simple-edit.tcl,v
diff -u -r1.14.2.1 -r1.14.2.2
--- openacs-4/packages/file-storage/www/simple-edit.tcl	9 Mar 2021 10:13:37 -0000	1.14.2.1
+++ openacs-4/packages/file-storage/www/simple-edit.tcl	9 Mar 2021 10:24:33 -0000	1.14.2.2
@@ -15,28 +15,51 @@
 
 ad_form -name simple-edit -form {
     object_id:key
-    {name:text {label "#file-storage.Title_#"} {html {size 40} } }
-    {url:text(url) {label "#file-storage.URL#"} {html {size 50} } }
-    {description:text(textarea),optional {label "#file-storage.Description#" } {html { rows 5 cols 50 } } }
+    {name:text
+        {label "#file-storage.Title_#"}
+        {html {size 40} }
+    }
+    {url:text(url)
+        {label "#file-storage.URL#"}
+        {html {size 50} }
+    }
+    {description:text(textarea),optional
+        {label "#file-storage.Description#" }
+        {html { rows 5 cols 50 } }
+    }
     {folder_id:text(hidden)}
 }
 
 set package_id [ad_conn package_id]
-if { [parameter::get -parameter CategoriesP -package_id $package_id -default 0] } {
+if { [parameter::get \
+        -parameter CategoriesP \
+        -package_id $package_id -default 0]
+} {
     category::ad_form::add_widgets \
-	 -container_object_id $package_id \
-	 -categorized_object_id $object_id \
-	 -form_name simple-edit
+        -container_object_id $package_id \
+        -categorized_object_id $object_id \
+        -form_name simple-edit
 }
 
 ad_form -extend -edit_request {
     db_1row extlink_data ""
 } -edit_data {
-    content::extlink::edit -extlink_id $object_id -url $url -label $name -description $description
-    if { [parameter::get -parameter CategoriesP -package_id $package_id -default 0] } {
-	category::map_object -remove_old -object_id $object_id [category::ad_form::get_categories \
-								       -container_object_id $package_id \
-								       -element_name category_id]
+    content::extlink::edit \
+        -extlink_id $object_id \
+        -url $url \
+        -label $name \
+        -description $description
+    if { [parameter::get \
+            -parameter CategoriesP \
+            -package_id $package_id \
+            -default 0]
+} {
+    category::map_object \
+        -remove_old \
+        -object_id $object_id \
+        [category::ad_form::get_categories \
+            -container_object_id $package_id \
+            -element_name category_id]
     }
     ad_returnredirect [export_vars -base . folder_id]
     ad_script_abort