Attachment 172034 Details for Bug 33462 – Bug 33462: (Follow up) Fix Perl Tidy

[patch] Bug 33462: (Follow up) Fix Perl Tidy

Bug-33462-Follow-up-Fix-Perl-Tidy.patch (text/plain), 6.52 KB, created by Olivier Vezina on 2024-09-26 19:18:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Vezina

Created: 2024-09-26 19:18:36 UTC

Size: 6.52 KB

patch

obsolete

>From 99431e8fbdda31eb940e2df0dbfda497b222d824 Mon Sep 17 00:00:00 2001
>From: Sam Lau <samalau@gmail.com>
>Date: Fri, 7 Jun 2024 19:26:51 +0000
>Subject: [PATCH] Bug 33462: (Follow up) Fix Perl Tidy
>
>Signed-off-by: Laura_Escamilla <laura.escamilla@bywatersolutions.com>
>Signed-off-by: Olivier V <olivier.vezina@inLibro.com>
>---
> Koha/Patron.pm                                |  7 +++--
> admin/categories.pl                           | 30 +++++++++----------
> .../data/mysql/atomicupdate/bug_33462.pl      | 12 +++++---
> 3 files changed, 27 insertions(+), 22 deletions(-)
>
>diff --git a/Koha/Patron.pm b/Koha/Patron.pm
>index 02ff8d4f7e..972037cc75 100644
>--- a/Koha/Patron.pm
>+++ b/Koha/Patron.pm
>@@ -291,10 +291,11 @@ sub store {
>                 # Make a copy of the plain text password for later use
>                 $self->plain_text_password( $self->password );
> 
>-                if($self->category->effective_force_password_reset_when_set_by_staff and ($self->categorycode ne C4::Context->preference("PatronSelfRegistrationDefaultCategory"))){
>+                if ( $self->category->effective_force_password_reset_when_set_by_staff
>+                    and ( $self->categorycode ne C4::Context->preference("PatronSelfRegistrationDefaultCategory") ) )
>+                {
>                     $self->password_expiration_date(dt_from_string);
>-                }
>-                else {
>+                } else {
>                     $self->password_expiration_date(
>                           $self->password
>                         ? $self->category->get_password_expiry_date || undef
>diff --git a/admin/categories.pl b/admin/categories.pl
>index 60d14a76b0..ce1bd85d28 100755
>--- a/admin/categories.pl
>+++ b/admin/categories.pl
>@@ -52,8 +52,7 @@ if ( $op eq 'add_form' ) {
>     );
> 
>     if ( C4::Context->preference('EnhancedMessagingPreferences') ) {
>-        C4::Form::MessagingPreferences::set_form_values(
>-            { categorycode => $categorycode }, $template );
>+        C4::Form::MessagingPreferences::set_form_values( { categorycode => $categorycode }, $template );
>     }
> }
> elsif ( $op eq 'cud-add_validate' ) {
>@@ -86,16 +85,16 @@ elsif ( $op eq 'cud-add_validate' ) {
>     my $can_be_guarantee = $input->param('can_be_guarantee');
>     my $force_password_reset_when_set_by_staff = $input->param('force_password_reset_when_set_by_staff');
> 
>-    $reset_password = undef if $reset_password eq -1;
>-    $change_password = undef if $change_password eq -1;
>-    $min_password_length = undef unless length($min_password_length);
>-    $require_strong_password = undef if $require_strong_password eq -1;
>+    $reset_password                         = undef if $reset_password eq -1;
>+    $change_password                        = undef if $change_password eq -1;
>+    $min_password_length                    = undef unless length($min_password_length);
>+    $require_strong_password                = undef if $require_strong_password eq -1;
>     $force_password_reset_when_set_by_staff = undef if $force_password_reset_when_set_by_staff eq -1;
> 
>     my $is_a_modif = $input->param("is_a_modif");
> 
>     if ($is_a_modif) {
>-        my $category = Koha::Patron::Categories->find( $categorycode );
>+        my $category = Koha::Patron::Categories->find($categorycode);
>         $category->categorycode($categorycode);
>         $category->description($description);
>         $category->enrolmentperiod($enrolmentperiod);
>@@ -126,13 +125,12 @@ elsif ( $op eq 'cud-add_validate' ) {
>             $category->store;
>             $category->replace_library_limits( \@branches );
>         };
>-        if ( $@ ) {
>-            push @messages, {type => 'error', code => 'error_on_update' };
>+        if ($@) {
>+            push @messages, { type => 'error', code => 'error_on_update' };
>         } else {
>             push @messages, { type => 'message', code => 'success_on_update' };
>         }
>-    }
>-    else {
>+    } else {
>         my $category = Koha::Patron::Category->new(
>             {
>                 categorycode                           => $categorycode,
>@@ -168,7 +166,7 @@ elsif ( $op eq 'cud-add_validate' ) {
>             $category->replace_library_limits( \@branches );
>         };
> 
>-        if ( $@ ) {
>+        if ($@) {
>             push @messages, { type => 'error', code => 'error_on_insert' };
>         } else {
>             push @messages, { type => 'message', code => 'success_on_insert' };
>@@ -176,12 +174,14 @@ elsif ( $op eq 'cud-add_validate' ) {
>     }
> 
>     if ( C4::Context->preference('EnhancedMessagingPreferences') ) {
>-        C4::Form::MessagingPreferences::handle_form_action( $input,
>-            { categorycode => scalar $input->param('categorycode') }, $template );
>+        C4::Form::MessagingPreferences::handle_form_action(
>+            $input,
>+            { categorycode => scalar $input->param('categorycode') }, $template
>+        );
>     }
> 
>     $searchfield = q||;
>-    $op = 'list';
>+    $op          = 'list';
> }
> elsif ( $op eq 'delete_confirm' ) {
> 
>diff --git a/installer/data/mysql/atomicupdate/bug_33462.pl b/installer/data/mysql/atomicupdate/bug_33462.pl
>index d74effdfec..9751e3f28f 100755
>--- a/installer/data/mysql/atomicupdate/bug_33462.pl
>+++ b/installer/data/mysql/atomicupdate/bug_33462.pl
>@@ -7,14 +7,18 @@ return {
>     up          => sub {
>         my ($args) = @_;
>         my ( $dbh, $out ) = @$args{qw(dbh out)};
>-        $dbh->do(q{
>+        $dbh->do(
>+            q{
>         INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` )
> VALUES ('ForcePasswordResetWhenSetByStaff', '0', NULL,'Force a staff created patron account to reset its password after its first OPAC login.', 'YesNo')
>-        });
>+        }
>+        );
>         say $out "Added new system preference 'ForcePasswordResetWhenSetByStaff'";
> 
>-        if( !column_exists( 'categories', 'force_password_reset_when_set_by_staff' ) ) {
>-            $dbh->do("ALTER TABLE categories ADD COLUMN `force_password_reset_when_set_by_staff` TINYINT(1) NULL DEFAULT NULL AFTER `require_strong_password` -- if patrons of this category are required to reset password after being created by a staff member");
>+        if ( !column_exists( 'categories', 'force_password_reset_when_set_by_staff' ) ) {
>+            $dbh->do(
>+                "ALTER TABLE categories ADD COLUMN `force_password_reset_when_set_by_staff` TINYINT(1) NULL DEFAULT NULL AFTER `require_strong_password` -- if patrons of this category are required to reset password after being created by a staff member"
>+            );
>         }
> 
>         say $out "Added column to categories 'force_password_reset_when_set_by_staff'";
>-- 
>2.34.1

Actions: View | Diff | Splinter Review

Attachments on bug 33462: 153687 | 153688 | 153689 | 154395 | 154396 | 154397 | 167582 | 167583 | 167584 | 167585 | 167586 | 167587 | 167981 | 167982 | 167983 | 167984 | 167985 | 167986 | 168413 | 168414 | 168415 | 168416 | 168417 | 168418 | 168452 | 168453 | 168454 | 168455 | 168456 | 168457 | 171634 | 171635 | 171636 | 171637 | 171638 | 171639 | 171640 | 172030 | 172031 | 172032 | 172033 | 172034 | 172035 | 172036 | 172064 | 172065 | 172066 | 172067 | 172068 | 172069 | 172070 | 172071 | 173864 | 173865