@@ -, +, @@
conventions in koha-conf which use underscores rather than camel case
required to pass qa
---
C4/UploadedFiles.pm | 8 ++++----
cataloguing/value_builder/upload.pl | 6 +++---
etc/koha-conf.xml | 2 +-
installer/data/mysql/updatedatabase.pl | 4 ++--
.../prog/en/modules/cataloguing/value_builder/upload.tt | 4 ++--
t/db_dependent/UploadedFiles.t | 2 +-
6 files changed, 13 insertions(+), 13 deletions(-)
--- a/C4/UploadedFiles.pm
+++ a/C4/UploadedFiles.pm
@@ -61,8 +61,8 @@ use C4::Context;
sub _get_file_path {
my ($id, $dirname, $filename) = @_;
- my $uploadPath = C4::Context->config('uploadPath');
- my $filepath = "$uploadPath/$dirname/${id}_$filename";
+ my $upload_path = C4::Context->config('upload_path');
+ my $filepath = "$upload_path/$dirname/${id}_$filename";
$filepath =~ s|/+|/|g;
return $filepath;
@@ -81,7 +81,7 @@ Hash keys are:
=item * filename: name of the file
-=item * dir: directory where file is stored (relative to config variable 'uploadPath')
+=item * dir: directory where file is stored (relative to config variable 'upload_path')
=back
@@ -123,7 +123,7 @@ Parameters:
=item * $filename: name of the file
-=item * $dir: directory where to store the file (path relative to config variable 'uploadPath'
+=item * $dir: directory where to store the file (path relative to config variable 'upload_path'
=item * $io_handle: valid IO::Handle object, can be retrieved with
$cgi->upload('uploaded_file')->handle;
--- a/cataloguing/value_builder/upload.pl
+++ a/cataloguing/value_builder/upload.pl
@@ -108,7 +108,7 @@ sub plugin {
}
}
} else {
- my $upload_path = C4::Context->config('uploadPath');
+ my $upload_path = C4::Context->config('upload_path');
if ($upload_path) {
my $filefield = CGI::filefield(
-name => 'uploaded_file',
@@ -141,7 +141,7 @@ sub plugin {
# Build a hierarchy of directories
sub finddirs {
my $base = shift;
- my $upload_path = C4::Context->config('uploadPath');
+ my $upload_path = C4::Context->config('upload_path');
my $found = 0;
my @dirs;
my @files = glob("$base/*");
@@ -175,7 +175,7 @@ Two system preference are used:
=over 4
-=item * uploadPath: the real absolute path where files will be stored
+=item * upload_path: the real absolute path where files will be stored
=item * OPACBaseURL: for building URLs to be stored in MARC
--- a/etc/koha-conf.xml
+++ a/etc/koha-conf.xml
@@ -88,7 +88,7 @@ __PAZPAR2_TOGGLE_XML_POST__
Configuration variable 'uploadPath' is not configured.
+Configuration variable 'upload_path' is not configured.
Please configure it in your koha-conf.xml
[% ELSE %]