Attachment 117652 Details for Bug 22824 – Bug 22824: Prevent YesNo to be filled with invalid values

[patch] Bug 22824: Prevent YesNo to be filled with invalid values

Bug-22824-Prevent-YesNo-to-be-filled-with-invalid-.patch (text/plain), 2.52 KB, created by Martin Renvoize (ashimema) on 2021-03-04 09:20:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-03-04 09:20:19 UTC

Size: 2.52 KB

patch

obsolete

>From 4e646bf03682b5d6aa4b073d58773eedd42e1b10 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 15 Feb 2021 11:37:58 +0100
>Subject: [PATCH] Bug 22824: Prevent YesNo to be filled with invalid values
>
>This patch prevents koha-preferences to set other values than 1/0 to be
>used for YesNo prefs
>
>Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> misc/admin/koha-preferences | 24 ++++++++++++++++--------
> 1 file changed, 16 insertions(+), 8 deletions(-)
>
>diff --git a/misc/admin/koha-preferences b/misc/admin/koha-preferences
>index 418c80cb04..af2cce2b7c 100755
>--- a/misc/admin/koha-preferences
>+++ b/misc/admin/koha-preferences
>@@ -60,14 +60,23 @@ sub _set_preference {
> 
>     _debug( "Setting $preference to $value" );
> 
>-    C4::Context->set_preference( $preference, $value );
>+    if (   $preference->{type} eq 'YesNo'
>+        && $value ne '0'
>+        && $value ne '1' )
>+    {
>+        print STDERR sprintf "System preference %s is YesNo and expects 1 or 0. '%s' was given, using '0'\n",
>+          $preference->{variable}, $value;
>+        $value = 0;
>+    }
>+
>+    C4::Context->set_preference( $preference->{variable}, $value );
> }
> 
> sub GetPreferences {
>     my $dbh = C4::Context->dbh;
> 
>     return {
>-        map { $_->{'variable'},  $_ }
>+        map { $_->{variable},  $_->{value} }
>         @{ $dbh->selectall_arrayref( "
>             SELECT
>               variable, value, type
>@@ -91,12 +100,11 @@ sub SetPreferences {
> 
>     exit 2 if ( scalar( @$current_state ) != scalar( keys %preferences ) );
> 
>-    # Iterate through again, now that we've checked all of the YesNo sysprefs
>-
>     foreach my $row ( @$current_state ) {
>-        next if ( $preferences{$row->{'variable'}} eq $row->{'value'} );
>+        my $new_value = $preferences{ $row->{variable} };
>+        next if $new_value && $row->{value} && $new_value eq $row->{value};
> 
>-        _set_preference( $row->{'variable'}, $preferences{$row->{'variable'}} );
>+        _set_preference( $row, $new_value );
>     }
> 
>     # FIXME This may be not needed
>@@ -134,7 +142,7 @@ sub SetPreference {
> 
>     exit 3 if ( $value eq $row->{'value'} ); #FIXME exit??
> 
>-    _set_preference( $preference, $value );
>+    _set_preference( $row, $value );
> }
> 
> sub ClearPreference {
>@@ -148,7 +156,7 @@ sub ClearPreference {
> 
>     exit 3 if ( $value eq $row->{'value'} );
> 
>-    _set_preference( $preference, $value );
>+    _set_preference( $row, $value );
> }
> 
> =head1 OPTIONS
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 22824: 116722 | 116723 | 116724 | 116725 | 116726 | 116727 | 116728 | 116729 | 116730 | 116731 | 116732 | 116733 | 116734 | 116735 | 116736 | 116741 | 116742 | 116743 | 116744 | 116745 | 116746 | 116747 | 116748 | 116749 | 116750 | 116751 | 116752 | 116753 | 116754 | 116755 | 116756 | 116881 | 116882 | 116883 | 116884 | 117037 | 117039 | 117040 | 117041 | 117042 | 117043 | 117044 | 117045 | 117046 | 117047 | 117048 | 117049 | 117050 | 117051 | 117052 | 117053 | 117054 | 117055 | 117056 | 117057 | 117058 | 117636 | 117637 | 117638 | 117639 | 117640 | 117641 | 117642 | 117643 | 117644 | 117645 | 117646 | 117647 | 117648 | 117649 | 117650 | 117651 | 117652 | 117653 | 117664 | 117666