|
version 1.1172.2.108, 2019/08/03 23:36:09
|
version 1.1172.2.118.2.8, 2020/10/01 13:19:14
|
|
Line 78 use CGI::Cookie;
|
Line 78 use CGI::Cookie;
|
| |
|
| use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir $deftex |
use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir $deftex |
| $_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease |
$_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease |
| %managerstab); |
%managerstab $passwdmin); |
| |
|
| my (%badServerCache, $memcache, %courselogs, %accesshash, %domainrolehash, |
my (%badServerCache, $memcache, %courselogs, %accesshash, %domainrolehash, |
| %userrolehash, $processmarker, $dumpcount, %coursedombuf, |
%userrolehash, $processmarker, $dumpcount, %coursedombuf, |
|
Line 99 use LONCAPA qw(:DEFAULT :match);
|
Line 99 use LONCAPA qw(:DEFAULT :match);
|
| use LONCAPA::Configuration; |
use LONCAPA::Configuration; |
| use LONCAPA::lonmetadata; |
use LONCAPA::lonmetadata; |
| use LONCAPA::Lond; |
use LONCAPA::Lond; |
| |
use LONCAPA::transliterate; |
| |
|
| use File::Copy; |
use File::Copy; |
| |
|
|
Line 262 sub get_server_loncaparev {
|
Line 263 sub get_server_loncaparev {
|
| if ($caller eq 'loncron') { |
if ($caller eq 'loncron') { |
| my $ua=new LWP::UserAgent; |
my $ua=new LWP::UserAgent; |
| $ua->timeout(4); |
$ua->timeout(4); |
| |
my $hostname = &hostname($lonhost); |
| my $protocol = $protocol{$lonhost}; |
my $protocol = $protocol{$lonhost}; |
| $protocol = 'http' if ($protocol ne 'https'); |
$protocol = 'http' if ($protocol ne 'https'); |
| my $url = $protocol.'://'.&hostname($lonhost).'/adm/about.html'; |
my $url = $protocol.'://'.$hostname.'/adm/about.html'; |
| my $request=new HTTP::Request('GET',$url); |
my $request=new HTTP::Request('GET',$url); |
| my $response=$ua->request($request); |
my $response=$ua->request($request); |
| unless ($response->is_error()) { |
unless ($response->is_error()) { |
|
Line 408 sub reply {
|
Line 410 sub reply {
|
| unless (defined(&hostname($server))) { return 'no_such_host'; } |
unless (defined(&hostname($server))) { return 'no_such_host'; } |
| my $answer=subreply($cmd,$server); |
my $answer=subreply($cmd,$server); |
| if (($answer=~/^refused/) || ($answer=~/^rejected/)) { |
if (($answer=~/^refused/) || ($answer=~/^rejected/)) { |
| &logthis("<font color=\"blue\">WARNING:". |
my $logged = $cmd; |
| " $cmd to $server returned $answer</font>"); |
if ($cmd =~ /^encrypt:([^:]+):/) { |
| |
my $subcmd = $1; |
| |
if (($subcmd eq 'auth') || ($subcmd eq 'passwd') || |
| |
($subcmd eq 'changeuserauth') || ($subcmd eq 'makeuser') || |
| |
($subcmd eq 'putdom') || ($subcmd eq 'autoexportgrades')) { |
| |
(undef,undef,my @rest) = split(/:/,$cmd); |
| |
if (($subcmd eq 'auth') || ($subcmd eq 'putdom')) { |
| |
splice(@rest,2,1,'Hidden'); |
| |
} elsif ($subcmd eq 'passwd') { |
| |
splice(@rest,2,2,('Hidden','Hidden')); |
| |
} elsif (($subcmd eq 'changeuserauth') || ($subcmd eq 'makeuser') || |
| |
($subcmd eq 'autoexportgrades')) { |
| |
splice(@rest,3,1,'Hidden'); |
| |
} |
| |
$logged = join(':',('encrypt:'.$subcmd,@rest)); |
| |
} |
| |
} |
| |
&logthis("<font color=\"blue\">WARNING:". |
| |
" $logged to $server returned $answer</font>"); |
| } |
} |
| return $answer; |
return $answer; |
| } |
} |
|
Line 878 sub userload {
|
Line 898 sub userload {
|
| while ($filename=readdir(LONIDS)) { |
while ($filename=readdir(LONIDS)) { |
| next if ($filename eq '.' || $filename eq '..'); |
next if ($filename eq '.' || $filename eq '..'); |
| next if ($filename =~ /publicuser_\d+\.id/); |
next if ($filename =~ /publicuser_\d+\.id/); |
| |
next if ($filename =~ /^[a-f0-9]+_linked\.id$/); |
| my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9]; |
my ($mtime)=(stat($perlvar{'lonIDsDir'}.'/'.$filename))[9]; |
| if ($curtime-$mtime < 1800) { $numusers++; } |
if ($curtime-$mtime < 1800) { $numusers++; } |
| } |
} |
|
Line 933 sub spareserver {
|
Line 954 sub spareserver {
|
| } |
} |
| |
|
| if (!$want_server_name) { |
if (!$want_server_name) { |
| my $protocol = 'http'; |
|
| if ($protocol{$spare_server} eq 'https') { |
|
| $protocol = $protocol{$spare_server}; |
|
| } |
|
| if (defined($spare_server)) { |
if (defined($spare_server)) { |
| my $hostname = &hostname($spare_server); |
my $hostname = &hostname($spare_server); |
| if (defined($hostname)) { |
if (defined($hostname)) { |
| |
my $protocol = 'http'; |
| |
if ($protocol{$spare_server} eq 'https') { |
| |
$protocol = $protocol{$spare_server}; |
| |
} |
| $spare_server = $protocol.'://'.$hostname; |
$spare_server = $protocol.'://'.$hostname; |
| } |
} |
| } |
} |
|
Line 1141 sub choose_server {
|
Line 1162 sub choose_server {
|
| return ($login_host,$hostname,$portal_path,$isredirect,$lowest_load); |
return ($login_host,$hostname,$portal_path,$isredirect,$lowest_load); |
| } |
} |
| |
|
| |
sub get_course_sessions { |
| |
my ($cnum,$cdom,$lastactivity) = @_; |
| |
my %servers = &internet_dom_servers($cdom); |
| |
my %returnhash; |
| |
foreach my $server (sort(keys(%servers))) { |
| |
my $rep = &reply("coursesessions:$cdom:$cnum:$lastactivity",$server); |
| |
my @pairs=split(/\&/,$rep); |
| |
unless (($rep eq 'unknown_cmd') || ($rep =~ /^error/)) { |
| |
foreach my $item (@pairs) { |
| |
my ($key,$value)=split(/=/,$item,2); |
| |
$key = &unescape($key); |
| |
next if ($key =~ /^error: 2 /); |
| |
if (exists($returnhash{$key})) { |
| |
next if ($value < $returnhash{$key}); |
| |
} |
| |
$returnhash{$key}=$value; |
| |
} |
| |
} |
| |
} |
| |
return %returnhash; |
| |
} |
| |
|
| # --------------------------------------------- Try to change a user's password |
# --------------------------------------------- Try to change a user's password |
| |
|
| sub changepass { |
sub changepass { |
|
Line 1176 sub changepass {
|
Line 1219 sub changepass {
|
| } elsif ($answer =~ "invalid_client") { |
} elsif ($answer =~ "invalid_client") { |
| &logthis("$server refused to change $uname in $udom password because ". |
&logthis("$server refused to change $uname in $udom password because ". |
| "it was a reset by e-mail originating from an invalid server."); |
"it was a reset by e-mail originating from an invalid server."); |
| |
} elsif ($answer =~ "^prioruse") { |
| |
&logthis("$server refused to change $uname in $udom password because ". |
| |
"the password had been used before"); |
| } |
} |
| return $answer; |
return $answer; |
| } |
} |
|
Line 1827 sub get_dom {
|
Line 1873 sub get_dom {
|
| } |
} |
| } |
} |
| if ($udom && $uhome && ($uhome ne 'no_host')) { |
if ($udom && $uhome && ($uhome ne 'no_host')) { |
| my $rep=&reply("getdom:$udom:$namespace:$items",$uhome); |
my $rep; |
| |
if ($namespace =~ /^enc/) { |
| |
$rep=&reply("encrypt:egetdom:$udom:$namespace:$items",$uhome); |
| |
} else { |
| |
$rep=&reply("getdom:$udom:$namespace:$items",$uhome); |
| |
} |
| my %returnhash; |
my %returnhash; |
| if ($rep eq '' || $rep =~ /^error: 2 /) { |
if ($rep eq '' || $rep =~ /^error: 2 /) { |
| return %returnhash; |
return %returnhash; |
|
Line 1871 sub put_dom {
|
Line 1922 sub put_dom {
|
| $items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&'; |
$items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&'; |
| } |
} |
| $items=~s/\&$//; |
$items=~s/\&$//; |
| return &reply("putdom:$udom:$namespace:$items",$uhome); |
if ($namespace =~ /^enc/) { |
| |
return &reply("encrypt:putdom:$udom:$namespace:$items",$uhome); |
| |
} else { |
| |
return &reply("putdom:$udom:$namespace:$items",$uhome); |
| |
} |
| } else { |
} else { |
| &logthis("put_dom failed - no homeserver and/or domain"); |
&logthis("put_dom failed - no homeserver and/or domain"); |
| } |
} |
|
Line 1962 sub inst_directory_query {
|
Line 2017 sub inst_directory_query {
|
| my $homeserver = &domain($udom,'primary'); |
my $homeserver = &domain($udom,'primary'); |
| my $outcome; |
my $outcome; |
| if ($homeserver ne '') { |
if ($homeserver ne '') { |
| |
unless ($homeserver eq $perlvar{'lonHostID'}) { |
| |
if ($srch->{'srchby'} eq 'email') { |
| |
my $lcrev = &get_server_loncaparev($udom,$homeserver); |
| |
my ($major,$minor,$subver) = ($lcrev =~ /^\'?(\d+)\.(\d+)\.(\d+)[\w.\-]+\'?$/); |
| |
if (($major eq '' && $minor eq '') || ($major < 2) || |
| |
(($major == 2) && ($minor < 11)) || |
| |
(($major == 2) && ($minor == 11) && ($subver < 3))) { |
| |
return; |
| |
} |
| |
} |
| |
} |
| my $queryid=&reply("querysend:instdirsearch:". |
my $queryid=&reply("querysend:instdirsearch:". |
| &escape($srch->{'srchby'}).':'. |
&escape($srch->{'srchby'}).':'. |
| &escape($srch->{'srchterm'}).':'. |
&escape($srch->{'srchterm'}).':'. |
|
Line 2003 sub usersearch {
|
Line 2069 sub usersearch {
|
| my $query = 'usersearch'; |
my $query = 'usersearch'; |
| foreach my $tryserver (keys(%libserv)) { |
foreach my $tryserver (keys(%libserv)) { |
| if (&host_domain($tryserver) eq $dom) { |
if (&host_domain($tryserver) eq $dom) { |
| |
unless ($tryserver eq $perlvar{'lonHostID'}) { |
| |
if ($srch->{'srchby'} eq 'email') { |
| |
my $lcrev = &get_server_loncaparev($dom,$tryserver); |
| |
my ($major,$minor,$subver) = ($lcrev =~ /^\'?(\d+)\.(\d+)\.(\d+)[\w.\-]+\'?$/); |
| |
next if (($major eq '' && $minor eq '') || ($major < 2) || |
| |
(($major == 2) && ($minor < 11)) || |
| |
(($major == 2) && ($minor == 11) && ($subver < 3))); |
| |
} |
| |
} |
| my $host=&hostname($tryserver); |
my $host=&hostname($tryserver); |
| my $queryid= |
my $queryid= |
| &reply("querysend:".&escape($query).':'. |
&reply("querysend:".&escape($query).':'. |
|
Line 2445 sub retrieve_instcodes {
|
Line 2520 sub retrieve_instcodes {
|
| return $totcodes; |
return $totcodes; |
| } |
} |
| |
|
| |
# --------------------------------------------- Get domain config for passwords |
| |
|
| |
sub get_passwdconf { |
| |
my ($dom) = @_; |
| |
my (%passwdconf,$gotconf,$lookup); |
| |
my ($result,$cached)=&is_cached_new('passwdconf',$dom); |
| |
if (defined($cached)) { |
| |
if (ref($result) eq 'HASH') { |
| |
%passwdconf = %{$result}; |
| |
$gotconf = 1; |
| |
} |
| |
} |
| |
unless ($gotconf) { |
| |
my %domconfig = &get_dom('configuration',['passwords'],$dom); |
| |
if (ref($domconfig{'passwords'}) eq 'HASH') { |
| |
%passwdconf = %{$domconfig{'passwords'}}; |
| |
} |
| |
my $cachetime = 24*60*60; |
| |
&do_cache_new('passwdconf',$dom,\%passwdconf,$cachetime); |
| |
} |
| |
return %passwdconf; |
| |
} |
| |
|
| |
sub course_portal_url { |
| |
my ($cnum,$cdom) = @_; |
| |
my $chome = &homeserver($cnum,$cdom); |
| |
my $hostname = &hostname($chome); |
| |
my $protocol = $protocol{$chome}; |
| |
$protocol = 'http' if ($protocol ne 'https'); |
| |
my %domdefaults = &get_domain_defaults($cdom); |
| |
my $firsturl; |
| |
if ($domdefaults{'portal_def'}) { |
| |
$firsturl = $domdefaults{'portal_def'}; |
| |
} else { |
| |
$firsturl = $protocol.'://'.$hostname; |
| |
} |
| |
return $firsturl; |
| |
} |
| |
|
| # --------------------------------------------------- Assign a key to a student |
# --------------------------------------------------- Assign a key to a student |
| |
|
| sub assign_access_key { |
sub assign_access_key { |
|
Line 2980 sub repcopy {
|
Line 3094 sub repcopy {
|
| } |
} |
| } |
} |
| |
|
| |
# ------------------------------------------------- Unsubscribe from a resource |
| |
|
| |
sub unsubscribe { |
| |
my ($fname) = @_; |
| |
my $answer; |
| |
if ($fname=~/\/(aboutme|syllabus|bulletinboard|smppg)$/) { return $answer; } |
| |
$fname=~s/[\n\r]//g; |
| |
my $author=$fname; |
| |
$author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/; |
| |
my ($udom,$uname)=split(/\//,$author); |
| |
my $home=homeserver($uname,$udom); |
| |
if ($home eq 'no_host') { |
| |
$answer = 'no_host'; |
| |
} elsif (grep { $_ eq $home } ¤t_machine_ids()) { |
| |
$answer = 'home'; |
| |
} else { |
| |
$answer = reply("unsub:$fname",$home); |
| |
} |
| |
return $answer; |
| |
} |
| |
|
| # ------------------------------------------------ Get server side include body |
# ------------------------------------------------ Get server side include body |
| sub ssi_body { |
sub ssi_body { |
| my ($filelink,%form)=@_; |
my ($filelink,%form)=@_; |
|
Line 3106 sub remove_stale_resfile {
|
Line 3241 sub remove_stale_resfile {
|
| (grep { $_ eq $homeserver } ¤t_machine_ids())) { |
(grep { $_ eq $homeserver } ¤t_machine_ids())) { |
| my $fname = &filelocation('',$url); |
my $fname = &filelocation('',$url); |
| if (-e $fname) { |
if (-e $fname) { |
| my $ua=new LWP::UserAgent; |
|
| $ua->timeout(5); |
|
| my $protocol = $protocol{$homeserver}; |
|
| $protocol = 'http' if ($protocol ne 'https'); |
|
| my $hostname = &hostname($homeserver); |
my $hostname = &hostname($homeserver); |
| if ($hostname) { |
if ($hostname) { |
| |
my $protocol = $protocol{$homeserver}; |
| |
$protocol = 'http' if ($protocol ne 'https'); |
| my $uri = $protocol.'://'.$hostname.'/raw/'.&declutter($url); |
my $uri = $protocol.'://'.$hostname.'/raw/'.&declutter($url); |
| |
my $ua=new LWP::UserAgent; |
| |
$ua->timeout(5); |
| my $request=new HTTP::Request('HEAD',$uri); |
my $request=new HTTP::Request('HEAD',$uri); |
| my $response=$ua->request($request); |
my $response=$ua->request($request); |
| if ($response->is_success()) { |
if ($response->is_success()) { |
|
Line 3138 sub remove_stale_resfile {
|
Line 3273 sub remove_stale_resfile {
|
| $stale = 1; |
$stale = 1; |
| } |
} |
| if ($stale) { |
if ($stale) { |
| unlink($fname); |
if (unlink($fname)) { |
| if ($uri!~/\.meta$/) { |
if ($uri!~/\.meta$/) { |
| unlink($fname.'.meta'); |
if (-e $fname.'.meta') { |
| |
unlink($fname.'.meta'); |
| |
} |
| |
} |
| |
my $unsubresult = &unsubscribe($fname); |
| |
unless ($unsubresult eq 'ok') { |
| |
&logthis("no unsub of $fname from $homeserver, reason: $unsubresult"); |
| |
} |
| |
$removed = 1; |
| } |
} |
| &reply("unsub:$fname",$homeserver); |
|
| $removed = 1; |
|
| } |
} |
| } |
} |
| } |
} |
|
Line 3293 sub can_edit_resource {
|
Line 3434 sub can_edit_resource {
|
| $forceedit = 1; |
$forceedit = 1; |
| } |
} |
| $cfile = $resurl; |
$cfile = $resurl; |
| |
} elsif (($resurl =~ m{^/ext/}) && ($symb ne '')) { |
| |
my ($map,$id,$res) = &decode_symb($symb); |
| |
if ($map =~ /\.page$/) { |
| |
$incourse = 1; |
| |
if ($env{'form.forceedit'}) { |
| |
$forceview = 1; |
| |
$cfile = $map; |
| |
} else { |
| |
$forceedit = 1; |
| |
$cfile = '/adm/wrapper'.$resurl; |
| |
} |
| |
} |
| |
} elsif ($resurl =~ m{^/adm/wrapper/adm/$cdom/$cnum/\d+/ext\.tool$}) { |
| |
$incourse = 1; |
| |
if ($env{'form.forceedit'}) { |
| |
$forceview = 1; |
| |
} else { |
| |
$forceedit = 1; |
| |
} |
| |
$cfile = $resurl; |
| } elsif ($resurl =~ m{^/?adm/viewclasslist$}) { |
} elsif ($resurl =~ m{^/?adm/viewclasslist$}) { |
| $incourse = 1; |
$incourse = 1; |
| if ($env{'form.forceedit'}) { |
if ($env{'form.forceedit'}) { |
|
Line 3310 sub can_edit_resource {
|
Line 3471 sub can_edit_resource {
|
| $cfile = $template; |
$cfile = $template; |
| } |
} |
| } elsif (($resurl =~ m{^/adm/wrapper/ext/}) && ($env{'form.folderpath'} =~ /^supplemental/)) { |
} elsif (($resurl =~ m{^/adm/wrapper/ext/}) && ($env{'form.folderpath'} =~ /^supplemental/)) { |
| $incourse = 1; |
$incourse = 1; |
| if ($env{'form.forceedit'}) { |
if ($env{'form.forceedit'}) { |
| $forceview = 1; |
$forceview = 1; |
| } else { |
} else { |
| $forceedit = 1; |
$forceedit = 1; |
| } |
} |
| $cfile = $resurl; |
$cfile = $resurl; |
| |
} elsif (($resurl =~ m{^/adm/wrapper/adm/$cdom/$cnum/\d+/ext\.tool$}) && ($env{'form.folderpath'} =~ /^supplemental/)) { |
| |
$incourse = 1; |
| |
if ($env{'form.forceedit'}) { |
| |
$forceview = 1; |
| |
} else { |
| |
$forceedit = 1; |
| |
} |
| |
$cfile = $resurl; |
| } elsif (($resurl eq '/adm/extresedit') && ($symb || $env{'form.folderpath'})) { |
} elsif (($resurl eq '/adm/extresedit') && ($symb || $env{'form.folderpath'})) { |
| $incourse = 1; |
$incourse = 1; |
| $forceview = 1; |
$forceview = 1; |
|
Line 3326 sub can_edit_resource {
|
Line 3495 sub can_edit_resource {
|
| $cfile = &clutter($res); |
$cfile = &clutter($res); |
| } else { |
} else { |
| $cfile = $env{'form.suppurl'}; |
$cfile = $env{'form.suppurl'}; |
| $cfile =~ s{^http://}{}; |
my $escfile = &unescape($cfile); |
| $cfile = '/adm/wrapper/ext/'.$cfile; |
if ($escfile =~ m{^/adm/$cdom/$cnum/\d+/ext\.tool$}) { |
| |
$cfile = '/adm/wrapper'.$escfile; |
| |
} else { |
| |
$escfile =~ s{^http://}{}; |
| |
$cfile = &escape("/adm/wrapper/ext/$escfile"); |
| |
} |
| } |
} |
| } elsif ($resurl =~ m{^/?adm/viewclasslist$}) { |
} elsif ($resurl =~ m{^/?adm/viewclasslist$}) { |
| if ($env{'form.forceedit'}) { |
if ($env{'form.forceedit'}) { |
|
Line 3566 sub clean_filename {
|
Line 3740 sub clean_filename {
|
| } |
} |
| # Replace spaces by underscores |
# Replace spaces by underscores |
| $fname=~s/\s+/\_/g; |
$fname=~s/\s+/\_/g; |
| |
# Transliterate non-ascii text to ascii |
| |
my $lang = &Apache::lonlocal::current_language(); |
| |
$fname = &LONCAPA::transliterate::fname_to_ascii($fname,$lang); |
| # Replace all other weird characters by nothing |
# Replace all other weird characters by nothing |
| $fname=~s{[^/\w\.\-]}{}g; |
$fname=~s{[^/\w\.\-]}{}g; |
| # Replace all .\d. sequences with _\d. so they no longer look like version |
# Replace all .\d. sequences with _\d. so they no longer look like version |
|
Line 3573 sub clean_filename {
|
Line 3750 sub clean_filename {
|
| $fname=~s/\.(\d+)(?=\.)/_$1/g; |
$fname=~s/\.(\d+)(?=\.)/_$1/g; |
| return $fname; |
return $fname; |
| } |
} |
| |
|
| # This Function checks if an Image's dimensions exceed either $resizewidth (width) |
# This Function checks if an Image's dimensions exceed either $resizewidth (width) |
| # or $resizeheight (height) - both pixels. If so, the image is scaled to produce an |
# or $resizeheight (height) - both pixels. If so, the image is scaled to produce an |
| # image with the same aspect ratio as the original, but with dimensions which do |
# image with the same aspect ratio as the original, but with dimensions which do |
|
Line 3615 sub resizeImage {
|
Line 3793 sub resizeImage {
|
| # input: $formname - the contents of the file are in $env{"form.$formname"} |
# input: $formname - the contents of the file are in $env{"form.$formname"} |
| # the desired filename is in $env{"form.$formname.filename"} |
# the desired filename is in $env{"form.$formname.filename"} |
| # $context - possible values: coursedoc, existingfile, overwrite, |
# $context - possible values: coursedoc, existingfile, overwrite, |
| # canceloverwrite, or ''. |
# canceloverwrite, scantron or ''. |
| # if 'coursedoc': upload to the current course |
# if 'coursedoc': upload to the current course |
| # if 'existingfile': write file to tmp/overwrites directory |
# if 'existingfile': write file to tmp/overwrites directory |
| # if 'canceloverwrite': delete file written to tmp/overwrites directory |
# if 'canceloverwrite': delete file written to tmp/overwrites directory |
| # $context is passed as argument to &finishuserfileupload |
# $context is passed as argument to &finishuserfileupload |
| # $subdir - directory in userfile to store the file into |
# $subdir - directory in userfile to store the file into |
| # $parser - instruction to parse file for objects ($parser = parse) |
# $parser - instruction to parse file for objects ($parser = parse) or |
| |
# if context is 'scantron', $parser is hashref of csv column mapping |
| |
# (e.g.,{ PaperID => 0, LastName => 1, FirstName => 2, ID => 3, |
| |
# Section => 4, CODE => 5, FirstQuestion => 9 }). |
| # $allfiles - reference to hash for embedded objects |
# $allfiles - reference to hash for embedded objects |
| # $codebase - reference to hash for codebase of java objects |
# $codebase - reference to hash for codebase of java objects |
| # $desuname - username for permanent storage of uploaded file |
# $desuname - username for permanent storage of uploaded file |
|
Line 3644 sub userfileupload {
|
Line 3825 sub userfileupload {
|
| $fname=&clean_filename($fname); |
$fname=&clean_filename($fname); |
| # See if there is anything left |
# See if there is anything left |
| unless ($fname) { return 'error: no uploaded file'; } |
unless ($fname) { return 'error: no uploaded file'; } |
| |
# If filename now begins with a . prepend unix timestamp _ milliseconds |
| |
if ($fname =~ /^\./) { |
| |
my ($s,$usec) = &gettimeofday(); |
| |
while (length($usec) < 6) { |
| |
$usec = '0'.$usec; |
| |
} |
| |
$fname = $s.'_'.substr($usec,0,3).$fname; |
| |
} |
| # Files uploaded to help request form, or uploaded to "create course" page are handled differently |
# Files uploaded to help request form, or uploaded to "create course" page are handled differently |
| if ((($formname eq 'screenshot') && ($subdir eq 'helprequests')) || |
if ((($formname eq 'screenshot') && ($subdir eq 'helprequests')) || |
| (($formname eq 'coursecreatorxml') && ($subdir eq 'batchupload')) || |
(($formname eq 'coursecreatorxml') && ($subdir eq 'batchupload')) || |
|
Line 3811 sub finishuserfileupload {
|
Line 4000 sub finishuserfileupload {
|
| } |
} |
| } |
} |
| } |
} |
| if ($parser eq 'parse') { |
if (($context ne 'scantron') && ($parser eq 'parse')) { |
| if ((ref($mimetype)) && ($$mimetype eq 'text/html')) { |
if ((ref($mimetype)) && ($$mimetype eq 'text/html')) { |
| my $parse_result = &extract_embedded_items($filepath.'/'.$file, |
my $parse_result = &extract_embedded_items($filepath.'/'.$file, |
| $allfiles,$codebase); |
$allfiles,$codebase); |
|
Line 3820 sub finishuserfileupload {
|
Line 4009 sub finishuserfileupload {
|
| ' for embedded media: '.$parse_result); |
' for embedded media: '.$parse_result); |
| } |
} |
| } |
} |
| |
} elsif (($context eq 'scantron') && (ref($parser) eq 'HASH')) { |
| |
my $format = $env{'form.scantron_format'}; |
| |
&bubblesheet_converter($docudom,$filepath.'/'.$file,$parser,$format); |
| } |
} |
| if (($thumbwidth =~ /^\d+$/) && ($thumbheight =~ /^\d+$/)) { |
if (($thumbwidth =~ /^\d+$/) && ($thumbheight =~ /^\d+$/)) { |
| my $input = $filepath.'/'.$file; |
my $input = $filepath.'/'.$file; |
|
Line 4060 sub embedded_dependency {
|
Line 4252 sub embedded_dependency {
|
| return; |
return; |
| } |
} |
| |
|
| |
sub bubblesheet_converter { |
| |
my ($cdom,$fullpath,$config,$format) = @_; |
| |
if ((&domain($cdom) ne '') && |
| |
($fullpath =~ m{^\Q$perlvar{'lonDocRoot'}/userfiles/$cdom/\E$match_courseid/scantron_orig}) && |
| |
(-e $fullpath) && (ref($config) eq 'HASH') && ($format ne '')) { |
| |
my (%csvcols,%csvoptions); |
| |
if (ref($config->{'fields'}) eq 'HASH') { |
| |
%csvcols = %{$config->{'fields'}}; |
| |
} |
| |
if (ref($config->{'options'}) eq 'HASH') { |
| |
%csvoptions = %{$config->{'options'}}; |
| |
} |
| |
my %csvbynum = reverse(%csvcols); |
| |
my %scantronconf = &get_scantron_config($format,$cdom); |
| |
if (keys(%scantronconf)) { |
| |
my %bynum = ( |
| |
$scantronconf{CODEstart} => 'CODEstart', |
| |
$scantronconf{IDstart} => 'IDstart', |
| |
$scantronconf{PaperID} => 'PaperID', |
| |
$scantronconf{FirstName} => 'FirstName', |
| |
$scantronconf{LastName} => 'LastName', |
| |
$scantronconf{Qstart} => 'Qstart', |
| |
); |
| |
my @ordered; |
| |
foreach my $item (sort { $a <=> $b } keys(%bynum)) { |
| |
push(@ordered,$bynum{$item}); |
| |
} |
| |
my %mapstart = ( |
| |
CODEstart => 'CODE', |
| |
IDstart => 'ID', |
| |
PaperID => 'PaperID', |
| |
FirstName => 'FirstName', |
| |
LastName => 'LastName', |
| |
Qstart => 'FirstQuestion', |
| |
); |
| |
my %maplength = ( |
| |
CODEstart => 'CODElength', |
| |
IDstart => 'IDlength', |
| |
PaperID => 'PaperIDlength', |
| |
FirstName => 'FirstNamelength', |
| |
LastName => 'LastNamelength', |
| |
); |
| |
if (open(my $fh,'<',$fullpath)) { |
| |
my $output; |
| |
my %lettdig = &letter_to_digits(); |
| |
my %diglett = reverse(%lettdig); |
| |
my $numletts = scalar(keys(%lettdig)); |
| |
my $num = 0; |
| |
while (my $line=<$fh>) { |
| |
$num ++; |
| |
next if (($num == 1) && ($csvoptions{'hdr'} == 1)); |
| |
$line =~ s{[\r\n]+$}{}; |
| |
my %found; |
| |
my @values = split(/,/,$line); |
| |
my ($qstart,$record); |
| |
for (my $i=0; $i<@values; $i++) { |
| |
if ((($qstart ne '') && ($i > $qstart)) || |
| |
($csvbynum{$i} eq 'FirstQuestion')) { |
| |
if ($values[$i] eq '') { |
| |
$values[$i] = $scantronconf{'Qoff'}; |
| |
} elsif ($scantronconf{'Qon'} eq 'number') { |
| |
if ($values[$i] =~ /^[A-Ja-j]$/) { |
| |
$values[$i] = $lettdig{uc($values[$i])}; |
| |
} |
| |
} elsif ($scantronconf{'Qon'} eq 'letter') { |
| |
if ($values[$i] =~ /^[0-9]$/) { |
| |
$values[$i] = $diglett{$values[$i]}; |
| |
} |
| |
} else { |
| |
if ($values[$i] =~ /^[0-9A-Ja-j]$/) { |
| |
my $digit; |
| |
if ($values[$i] =~ /^[A-Ja-j]$/) { |
| |
$digit = $lettdig{uc($values[$i])}-1; |
| |
if ($values[$i] eq 'J') { |
| |
$digit += $numletts; |
| |
} |
| |
} elsif ($values[$i] =~ /^[0-9]$/) { |
| |
$digit = $values[$i]-1; |
| |
if ($values[$i] eq '0') { |
| |
$digit += $numletts; |
| |
} |
| |
} |
| |
my $qval=''; |
| |
for (my $j=0; $j<$scantronconf{'Qlength'}; $j++) { |
| |
if ($j == $digit) { |
| |
$qval .= $scantronconf{'Qon'}; |
| |
} else { |
| |
$qval .= $scantronconf{'Qoff'}; |
| |
} |
| |
} |
| |
$values[$i] = $qval; |
| |
} |
| |
} |
| |
if (length($values[$i]) > $scantronconf{'Qlength'}) { |
| |
$values[$i] = substr($values[$i],0,$scantronconf{'Qlength'}); |
| |
} |
| |
my $numblank = $scantronconf{'Qlength'} - length($values[$i]); |
| |
if ($numblank > 0) { |
| |
$values[$i] .= ($scantronconf{'Qoff'} x $numblank); |
| |
} |
| |
if ($csvbynum{$i} eq 'FirstQuestion') { |
| |
$qstart = $i; |
| |
$found{$csvbynum{$i}} = $values[$i]; |
| |
} else { |
| |
$found{'FirstQuestion'} .= $values[$i]; |
| |
} |
| |
} elsif (exists($csvbynum{$i})) { |
| |
if ($csvoptions{'rem'}) { |
| |
$values[$i] =~ s/^\s+//; |
| |
} |
| |
if (($csvbynum{$i} eq 'PaperID') && ($csvoptions{'pad'})) { |
| |
while (length($values[$i]) < $scantronconf{$maplength{$csvbynum{$i}}}) { |
| |
$values[$i] = '0'.$values[$i]; |
| |
} |
| |
} |
| |
$found{$csvbynum{$i}} = $values[$i]; |
| |
} |
| |
} |
| |
foreach my $item (@ordered) { |
| |
my $currlength = 1+length($record); |
| |
my $numspaces = $scantronconf{$item} - $currlength; |
| |
if ($numspaces > 0) { |
| |
$record .= (' ' x $numspaces); |
| |
} |
| |
if (($mapstart{$item} ne '') && (exists($found{$mapstart{$item}}))) { |
| |
unless ($item eq 'Qstart') { |
| |
if (length($found{$mapstart{$item}}) > $scantronconf{$maplength{$item}}) { |
| |
$found{$mapstart{$item}} = substr($found{$mapstart{$item}},0,$scantronconf{$maplength{$item}}); |
| |
} |
| |
} |
| |
$record .= $found{$mapstart{$item}}; |
| |
} |
| |
} |
| |
$output .= "$record\n"; |
| |
} |
| |
close($fh); |
| |
if ($output) { |
| |
if (open(my $fh,'>',$fullpath)) { |
| |
print $fh $output; |
| |
close($fh); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
} |
| |
|
| |
sub letter_to_digits { |
| |
my %lettdig = ( |
| |
A => 1, |
| |
B => 2, |
| |
C => 3, |
| |
D => 4, |
| |
E => 5, |
| |
F => 6, |
| |
G => 7, |
| |
H => 8, |
| |
I => 9, |
| |
J => 0, |
| |
); |
| |
return %lettdig; |
| |
} |
| |
|
| |
sub get_scantron_config { |
| |
my ($which,$cdom) = @_; |
| |
my @lines = &get_scantronformat_file($cdom); |
| |
my %config; |
| |
#FIXME probably should move to XML it has already gotten a bit much now |
| |
foreach my $line (@lines) { |
| |
my ($name,$descrip)=split(/:/,$line); |
| |
if ($name ne $which ) { next; } |
| |
chomp($line); |
| |
my @config=split(/:/,$line); |
| |
$config{'name'}=$config[0]; |
| |
$config{'description'}=$config[1]; |
| |
$config{'CODElocation'}=$config[2]; |
| |
$config{'CODEstart'}=$config[3]; |
| |
$config{'CODElength'}=$config[4]; |
| |
$config{'IDstart'}=$config[5]; |
| |
$config{'IDlength'}=$config[6]; |
| |
$config{'Qstart'}=$config[7]; |
| |
$config{'Qlength'}=$config[8]; |
| |
$config{'Qoff'}=$config[9]; |
| |
$config{'Qon'}=$config[10]; |
| |
$config{'PaperID'}=$config[11]; |
| |
$config{'PaperIDlength'}=$config[12]; |
| |
$config{'FirstName'}=$config[13]; |
| |
$config{'FirstNamelength'}=$config[14]; |
| |
$config{'LastName'}=$config[15]; |
| |
$config{'LastNamelength'}=$config[16]; |
| |
$config{'BubblesPerRow'}=$config[17]; |
| |
last; |
| |
} |
| |
return %config; |
| |
} |
| |
|
| |
sub get_scantronformat_file { |
| |
my ($cdom) = @_; |
| |
if ($cdom eq '') { |
| |
$cdom= $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
} |
| |
my %domconfig = &get_dom('configuration',['scantron'],$cdom); |
| |
my $gottab = 0; |
| |
my @lines; |
| |
if (ref($domconfig{'scantron'}) eq 'HASH') { |
| |
if ($domconfig{'scantron'}{'scantronformat'} ne '') { |
| |
my $formatfile = &getfile($perlvar{'lonDocRoot'}.$domconfig{'scantron'}{'scantronformat'}); |
| |
if ($formatfile ne '-1') { |
| |
@lines = split("\n",$formatfile,-1); |
| |
$gottab = 1; |
| |
} |
| |
} |
| |
} |
| |
if (!$gottab) { |
| |
my $confname = $cdom.'-domainconfig'; |
| |
my $default = $perlvar{'lonDocRoot'}.'/res/'.$cdom.'/'.$confname.'/default.tab'; |
| |
my $formatfile = &getfile($default); |
| |
if ($formatfile ne '-1') { |
| |
@lines = split("\n",$formatfile,-1); |
| |
$gottab = 1; |
| |
} |
| |
} |
| |
if (!$gottab) { |
| |
my @domains = ¤t_machine_domains(); |
| |
if (grep(/^\Q$cdom\E$/,@domains)) { |
| |
if (open(my $fh,'<',$perlvar{'lonTabDir'}.'/scantronformat.tab')) { |
| |
@lines = <$fh>; |
| |
close($fh); |
| |
} |
| |
} else { |
| |
if (open(my $fh,'<',$perlvar{'lonTabDir'}.'/default_scantronformat.tab')) { |
| |
@lines = <$fh>; |
| |
close($fh); |
| |
} |
| |
} |
| |
} |
| |
return @lines; |
| |
} |
| |
|
| sub removeuploadedurl { |
sub removeuploadedurl { |
| my ($url)=@_; |
my ($url)=@_; |
| my (undef,undef,$udom,$uname,$fname)=split('/',$url,5); |
my (undef,undef,$udom,$uname,$fname)=split('/',$url,5); |
|
Line 5042 my %cachedtimes=();
|
Line 5474 my %cachedtimes=();
|
| my $cachedtime=''; |
my $cachedtime=''; |
| |
|
| sub load_all_first_access { |
sub load_all_first_access { |
| my ($uname,$udom)=@_; |
my ($uname,$udom,$ignorecache)=@_; |
| if (($cachedkey eq $uname.':'.$udom) && |
if (($cachedkey eq $uname.':'.$udom) && |
| (abs($cachedtime-time)<5) && (!$env{'form.markaccess'})) { |
(abs($cachedtime-time)<5) && (!$env{'form.markaccess'}) && |
| |
(!$ignorecache)) { |
| return; |
return; |
| } |
} |
| $cachedtime=time; |
$cachedtime=time; |
|
Line 5053 sub load_all_first_access {
|
Line 5486 sub load_all_first_access {
|
| } |
} |
| |
|
| sub get_first_access { |
sub get_first_access { |
| my ($type,$argsymb,$argmap)=@_; |
my ($type,$argsymb,$argmap,$ignorecache)=@_; |
| my ($symb,$courseid,$udom,$uname)=&whichuser(); |
my ($symb,$courseid,$udom,$uname)=&whichuser(); |
| if ($argsymb) { $symb=$argsymb; } |
if ($argsymb) { $symb=$argsymb; } |
| my ($map,$id,$res)=&decode_symb($symb); |
my ($map,$id,$res)=&decode_symb($symb); |
|
Line 5065 sub get_first_access {
|
Line 5498 sub get_first_access {
|
| } else { |
} else { |
| $res=$symb; |
$res=$symb; |
| } |
} |
| &load_all_first_access($uname,$udom); |
&load_all_first_access($uname,$udom,$ignorecache); |
| return $cachedtimes{"$courseid\0$res"}; |
return $cachedtimes{"$courseid\0$res"}; |
| } |
} |
| |
|
|
Line 6482 sub currentdump {
|
Line 6915 sub currentdump {
|
| # |
# |
| my %returnhash=(); |
my %returnhash=(); |
| # |
# |
| if ($rep eq "unknown_cmd") { |
if ($rep eq 'unknown_cmd') { |
| # an old lond will not know currentdump |
# an old lond will not know currentdump |
| # Do a dump and make it look like a currentdump |
# Do a dump and make it look like a currentdump |
| my @tmp = &dumpstore($courseid,$sdom,$sname,'.'); |
my @tmp = &dumpstore($courseid,$sdom,$sname,'.'); |
|
Line 7398 sub customaccess {
|
Line 7831 sub customaccess {
|
| # ------------------------------------------------- Check for a user privilege |
# ------------------------------------------------- Check for a user privilege |
| |
|
| sub allowed { |
sub allowed { |
| my ($priv,$uri,$symb,$role,$clientip,$noblockcheck)=@_; |
my ($priv,$uri,$symb,$role,$clientip,$noblockcheck,$ignorecache)=@_; |
| my $ver_orguri=$uri; |
my $ver_orguri=$uri; |
| $uri=&deversion($uri); |
$uri=&deversion($uri); |
| my $orguri=$uri; |
my $orguri=$uri; |
|
Line 7415 sub allowed {
|
Line 7848 sub allowed {
|
| |
|
| if (defined($env{'allowed.'.$priv})) { return $env{'allowed.'.$priv}; } |
if (defined($env{'allowed.'.$priv})) { return $env{'allowed.'.$priv}; } |
| # Free bre access to adm and meta resources |
# Free bre access to adm and meta resources |
| if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard)$})) |
if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard|ext\.tool)$})) |
| || (($uri=~/\.meta$/) && ($uri!~m|^uploaded/|) )) |
|| (($uri=~/\.meta$/) && ($uri!~m|^uploaded/|) )) |
| && ($priv eq 'bre')) { |
&& ($priv eq 'bre')) { |
| return 'F'; |
return 'F'; |
|
Line 7580 sub allowed {
|
Line 8013 sub allowed {
|
| |
|
| if ($env{'user.priv.'.$env{'request.role'}.'.'.$courseuri} |
if ($env{'user.priv.'.$env{'request.role'}.'.'.$courseuri} |
| =~/\Q$priv\E\&([^\:]*)/) { |
=~/\Q$priv\E\&([^\:]*)/) { |
| unless (($priv eq 'bro') && (!$ownaccess)) { |
if ($priv eq 'mip') { |
| $thisallowed.=$1; |
my $rem = $1; |
| |
if (($uri ne '') && ($env{'request.course.id'} eq $uri) && |
| |
($env{'course.'.$env{'request.course.id'}.'.internal.courseowner'} eq $env{'user.name'}.':'.$env{'user.domain'})) { |
| |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
if ($cdom ne '') { |
| |
my %passwdconf = &get_passwdconf($cdom); |
| |
if (ref($passwdconf{'crsownerchg'}) eq 'HASH') { |
| |
if (ref($passwdconf{'crsownerchg'}{'by'}) eq 'ARRAY') { |
| |
if (@{$passwdconf{'crsownerchg'}{'by'}}) { |
| |
my @inststatuses = split(':',$env{'environment.inststatus'}); |
| |
unless (@inststatuses) { |
| |
@inststatuses = ('default'); |
| |
} |
| |
foreach my $status (@inststatuses) { |
| |
if (grep(/^\Q$status\E$/,@{$passwdconf{'crsownerchg'}{'by'}})) { |
| |
$thisallowed.=$rem; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
unless (($priv eq 'bro') && (!$ownaccess)) { |
| |
$thisallowed.=$1; |
| |
} |
| } |
} |
| } |
} |
| |
|
|
Line 7597 sub allowed {
|
Line 8056 sub allowed {
|
| if ($noblockcheck) { |
if ($noblockcheck) { |
| $thisallowed.=$value; |
$thisallowed.=$value; |
| } else { |
} else { |
| my @blockers = &has_comm_blocking($priv,$symb,$uri); |
my @blockers = &has_comm_blocking($priv,$symb,$uri,$ignorecache); |
| if (@blockers > 0) { |
if (@blockers > 0) { |
| $thisallowed = 'B'; |
$thisallowed = 'B'; |
| } else { |
} else { |
|
Line 7617 sub allowed {
|
Line 8076 sub allowed {
|
| if ($noblockcheck) { |
if ($noblockcheck) { |
| $thisallowed='F'; |
$thisallowed='F'; |
| } else { |
} else { |
| my @blockers = &has_comm_blocking($priv,$symb,$refuri); |
my @blockers = &has_comm_blocking($priv,'',$refuri,'',1); |
| if (@blockers > 0) { |
if (@blockers > 0) { |
| $thisallowed = 'B'; |
$thisallowed = 'B'; |
| } else { |
} else { |
|
Line 7636 sub allowed {
|
Line 8095 sub allowed {
|
| && &is_portfolio_url($uri)) { |
&& &is_portfolio_url($uri)) { |
| $thisallowed = &portfolio_access($uri,$clientip); |
$thisallowed = &portfolio_access($uri,$clientip); |
| } |
} |
| |
|
| # Full access at system, domain or course-wide level? Exit. |
# Full access at system, domain or course-wide level? Exit. |
| if ($thisallowed=~/F/) { |
if ($thisallowed=~/F/) { |
| return 'F'; |
return 'F'; |
|
Line 7664 sub allowed {
|
Line 8123 sub allowed {
|
| |
|
| if ($env{'request.course.id'}) { |
if ($env{'request.course.id'}) { |
| |
|
| |
# If this is modifying password (internal auth) domains must match for user and user's role. |
| |
|
| |
if ($priv eq 'mip') { |
| |
if ($env{'user.domain'} eq $env{'request.role.domain'}) { |
| |
return $thisallowed; |
| |
} else { |
| |
return ''; |
| |
} |
| |
} |
| |
|
| $courseprivid=$env{'request.course.id'}; |
$courseprivid=$env{'request.course.id'}; |
| if ($env{'request.course.sec'}) { |
if ($env{'request.course.sec'}) { |
| $courseprivid.='/'.$env{'request.course.sec'}; |
$courseprivid.='/'.$env{'request.course.sec'}; |
|
Line 7680 sub allowed {
|
Line 8149 sub allowed {
|
| if ($noblockcheck) { |
if ($noblockcheck) { |
| $thisallowed.=$value; |
$thisallowed.=$value; |
| } else { |
} else { |
| my @blockers = &has_comm_blocking($priv,$symb,$uri); |
my @blockers = &has_comm_blocking($priv,$symb,$uri,$ignorecache); |
| if (@blockers > 0) { |
if (@blockers > 0) { |
| $thisallowed = 'B'; |
$thisallowed = 'B'; |
| } else { |
} else { |
|
Line 7693 sub allowed {
|
Line 8162 sub allowed {
|
| $checkreferer=0; |
$checkreferer=0; |
| } |
} |
| } |
} |
| |
|
| if ($checkreferer) { |
if ($checkreferer) { |
| my $refuri=$env{'httpref.'.$orguri}; |
my $refuri=$env{'httpref.'.$orguri}; |
| unless ($refuri) { |
unless ($refuri) { |
|
Line 7722 sub allowed {
|
Line 8191 sub allowed {
|
| if ($noblockcheck) { |
if ($noblockcheck) { |
| $thisallowed.=$value; |
$thisallowed.=$value; |
| } else { |
} else { |
| my @blockers = &has_comm_blocking($priv,$symb,$refuri); |
my @blockers = &has_comm_blocking($priv,'',$refuri,'',1); |
| if (@blockers > 0) { |
if (@blockers > 0) { |
| $thisallowed = 'B'; |
$thisallowed = 'B'; |
| } else { |
} else { |
|
Line 7808 sub allowed {
|
Line 8277 sub allowed {
|
| } |
} |
| } |
} |
| } |
} |
| |
|
| # |
# |
| # Rest of the restrictions depend on selected course |
# Rest of the restrictions depend on selected course |
| # |
# |
|
Line 7966 sub constructaccess {
|
Line 8435 sub constructaccess {
|
| # |
# |
| # User for whom data are being temporarily cached. |
# User for whom data are being temporarily cached. |
| my $cacheduser=''; |
my $cacheduser=''; |
| |
# Course for which data are being temporarily cached. |
| |
my $cachedcid=''; |
| |
# List of blocks passed to &get_commblock_resources(); |
| |
my $cachedblocks=''; |
| # Cached blockers for this user (a hash of blocking items). |
# Cached blockers for this user (a hash of blocking items). |
| my %cachedblockers=(); |
my %cachedblockers=(); |
| # When the data were last cached. |
# When the data were last cached. |
|
Line 7975 sub load_all_blockers {
|
Line 8448 sub load_all_blockers {
|
| my ($uname,$udom,$blocks)=@_; |
my ($uname,$udom,$blocks)=@_; |
| if (($uname ne '') && ($udom ne '')) { |
if (($uname ne '') && ($udom ne '')) { |
| if (($cacheduser eq $uname.':'.$udom) && |
if (($cacheduser eq $uname.':'.$udom) && |
| (abs($cachedlast-time)<5)) { |
($cachedcid eq $env{'request.course.id'}) && |
| |
(abs($cachedlast-time)<5) && |
| |
(((ref($blocks) eq 'HASH') && |
| |
($cachedblocks eq join(',',sort(keys(%{$blocks}))))) || |
| |
(!ref($blocks) && $cachedblocks eq ''))) { |
| return; |
return; |
| } |
} |
| } |
} |
| $cachedlast=time; |
$cachedlast=time; |
| $cacheduser=$uname.':'.$udom; |
$cacheduser=$uname.':'.$udom; |
| |
$cachedcid=$env{'request.course.id'}; |
| %cachedblockers = &get_commblock_resources($blocks); |
%cachedblockers = &get_commblock_resources($blocks); |
| |
if ((ref($blocks) eq 'HASH') && (keys(%{$blocks}) > 0)) { |
| |
$cachedblocks = join(',',sort(keys(%{$blocks}))); |
| |
} |
| |
return; |
| } |
} |
| |
|
| sub get_comm_blocks { |
sub get_comm_blocks { |
|
Line 8076 sub get_commblock_resources {
|
Line 8558 sub get_commblock_resources {
|
| } |
} |
| } |
} |
| } |
} |
| if ($interval[0] =~ /^\d+$/) { |
if ($interval[0] =~ /^(\d+)/) { |
| |
my $timelimit = $1; |
| my $first_access; |
my $first_access; |
| if ($type eq 'resource') { |
if ($type eq 'resource') { |
| $first_access=&get_first_access($interval[1],$item); |
$first_access=&get_first_access($interval[1],$item); |
|
Line 8086 sub get_commblock_resources {
|
Line 8569 sub get_commblock_resources {
|
| $first_access=&get_first_access($interval[1]); |
$first_access=&get_first_access($interval[1]); |
| } |
} |
| if ($first_access) { |
if ($first_access) { |
| my $timesup = $first_access+$interval[0]; |
my $timesup = $first_access+$timelimit; |
| if ($timesup > $now) { |
if ($timesup > $now) { |
| my $activeblock; |
my $activeblock; |
| foreach my $res (@to_test) { |
foreach my $res (@to_test) { |
|
Line 8118 sub get_commblock_resources {
|
Line 8601 sub get_commblock_resources {
|
| } |
} |
| |
|
| sub has_comm_blocking { |
sub has_comm_blocking { |
| my ($priv,$symb,$uri,$blocks) = @_; |
my ($priv,$symb,$uri,$nosymbcache,$noenccheck,$blocked,$blocks) = @_; |
| my @blockers; |
my @blockers; |
| return unless ($env{'request.course.id'}); |
return unless ($env{'request.course.id'}); |
| return unless ($priv eq 'bre'); |
return unless ($priv eq 'bre'); |
|
Line 8128 sub has_comm_blocking {
|
Line 8611 sub has_comm_blocking {
|
| return unless (keys(%cachedblockers) > 0); |
return unless (keys(%cachedblockers) > 0); |
| my (%possibles,@symbs); |
my (%possibles,@symbs); |
| if (!$symb) { |
if (!$symb) { |
| $symb = &symbread($uri,1,1,1,\%possibles); |
$symb = &symbread($uri,1,1,1,\%possibles,$nosymbcache,$noenccheck); |
| } |
} |
| if ($symb) { |
if ($symb) { |
| @symbs = ($symb); |
@symbs = ($symb); |
|
Line 8142 sub has_comm_blocking {
|
Line 8625 sub has_comm_blocking {
|
| foreach my $block (keys(%cachedblockers)) { |
foreach my $block (keys(%cachedblockers)) { |
| if ($block =~ /^firstaccess____(.+)$/) { |
if ($block =~ /^firstaccess____(.+)$/) { |
| my $item = $1; |
my $item = $1; |
| if (($item eq $map) || ($item eq $symb)) { |
unless ($blocked) { |
| $noblock = 1; |
if (($item eq $map) || ($item eq $symb)) { |
| last; |
$noblock = 1; |
| |
last; |
| |
} |
| } |
} |
| } |
} |
| if (ref($cachedblockers{$block}) eq 'HASH') { |
if (ref($cachedblockers{$block}) eq 'HASH') { |
|
Line 8155 sub has_comm_blocking {
|
Line 8640 sub has_comm_blocking {
|
| } |
} |
| } |
} |
| } |
} |
| } |
if (ref($cachedblockers{$block}{'maps'}) eq 'HASH') { |
| if (ref($cachedblockers{$block}{'maps'}) eq 'HASH') { |
if ($cachedblockers{$block}{'maps'}{$map}) { |
| if ($cachedblockers{$block}{'maps'}{$map}) { |
unless (grep(/^\Q$block\E$/,@blockers)) { |
| unless (grep(/^\Q$block\E$/,@blockers)) { |
push(@blockers,$block); |
| push(@blockers,$block); |
} |
| } |
} |
| } |
} |
| } |
} |
| } |
} |
| } |
} |
| return if ($noblock); |
unless ($noblock) { |
| return @blockers; |
return @blockers; |
| |
} |
| |
return; |
| } |
} |
| } |
} |
| |
|
|
Line 9460 sub store_coowners {
|
Line 9947 sub store_coowners {
|
| sub modifyuserauth { |
sub modifyuserauth { |
| my ($udom,$uname,$umode,$upass)=@_; |
my ($udom,$uname,$umode,$upass)=@_; |
| my $uhome=&homeserver($uname,$udom); |
my $uhome=&homeserver($uname,$udom); |
| unless (&allowed('mau',$udom)) { return 'refused'; } |
my $allowed; |
| |
if (&allowed('mau',$udom)) { |
| |
$allowed = 1; |
| |
} elsif (($umode eq 'internal') && ($udom eq $env{'user.domain'}) && |
| |
($env{'request.course.id'}) && (&allowed('mip',$env{'request.course.id'})) && |
| |
(!$env{'course.'.$env{'request.course.id'}.'.internal.nopasswdchg'})) { |
| |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| |
if (($cdom ne '') && ($cnum ne '')) { |
| |
my $is_owner = &is_course_owner($cdom,$cnum); |
| |
if ($is_owner) { |
| |
$allowed = 1; |
| |
} |
| |
} |
| |
} |
| |
unless ($allowed) { return 'refused'; } |
| &logthis('Call to modify user authentication '.$udom.', '.$uname.', '. |
&logthis('Call to modify user authentication '.$udom.', '.$uname.', '. |
| $umode.' by '.$env{'user.name'}.' at '.$env{'user.domain'}. |
$umode.' by '.$env{'user.name'}.' at '.$env{'user.domain'}. |
| ' in domain '.$env{'request.role.domain'}); |
' in domain '.$env{'request.role.domain'}); |
|
Line 9797 sub writecoursepref {
|
Line 10299 sub writecoursepref {
|
| |
|
| sub createcourse { |
sub createcourse { |
| my ($udom,$description,$url,$course_server,$nonstandard,$inst_code, |
my ($udom,$description,$url,$course_server,$nonstandard,$inst_code, |
| $course_owner,$crstype,$cnum,$context,$category)=@_; |
$course_owner,$crstype,$cnum,$context,$category,$callercontext)=@_; |
| $url=&declutter($url); |
$url=&declutter($url); |
| my $cid=''; |
my $cid=''; |
| if ($context eq 'requestcourses') { |
if ($context eq 'requestcourses') { |
| my $can_create = 0; |
my $can_create = 0; |
| my ($ownername,$ownerdom) = split(':',$course_owner); |
my ($ownername,$ownerdom) = split(':',$course_owner); |
| if ($udom eq $ownerdom) { |
if ($udom eq $ownerdom) { |
| if (&usertools_access($ownername,$ownerdom,$category,undef, |
my $reload; |
| |
if (($callercontext eq 'auto') && |
| |
($ownerdom eq $env{'user.domain'}) && ($ownername eq $env{'user.name'})) { |
| |
$reload = 'reload'; |
| |
} |
| |
if (&usertools_access($ownername,$ownerdom,$category,$reload, |
| $context)) { |
$context)) { |
| $can_create = 1; |
$can_create = 1; |
| } |
} |
|
Line 10813 sub get_userresdata {
|
Line 11320 sub get_userresdata {
|
| # Parameters: |
# Parameters: |
| # $name - Course/user name. |
# $name - Course/user name. |
| # $domain - Name of the domain the user/course is registered on. |
# $domain - Name of the domain the user/course is registered on. |
| # $type - Type of thing $name is (must be 'course' or 'user' |
# $type - Type of thing $name is (must be 'course' or 'user') |
| # @which - Array of names of resources desired. |
# @which - Array of names of resources desired. |
| # Returns: |
# Returns: |
| # The value of the first reasource in @which that is found in the |
# The value of the first reasource in @which that is found in the |
|
Line 10834 sub resdata {
|
Line 11341 sub resdata {
|
| foreach my $item (@which) { |
foreach my $item (@which) { |
| if (defined($result->{$item->[0]})) { |
if (defined($result->{$item->[0]})) { |
| return [$result->{$item->[0]},$item->[1]]; |
return [$result->{$item->[0]},$item->[1]]; |
| } |
} |
| } |
} |
| return undef; |
return undef; |
| } |
} |
| |
|
| |
sub get_domain_ltitools { |
| |
my ($cdom) = @_; |
| |
my %ltitools; |
| |
my ($result,$cached)=&is_cached_new('ltitools',$cdom); |
| |
if (defined($cached)) { |
| |
if (ref($result) eq 'HASH') { |
| |
%ltitools = %{$result}; |
| |
} |
| |
} else { |
| |
my %domconfig = &get_dom('configuration',['ltitools'],$cdom); |
| |
if (ref($domconfig{'ltitools'}) eq 'HASH') { |
| |
%ltitools = %{$domconfig{'ltitools'}}; |
| |
my %encdomconfig = &get_dom('encconfig',['ltitools'],$cdom); |
| |
if (ref($encdomconfig{'ltitools'}) eq 'HASH') { |
| |
foreach my $id (keys(%ltitools)) { |
| |
if (ref($encdomconfig{'ltitools'}{$id}) eq 'HASH') { |
| |
foreach my $item ('key','secret') { |
| |
$ltitools{$id}{$item} = $encdomconfig{'ltitools'}{$id}{$item}; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
my $cachetime = 24*60*60; |
| |
&do_cache_new('ltitools',$cdom,\%ltitools,$cachetime); |
| |
} |
| |
return %ltitools; |
| |
} |
| |
|
| sub get_numsuppfiles { |
sub get_numsuppfiles { |
| my ($cnum,$cdom,$ignorecache)=@_; |
my ($cnum,$cdom,$ignorecache)=@_; |
| my $hashid=$cnum.':'.$cdom; |
my $hashid=$cnum.':'.$cdom; |
|
Line 11294 sub metadata {
|
Line 11830 sub metadata {
|
| # if it is a non metadata possible uri return quickly |
# if it is a non metadata possible uri return quickly |
| if (($uri eq '') || |
if (($uri eq '') || |
| (($uri =~ m|^/*adm/|) && |
(($uri =~ m|^/*adm/|) && |
| ($uri !~ m|^adm/includes|) && ($uri !~ m{/(smppg|bulletinboard)$})) || |
($uri !~ m|^adm/includes|) && ($uri !~ m{/(smppg|bulletinboard|ext\.tool)$})) || |
| ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ m{^/*uploaded/.+\.sequence$})) { |
($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ m{^/*uploaded/.+\.sequence$})) { |
| return undef; |
return undef; |
| } |
} |
|
Line 11881 sub symbverify {
|
Line 12417 sub symbverify {
|
| |
|
| if (tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db', |
if (tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db', |
| &GDBM_READER(),0640)) { |
&GDBM_READER(),0640)) { |
| my $noclutter; |
|
| if (($thisurl =~ m{^/adm/wrapper/ext/}) || ($thisurl =~ m{^ext/})) { |
if (($thisurl =~ m{^/adm/wrapper/ext/}) || ($thisurl =~ m{^ext/})) { |
| $thisurl =~ s/\?.+$//; |
$thisurl =~ s/\?.+$//; |
| if ($map =~ m{^uploaded/.+\.page$}) { |
if ($map =~ m{^uploaded/.+\.page$}) { |
| $thisurl =~ s{^(/adm/wrapper|)/ext/}{http://}; |
$thisurl =~ s{^(/adm/wrapper|)/ext/}{http://}; |
| $thisurl =~ s{^\Qhttp://https://\E}{https://}; |
$thisurl =~ s{^\Qhttp://https://\E}{https://}; |
| $noclutter = 1; |
|
| } |
} |
| } |
} |
| my $ids; |
my $ids; |
| if ($noclutter) { |
if ($map =~ m{^uploaded/.+\.page$}) { |
| $ids=$bighash{'ids_'.$thisurl}; |
$ids=$bighash{'ids_'.&clutter_with_no_wrapper($thisurl)}; |
| } else { |
} else { |
| $ids=$bighash{'ids_'.&clutter($thisurl)}; |
$ids=$bighash{'ids_'.&clutter($thisurl)}; |
| } |
} |
|
Line 11992 sub deversion {
|
Line 12526 sub deversion {
|
| # ------------------------------------------------------ Return symb list entry |
# ------------------------------------------------------ Return symb list entry |
| |
|
| sub symbread { |
sub symbread { |
| my ($thisfn,$donotrecurse,$ignorecachednull,$checkforblock,$possibles)=@_; |
my ($thisfn,$donotrecurse,$ignorecachednull,$checkforblock,$possibles, |
| |
$nocache,$noenccheck)=@_; |
| my $cache_str='request.symbread.cached.'.$thisfn; |
my $cache_str='request.symbread.cached.'.$thisfn; |
| if (defined($env{$cache_str})) { |
if (defined($env{$cache_str}) && !$nocache) { |
| if ($ignorecachednull) { |
unless (ref($possibles) eq 'HASH') { |
| return $env{$cache_str} unless ($env{$cache_str} eq ''); |
if ($ignorecachednull) { |
| } else { |
return $env{$cache_str} unless ($env{$cache_str} eq ''); |
| return $env{$cache_str}; |
} else { |
| |
return $env{$cache_str}; |
| |
} |
| } |
} |
| } |
} |
| # no filename provided? try from environment |
# no filename provided? try from environment |
| unless ($thisfn) { |
unless ($thisfn) { |
| if ($env{'request.symb'}) { |
if ($env{'request.symb'}) { |
| return $env{$cache_str}=&symbclean($env{'request.symb'}); |
if ($nocache) { |
| |
return &symbclean($env{'request.symb'}); |
| |
} else { |
| |
return $env{$cache_str}=&symbclean($env{'request.symb'}); |
| |
} |
| } |
} |
| $thisfn=$env{'request.filename'}; |
$thisfn=$env{'request.filename'}; |
| } |
} |
|
Line 12012 sub symbread {
|
Line 12553 sub symbread {
|
| # is that filename actually a symb? Verify, clean, and return |
# is that filename actually a symb? Verify, clean, and return |
| if ($thisfn=~/\_\_\_\d+\_\_\_(.*)$/) { |
if ($thisfn=~/\_\_\_\d+\_\_\_(.*)$/) { |
| if (&symbverify($thisfn,$1)) { |
if (&symbverify($thisfn,$1)) { |
| return $env{$cache_str}=&symbclean($thisfn); |
if ($nocache) { |
| |
return &symbclean($thisfn); |
| |
} else { |
| |
return $env{$cache_str}=&symbclean($thisfn); |
| |
} |
| } |
} |
| } |
} |
| $thisfn=declutter($thisfn); |
$thisfn=declutter($thisfn); |
|
Line 12027 sub symbread {
|
Line 12572 sub symbread {
|
| if ($targetfn =~ m|^adm/wrapper/(ext/.*)|) { |
if ($targetfn =~ m|^adm/wrapper/(ext/.*)|) { |
| $targetfn=$1; |
$targetfn=$1; |
| } |
} |
| if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db', |
unless ($nocache) { |
| &GDBM_READER(),0640)) { |
if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db', |
| $syval=$hash{$targetfn}; |
&GDBM_READER(),0640)) { |
| untie(%hash); |
$syval=$hash{$targetfn}; |
| |
untie(%hash); |
| |
} |
| |
if ($syval) { |
| |
my @blockers = &has_comm_blocking('bre',$syval,$thisfn,$nocache,$noenccheck); |
| |
if (@blockers) { |
| |
$syval=''; |
| |
} |
| |
} |
| } |
} |
| # ---------------------------------------------------------- There was an entry |
# ---------------------------------------------------------- There was an entry |
| if ($syval) { |
if ($syval) { |
|
Line 12063 sub symbread {
|
Line 12616 sub symbread {
|
| $syval=&encode_symb($bighash{'map_id_'.$mapid}, |
$syval=&encode_symb($bighash{'map_id_'.$mapid}, |
| $resid,$thisfn); |
$resid,$thisfn); |
| if (ref($possibles) eq 'HASH') { |
if (ref($possibles) eq 'HASH') { |
| $possibles->{$syval} = 1; |
unless ($bighash{'randomout_'.$ids} || $env{'request.role.adv'}) { |
| |
$possibles->{$syval} = 1; |
| |
} |
| } |
} |
| if ($checkforblock) { |
if ($checkforblock) { |
| my @blockers = &has_comm_blocking('bre',$syval,$bighash{'src_'.$ids}); |
unless ($bighash{'randomout_'.$ids} || $env{'request.role.adv'}) { |
| if (@blockers) { |
my @blockers = &has_comm_blocking('bre',$syval,$bighash{'src_'.$ids},'',$noenccheck); |
| $syval = ''; |
if (@blockers) { |
| return; |
$syval = ''; |
| |
untie(%bighash); |
| |
return '' if ($nocache); |
| |
return $env{$cache_str}=''; |
| |
} |
| } |
} |
| } |
} |
| } elsif ((!$donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) { |
} elsif ((!$donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) { |
|
Line 12088 sub symbread {
|
Line 12647 sub symbread {
|
| if ($bighash{'map_type_'.$mapid} ne 'page') { |
if ($bighash{'map_type_'.$mapid} ne 'page') { |
| my $poss_syval=&encode_symb($bighash{'map_id_'.$mapid}, |
my $poss_syval=&encode_symb($bighash{'map_id_'.$mapid}, |
| $resid,$thisfn); |
$resid,$thisfn); |
| if (ref($possibles) eq 'HASH') { |
next if ($bighash{'randomout_'.$id} && !$env{'request.role.adv'}); |
| $possibles->{$syval} = 1; |
next unless (($noenccheck) || ($bighash{'encrypted_'.$id} eq $env{'request.enc'})); |
| } |
|
| if ($checkforblock) { |
if ($checkforblock) { |
| my @blockers = &has_comm_blocking('bre',$poss_syval,$file); |
my @blockers = &has_comm_blocking('bre',$poss_syval,$file,'',$noenccheck); |
| unless (@blockers > 0) { |
if (@blockers > 0) { |
| |
$syval = ''; |
| |
} else { |
| $syval = $poss_syval; |
$syval = $poss_syval; |
| $realpossible++; |
$realpossible++; |
| } |
} |
|
Line 12101 sub symbread {
|
Line 12661 sub symbread {
|
| $syval = $poss_syval; |
$syval = $poss_syval; |
| $realpossible++; |
$realpossible++; |
| } |
} |
| |
if ($syval) { |
| |
if (ref($possibles) eq 'HASH') { |
| |
$possibles->{$syval} = 1; |
| |
} |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 12113 sub symbread {
|
Line 12678 sub symbread {
|
| } |
} |
| } |
} |
| if ($syval) { |
if ($syval) { |
| return $env{$cache_str}=$syval; |
if ($nocache) { |
| |
return $syval; |
| |
} else { |
| |
return $env{$cache_str}=$syval; |
| |
} |
| } |
} |
| } |
} |
| &appenv({'request.ambiguous' => $thisfn}); |
&appenv({'request.ambiguous' => $thisfn}); |
| |
return '' if ($nocache); |
| return $env{$cache_str}=''; |
return $env{$cache_str}=''; |
| } |
} |
| |
|
|
Line 12638 sub repcopy_userfile {
|
Line 13208 sub repcopy_userfile {
|
| my $request; |
my $request; |
| $uri=~s/^\///; |
$uri=~s/^\///; |
| my $homeserver = &homeserver($cnum,$cdom); |
my $homeserver = &homeserver($cnum,$cdom); |
| |
my $hostname = &hostname($homeserver); |
| my $protocol = $protocol{$homeserver}; |
my $protocol = $protocol{$homeserver}; |
| $protocol = 'http' if ($protocol ne 'https'); |
$protocol = 'http' if ($protocol ne 'https'); |
| $request=new HTTP::Request('GET',$protocol.'://'.&hostname($homeserver).'/raw/'.$uri); |
$request=new HTTP::Request('GET',$protocol.'://'.$hostname.'/raw/'.$uri); |
| my $response=$ua->request($request,$transferfile); |
my $response=$ua->request($request,$transferfile); |
| # did it work? |
# did it work? |
| if ($response->is_error()) { |
if ($response->is_error()) { |
|
Line 12664 sub tokenwrapper {
|
Line 13235 sub tokenwrapper {
|
| $file=~s|(\?\.*)*$||; |
$file=~s|(\?\.*)*$||; |
| &appenv({"userfile.$udom/$uname/$file" => $env{'request.course.id'}}); |
&appenv({"userfile.$udom/$uname/$file" => $env{'request.course.id'}}); |
| my $homeserver = &homeserver($uname,$udom); |
my $homeserver = &homeserver($uname,$udom); |
| |
my $hostname = &hostname($homeserver); |
| my $protocol = $protocol{$homeserver}; |
my $protocol = $protocol{$homeserver}; |
| $protocol = 'http' if ($protocol ne 'https'); |
$protocol = 'http' if ($protocol ne 'https'); |
| return $protocol.'://'.&hostname($homeserver).'/'.$uri. |
return $protocol.'://'.$hostname.'/'.$uri. |
| (($uri=~/\?/)?'&':'?').'token='.$token. |
(($uri=~/\?/)?'&':'?').'token='.$token. |
| '&tokenissued='.$perlvar{'lonHostID'}; |
'&tokenissued='.$perlvar{'lonHostID'}; |
| } else { |
} else { |
|
Line 12682 sub getuploaded {
|
Line 13254 sub getuploaded {
|
| my ($reqtype,$uri,$cdom,$cnum,$info,$rtncode) = @_; |
my ($reqtype,$uri,$cdom,$cnum,$info,$rtncode) = @_; |
| $uri=~s/^\///; |
$uri=~s/^\///; |
| my $homeserver = &homeserver($cnum,$cdom); |
my $homeserver = &homeserver($cnum,$cdom); |
| |
my $hostname = &hostname($homeserver); |
| my $protocol = $protocol{$homeserver}; |
my $protocol = $protocol{$homeserver}; |
| $protocol = 'http' if ($protocol ne 'https'); |
$protocol = 'http' if ($protocol ne 'https'); |
| $uri = $protocol.'://'.&hostname($homeserver).'/raw/'.$uri; |
$uri = $protocol.'://'.$hostname.'/raw/'.$uri; |
| my $ua=new LWP::UserAgent; |
my $ua=new LWP::UserAgent; |
| my $request=new HTTP::Request($reqtype,$uri); |
my $request=new HTTP::Request($reqtype,$uri); |
| my $response=$ua->request($request); |
my $response=$ua->request($request); |
|
Line 12859 sub shared_institution {
|
Line 13432 sub shared_institution {
|
| return $same_intdom; |
return $same_intdom; |
| } |
} |
| |
|
| |
sub uses_sts { |
| |
my ($ignore_cache) = @_; |
| |
my $lonhost = $perlvar{'lonHostID'}; |
| |
my $hostname = &hostname($lonhost); |
| |
my $sts_on; |
| |
if ($protocol{$lonhost} eq 'https') { |
| |
my $cachetime = 12*3600; |
| |
if (!$ignore_cache) { |
| |
($sts_on,my $cached)=&is_cached_new('stspolicy',$lonhost); |
| |
if (defined($cached)) { |
| |
return $sts_on; |
| |
} |
| |
} |
| |
my $ua=new LWP::UserAgent; |
| |
my $url = $protocol{$lonhost}.'://'.$hostname.'/index.html'; |
| |
my $request=new HTTP::Request('HEAD',$url); |
| |
my $response=$ua->request($request); |
| |
if ($response->is_success) { |
| |
my $has_sts = $response->header('Strict-Transport-Security'); |
| |
if ($has_sts eq '') { |
| |
$sts_on = 0; |
| |
} else { |
| |
if ($has_sts =~ /\Qmax-age=\E(\d+)/) { |
| |
my $maxage = $1; |
| |
if ($maxage) { |
| |
$sts_on = 1; |
| |
} else { |
| |
$sts_on = 0; |
| |
} |
| |
} else { |
| |
$sts_on = 0; |
| |
} |
| |
} |
| |
return &do_cache_new('stspolicy',$lonhost,$sts_on,$cachetime); |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| # ------------------------------------------------------------- Declutters URLs |
# ------------------------------------------------------------- Declutters URLs |
| |
|
| sub declutter { |
sub declutter { |
|
Line 12909 sub clutter {
|
Line 13521 sub clutter {
|
| # &logthis("Got a blank emb style"); |
# &logthis("Got a blank emb style"); |
| } |
} |
| } |
} |
| |
} elsif ($thisfn =~ m{^/adm/$match_domain/$match_courseid/\d+/ext\.tool$}) { |
| |
$thisfn='/adm/wrapper'.$thisfn; |
| } |
} |
| return $thisfn; |
return $thisfn; |
| } |
} |
|
Line 13631 BEGIN {
|
Line 14245 BEGIN {
|
| $deftex = LONCAPA::texengine(); |
$deftex = LONCAPA::texengine(); |
| } |
} |
| |
|
| |
# ------------- set default minimum length for passwords for internal auth users |
| |
{ |
| |
$passwdmin = LONCAPA::passwd_min(); |
| |
} |
| |
|
| $memcache=new Cache::Memcached({'servers' => ['127.0.0.1:11211'], |
$memcache=new Cache::Memcached({'servers' => ['127.0.0.1:11211'], |
| 'compress_threshold'=> 20_000, |
'compress_threshold'=> 20_000, |
| }); |
}); |
|
Line 14278 Returns:
|
Line 14897 Returns:
|
| |
|
| =back |
=back |
| |
|
| |
=head2 Bubblesheet Configuration |
| |
|
| |
=over 4 |
| |
|
| |
=item * |
| |
|
| |
get_scantron_config($which) |
| |
|
| |
$which - the name of the configuration to parse from the file. |
| |
|
| |
Parses and returns the bubblesheet configuration line selected as a |
| |
hash of configuration file fields. |
| |
|
| |
|
| |
Returns: |
| |
If the named configuration is not in the file, an empty |
| |
hash is returned. |
| |
|
| |
a hash with the fields |
| |
name - internal name for the this configuration setup |
| |
description - text to display to operator that describes this config |
| |
CODElocation - if 0 or the string 'none' |
| |
- no CODE exists for this config |
| |
if -1 || the string 'letter' |
| |
- a CODE exists for this config and is |
| |
a string of letters |
| |
Unsupported value (but planned for future support) |
| |
if a positive integer |
| |
- The CODE exists as the first n items from |
| |
the question section of the form |
| |
if the string 'number' |
| |
- The CODE exists for this config and is |
| |
a string of numbers |
| |
CODEstart - (only matter if a CODE exists) column in the line where |
| |
the CODE starts |
| |
CODElength - length of the CODE |
| |
IDstart - column where the student/employee ID starts |
| |
IDlength - length of the student/employee ID info |
| |
Qstart - column where the information from the bubbled |
| |
'questions' start |
| |
Qlength - number of columns comprising a single bubble line from |
| |
the sheet. (usually either 1 or 10) |
| |
Qon - either a single character representing the character used |
| |
to signal a bubble was chosen in the positional setup, or |
| |
the string 'letter' if the letter of the chosen bubble is |
| |
in the final, or 'number' if a number representing the |
| |
chosen bubble is in the file (1->A 0->J) |
| |
Qoff - the character used to represent that a bubble was |
| |
left blank |
| |
PaperID - if the scanning process generates a unique number for each |
| |
sheet scanned the column that this ID number starts in |
| |
PaperIDlength - number of columns that comprise the unique ID number |
| |
for the sheet of paper |
| |
FirstName - column that the first name starts in |
| |
FirstNameLength - number of columns that the first name spans |
| |
LastName - column that the last name starts in |
| |
LastNameLength - number of columns that the last name spans |
| |
BubblesPerRow - number of bubbles available in each row used to |
| |
bubble an answer. (If not specified, 10 assumed). |
| |
|
| |
|
| |
=item * |
| |
|
| |
get_scantronformat_file($cdom) |
| |
|
| |
$cdom - the course's domain (optional); if not supplied, uses |
| |
domain for current $env{'request.course.id'}. |
| |
|
| |
Returns an array containing lines from the scantron format file for |
| |
the domain of the course. |
| |
|
| |
If a url for a custom.tab file is listed in domain's configuration.db, |
| |
lines are from this file. |
| |
|
| |
Otherwise, if a default.tab has been published in RES space by the |
| |
domainconfig user, lines are from this file. |
| |
|
| |
Otherwise, fall back to getting lines from the legacy file on the |
| |
local server: /home/httpd/lonTabs/default_scantronformat.tab |
| |
|
| |
=back |
| |
|
| =head2 Resource Subroutines |
=head2 Resource Subroutines |
| |
|
| =over 4 |
=over 4 |
|
Line 14969 userspace, probably shouldn't be called
|
Line 15670 userspace, probably shouldn't be called
|
| formname: same as for userfileupload() |
formname: same as for userfileupload() |
| fname: filename (including subdirectories) for the file |
fname: filename (including subdirectories) for the file |
| parser: if 'parse', will parse (html) file to extract references to objects, links etc. |
parser: if 'parse', will parse (html) file to extract references to objects, links etc. |
| |
if hashref, and context is scantron, will convert csv format to standard format |
| allfiles: reference to hash used to store objects found by parser |
allfiles: reference to hash used to store objects found by parser |
| codebase: reference to hash used for codebases of java objects found by parser |
codebase: reference to hash used for codebases of java objects found by parser |
| thumbwidth: width (pixels) of thumbnail to be created for uploaded image |
thumbwidth: width (pixels) of thumbnail to be created for uploaded image |
![[BACK]](/icons/back.gif){kind=icon}
Return to lonnet.pm CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [LON-CAPA] / loncom / lonnet / perl