[Catalyst-commits] r14426 -
Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP
karpet at dev.catalyst.perl.org
karpet at dev.catalyst.perl.org
Wed Jan 9 14:49:48 GMT 2013
Author: karpet
Date: 2013-01-09 14:49:48 +0000 (Wed, 09 Jan 2013)
New Revision: 14426
Modified:
Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/Backend.pm
Log:
perltidy only
Modified: Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/Backend.pm
===================================================================
--- Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/Backend.pm 2013-01-03 14:43:07 UTC (rev 14425)
+++ Catalyst-Authentication-Store-LDAP/trunk/lib/Catalyst/Authentication/Store/LDAP/Backend.pm 2013-01-09 14:49:48 UTC (rev 14426)
@@ -120,10 +120,11 @@
$config_hash{'use_roles'} ||= '1';
$config_hash{'start_tls'} ||= '0';
$config_hash{'entry_class'} ||= 'Catalyst::Model::LDAP::Entry';
- $config_hash{'user_class'} ||= 'Catalyst::Authentication::Store::LDAP::User';
+ $config_hash{'user_class'}
+ ||= 'Catalyst::Authentication::Store::LDAP::User';
$config_hash{'role_search_as_user'} ||= 0;
- Catalyst::Utils::ensure_class_loaded($config_hash{'user_class'});
+ Catalyst::Utils::ensure_class_loaded( $config_hash{'user_class'} );
my $self = \%config_hash;
bless( $self, $class );
return $self;
@@ -157,8 +158,7 @@
sub get_user {
my ( $self, $id, $c ) = @_;
- my $user = $self->user_class->new( $self,
- $self->lookup_user($id), $c );
+ my $user = $self->user_class->new( $self, $self->lookup_user($id), $c );
return $user;
}
@@ -210,7 +210,7 @@
sub ldap_bind {
my ( $self, $ldap, $binddn, $bindpw, $forauth ) = @_;
$forauth ||= 0;
- $ldap ||= $self->ldap_connect;
+ $ldap ||= $self->ldap_connect;
if ( !defined($ldap) ) {
Catalyst::Exception->throw("LDAP Server undefined!");
}
@@ -236,14 +236,14 @@
}
}
else {
- $self->_ldap_bind_anon($ldap, $binddn);
+ $self->_ldap_bind_anon( $ldap, $binddn );
}
}
return $ldap;
}
sub _ldap_bind_anon {
- my ($self, $ldap, $dn) = @_;
+ my ( $self, $ldap, $dn ) = @_;
my $mesg = $ldap->bind($dn);
if ( $mesg->is_error ) {
Catalyst::Exception->throw( "Error on Bind: " . $mesg->error );
@@ -279,6 +279,7 @@
if ( $id =~ /\*/ ) {
Catalyst::Exception->throw("ID $id contains wildcards!");
}
+
# Trim trailing space or we confuse ourselves
$id =~ s/\s+$//;
my $ldap = $self->ldap_bind;
@@ -345,8 +346,8 @@
$attrhash->{ lc($attr) } = \@attrvalues;
}
}
-
- eval { Catalyst::Utils::ensure_class_loaded($self->entry_class) };
+
+ eval { Catalyst::Utils::ensure_class_loaded( $self->entry_class ) };
if ( !$@ ) {
bless( $userentry, $self->entry_class );
$userentry->{_use_unicode}++;
@@ -437,7 +438,7 @@
sub from_session {
my ( $self, $c, $id ) = @_;
- $self->get_user($id, $c);
+ $self->get_user( $id, $c );
}
1;
More information about the Catalyst-commits
mailing list