Index: openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl,v
diff -u -N -r1.8 -r1.9
--- openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl	27 Oct 2014 16:42:07 -0000	1.8
+++ openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl	27 Apr 2015 15:28:24 -0000	1.9
@@ -4,54 +4,54 @@
   parent_id:notnull,naturalnum
   {bild_url ""}
 }
+
+#      {width:text(text),optional {label #xowiki.width_in_pixel}}
+#      {height:text(text),optional {label #xowiki.height_in_pixel}}
+
 set js_update ""
 ad_form -name upload_form \
     -export { parent_id CKEditorFuncNum } \
     -html { enctype multipart/form-data } \
+    -has_submit 1 \
     -mode edit \
     -form {
-      {upload_file:file(file),optional {label "Bild zum Hochladen auswählen"}}
-      {width:text(text),optional {label "Breite in Pixel"}}
-      {height:text(text),optional {label "Höhe in Pixel"}}
+	{upload_file:file(file),optional {label #xowiki.choose_file#}}
     } -on_submit {
-      set width [template::element::get_values upload_form width]
-      set height [template::element::get_values upload_form height]
+      #set width [template::element::get_values upload_form width]
+      #set height [template::element::get_values upload_form height]
       set size ""
-      if {$width ne ""} {append size $width}
-      if {$height ne ""} {append size x$height}
+      #if {$width ne ""} {append size $width}
+      #if {$height ne ""} {append size x$height}
 
       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]
-      #ds_comment $upload_tmpfile
+      set mime_type [::xowiki::guesstype $file_name]
+      set tmp_size [file size $upload_tmpfile]
+
       if {$size ne ""} {exec convert -resize $size $upload_tmpfile $upload_tmpfile}
+      if {![regexp (image/*|audio/mpeg|application/x-shockwave-flash|video/mp4) $mime_type]} {
+        #template::form::set_error "upload_image" "upload_file" "[_ tlf-resource-integrator.HTMLArea_SelectImageUploadNoImage]"
+        break
+      }    
 
-      if {![string match "image/*" $mime_type]} {
-	# File is no image
-	template::form::set_error "upload_image" "upload_file" "[_ acs-templating.HTMLArea_SelectImageUploadNoImage]"
-	break
-      }
-
-      #set parent_id  [xo::dc get_value _ "select parent_id from cr_items where item_id=:fs_package_id"]
       set title $file_name
-      
       set existing_filenames [xo::dc list _ "select name from cr_items  where parent_id = :parent_id" ]
-      ns_log notice "util_text_to_url  -text ${title} -existing_urls \"$existing_filenames\" -replacement \"_\""	
-      set filename [util_text_to_url  -text "${title}" -existing_urls "$existing_filenames" -replacement "_"]
+      set filename [util_text_to_url  -text $title -existing_urls $existing_filenames -replacement "_"]
       set package_id [xo::dc get_value _ "select package_id from acs_objects where object_id=:parent_id"]
+
       ::xowiki::Package initialize -package_id $package_id
       set file_object [::xowiki::File new -destroy_on_cleanup \
                            -title $title \
                            -name file:$filename \
                            -parent_id $parent_id \
                            -package_id $package_id \
-                           -mime_type [::xowiki::guesstype $title] \
+                           -mime_type $mime_type \
                            -creation_user [ad_conn user_id]]
       $file_object set import_file $upload_tmpfile
       $file_object save_new
       set revision_id [$file_object set revision_id]
 
       set bild_url "[$file_object pretty_link]?m=download"
       set image_browser_url [ad_conn package_url]/ckeditor-images
-      set js_update "parent.frames\['thumbs'\].location='$image_browser_url/thumb-view?parent_id=${parent_id}';"
+      set js_update "parent.frames\['thumbs'\].location='$image_browser_url/thumb-view?parent_id=$parent_id';"
     }