version 1.152, 2014/01/24 04:38:14
|
version 1.156, 2014/05/17 21:43:55
|
Line 160 sub get_posted_cgi {
|
Line 160 sub get_posted_cgi {
|
if (length($value) == 1) { |
if (length($value) == 1) { |
$value=~s/[\r\n]$//; |
$value=~s/[\r\n]$//; |
} |
} |
|
} elsif ($fname =~ /\.(xls|doc|ppt)x$/i) { |
|
$value=~s/[\r\n]$//; |
} |
} |
if (ref($fields) eq 'ARRAY') { |
if (ref($fields) eq 'ARRAY') { |
next if (!grep(/^\Q$name\E$/,@{$fields})); |
next if (!grep(/^\Q$name\E$/,@{$fields})); |
Line 281 sub sso_login {
|
Line 283 sub sso_login {
|
my ($r,$handle,$username) = @_; |
my ($r,$handle,$username) = @_; |
|
|
my $lonidsdir=$r->dir_config('lonIDsDir'); |
my $lonidsdir=$r->dir_config('lonIDsDir'); |
if (($r->user eq '') || ($username ne '') || |
if (($r->user eq '') || ($username ne '') || ($r->user eq 'public:public') || |
(defined($env{'user.name'}) && (defined($env{'user.domain'})) |
(defined($env{'user.name'}) && (defined($env{'user.domain'})) |
&& ($handle ne ''))) { |
&& ($handle ne ''))) { |
# not an SSO case or already logged in |
# not an SSO case or already logged in |
Line 384 sub sso_login {
|
Line 386 sub sso_login {
|
$r->set_handlers('PerlHandler'=> undef); |
$r->set_handlers('PerlHandler'=> undef); |
} |
} |
return OK; |
return OK; |
} elsif (defined($r->dir_config('lonSSOUserUnknownRedirect'))) { |
} else { |
&Apache::lonnet::logthis(" SSO authorized unknown user $user "); |
&Apache::lonnet::logthis(" SSO authorized unknown user $user "); |
$r->subprocess_env->set('SSOUserUnknown' => $user); |
|
$r->subprocess_env->set('SSOUserDomain' => $domain); |
|
my @cancreate; |
my @cancreate; |
my %domconfig = |
my %domconfig = |
&Apache::lonnet::get_dom('configuration',['usercreation'],$domain); |
&Apache::lonnet::get_dom('configuration',['usercreation'],$domain); |
Line 401 sub sso_login {
|
Line 401 sub sso_login {
|
} |
} |
} |
} |
} |
} |
if (grep(/^sso$/,@cancreate)) { |
if ((grep(/^sso$/,@cancreate)) || (defined($r->dir_config('lonSSOUserUnknownRedirect')))) { |
$r->internal_redirect('/adm/createaccount'); |
$r->subprocess_env->set('SSOUserUnknown' => $user); |
} else { |
$r->subprocess_env->set('SSOUserDomain' => $domain); |
$r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect')); |
if (grep(/^sso$/,@cancreate)) { |
|
$r->set_handlers('PerlHandler'=> [\&Apache::createaccount::handler]); |
|
$r->handler('perl-script'); |
|
} else { |
|
$r->internal_redirect($r->dir_config('lonSSOUserUnknownRedirect')); |
|
$r->set_handlers('PerlHandler'=> undef); |
|
} |
|
return OK; |
} |
} |
$r->set_handlers('PerlHandler'=> undef); |
|
return OK; |
|
} |
} |
return undef; |
return undef; |
} |
} |