Index: openacs-4/packages/photo-album/www/photo-add-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo-add-2.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/photo-album/www/photo-add-2.tcl	12 Jun 2003 06:55:45 -0000	1.2
+++ openacs-4/packages/photo-album/www/photo-add-2.tcl	18 Nov 2003 18:27:53 -0000	1.3
@@ -21,6 +21,27 @@
 	    ad_complain "The specified album is not valid."
 	}
     }
+    valid_mime_type {
+ 
+        if ![parameter::get -parameter ConverttoJpgorPng -package_id [ad_conn package_id]] {  
+    
+	    if { [catch {set photo_info [pa_file_info ${upload_file.tmpfile}]}  errMsg] } { 
+            ns_log Warning "Error parsing file data Error: $errMsg" 
+            ad_complain "error" 
+	    } 
+         
+	    foreach {base_bytes base_width base_height base_type base_mime base_colors base_quantum base_sha256} $photo_info { break } 
+ 
+	    if [empty_string_p $base_mime] { 
+           set base_mime invalid 
+	    }   
+ 
+	    if ![regexp  $base_mime [parameter::get -parameter AcceptableUploadMIMETypes -package_id [ad_conn package_id]]] { 
+            ad_complain "The parameter AcceptableUploadMIMETypes is not satisfied" 
+            ad_complain "The parameter ConverttoJpgorPng is not in automatic mode" 
+	    } 
+	} 
+    }
     valid_photo_id -requires {photo_id:integer} {
 	# supplied photo_id must not already exist	
         if {[db_string check_photo_id {}]} {