X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fhousebound.pl;h=574bacdbb1bdd1aa5978f22332d7966fb605204f;hb=9f112ff75c2049cb3e5a259e38ad27a7282f53d2;hp=2fa0fb0cf00bd4fe22289f6cb22a422ddce98015;hpb=01ebef46e72a5760afb4a8cf939e61d63059bcac;p=koha.git

diff --git a/members/housebound.pl b/members/housebound.pl
index 2fa0fb0cf0..574bacdbb1 100755
--- a/members/housebound.pl
+++ b/members/housebound.pl
@@ -47,7 +47,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         query           => $input,
         type            => 'intranet',
         authnotrequired => 0,
-        flagsrequired   => { borrowers => 1 },
+        flagsrequired   => { borrowers => 'edit_borrowers' },
     }
 );
 
@@ -56,19 +56,14 @@ my $method = $input->param('method') // q{};
 my $visit_id = $input->param('visit_id') // q{};
 
 # Get patron
-my $patron = eval {
-    my $borrowernumber = $input->param('borrowernumber') // q{};
-    return Koha::Patrons->find($borrowernumber);
-};
-push @messages, { type => 'error', code => 'error_on_patron_load' }
-    if ( $@ or !$patron );
+my $borrowernumber = $input->param('borrowernumber');
+my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+my $patron = Koha::Patrons->find($borrowernumber);
+output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
 
 # Get supporting cast
-my ( $branch, $category, $houseboundprofile, $visit, $patron_image );
-if ( $patron ) {
-    $patron_image = Koha::Patron::Images->find($patron->borrowernumber);
-    $branch = Koha::Libraries->new->find($patron->branchcode);
-    $category = Koha::Patron::Categories->new->find($patron->categorycode);
+my ( $houseboundprofile, $visit );
+if ( $patron ) { # FIXME This test is not needed - output_and_exit_if_error handles it
     $houseboundprofile = $patron->housebound_profile;
 }
 if ( $visit_id ) {
@@ -86,13 +81,13 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) {
     # We have received the input from the profile edit form.  We must save the
     # changes, and return to simple display.
     $houseboundprofile->set({
-        day           => $input->param('day')           // q{},
-        frequency     => $input->param('frequency')     // q{},
-        fav_itemtypes => $input->param('fav_itemtypes') // q{},
-        fav_subjects  => $input->param('fav_subjects')  // q{},
-        fav_authors   => $input->param('fav_authors')   // q{},
-        referral      => $input->param('referral')      // q{},
-        notes         => $input->param('notes')         // q{},
+        day           => scalar $input->param('day')           // q{},
+        frequency     => scalar $input->param('frequency')     // q{},
+        fav_itemtypes => scalar $input->param('fav_itemtypes') // q{},
+        fav_subjects  => scalar $input->param('fav_subjects')  // q{},
+        fav_authors   => scalar $input->param('fav_authors')   // q{},
+        referral      => scalar $input->param('referral')      // q{},
+        notes         => scalar $input->param('notes')         // q{},
     });
     my $success = eval { return $houseboundprofile->store };
     push @messages, { type => 'error', code => 'error_on_profile_store' }
@@ -103,13 +98,13 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) {
     # save it, and return to simple display.
     $houseboundprofile = Koha::Patron::HouseboundProfile->new({
         borrowernumber => $patron->borrowernumber,
-        day            => $input->param('day')           // q{},
-        frequency      => $input->param('frequency')     // q{},
-        fav_itemtypes  => $input->param('fav_itemtypes') // q{},
-        fav_subjects   => $input->param('fav_subjects')  // q{},
-        fav_authors    => $input->param('fav_authors')   // q{},
-        referral       => $input->param('referral')      // q{},
-        notes          => $input->param('notes')         // q{},
+        day            => scalar $input->param('day')           // q{},
+        frequency      => scalar $input->param('frequency')     // q{},
+        fav_itemtypes  => scalar $input->param('fav_itemtypes') // q{},
+        fav_subjects   => scalar $input->param('fav_subjects')  // q{},
+        fav_authors    => scalar $input->param('fav_authors')   // q{},
+        referral       => scalar $input->param('referral')      // q{},
+        notes          => scalar $input->param('notes')         // q{},
     });
     my $success = eval { return $houseboundprofile->store };
     push @messages, { type => 'error', code => 'error_on_profile_create' }
@@ -117,8 +112,8 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) {
     $method = undef;
 } elsif ( $method eq 'visit_update_or_create' ) {
     # We want to edit, edit a visit, so we must pass its details.
-    $deliverers = Koha::Patrons->new->search_housebound_deliverers;
-    $choosers = Koha::Patrons->new->search_housebound_choosers;
+    $deliverers = Koha::Patrons->search_housebound_deliverers;
+    $choosers = Koha::Patrons->search_housebound_choosers;
     $houseboundvisit = $visit;
 } elsif ( $method eq 'visit_delete' and $visit ) {
     # We want ot delete a specific visit.
@@ -130,11 +125,11 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) {
     # We have received input for editing a visit.  We must store and return to
     # simple display.
     $visit->set({
-        borrowernumber      => $input->param('borrowernumber')      // q{},
+        borrowernumber      => scalar $input->param('borrowernumber')      // q{},
         appointment_date    => dt_from_string($input->param('date') // q{}),
-        day_segment         => $input->param('segment')             // q{},
-        chooser_brwnumber   => $input->param('chooser')             // q{},
-        deliverer_brwnumber => $input->param('deliverer')           // q{},
+        day_segment         => scalar $input->param('segment')             // q{},
+        chooser_brwnumber   => scalar $input->param('chooser')             // q{},
+        deliverer_brwnumber => scalar $input->param('deliverer')           // q{},
     });
     my $success = eval { return $visit->store };
     push @messages, { type => 'error', code => 'error_on_visit_store' }
@@ -144,11 +139,11 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) {
     # We have received input for creating a visit.  We must store and return
     # to simple display.
     my $visit = Koha::Patron::HouseboundVisit->new({
-        borrowernumber      => $input->param('borrowernumber')      // q{},
+        borrowernumber      => scalar $input->param('borrowernumber')      // q{},
         appointment_date    => dt_from_string($input->param('date') // q{}),
-        day_segment         => $input->param('segment')             // q{},
-        chooser_brwnumber   => $input->param('chooser')             // q{},
-        deliverer_brwnumber => $input->param('deliverer')           // q{},
+        day_segment         => scalar $input->param('segment')             // q{},
+        chooser_brwnumber   => scalar $input->param('chooser')             // q{},
+        deliverer_brwnumber => scalar $input->param('deliverer')           // q{},
     });
     my $success = eval { return $visit->store };
     push @messages, { type => 'error', code => 'error_on_visit_create' }
@@ -160,7 +155,7 @@ if ( $method eq 'updateconfirm' and $houseboundprofile ) {
 $method = 'update_or_create' if ( !$houseboundprofile );
 
 # Ensure template has all patron details.
-$template->param(%{$patron->unblessed}) if ( $patron );
+$template->param( patron => $patron );
 
 # Load extended patron attributes if necessary (taken from members/files.pl).
 if ( C4::Context->preference('ExtendedPatronAttributes') and $patron ) {
@@ -172,11 +167,8 @@ if ( C4::Context->preference('ExtendedPatronAttributes') and $patron ) {
 }
 
 $template->param(
-    picture            => $patron_image,
     housebound_profile => $houseboundprofile,
     visit              => $houseboundvisit,
-    branch             => $branch,
-    category           => $category,
     messages           => \@messages,
     method             => $method,
     choosers           => $choosers,