Index: openacs-4/contrib/obsolete-packages/photo-album-lite/www/photo-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/obsolete-packages/photo-album-lite/www/photo-add-2.tcl,v diff -u -N -r1.2 -r1.3 --- openacs-4/contrib/obsolete-packages/photo-album-lite/www/photo-add-2.tcl 10 Sep 2002 22:23:14 -0000 1.2 +++ openacs-4/contrib/obsolete-packages/photo-album-lite/www/photo-add-2.tcl 18 Sep 2002 13:03:18 -0000 1.3 @@ -29,6 +29,7 @@ if !$caller_id { ad_return_complaint 1 "Sorry, you don't appear to be logged in. Please log in and try again." + ad_script_abort } ad_require_permission $folder_id write @@ -38,6 +39,7 @@ set guessed_file_type [string tolower [ns_guesstype [set file$num]]] if { [lsearch [list image/gif image/jpeg application/x-zip-compressed] $guessed_file_type] < 0 } { ad_return_complaint 1 "Sorry, only GIF, JPEG, and ZIP formats are allowed at this time. Please make sure your images are in the correct format and that your filenames end in .gif or .jpg." + ad_script_abort } } } @@ -50,11 +52,13 @@ if [catch {pl_bulk_insert -use_default_date $use_default_date -use_default_prefix $use_default_prefix $folder_id [set file${num}.tmpfile]} errMsg] { global errorInfo doc_return 200 text/plain "sorry, there was an error: $errMsg" + ad_script_abort } } else { if [catch {pl_photo_insert -use_default_date $use_default_date -use_default_prefix $use_default_prefix $folder_id [set file${num}.tmpfile] [set file$num]} errMsg] { global errorInfo doc_return 200 text/plain "sorry, there was an error: $errMsg" + ad_script_abort } }