X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-privacy.pl;h=81d59585124914b96e8057790a9b082b27f4dce9;hb=577a237a3f15a5a3c2e27761a900994e439affcf;hp=8796a7a8dd6128ab9d77a3e4dd17a63ccfab1c95;hpb=0a49e3bf92ae3fa4b03067199d1e860f1fe0b274;p=srvgit

diff --git a/opac/opac-privacy.pl b/opac/opac-privacy.pl
index 8796a7a8dd..81d5958512 100755
--- a/opac/opac-privacy.pl
+++ b/opac/opac-privacy.pl
@@ -16,16 +16,15 @@
 # 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 Modern::Perl;
 use CGI qw ( -utf8 );
 
-use C4::Auth;    # checkauth, getborrowernumber.
+use C4::Auth qw( get_template_and_user );
 use C4::Context;
-use C4::Members;
-use C4::Output;
+use C4::Output qw( output_html_with_http_headers );
 use Koha::Patrons;
 
-my $query = new CGI;
+my $query = CGI->new;
 
 # if OPACPrivacy is disabled, leave immediately
 if ( ! C4::Context->preference('OPACPrivacy') || ! C4::Context->preference('opacreadinghistory') ) {
@@ -33,55 +32,78 @@ if ( ! C4::Context->preference('OPACPrivacy') || ! C4::Context->preference('opac
     exit;
 }
 
-my $dbh   = C4::Context->dbh;
-
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
         template_name   => "opac-privacy.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
-        debug           => 1,
     }
 );
 
 my $op                         = $query->param("op");
 my $privacy                    = $query->param("privacy");
 my $privacy_guarantor_checkouts = $query->param("privacy_guarantor_checkouts");
+my $privacy_guarantor_fines     = $query->param("privacy_guarantor_fines");
+
+my $patron = Koha::Patrons->find( $borrowernumber );
 
 if ( $op eq "update_privacy" ) {
-    ModMember(
-        borrowernumber             => $borrowernumber,
-        privacy                    => $privacy,
-        privacy_guarantor_checkouts => $privacy_guarantor_checkouts,
-    );
-    $template->param( 'privacy_updated' => 1 );
+    if ( $patron ) {
+        $patron->set({
+            privacy                    => $privacy,
+            privacy_guarantor_checkouts => defined $privacy_guarantor_checkouts?$privacy_guarantor_checkouts:$patron->privacy_guarantor_checkouts,
+            privacy_guarantor_fines     => defined $privacy_guarantor_fines?$privacy_guarantor_fines:$patron->privacy_guarantor_fines,
+        })->store;
+        $template->param( 'privacy_updated' => 1 );
+    }
 }
 elsif ( $op eq "delete_record" ) {
 
-    # delete all reading records for items returned
-    my $rows = eval {
-        Koha::Patrons->search({ 'me.borrowernumber' => $borrowernumber })->anonymise_issue_history;
-    };
-    $template->param(
-        (
-              $@    ? ( history_not_deleted => 1 )
-            : $rows ? ( deleted             => int($rows) )
-            :         ( nothing_to_delete => 1 )
-        )
-    );
-}
+    my $holds     = $query->param('holds');
+    my $checkouts = $query->param('checkouts');
+    my $all       = $query->param('all');
+
+    $template->param( delete_all_quested => 1 )
+      if $all;
+
+    if ( $all or $checkouts ) {
+
+        # delete all reading records for items returned
+        my $rows = eval { $patron->old_checkouts->anonymize + 0 };
 
-# get borrower privacy ....
-my $borrower = Koha::Patrons->find( $borrowernumber );;
+        $template->param(
+            (
+                  $@    ? ( error_deleting_checkouts_history => 1 )
+                : $rows ? ( deleted_checkouts => int($rows) )
+                :         ( no_checkouts_to_delete => 1 )
+            ),
+            delete_checkouts_requested => 1,
+        );
+    }
+
+    if ( $all or $holds ) {
+
+        my $rows = eval { $patron->old_holds->anonymize + 0 };
+
+        $template->param(
+            (
+                  $@    ? ( error_deleting_holds_history => 1 )
+                : $rows ? ( deleted_holds => int($rows) )
+                :         ( no_holds_to_delete => 1 )
+            ),
+            delete_holds_requested => 1,
+        );
+    }
+}
 
 $template->param(
-    'Ask_data'                       => 1,
-    'privacy' . $borrower->privacy() => 1,
-    'privacyview'                    => 1,
-    'borrower'                       => $borrower,
-    'surname'                        => $borrower->surname,
-    'firstname'                      => $borrower->firstname,
+    'Ask_data'                     => 1,
+    'privacy' . $patron->privacy() => 1,
+    'privacyview'                  => 1,
+    'borrower'                     => $patron,
+    'surname'                      => $patron->surname,
+    'firstname'                    => $patron->firstname,
+    'has_guarantor_flag'           => $patron->guarantor_relationships->guarantors->_resultset->count
 );
 
 output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };