bitlair/revbank
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

statiegeld: case insensitive usernames

Browse source 
Shouldn't usually matter because these are already normalized, but would
matter if the case of an existing username ever changes.
This commit is contained in:
Juerd Waalboer 2023-04-08 22:26:50 +02:00
parent 2015e6362d
commit 2b0fd9b22c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
plugins/statiegeld_tokens
View file

@ -52,7 +52,7 @@ sub _read {
/\S/ or next; /\S/ or next;
my ($username, @tokens) = split " ", $_; my ($username, @tokens) = split " ", $_;
if (exists $users_tokens{$username}) { if (exists $users_tokens{lc $username}) {
die "Corrupt data file $filename, $username listed twice"; die "Corrupt data file $filename, $username listed twice";
} }
@ -62,7 +62,7 @@ sub _read {
push @{ $by_type{$token_type} }, $token; push @{ $by_type{$token_type} }, $token;
} }
$users_tokens{$username} = \%by_type; $users_tokens{lc $username} = \%by_type;
} }
return \%users_tokens; return \%users_tokens;
} }
@ -105,7 +105,7 @@ sub _write($username, $tokens_by_type, $create) {
$old_line =~ /\S/ or return $old_line; # keep whitespace-only lines $old_line =~ /\S/ or return $old_line; # keep whitespace-only lines
# removes line from file if $new_line is undef # removes line from file if $new_line is undef
my $line = /(\S+)/ && $1 eq $username ? $new_line : $old_line; my $line = /(\S+)/ && lc($1) eq lc($username) ? $new_line : $old_line;
return _expire_tokens($line, $time); return _expire_tokens($line, $time);
}; };
} }
@ -155,7 +155,7 @@ sub hook_checkout_prepare($class, $cart, $username, $transaction_id, @) {
} }
# Read data # Read data
my $tokens_by_type = _read->{$username}; my $tokens_by_type = _read->{lc $username};
my $is_new = !defined $tokens_by_type; my $is_new = !defined $tokens_by_type;
$tokens_by_type = {} if $is_new; $tokens_by_type = {} if $is_new;
my $time_is_reliable = _time_is_reliable; my $time_is_reliable = _time_is_reliable;
@ -252,7 +252,7 @@ sub hook_checkout_prepare($class, $cart, $username, $transaction_id, @) {
} }
sub hook_user_info ($class, $username, @) { sub hook_user_info ($class, $username, @) {
my $tokens_by_type = _read->{$username}; my $tokens_by_type = _read->{lc $username};
my @info; my @info;
for my $type (sort keys %$tokens_by_type) { for my $type (sort keys %$tokens_by_type) {
my @tokens = @{ $tokens_by_type->{$type} // [] }; my @tokens = @{ $tokens_by_type->{$type} // [] };