oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- fix: Ldap Registration of new users (Thanks to guiuser)

Browse source 
- fix: Missing/Incorrect POD
This commit is contained in:
JT Smith 2006-07-11 20:54:24 +00:00
parent a440cb5f41
commit 07f7e021ca
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/7.x.x.txt
View file

@ -18,6 +18,8 @@
- fix: Avatar/photo upload not working - fix: Avatar/photo upload not working
- fix: Shortcut with content lock fails (Thanks to Michelle Lamar) - fix: Shortcut with content lock fails (Thanks to Michelle Lamar)
- fix: Security bug in session env - fix: Security bug in session env
- fix: Ldap Registration of new users (Thanks to guiuser)
- fix: Missing/Incorrect POD
7.0.0 7.0.0

15
lib/WebGUI/Asset/Wobject/Search.pm
View file

@ -48,13 +48,19 @@ Definition hashref from subclasses.
=head3 Search specific properties =head3 Search specific properties
=over 4 These properties are added just for this asset.
=item templateId =head4 templateId
ID of a tempate from the Search namespace to display the search results. ID of a tempate from the Search namespace to display the search results.
=back =head4 searchRoot
An asset id of the point at which a search should start.
=head4 classLimiter
An array reference of asset classnames that are valid for the search.
=cut =cut
@ -123,8 +129,7 @@ sub prepareView {
=head2 view ( ) =head2 view ( )
view defines all template variables, processes the template and Display search interface and results.
returns the output.
=cut =cut

10
lib/WebGUI/Auth/LDAP.pm
View file

@ -30,7 +30,7 @@ sub _isValidLDAPUser {
my ($uri, $error, $ldap, $search, $auth, $connectDN); my ($uri, $error, $ldap, $search, $auth, $connectDN);
my $i18n = WebGUI::International->new($self->session); my $i18n = WebGUI::International->new($self->session);
my $connection = $self->{_connection}; my $connection = $self->{_connection};
$uri = URI->new($connection->{ldapURL}) or $error = $i18n->get(2,'AuthLDAP'); $uri = URI->new($connection->{ldapUrl}) or $error = $i18n->get(2,'AuthLDAP');
if($error ne ""){ if($error ne ""){
$self->error($error); $self->error($error);
return 0; return 0;
@ -67,7 +67,7 @@ sub _isValidLDAPUser {
} }
} else { } else {
$error = $i18n->get(2,'AuthLDAP'); $error = $i18n->get(2,'AuthLDAP');
$self->session->errorHandler->error("Couldn't bind to LDAP server: ".$connection->{ldapURL}); $self->session->errorHandler->error("Couldn't bind to LDAP server: ".$connection->{ldapUrl});
} }
} else { } else {
$error = $i18n->get(2,'AuthLDAP'); $error = $i18n->get(2,'AuthLDAP');
@ -175,7 +175,7 @@ sub createAccountSave {
my $connection = $self->{_connection}; my $connection = $self->{_connection};
#Get connectDN from settings #Get connectDN from settings
my $uri = URI->new($connection->{ldapURL}); my $uri = URI->new($connection->{ldapUrl});
my $ldap = Net::LDAP->new($uri->host, (port=>$uri->port)); my $ldap = Net::LDAP->new($uri->host, (port=>$uri->port));
my $auth; my $auth;
if($connection->{connectDn}) { if($connection->{connectDn}) {
@ -209,7 +209,7 @@ sub createAccountSave {
my $properties; my $properties;
$properties->{connectDN} = $connectDN; $properties->{connectDN} = $connectDN;
$properties->{ldapUrl} = $connection->{ldapURL}; $properties->{ldapUrl} = $connection->{ldapUrl};
return $self->SUPER::createAccountSave($username,$properties,$password,$profile); return $self->SUPER::createAccountSave($username,$properties,$password,$profile);
} }
@ -265,7 +265,7 @@ sub editUserForm {
my $self = shift; my $self = shift;
my $userData = $self->getParams; my $userData = $self->getParams;
my $connection = $self->{_connection}; my $connection = $self->{_connection};
my $ldapUrl = $self->session->form->process('authLDAP_ldapUrl') || $userData->{ldapUrl} || $connection->{ldapURL}; my $ldapUrl = $self->session->form->process('authLDAP_ldapUrl') || $userData->{ldapUrl} || $connection->{ldapUrl};
my $connectDN = $self->session->form->process('authLDAP_connectDN') || $userData->{connectDN}; my $connectDN = $self->session->form->process('authLDAP_connectDN') || $userData->{connectDN};
my $ldapConnection = $self->session->form->process('authLDAP_ldapConnection') || $userData->{ldapConnection}; my $ldapConnection = $self->session->form->process('authLDAP_ldapConnection') || $userData->{ldapConnection};
my $ldapLinks = $self->session->db->buildHashRef("select ldapLinkId,ldapUrl from ldapLink"); my $ldapLinks = $self->session->db->buildHashRef("select ldapLinkId,ldapUrl from ldapLink");