diff options
| -rw-r--r-- | lib/GitACL.pm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/GitACL.pm b/lib/GitACL.pm index 4c1cc67..2bb78e5 100644 --- a/lib/GitACL.pm +++ b/lib/GitACL.pm @@ -160,3 +160,3 @@ sub match_ref($$) { return ($self->{ref} =~ /$expr/) if ($expr =~ /^\^/); - return ("$self->{ref}/" eq $expr or index($self->{ref}, $expr) == 0) + return ("$self->{ref}/" eq $expr || index($self->{ref}, $expr) == 0) if ($expr =~ /\/$/); @@ -182,6 +182,6 @@ sub match_tree($$) { - if (($expr =~ /^\^/ and $dir =~ /$expr/) - or ($expr =~ /\/$/ - and ("$dir/" eq $expr or index($dir, $expr) == 0)) - or $dir eq $expr) { + if (($expr =~ /^\^/ && $dir =~ /$expr/) + || ($expr =~ /\/$/ + && ("$dir/" eq $expr or index($dir, $expr) == 0)) + || $dir eq $expr) { splice(@{$self->{tree}}, $i, 1); @@ -204,3 +204,3 @@ sub match_tuple($$) { return ( 0, "project mismatch" ) - if ($x[1] ne "all" and $x[1] ne $self->{project_name}); + if ($x[1] ne "all" && $x[1] ne $self->{project_name}); return ( 0, "user mismatch" ) @@ -272,3 +272,3 @@ sub new { my $httpdusr = git_value('config', 'hooks.acl.httpd-user'); - if (defined($httpdusr) and $obj->{user_name} eq $httpdusr) { + if (defined($httpdusr) && $obj->{user_name} eq $httpdusr) { $obj->deny("need authenticated user") unless $ENV{AUTH_TYPE}; @@ -277,3 +277,3 @@ sub new { } else { - my $ipvar = git_value('config', 'hooks.acl.ip-env-var') or 'SSH_CLIENT'; + my $ipvar = git_value('config', 'hooks.acl.ip-env-var') || 'SSH_CLIENT'; if (defined($ENV{$ipvar})) { |