|
version 1.1172.2.81, 2016/09/18 14:37:57
|
version 1.1172.2.129, 2020/10/15 19:20:25
|
|
Line 74 use strict;
|
Line 74 use strict;
|
| use LWP::UserAgent(); |
use LWP::UserAgent(); |
| use HTTP::Date; |
use HTTP::Date; |
| use Image::Magick; |
use Image::Magick; |
| |
use CGI::Cookie; |
| |
|
| use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir |
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 98 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 142 our @EXPORT = qw(%env);
|
Line 144 our @EXPORT = qw(%env);
|
| sub logtouch { |
sub logtouch { |
| my $execdir=$perlvar{'lonDaemons'}; |
my $execdir=$perlvar{'lonDaemons'}; |
| unless (-e "$execdir/logs/lonnet.log") { |
unless (-e "$execdir/logs/lonnet.log") { |
| open(my $fh,">>$execdir/logs/lonnet.log"); |
open(my $fh,">>","$execdir/logs/lonnet.log"); |
| close $fh; |
close $fh; |
| } |
} |
| my ($wwwuid,$wwwgid)=(getpwnam('www'))[2,3]; |
my ($wwwuid,$wwwgid)=(getpwnam('www'))[2,3]; |
|
Line 154 sub logthis {
|
Line 156 sub logthis {
|
| my $execdir=$perlvar{'lonDaemons'}; |
my $execdir=$perlvar{'lonDaemons'}; |
| my $now=time; |
my $now=time; |
| my $local=localtime($now); |
my $local=localtime($now); |
| if (open(my $fh,">>$execdir/logs/lonnet.log")) { |
if (open(my $fh,">>","$execdir/logs/lonnet.log")) { |
| my $logstring = $local. " ($$): ".$message."\n"; # Keep any \'s in string. |
my $logstring = $local. " ($$): ".$message."\n"; # Keep any \'s in string. |
| print $fh $logstring; |
print $fh $logstring; |
| close($fh); |
close($fh); |
|
Line 167 sub logperm {
|
Line 169 sub logperm {
|
| my $execdir=$perlvar{'lonDaemons'}; |
my $execdir=$perlvar{'lonDaemons'}; |
| my $now=time; |
my $now=time; |
| my $local=localtime($now); |
my $local=localtime($now); |
| if (open(my $fh,">>$execdir/logs/lonnet.perm.log")) { |
if (open(my $fh,">>","$execdir/logs/lonnet.perm.log")) { |
| print $fh "$now:$message:$local\n"; |
print $fh "$now:$message:$local\n"; |
| close($fh); |
close($fh); |
| } |
} |
|
Line 261 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 407 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 436 sub reconlonc {
|
Line 457 sub reconlonc {
|
| |
|
| &logthis("Trying to reconnect lonc"); |
&logthis("Trying to reconnect lonc"); |
| my $loncfile="$perlvar{'lonDaemons'}/logs/lonc.pid"; |
my $loncfile="$perlvar{'lonDaemons'}/logs/lonc.pid"; |
| if (open(my $fh,"<$loncfile")) { |
if (open(my $fh,"<",$loncfile)) { |
| my $loncpid=<$fh>; |
my $loncpid=<$fh>; |
| chomp($loncpid); |
chomp($loncpid); |
| if (kill 0 => $loncpid) { |
if (kill 0 => $loncpid) { |
|
Line 476 sub critical {
|
Line 497 sub critical {
|
| $dumpcount++; |
$dumpcount++; |
| { |
{ |
| my $dfh; |
my $dfh; |
| if (open($dfh,">$dfilename")) { |
if (open($dfh,">",$dfilename)) { |
| print $dfh "$cmd\n"; |
print $dfh "$cmd\n"; |
| close($dfh); |
close($dfh); |
| } |
} |
|
Line 485 sub critical {
|
Line 506 sub critical {
|
| my $wcmd=''; |
my $wcmd=''; |
| { |
{ |
| my $dfh; |
my $dfh; |
| if (open($dfh,"<$dfilename")) { |
if (open($dfh,"<",$dfilename)) { |
| $wcmd=<$dfh>; |
$wcmd=<$dfh>; |
| close($dfh); |
close($dfh); |
| } |
} |
|
Line 601 sub transfer_profile_to_env {
|
Line 622 sub transfer_profile_to_env {
|
| |
|
| # ---------------------------------------------------- Check for valid session |
# ---------------------------------------------------- Check for valid session |
| sub check_for_valid_session { |
sub check_for_valid_session { |
| my ($r,$name,$userhashref) = @_; |
my ($r,$name,$userhashref,$domref) = @_; |
| my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); |
my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); |
| if ($name eq '') { |
my ($lonidsdir,$linkname,$pubname,$secure,$lonid); |
| $name = 'lonID'; |
|
| } |
|
| my $lonid=$cookies{$name}; |
|
| return undef if (!$lonid); |
|
| |
|
| my $handle=&LONCAPA::clean_handle($lonid->value); |
|
| my $lonidsdir; |
|
| if ($name eq 'lonDAV') { |
if ($name eq 'lonDAV') { |
| $lonidsdir=$r->dir_config('lonDAVsessDir'); |
$lonidsdir=$r->dir_config('lonDAVsessDir'); |
| } else { |
} else { |
| $lonidsdir=$r->dir_config('lonIDsDir'); |
$lonidsdir=$r->dir_config('lonIDsDir'); |
| |
if ($name eq '') { |
| |
$name = 'lonID'; |
| |
} |
| |
} |
| |
if ($name eq 'lonID') { |
| |
$secure = 'lonSID'; |
| |
$linkname = 'lonLinkID'; |
| |
$pubname = 'lonPubID'; |
| |
if (exists($cookies{$secure})) { |
| |
$lonid=$cookies{$secure}; |
| |
} elsif (exists($cookies{$name})) { |
| |
$lonid=$cookies{$name}; |
| |
} elsif ((exists($cookies{$linkname})) && ($ENV{'SERVER_PORT'} != 443)) { |
| |
$lonid=$cookies{$linkname}; |
| |
} elsif (exists($cookies{$pubname})) { |
| |
$lonid=$cookies{$pubname}; |
| |
} |
| |
} else { |
| |
$lonid=$cookies{$name}; |
| |
} |
| |
return undef if (!$lonid); |
| |
|
| |
my $handle=&LONCAPA::clean_handle($lonid->value); |
| |
if (-l "$lonidsdir/$handle.id") { |
| |
my $link = readlink("$lonidsdir/$handle.id"); |
| |
if ((-e $link) && ($link =~ m{^\Q$lonidsdir\E/(.+)\.id$})) { |
| |
$handle = $1; |
| |
} |
| |
} |
| |
if (!-e "$lonidsdir/$handle.id") { |
| |
if ((ref($domref)) && ($name eq 'lonID') && |
| |
($handle =~ /^($match_username)\_\d+\_($match_domain)\_(.+)$/)) { |
| |
my ($possuname,$possudom,$possuhome) = ($1,$2,$3); |
| |
if ((&domain($possudom) ne '') && (&homeserver($possuname,$possudom) eq $possuhome)) { |
| |
$$domref = $possudom; |
| |
} |
| |
} |
| |
return undef; |
| } |
} |
| return undef if (!-e "$lonidsdir/$handle.id"); |
|
| |
|
| my $opened = open(my $idf,'+<',"$lonidsdir/$handle.id"); |
my $opened = open(my $idf,'+<',"$lonidsdir/$handle.id"); |
| return undef if (!$opened); |
return undef if (!$opened); |
|
Line 630 sub check_for_valid_session {
|
Line 681 sub check_for_valid_session {
|
| |
|
| if (!defined($disk_env{'user.name'}) |
if (!defined($disk_env{'user.name'}) |
| || !defined($disk_env{'user.domain'})) { |
|| !defined($disk_env{'user.domain'})) { |
| |
untie(%disk_env); |
| return undef; |
return undef; |
| } |
} |
| |
|
|
Line 637 sub check_for_valid_session {
|
Line 689 sub check_for_valid_session {
|
| $userhashref->{'name'} = $disk_env{'user.name'}; |
$userhashref->{'name'} = $disk_env{'user.name'}; |
| $userhashref->{'domain'} = $disk_env{'user.domain'}; |
$userhashref->{'domain'} = $disk_env{'user.domain'}; |
| } |
} |
| |
untie(%disk_env); |
| |
|
| return $handle; |
return $handle; |
| } |
} |
|
Line 661 sub timed_flock {
|
Line 714 sub timed_flock {
|
| } |
} |
| } |
} |
| |
|
| |
sub get_sessionfile_vars { |
| |
my ($handle,$lonidsdir,$storearr) = @_; |
| |
my %returnhash; |
| |
unless (ref($storearr) eq 'ARRAY') { |
| |
return %returnhash; |
| |
} |
| |
if (-l "$lonidsdir/$handle.id") { |
| |
my $link = readlink("$lonidsdir/$handle.id"); |
| |
if ((-e $link) && ($link =~ m{^\Q$lonidsdir\E/(.+)\.id$})) { |
| |
$handle = $1; |
| |
} |
| |
} |
| |
if ((-e "$lonidsdir/$handle.id") && |
| |
($handle =~ /^($match_username)\_\d+\_($match_domain)\_(.+)$/)) { |
| |
my ($possuname,$possudom,$possuhome) = ($1,$2,$3); |
| |
if ((&domain($possudom) ne '') && (&homeserver($possuname,$possudom) eq $possuhome)) { |
| |
if (open(my $idf,'+<',"$lonidsdir/$handle.id")) { |
| |
flock($idf,LOCK_SH); |
| |
if (tie(my %disk_env,'GDBM_File',"$lonidsdir/$handle.id", |
| |
&GDBM_READER(),0640)) { |
| |
foreach my $item (@{$storearr}) { |
| |
$returnhash{$item} = $disk_env{$item}; |
| |
} |
| |
untie(%disk_env); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return %returnhash; |
| |
} |
| |
|
| # ---------------------------------------------------------- Append Environment |
# ---------------------------------------------------------- Append Environment |
| |
|
| sub appenv { |
sub appenv { |
|
Line 686 sub appenv {
|
Line 770 sub appenv {
|
| $env{$key}=$newenv->{$key}; |
$env{$key}=$newenv->{$key}; |
| } |
} |
| } |
} |
| my $opened = open(my $env_file,'+<',$env{'user.environment'}); |
my $lonids = $perlvar{'lonIDsDir'}; |
| if ($opened |
if ($env{'user.environment'} =~ m{^\Q$lonids/\E$match_username\_\d+\_$match_domain\_[\w\-.]+\.id$}) { |
| && &timed_flock($env_file,LOCK_EX) |
my $opened = open(my $env_file,'+<',$env{'user.environment'}); |
| && |
if ($opened |
| tie(my %disk_env,'GDBM_File',$env{'user.environment'}, |
&& &timed_flock($env_file,LOCK_EX) |
| (&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) { |
&& |
| while (my ($key,$value) = each(%{$newenv})) { |
tie(my %disk_env,'GDBM_File',$env{'user.environment'}, |
| $disk_env{$key} = $value; |
(&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) { |
| } |
while (my ($key,$value) = each(%{$newenv})) { |
| untie(%disk_env); |
$disk_env{$key} = $value; |
| |
} |
| |
untie(%disk_env); |
| |
} |
| } |
} |
| } |
} |
| return 'ok'; |
return 'ok'; |
|
Line 811 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 866 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 939 sub find_existing_session {
|
Line 1027 sub find_existing_session {
|
| return; |
return; |
| } |
} |
| |
|
| |
# check if user's browser sent load balancer cookie and server still has session |
| |
# and is not overloaded. |
| |
sub check_for_balancer_cookie { |
| |
my ($r,$update_mtime) = @_; |
| |
my ($otherserver,$cookie); |
| |
my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); |
| |
if (exists($cookies{'balanceID'})) { |
| |
my $balid = $cookies{'balanceID'}; |
| |
$cookie=&LONCAPA::clean_handle($balid->value); |
| |
my $balancedir=$r->dir_config('lonBalanceDir'); |
| |
if ((-d $balancedir) && (-e "$balancedir/$cookie.id")) { |
| |
if ($cookie =~ /^($match_domain)_($match_username)_[a-f0-9]+$/) { |
| |
my ($possudom,$possuname) = ($1,$2); |
| |
my $has_session = 0; |
| |
if ((&domain($possudom) ne '') && |
| |
(&homeserver($possuname,$possudom) ne 'no_host')) { |
| |
my $try_server; |
| |
my $opened = open(my $idf,'+<',"$balancedir/$cookie.id"); |
| |
if ($opened) { |
| |
flock($idf,LOCK_SH); |
| |
while (my $line = <$idf>) { |
| |
chomp($line); |
| |
if (&hostname($line) ne '') { |
| |
$try_server = $line; |
| |
last; |
| |
} |
| |
} |
| |
close($idf); |
| |
if (($try_server) && |
| |
(&has_user_session($try_server,$possudom,$possuname))) { |
| |
my $lowest_load = 30000; |
| |
($otherserver,$lowest_load) = |
| |
&compare_server_load($try_server,undef,$lowest_load); |
| |
if ($otherserver ne '' && $lowest_load < 100) { |
| |
$has_session = 1; |
| |
} else { |
| |
undef($otherserver); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($has_session) { |
| |
if ($update_mtime) { |
| |
my $atime = my $mtime = time; |
| |
utime($atime,$mtime,"$balancedir/$cookie.id"); |
| |
} |
| |
} else { |
| |
unlink("$balancedir/$cookie.id"); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return ($otherserver,$cookie); |
| |
} |
| |
|
| |
sub delbalcookie { |
| |
my ($cookie,$balancer) =@_; |
| |
if ($cookie =~ /^($match_domain)\_($match_username)\_[a-f0-9]{32}$/) { |
| |
my ($udom,$uname) = ($1,$2); |
| |
my $uprimary_id = &domain($udom,'primary'); |
| |
my $uintdom = &internet_dom($uprimary_id); |
| |
my $intdom = &internet_dom($balancer); |
| |
my $serverhomedom = &host_domain($balancer); |
| |
if (($uintdom ne '') && ($uintdom eq $intdom)) { |
| |
return &reply("delbalcookie:$cookie",$balancer); |
| |
} |
| |
} |
| |
} |
| |
|
| # -------------------------------- ask if server already has a session for user |
# -------------------------------- ask if server already has a session for user |
| sub has_user_session { |
sub has_user_session { |
| my ($lonid,$udom,$uname) = @_; |
my ($lonid,$udom,$uname) = @_; |
|
Line 1002 sub choose_server {
|
Line 1159 sub choose_server {
|
| if ($login_host ne '') { |
if ($login_host ne '') { |
| $hostname = &hostname($login_host); |
$hostname = &hostname($login_host); |
| } |
} |
| return ($login_host,$hostname,$portal_path,$isredirect); |
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 |
|
Line 1040 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 1274 sub get_lonbalancer_config {
|
Line 1456 sub get_lonbalancer_config {
|
| } |
} |
| |
|
| sub check_loadbalancing { |
sub check_loadbalancing { |
| my ($uname,$udom) = @_; |
my ($uname,$udom,$caller) = @_; |
| my ($is_balancer,$currtargets,$currrules,$dom_in_use,$homeintdom, |
my ($is_balancer,$currtargets,$currrules,$dom_in_use,$homeintdom, |
| $rule_in_effect,$offloadto,$otherserver); |
$rule_in_effect,$offloadto,$otherserver,$setcookie); |
| my $lonhost = $perlvar{'lonHostID'}; |
my $lonhost = $perlvar{'lonHostID'}; |
| my @hosts = ¤t_machine_ids(); |
my @hosts = ¤t_machine_ids(); |
| my $uprimary_id = &Apache::lonnet::domain($udom,'primary'); |
my $uprimary_id = &Apache::lonnet::domain($udom,'primary'); |
|
Line 1303 sub check_loadbalancing {
|
Line 1485 sub check_loadbalancing {
|
| } |
} |
| } |
} |
| if (ref($result) eq 'HASH') { |
if (ref($result) eq 'HASH') { |
| ($is_balancer,$currtargets,$currrules) = |
($is_balancer,$currtargets,$currrules,$setcookie) = |
| &check_balancer_result($result,@hosts); |
&check_balancer_result($result,@hosts); |
| if ($is_balancer) { |
if ($is_balancer) { |
| if (ref($currrules) eq 'HASH') { |
if (ref($currrules) eq 'HASH') { |
|
Line 1364 sub check_loadbalancing {
|
Line 1546 sub check_loadbalancing {
|
| } |
} |
| } |
} |
| if (ref($result) eq 'HASH') { |
if (ref($result) eq 'HASH') { |
| ($is_balancer,$currtargets,$currrules) = |
($is_balancer,$currtargets,$currrules,$setcookie) = |
| &check_balancer_result($result,@hosts); |
&check_balancer_result($result,@hosts); |
| if ($is_balancer) { |
if ($is_balancer) { |
| if (ref($currrules) eq 'HASH') { |
if (ref($currrules) eq 'HASH') { |
|
Line 1425 sub check_loadbalancing {
|
Line 1607 sub check_loadbalancing {
|
| } |
} |
| } |
} |
| } |
} |
| if (($otherserver ne '') && (grep(/^\Q$otherserver\E$/,@hosts))) { |
unless ($caller eq 'login') { |
| $is_balancer = 0; |
if (($otherserver ne '') && (grep(/^\Q$otherserver\E$/,@hosts))) { |
| if ($uname ne '' && $udom ne '') { |
$is_balancer = 0; |
| if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) { |
if ($uname ne '' && $udom ne '') { |
| |
if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) { |
| &appenv({'user.loadbalexempt' => $lonhost, |
&appenv({'user.loadbalexempt' => $lonhost, |
| 'user.loadbalcheck.time' => time}); |
'user.loadbalcheck.time' => time}); |
| |
} |
| } |
} |
| } |
} |
| } |
} |
| |
unless ($homeintdom) { |
| |
undef($setcookie); |
| |
} |
| } |
} |
| return ($is_balancer,$otherserver); |
return ($is_balancer,$otherserver,$setcookie); |
| } |
} |
| |
|
| sub check_balancer_result { |
sub check_balancer_result { |
| my ($result,@hosts) = @_; |
my ($result,@hosts) = @_; |
| my ($is_balancer,$currtargets,$currrules); |
my ($is_balancer,$currtargets,$currrules,$setcookie); |
| if (ref($result) eq 'HASH') { |
if (ref($result) eq 'HASH') { |
| if ($result->{'lonhost'} ne '') { |
if ($result->{'lonhost'} ne '') { |
| my $currbalancer = $result->{'lonhost'}; |
my $currbalancer = $result->{'lonhost'}; |
|
Line 1457 sub check_balancer_result {
|
Line 1643 sub check_balancer_result {
|
| $is_balancer = 1; |
$is_balancer = 1; |
| $currrules = $result->{$key}{'rules'}; |
$currrules = $result->{$key}{'rules'}; |
| $currtargets = $result->{$key}{'targets'}; |
$currtargets = $result->{$key}{'targets'}; |
| |
$setcookie = $result->{$key}{'cookie'}; |
| last; |
last; |
| } |
} |
| } |
} |
| } |
} |
| } |
} |
| return ($is_balancer,$currtargets,$currrules); |
return ($is_balancer,$currtargets,$currrules,$setcookie); |
| } |
} |
| |
|
| sub get_loadbalancer_targets { |
sub get_loadbalancer_targets { |
|
Line 1821 sub inst_directory_query {
|
Line 2008 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'}).':'. |
| &escape($srch->{'srchtype'}),$homeserver); |
&escape($srch->{'srchtype'}),$homeserver); |
| my $host=&hostname($homeserver); |
my $host=&hostname($homeserver); |
| if ($queryid !~/^\Q$host\E\_/) { |
if ($queryid !~/^\Q$host\E\_/) { |
| &logthis('instituional directory search invalid queryid: '.$queryid.' for host: '.$homeserver.'in domain '.$udom); |
&logthis('institutional directory search invalid queryid: '.$queryid.' for host: '.$homeserver.' in domain '.$udom); |
| return; |
return; |
| } |
} |
| my $response = &get_query_reply($queryid); |
my $response = &get_query_reply($queryid); |
|
Line 1862 sub usersearch {
|
Line 2060 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 2100 sub get_domain_defaults {
|
Line 2307 sub get_domain_defaults {
|
| 'requestcourses','inststatus', |
'requestcourses','inststatus', |
| 'coursedefaults','usersessions', |
'coursedefaults','usersessions', |
| 'requestauthor','selfenrollment', |
'requestauthor','selfenrollment', |
| 'coursecategories','autoenroll'],$domain); |
'coursecategories','autoenroll', |
| |
'helpsettings'],$domain); |
| my @coursetypes = ('official','unofficial','community','textbook'); |
my @coursetypes = ('official','unofficial','community','textbook'); |
| if (ref($domconfig{'defaults'}) eq 'HASH') { |
if (ref($domconfig{'defaults'}) eq 'HASH') { |
| $domdefaults{'lang_def'} = $domconfig{'defaults'}{'lang_def'}; |
$domdefaults{'lang_def'} = $domconfig{'defaults'}{'lang_def'}; |
|
Line 2109 sub get_domain_defaults {
|
Line 2317 sub get_domain_defaults {
|
| $domdefaults{'timezone_def'} = $domconfig{'defaults'}{'timezone_def'}; |
$domdefaults{'timezone_def'} = $domconfig{'defaults'}{'timezone_def'}; |
| $domdefaults{'datelocale_def'} = $domconfig{'defaults'}{'datelocale_def'}; |
$domdefaults{'datelocale_def'} = $domconfig{'defaults'}{'datelocale_def'}; |
| $domdefaults{'portal_def'} = $domconfig{'defaults'}{'portal_def'}; |
$domdefaults{'portal_def'} = $domconfig{'defaults'}{'portal_def'}; |
| |
$domdefaults{'intauth_cost'} = $domconfig{'defaults'}{'intauth_cost'}; |
| |
$domdefaults{'intauth_switch'} = $domconfig{'defaults'}{'intauth_switch'}; |
| |
$domdefaults{'intauth_check'} = $domconfig{'defaults'}{'intauth_check'}; |
| } else { |
} else { |
| $domdefaults{'lang_def'} = &domain($domain,'lang_def'); |
$domdefaults{'lang_def'} = &domain($domain,'lang_def'); |
| $domdefaults{'auth_def'} = &domain($domain,'auth_def'); |
$domdefaults{'auth_def'} = &domain($domain,'auth_def'); |
|
Line 2175 sub get_domain_defaults {
|
Line 2386 sub get_domain_defaults {
|
| } elsif ($domconfig{'coursedefaults'}{'canclone'}) { |
} elsif ($domconfig{'coursedefaults'}{'canclone'}) { |
| $domdefaults{'canclone'}=$domconfig{'coursedefaults'}{'canclone'}; |
$domdefaults{'canclone'}=$domconfig{'coursedefaults'}{'canclone'}; |
| } |
} |
| |
if ($domconfig{'coursedefaults'}{'texengine'}) { |
| |
$domdefaults{'texengine'} = $domconfig{'coursedefaults'}{'texengine'}; |
| |
} |
| } |
} |
| if (ref($domconfig{'usersessions'}) eq 'HASH') { |
if (ref($domconfig{'usersessions'}) eq 'HASH') { |
| if (ref($domconfig{'usersessions'}{'remote'}) eq 'HASH') { |
if (ref($domconfig{'usersessions'}{'remote'}) eq 'HASH') { |
|
Line 2228 sub get_domain_defaults {
|
Line 2442 sub get_domain_defaults {
|
| if (ref($domconfig{'autoenroll'}) eq 'HASH') { |
if (ref($domconfig{'autoenroll'}) eq 'HASH') { |
| $domdefaults{'autofailsafe'} = $domconfig{'autoenroll'}{'autofailsafe'}; |
$domdefaults{'autofailsafe'} = $domconfig{'autoenroll'}{'autofailsafe'}; |
| } |
} |
| |
if (ref($domconfig{'helpsettings'}) eq 'HASH') { |
| |
$domdefaults{'submitbugs'} = $domconfig{'helpsettings'}{'submitbugs'}; |
| |
if (ref($domconfig{'helpsettings'}{'adhoc'}) eq 'HASH') { |
| |
$domdefaults{'adhocroles'} = $domconfig{'helpsettings'}{'adhoc'}; |
| |
} |
| |
} |
| &do_cache_new('domdefaults',$domain,\%domdefaults,$cachetime); |
&do_cache_new('domdefaults',$domain,\%domdefaults,$cachetime); |
| return %domdefaults; |
return %domdefaults; |
| } |
} |
| |
|
| |
sub get_dom_cats { |
| |
my ($dom) = @_; |
| |
return unless (&domain($dom)); |
| |
my ($cats,$cached)=&is_cached_new('cats',$dom); |
| |
unless (defined($cached)) { |
| |
my %domconfig = &get_dom('configuration',['coursecategories'],$dom); |
| |
if (ref($domconfig{'coursecategories'}) eq 'HASH') { |
| |
if (ref($domconfig{'coursecategories'}{'cats'}) eq 'HASH') { |
| |
%{$cats} = %{$domconfig{'coursecategories'}{'cats'}}; |
| |
} else { |
| |
$cats = {}; |
| |
} |
| |
} else { |
| |
$cats = {}; |
| |
} |
| |
&Apache::lonnet::do_cache_new('cats',$dom,$cats,3600); |
| |
} |
| |
return $cats; |
| |
} |
| |
|
| |
sub get_dom_instcats { |
| |
my ($dom) = @_; |
| |
return unless (&domain($dom)); |
| |
my ($instcats,$cached)=&is_cached_new('instcats',$dom); |
| |
unless (defined($cached)) { |
| |
my (%coursecodes,%codes,@codetitles,%cat_titles,%cat_order); |
| |
my $totcodes = &retrieve_instcodes(\%coursecodes,$dom); |
| |
if ($totcodes > 0) { |
| |
my $caller = 'global'; |
| |
if (&auto_instcode_format($caller,$dom,\%coursecodes,\%codes, |
| |
\@codetitles,\%cat_titles,\%cat_order) eq 'ok') { |
| |
$instcats = { |
| |
codes => \%codes, |
| |
codetitles => \@codetitles, |
| |
cat_titles => \%cat_titles, |
| |
cat_order => \%cat_order, |
| |
}; |
| |
&do_cache_new('instcats',$dom,$instcats,3600); |
| |
} |
| |
} |
| |
} |
| |
return $instcats; |
| |
} |
| |
|
| |
sub retrieve_instcodes { |
| |
my ($coursecodes,$dom) = @_; |
| |
my $totcodes; |
| |
my %courses = &courseiddump($dom,'.',1,'.','.','.',undef,undef,'Course'); |
| |
foreach my $course (keys(%courses)) { |
| |
if (ref($courses{$course}) eq 'HASH') { |
| |
if ($courses{$course}{'inst_code'} ne '') { |
| |
$$coursecodes{$course} = $courses{$course}{'inst_code'}; |
| |
$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; |
| |
} |
| |
|
| # --------------------------------------------------- Assign a key to a student |
# --------------------------------------------------- Assign a key to a student |
| |
|
| sub assign_access_key { |
sub assign_access_key { |
|
Line 2767 sub repcopy {
|
Line 3069 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 2816 sub absolute_url {
|
Line 3139 sub absolute_url {
|
| sub ssi { |
sub ssi { |
| |
|
| my ($fn,%form)=@_; |
my ($fn,%form)=@_; |
| my $ua=new LWP::UserAgent; |
my ($request,$response); |
| my $request; |
|
| |
|
| $form{'no_update_last_known'}=1; |
$form{'no_update_last_known'}=1; |
| &Apache::lonenc::check_encrypt(\$fn); |
&Apache::lonenc::check_encrypt(\$fn); |
|
Line 2834 sub ssi {
|
Line 3156 sub ssi {
|
| } |
} |
| |
|
| $request->header(Cookie => $ENV{'HTTP_COOKIE'}); |
$request->header(Cookie => $ENV{'HTTP_COOKIE'}); |
| my $response= $ua->request($request); |
|
| |
if (($env{'request.course.id'}) && |
| |
($form{'grade_courseid'} eq $env{'request.course.id'}) && |
| |
($form{'grade_username'} ne '') && ($form{'grade_domain'} ne '') && |
| |
($form{'grade_symb'} ne '') && |
| |
(&Apache::lonnet::allowed('mgr',$env{'request.course.id'}. |
| |
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')))) { |
| |
if (LWP::UserAgent->VERSION >= 5.834) { |
| |
my $ua=new LWP::UserAgent; |
| |
$ua->local_address('127.0.0.1'); |
| |
$response = $ua->request($request); |
| |
} else { |
| |
{ |
| |
require LWP::Protocol::http; |
| |
local @LWP::Protocol::http::EXTRA_SOCK_OPTS = (LocalAddr => '127.0.0.1'); |
| |
my $ua=new LWP::UserAgent; |
| |
$response = $ua->request($request); |
| |
@LWP::Protocol::http::EXTRA_SOCK_OPTS = (); |
| |
} |
| |
} |
| |
} else { |
| |
my $ua=new LWP::UserAgent; |
| |
$response = $ua->request($request); |
| |
} |
| if (wantarray) { |
if (wantarray) { |
| return ($response->content, $response); |
return ($response->content, $response); |
| } else { |
} else { |
|
Line 2854 sub externalssi {
|
Line 3199 sub externalssi {
|
| } |
} |
| } |
} |
| |
|
| |
# If the local copy of a replicated resource is outdated, trigger a |
| |
# connection from the homeserver to flush the delayed queue. If no update |
| |
# happens, remove local copies of outdated resource (and corresponding |
| |
# metadata file). |
| |
|
| |
sub remove_stale_resfile { |
| |
my ($url) = @_; |
| |
my $removed; |
| |
if ($url=~m{^/res/($match_domain)/($match_username)/}) { |
| |
my $audom = $1; |
| |
my $auname = $2; |
| |
unless (($url =~ /\.\d+\.\w+$/) || ($url =~ m{^/res/lib/templates/})) { |
| |
my $homeserver = &homeserver($auname,$audom); |
| |
unless (($homeserver eq 'no_host') || |
| |
(grep { $_ eq $homeserver } ¤t_machine_ids())) { |
| |
my $fname = &filelocation('',$url); |
| |
if (-e $fname) { |
| |
my $hostname = &hostname($homeserver); |
| |
if ($hostname) { |
| |
my $protocol = $protocol{$homeserver}; |
| |
$protocol = 'http' if ($protocol ne 'https'); |
| |
my $uri = $protocol.'://'.$hostname.'/raw/'.&declutter($url); |
| |
my $ua=new LWP::UserAgent; |
| |
$ua->timeout(5); |
| |
my $request=new HTTP::Request('HEAD',$uri); |
| |
my $response=$ua->request($request); |
| |
if ($response->is_success()) { |
| |
my $remmodtime = &HTTP::Date::str2time( $response->header('Last-modified') ); |
| |
my $locmodtime = (stat($fname))[9]; |
| |
if ($locmodtime < $remmodtime) { |
| |
my $stale; |
| |
my $answer = &reply('pong',$homeserver); |
| |
if ($answer eq $homeserver.':'.$perlvar{'lonHostID'}) { |
| |
sleep(0.2); |
| |
$locmodtime = (stat($fname))[9]; |
| |
if ($locmodtime < $remmodtime) { |
| |
my $posstransfer = $fname.'.in.transfer'; |
| |
if ((-e $posstransfer) && ($remmodtime < (stat($posstransfer))[9])) { |
| |
$removed = 1; |
| |
} else { |
| |
$stale = 1; |
| |
} |
| |
} else { |
| |
$removed = 1; |
| |
} |
| |
} else { |
| |
$stale = 1; |
| |
} |
| |
if ($stale) { |
| |
if (unlink($fname)) { |
| |
if ($uri!~/\.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; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return $removed; |
| |
} |
| |
|
| # -------------------------------- Allow a /uploaded/ URI to be vouched for |
# -------------------------------- Allow a /uploaded/ URI to be vouched for |
| |
|
| sub allowuploaded { |
sub allowuploaded { |
|
Line 2992 sub can_edit_resource {
|
Line 3409 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/viewclasslist$}) { |
} elsif ($resurl =~ m{^/?adm/viewclasslist$}) { |
| $incourse = 1; |
$incourse = 1; |
| if ($env{'form.forceedit'}) { |
if ($env{'form.forceedit'}) { |
|
Line 3009 sub can_edit_resource {
|
Line 3438 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 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 3182 sub process_coursefile {
|
Line 3611 sub process_coursefile {
|
| $home); |
$home); |
| } |
} |
| } elsif ($action eq 'uploaddoc') { |
} elsif ($action eq 'uploaddoc') { |
| open(my $fh,'>'.$filepath.'/'.$fname); |
open(my $fh,'>',$filepath.'/'.$fname); |
| print $fh $env{'form.'.$source}; |
print $fh $env{'form.'.$source}; |
| close($fh); |
close($fh); |
| if ($parser eq 'parse') { |
if ($parser eq 'parse') { |
|
Line 3240 sub store_edited_file {
|
Line 3669 sub store_edited_file {
|
| ($fpath,$fname) = ($file =~ m|^(.*)/([^/]+)$|); |
($fpath,$fname) = ($file =~ m|^(.*)/([^/]+)$|); |
| $fpath=$docudom.'/'.$docuname.'/'.$fpath; |
$fpath=$docudom.'/'.$docuname.'/'.$fpath; |
| my $filepath = &build_filepath($fpath); |
my $filepath = &build_filepath($fpath); |
| open(my $fh,'>'.$filepath.'/'.$fname); |
open(my $fh,'>',$filepath.'/'.$fname); |
| print $fh $content; |
print $fh $content; |
| close($fh); |
close($fh); |
| my $home=&homeserver($docuname,$docudom); |
my $home=&homeserver($docuname,$docudom); |
|
Line 3265 sub clean_filename {
|
Line 3694 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 3272 sub clean_filename {
|
Line 3704 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 3314 sub resizeImage {
|
Line 3747 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 3343 sub userfileupload {
|
Line 3779 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 3356 sub userfileupload {
|
Line 3800 sub userfileupload {
|
| '_'.$env{'user.domain'}.'/pending'; |
'_'.$env{'user.domain'}.'/pending'; |
| } elsif (($context eq 'existingfile') || ($context eq 'canceloverwrite')) { |
} elsif (($context eq 'existingfile') || ($context eq 'canceloverwrite')) { |
| my ($docuname,$docudom); |
my ($docuname,$docudom); |
| if ($destudom) { |
if ($destudom =~ /^$match_domain$/) { |
| $docudom = $destudom; |
$docudom = $destudom; |
| } else { |
} else { |
| $docudom = $env{'user.domain'}; |
$docudom = $env{'user.domain'}; |
| } |
} |
| if ($destuname) { |
if ($destuname =~ /^$match_username$/) { |
| $docuname = $destuname; |
$docuname = $destuname; |
| } else { |
} else { |
| $docuname = $env{'user.name'}; |
$docuname = $env{'user.name'}; |
|
Line 3391 sub userfileupload {
|
Line 3835 sub userfileupload {
|
| mkdir($fullpath,0777); |
mkdir($fullpath,0777); |
| } |
} |
| } |
} |
| open(my $fh,'>'.$fullpath.'/'.$fname); |
open(my $fh,'>',$fullpath.'/'.$fname); |
| print $fh $env{'form.'.$formname}; |
print $fh $env{'form.'.$formname}; |
| close($fh); |
close($fh); |
| if ($context eq 'existingfile') { |
if ($context eq 'existingfile') { |
|
Line 3466 sub finishuserfileupload {
|
Line 3910 sub finishuserfileupload {
|
| |
|
| # Save the file |
# Save the file |
| { |
{ |
| if (!open(FH,'>'.$filepath.'/'.$file)) { |
if (!open(FH,'>',$filepath.'/'.$file)) { |
| &logthis('Failed to create '.$filepath.'/'.$file); |
&logthis('Failed to create '.$filepath.'/'.$file); |
| print STDERR ('Failed to create '.$filepath.'/'.$file."\n"); |
print STDERR ('Failed to create '.$filepath.'/'.$file."\n"); |
| return '/adm/notfound.html'; |
return '/adm/notfound.html'; |
|
Line 3510 sub finishuserfileupload {
|
Line 3954 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 3519 sub finishuserfileupload {
|
Line 3963 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; |
| my $output = $filepath.'/'.'tn-'.$file; |
my $output = $filepath.'/'.'tn-'.$file; |
| my $thumbsize = $thumbwidth.'x'.$thumbheight; |
my $thumbsize = $thumbwidth.'x'.$thumbheight; |
| system("convert -sample $thumbsize $input $output"); |
my @args = ('convert','-sample',$thumbsize,$input,$output); |
| |
system({$args[0]} @args); |
| if (-e $filepath.'/'.'tn-'.$file) { |
if (-e $filepath.'/'.'tn-'.$file) { |
| $fetchthumb = 1; |
$fetchthumb = 1; |
| } |
} |
|
Line 3758 sub embedded_dependency {
|
Line 4206 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 3908 sub flushcourselogs {
|
Line 4596 sub flushcourselogs {
|
| } |
} |
| } |
} |
| # |
# |
| # Reverse lookup of domain roles (dc, ad, li, sc, au) |
# Reverse lookup of domain roles (dc, ad, li, sc, dh, da, au) |
| # |
# |
| my %domrolebuffer = (); |
my %domrolebuffer = (); |
| foreach my $entry (keys(%domainrolehash)) { |
foreach my $entry (keys(%domainrolehash)) { |
|
Line 3923 sub flushcourselogs {
|
Line 4611 sub flushcourselogs {
|
| delete $domainrolehash{$entry}; |
delete $domainrolehash{$entry}; |
| } |
} |
| foreach my $dom (keys(%domrolebuffer)) { |
foreach my $dom (keys(%domrolebuffer)) { |
| my %servers = &get_servers($dom,'library'); |
my %servers; |
| |
if (defined(&domain($dom,'primary'))) { |
| |
my $primary=&domain($dom,'primary'); |
| |
my $hostname=&hostname($primary); |
| |
$servers{$primary} = $hostname; |
| |
} else { |
| |
%servers = &get_servers($dom,'library'); |
| |
} |
| foreach my $tryserver (keys(%servers)) { |
foreach my $tryserver (keys(%servers)) { |
| unless (&reply('domroleput:'.$dom.':'. |
if (&reply('domroleput:'.$dom.':'. |
| $domrolebuffer{$dom},$tryserver) eq 'ok') { |
$domrolebuffer{$dom},$tryserver) eq 'ok') { |
| |
last; |
| |
} else { |
| &logthis('Put of domain roles failed for '.$dom.' and '.$tryserver); |
&logthis('Put of domain roles failed for '.$dom.' and '.$tryserver); |
| } |
} |
| } |
} |
|
Line 4046 sub userrolelog {
|
Line 4743 sub userrolelog {
|
| {$trole.':'.$username.':'.$domain.':'.$env{'user.name'}.':'.$env{'user.domain'}.':'} |
{$trole.':'.$username.':'.$domain.':'.$env{'user.name'}.':'.$env{'user.domain'}.':'} |
| =$tend.':'.$tstart; |
=$tend.':'.$tstart; |
| } |
} |
| if ($trole =~ /^(dc|ad|li|au|dg|sc)/ ) { |
if ($trole =~ /^(dc|ad|li|au|dg|sc|dh|da)/ ) { |
| my (undef,$rudom,$runame,$rsec)=split(/\//,$area); |
my (undef,$rudom,$runame,$rsec)=split(/\//,$area); |
| $domainrolehash |
$domainrolehash |
| {$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec} |
{$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec} |
|
Line 4273 sub get_my_roles {
|
Line 4970 sub get_my_roles {
|
| return %returnhash; |
return %returnhash; |
| } |
} |
| |
|
| |
sub get_all_adhocroles { |
| |
my ($dom) = @_; |
| |
my @roles_by_num = (); |
| |
my %domdefaults = &get_domain_defaults($dom); |
| |
my (%description,%access_in_dom,%access_info); |
| |
if (ref($domdefaults{'adhocroles'}) eq 'HASH') { |
| |
my $count = 0; |
| |
my %domcurrent = %{$domdefaults{'adhocroles'}}; |
| |
my %ordered; |
| |
foreach my $role (sort(keys(%domcurrent))) { |
| |
my ($order,$desc,$access_in_dom); |
| |
if (ref($domcurrent{$role}) eq 'HASH') { |
| |
$order = $domcurrent{$role}{'order'}; |
| |
$desc = $domcurrent{$role}{'desc'}; |
| |
$access_in_dom{$role} = $domcurrent{$role}{'access'}; |
| |
$access_info{$role} = $domcurrent{$role}{$access_in_dom{$role}}; |
| |
} |
| |
if ($order eq '') { |
| |
$order = $count; |
| |
} |
| |
$ordered{$order} = $role; |
| |
if ($desc ne '') { |
| |
$description{$role} = $desc; |
| |
} else { |
| |
$description{$role}= $role; |
| |
} |
| |
$count++; |
| |
} |
| |
foreach my $item (sort {$a <=> $b } (keys(%ordered))) { |
| |
push(@roles_by_num,$ordered{$item}); |
| |
} |
| |
} |
| |
return (\@roles_by_num,\%description,\%access_in_dom,\%access_info); |
| |
} |
| |
|
| |
sub get_my_adhocroles { |
| |
my ($cid,$checkreg) = @_; |
| |
my ($cdom,$cnum,%info,@possroles,$description,$roles_by_num); |
| |
if ($env{'request.course.id'} eq $cid) { |
| |
$cdom = $env{'course.'.$cid.'.domain'}; |
| |
$cnum = $env{'course.'.$cid.'.num'}; |
| |
$info{'internal.coursecode'} = $env{'course.'.$cid.'.internal.coursecode'}; |
| |
} elsif ($cid =~ /^($match_domain)_($match_courseid)$/) { |
| |
$cdom = $1; |
| |
$cnum = $2; |
| |
%info = &Apache::lonnet::get('environment',['internal.coursecode'], |
| |
$cdom,$cnum); |
| |
} |
| |
if (($info{'internal.coursecode'} ne '') && ($checkreg)) { |
| |
my $user = $env{'user.name'}.':'.$env{'user.domain'}; |
| |
my %rosterhash = &get('classlist',[$user],$cdom,$cnum); |
| |
if ($rosterhash{$user} ne '') { |
| |
my $type = (split(/:/,$rosterhash{$user}))[5]; |
| |
return ([],{}) if ($type eq 'auto'); |
| |
} |
| |
} |
| |
if (($cdom ne '') && ($cnum ne '')) { |
| |
if (($env{"user.role.dh./$cdom/"}) || ($env{"user.role.da./$cdom/"})) { |
| |
my $then=$env{'user.login.time'}; |
| |
my $update=$env{'user.update.time'}; |
| |
if (!$update) { |
| |
$update = $then; |
| |
} |
| |
my @liveroles; |
| |
foreach my $role ('dh','da') { |
| |
if ($env{"user.role.$role./$cdom/"}) { |
| |
my ($tstart,$tend)=split(/\./,$env{"user.role.$role./$cdom/"}); |
| |
my $limit = $update; |
| |
if ($env{'request.role'} eq "$role./$cdom/") { |
| |
$limit = $then; |
| |
} |
| |
my $activerole = 1; |
| |
if ($tstart && $tstart>$limit) { $activerole = 0; } |
| |
if ($tend && $tend <$limit) { $activerole = 0; } |
| |
if ($activerole) { |
| |
push(@liveroles,$role); |
| |
} |
| |
} |
| |
} |
| |
if (@liveroles) { |
| |
if (&homeserver($cnum,$cdom) ne 'no_host') { |
| |
my ($accessref,$accessinfo,%access_in_dom); |
| |
($roles_by_num,$description,$accessref,$accessinfo) = &get_all_adhocroles($cdom); |
| |
if (ref($roles_by_num) eq 'ARRAY') { |
| |
if (@{$roles_by_num}) { |
| |
my %settings; |
| |
if ($env{'request.course.id'} eq $cid) { |
| |
foreach my $envkey (keys(%env)) { |
| |
if ($envkey =~ /^\Qcourse.$cid.\E(internal\.adhoc.+)$/) { |
| |
$settings{$1} = $env{$envkey}; |
| |
} |
| |
} |
| |
} else { |
| |
%settings = &dump('environment',$cdom,$cnum,'internal\.adhoc'); |
| |
} |
| |
my %setincrs; |
| |
if ($settings{'internal.adhocaccess'}) { |
| |
map { $setincrs{$_} = 1; } split(/,/,$settings{'internal.adhocaccess'}); |
| |
} |
| |
my @statuses; |
| |
if ($env{'environment.inststatus'}) { |
| |
@statuses = split(/,/,$env{'environment.inststatus'}); |
| |
} |
| |
my $user = $env{'user.name'}.':'.$env{'user.domain'}; |
| |
if (ref($accessref) eq 'HASH') { |
| |
%access_in_dom = %{$accessref}; |
| |
} |
| |
foreach my $role (@{$roles_by_num}) { |
| |
my ($curraccess,@okstatus,@personnel); |
| |
if ($setincrs{$role}) { |
| |
($curraccess,my $rest) = split(/=/,$settings{'internal.adhoc.'.$role}); |
| |
if ($curraccess eq 'status') { |
| |
@okstatus = split(/\&/,$rest); |
| |
} elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) { |
| |
@personnel = split(/\&/,$rest); |
| |
} |
| |
} else { |
| |
$curraccess = $access_in_dom{$role}; |
| |
if (ref($accessinfo) eq 'HASH') { |
| |
if ($curraccess eq 'status') { |
| |
if (ref($accessinfo->{$role}) eq 'ARRAY') { |
| |
@okstatus = @{$accessinfo->{$role}}; |
| |
} |
| |
} elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) { |
| |
if (ref($accessinfo->{$role}) eq 'ARRAY') { |
| |
@personnel = @{$accessinfo->{$role}}; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($curraccess eq 'none') { |
| |
next; |
| |
} elsif ($curraccess eq 'all') { |
| |
push(@possroles,$role); |
| |
} elsif ($curraccess eq 'dh') { |
| |
if (grep(/^dh$/,@liveroles)) { |
| |
push(@possroles,$role); |
| |
} else { |
| |
next; |
| |
} |
| |
} elsif ($curraccess eq 'da') { |
| |
if (grep(/^da$/,@liveroles)) { |
| |
push(@possroles,$role); |
| |
} else { |
| |
next; |
| |
} |
| |
} elsif ($curraccess eq 'status') { |
| |
if (@okstatus) { |
| |
if (!@statuses) { |
| |
if (grep(/^default$/,@okstatus)) { |
| |
push(@possroles,$role); |
| |
} |
| |
} else { |
| |
foreach my $status (@okstatus) { |
| |
if (grep(/^\Q$status\E$/,@statuses)) { |
| |
push(@possroles,$role); |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} elsif (($curraccess eq 'exc') || ($curraccess eq 'inc')) { |
| |
if (grep(/^\Q$user\E$/,@personnel)) { |
| |
if ($curraccess eq 'exc') { |
| |
push(@possroles,$role); |
| |
} |
| |
} elsif ($curraccess eq 'inc') { |
| |
push(@possroles,$role); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
unless (ref($description) eq 'HASH') { |
| |
if (ref($roles_by_num) eq 'ARRAY') { |
| |
my %desc; |
| |
map { $desc{$_} = $_; } (@{$roles_by_num}); |
| |
$description = \%desc; |
| |
} else { |
| |
$description = {}; |
| |
} |
| |
} |
| |
return (\@possroles,$description); |
| |
} |
| |
|
| # ----------------------------------------------------- Frontpage Announcements |
# ----------------------------------------------------- Frontpage Announcements |
| # |
# |
| # |
# |
|
Line 4286 sub postannounce {
|
Line 5172 sub postannounce {
|
| |
|
| sub getannounce { |
sub getannounce { |
| |
|
| if (open(my $fh,$perlvar{'lonDocRoot'}.'/announcement.txt')) { |
if (open(my $fh,"<",$perlvar{'lonDocRoot'}.'/announcement.txt')) { |
| my $announcement=''; |
my $announcement=''; |
| while (my $line = <$fh>) { $announcement .= $line; } |
while (my $line = <$fh>) { $announcement .= $line; } |
| close($fh); |
close($fh); |
|
Line 4513 sub get_domain_roles {
|
Line 5399 sub get_domain_roles {
|
| return %personnel; |
return %personnel; |
| } |
} |
| |
|
| |
sub get_active_domroles { |
| |
my ($dom,$roles) = @_; |
| |
return () unless (ref($roles) eq 'ARRAY'); |
| |
my $now = time; |
| |
my %dompersonnel = &get_domain_roles($dom,$roles,$now,$now); |
| |
my %domroles; |
| |
foreach my $server (keys(%dompersonnel)) { |
| |
foreach my $user (sort(keys(%{$dompersonnel{$server}}))) { |
| |
my ($trole,$uname,$udom,$runame,$rudom,$rsec) = split(/:/,$user); |
| |
$domroles{$uname.':'.$udom} = $dompersonnel{$server}{$user}; |
| |
} |
| |
} |
| |
return %domroles; |
| |
} |
| |
|
| # ----------------------------------------------------------- Interval timing |
# ----------------------------------------------------------- Interval timing |
| |
|
| { |
{ |
|
Line 4567 sub set_first_access {
|
Line 5468 sub set_first_access {
|
| } |
} |
| $cachedkey=''; |
$cachedkey=''; |
| my $firstaccess=&get_first_access($type,$symb,$map); |
my $firstaccess=&get_first_access($type,$symb,$map); |
| if (!$firstaccess) { |
if ($firstaccess) { |
| |
&logthis("First access time already set ($firstaccess) when attempting ". |
| |
"to set new value (type: $type, extent: $res) for $uname:$udom ". |
| |
"in $courseid"); |
| |
return 'already_set'; |
| |
} else { |
| my $start = time; |
my $start = time; |
| my $putres = &put('firstaccesstimes',{"$courseid\0$res"=>$start}, |
my $putres = &put('firstaccesstimes',{"$courseid\0$res"=>$start}, |
| $udom,$uname); |
$udom,$uname); |
|
Line 4580 sub set_first_access {
|
Line 5486 sub set_first_access {
|
| 'course.'.$courseid.'.timerinterval.'.$res => $interval, |
'course.'.$courseid.'.timerinterval.'.$res => $interval, |
| } |
} |
| ); |
); |
| |
if (($cachedtime) && (abs($start-$cachedtime) < 5)) { |
| |
$cachedtimes{"$courseid\0$res"} = $start; |
| |
} |
| |
} elsif ($putres ne 'refused') { |
| |
&logthis("Result: $putres when attempting to set first access time ". |
| |
"(type: $type, extent: $res) for $uname:$udom in $courseid"); |
| } |
} |
| return $putres; |
return $putres; |
| } |
} |
|
Line 5451 sub rolesinit {
|
Line 6363 sub rolesinit {
|
| } |
} |
| } |
} |
| |
|
| @userroles{'user.author', 'user.adv'} = &set_userprivs(\%userroles, |
@userroles{'user.author','user.adv','user.rar'} = &set_userprivs(\%userroles, |
| \%allroles, \%allgroups); |
\%allroles, \%allgroups); |
| $env{'user.adv'} = $userroles{'user.adv'}; |
$env{'user.adv'} = $userroles{'user.adv'}; |
| |
$env{'user.rar'} = $userroles{'user.rar'}; |
| |
|
| return (\%userroles,\%firstaccenv,\%timerintenv); |
return (\%userroles,\%firstaccenv,\%timerintenv); |
| } |
} |
|
Line 5489 sub custom_roleprivs {
|
Line 6402 sub custom_roleprivs {
|
| $$allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv; |
$$allroles{$spec.'./'.$tdomain.'/'}.=':'.$dompriv; |
| } |
} |
| if (($trest ne '') && (defined($coursepriv))) { |
if (($trest ne '') && (defined($coursepriv))) { |
| |
if ($trole =~ m{^cr/$tdomain/$tdomain\Q-domainconfig\E/([^/]+)$}) { |
| |
my $rolename = $1; |
| |
$coursepriv = &course_adhocrole_privs($rolename,$tdomain,$trest,$coursepriv); |
| |
} |
| $$allroles{'cm.'.$area}.=':'.$coursepriv; |
$$allroles{'cm.'.$area}.=':'.$coursepriv; |
| $$allroles{$spec.'.'.$area}.=':'.$coursepriv; |
$$allroles{$spec.'.'.$area}.=':'.$coursepriv; |
| } |
} |
|
Line 5497 sub custom_roleprivs {
|
Line 6414 sub custom_roleprivs {
|
| } |
} |
| } |
} |
| |
|
| |
sub course_adhocrole_privs { |
| |
my ($rolename,$cdom,$cnum,$coursepriv) = @_; |
| |
my %overrides = &get('environment',["internal.adhocpriv.$rolename"],$cdom,$cnum); |
| |
if ($overrides{"internal.adhocpriv.$rolename"}) { |
| |
my (%currprivs,%storeprivs); |
| |
foreach my $item (split(/:/,$coursepriv)) { |
| |
my ($priv,$restrict) = split(/\&/,$item); |
| |
$currprivs{$priv} = $restrict; |
| |
} |
| |
my (%possadd,%possremove,%full); |
| |
foreach my $item (split(/\:/,$Apache::lonnet::pr{'cr:c'})) { |
| |
my ($priv,$restrict)=split(/\&/,$item); |
| |
$full{$priv} = $restrict; |
| |
} |
| |
foreach my $item (split(/,/,$overrides{"internal.adhocpriv.$rolename"})) { |
| |
next if ($item eq ''); |
| |
my ($rule,$rest) = split(/=/,$item); |
| |
next unless (($rule eq 'off') || ($rule eq 'on')); |
| |
foreach my $priv (split(/:/,$rest)) { |
| |
if ($priv ne '') { |
| |
if ($rule eq 'off') { |
| |
$possremove{$priv} = 1; |
| |
} else { |
| |
$possadd{$priv} = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
foreach my $priv (sort(keys(%full))) { |
| |
if (exists($currprivs{$priv})) { |
| |
unless (exists($possremove{$priv})) { |
| |
$storeprivs{$priv} = $currprivs{$priv}; |
| |
} |
| |
} elsif (exists($possadd{$priv})) { |
| |
$storeprivs{$priv} = $full{$priv}; |
| |
} |
| |
} |
| |
$coursepriv = ':'.join(':',map { $_.'&'.$storeprivs{$_}; } sort(keys(%storeprivs))); |
| |
} |
| |
return $coursepriv; |
| |
} |
| |
|
| sub group_roleprivs { |
sub group_roleprivs { |
| my ($allgroups,$area,$group_privs,$tend,$tstart) = @_; |
my ($allgroups,$area,$group_privs,$tend,$tstart) = @_; |
| my $access = 1; |
my $access = 1; |
|
Line 5531 sub set_userprivs {
|
Line 6490 sub set_userprivs {
|
| my ($userroles,$allroles,$allgroups,$groups_roles) = @_; |
my ($userroles,$allroles,$allgroups,$groups_roles) = @_; |
| my $author=0; |
my $author=0; |
| my $adv=0; |
my $adv=0; |
| |
my $rar=0; |
| my %grouproles = (); |
my %grouproles = (); |
| if (keys(%{$allgroups}) > 0) { |
if (keys(%{$allgroups}) > 0) { |
| my @groupkeys; |
my @groupkeys; |
|
Line 5578 sub set_userprivs {
|
Line 6538 sub set_userprivs {
|
| $thesepriv{$privilege}.=$restrictions; |
$thesepriv{$privilege}.=$restrictions; |
| } |
} |
| if ($thesepriv{'adv'} eq 'F') { $adv=1; } |
if ($thesepriv{'adv'} eq 'F') { $adv=1; } |
| |
if ($thesepriv{'rar'} eq 'F') { $rar=1; } |
| } |
} |
| } |
} |
| my $thesestr=''; |
my $thesestr=''; |
|
Line 5586 sub set_userprivs {
|
Line 6547 sub set_userprivs {
|
| } |
} |
| $userroles->{'user.priv.'.$role} = $thesestr; |
$userroles->{'user.priv.'.$role} = $thesestr; |
| } |
} |
| return ($author,$adv); |
return ($author,$adv,$rar); |
| } |
} |
| |
|
| sub role_status { |
sub role_status { |
|
Line 5631 sub role_status {
|
Line 6592 sub role_status {
|
| push(@rolecodes,$$role); |
push(@rolecodes,$$role); |
| &standard_roleprivs(\%allroles,$$role,$tdomain,$spec,$trest,$$where); |
&standard_roleprivs(\%allroles,$$role,$tdomain,$spec,$trest,$$where); |
| } |
} |
| my ($author,$adv)= &set_userprivs(\%userroles,\%allroles,\%allgroups,\%groups_roles); |
my ($author,$adv,$rar)= &set_userprivs(\%userroles,\%allroles,\%allgroups, |
| |
\%groups_roles); |
| &appenv(\%userroles,\@rolecodes); |
&appenv(\%userroles,\@rolecodes); |
| &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$role); |
&log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$spec); |
| } |
} |
| } |
} |
| $$tstatus = 'is'; |
$$tstatus = 'is'; |
|
Line 5709 sub delete_env_groupprivs {
|
Line 6671 sub delete_env_groupprivs {
|
| } |
} |
| |
|
| sub check_adhoc_privs { |
sub check_adhoc_privs { |
| my ($cdom,$cnum,$update,$refresh,$now,$checkrole,$caller) = @_; |
my ($cdom,$cnum,$update,$refresh,$now,$checkrole,$caller,$sec) = @_; |
| my $cckey = 'user.role.'.$checkrole.'./'.$cdom.'/'.$cnum; |
my $cckey = 'user.role.'.$checkrole.'./'.$cdom.'/'.$cnum; |
| |
if ($sec) { |
| |
$cckey .= '/'.$sec; |
| |
} |
| my $setprivs; |
my $setprivs; |
| if ($env{$cckey}) { |
if ($env{$cckey}) { |
| my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend); |
my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend); |
| &role_status($cckey,$update,$refresh,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend); |
&role_status($cckey,$update,$refresh,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend); |
| unless (($tstatus eq 'is') || ($tstatus eq 'will_not')) { |
unless (($tstatus eq 'is') || ($tstatus eq 'will_not')) { |
| &set_adhoc_privileges($cdom,$cnum,$checkrole,$caller); |
&set_adhoc_privileges($cdom,$cnum,$checkrole,$caller,$sec); |
| $setprivs = 1; |
$setprivs = 1; |
| } |
} |
| } else { |
} else { |
| &set_adhoc_privileges($cdom,$cnum,$checkrole,$caller); |
&set_adhoc_privileges($cdom,$cnum,$checkrole,$caller,$sec); |
| $setprivs = 1; |
$setprivs = 1; |
| } |
} |
| return $setprivs; |
return $setprivs; |
| } |
} |
| |
|
| sub set_adhoc_privileges { |
sub set_adhoc_privileges { |
| # role can be cc or ca |
# role can be cc, ca, or cr/<dom>/<dom>-domainconfig/role |
| my ($dcdom,$pickedcourse,$role,$caller) = @_; |
my ($dcdom,$pickedcourse,$role,$caller,$sec) = @_; |
| my $area = '/'.$dcdom.'/'.$pickedcourse; |
my $area = '/'.$dcdom.'/'.$pickedcourse; |
| |
if ($sec ne '') { |
| |
$area .= '/'.$sec; |
| |
} |
| my $spec = $role.'.'.$area; |
my $spec = $role.'.'.$area; |
| my %userroles = &set_arearole($role,$area,'','',$env{'user.domain'}, |
my %userroles = &set_arearole($role,$area,'','',$env{'user.domain'}, |
| $env{'user.name'},1); |
$env{'user.name'},1); |
| my %ccrole = (); |
my %rolehash = (); |
| &standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area); |
if ($role =~ m{^\Qcr/$dcdom/$dcdom\E\-domainconfig/(\w+)$}) { |
| my ($author,$adv)= &set_userprivs(\%userroles,\%ccrole); |
my $rolename = $1; |
| |
&custom_roleprivs(\%rolehash,$role,$dcdom,$pickedcourse,$spec,$area); |
| |
my %domdef = &get_domain_defaults($dcdom); |
| |
if (ref($domdef{'adhocroles'}) eq 'HASH') { |
| |
if (ref($domdef{'adhocroles'}{$rolename}) eq 'HASH') { |
| |
&appenv({'request.role.desc' => $domdef{'adhocroles'}{$rolename}{'desc'},}); |
| |
} |
| |
} |
| |
} else { |
| |
&standard_roleprivs(\%rolehash,$role,$dcdom,$spec,$pickedcourse,$area); |
| |
} |
| |
my ($author,$adv,$rar)= &set_userprivs(\%userroles,\%rolehash); |
| &appenv(\%userroles,[$role,'cm']); |
&appenv(\%userroles,[$role,'cm']); |
| &log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$role); |
&log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$spec); |
| unless ($caller eq 'constructaccess' && $env{'request.course.id'}) { |
unless ($caller eq 'constructaccess' && $env{'request.course.id'}) { |
| &appenv( {'request.role' => $spec, |
&appenv( {'request.role' => $spec, |
| 'request.role.domain' => $dcdom, |
'request.role.domain' => $dcdom, |
| 'request.course.sec' => '' |
'request.course.sec' => $sec, |
| } |
} |
| ); |
); |
| my $tadv=0; |
my $tadv=0; |
|
Line 6123 sub tmpget {
|
Line 7102 sub tmpget {
|
| if (!defined($server)) { $server = $perlvar{'lonHostID'}; } |
if (!defined($server)) { $server = $perlvar{'lonHostID'}; } |
| my $rep=&reply("tmpget:$token",$server); |
my $rep=&reply("tmpget:$token",$server); |
| my %returnhash; |
my %returnhash; |
| |
if ($rep =~ /^(con_lost|error|no_such_host)/i) { |
| |
return %returnhash; |
| |
} |
| foreach my $item (split(/\&/,$rep)) { |
foreach my $item (split(/\&/,$rep)) { |
| my ($key,$value)=split(/=/,$item); |
my ($key,$value)=split(/=/,$item); |
| next if ($key =~ /^error: 2 /); |
|
| $returnhash{&unescape($key)}=&thaw_unescape($value); |
$returnhash{&unescape($key)}=&thaw_unescape($value); |
| } |
} |
| return %returnhash; |
return %returnhash; |
|
Line 6803 sub customaccess {
|
Line 7784 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 6985 sub allowed {
|
Line 7966 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 7002 sub allowed {
|
Line 8009 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 7022 sub allowed {
|
Line 8029 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 7069 sub allowed {
|
Line 8076 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 7085 sub allowed {
|
Line 8102 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 7098 sub allowed {
|
Line 8115 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 7127 sub allowed {
|
Line 8144 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 7213 sub allowed {
|
Line 8230 sub allowed {
|
| } |
} |
| } |
} |
| } |
} |
| |
|
| # |
# |
| # Rest of the restrictions depend on selected course |
# Rest of the restrictions depend on selected course |
| # |
# |
|
Line 7308 sub constructaccess {
|
Line 8325 sub constructaccess {
|
| my ($ownername,$ownerdomain,$ownerhome); |
my ($ownername,$ownerdomain,$ownerhome); |
| |
|
| ($ownerdomain,$ownername) = |
($ownerdomain,$ownername) = |
| ($url=~ m{^(?:\Q$perlvar{'lonDocRoot'}\E|)/priv/($match_domain)/($match_username)/}); |
($url=~ m{^(?:\Q$perlvar{'lonDocRoot'}\E|)/priv/($match_domain)/($match_username)(?:/|$)}); |
| |
|
| # The URL does not really point to any authorspace, forget it |
# The URL does not really point to any authorspace, forget it |
| unless (($ownername) && ($ownerdomain)) { return ''; } |
unless (($ownername) && ($ownerdomain)) { return ''; } |
|
Line 7371 sub constructaccess {
|
Line 8388 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=''; |
| # 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. |
| my $cachedlast=''; |
my $cachedlast=''; |
| |
|
| sub load_all_blockers { |
sub load_all_blockers { |
| my ($uname,$udom,$blocks)=@_; |
my ($uname,$udom)=@_; |
| if (($uname ne '') && ($udom ne '')) { |
if (($uname ne '') && ($udom ne '')) { |
| if (($cacheduser eq $uname.':'.$udom) && |
if (($cacheduser eq $uname.':'.$udom) && |
| |
($cachedcid eq $env{'request.course.id'}) && |
| (abs($cachedlast-time)<5)) { |
(abs($cachedlast-time)<5)) { |
| return; |
return; |
| } |
} |
| } |
} |
| $cachedlast=time; |
$cachedlast=time; |
| $cacheduser=$uname.':'.$udom; |
$cacheduser=$uname.':'.$udom; |
| %cachedblockers = &get_commblock_resources($blocks); |
$cachedcid=$env{'request.course.id'}; |
| |
%cachedblockers = &get_commblock_resources(); |
| |
return; |
| } |
} |
| |
|
| sub get_comm_blocks { |
sub get_comm_blocks { |
|
Line 7466 sub get_commblock_resources {
|
Line 8488 sub get_commblock_resources {
|
| if ($mapsymb) { |
if ($mapsymb) { |
| if (ref($navmap)) { |
if (ref($navmap)) { |
| my $mapres = $navmap->getBySymb($mapsymb); |
my $mapres = $navmap->getBySymb($mapsymb); |
| @to_test = $mapres->retrieveResources($mapres,undef,0,0,0,1); |
if (ref($mapres)) { |
| foreach my $res (@to_test) { |
my $first = $mapres->map_start(); |
| my $symb = $res->symb(); |
my $finish = $mapres->map_finish(); |
| next if ($symb eq $mapsymb); |
my $it = $navmap->getIterator($first,$finish,undef,0,0); |
| if ($symb ne '') { |
if (ref($it)) { |
| @interval=&EXT("resource.0.interval",$symb); |
my $res; |
| if ($interval[1] eq 'map') { |
while ($res = $it->next(undef,1)) { |
| last; |
next unless (ref($res)); |
| |
my $symb = $res->symb(); |
| |
next if (($symb eq $mapsymb) || ($symb eq '')); |
| |
@interval=&EXT("resource.0.interval",$symb); |
| |
if ($interval[1] eq 'map') { |
| |
if ($res->answerable()) { |
| |
push(@to_test,$res); |
| |
last; |
| |
} |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 7523 sub get_commblock_resources {
|
Line 8554 sub get_commblock_resources {
|
| } |
} |
| |
|
| sub has_comm_blocking { |
sub has_comm_blocking { |
| my ($priv,$symb,$uri,$blocks) = @_; |
my ($priv,$symb,$uri,$ignoresymbdb,$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'); |
| return if ($env{'user.priv.'.$env{'request.role'}} =~/evb\&([^\:]*)/); |
return if ($env{'user.priv.'.$env{'request.role'}} =~/evb\&([^\:]*)/); |
| return if ($env{'request.state'} eq 'construct'); |
return if ($env{'request.state'} eq 'construct'); |
| &load_all_blockers($env{'user.name'},$env{'user.domain'},$blocks); |
my %blockinfo; |
| return unless (keys(%cachedblockers) > 0); |
if (ref($blocks) eq 'HASH') { |
| |
%blockinfo = &get_commblock_resources($blocks); |
| |
} else { |
| |
&load_all_blockers($env{'user.name'},$env{'user.domain'}); |
| |
%blockinfo = %cachedblockers; |
| |
} |
| |
return unless (keys(%blockinfo) > 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,$ignoresymbdb,$noenccheck); |
| } |
} |
| if ($symb) { |
if ($symb) { |
| @symbs = ($symb); |
@symbs = ($symb); |
|
Line 7544 sub has_comm_blocking {
|
Line 8581 sub has_comm_blocking {
|
| foreach my $symb (@symbs) { |
foreach my $symb (@symbs) { |
| last if ($noblock); |
last if ($noblock); |
| my ($map,$resid,$resurl)=&decode_symb($symb); |
my ($map,$resid,$resurl)=&decode_symb($symb); |
| foreach my $block (keys(%cachedblockers)) { |
foreach my $block (keys(%blockinfo)) { |
| 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($blockinfo{$block}) eq 'HASH') { |
| if (ref($cachedblockers{$block}{'resources'}) eq 'HASH') { |
if (ref($blockinfo{$block}{'resources'}) eq 'HASH') { |
| if ($cachedblockers{$block}{'resources'}{$symb}) { |
if ($blockinfo{$block}{'resources'}{$symb}) { |
| unless (grep(/^\Q$block\E$/,@blockers)) { |
unless (grep(/^\Q$block\E$/,@blockers)) { |
| push(@blockers,$block); |
push(@blockers,$block); |
| } |
} |
| } |
} |
| } |
} |
| } |
if (ref($blockinfo{$block}{'maps'}) eq 'HASH') { |
| if (ref($cachedblockers{$block}{'maps'}) eq 'HASH') { |
if ($blockinfo{$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 7646 sub get_symb_from_alias {
|
Line 8687 sub get_symb_from_alias {
|
| |
|
| sub definerole { |
sub definerole { |
| if (allowed('mcr','/')) { |
if (allowed('mcr','/')) { |
| my ($rolename,$sysrole,$domrole,$courole)=@_; |
my ($rolename,$sysrole,$domrole,$courole,$uname,$udom)=@_; |
| foreach my $role (split(':',$sysrole)) { |
foreach my $role (split(':',$sysrole)) { |
| my ($crole,$cqual)=split(/\&/,$role); |
my ($crole,$cqual)=split(/\&/,$role); |
| if ($pr{'cr:s'}!~/\Q$crole\E/) { return "refused:s:$crole"; } |
if ($pr{'cr:s'}!~/\Q$crole\E/) { return "refused:s:$crole"; } |
|
Line 7674 sub definerole {
|
Line 8715 sub definerole {
|
| } |
} |
| } |
} |
| } |
} |
| |
my $uhome; |
| |
if (($uname ne '') && ($udom ne '')) { |
| |
$uhome = &homeserver($uname,$udom); |
| |
return $uhome if ($uhome eq 'no_host'); |
| |
} else { |
| |
$uname = $env{'user.name'}; |
| |
$udom = $env{'user.domain'}; |
| |
$uhome = $env{'user.home'}; |
| |
} |
| my $command="encrypt:rolesput:$env{'user.domain'}:$env{'user.name'}:". |
my $command="encrypt:rolesput:$env{'user.domain'}:$env{'user.name'}:". |
| "$env{'user.domain'}:$env{'user.name'}:". |
"$udom:$uname:rolesdef_$rolename=". |
| "rolesdef_$rolename=". |
|
| escape($sysrole.'_'.$domrole.'_'.$courole); |
escape($sysrole.'_'.$domrole.'_'.$courole); |
| return reply($command,$env{'user.home'}); |
return reply($command,$uhome); |
| } else { |
} else { |
| return 'refused'; |
return 'refused'; |
| } |
} |
|
Line 7783 sub fetch_enrollment_query {
|
Line 8832 sub fetch_enrollment_query {
|
| &logthis('fetch_enrollment_query: invalid queryid: '.$queryid.' for host: '.$host.' and homeserver: '.$homeserver.' context: '.$context.' '.$cnum); |
&logthis('fetch_enrollment_query: invalid queryid: '.$queryid.' for host: '.$host.' and homeserver: '.$homeserver.' context: '.$context.' '.$cnum); |
| return 'error: '.$queryid; |
return 'error: '.$queryid; |
| } |
} |
| my $reply = &get_query_reply($queryid,$sleep.$loopmax); |
my $reply = &get_query_reply($queryid,$sleep,$loopmax); |
| my $tries = 1; |
my $tries = 1; |
| while (($reply=~/^timeout/) && ($tries < $maxtries)) { |
while (($reply=~/^timeout/) && ($tries < $maxtries)) { |
| $reply = &get_query_reply($queryid,$sleep,$loopmax); |
$reply = &get_query_reply($queryid,$sleep,$loopmax); |
|
Line 7793 sub fetch_enrollment_query {
|
Line 8842 sub fetch_enrollment_query {
|
| &logthis('fetch_enrollment_query error: '.$reply.' for '.$dom.' '.$env{'user.name'}.' for '.$queryid.' context: '.$context.' '.$cnum.' maxtries: '.$maxtries.' tries: '.$tries); |
&logthis('fetch_enrollment_query error: '.$reply.' for '.$dom.' '.$env{'user.name'}.' for '.$queryid.' context: '.$context.' '.$cnum.' maxtries: '.$maxtries.' tries: '.$tries); |
| } else { |
} else { |
| my @responses = split(/:/,$reply); |
my @responses = split(/:/,$reply); |
| if ($homeserver eq $perlvar{'lonHostID'}) { |
if (grep { $_ eq $homeserver } ¤t_machine_ids()) { |
| foreach my $line (@responses) { |
foreach my $line (@responses) { |
| my ($key,$value) = split(/=/,$line,2); |
my ($key,$value) = split(/=/,$line,2); |
| $$replyref{$key} = $value; |
$$replyref{$key} = $value; |
|
Line 7811 sub fetch_enrollment_query {
|
Line 8860 sub fetch_enrollment_query {
|
| if ($xml_classlist =~ /^error/) { |
if ($xml_classlist =~ /^error/) { |
| &logthis('fetch_enrollment_query - autoretrieve error: '.$xml_classlist.' for '.$filename.' from server: '.$homeserver.' '.$context.' '.$cnum); |
&logthis('fetch_enrollment_query - autoretrieve error: '.$xml_classlist.' for '.$filename.' from server: '.$homeserver.' '.$context.' '.$cnum); |
| } else { |
} else { |
| if ( open(FILE,">$destname") ) { |
if ( open(FILE,">",$destname) ) { |
| print FILE &unescape($xml_classlist); |
print FILE &unescape($xml_classlist); |
| close(FILE); |
close(FILE); |
| } else { |
} else { |
|
Line 7840 sub get_query_reply {
|
Line 8889 sub get_query_reply {
|
| for (1..$loopmax) { |
for (1..$loopmax) { |
| sleep($sleep); |
sleep($sleep); |
| if (-e $replyfile.'.end') { |
if (-e $replyfile.'.end') { |
| if (open(my $fh,$replyfile)) { |
if (open(my $fh,"<",$replyfile)) { |
| $reply = join('',<$fh>); |
$reply = join('',<$fh>); |
| close($fh); |
close($fh); |
| } else { return 'error: reply_file_error'; } |
} else { return 'error: reply_file_error'; } |
|
Line 8232 sub auto_validate_class_sec {
|
Line 9281 sub auto_validate_class_sec {
|
| return $response; |
return $response; |
| } |
} |
| |
|
| |
sub auto_validate_instclasses { |
| |
my ($cdom,$cnum,$owners,$classesref) = @_; |
| |
my ($homeserver,%validations); |
| |
$homeserver = &homeserver($cnum,$cdom); |
| |
unless ($homeserver eq 'no_host') { |
| |
my $ownerlist; |
| |
if (ref($owners) eq 'ARRAY') { |
| |
$ownerlist = join(',',@{$owners}); |
| |
} else { |
| |
$ownerlist = $owners; |
| |
} |
| |
if (ref($classesref) eq 'HASH') { |
| |
my $classes = &freeze_escape($classesref); |
| |
my $response=&reply('autovalidateinstclasses:'.&escape($ownerlist). |
| |
':'.$cdom.':'.$classes,$homeserver); |
| |
unless ($response =~ /(con_lost|error|no_such_host|refused)/) { |
| |
my @items = split(/&/,$response); |
| |
foreach my $item (@items) { |
| |
my ($key,$value) = split('=',$item); |
| |
$validations{&unescape($key)} = &thaw_unescape($value); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return %validations; |
| |
} |
| |
|
| sub auto_crsreq_update { |
sub auto_crsreq_update { |
| my ($cdom,$cnum,$crstype,$action,$ownername,$ownerdomain,$fullname,$title, |
my ($cdom,$cnum,$crstype,$action,$ownername,$ownerdomain,$fullname,$title, |
| $code,$accessstart,$accessend,$inbound) = @_; |
$code,$accessstart,$accessend,$inbound) = @_; |
|
Line 8725 sub assignrole {
|
Line 9801 sub assignrole {
|
| &courserolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag, |
&courserolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag, |
| $selfenroll,$context); |
$selfenroll,$context); |
| } elsif (($role eq 'li') || ($role eq 'dg') || ($role eq 'sc') || |
} elsif (($role eq 'li') || ($role eq 'dg') || ($role eq 'sc') || |
| ($role eq 'au') || ($role eq 'dc')) { |
($role eq 'au') || ($role eq 'dc') || ($role eq 'dh') || |
| |
($role eq 'da')) { |
| &domainrolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag, |
&domainrolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag, |
| $context); |
$context); |
| } elsif (($role eq 'ca') || ($role eq 'aa')) { |
} elsif (($role eq 'ca') || ($role eq 'aa')) { |
|
Line 8829 sub store_coowners {
|
Line 9906 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 9322 sub generate_coursenum {
|
Line 10414 sub generate_coursenum {
|
| sub is_course { |
sub is_course { |
| my ($cdom, $cnum) = scalar(@_) == 1 ? |
my ($cdom, $cnum) = scalar(@_) == 1 ? |
| ($_[0] =~ /^($match_domain)_($match_courseid)$/) : @_; |
($_[0] =~ /^($match_domain)_($match_courseid)$/) : @_; |
| |
return unless (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/)); |
| return unless $cdom and $cnum; |
my $uhome=&homeserver($cnum,$cdom); |
| |
my $iscourse; |
| my %courses = &courseiddump($cdom, '.', 1, '.', '.', $cnum, undef, undef, |
if (grep { $_ eq $uhome } current_machine_ids()) { |
| '.'); |
$iscourse = &LONCAPA::Lond::is_course($cdom,$cnum); |
| |
} else { |
| return unless(exists($courses{$cdom.'_'.$cnum})); |
my $hashid = $cdom.':'.$cnum; |
| |
($iscourse,my $cached) = &is_cached_new('iscourse',$hashid); |
| |
unless (defined($cached)) { |
| |
my %courses = &courseiddump($cdom, '.', 1, '.', '.', |
| |
$cnum,undef,undef,'.'); |
| |
$iscourse = 0; |
| |
if (exists($courses{$cdom.'_'.$cnum})) { |
| |
$iscourse = 1; |
| |
} |
| |
&do_cache_new('iscourse',$hashid,$iscourse,3600); |
| |
} |
| |
} |
| |
return unless($iscourse); |
| return wantarray ? ($cdom, $cnum) : $cdom.'_'.$cnum; |
return wantarray ? ($cdom, $cnum) : $cdom.'_'.$cnum; |
| } |
} |
| |
|
|
Line 9464 sub save_selected_files {
|
Line 10568 sub save_selected_files {
|
| my ($user, $path, @files) = @_; |
my ($user, $path, @files) = @_; |
| my $filename = $user."savedfiles"; |
my $filename = $user."savedfiles"; |
| my @other_files = &files_not_in_path($user, $path); |
my @other_files = &files_not_in_path($user, $path); |
| open (OUT, '>'.$tmpdir.$filename); |
open (OUT,'>',LONCAPA::tempdir().$filename); |
| foreach my $file (@files) { |
foreach my $file (@files) { |
| print (OUT $env{'form.currentpath'}.$file."\n"); |
print (OUT $env{'form.currentpath'}.$file."\n"); |
| } |
} |
|
Line 9478 sub save_selected_files {
|
Line 10582 sub save_selected_files {
|
| sub clear_selected_files { |
sub clear_selected_files { |
| my ($user) = @_; |
my ($user) = @_; |
| my $filename = $user."savedfiles"; |
my $filename = $user."savedfiles"; |
| open (OUT, '>'.LONCAPA::tempdir().$filename); |
open (OUT,'>',LONCAPA::tempdir().$filename); |
| print (OUT undef); |
print (OUT undef); |
| close (OUT); |
close (OUT); |
| return ("ok"); |
return ("ok"); |
|
Line 9488 sub files_in_path {
|
Line 10592 sub files_in_path {
|
| my ($user, $path) = @_; |
my ($user, $path) = @_; |
| my $filename = $user."savedfiles"; |
my $filename = $user."savedfiles"; |
| my %return_files; |
my %return_files; |
| open (IN, '<'.LONCAPA::tempdir().$filename); |
open (IN,'<',LONCAPA::tempdir().$filename); |
| while (my $line_in = <IN>) { |
while (my $line_in = <IN>) { |
| chomp ($line_in); |
chomp ($line_in); |
| my @paths_and_file = split (m!/!, $line_in); |
my @paths_and_file = split (m!/!, $line_in); |
|
Line 9510 sub files_not_in_path {
|
Line 10614 sub files_not_in_path {
|
| my $filename = $user."savedfiles"; |
my $filename = $user."savedfiles"; |
| my @return_files; |
my @return_files; |
| my $path_part; |
my $path_part; |
| open(IN, '<'.LONCAPA::.$filename); |
open(IN, '<',LONCAPA::tempdir().$filename); |
| while (my $line = <IN>) { |
while (my $line = <IN>) { |
| #ok, I know it's clunky, but I want it to work |
#ok, I know it's clunky, but I want it to work |
| my @paths_and_file = split(m|/|, $line); |
my @paths_and_file = split(m|/|, $line); |
|
Line 10644 sub add_prefix_and_part {
|
Line 11748 sub add_prefix_and_part {
|
| |
|
| my %metaentry; |
my %metaentry; |
| my %importedpartids; |
my %importedpartids; |
| |
my %importedrespids; |
| sub metadata { |
sub metadata { |
| my ($uri,$what,$liburi,$prefix,$depthcount)=@_; |
my ($uri,$what,$liburi,$prefix,$depthcount)=@_; |
| $uri=&declutter($uri); |
$uri=&declutter($uri); |
|
Line 10671 sub metadata {
|
Line 11776 sub metadata {
|
| } |
} |
| { |
{ |
| # Imported parts would go here |
# Imported parts would go here |
| my %importedids=(); |
my @origfiletagids=(); |
| my @origfileimportpartids=(); |
|
| my $importedparts=0; |
my $importedparts=0; |
| |
|
| |
# Imported responseids would go here |
| |
my $importedresponses=0; |
| # |
# |
| # Is this a recursive call for a library? |
# Is this a recursive call for a library? |
| # |
# |
|
Line 10768 sub metadata {
|
Line 11875 sub metadata {
|
| my $dir=$filename; |
my $dir=$filename; |
| $dir=~s|[^/]*$||; |
$dir=~s|[^/]*$||; |
| $location=&filelocation($dir,$location); |
$location=&filelocation($dir,$location); |
| |
|
| |
my $importid=$token->[2]->{'id'}; |
| my $importmode=$token->[2]->{'importmode'}; |
my $importmode=$token->[2]->{'importmode'}; |
| |
# |
| |
# Check metadata for imported file to |
| |
# see if it contained response items |
| |
# |
| |
my %currmetaentry = %metaentry; |
| |
my $libresponseorder = &metadata($location,'responseorder'); |
| |
my $origfile; |
| |
if ($libresponseorder ne '') { |
| |
if ($#origfiletagids<0) { |
| |
undef(%importedrespids); |
| |
undef(%importedpartids); |
| |
} |
| |
@{$importedrespids{$importid}} = split(/\s*,\s*/,$libresponseorder); |
| |
if (@{$importedrespids{$importid}} > 0) { |
| |
$importedresponses = 1; |
| |
# We need to get the original file and the imported file to get the response order correct |
| |
# Load and inspect original file |
| |
if ($#origfiletagids<0) { |
| |
my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri); |
| |
$origfile=&getfile($origfilelocation); |
| |
@origfiletagids=($origfile=~/<((?:\w+)response|import|part)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs); |
| |
} |
| |
} |
| |
} |
| |
# Do not overwrite contents of %metaentry hash for resource itself with |
| |
# hash populated for imported library file |
| |
%metaentry = %currmetaentry; |
| |
undef(%currmetaentry); |
| if ($importmode eq 'problem') { |
if ($importmode eq 'problem') { |
| # Import as problem/response |
# Import as problem/response |
| $unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
$unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
|
Line 10778 sub metadata {
|
Line 11914 sub metadata {
|
| $importedparts=1; |
$importedparts=1; |
| # We need to get the original file and the imported file to get the part order correct |
# We need to get the original file and the imported file to get the part order correct |
| # Good news: we do not need to worry about nested libraries, since parts cannot be nested |
# Good news: we do not need to worry about nested libraries, since parts cannot be nested |
| # Load and inspect original file |
# Load and inspect original file if we didn't do that already |
| if ($#origfileimportpartids<0) { |
if ($#origfiletagids<0) { |
| undef(%importedpartids); |
undef(%importedrespids); |
| my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri); |
undef(%importedpartids); |
| my $origfile=&getfile($origfilelocation); |
if ($origfile eq '') { |
| @origfileimportpartids=($origfile=~/<(part|import)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs); |
my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri); |
| |
$origfile=&getfile($origfilelocation); |
| |
@origfiletagids=($origfile=~/<(part|import)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs); |
| |
} |
| } |
} |
| |
|
| # Load and inspect imported file |
# Load and inspect imported file |
|
Line 10897 sub metadata {
|
Line 12036 sub metadata {
|
| grep { ! $seen{$_} ++ } (split(',',$metaentry{':packages'})); |
grep { ! $seen{$_} ++ } (split(',',$metaentry{':packages'})); |
| $metaentry{':packages'} = join(',',@uniq_packages); |
$metaentry{':packages'} = join(',',@uniq_packages); |
| |
|
| if ($importedparts) { |
if (($importedresponses) || ($importedparts)) { |
| |
if ($importedparts) { |
| # We had imported parts and need to rebuild partorder |
# We had imported parts and need to rebuild partorder |
| $metaentry{':partorder'}=''; |
$metaentry{':partorder'}=''; |
| $metathesekeys{'partorder'}=1; |
$metathesekeys{'partorder'}=1; |
| for (my $index=0;$index<$#origfileimportpartids;$index+=2) { |
} |
| if ($origfileimportpartids[$index] eq 'part') { |
if ($importedresponses) { |
| # original part, part of the problem |
# We had imported responses and need to rebuild responseorder |
| $metaentry{':partorder'}.=','.$origfileimportpartids[$index+1]; |
$metaentry{':responseorder'}=''; |
| } else { |
$metathesekeys{'responseorder'}=1; |
| # we have imported parts at this position |
} |
| $metaentry{':partorder'}.=','.$importedpartids{$origfileimportpartids[$index+1]}; |
for (my $index=0;$index<$#origfiletagids;$index+=2) { |
| } |
my $origid = $origfiletagids[$index+1]; |
| } |
if ($origfiletagids[$index] eq 'part') { |
| $metaentry{':partorder'}=~s/^\,//; |
# Original part, part of the problem |
| |
if ($importedparts) { |
| |
$metaentry{':partorder'}.=','.$origid; |
| |
} |
| |
} elsif ($origfiletagids[$index] eq 'import') { |
| |
if ($importedparts) { |
| |
# We have imported parts at this position |
| |
$metaentry{':partorder'}.=','.$importedpartids{$origid}; |
| |
} |
| |
if ($importedresponses) { |
| |
# We have imported responses at this position |
| |
if (ref($importedrespids{$origid}) eq 'ARRAY') { |
| |
$metaentry{':responseorder'}.=','.join(',',map { $origid.'_'.$_ } @{$importedrespids{$origid}}); |
| |
} |
| |
} |
| |
} else { |
| |
# Original response item, part of the problem |
| |
if ($importedresponses) { |
| |
$metaentry{':responseorder'}.=','.$origid; |
| |
} |
| |
} |
| |
} |
| |
if ($importedparts) { |
| |
$metaentry{':partorder'}=~s/^\,//; |
| |
} |
| |
if ($importedresponses) { |
| |
$metaentry{':responseorder'}=~s/^\,//; |
| |
} |
| } |
} |
| |
|
| $metaentry{':keys'} = join(',',keys(%metathesekeys)); |
$metaentry{':keys'} = join(',',keys(%metathesekeys)); |
|
Line 11175 sub symbverify {
|
Line 12342 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 11286 sub deversion {
|
Line 12451 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, |
| |
$ignoresymbdb,$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})) { |
| 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 |
|
Line 11321 sub symbread {
|
Line 12489 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 ($ignoresymbdb) { |
| &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 && $checkforblock) { |
| |
my @blockers = &has_comm_blocking('bre',$syval,$thisfn,$ignoresymbdb,$noenccheck); |
| |
if (@blockers) { |
| |
$syval=''; |
| |
} |
| |
} |
| } |
} |
| # ---------------------------------------------------------- There was an entry |
# ---------------------------------------------------------- There was an entry |
| if ($syval) { |
if ($syval) { |
|
Line 11357 sub symbread {
|
Line 12533 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 $env{$cache_str}=''; |
| |
} |
| } |
} |
| } |
} |
| } elsif ((!$donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) { |
} elsif ((!$donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) { |
|
Line 11382 sub symbread {
|
Line 12563 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 11395 sub symbread {
|
Line 12577 sub symbread {
|
| $syval = $poss_syval; |
$syval = $poss_syval; |
| $realpossible++; |
$realpossible++; |
| } |
} |
| |
if ($syval) { |
| |
if (ref($possibles) eq 'HASH') { |
| |
$possibles->{$syval} = 1; |
| |
} |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 11932 sub repcopy_userfile {
|
Line 13119 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 11958 sub tokenwrapper {
|
Line 13146 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 11976 sub getuploaded {
|
Line 13165 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 11998 sub readfile {
|
Line 13188 sub readfile {
|
| my $file = shift; |
my $file = shift; |
| if ( (! -e $file ) || ($file eq '') ) { return -1; }; |
if ( (! -e $file ) || ($file eq '') ) { return -1; }; |
| my $fh; |
my $fh; |
| open($fh,"<$file"); |
open($fh,"<",$file); |
| my $a=''; |
my $a=''; |
| while (my $line = <$fh>) { $a .= $line; } |
while (my $line = <$fh>) { $a .= $line; } |
| return $a; |
return $a; |
|
Line 12111 sub machine_ids {
|
Line 13301 sub machine_ids {
|
| |
|
| sub additional_machine_domains { |
sub additional_machine_domains { |
| my @domains; |
my @domains; |
| open(my $fh,"<$perlvar{'lonTabDir'}/expected_domains.tab"); |
open(my $fh,"<","$perlvar{'lonTabDir'}/expected_domains.tab"); |
| while( my $line = <$fh>) { |
while( my $line = <$fh>) { |
| $line =~ s/\s//g; |
$line =~ s/\s//g; |
| push(@domains,$line); |
push(@domains,$line); |
|
Line 12132 sub default_login_domain {
|
Line 13322 sub default_login_domain {
|
| return $domain; |
return $domain; |
| } |
} |
| |
|
| |
sub shared_institution { |
| |
my ($dom) = @_; |
| |
my $same_intdom; |
| |
my $hostintdom = &internet_dom($perlvar{'lonHostID'}); |
| |
if ($hostintdom ne '') { |
| |
my %iphost = &get_iphost(); |
| |
my $primary_id = &domain($dom,'primary'); |
| |
my $primary_ip = &get_host_ip($primary_id); |
| |
if (ref($iphost{$primary_ip}) eq 'ARRAY') { |
| |
foreach my $id (@{$iphost{$primary_ip}}) { |
| |
my $intdom = &internet_dom($id); |
| |
if ($intdom eq $hostintdom) { |
| |
$same_intdom = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
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 12255 sub get_dns {
|
Line 13505 sub get_dns {
|
| } |
} |
| |
|
| my %alldns; |
my %alldns; |
| open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab"); |
if (open(my $config,"<","$perlvar{'lonTabDir'}/hosts.tab")) { |
| foreach my $dns (<$config>) { |
foreach my $dns (<$config>) { |
| next if ($dns !~ /^\^(\S*)/x); |
next if ($dns !~ /^\^(\S*)/x); |
| my $line = $1; |
my $line = $1; |
| my ($host,$protocol) = split(/:/,$line); |
my ($host,$protocol) = split(/:/,$line); |
| if ($protocol ne 'https') { |
if ($protocol ne 'https') { |
| $protocol = 'http'; |
$protocol = 'http'; |
| |
} |
| |
$alldns{$host} = $protocol; |
| } |
} |
| $alldns{$host} = $protocol; |
close($config); |
| } |
} |
| while (%alldns) { |
while (%alldns) { |
| my ($dns) = sort { $b cmp $a } keys(%alldns); |
my ($dns) = sort { $b cmp $a } keys(%alldns); |
|
Line 12280 sub get_dns {
|
Line 13532 sub get_dns {
|
| &$func(\@content,$hashref); |
&$func(\@content,$hashref); |
| return; |
return; |
| } |
} |
| close($config); |
|
| my $which = (split('/',$url))[3]; |
my $which = (split('/',$url))[3]; |
| &logthis("unable to contact DNS defaulting to on disk file dns_$which.tab\n"); |
&logthis("unable to contact DNS defaulting to on disk file dns_$which.tab\n"); |
| open($config,"<$perlvar{'lonTabDir'}/dns_$which.tab"); |
if (open(my $config,"<","$perlvar{'lonTabDir'}/dns_$which.tab")) { |
| my @content = <$config>; |
my @content = <$config>; |
| &$func(\@content,$hashref); |
&$func(\@content,$hashref); |
| |
} |
| return; |
return; |
| } |
} |
| |
|
|
Line 12376 sub fetch_dns_checksums {
|
Line 13628 sub fetch_dns_checksums {
|
| my ($ignore_cache,$nocache) = @_; |
my ($ignore_cache,$nocache) = @_; |
| &get_dns('/adm/dns/domain',\&parse_domain_tab,$ignore_cache,$nocache); |
&get_dns('/adm/dns/domain',\&parse_domain_tab,$ignore_cache,$nocache); |
| my $fh; |
my $fh; |
| if (open($fh,"<".$perlvar{'lonTabDir'}.'/domain.tab')) { |
if (open($fh,"<",$perlvar{'lonTabDir'}.'/domain.tab')) { |
| my @lines = <$fh>; |
my @lines = <$fh>; |
| &parse_domain_tab(\@lines); |
&parse_domain_tab(\@lines); |
| } |
} |
|
Line 12428 sub fetch_dns_checksums {
|
Line 13680 sub fetch_dns_checksums {
|
| my ($id,$domain,$role,$name,$protocol,$intdom)=split(/:/,$configline); |
my ($id,$domain,$role,$name,$protocol,$intdom)=split(/:/,$configline); |
| $name=~s/\s//g; |
$name=~s/\s//g; |
| if ($id && $domain && $role && $name) { |
if ($id && $domain && $role && $name) { |
| |
if ((exists($hostname{$id})) && ($hostname{$id} ne '')) { |
| |
my $curr = $hostname{$id}; |
| |
my $skip; |
| |
if (ref($name_to_host{$curr}) eq 'ARRAY') { |
| |
if (($curr eq $name) && (@{$name_to_host{$curr}} == 1)) { |
| |
$skip = 1; |
| |
} else { |
| |
@{$name_to_host{$curr}} = grep { $_ ne $id } @{$name_to_host{$curr}}; |
| |
} |
| |
} |
| |
unless ($skip) { |
| |
push(@{$name_to_host{$name}},$id); |
| |
} |
| |
} else { |
| |
push(@{$name_to_host{$name}},$id); |
| |
} |
| $hostname{$id}=$name; |
$hostname{$id}=$name; |
| push(@{$name_to_host{$name}}, $id); |
|
| $hostdom{$id}=$domain; |
$hostdom{$id}=$domain; |
| if ($role eq 'library') { $libserv{$id}=$name; } |
if ($role eq 'library') { $libserv{$id}=$name; } |
| if (defined($protocol)) { |
if (defined($protocol)) { |
|
Line 12462 sub fetch_dns_checksums {
|
Line 13729 sub fetch_dns_checksums {
|
| sub load_hosts_tab { |
sub load_hosts_tab { |
| my ($ignore_cache,$nocache) = @_; |
my ($ignore_cache,$nocache) = @_; |
| &get_dns('/adm/dns/hosts',\&parse_hosts_tab,$ignore_cache,$nocache); |
&get_dns('/adm/dns/hosts',\&parse_hosts_tab,$ignore_cache,$nocache); |
| open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab"); |
open(my $config,"<","$perlvar{'lonTabDir'}/hosts.tab"); |
| my @config = <$config>; |
my @config = <$config>; |
| &parse_hosts_tab(\@config); |
&parse_hosts_tab(\@config); |
| close($config); |
close($config); |
|
Line 12728 sub all_loncaparevs {
|
Line 13995 sub all_loncaparevs {
|
| { |
{ |
| sub load_loncaparevs { |
sub load_loncaparevs { |
| if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") { |
if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") { |
| if (open(my $config,"<$perlvar{'lonTabDir'}/loncaparevs.tab")) { |
if (open(my $config,"<","$perlvar{'lonTabDir'}/loncaparevs.tab")) { |
| while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
| chomp($configline); |
chomp($configline); |
| my ($hostid,$loncaparev)=split(/:/,$configline); |
my ($hostid,$loncaparev)=split(/:/,$configline); |
|
Line 12744 sub all_loncaparevs {
|
Line 14011 sub all_loncaparevs {
|
| { |
{ |
| sub load_serverhomeIDs { |
sub load_serverhomeIDs { |
| if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") { |
if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") { |
| if (open(my $config,"<$perlvar{'lonTabDir'}/serverhomeIDs.tab")) { |
if (open(my $config,"<","$perlvar{'lonTabDir'}/serverhomeIDs.tab")) { |
| while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
| chomp($configline); |
chomp($configline); |
| my ($name,$id)=split(/:/,$configline); |
my ($name,$id)=split(/:/,$configline); |
|
Line 12769 BEGIN {
|
Line 14036 BEGIN {
|
| |
|
| # ------------------------------------------------------ Read spare server file |
# ------------------------------------------------------ Read spare server file |
| { |
{ |
| open(my $config,"<$perlvar{'lonTabDir'}/spare.tab"); |
open(my $config,"<","$perlvar{'lonTabDir'}/spare.tab"); |
| |
|
| while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
| chomp($configline); |
chomp($configline); |
|
Line 12783 BEGIN {
|
Line 14050 BEGIN {
|
| } |
} |
| # ------------------------------------------------------------ Read permissions |
# ------------------------------------------------------------ Read permissions |
| { |
{ |
| open(my $config,"<$perlvar{'lonTabDir'}/roles.tab"); |
open(my $config,"<","$perlvar{'lonTabDir'}/roles.tab"); |
| |
|
| while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
| chomp($configline); |
chomp($configline); |
|
Line 12797 BEGIN {
|
Line 14064 BEGIN {
|
| |
|
| # -------------------------------------------- Read plain texts for permissions |
# -------------------------------------------- Read plain texts for permissions |
| { |
{ |
| open(my $config,"<$perlvar{'lonTabDir'}/rolesplain.tab"); |
open(my $config,"<","$perlvar{'lonTabDir'}/rolesplain.tab"); |
| |
|
| while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
| chomp($configline); |
chomp($configline); |
|
Line 12817 BEGIN {
|
Line 14084 BEGIN {
|
| |
|
| # ---------------------------------------------------------- Read package table |
# ---------------------------------------------------------- Read package table |
| { |
{ |
| open(my $config,"<$perlvar{'lonTabDir'}/packages.tab"); |
open(my $config,"<","$perlvar{'lonTabDir'}/packages.tab"); |
| |
|
| while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
| if ($configline !~ /\S/ || $configline=~/^#/) { next; } |
if ($configline !~ /\S/ || $configline=~/^#/) { next; } |
|
Line 12863 BEGIN {
|
Line 14130 BEGIN {
|
| # ---------------------------------------------------------- Read managers table |
# ---------------------------------------------------------- Read managers table |
| { |
{ |
| if (-e "$perlvar{'lonTabDir'}/managers.tab") { |
if (-e "$perlvar{'lonTabDir'}/managers.tab") { |
| if (open(my $config,"<$perlvar{'lonTabDir'}/managers.tab")) { |
if (open(my $config,"<","$perlvar{'lonTabDir'}/managers.tab")) { |
| while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
| chomp($configline); |
chomp($configline); |
| next if ($configline =~ /^\#/); |
next if ($configline =~ /^\#/); |
|
Line 12882 BEGIN {
|
Line 14149 BEGIN {
|
| |
|
| } |
} |
| |
|
| |
# ------------- set default texengine (domain default overrides this) |
| |
{ |
| |
$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 13217 in which case the null string is returne
|
Line 14494 in which case the null string is returne
|
| |
|
| =item * |
=item * |
| |
|
| definerole($rolename,$sysrole,$domrole,$courole) : define role; define a custom |
definerole($rolename,$sysrole,$domrole,$courole,$uname,$udom) : define role; |
| role rolename set privileges in format of lonTabs/roles.tab for system, domain, |
define a custom role rolename set privileges in format of lonTabs/roles.tab |
| and course level |
for system, domain, and course level. $uname and $udom are optional (current |
| |
user's username and domain will be used when either of $uname or $udom are absent. |
| |
|
| =item * |
=item * |
| |
|
|
Line 13528 Returns:
|
Line 14806 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 14219 userspace, probably shouldn't be called
|
Line 15579 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