Index: openacs-4/packages/photo-album/www/photos-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photos-add-2.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/photo-album/www/photos-add-2.tcl 12 Jun 2003 06:55:45 -0000 1.2 +++ openacs-4/packages/photo-album/www/photos-add-2.tcl 12 Jun 2003 18:05:05 -0000 1.3 @@ -25,11 +25,11 @@ } directory_exists -requires {directory:notnull} { if {![empty_string_p $directory] && ![file isdirectory $directory]} { - ad_complain "The directory file does not exist" + ad_complain "The directory file does not exist" } } directory_tmp -requires {directory:notnull} { - if {!([ad_conn user_id] == 287 || [ad_conn user_id] == 2601) && ( ![string match "/tmp/pa-tmp" $directory ] || [string match ".." $directory]) } { + if {![empty_string_p $directory] && !([ad_conn user_id] == 287 || [ad_conn user_id] == 2601) && ( ![string match "/tmp/pa-tmp" $directory ] || [string match ".." $directory]) } { ad_complain "You can currently only load images from /tmp/pa-tmp for security" } } @@ -51,11 +51,19 @@ ad_script_abort } +ReturnHeaders text/html +ns_write "