adding a pre-check for patronimages/ dir, which won't be there by

default

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
index 3c55468..539f2d4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/picture-upload.tmpl
@@ -31,9 +31,12 @@
     <!-- /TMPL_LOOP -->\r
 <!-- TMPL_ELSE -->\r
 \r
-    <!-- TMPL_IF name="errors" -->\r
-        <!-- TMPL_LOOP name="errors" -->\r
+    <!-- TMPL_IF name="ERRORS" -->\r
+        <!-- TMPL_LOOP name="ERRORS" -->\r
         <ul class="error">\r
+               <!-- TMPL_IF NAME="NODIR" -->\r
+                       <li>The patronimages/ directory isn't present on your server, please ask your systems administrator to create it</li>\r
+               <!-- /TMPL_IF -->\r
         <!-- TMPL_IF name="NOTZIP" -->\r
             <li>The upload file does not appear to be a zip file.  The extention is not '.zip'.</li>\r
         <!-- /TMPL_IF -->\r

diff --git a/tools/picture-upload.pl b/tools/picture-upload.pl
index c1834ca..445b071 100755 (executable)
--- a/tools/picture-upload.pl
+++ b/tools/picture-upload.pl
@@ -22,6 +22,13 @@ my ($template, $loggedinuser, $cookie)
                                        debug => 0,
                                        });
 
+unless (-d $destdir) {
+       $errors{'NODIR'} = 1;
+       warn "patronimages directory not present";
+}
+if ( %errors ) {
+    $template->param( ERRORS => [ \%errors ] );
+}
 my $uploadfilename = $input->param( 'uploadfile' );
 my $uploadfile = $input->upload( 'uploadfile' );
 my ( $total, $handled, @counts );