Bug 15548: Move new patron related code to Patron*

[koha.git] / members / files.pl

diff --git a/members/files.pl b/members/files.pl
index ccd11bc..d71fa57 100755 (executable)
--- a/members/files.pl
+++ b/members/files.pl
@@ -4,37 +4,39 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 use strict;
 use warnings;
 
-use CGI;
+use CGI qw ( -utf8 );
 
 use C4::Auth;
+use C4::Branch;
 use C4::Output;
 use C4::Members;
+use C4::Members::Attributes qw(GetBorrowerAttributes);
 use C4::Debug;
 
 use Koha::DateUtils;
-use Koha::Borrower::Files;
+use Koha::Patron::Files;
 
 my $cgi = CGI->new;
 
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     {
-        template_name   => "members/files.tmpl",
+        template_name   => "members/files.tt",
         query           => $cgi,
         type            => "intranet",
         authnotrequired => 0,
@@ -45,7 +47,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 $template->param( 'borrower_files' => 1 );
 
 my $borrowernumber = $cgi->param('borrowernumber');
-my $bf = Koha::Borrower::Files->new( borrowernumber => $borrowernumber );
+my $bf = Koha::Patron::Files->new( borrowernumber => $borrowernumber );
 
 my $op = $cgi->param('op') || '';
 
@@ -73,7 +75,7 @@ else {
             my $filename = $cgi->param('uploadfile');
             my $mimetype = $cgi->uploadInfo($filename)->{'Content-Type'};
 
-            $errors{'empty_upload'} = 1 unless ( length($uploaded_file) > 0 );
+            $errors{'empty_upload'} = 1 if ( -z $uploaded_file );
 
             if (%errors) {
                 $template->param( errors => %errors );
@@ -100,10 +102,27 @@ else {
     }
 
     $template->param(
-        files => Koha::Borrower::Files->new( borrowernumber => $borrowernumber )
+        categoryname    => $data->{'description'},
+        branchname      => GetBranchName($data->{'branchcode'}),
+        RoutingSerials => C4::Context->preference('RoutingSerials'),
+    );
+
+    if (C4::Context->preference('ExtendedPatronAttributes')) {
+        my $attributes = GetBorrowerAttributes($borrowernumber);
+        $template->param(
+            ExtendedPatronAttributes => 1,
+            extendedattributes => $attributes
+        );
+    }
+
+    my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
+    $template->param( picture => 1 ) if $picture;
+
+    $template->param(
+        files => Koha::Patron::Files->new( borrowernumber => $borrowernumber )
           ->GetFilesInfo(),
 
-        errors => %errors
+        errors => \%errors,
     );
     output_html_with_http_headers $cgi, $cookie, $template->output;
 }