fix - Cannot manage user accounts in 7.1.0. See the comments in Auth/LDAP.pm. We really need a more robust fix.
This commit is contained in:
parent
eef214ebb6
commit
2e506660f8
3 changed files with 17 additions and 0 deletions
|
|
@ -6,6 +6,7 @@
|
||||||
- add: asset exporter making appropriate symlinks for extras, uploads, and root URL
|
- add: asset exporter making appropriate symlinks for extras, uploads, and root URL
|
||||||
- change: asset exporter now uses one session per asset to avoid breaking state in between
|
- change: asset exporter now uses one session per asset to avoid breaking state in between
|
||||||
- fix: Lineage length is not checked (Martin Kamerbeek / Procolix)
|
- fix: Lineage length is not checked (Martin Kamerbeek / Procolix)
|
||||||
|
- fix: Cannot manage user accounts in 7.1.0
|
||||||
|
|
||||||
7.1.0
|
7.1.0
|
||||||
- fix: mysql and mysqldump were transposed in upgrade.pl --help
|
- fix: mysql and mysqldump were transposed in upgrade.pl --help
|
||||||
|
|
|
||||||
|
|
@ -21,9 +21,17 @@ my $quiet; # this line required
|
||||||
my $session = start(); # this line required
|
my $session = start(); # this line required
|
||||||
|
|
||||||
fixSurvey();
|
fixSurvey();
|
||||||
|
fixLDAP();
|
||||||
|
|
||||||
finish($session); # this line required
|
finish($session); # this line required
|
||||||
|
|
||||||
|
#-------------------------------------------------
|
||||||
|
sub fixLDAP {
|
||||||
|
print "\tFixing the ldap connection setting.\n" unless ($quiet);
|
||||||
|
# Set the LDAP connection setting to the default ldap link if it's not set to anything
|
||||||
|
my $ldapConnection = $session->setting->get("ldapConnection");
|
||||||
|
$session->setting->set("ldapConnection", "1uBbhUm686mkFZ1ghv7Lag") if ($ldapConnection eq "");
|
||||||
|
}
|
||||||
|
|
||||||
#-------------------------------------------------
|
#-------------------------------------------------
|
||||||
sub fixSurvey {
|
sub fixSurvey {
|
||||||
|
|
|
||||||
|
|
@ -198,6 +198,14 @@ sub authenticate {
|
||||||
|
|
||||||
#-------------------------------------------------------------------
|
#-------------------------------------------------------------------
|
||||||
sub connectToLDAP {
|
sub connectToLDAP {
|
||||||
|
|
||||||
|
# This method needs to do some excpetion handling when we try to create an LDAPLink object
|
||||||
|
# Lot's to do though because then everything calling connectToLDAP must also handle exceptions on up
|
||||||
|
#
|
||||||
|
# Problem is that $connectionId may not have a value or the object creation may fail for other reasons.
|
||||||
|
# Quick fix for now is to ensure the ldapConnection setting is set in the settings table with the id of
|
||||||
|
# the default ldap connection.
|
||||||
|
|
||||||
my $self = shift;
|
my $self = shift;
|
||||||
my $connectionId = $self->session->form->process("connection") || $self->session->setting->get("ldapConnection");
|
my $connectionId = $self->session->form->process("connection") || $self->session->setting->get("ldapConnection");
|
||||||
my $ldapLink = WebGUI::LDAPLink->new($self->session,$connectionId);
|
my $ldapLink = WebGUI::LDAPLink->new($self->session,$connectionId);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue