Index: openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml,v
diff -u -r1.19.8.5 -r1.19.8.6
--- openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml	9 May 2017 10:07:43 -0000	1.19.8.5
+++ openacs-4/packages/file-storage/catalog/file-storage.de_DE.ISO-8859-1.xml	24 May 2017 16:09:24 -0000	1.19.8.6
@@ -160,13 +160,15 @@
   <msg key="Search_again">Erneut suchen:</msg>
   <msg key="Search_Results">Suchergebnisse</msg>
   <msg key="Selected_items_have_been_copied">Ausgew�hlte Dateien wurden kopiert.</msg>
+  <msg key="Selected_items_have_been_moved">Ausgew�hlte Dateien wurden verschoben.</msg>
   <msg key="Set_Permissions">Berechtigungen erteilen</msg>
   <msg key="show_all_versions">Alle Versionen anzeigen</msg>
   <msg key="show_version_title">%version.title% anzeigen</msg>
   <msg key="simple_add_page_title">%pretty_name%  erstellen</msg>
   <msg key="Size">Gr��e</msg>
   <msg key="Size_bytes">Gr��e (Bytes)</msg>
   <msg key="There_was_a_problem_copying_the_following_items">Beim Kopieren der folgenden Dateien ist ein Fehler aufgetreten</msg>
+  <msg key="There_was_a_problem_moving_the_following_items">Es gab ein Problem beim Verschieben der folgenden Dateien</msg>
   <msg key="this_may_take_a_while">&lt;strong&gt;Hinweis:&lt;/strong&gt; Dieser Vorgang kann einige Minuten dauern. </msg>
   <msg key="Title">Name:</msg>
   <msg key="Title_">Name:</msg>
Index: openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml,v
diff -u -r1.42.2.2 -r1.42.2.3
--- openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	9 May 2017 10:07:43 -0000	1.42.2.2
+++ openacs-4/packages/file-storage/catalog/file-storage.en_US.ISO-8859-1.xml	24 May 2017 16:09:24 -0000	1.42.2.3
@@ -163,14 +163,16 @@
   <msg key="Search">Search</msg>
   <msg key="Search_again">Search again:</msg>
   <msg key="Search_Results">Search Results</msg>
-  <msg key="Selected_items_have_been_copied">Selected items have been copied.</msg>  
+  <msg key="Selected_items_have_been_copied">Selected items have been copied.</msg>
+  <msg key="Selected_items_have_been_moved">Selected items have been moved.</msg>
   <msg key="Set_Permissions">Set Permissions</msg>
   <msg key="show_all_versions">show all versions</msg>
   <msg key="show_version_title">Show %version.title%</msg>
   <msg key="simple_add_page_title">Create %pretty_name%</msg>
   <msg key="Size">Size</msg>
   <msg key="Size_bytes">Size (bytes)</msg>
-  <msg key="There_was_a_problem_copying_the_following_items">There was a problem copying the following items</msg>  
+  <msg key="There_was_a_problem_copying_the_following_items">There was a problem copying the following items</msg>
+  <msg key="There_was_a_problem_moving_the_following_items">There was a problem moving the following items</msg>
   <msg key="this_may_take_a_while">&lt;strong&gt;Note:&lt;/strong&gt; This may take a while, please be patient.</msg>
   <msg key="Title">Title</msg>
   <msg key="Title_">Title:</msg>
Index: openacs-4/packages/file-storage/catalog/file-storage.it_IT.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.it_IT.ISO-8859-1.xml,v
diff -u -r1.18.8.2 -r1.18.8.3
--- openacs-4/packages/file-storage/catalog/file-storage.it_IT.ISO-8859-1.xml	9 May 2017 10:07:44 -0000	1.18.8.2
+++ openacs-4/packages/file-storage/catalog/file-storage.it_IT.ISO-8859-1.xml	24 May 2017 16:09:24 -0000	1.18.8.3
@@ -159,13 +159,15 @@
   <msg key="Search_again">Cerca Ancora</msg>
   <msg key="Search_Results">Risultati della Ricerca</msg>
   <msg key="Selected_items_have_been_copied">Gli oggetti selezionati sono stati copiati.</msg>
+  <msg key="Selected_items_have_been_moved">Gli oggetti selezionati sono stati spostati.</msg>
   <msg key="Set_Permissions">Definisci Permessi</msg>
   <msg key="show_all_versions">mostra tutte le versioni</msg>
   <msg key="show_version_title">Mostra %version.title%</msg>
   <msg key="simple_add_page_title">Crea %pretty_name%</msg>
   <msg key="Size">Dimensione</msg>
   <msg key="Size_bytes">Dimensione (bytes)</msg>
   <msg key="There_was_a_problem_copying_the_following_items">Si � verificato un problema nel copiare i seguenti oggetti</msg>
+  <msg key="There_was_a_problem_moving_the_following_items">Si � verificato un problema nello spostare i seguenti oggetti</msg>
   <msg key="this_may_take_a_while">&lt;strong&gt;Nota:&lt;/strong&gt; Pu� richiedere qualche istante, attendi per favore. </msg>
   <msg key="Title">Titolo:</msg>
   <msg key="Title_">Titolo :</msg>
Index: openacs-4/packages/file-storage/www/move.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/move.tcl,v
diff -u -r1.10.2.2 -r1.10.2.3
--- openacs-4/packages/file-storage/www/move.tcl	2 Feb 2017 15:15:10 -0000	1.10.2.2
+++ openacs-4/packages/file-storage/www/move.tcl	24 May 2017 16:09:24 -0000	1.10.2.3
@@ -40,9 +40,10 @@
     }
     if {$type eq "folder"} {
         lappend not_allowed_children $object_id
-        lappend not_allowed_parents $parent_id
     }
-  
+    # prevent people from selecting source folder as destination
+    # folder
+    lappend not_allowed_parents $parent_id
 }
 
 set total_count [template::multirow size move_objects]
@@ -59,40 +60,40 @@
  	-privilege "write"
 
 
-    # check for WRTIE permission on each object to be moved
-    # DaveB: I think it should be DELETE instead of WRITE
-    # but the existing file-move page checks for WRITE
-     set error_items [list]
-    template::multirow foreach move_objects {
-	if {$copy_and_delete_p} {  
+     # check for WRTIE permission on each object to be moved
+     # DaveB: I think it should be DELETE instead of WRITE
+     # but the existing file-move page checks for WRITE
+     set error_items {}
+     template::multirow foreach move_objects {
+         if {$copy_and_delete_p} {  
              # copy and delete file to move it
-	    db_transaction {
-		if {$type ne "folder" } {  
-		    set file_rev_id [db_exec_plsql copy_item {}]  
-		    set file_id [content::revision::item_id -revision_id $file_rev_id]  
-		    callback fs::file_revision_new -package_id $package_id -file_id $file_id -parent_id $folder_id  
-		    fs::delete_file -item_id $object_id -parent_id $parent_id  
-		} else {  
-		    db_exec_plsql copy_folder {}  
-		    fs::delete_folder -folder_id $object_id -parent_id $parent_id  
-		}
-	    } on_error {
-		lappend error_items $name
-	    }
-	} else {
-	    # execute move command  
-	    db_transaction {  
-		db_exec_plsql move_item {}
-	    } on_error {
-		lappend error_items $name
-	    }
-	}    
-    }
-     
+             db_transaction {
+                 if {$type ne "folder" } {  
+                     set file_rev_id [db_exec_plsql copy_item {}]  
+                     set file_id [content::revision::item_id -revision_id $file_rev_id]  
+                     callback fs::file_revision_new -package_id $package_id -file_id $file_id -parent_id $folder_id  
+                     fs::delete_file -item_id $object_id -parent_id $parent_id  
+                 } else {  
+                     db_exec_plsql copy_folder {}  
+                     fs::delete_folder -folder_id $object_id -parent_id $parent_id  
+                 }
+             } on_error {
+                 lappend error_items $name
+             }
+         } else {
+             # execute move command  
+             db_transaction {  
+                 db_exec_plsql move_item {}
+             } on_error {
+                 lappend error_items $name
+             }
+         }    
+     }
+
      if {[llength $error_items]} {
-	 set message "There was a problem moving the following items: [join $error_items ", "]"
+         set message "[_ file-storage.There_was_a_problem_moving_the_following_items]: [join $error_items ", "]"
      } else {
-	 set message "Selected items moved"
+         set message [_ file-storage.Selected_items_have_been_moved]
      }
      ad_returnredirect -message $message $return_url
      ad_script_abort