Index: openacs-4/packages/xowiki/www/admin/import.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/import.tcl,v
diff -u -r1.12 -r1.13
--- openacs-4/packages/xowiki/www/admin/import.tcl	21 Feb 2008 21:44:53 -0000	1.12
+++ openacs-4/packages/xowiki/www/admin/import.tcl	9 Jul 2008 11:39:48 -0000	1.13
@@ -4,17 +4,28 @@
   @author Gustaf Neumann (gustaf.neumann@wu-wien.ac.at)
   @creation-date Aug 11, 2006
   @cvs-id $Id$
+} -parameter {
+  {keep_user_ids 0}
+  {replace 0}
+}
 
-} 
 
+
 set msg ""
 ad_form \
     -name upload_form \
     -mode edit \
-    -export {fs_package_id folder_id orderby selector_type file_types} \
     -html { enctype multipart/form-data } \
     -form {
-      {upload_file:file(file) {html {size 30}} }
+      {upload_file:file(file) {html {size 30}} {label "Import file for upload"} }
+      {keep_user_ids:integer(radio),optional {options {{yes 1} {no 0}}} {value 0} 
+        {label "Keep user_ids"}
+        {help_text "If checked, import will keep the original user_ids and create the needed user_ids if necessary"}
+      }
+      {replace:integer(radio),optional {options {{yes 1} {no 0}}} {value 0} 
+        {label "Replace objects"}
+        {help_text "If checked, import will delete the object if it exists and create it new, otherwise import just adds a revision"}
+      }
       {ok_btn:text(submit) {label "[_ acs-templating.HTMLArea_SelectUploadBtn]"}
       }
     } \
@@ -37,7 +48,7 @@
       if {[catch {namespace eval ::xo::import $content} error]} {
         set msg "Error: $error"
       } else {
-        set msg [$package_id import -replace 0]
+        set msg [$package_id import -replace $replace -keep_user_ids $keep_user_ids]
       }
       namespace delete ::xo::import
     }