version 1.159.2.5, 2017/01/21 20:40:46
|
version 1.169, 2018/01/12 13:33:46
|
Line 159 sub get_posted_cgi {
|
Line 159 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) { |
} elsif ($fname =~ /\.(xls|doc|ppt)(x|m)$/i) { |
$value=~s/[\r\n]$//; |
$value=~s/[\r\n]$//; |
} |
} |
if (ref($fields) eq 'ARRAY') { |
if (ref($fields) eq 'ARRAY') { |
Line 202 sub get_posted_cgi {
|
Line 202 sub get_posted_cgi {
|
$fname=''; |
$fname=''; |
$fmime=''; |
$fmime=''; |
} |
} |
|
if ($i<$#lines && $lines[$i+1]=~/^Content\-Type\:\s*([\w\-\/]+)/i) { |
|
# TODO: something with $1 ! |
|
$i++; |
|
} |
|
if ($i<$#lines && $lines[$i+1]=~/^Content\-transfer\-encoding\:\s*([\w\-\/]+)/i) { |
|
# TODO: something with $1 ! |
|
$i++; |
|
} |
$i++; |
$i++; |
} |
} |
} else { |
} else { |
Line 366 sub sso_login {
|
Line 374 sub sso_login {
|
} else { |
} else { |
# need to login them in, so generate the need data that |
# need to login them in, so generate the need data that |
# migrate expects to do login |
# migrate expects to do login |
my $ip = $r->get_remote_host(); |
my $ip = $r->get_remote_host(); |
my %info=('ip' => $ip, |
my %info=('ip' => $ip, |
'domain' => $domain, |
'domain' => $domain, |
'username' => $user, |
'username' => $user, |
Line 517 sub handler {
|
Line 525 sub handler {
|
} |
} |
} elsif ($env{'request.course.id'} && |
} elsif ($env{'request.course.id'} && |
(($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) || |
(($requrl =~ m{^/adm/$match_domain/$match_username/aboutme$}) || |
($requrl =~ m{^/public/$cdom/$cnum/syllabus$}))) { |
($requrl eq "/public/$cdom/$cnum/syllabus") || |
|
($requrl =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}))) { |
my $query = $r->args; |
my $query = $r->args; |
if ($query) { |
if ($query) { |
foreach my $pair (split(/&/,$query)) { |
foreach my $pair (split(/&/,$query)) { |
Line 575 sub handler {
|
Line 584 sub handler {
|
$env{'form.origurl'} = $r->uri; |
$env{'form.origurl'} = $r->uri; |
} |
} |
} |
} |
|
if ($requrl=~m{^/+tiny/+$match_domain/+\w+$}) { |
|
return OK; |
|
} |
# ---------------------------------------------------------------- Check access |
# ---------------------------------------------------------------- Check access |
my $now = time; |
my $now = time; |
if ($requrl !~ m{^/(?:adm|public|prtspool)/} |
if ($requrl !~ m{^/(?:adm|public|prtspool)/} |
Line 665 sub handler {
|
Line 676 sub handler {
|
($requrl=~m|\.problem/smpedit$|) || |
($requrl=~m|\.problem/smpedit$|) || |
($requrl=~/^\/public\/.*\/syllabus$/) || |
($requrl=~/^\/public\/.*\/syllabus$/) || |
($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) || |
($requrl=~/^\/adm\/(viewclasslist|navmaps)$/) || |
($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/)) { |
($requrl=~/^\/adm\/.*\/aboutme\/portfolio(\?|$)/) || |
|
($requrl=~m{^/adm/$cdom/$cnum/\d+/ext\.tool$})) { |
# ------------------------------------- This is serious stuff, get symb and log |
# ------------------------------------- This is serious stuff, get symb and log |
my $symb; |
my $symb; |
if ($query) { |
if ($query) { |
Line 760 sub handler {
|
Line 772 sub handler {
|
# ------------------------------------ See if this is a viewable portfolio file |
# ------------------------------------ See if this is a viewable portfolio file |
if (&Apache::lonnet::is_portfolio_url($requrl)) { |
if (&Apache::lonnet::is_portfolio_url($requrl)) { |
my $clientip = $r->get_remote_host(); |
my $clientip = $r->get_remote_host(); |
my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip); |
my $access=&Apache::lonnet::allowed('bre',$requrl,undef,undef,$clientip); |
if ($access eq 'A') { |
if ($access eq 'A') { |
&Apache::restrictedaccess::setup_handler($r); |
&Apache::restrictedaccess::setup_handler($r); |
return OK; |
return OK; |