Revision 8844
Added by ben leinfelder over 10 years ago
| register-dataset.cgi | ||
|---|---|---|
| 2413 | 2413 |
|
| 2414 | 2414 |
sub getUsername() {
|
| 2415 | 2415 |
my $username = ''; |
| 2416 |
my $authBase = $properties->getProperty("auth.base");
|
|
| 2416 | 2417 |
|
| 2417 | 2418 |
if ( $FORM::username ne '' ) {
|
| 2418 | 2419 |
$username = |
| 2419 |
"uid=$FORM::username,o=$FORM::organization,dc=ecoinformatics,dc=org";
|
|
| 2420 |
"uid=$FORM::username,o=$FORM::organization,$authBase";
|
|
| 2420 | 2421 |
} |
| 2421 | 2422 |
else {
|
| 2422 | 2423 |
my $session = CGI::Session->load(); |
| ... | ... | |
| 3733 | 3734 |
my $userDN = $FORM::username; |
| 3734 | 3735 |
my $userOrg = $FORM::organization; |
| 3735 | 3736 |
my $userPass = $FORM::password; |
| 3736 |
my $dname = "uid=$userDN,o=$userOrg,dc=ecoinformatics,dc=org"; |
|
| 3737 |
my $authBase = $properties->getProperty("auth.base");
|
|
| 3738 |
my $dname = "uid=$userDN,o=$userOrg,$authBase"; |
|
| 3737 | 3739 |
|
| 3738 | 3740 |
my $session = CGI::Session->load(); |
| 3739 | 3741 |
if ( !( $session->is_empty || $session->is_expired ) ) {
|
Also available in: Unified diff
use configured auth.base rather than hard-coded dc=ecoinformatics,dc=org. https://projects.ecoinformatics.org/ecoinfo/issues/6592