|
version 1.976.2.6, 2009/01/05 16:29:24
|
version 1.1172.2.144, 2021/12/24 21:13:15
|
|
Line 73 package Apache::lonnet;
|
Line 73 package Apache::lonnet;
|
| use strict; |
use strict; |
| use LWP::UserAgent(); |
use LWP::UserAgent(); |
| use HTTP::Date; |
use HTTP::Date; |
| # use Date::Parse; |
use Image::Magick; |
| use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir |
use CGI::Cookie; |
| $_64bit %env %protocol); |
|
| |
use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir $deftex |
| |
$_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease |
| |
%managerstab $passwdmin); |
| |
|
| my (%badServerCache, $memcache, %courselogs, %accesshash, %domainrolehash, |
my (%badServerCache, $memcache, %courselogs, %accesshash, %domainrolehash, |
| %userrolehash, $processmarker, $dumpcount, %coursedombuf, |
%userrolehash, $processmarker, $dumpcount, %coursedombuf, |
|
Line 87 use GDBM_File;
|
Line 90 use GDBM_File;
|
| use HTML::LCParser; |
use HTML::LCParser; |
| use Fcntl qw(:flock); |
use Fcntl qw(:flock); |
| use Storable qw(thaw nfreeze); |
use Storable qw(thaw nfreeze); |
| use Time::HiRes qw( gettimeofday tv_interval ); |
use Time::HiRes qw( sleep gettimeofday tv_interval ); |
| use Cache::Memcached; |
use Cache::Memcached; |
| use Digest::MD5; |
use Digest::MD5; |
| use Math::Random; |
use Math::Random; |
| |
use File::MMagic; |
| |
use Net::CIDR; |
| |
use Sys::Hostname::FQDN(); |
| use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
| use LONCAPA::Configuration; |
use LONCAPA::Configuration; |
| |
use LONCAPA::lonmetadata; |
| |
use LONCAPA::Lond; |
| |
use LONCAPA::transliterate; |
| |
|
| |
use File::Copy; |
| |
|
| my $readit; |
my $readit; |
| my $max_connection_retries = 10; # Or some such value. |
my $max_connection_retries = 20; # Or some such value. |
| |
|
| require Exporter; |
require Exporter; |
| |
|
| our @ISA = qw (Exporter); |
our @ISA = qw (Exporter); |
| our @EXPORT = qw(%env); |
our @EXPORT = qw(%env); |
| |
|
| |
# ------------------------------------ Logging (parameters, docs, slots, roles) |
| # --------------------------------------------------------------------- Logging |
|
| { |
{ |
| my $logid; |
my $logid; |
| sub instructor_log { |
sub write_log { |
| my ($hash_name,$storehash,$delflag,$uname,$udom,$cnum,$cdom)=@_; |
my ($context,$hash_name,$storehash,$delflag,$uname,$udom,$cnum,$cdom)=@_; |
| if (($cnum eq '') || ($cdom eq '')) { |
if ($context eq 'course') { |
| $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
if (($cnum eq '') || ($cdom eq '')) { |
| $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
} |
| } |
} |
| $logid++; |
$logid ++; |
| my $now = time(); |
my $now = time(); |
| my $id=$now.'00000'.$$.'00000'.$logid; |
my $id=$now.'00000'.$$.'00000'.$logid; |
| return &Apache::lonnet::put('nohist_'.$hash_name, |
my $ip = &get_requestor_ip(); |
| { $id => { |
my $logentry = { |
| 'exe_uname' => $env{'user.name'}, |
$id => { |
| 'exe_udom' => $env{'user.domain'}, |
'exe_uname' => $env{'user.name'}, |
| 'exe_time' => $now, |
'exe_udom' => $env{'user.domain'}, |
| 'exe_ip' => $ENV{'REMOTE_ADDR'}, |
'exe_time' => $now, |
| 'delflag' => $delflag, |
'exe_ip' => $ip, |
| 'logentry' => $storehash, |
'delflag' => $delflag, |
| 'uname' => $uname, |
'logentry' => $storehash, |
| 'udom' => $udom, |
'uname' => $uname, |
| } |
'udom' => $udom, |
| },$cdom,$cnum); |
} |
| |
}; |
| |
return &put('nohist_'.$hash_name,$logentry,$cdom,$cnum); |
| } |
} |
| } |
} |
| |
|
| 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 145 sub logthis {
|
Line 159 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")) { |
| print $fh "$local ($$): $message\n"; |
my $logstring = $local. " ($$): ".$message."\n"; # Keep any \'s in string. |
| |
print $fh $logstring; |
| close($fh); |
close($fh); |
| } |
} |
| return 1; |
return 1; |
|
Line 157 sub logperm {
|
Line 172 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 192 sub get_server_timezone {
|
Line 207 sub get_server_timezone {
|
| } |
} |
| } |
} |
| |
|
| |
sub get_server_distarch { |
| |
my ($lonhost,$ignore_cache) = @_; |
| |
if (defined($lonhost)) { |
| |
if (!defined(&hostname($lonhost))) { |
| |
return; |
| |
} |
| |
my $cachetime = 12*3600; |
| |
if (!$ignore_cache) { |
| |
my ($distarch,$cached)=&is_cached_new('serverdistarch',$lonhost); |
| |
if (defined($cached)) { |
| |
return $distarch; |
| |
} |
| |
} |
| |
my $rep = &reply('serverdistarch',$lonhost); |
| |
unless ($rep eq 'unknown_command' || $rep eq 'no_such_host' || |
| |
$rep eq 'con_lost' || $rep eq 'rejected' || $rep eq 'refused' || |
| |
$rep eq '') { |
| |
return &do_cache_new('serverdistarch',$lonhost,$rep,$cachetime); |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub get_server_loncaparev { |
| |
my ($dom,$lonhost,$ignore_cache,$caller) = @_; |
| |
if (defined($lonhost)) { |
| |
if (!defined(&hostname($lonhost))) { |
| |
undef($lonhost); |
| |
} |
| |
} |
| |
if (!defined($lonhost)) { |
| |
if (defined(&domain($dom,'primary'))) { |
| |
$lonhost=&domain($dom,'primary'); |
| |
if ($lonhost eq 'no_host') { |
| |
undef($lonhost); |
| |
} |
| |
} |
| |
} |
| |
if (defined($lonhost)) { |
| |
my $cachetime = 12*3600; |
| |
if (!$ignore_cache) { |
| |
my ($loncaparev,$cached)=&is_cached_new('serverloncaparev',$lonhost); |
| |
if (defined($cached)) { |
| |
return $loncaparev; |
| |
} |
| |
} |
| |
my ($answer,$loncaparev); |
| |
my @ids=¤t_machine_ids(); |
| |
if (grep(/^\Q$lonhost\E$/,@ids)) { |
| |
$answer = $perlvar{'lonVersion'}; |
| |
if ($answer =~ /^[\'\"]?([\w.\-]+)[\'\"]?$/) { |
| |
$loncaparev = $1; |
| |
} |
| |
} else { |
| |
$answer = &reply('serverloncaparev',$lonhost); |
| |
if (($answer eq 'unknown_cmd') || ($answer eq 'con_lost')) { |
| |
if ($caller eq 'loncron') { |
| |
my $ua=new LWP::UserAgent; |
| |
$ua->timeout(4); |
| |
my $hostname = &hostname($lonhost); |
| |
my $protocol = $protocol{$lonhost}; |
| |
$protocol = 'http' if ($protocol ne 'https'); |
| |
my $url = $protocol.'://'.$hostname.'/adm/about.html'; |
| |
my $request=new HTTP::Request('GET',$url); |
| |
my $response=$ua->request($request); |
| |
unless ($response->is_error()) { |
| |
my $content = $response->content; |
| |
if ($content =~ /<p>VERSION\:\s*([\w.\-]+)<\/p>/) { |
| |
$loncaparev = $1; |
| |
} |
| |
} |
| |
} else { |
| |
$loncaparev = $loncaparevs{$lonhost}; |
| |
} |
| |
} elsif ($answer =~ /^[\'\"]?([\w.\-]+)[\'\"]?$/) { |
| |
$loncaparev = $1; |
| |
} |
| |
} |
| |
return &do_cache_new('serverloncaparev',$lonhost,$loncaparev,$cachetime); |
| |
} |
| |
} |
| |
|
| |
sub get_server_homeID { |
| |
my ($hostname,$ignore_cache,$caller) = @_; |
| |
unless ($ignore_cache) { |
| |
my ($serverhomeID,$cached)=&is_cached_new('serverhomeID',$hostname); |
| |
if (defined($cached)) { |
| |
return $serverhomeID; |
| |
} |
| |
} |
| |
my $cachetime = 12*3600; |
| |
my $serverhomeID; |
| |
if ($caller eq 'loncron') { |
| |
my @machine_ids = &machine_ids($hostname); |
| |
foreach my $id (@machine_ids) { |
| |
my $response = &reply('serverhomeID',$id); |
| |
unless (($response eq 'unknown_cmd') || ($response eq 'con_lost')) { |
| |
$serverhomeID = $response; |
| |
last; |
| |
} |
| |
} |
| |
if ($serverhomeID eq '') { |
| |
$serverhomeID = $machine_ids[-1]; |
| |
} |
| |
} else { |
| |
$serverhomeID = $serverhomeIDs{$hostname}; |
| |
} |
| |
return &do_cache_new('serverhomeID',$hostname,$serverhomeID,$cachetime); |
| |
} |
| |
|
| |
sub get_remote_globals { |
| |
my ($lonhost,$whathash,$ignore_cache) = @_; |
| |
my ($result,%returnhash,%whatneeded); |
| |
if (ref($whathash) eq 'HASH') { |
| |
foreach my $what (sort(keys(%{$whathash}))) { |
| |
my $hashid = $lonhost.'-'.$what; |
| |
my ($response,$cached); |
| |
unless ($ignore_cache) { |
| |
($response,$cached)=&is_cached_new('lonnetglobal',$hashid); |
| |
} |
| |
if (defined($cached)) { |
| |
$returnhash{$what} = $response; |
| |
} else { |
| |
$whatneeded{$what} = 1; |
| |
} |
| |
} |
| |
if (keys(%whatneeded) == 0) { |
| |
$result = 'ok'; |
| |
} else { |
| |
my $requested = &freeze_escape(\%whatneeded); |
| |
my $rep=&reply('readlonnetglobal:'.$requested,$lonhost); |
| |
if (($rep=~/^(refused|rejected|error)/) || ($rep eq 'con_lost') || |
| |
($rep eq 'unknown_cmd')) { |
| |
$result = $rep; |
| |
} else { |
| |
$result = 'ok'; |
| |
my @pairs=split(/\&/,$rep); |
| |
foreach my $item (@pairs) { |
| |
my ($key,$value)=split(/=/,$item,2); |
| |
my $what = &unescape($key); |
| |
my $hashid = $lonhost.'-'.$what; |
| |
$returnhash{$what}=&thaw_unescape($value); |
| |
&do_cache_new('lonnetglobal',$hashid,$returnhash{$what},600); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return ($result,\%returnhash); |
| |
} |
| |
|
| |
sub remote_devalidate_cache { |
| |
my ($lonhost,$cachekeys) = @_; |
| |
my $items; |
| |
return unless (ref($cachekeys) eq 'ARRAY'); |
| |
my $cachestr = join('&',@{$cachekeys}); |
| |
return &reply('devalidatecache:'.&escape($cachestr),$lonhost); |
| |
} |
| |
|
| # -------------------------------------------------- Non-critical communication |
# -------------------------------------------------- Non-critical communication |
| sub subreply { |
sub subreply { |
| my ($cmd,$server)=@_; |
my ($cmd,$server)=@_; |
|
Line 203 sub subreply {
|
Line 376 sub subreply {
|
| |
|
| my $lockfile=$peerfile.".lock"; |
my $lockfile=$peerfile.".lock"; |
| while (-e $lockfile) { # Need to wait for the lockfile to disappear. |
while (-e $lockfile) { # Need to wait for the lockfile to disappear. |
| sleep(1); |
sleep(0.1); |
| } |
} |
| # At this point, either a loncnew parent is listening or an old lonc |
# At this point, either a loncnew parent is listening or an old lonc |
| # or loncnew child is listening so we can connect or everything's dead. |
# or loncnew child is listening so we can connect or everything's dead. |
|
Line 221 sub subreply {
|
Line 394 sub subreply {
|
| } else { |
} else { |
| &create_connection(&hostname($server),$server); |
&create_connection(&hostname($server),$server); |
| } |
} |
| sleep(1); # Try again later if failed connection. |
sleep(0.1); # Try again later if failed connection. |
| } |
} |
| my $answer; |
my $answer; |
| if ($client) { |
if ($client) { |
|
Line 240 sub reply {
|
Line 413 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 250 sub reply {
|
Line 441 sub reply {
|
| |
|
| sub reconlonc { |
sub reconlonc { |
| my ($lonid) = @_; |
my ($lonid) = @_; |
| my $hostname = &hostname($lonid); |
|
| if ($lonid) { |
if ($lonid) { |
| |
my $hostname = &hostname($lonid); |
| my $peerfile="$perlvar{'lonSockDir'}/$hostname"; |
my $peerfile="$perlvar{'lonSockDir'}/$hostname"; |
| if ($hostname && -e $peerfile) { |
if ($hostname && -e $peerfile) { |
| &logthis("Trying to reconnect lonc for $lonid ($hostname)"); |
&logthis("Trying to reconnect lonc for $lonid ($hostname)"); |
|
Line 269 sub reconlonc {
|
Line 460 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 297 sub critical {
|
Line 488 sub critical {
|
| } |
} |
| my $answer=reply($cmd,$server); |
my $answer=reply($cmd,$server); |
| if ($answer eq 'con_lost') { |
if ($answer eq 'con_lost') { |
| &reconlonc("$perlvar{'lonSockDir'}/$server"); |
&reconlonc($server); |
| my $answer=reply($cmd,$server); |
my $answer=reply($cmd,$server); |
| if ($answer eq 'con_lost') { |
if ($answer eq 'con_lost') { |
| my $now=time; |
my $now=time; |
|
Line 309 sub critical {
|
Line 500 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); |
| } |
} |
| } |
} |
| sleep 2; |
sleep 1; |
| 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 434 sub transfer_profile_to_env {
|
Line 625 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) = @_; |
my ($r,$name,$userhashref,$domref) = @_; |
| my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); |
my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); |
| my $lonid=$cookies{'lonID'}; |
my ($lonidsdir,$linkname,$pubname,$secure,$lonid); |
| |
if ($name eq 'lonDAV') { |
| |
$lonidsdir=$r->dir_config('lonDAVsessDir'); |
| |
} else { |
| |
$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); |
return undef if (!$lonid); |
| |
|
| my $handle=&LONCAPA::clean_handle($lonid->value); |
my $handle=&LONCAPA::clean_handle($lonid->value); |
| my $lonidsdir=$r->dir_config('lonIDsDir'); |
if (-l "$lonidsdir/$handle.id") { |
| return undef if (!-e "$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; |
| |
} |
| |
|
| 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 455 sub check_for_valid_session {
|
Line 684 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; |
| } |
} |
| |
|
| |
if (ref($userhashref) eq 'HASH') { |
| |
$userhashref->{'name'} = $disk_env{'user.name'}; |
| |
$userhashref->{'domain'} = $disk_env{'user.domain'}; |
| |
if ($disk_env{'request.role'}) { |
| |
$userhashref->{'role'} = $disk_env{'request.role'}; |
| |
} |
| |
} |
| |
untie(%disk_env); |
| |
|
| return $handle; |
return $handle; |
| } |
} |
| |
|
|
Line 480 sub timed_flock {
|
Line 720 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 490 sub appenv {
|
Line 761 sub appenv {
|
| if (($key =~ /^user\.role/) || ($key =~ /^user\.priv/)) { |
if (($key =~ /^user\.role/) || ($key =~ /^user\.priv/)) { |
| $refused = 1; |
$refused = 1; |
| if (ref($roles) eq 'ARRAY') { |
if (ref($roles) eq 'ARRAY') { |
| my ($type,$role) = ($key =~ /^user\.(role|priv)\.([^.]+)\./); |
my ($type,$role) = ($key =~ m{^user\.(role|priv)\.(.+?)\./}); |
| if (grep(/^\Q$role\E$/,@{$roles})) { |
if (grep(/^\Q$role\E$/,@{$roles})) { |
| $refused = 0; |
$refused = 0; |
| } |
} |
|
Line 505 sub appenv {
|
Line 776 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 522 sub appenv {
|
Line 796 sub appenv {
|
| # ----------------------------------------------------- Delete from Environment |
# ----------------------------------------------------- Delete from Environment |
| |
|
| sub delenv { |
sub delenv { |
| my $delthis=shift; |
my ($delthis,$regexp,$roles) = @_; |
| if (($delthis=~/user\.role/) || ($delthis=~/user\.priv/)) { |
if (($delthis=~/^user\.role/) || ($delthis=~/^user\.priv/)) { |
| &logthis("<font color=\"blue\">WARNING: ". |
my $refused = 1; |
| "Attempt to delete from environment ".$delthis); |
if (ref($roles) eq 'ARRAY') { |
| return 'error'; |
my ($type,$role) = ($delthis =~ /^user\.(role|priv)\.([^.]+)\./); |
| |
if (grep(/^\Q$role\E$/,@{$roles})) { |
| |
$refused = 0; |
| |
} |
| |
} |
| |
if ($refused) { |
| |
&logthis("<font color=\"blue\">WARNING: ". |
| |
"Attempt to delete from environment ".$delthis); |
| |
return 'error'; |
| |
} |
| } |
} |
| my $opened = open(my $env_file,'+<',$env{'user.environment'}); |
my $opened = open(my $env_file,'+<',$env{'user.environment'}); |
| if ($opened |
if ($opened |
|
Line 535 sub delenv {
|
Line 818 sub delenv {
|
| tie(my %disk_env,'GDBM_File',$env{'user.environment'}, |
tie(my %disk_env,'GDBM_File',$env{'user.environment'}, |
| (&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) { |
(&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) { |
| foreach my $key (keys(%disk_env)) { |
foreach my $key (keys(%disk_env)) { |
| if ($key=~/^\Q$delthis\E/) { |
if ($regexp) { |
| delete($env{$key}); |
if ($key=~/^$delthis/) { |
| delete($disk_env{$key}); |
delete($env{$key}); |
| } |
delete($disk_env{$key}); |
| |
} |
| |
} else { |
| |
if ($key=~/^\Q$delthis\E/) { |
| |
delete($env{$key}); |
| |
delete($disk_env{$key}); |
| |
} |
| |
} |
| } |
} |
| untie(%disk_env); |
untie(%disk_env); |
| } |
} |
|
Line 614 sub userload {
|
Line 904 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 628 sub userload {
|
Line 919 sub userload {
|
| return $userloadpercent; |
return $userloadpercent; |
| } |
} |
| |
|
| # ------------------------------------------ Fight off request when overloaded |
|
| |
|
| sub overloaderror { |
|
| my ($r,$checkserver)=@_; |
|
| unless ($checkserver) { $checkserver=$perlvar{'lonHostID'}; } |
|
| my $loadavg; |
|
| if ($checkserver eq $perlvar{'lonHostID'}) { |
|
| open(my $loadfile,'/proc/loadavg'); |
|
| $loadavg=<$loadfile>; |
|
| $loadavg =~ s/\s.*//g; |
|
| $loadavg = 100*$loadavg/$perlvar{'lonLoadLim'}; |
|
| close($loadfile); |
|
| } else { |
|
| $loadavg=&reply('load',$checkserver); |
|
| } |
|
| my $overload=$loadavg-100; |
|
| if ($overload>0) { |
|
| $r->err_headers_out->{'Retry-After'}=$overload; |
|
| $r->log_error('Overload of '.$overload.' on '.$checkserver); |
|
| return 413; |
|
| } |
|
| return ''; |
|
| } |
|
| |
|
| # ------------------------------ Find server with least workload from spare.tab |
# ------------------------------ Find server with least workload from spare.tab |
| |
|
| sub spareserver { |
sub spareserver { |
| my ($loadpercent,$userloadpercent,$want_server_name) = @_; |
my ($r,$loadpercent,$userloadpercent,$want_server_name,$udom) = @_; |
| my $spare_server; |
my $spare_server; |
| if ($userloadpercent !~ /\d/) { $userloadpercent=0; } |
if ($userloadpercent !~ /\d/) { $userloadpercent=0; } |
| my $lowest_load=($loadpercent > $userloadpercent) ? $loadpercent |
my $lowest_load=($loadpercent > $userloadpercent) ? $loadpercent |
| : $userloadpercent; |
: $userloadpercent; |
| |
my ($uint_dom,$remotesessions); |
| foreach my $try_server (@{ $spareid{'primary'} }) { |
if (($udom ne '') && (&domain($udom) ne '')) { |
| ($spare_server, $lowest_load) = |
my $uprimary_id = &Apache::lonnet::domain($udom,'primary'); |
| &compare_server_load($try_server, $spare_server, $lowest_load); |
$uint_dom = &Apache::lonnet::internet_dom($uprimary_id); |
| } |
my %udomdefaults = &Apache::lonnet::get_domain_defaults($udom); |
| |
$remotesessions = $udomdefaults{'remotesessions'}; |
| my $found_server = ($spare_server ne '' && $lowest_load < 100); |
} |
| |
my $spareshash = &this_host_spares($udom); |
| |
if (ref($spareshash) eq 'HASH') { |
| |
if (ref($spareshash->{'primary'}) eq 'ARRAY') { |
| |
foreach my $try_server (@{ $spareshash->{'primary'} }) { |
| |
next unless (&spare_can_host($udom,$uint_dom,$remotesessions, |
| |
$try_server)); |
| |
($spare_server, $lowest_load) = |
| |
&compare_server_load($try_server, $spare_server, $lowest_load); |
| |
} |
| |
} |
| |
|
| if (!$found_server) { |
my $found_server = ($spare_server ne '' && $lowest_load < 100); |
| foreach my $try_server (@{ $spareid{'default'} }) { |
|
| ($spare_server, $lowest_load) = |
if (!$found_server) { |
| &compare_server_load($try_server, $spare_server, $lowest_load); |
if (ref($spareshash->{'default'}) eq 'ARRAY') { |
| } |
foreach my $try_server (@{ $spareshash->{'default'} }) { |
| |
next unless (&spare_can_host($udom,$uint_dom, |
| |
$remotesessions,$try_server)); |
| |
($spare_server, $lowest_load) = |
| |
&compare_server_load($try_server, $spare_server, $lowest_load); |
| |
} |
| |
} |
| |
} |
| } |
} |
| |
|
| if (!$want_server_name) { |
if (!$want_server_name) { |
| my $protocol = 'http'; |
if (defined($spare_server)) { |
| if ($protocol{$spare_server} eq 'https') { |
my $hostname = &hostname($spare_server); |
| $protocol = $protocol{$spare_server}; |
if (defined($hostname)) { |
| |
my $protocol = 'http'; |
| |
if ($protocol{$spare_server} eq 'https') { |
| |
$protocol = $protocol{$spare_server}; |
| |
} |
| |
my $alias = &Apache::lonnet::use_proxy_alias($r,$spare_server); |
| |
$hostname = $alias if ($alias ne ''); |
| |
$spare_server = $protocol.'://'.$hostname; |
| |
} |
| } |
} |
| $spare_server = $protocol.'://'.&hostname($spare_server); |
|
| } |
} |
| return $spare_server; |
return $spare_server; |
| } |
} |
| |
|
| sub compare_server_load { |
sub compare_server_load { |
| my ($try_server, $spare_server, $lowest_load) = @_; |
my ($try_server, $spare_server, $lowest_load, $required) = @_; |
| |
|
| |
if ($required) { |
| |
my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/); |
| |
my $remoterev = &get_server_loncaparev(undef,$try_server); |
| |
my ($major,$minor) = ($remoterev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/); |
| |
if (($major eq '' && $minor eq '') || |
| |
(($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) { |
| |
return ($spare_server,$lowest_load); |
| |
} |
| |
} |
| |
|
| my $loadans = &reply('load', $try_server); |
my $loadans = &reply('load', $try_server); |
| my $userloadans = &reply('userload',$try_server); |
my $userloadans = &reply('userload',$try_server); |
| |
|
| if ($loadans !~ /\d/ && $userloadans !~ /\d/) { |
if ($loadans !~ /\d/ && $userloadans !~ /\d/) { |
| next; #didn't get a number from the server |
return ($spare_server, $lowest_load); #didn't get a number from the server |
| } |
} |
| |
|
| my $load; |
my $load; |
|
Line 718 sub compare_server_load {
|
Line 1019 sub compare_server_load {
|
| # --------------------------- ask offload servers if user already has a session |
# --------------------------- ask offload servers if user already has a session |
| sub find_existing_session { |
sub find_existing_session { |
| my ($udom,$uname) = @_; |
my ($udom,$uname) = @_; |
| foreach my $try_server (@{ $spareid{'primary'} }, |
my $spareshash = &this_host_spares($udom); |
| @{ $spareid{'default'} }) { |
if (ref($spareshash) eq 'HASH') { |
| return $try_server if (&has_user_session($try_server, $udom, $uname)); |
if (ref($spareshash->{'primary'}) eq 'ARRAY') { |
| |
foreach my $try_server (@{ $spareshash->{'primary'} }) { |
| |
return $try_server if (&has_user_session($try_server, $udom, $uname)); |
| |
} |
| |
} |
| |
if (ref($spareshash->{'default'}) eq 'ARRAY') { |
| |
foreach my $try_server (@{ $spareshash->{'default'} }) { |
| |
return $try_server if (&has_user_session($try_server, $udom, $uname)); |
| |
} |
| |
} |
| } |
} |
| 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 updatebalcookie { |
| |
my ($cookie,$balancer,$lastentry)=@_; |
| |
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('updatebalcookie:'.&escape($cookie).':'.&escape($lastentry),$balancer); |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
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:'.&escape($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 735 sub has_user_session {
|
Line 1129 sub has_user_session {
|
| return 0; |
return 0; |
| } |
} |
| |
|
| |
# --------- determine least loaded server in a user's domain which allows login |
| |
|
| |
sub choose_server { |
| |
my ($udom,$checkloginvia,$required,$skiploadbal) = @_; |
| |
my %domconfhash = &Apache::loncommon::get_domainconf($udom); |
| |
my %servers = &get_servers($udom); |
| |
my $lowest_load = 30000; |
| |
my ($login_host,$hostname,$portal_path,$isredirect,$balancers); |
| |
if ($skiploadbal) { |
| |
($balancers,my $cached)=&is_cached_new('loadbalancing',$udom); |
| |
unless (defined($cached)) { |
| |
my $cachetime = 60*60*24; |
| |
my %domconfig = |
| |
&Apache::lonnet::get_dom('configuration',['loadbalancing'],$udom); |
| |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
| |
$balancers = &do_cache_new('loadbalancing',$udom,$domconfig{'loadbalancing'}, |
| |
$cachetime); |
| |
} |
| |
} |
| |
} |
| |
foreach my $lonhost (keys(%servers)) { |
| |
my $loginvia; |
| |
if ($skiploadbal) { |
| |
if (ref($balancers) eq 'HASH') { |
| |
next if (exists($balancers->{$lonhost})); |
| |
} |
| |
} |
| |
if ($checkloginvia) { |
| |
$loginvia = $domconfhash{$udom.'.login.loginvia_'.$lonhost}; |
| |
if ($loginvia) { |
| |
my ($server,$path) = split(/:/,$loginvia); |
| |
($login_host, $lowest_load) = |
| |
&compare_server_load($server, $login_host, $lowest_load, $required); |
| |
if ($login_host eq $server) { |
| |
$portal_path = $path; |
| |
$isredirect = 1; |
| |
} |
| |
} else { |
| |
($login_host, $lowest_load) = |
| |
&compare_server_load($lonhost, $login_host, $lowest_load, $required); |
| |
if ($login_host eq $lonhost) { |
| |
$portal_path = ''; |
| |
$isredirect = ''; |
| |
} |
| |
} |
| |
} else { |
| |
($login_host, $lowest_load) = |
| |
&compare_server_load($lonhost, $login_host, $lowest_load, $required); |
| |
} |
| |
} |
| |
if ($login_host ne '') { |
| |
$hostname = &hostname($login_host); |
| |
} |
| |
return ($login_host,$hostname,$portal_path,$isredirect,$lowest_load); |
| |
} |
| |
|
| |
sub get_course_sessions { |
| |
my ($cnum,$cdom,$lastactivity) = @_; |
| |
my %servers = &internet_dom_servers($cdom); |
| |
my %returnhash; |
| |
foreach my $server (sort(keys(%servers))) { |
| |
my $rep = &reply("coursesessions:$cdom:$cnum:$lastactivity",$server); |
| |
my @pairs=split(/\&/,$rep); |
| |
unless (($rep eq 'unknown_cmd') || ($rep =~ /^error/)) { |
| |
foreach my $item (@pairs) { |
| |
my ($key,$value)=split(/=/,$item,2); |
| |
$key = &unescape($key); |
| |
next if ($key =~ /^error: 2 /); |
| |
if (exists($returnhash{$key})) { |
| |
next if ($value < $returnhash{$key}); |
| |
} |
| |
$returnhash{$key}=$value; |
| |
} |
| |
} |
| |
} |
| |
return %returnhash; |
| |
} |
| |
|
| # --------------------------------------------- Try to change a user's password |
# --------------------------------------------- Try to change a user's password |
| |
|
| sub changepass { |
sub changepass { |
| my ($uname,$udom,$currentpass,$newpass,$server,$context)=@_; |
my ($uname,$udom,$currentpass,$newpass,$server,$context)=@_; |
| $currentpass = &escape($currentpass); |
$currentpass = &escape($currentpass); |
| $newpass = &escape($newpass); |
$newpass = &escape($newpass); |
| my $answer = reply("encrypt:passwd:$udom:$uname:$currentpass:$newpass:$context", |
my $lonhost = $perlvar{'lonHostID'}; |
| |
my $answer = reply("encrypt:passwd:$udom:$uname:$currentpass:$newpass:$context:$lonhost", |
| $server); |
$server); |
| if (! $answer) { |
if (! $answer) { |
| &logthis("No reply on password change request to $server ". |
&logthis("No reply on password change request to $server ". |
|
Line 766 sub changepass {
|
Line 1239 sub changepass {
|
| } elsif ($answer =~ "^refused") { |
} elsif ($answer =~ "^refused") { |
| &logthis("$server refused to change $uname in $udom password because ". |
&logthis("$server refused to change $uname in $udom password because ". |
| "it was sent an unencrypted request to change the password."); |
"it was sent an unencrypted request to change the password."); |
| |
} elsif ($answer =~ "invalid_client") { |
| |
&logthis("$server refused to change $uname in $udom password because ". |
| |
"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 789 sub queryauthenticate {
|
Line 1268 sub queryauthenticate {
|
| # --------- Try to authenticate user from domain's lib servers (first this one) |
# --------- Try to authenticate user from domain's lib servers (first this one) |
| |
|
| sub authenticate { |
sub authenticate { |
| my ($uname,$upass,$udom,$checkdefauth)=@_; |
my ($uname,$upass,$udom,$checkdefauth,$clientcancheckhost)=@_; |
| $upass=&escape($upass); |
$upass=&escape($upass); |
| $uname= &LONCAPA::clean_username($uname); |
$uname= &LONCAPA::clean_username($uname); |
| my $uhome=&homeserver($uname,$udom,1); |
my $uhome=&homeserver($uname,$udom,1); |
|
Line 812 sub authenticate {
|
Line 1291 sub authenticate {
|
| return 'no_host'; |
return 'no_host'; |
| } |
} |
| } |
} |
| my $answer=reply("encrypt:auth:$udom:$uname:$upass:$checkdefauth",$uhome); |
my $answer=reply("encrypt:auth:$udom:$uname:$upass:$checkdefauth:$clientcancheckhost",$uhome); |
| if ($answer eq 'authorized') { |
if ($answer eq 'authorized') { |
| if ($newhome) { |
if ($newhome) { |
| &logthis("User $uname at $udom authorized by $uhome, but needs account"); |
&logthis("User $uname at $udom authorized by $uhome, but needs account"); |
|
Line 830 sub authenticate {
|
Line 1309 sub authenticate {
|
| return 'no_host'; |
return 'no_host'; |
| } |
} |
| |
|
| |
sub can_host_session { |
| |
my ($udom,$lonhost,$remoterev,$remotesessions,$hostedsessions) = @_; |
| |
my $canhost = 1; |
| |
my $host_idn = &Apache::lonnet::internet_dom($lonhost); |
| |
if (ref($remotesessions) eq 'HASH') { |
| |
if (ref($remotesessions->{'excludedomain'}) eq 'ARRAY') { |
| |
if (grep(/^\Q$host_idn\E$/,@{$remotesessions->{'excludedomain'}})) { |
| |
$canhost = 0; |
| |
} else { |
| |
$canhost = 1; |
| |
} |
| |
} |
| |
if (ref($remotesessions->{'includedomain'}) eq 'ARRAY') { |
| |
if (grep(/^\Q$host_idn\E$/,@{$remotesessions->{'includedomain'}})) { |
| |
$canhost = 1; |
| |
} else { |
| |
$canhost = 0; |
| |
} |
| |
} |
| |
if ($canhost) { |
| |
if ($remotesessions->{'version'} ne '') { |
| |
my ($reqmajor,$reqminor) = ($remotesessions->{'version'} =~ /^(\d+)\.(\d+)$/); |
| |
if ($reqmajor ne '' && $reqminor ne '') { |
| |
if ($remoterev =~ /^\'?(\d+)\.(\d+)/) { |
| |
my $major = $1; |
| |
my $minor = $2; |
| |
if (($major < $reqmajor ) || |
| |
(($major == $reqmajor) && ($minor < $reqminor))) { |
| |
$canhost = 0; |
| |
} |
| |
} else { |
| |
$canhost = 0; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($canhost) { |
| |
if (ref($hostedsessions) eq 'HASH') { |
| |
my $uprimary_id = &Apache::lonnet::domain($udom,'primary'); |
| |
my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id); |
| |
if (ref($hostedsessions->{'excludedomain'}) eq 'ARRAY') { |
| |
if (($uint_dom ne '') && |
| |
(grep(/^\Q$uint_dom\E$/,@{$hostedsessions->{'excludedomain'}}))) { |
| |
$canhost = 0; |
| |
} else { |
| |
$canhost = 1; |
| |
} |
| |
} |
| |
if (ref($hostedsessions->{'includedomain'}) eq 'ARRAY') { |
| |
if (($uint_dom ne '') && |
| |
(grep(/^\Q$uint_dom\E$/,@{$hostedsessions->{'includedomain'}}))) { |
| |
$canhost = 1; |
| |
} else { |
| |
$canhost = 0; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return $canhost; |
| |
} |
| |
|
| |
sub spare_can_host { |
| |
my ($udom,$uint_dom,$remotesessions,$try_server)=@_; |
| |
my $canhost=1; |
| |
my $try_server_hostname = &hostname($try_server); |
| |
my $serverhomeID = &get_server_homeID($try_server_hostname); |
| |
my $serverhomedom = &host_domain($serverhomeID); |
| |
my %defdomdefaults = &get_domain_defaults($serverhomedom); |
| |
if (ref($defdomdefaults{'offloadnow'}) eq 'HASH') { |
| |
if ($defdomdefaults{'offloadnow'}{$try_server}) { |
| |
$canhost = 0; |
| |
} |
| |
} |
| |
if ($canhost) { |
| |
if (ref($defdomdefaults{'offloadoth'}) eq 'HASH') { |
| |
if ($defdomdefaults{'offloadoth'}{$try_server}) { |
| |
unless (&shared_institution($udom,$try_server)) { |
| |
$canhost = 0; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if (($canhost) && ($uint_dom)) { |
| |
my @intdoms; |
| |
my $internet_names = &get_internet_names($try_server); |
| |
if (ref($internet_names) eq 'ARRAY') { |
| |
@intdoms = @{$internet_names}; |
| |
} |
| |
unless (grep(/^\Q$uint_dom\E$/,@intdoms)) { |
| |
my $remoterev = &get_server_loncaparev(undef,$try_server); |
| |
$canhost = &can_host_session($udom,$try_server,$remoterev, |
| |
$remotesessions, |
| |
$defdomdefaults{'hostedsessions'}); |
| |
} |
| |
} |
| |
return $canhost; |
| |
} |
| |
|
| |
sub this_host_spares { |
| |
my ($dom) = @_; |
| |
my ($dom_in_use,$lonhost_in_use,$result); |
| |
my @hosts = ¤t_machine_ids(); |
| |
foreach my $lonhost (@hosts) { |
| |
if (&host_domain($lonhost) eq $dom) { |
| |
$dom_in_use = $dom; |
| |
$lonhost_in_use = $lonhost; |
| |
last; |
| |
} |
| |
} |
| |
if ($dom_in_use ne '') { |
| |
$result = &spares_for_offload($dom_in_use,$lonhost_in_use); |
| |
} |
| |
if (ref($result) ne 'HASH') { |
| |
$lonhost_in_use = $perlvar{'lonHostID'}; |
| |
$dom_in_use = &host_domain($lonhost_in_use); |
| |
$result = &spares_for_offload($dom_in_use,$lonhost_in_use); |
| |
if (ref($result) ne 'HASH') { |
| |
$result = \%spareid; |
| |
} |
| |
} |
| |
return $result; |
| |
} |
| |
|
| |
sub spares_for_offload { |
| |
my ($dom_in_use,$lonhost_in_use) = @_; |
| |
my ($result,$cached)=&is_cached_new('spares',$dom_in_use); |
| |
if (defined($cached)) { |
| |
return $result; |
| |
} else { |
| |
my $cachetime = 60*60*24; |
| |
my %domconfig = |
| |
&Apache::lonnet::get_dom('configuration',['usersessions'],$dom_in_use); |
| |
if (ref($domconfig{'usersessions'}) eq 'HASH') { |
| |
if (ref($domconfig{'usersessions'}{'spares'}) eq 'HASH') { |
| |
if (ref($domconfig{'usersessions'}{'spares'}{$lonhost_in_use}) eq 'HASH') { |
| |
return &do_cache_new('spares',$dom_in_use,$domconfig{'usersessions'}{'spares'}{$lonhost_in_use},$cachetime); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub get_lonbalancer_config { |
| |
my ($servers) = @_; |
| |
my ($currbalancer,$currtargets); |
| |
if (ref($servers) eq 'HASH') { |
| |
foreach my $server (keys(%{$servers})) { |
| |
my %what = ( |
| |
spareid => 1, |
| |
perlvar => 1, |
| |
); |
| |
my ($result,$returnhash) = &get_remote_globals($server,\%what); |
| |
if ($result eq 'ok') { |
| |
if (ref($returnhash) eq 'HASH') { |
| |
if (ref($returnhash->{'perlvar'}) eq 'HASH') { |
| |
if ($returnhash->{'perlvar'}->{'lonBalancer'} eq 'yes') { |
| |
$currbalancer = $server; |
| |
$currtargets = {}; |
| |
if (ref($returnhash->{'spareid'}) eq 'HASH') { |
| |
if (ref($returnhash->{'spareid'}->{'primary'}) eq 'ARRAY') { |
| |
$currtargets->{'primary'} = $returnhash->{'spareid'}->{'primary'}; |
| |
} |
| |
if (ref($returnhash->{'spareid'}->{'default'}) eq 'ARRAY') { |
| |
$currtargets->{'default'} = $returnhash->{'spareid'}->{'default'}; |
| |
} |
| |
} |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return ($currbalancer,$currtargets); |
| |
} |
| |
|
| |
sub check_loadbalancing { |
| |
my ($uname,$udom,$caller) = @_; |
| |
my ($is_balancer,$currtargets,$currrules,$dom_in_use,$homeintdom, |
| |
$rule_in_effect,$offloadto,$otherserver,$setcookie); |
| |
my $lonhost = $perlvar{'lonHostID'}; |
| |
my @hosts = ¤t_machine_ids(); |
| |
my $uprimary_id = &Apache::lonnet::domain($udom,'primary'); |
| |
my $uintdom = &Apache::lonnet::internet_dom($uprimary_id); |
| |
my $intdom = &Apache::lonnet::internet_dom($lonhost); |
| |
my $serverhomedom = &host_domain($lonhost); |
| |
my $domneedscache; |
| |
my $cachetime = 60*60*24; |
| |
|
| |
if (($uintdom ne '') && ($uintdom eq $intdom)) { |
| |
$dom_in_use = $udom; |
| |
$homeintdom = 1; |
| |
} else { |
| |
$dom_in_use = $serverhomedom; |
| |
} |
| |
my ($result,$cached)=&is_cached_new('loadbalancing',$dom_in_use); |
| |
unless (defined($cached)) { |
| |
my %domconfig = |
| |
&Apache::lonnet::get_dom('configuration',['loadbalancing'],$dom_in_use); |
| |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
| |
$result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'loadbalancing'},$cachetime); |
| |
} else { |
| |
$domneedscache = $dom_in_use; |
| |
} |
| |
} |
| |
if (ref($result) eq 'HASH') { |
| |
($is_balancer,$currtargets,$currrules,$setcookie) = |
| |
&check_balancer_result($result,@hosts); |
| |
if ($is_balancer) { |
| |
if (ref($currrules) eq 'HASH') { |
| |
if ($homeintdom) { |
| |
if ($uname ne '') { |
| |
if (($currrules->{'_LC_adv'} ne '') || ($currrules->{'_LC_author'} ne '')) { |
| |
my ($is_adv,$is_author) = &is_advanced_user($udom,$uname); |
| |
if (($currrules->{'_LC_author'} ne '') && ($is_author)) { |
| |
$rule_in_effect = $currrules->{'_LC_author'}; |
| |
} elsif (($currrules->{'_LC_adv'} ne '') && ($is_adv)) { |
| |
$rule_in_effect = $currrules->{'_LC_adv'} |
| |
} |
| |
} |
| |
if ($rule_in_effect eq '') { |
| |
my %userenv = &userenvironment($udom,$uname,'inststatus'); |
| |
if ($userenv{'inststatus'} ne '') { |
| |
my @statuses = map { &unescape($_); } split(/:/,$userenv{'inststatus'}); |
| |
my ($othertitle,$usertypes,$types) = |
| |
&Apache::loncommon::sorted_inst_types($udom); |
| |
if (ref($types) eq 'ARRAY') { |
| |
foreach my $type (@{$types}) { |
| |
if (grep(/^\Q$type\E$/,@statuses)) { |
| |
if (exists($currrules->{$type})) { |
| |
$rule_in_effect = $currrules->{$type}; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
if (exists($currrules->{'default'})) { |
| |
$rule_in_effect = $currrules->{'default'}; |
| |
} |
| |
} |
| |
} |
| |
} else { |
| |
if (exists($currrules->{'default'})) { |
| |
$rule_in_effect = $currrules->{'default'}; |
| |
} |
| |
} |
| |
} else { |
| |
if ($currrules->{'_LC_external'} ne '') { |
| |
$rule_in_effect = $currrules->{'_LC_external'}; |
| |
} |
| |
} |
| |
$offloadto = &get_loadbalancer_targets($rule_in_effect,$currtargets, |
| |
$uname,$udom); |
| |
} |
| |
} |
| |
} elsif (($homeintdom) && ($udom ne $serverhomedom)) { |
| |
($result,$cached)=&is_cached_new('loadbalancing',$serverhomedom); |
| |
unless (defined($cached)) { |
| |
my %domconfig = |
| |
&Apache::lonnet::get_dom('configuration',['loadbalancing'],$serverhomedom); |
| |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
| |
$result = &do_cache_new('loadbalancing',$serverhomedom,$domconfig{'loadbalancing'},$cachetime); |
| |
} else { |
| |
$domneedscache = $serverhomedom; |
| |
} |
| |
} |
| |
if (ref($result) eq 'HASH') { |
| |
($is_balancer,$currtargets,$currrules,$setcookie) = |
| |
&check_balancer_result($result,@hosts); |
| |
if ($is_balancer) { |
| |
if (ref($currrules) eq 'HASH') { |
| |
if ($currrules->{'_LC_internetdom'} ne '') { |
| |
$rule_in_effect = $currrules->{'_LC_internetdom'}; |
| |
} |
| |
} |
| |
$offloadto = &get_loadbalancer_targets($rule_in_effect,$currtargets, |
| |
$uname,$udom); |
| |
} |
| |
} else { |
| |
if ($perlvar{'lonBalancer'} eq 'yes') { |
| |
$is_balancer = 1; |
| |
$offloadto = &this_host_spares($dom_in_use); |
| |
} |
| |
unless (defined($cached)) { |
| |
$domneedscache = $serverhomedom; |
| |
} |
| |
} |
| |
} else { |
| |
if ($perlvar{'lonBalancer'} eq 'yes') { |
| |
$is_balancer = 1; |
| |
$offloadto = &this_host_spares($dom_in_use); |
| |
} |
| |
unless (defined($cached)) { |
| |
$domneedscache = $serverhomedom; |
| |
} |
| |
} |
| |
if ($domneedscache) { |
| |
&do_cache_new('loadbalancing',$domneedscache,$is_balancer,$cachetime); |
| |
} |
| |
if (($is_balancer) && ($caller ne 'switchserver')) { |
| |
my $lowest_load = 30000; |
| |
if (ref($offloadto) eq 'HASH') { |
| |
if (ref($offloadto->{'primary'}) eq 'ARRAY') { |
| |
foreach my $try_server (@{$offloadto->{'primary'}}) { |
| |
($otherserver,$lowest_load) = |
| |
&compare_server_load($try_server,$otherserver,$lowest_load); |
| |
} |
| |
} |
| |
my $found_server = ($otherserver ne '' && $lowest_load < 100); |
| |
|
| |
if (!$found_server) { |
| |
if (ref($offloadto->{'default'}) eq 'ARRAY') { |
| |
foreach my $try_server (@{$offloadto->{'default'}}) { |
| |
($otherserver,$lowest_load) = |
| |
&compare_server_load($try_server,$otherserver,$lowest_load); |
| |
} |
| |
} |
| |
} |
| |
} elsif (ref($offloadto) eq 'ARRAY') { |
| |
if (@{$offloadto} == 1) { |
| |
$otherserver = $offloadto->[0]; |
| |
} elsif (@{$offloadto} > 1) { |
| |
foreach my $try_server (@{$offloadto}) { |
| |
($otherserver,$lowest_load) = |
| |
&compare_server_load($try_server,$otherserver,$lowest_load); |
| |
} |
| |
} |
| |
} |
| |
unless ($caller eq 'login') { |
| |
if (($otherserver ne '') && (grep(/^\Q$otherserver\E$/,@hosts))) { |
| |
$is_balancer = 0; |
| |
if ($uname ne '' && $udom ne '') { |
| |
if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) { |
| |
&appenv({'user.loadbalexempt' => $lonhost, |
| |
'user.loadbalcheck.time' => time}); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if (($is_balancer) && (!$homeintdom)) { |
| |
undef($setcookie); |
| |
} |
| |
return ($is_balancer,$otherserver,$setcookie); |
| |
} |
| |
|
| |
sub check_balancer_result { |
| |
my ($result,@hosts) = @_; |
| |
my ($is_balancer,$currtargets,$currrules,$setcookie); |
| |
if (ref($result) eq 'HASH') { |
| |
if ($result->{'lonhost'} ne '') { |
| |
my $currbalancer = $result->{'lonhost'}; |
| |
if (grep(/^\Q$currbalancer\E$/,@hosts)) { |
| |
$is_balancer = 1; |
| |
$currtargets = $result->{'targets'}; |
| |
$currrules = $result->{'rules'}; |
| |
} |
| |
} else { |
| |
foreach my $key (keys(%{$result})) { |
| |
if (($key ne '') && (grep(/^\Q$key\E$/,@hosts)) && |
| |
(ref($result->{$key}) eq 'HASH')) { |
| |
$is_balancer = 1; |
| |
$currrules = $result->{$key}{'rules'}; |
| |
$currtargets = $result->{$key}{'targets'}; |
| |
$setcookie = $result->{$key}{'cookie'}; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return ($is_balancer,$currtargets,$currrules,$setcookie); |
| |
} |
| |
|
| |
sub get_loadbalancer_targets { |
| |
my ($rule_in_effect,$currtargets,$uname,$udom) = @_; |
| |
my $offloadto; |
| |
if ($rule_in_effect eq 'none') { |
| |
return [$perlvar{'lonHostID'}]; |
| |
} elsif ($rule_in_effect eq '') { |
| |
$offloadto = $currtargets; |
| |
} else { |
| |
if ($rule_in_effect eq 'homeserver') { |
| |
my $homeserver = &homeserver($uname,$udom); |
| |
if ($homeserver ne 'no_host') { |
| |
$offloadto = [$homeserver]; |
| |
} |
| |
} elsif ($rule_in_effect eq 'externalbalancer') { |
| |
my %domconfig = |
| |
&Apache::lonnet::get_dom('configuration',['loadbalancing'],$udom); |
| |
if (ref($domconfig{'loadbalancing'}) eq 'HASH') { |
| |
if ($domconfig{'loadbalancing'}{'lonhost'} ne '') { |
| |
if (&hostname($domconfig{'loadbalancing'}{'lonhost'}) ne '') { |
| |
$offloadto = [$domconfig{'loadbalancing'}{'lonhost'}]; |
| |
} |
| |
} |
| |
} else { |
| |
my %servers = &internet_dom_servers($udom); |
| |
my ($remotebalancer,$remotetargets) = &get_lonbalancer_config(\%servers); |
| |
if (&hostname($remotebalancer) ne '') { |
| |
$offloadto = [$remotebalancer]; |
| |
} |
| |
} |
| |
} elsif (&hostname($rule_in_effect) ne '') { |
| |
$offloadto = [$rule_in_effect]; |
| |
} |
| |
} |
| |
return $offloadto; |
| |
} |
| |
|
| |
sub internet_dom_servers { |
| |
my ($dom) = @_; |
| |
my (%uniqservers,%servers); |
| |
my $primaryserver = &hostname(&domain($dom,'primary')); |
| |
my @machinedoms = &machine_domains($primaryserver); |
| |
foreach my $mdom (@machinedoms) { |
| |
my %currservers = %servers; |
| |
my %server = &get_servers($mdom); |
| |
%servers = (%currservers,%server); |
| |
} |
| |
my %by_hostname; |
| |
foreach my $id (keys(%servers)) { |
| |
push(@{$by_hostname{$servers{$id}}},$id); |
| |
} |
| |
foreach my $hostname (sort(keys(%by_hostname))) { |
| |
if (@{$by_hostname{$hostname}} > 1) { |
| |
my $match = 0; |
| |
foreach my $id (@{$by_hostname{$hostname}}) { |
| |
if (&host_domain($id) eq $dom) { |
| |
$uniqservers{$id} = $hostname; |
| |
$match = 1; |
| |
} |
| |
} |
| |
unless ($match) { |
| |
$uniqservers{$by_hostname{$hostname}[0]} = $hostname; |
| |
} |
| |
} else { |
| |
$uniqservers{$by_hostname{$hostname}[0]} = $hostname; |
| |
} |
| |
} |
| |
return %uniqservers; |
| |
} |
| |
|
| # ---------------------- Find the homebase for a user from domain's lib servers |
# ---------------------- Find the homebase for a user from domain's lib servers |
| |
|
| my %homecache; |
my %homecache; |
|
Line 863 sub idget {
|
Line 1786 sub idget {
|
| |
|
| my %servers = &get_servers($udom,'library'); |
my %servers = &get_servers($udom,'library'); |
| foreach my $tryserver (keys(%servers)) { |
foreach my $tryserver (keys(%servers)) { |
| my $idlist=join('&',@ids); |
my $idlist=join('&', map { &escape($_); } @ids); |
| $idlist=~tr/A-Z/a-z/; |
$idlist=~tr/A-Z/a-z/; |
| my $reply=&reply("idget:$udom:".$idlist,$tryserver); |
my $reply=&reply("idget:$udom:".$idlist,$tryserver); |
| my @answer=(); |
my @answer=(); |
|
Line 873 sub idget {
|
Line 1796 sub idget {
|
| my $i; |
my $i; |
| for ($i=0;$i<=$#ids;$i++) { |
for ($i=0;$i<=$#ids;$i++) { |
| if ($answer[$i]) { |
if ($answer[$i]) { |
| $returnhash{$ids[$i]}=$answer[$i]; |
$returnhash{$ids[$i]}=&unescape($answer[$i]); |
| } |
} |
| } |
} |
| } |
} |
|
Line 915 sub idput {
|
Line 1838 sub idput {
|
| } |
} |
| } |
} |
| |
|
| # ------------------------------------------- get items from domain db files |
# ---------------------------------------- Delete unwanted IDs from ids.db file |
| |
|
| |
sub iddel { |
| |
my ($udom,$idshashref,$uhome)=@_; |
| |
my %result=(); |
| |
unless (ref($idshashref) eq 'HASH') { |
| |
return %result; |
| |
} |
| |
my %servers=(); |
| |
while (my ($id,$uname) = each(%{$idshashref})) { |
| |
my $uhom; |
| |
if ($uhome) { |
| |
$uhom = $uhome; |
| |
} else { |
| |
$uhom=&homeserver($uname,$udom); |
| |
} |
| |
if ($uhom ne 'no_host') { |
| |
if ($servers{$uhom}) { |
| |
$servers{$uhom}.='&'.&escape($id); |
| |
} else { |
| |
$servers{$uhom}=&escape($id); |
| |
} |
| |
} |
| |
} |
| |
foreach my $server (keys(%servers)) { |
| |
$result{$server} = &critical('iddel:'.$udom.':'.$servers{$server},$uhome); |
| |
} |
| |
return %result; |
| |
} |
| |
|
| |
# ------------------------------dump from db file owned by domainconfig user |
| |
sub dump_dom { |
| |
my ($namespace, $udom, $regexp) = @_; |
| |
|
| |
$udom ||= $env{'user.domain'}; |
| |
|
| |
return () unless $udom; |
| |
|
| |
return &dump($namespace, $udom, &get_domainconfiguser($udom), $regexp); |
| |
} |
| |
|
| |
# ------------------------------------------ get items from domain db files |
| |
|
| sub get_dom { |
sub get_dom { |
| my ($namespace,$storearr,$udom,$uhome)=@_; |
my ($namespace,$storearr,$udom,$uhome)=@_; |
| |
return if ($udom eq 'public'); |
| my $items=''; |
my $items=''; |
| foreach my $item (@$storearr) { |
foreach my $item (@$storearr) { |
| $items.=&escape($item).'&'; |
$items.=&escape($item).'&'; |
|
Line 926 sub get_dom {
|
Line 1891 sub get_dom {
|
| $items=~s/\&$//; |
$items=~s/\&$//; |
| if (!$udom) { |
if (!$udom) { |
| $udom=$env{'user.domain'}; |
$udom=$env{'user.domain'}; |
| |
return if ($udom eq 'public'); |
| if (defined(&domain($udom,'primary'))) { |
if (defined(&domain($udom,'primary'))) { |
| $uhome=&domain($udom,'primary'); |
$uhome=&domain($udom,'primary'); |
| } else { |
} else { |
|
Line 939 sub get_dom {
|
Line 1905 sub get_dom {
|
| } |
} |
| } |
} |
| if ($udom && $uhome && ($uhome ne 'no_host')) { |
if ($udom && $uhome && ($uhome ne 'no_host')) { |
| my $rep=&reply("getdom:$udom:$namespace:$items",$uhome); |
my $rep; |
| |
if (grep { $_ eq $uhome } ¤t_machine_ids()) { |
| |
# domain information is hosted on this machine |
| |
$rep = &LONCAPA::Lond::get_dom("getdom:$udom:$namespace:$items"); |
| |
} else { |
| |
$rep=&reply("getdom:$udom:$namespace:$items",$uhome); |
| |
} |
| my %returnhash; |
my %returnhash; |
| if ($rep eq '' || $rep =~ /^error: 2 /) { |
if ($rep eq '' || $rep =~ /^error: 2 /) { |
| return %returnhash; |
return %returnhash; |
|
Line 989 sub put_dom {
|
Line 1961 sub put_dom {
|
| } |
} |
| } |
} |
| |
|
| |
# --------------------- newput for items in db file owned by domainconfig user |
| |
sub newput_dom { |
| |
my ($namespace,$storehash,$udom) = @_; |
| |
my $result; |
| |
if (!$udom) { |
| |
$udom=$env{'user.domain'}; |
| |
} |
| |
if ($udom) { |
| |
my $uname = &get_domainconfiguser($udom); |
| |
$result = &newput($namespace,$storehash,$udom,$uname); |
| |
} |
| |
return $result; |
| |
} |
| |
|
| |
# --------------------- delete for items in db file owned by domainconfig user |
| |
sub del_dom { |
| |
my ($namespace,$storearr,$udom)=@_; |
| |
if (ref($storearr) eq 'ARRAY') { |
| |
if (!$udom) { |
| |
$udom=$env{'user.domain'}; |
| |
} |
| |
if ($udom) { |
| |
my $uname = &get_domainconfiguser($udom); |
| |
return &del($namespace,$storearr,$udom,$uname); |
| |
} |
| |
} |
| |
} |
| |
|
| |
# ----------------------------------construct domainconfig user for a domain |
| |
sub get_domainconfiguser { |
| |
my ($udom) = @_; |
| |
return $udom.'-domainconfig'; |
| |
} |
| |
|
| sub retrieve_inst_usertypes { |
sub retrieve_inst_usertypes { |
| my ($udom) = @_; |
my ($udom) = @_; |
| my (%returnhash,@order); |
my (%returnhash,@order); |
| if (defined(&domain($udom,'primary'))) { |
my %domdefs = &Apache::lonnet::get_domain_defaults($udom); |
| my $uhome=&domain($udom,'primary'); |
if ((ref($domdefs{'inststatustypes'}) eq 'HASH') && |
| my $rep=&reply("inst_usertypes:$udom",$uhome); |
(ref($domdefs{'inststatusorder'}) eq 'ARRAY')) { |
| if ($rep =~ /^(con_lost|error|no_such_host|refused)/) { |
return ($domdefs{'inststatustypes'},$domdefs{'inststatusorder'}); |
| &logthis("get_dom failed - $rep returned from $uhome in domain: $udom"); |
|
| return (\%returnhash,\@order); |
|
| } |
|
| my ($hashitems,$orderitems) = split(/:/,$rep); |
|
| my @pairs=split(/\&/,$hashitems); |
|
| foreach my $item (@pairs) { |
|
| my ($key,$value)=split(/=/,$item,2); |
|
| $key = &unescape($key); |
|
| next if ($key =~ /^error: 2 /); |
|
| $returnhash{$key}=&thaw_unescape($value); |
|
| } |
|
| my @esc_order = split(/\&/,$orderitems); |
|
| foreach my $item (@esc_order) { |
|
| push(@order,&unescape($item)); |
|
| } |
|
| } else { |
} else { |
| &logthis("get_dom failed - no primary domain server for $udom"); |
if (defined(&domain($udom,'primary'))) { |
| |
my $uhome=&domain($udom,'primary'); |
| |
my $rep=&reply("inst_usertypes:$udom",$uhome); |
| |
if ($rep =~ /^(con_lost|error|no_such_host|refused)/) { |
| |
&logthis("retrieve_inst_usertypes failed - $rep returned from $uhome in domain: $udom"); |
| |
return (\%returnhash,\@order); |
| |
} |
| |
my ($hashitems,$orderitems) = split(/:/,$rep); |
| |
my @pairs=split(/\&/,$hashitems); |
| |
foreach my $item (@pairs) { |
| |
my ($key,$value)=split(/=/,$item,2); |
| |
$key = &unescape($key); |
| |
next if ($key =~ /^error: 2 /); |
| |
$returnhash{$key}=&thaw_unescape($value); |
| |
} |
| |
my @esc_order = split(/\&/,$orderitems); |
| |
foreach my $item (@esc_order) { |
| |
push(@order,&unescape($item)); |
| |
} |
| |
} else { |
| |
&logthis("retrieve_inst_usertypes failed - no primary domain server for $udom"); |
| |
} |
| |
return (\%returnhash,\@order); |
| } |
} |
| return (\%returnhash,\@order); |
|
| } |
} |
| |
|
| sub is_domainimage { |
sub is_domainimage { |
| my ($url) = @_; |
my ($url) = @_; |
| if ($url=~m-^/+res/+($match_domain)/+\1\-domainconfig/+(img|logo|domlogo)/+-) { |
if ($url=~m-^/+res/+($match_domain)/+\1\-domainconfig/+(img|logo|domlogo|login)/+[^/]-) { |
| if (&domain($1) ne '') { |
if (&domain($1) ne '') { |
| return '1'; |
return '1'; |
| } |
} |
|
Line 1034 sub inst_directory_query {
|
Line 2046 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 1075 sub usersearch {
|
Line 2098 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 1160 sub get_instuser {
|
Line 2192 sub get_instuser {
|
| return ($outcome,%userinfo); |
return ($outcome,%userinfo); |
| } |
} |
| |
|
| |
sub get_multiple_instusers { |
| |
my ($udom,$users,$caller) = @_; |
| |
my ($outcome,$results); |
| |
if (ref($users) eq 'HASH') { |
| |
my $count = keys(%{$users}); |
| |
my $requested = &freeze_escape($users); |
| |
my $homeserver = &domain($udom,'primary'); |
| |
if ($homeserver ne '') { |
| |
my $queryid=&reply('querysend:getmultinstusers:::'.$caller.'='.$requested,$homeserver); |
| |
my $host=&hostname($homeserver); |
| |
if ($queryid !~/^\Q$host\E\_/) { |
| |
&logthis('get_multiple_instusers invalid queryid: '.$queryid. |
| |
' for host: '.$homeserver.'in domain '.$udom); |
| |
return ($outcome,$results); |
| |
} |
| |
my $response = &get_query_reply($queryid); |
| |
my $maxtries = 5; |
| |
if ($count > 100) { |
| |
$maxtries = 1+int($count/20); |
| |
} |
| |
my $tries = 1; |
| |
while (($response=~/^timeout/) && ($tries <= $maxtries)) { |
| |
$response = &get_query_reply($queryid); |
| |
$tries ++; |
| |
} |
| |
if ($response eq '') { |
| |
$results = {}; |
| |
foreach my $key (keys(%{$users})) { |
| |
my ($uname,$id); |
| |
if ($caller eq 'id') { |
| |
$id = $key; |
| |
} else { |
| |
$uname = $key; |
| |
} |
| |
my ($resp,%info) = &get_instuser($udom,$uname,$id); |
| |
$outcome = $resp; |
| |
if ($resp eq 'ok') { |
| |
%{$results} = (%{$results}, %info); |
| |
} else { |
| |
last; |
| |
} |
| |
} |
| |
} elsif(!&error($response) && ($response ne 'refused')) { |
| |
if (($response eq 'unavailable') || ($response eq 'invalid') || ($response eq 'timeout')) { |
| |
$outcome = $response; |
| |
} else { |
| |
($outcome,my $userdata) = split(/=/,$response,2); |
| |
if ($outcome eq 'ok') { |
| |
$results = &thaw_unescape($userdata); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return ($outcome,$results); |
| |
} |
| |
|
| sub inst_rulecheck { |
sub inst_rulecheck { |
| my ($udom,$uname,$id,$item,$rules) = @_; |
my ($udom,$uname,$id,$item,$rules) = @_; |
| my %returnhash; |
my %returnhash; |
|
Line 1239 sub inst_userrules {
|
Line 2328 sub inst_userrules {
|
| # ------------- Get Authentication, Language and User Tools Defaults for Domain |
# ------------- Get Authentication, Language and User Tools Defaults for Domain |
| |
|
| sub get_domain_defaults { |
sub get_domain_defaults { |
| my ($domain) = @_; |
my ($domain,$ignore_cache) = @_; |
| |
return if (($domain eq '') || ($domain eq 'public')); |
| my $cachetime = 60*60*24; |
my $cachetime = 60*60*24; |
| my ($result,$cached)=&is_cached_new('domdefaults',$domain); |
unless ($ignore_cache) { |
| if (defined($cached)) { |
my ($result,$cached)=&is_cached_new('domdefaults',$domain); |
| if (ref($result) eq 'HASH') { |
if (defined($cached)) { |
| return %{$result}; |
if (ref($result) eq 'HASH') { |
| |
return %{$result}; |
| |
} |
| } |
} |
| } |
} |
| my %domdefaults; |
my %domdefaults; |
| my %domconfig = |
my %domconfig = |
| &Apache::lonnet::get_dom('configuration',['defaults','quotas'],$domain); |
&Apache::lonnet::get_dom('configuration',['defaults','quotas', |
| |
'requestcourses','inststatus', |
| |
'coursedefaults','usersessions', |
| |
'requestauthor','selfenrollment', |
| |
'coursecategories','autoenroll', |
| |
'helpsettings'],$domain); |
| |
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'}; |
| $domdefaults{'auth_def'} = $domconfig{'defaults'}{'auth_def'}; |
$domdefaults{'auth_def'} = $domconfig{'defaults'}{'auth_def'}; |
| $domdefaults{'auth_arg_def'} = $domconfig{'defaults'}{'auth_arg_def'}; |
$domdefaults{'auth_arg_def'} = $domconfig{'defaults'}{'auth_arg_def'}; |
| $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{'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 1266 sub get_domain_defaults {
|
Line 2368 sub get_domain_defaults {
|
| $domdefaults{'defaultquota'} = $domconfig{'quotas'}{'defaultquota'}; |
$domdefaults{'defaultquota'} = $domconfig{'quotas'}{'defaultquota'}; |
| } else { |
} else { |
| $domdefaults{'defaultquota'} = $domconfig{'quotas'}; |
$domdefaults{'defaultquota'} = $domconfig{'quotas'}; |
| } |
} |
| my @usertools = ('aboutme','blog','portfolio'); |
my @usertools = ('aboutme','blog','webdav','portfolio'); |
| foreach my $item (@usertools) { |
foreach my $item (@usertools) { |
| if (ref($domconfig{'quotas'}{$item}) eq 'HASH') { |
if (ref($domconfig{'quotas'}{$item}) eq 'HASH') { |
| $domdefaults{$item} = $domconfig{'quotas'}{$item}; |
$domdefaults{$item} = $domconfig{'quotas'}{$item}; |
| } |
} |
| } |
} |
| |
if (ref($domconfig{'quotas'}{'authorquota'}) eq 'HASH') { |
| |
$domdefaults{'authorquota'} = $domconfig{'quotas'}{'authorquota'}; |
| |
} |
| |
} |
| |
if (ref($domconfig{'requestcourses'}) eq 'HASH') { |
| |
foreach my $item ('official','unofficial','community','textbook') { |
| |
$domdefaults{$item} = $domconfig{'requestcourses'}{$item}; |
| |
} |
| |
} |
| |
if (ref($domconfig{'requestauthor'}) eq 'HASH') { |
| |
$domdefaults{'requestauthor'} = $domconfig{'requestauthor'}; |
| |
} |
| |
if (ref($domconfig{'inststatus'}) eq 'HASH') { |
| |
foreach my $item ('inststatustypes','inststatusorder','inststatusguest') { |
| |
$domdefaults{$item} = $domconfig{'inststatus'}{$item}; |
| |
} |
| |
} |
| |
if (ref($domconfig{'coursedefaults'}) eq 'HASH') { |
| |
$domdefaults{'usejsme'} = $domconfig{'coursedefaults'}{'usejsme'}; |
| |
$domdefaults{'inline_chem'} = $domconfig{'coursedefaults'}{'inline_chem'}; |
| |
$domdefaults{'uselcmath'} = $domconfig{'coursedefaults'}{'uselcmath'}; |
| |
if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') { |
| |
$domdefaults{'postsubmit'} = $domconfig{'coursedefaults'}{'postsubmit'}{'client'}; |
| |
} |
| |
foreach my $type (@coursetypes) { |
| |
if (ref($domconfig{'coursedefaults'}{'coursecredits'}) eq 'HASH') { |
| |
unless ($type eq 'community') { |
| |
$domdefaults{$type.'credits'} = $domconfig{'coursedefaults'}{'coursecredits'}{$type}; |
| |
} |
| |
} |
| |
if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') { |
| |
$domdefaults{$type.'quota'} = $domconfig{'coursedefaults'}{'uploadquota'}{$type}; |
| |
} |
| |
if ($domdefaults{'postsubmit'} eq 'on') { |
| |
if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') { |
| |
$domdefaults{$type.'postsubtimeout'} = |
| |
$domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}{$type}; |
| |
} |
| |
} |
| |
} |
| |
if (ref($domconfig{'coursedefaults'}{'canclone'}) eq 'HASH') { |
| |
if (ref($domconfig{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') { |
| |
my @clonecodes = @{$domconfig{'coursedefaults'}{'canclone'}{'instcode'}}; |
| |
if (@clonecodes) { |
| |
$domdefaults{'canclone'} = join('+',@clonecodes); |
| |
} |
| |
} |
| |
} elsif ($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'}{'remote'}) eq 'HASH') { |
| |
$domdefaults{'remotesessions'} = $domconfig{'usersessions'}{'remote'}; |
| |
} |
| |
if (ref($domconfig{'usersessions'}{'hosted'}) eq 'HASH') { |
| |
$domdefaults{'hostedsessions'} = $domconfig{'usersessions'}{'hosted'}; |
| |
} |
| |
if (ref($domconfig{'usersessions'}{'offloadnow'}) eq 'HASH') { |
| |
$domdefaults{'offloadnow'} = $domconfig{'usersessions'}{'offloadnow'}; |
| |
} |
| |
if (ref($domconfig{'usersessions'}{'offloadoth'}) eq 'HASH') { |
| |
$domdefaults{'offloadoth'} = $domconfig{'usersessions'}{'offloadoth'}; |
| |
} |
| |
} |
| |
if (ref($domconfig{'selfenrollment'}) eq 'HASH') { |
| |
if (ref($domconfig{'selfenrollment'}{'admin'}) eq 'HASH') { |
| |
my @settings = ('types','registered','enroll_dates','access_dates','section', |
| |
'approval','limit'); |
| |
foreach my $type (@coursetypes) { |
| |
if (ref($domconfig{'selfenrollment'}{'admin'}{$type}) eq 'HASH') { |
| |
my @mgrdc = (); |
| |
foreach my $item (@settings) { |
| |
if ($domconfig{'selfenrollment'}{'admin'}{$type}{$item} eq '0') { |
| |
push(@mgrdc,$item); |
| |
} |
| |
} |
| |
if (@mgrdc) { |
| |
$domdefaults{$type.'selfenrolladmdc'} = join(',',@mgrdc); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if (ref($domconfig{'selfenrollment'}{'default'}) eq 'HASH') { |
| |
foreach my $type (@coursetypes) { |
| |
if (ref($domconfig{'selfenrollment'}{'default'}{$type}) eq 'HASH') { |
| |
foreach my $item (keys(%{$domconfig{'selfenrollment'}{'default'}{$type}})) { |
| |
$domdefaults{$type.'selfenroll'.$item} = $domconfig{'selfenrollment'}{'default'}{$type}{$item}; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if (ref($domconfig{'coursecategories'}) eq 'HASH') { |
| |
$domdefaults{'catauth'} = 'std'; |
| |
$domdefaults{'catunauth'} = 'std'; |
| |
if ($domconfig{'coursecategories'}{'auth'}) { |
| |
$domdefaults{'catauth'} = $domconfig{'coursecategories'}{'auth'}; |
| |
} |
| |
if ($domconfig{'coursecategories'}{'unauth'}) { |
| |
$domdefaults{'catunauth'} = $domconfig{'coursecategories'}{'unauth'}; |
| |
} |
| |
} |
| |
if (ref($domconfig{'autoenroll'}) eq 'HASH') { |
| |
$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'}; |
| |
} |
| } |
} |
| &Apache::lonnet::do_cache_new('domdefaults',$domain,\%domdefaults, |
if (ref($domconfig{'wafproxy'}) eq 'HASH') { |
| $cachetime); |
foreach my $item ('ipheader','trusted','vpnint','vpnext','sslopt') { |
| |
if ($domconfig{'wafproxy'}{$item}) { |
| |
$domdefaults{'waf_'.$item} = $domconfig{'wafproxy'}{$item}; |
| |
} |
| |
} |
| |
} |
| |
&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 1515 sub make_key {
|
Line 2819 sub make_key {
|
| sub devalidate_cache_new { |
sub devalidate_cache_new { |
| my ($name,$id,$debug) = @_; |
my ($name,$id,$debug) = @_; |
| if ($debug) { &Apache::lonnet::logthis("deleting $name:$id"); } |
if ($debug) { &Apache::lonnet::logthis("deleting $name:$id"); } |
| |
my $remembered_id=$name.':'.$id; |
| $id=&make_key($name,$id); |
$id=&make_key($name,$id); |
| $memcache->delete($id); |
$memcache->delete($id); |
| delete($remembered{$id}); |
delete($remembered{$remembered_id}); |
| delete($accessed{$id}); |
delete($accessed{$remembered_id}); |
| } |
} |
| |
|
| sub is_cached_new { |
sub is_cached_new { |
| my ($name,$id,$debug) = @_; |
my ($name,$id,$debug) = @_; |
| $id=&make_key($name,$id); |
my $remembered_id=$name.':'.$id; # this is to avoid make_key (which is slow) for |
| if (exists($remembered{$id})) { |
# keys in %remembered hash, which persists for |
| if ($debug) { &Apache::lonnet::logthis("Earyl return $id of $remembered{$id} "); } |
# duration of request (no restriction on key length). |
| $accessed{$id}=[&gettimeofday()]; |
if (exists($remembered{$remembered_id})) { |
| |
if ($debug) { &Apache::lonnet::logthis("Early return $remembered_id of $remembered{$remembered_id} "); } |
| |
$accessed{$remembered_id}=[&gettimeofday()]; |
| $hits++; |
$hits++; |
| return ($remembered{$id},1); |
return ($remembered{$remembered_id},1); |
| } |
} |
| |
$id=&make_key($name,$id); |
| my $value = $memcache->get($id); |
my $value = $memcache->get($id); |
| if (!(defined($value))) { |
if (!(defined($value))) { |
| if ($debug) { &Apache::lonnet::logthis("getting $id is not defined"); } |
if ($debug) { &Apache::lonnet::logthis("getting $id is not defined"); } |
|
Line 1539 sub is_cached_new {
|
Line 2847 sub is_cached_new {
|
| if ($debug) { &Apache::lonnet::logthis("getting $id is __undef__"); } |
if ($debug) { &Apache::lonnet::logthis("getting $id is __undef__"); } |
| $value=undef; |
$value=undef; |
| } |
} |
| &make_room($id,$value,$debug); |
&make_room($remembered_id,$value,$debug); |
| if ($debug) { &Apache::lonnet::logthis("getting $id is $value"); } |
if ($debug) { &Apache::lonnet::logthis("getting $id is $value"); } |
| return ($value,1); |
return ($value,1); |
| } |
} |
| |
|
| sub do_cache_new { |
sub do_cache_new { |
| my ($name,$id,$value,$time,$debug) = @_; |
my ($name,$id,$value,$time,$debug) = @_; |
| |
my $remembered_id=$name.':'.$id; |
| $id=&make_key($name,$id); |
$id=&make_key($name,$id); |
| my $setvalue=$value; |
my $setvalue=$value; |
| if (!defined($setvalue)) { |
if (!defined($setvalue)) { |
|
Line 1561 sub do_cache_new {
|
Line 2870 sub do_cache_new {
|
| $memcache->disconnect_all(); |
$memcache->disconnect_all(); |
| } |
} |
| # need to make a copy of $value |
# need to make a copy of $value |
| &make_room($id,$value,$debug); |
&make_room($remembered_id,$value,$debug); |
| return $value; |
return $value; |
| } |
} |
| |
|
| sub make_room { |
sub make_room { |
| my ($id,$value,$debug)=@_; |
my ($remembered_id,$value,$debug)=@_; |
| |
|
| $remembered{$id}= (ref($value)) ? &Storable::dclone($value) |
$remembered{$remembered_id}= (ref($value)) ? &Storable::dclone($value) |
| : $value; |
: $value; |
| if ($to_remember<0) { return; } |
if ($to_remember<0) { return; } |
| $accessed{$id}=[&gettimeofday()]; |
$accessed{$remembered_id}=[&gettimeofday()]; |
| if (scalar(keys(%remembered)) <= $to_remember) { return; } |
if (scalar(keys(%remembered)) <= $to_remember) { return; } |
| my $to_kick; |
my $to_kick; |
| my $max_time=0; |
my $max_time=0; |
|
Line 1604 sub userenvironment {
|
Line 2913 sub userenvironment {
|
| } |
} |
| $items=~s/\&$//; |
$items=~s/\&$//; |
| my %returnhash=(); |
my %returnhash=(); |
| my @answer=split(/\&/, |
my $uhome = &homeserver($unam,$udom); |
| &reply('get:'.$udom.':'.$unam.':environment:'.$items, |
unless ($uhome eq 'no_host') { |
| &homeserver($unam,$udom))); |
my @answer=split(/\&/, |
| my $i; |
&reply('get:'.$udom.':'.$unam.':environment:'.$items,$uhome)); |
| for ($i=0;$i<=$#what;$i++) { |
if ($#answer==0 && $answer[0] =~ /^(con_lost|error:|no_such_host)/i) { |
| $returnhash{$what[$i]}=&unescape($answer[$i]); |
return %returnhash; |
| |
} |
| |
my $i; |
| |
for ($i=0;$i<=$#what;$i++) { |
| |
$returnhash{$what[$i]}=&unescape($answer[$i]); |
| |
} |
| } |
} |
| return %returnhash; |
return %returnhash; |
| } |
} |
|
Line 1680 sub chatsend {
|
Line 2994 sub chatsend {
|
| |
|
| sub getversion { |
sub getversion { |
| my $fname=&clutter(shift); |
my $fname=&clutter(shift); |
| unless ($fname=~/^\/res\//) { return -1; } |
unless ($fname=~m{^(/adm/wrapper|)/res/}) { return -1; } |
| return ¤tversion(&filelocation('',$fname)); |
return ¤tversion(&filelocation('',$fname)); |
| } |
} |
| |
|
| sub currentversion { |
sub currentversion { |
| my $fname=shift; |
my $fname=shift; |
| my ($result,$cached)=&is_cached_new('resversion',$fname); |
|
| if (defined($cached)) { return $result; } |
|
| my $author=$fname; |
my $author=$fname; |
| $author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/; |
$author=~s/\/home\/httpd\/html\/res\/([^\/]*)\/([^\/]*).*/$1\/$2/; |
| my ($udom,$uname)=split(/\//,$author); |
my ($udom,$uname)=split(/\//,$author); |
| my $home=homeserver($uname,$udom); |
my $home=&homeserver($uname,$udom); |
| if ($home eq 'no_host') { |
if ($home eq 'no_host') { |
| return -1; |
return -1; |
| } |
} |
| my $answer=reply("currentversion:$fname",$home); |
my $answer=&reply("currentversion:$fname",$home); |
| if (($answer eq 'con_lost') || ($answer eq 'rejected')) { |
if (($answer eq 'con_lost') || ($answer eq 'rejected')) { |
| return -1; |
return -1; |
| } |
} |
| return &do_cache_new('resversion',$fname,$answer,600); |
return $answer; |
| |
} |
| |
|
| |
# |
| |
# Return special version number of resource if set by override, empty otherwise |
| |
# |
| |
sub usedversion { |
| |
my $fname=shift; |
| |
unless ($fname) { $fname=$env{'request.uri'}; } |
| |
my ($urlversion)=($fname=~/\.(\d+)\.\w+$/); |
| |
if ($urlversion) { return $urlversion; } |
| |
return ''; |
| } |
} |
| |
|
| # ----------------------------- Subscribe to a resource, return URL if possible |
# ----------------------------- Subscribe to a resource, return URL if possible |
|
Line 1727 sub subscribe {
|
Line 3050 sub subscribe {
|
| sub repcopy { |
sub repcopy { |
| my $filename=shift; |
my $filename=shift; |
| $filename=~s/\/+/\//g; |
$filename=~s/\/+/\//g; |
| if ($filename=~m|^/home/httpd/html/adm/|) { return 'ok'; } |
my $londocroot = $perlvar{'lonDocRoot'}; |
| if ($filename=~m|^/home/httpd/html/lonUsers/|) { return 'ok'; } |
if ($filename=~m{^\Q$londocroot/adm/\E}) { return 'ok'; } |
| if ($filename=~m|^/home/httpd/html/userfiles/| or |
if ($filename=~m{^\Q/home/httpd/lonUsers/\E}) { return 'ok'; } |
| $filename=~m -^/*(uploaded|editupload)/-) { |
if ($filename=~m{^\Q$londocroot/userfiles/\E} or |
| |
$filename=~m{^/*(uploaded|editupload)/}) { |
| return &repcopy_userfile($filename); |
return &repcopy_userfile($filename); |
| } |
} |
| $filename=~s/[\n\r]//g; |
$filename=~s/[\n\r]//g; |
|
Line 1757 sub repcopy {
|
Line 3081 sub repcopy {
|
| unless ($home eq $perlvar{'lonHostID'}) { |
unless ($home eq $perlvar{'lonHostID'}) { |
| my @parts=split(/\//,$filename); |
my @parts=split(/\//,$filename); |
| my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]"; |
my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]"; |
| if ($path ne "$perlvar{'lonDocRoot'}/res") { |
if ($path ne "$londocroot/res") { |
| &logthis("Malconfiguration for replication: $filename"); |
&logthis("Malconfiguration for replication: $filename"); |
| return 'bad_request'; |
return 'bad_request'; |
| } |
} |
|
Line 1794 sub repcopy {
|
Line 3118 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 1805 sub ssi_body {
|
Line 3150 sub ssi_body {
|
| if ($filelink=~/^https?\:/) { |
if ($filelink=~/^https?\:/) { |
| ($output,$response)=&externalssi($filelink); |
($output,$response)=&externalssi($filelink); |
| } else { |
} else { |
| |
$filelink .= $filelink=~/\?/ ? '&' : '?'; |
| |
$filelink .= 'inhibitmenu=yes'; |
| ($output,$response)=&ssi($filelink,%form); |
($output,$response)=&ssi($filelink,%form); |
| } |
} |
| $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs; |
$output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs; |
|
Line 1841 sub absolute_url {
|
Line 3188 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); |
| if (%form) { |
if (%form) { |
| $request=new HTTP::Request('POST',&absolute_url().$fn); |
$request=new HTTP::Request('POST',&absolute_url().$fn); |
| $request->content(join('&',map { &escape($_).'='.&escape($form{$_}) } keys %form)); |
$request->content(join('&',map { |
| |
my $name = escape($_); |
| |
"$name=" . ( ref($form{$_}) eq 'ARRAY' |
| |
? join("&$name=", map {escape($_) } @{$form{$_}}) |
| |
: &escape($form{$_}) ); |
| |
} keys(%form))); |
| } else { |
} else { |
| $request=new HTTP::Request('GET',&absolute_url().$fn); |
$request=new HTTP::Request('GET',&absolute_url().$fn); |
| } |
} |
| |
|
| $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 1875 sub externalssi {
|
Line 3248 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 1888 sub allowuploaded {
|
Line 3333 sub allowuploaded {
|
| &Apache::lonnet::appenv(\%httpref); |
&Apache::lonnet::appenv(\%httpref); |
| } |
} |
| |
|
| |
# |
| |
# Determine if the current user should be able to edit a particular resource, |
| |
# when viewing in course context. |
| |
# (a) When viewing resource used to determine if "Edit" item is included in |
| |
# Functions. |
| |
# (b) When displaying folder contents in course editor, used to determine if |
| |
# "Edit" link will be displayed alongside resource. |
| |
# |
| |
# input: six args -- filename (decluttered), course number, course domain, |
| |
# url, symb (if registered) and group (if this is a group |
| |
# item -- e.g., bulletin board, group page etc.). |
| |
# output: array of five scalars -- |
| |
# $cfile -- url for file editing if editable on current server |
| |
# $home -- homeserver of resource (i.e., for author if published, |
| |
# or course if uploaded.). |
| |
# $switchserver -- 1 if server switch will be needed. |
| |
# $forceedit -- 1 if icon/link should be to go to edit mode |
| |
# $forceview -- 1 if icon/link should be to go to view mode |
| |
# |
| |
|
| |
sub can_edit_resource { |
| |
my ($file,$cnum,$cdom,$resurl,$symb,$group) = @_; |
| |
my ($cfile,$home,$switchserver,$forceedit,$forceview,$uploaded,$incourse); |
| |
# |
| |
# For aboutme pages user can only edit his/her own. |
| |
# |
| |
if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) { |
| |
my ($sdom,$sname) = ($1,$2); |
| |
if (($sdom eq $env{'user.domain'}) && ($sname eq $env{'user.name'})) { |
| |
$home = $env{'user.home'}; |
| |
$cfile = $resurl; |
| |
if ($env{'form.forceedit'}) { |
| |
$forceview = 1; |
| |
} else { |
| |
$forceedit = 1; |
| |
} |
| |
return ($cfile,$home,$switchserver,$forceedit,$forceview); |
| |
} else { |
| |
return; |
| |
} |
| |
} |
| |
|
| |
if ($env{'request.course.id'}) { |
| |
my $crsedit = &Apache::lonnet::allowed('mdc',$env{'request.course.id'}); |
| |
if ($group ne '') { |
| |
# if this is a group homepage or group bulletin board, check group privs |
| |
my $allowed = 0; |
| |
if ($resurl =~ m{^/?adm/$cdom/$cnum/$group/smppg$}) { |
| |
if ((&allowed('mdg',$env{'request.course.id'}. |
| |
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) || |
| |
(&allowed('mgh',$env{'request.course.id'}.'/'.$group)) || $crsedit) { |
| |
$allowed = 1; |
| |
} |
| |
} elsif ($resurl =~ m{^/?adm/$cdom/$cnum/\d+/bulletinboard$}) { |
| |
if ((&allowed('mdg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) || |
| |
(&allowed('cgb',$env{'request.course.id'}.'/'.$group)) || $crsedit) { |
| |
$allowed = 1; |
| |
} |
| |
} |
| |
if ($allowed) { |
| |
$home=&homeserver($cnum,$cdom); |
| |
if ($env{'form.forceedit'}) { |
| |
$forceview = 1; |
| |
} else { |
| |
$forceedit = 1; |
| |
} |
| |
$cfile = $resurl; |
| |
} else { |
| |
return; |
| |
} |
| |
} else { |
| |
if ($resurl =~ m{^/?adm/viewclasslist$}) { |
| |
unless (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) { |
| |
return; |
| |
} |
| |
} elsif (!$crsedit) { |
| |
# |
| |
# No edit allowed where CC has switched to student role. |
| |
# |
| |
return; |
| |
} |
| |
} |
| |
} |
| |
|
| |
if ($file ne '') { |
| |
if (($cnum =~ /$match_courseid/) && ($cdom =~ /$match_domain/)) { |
| |
if (&is_course_upload($file,$cnum,$cdom)) { |
| |
$uploaded = 1; |
| |
$incourse = 1; |
| |
if ($file =~/\.(htm|html|css|js|txt)$/) { |
| |
$cfile = &hreflocation('',$file); |
| |
if ($env{'form.forceedit'}) { |
| |
$forceview = 1; |
| |
} else { |
| |
$forceedit = 1; |
| |
} |
| |
} |
| |
} elsif ($resurl =~ m{^/public/$cdom/$cnum/syllabus}) { |
| |
$incourse = 1; |
| |
if ($env{'form.forceedit'}) { |
| |
$forceview = 1; |
| |
} else { |
| |
$forceedit = 1; |
| |
} |
| |
$cfile = $resurl; |
| |
} elsif (($resurl ne '') && (&is_on_map($resurl))) { |
| |
if ($resurl =~ m{^/adm/$match_domain/$match_username/\d+/smppg|bulletinboard$}) { |
| |
$incourse = 1; |
| |
if ($env{'form.forceedit'}) { |
| |
$forceview = 1; |
| |
} else { |
| |
$forceedit = 1; |
| |
} |
| |
$cfile = $resurl; |
| |
} elsif ($resurl eq '/res/lib/templates/simpleproblem.problem') { |
| |
$incourse = 1; |
| |
$cfile = $resurl.'/smpedit'; |
| |
} elsif ($resurl =~ m{^/adm/wrapper/ext/}) { |
| |
$incourse = 1; |
| |
if ($env{'form.forceedit'}) { |
| |
$forceview = 1; |
| |
} else { |
| |
$forceedit = 1; |
| |
} |
| |
$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$}) { |
| |
$incourse = 1; |
| |
if ($env{'form.forceedit'}) { |
| |
$forceview = 1; |
| |
} else { |
| |
$forceedit = 1; |
| |
} |
| |
$cfile = ($resurl =~ m{^/} ? $resurl : "/$resurl"); |
| |
} |
| |
} elsif ($resurl eq '/res/lib/templates/simpleproblem.problem/smpedit') { |
| |
my $template = '/res/lib/templates/simpleproblem.problem'; |
| |
if (&is_on_map($template)) { |
| |
$incourse = 1; |
| |
$forceview = 1; |
| |
$cfile = $template; |
| |
} |
| |
} elsif (($resurl =~ m{^/adm/wrapper/ext/}) && ($env{'form.folderpath'} =~ /^supplemental/)) { |
| |
$incourse = 1; |
| |
if ($env{'form.forceedit'}) { |
| |
$forceview = 1; |
| |
} else { |
| |
$forceedit = 1; |
| |
} |
| |
$cfile = $resurl; |
| |
} elsif (($resurl eq '/adm/extresedit') && ($symb || $env{'form.folderpath'})) { |
| |
$incourse = 1; |
| |
$forceview = 1; |
| |
if ($symb) { |
| |
my ($map,$id,$res)=&decode_symb($symb); |
| |
$env{'request.symb'} = $symb; |
| |
$cfile = &clutter($res); |
| |
} else { |
| |
$cfile = $env{'form.suppurl'}; |
| |
$cfile =~ s{^http://}{}; |
| |
$cfile = '/adm/wrapper/ext/'.$cfile; |
| |
} |
| |
} elsif ($resurl =~ m{^/?adm/viewclasslist$}) { |
| |
if ($env{'form.forceedit'}) { |
| |
$forceview = 1; |
| |
} else { |
| |
$forceedit = 1; |
| |
} |
| |
$cfile = ($resurl =~ m{^/} ? $resurl : "/$resurl"); |
| |
} |
| |
} |
| |
if ($uploaded || $incourse) { |
| |
$home=&homeserver($cnum,$cdom); |
| |
} elsif ($file !~ m{/$}) { |
| |
$file=~s{^(priv/$match_domain/$match_username)}{/$1}; |
| |
$file=~s{^($match_domain/$match_username)}{/priv/$1}; |
| |
# Check that the user has permission to edit this resource |
| |
my $setpriv = 1; |
| |
my ($cfuname,$cfudom)=&constructaccess($file,$setpriv); |
| |
if (defined($cfudom)) { |
| |
$home=&homeserver($cfuname,$cfudom); |
| |
$cfile=$file; |
| |
} |
| |
} |
| |
if (($cfile ne '') && (!$incourse || $uploaded) && |
| |
(($home ne '') && ($home ne 'no_host'))) { |
| |
my @ids=¤t_machine_ids(); |
| |
unless (grep(/^\Q$home\E$/,@ids)) { |
| |
$switchserver=1; |
| |
} |
| |
} |
| |
} |
| |
return ($cfile,$home,$switchserver,$forceedit,$forceview); |
| |
} |
| |
|
| |
sub is_course_upload { |
| |
my ($file,$cnum,$cdom) = @_; |
| |
my $uploadpath = &LONCAPA::propath($cdom,$cnum); |
| |
$uploadpath =~ s{^\/}{}; |
| |
if (($file =~ m{^\Q$uploadpath\E/userfiles/(docs|supplemental)/}) || |
| |
($file =~ m{^userfiles/\Q$cdom\E/\Q$cnum\E/(docs|supplemental)/})) { |
| |
return 1; |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub in_course { |
| |
my ($udom,$uname,$cdom,$cnum,$type,$hideprivileged) = @_; |
| |
if ($hideprivileged) { |
| |
my $skipuser; |
| |
my %coursehash = &coursedescription($cdom.'_'.$cnum); |
| |
my @possdoms = ($cdom); |
| |
if ($coursehash{'checkforpriv'}) { |
| |
push(@possdoms,split(/,/,$coursehash{'checkforpriv'})); |
| |
} |
| |
if (&privileged($uname,$udom,\@possdoms)) { |
| |
$skipuser = 1; |
| |
if ($coursehash{'nothideprivileged'}) { |
| |
foreach my $item (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
| |
my $user; |
| |
if ($item =~ /:/) { |
| |
$user = $item; |
| |
} else { |
| |
$user = join(':',split(/[\@]/,$item)); |
| |
} |
| |
if ($user eq $uname.':'.$udom) { |
| |
undef($skipuser); |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
if ($skipuser) { |
| |
return 0; |
| |
} |
| |
} |
| |
} |
| |
$type ||= 'any'; |
| |
if (!defined($cdom) || !defined($cnum)) { |
| |
my $cid = $env{'request.course.id'}; |
| |
$cdom = $env{'course.'.$cid.'.domain'}; |
| |
$cnum = $env{'course.'.$cid.'.num'}; |
| |
} |
| |
my $typesref; |
| |
if (($type eq 'any') || ($type eq 'all')) { |
| |
$typesref = ['active','previous','future']; |
| |
} elsif ($type eq 'previous' || $type eq 'future') { |
| |
$typesref = [$type]; |
| |
} |
| |
my %roles = &get_my_roles($uname,$udom,'userroles', |
| |
$typesref,undef,[$cdom]); |
| |
my ($tmp) = keys(%roles); |
| |
return 0 if ($tmp =~ /^(con_lost|error|no_such_host)/i); |
| |
my @course_roles = grep(/^\Q$cnum\E:\Q$cdom\E:/, keys(%roles)); |
| |
if (@course_roles > 0) { |
| |
return 1; |
| |
} |
| |
return 0; |
| |
} |
| |
|
| # --------- File operations in /home/httpd/html/userfiles/$domain/1/2/3/$course |
# --------- File operations in /home/httpd/html/userfiles/$domain/1/2/3/$course |
| # input: action, courseID, current domain, intended |
# input: action, courseID, current domain, intended |
| # path to file, source of file, instruction to parse file for objects, |
# path to file, source of file, instruction to parse file for objects, |
| # ref to hash for embedded objects, |
# ref to hash for embedded objects, |
| # ref to hash for codebase of java objects. |
# ref to hash for codebase of java objects. |
| |
# reference to scalar to accommodate mime type determined |
| |
# from File::MMagic if $parser = parse. |
| # |
# |
| # output: url to file (if action was uploaddoc), |
# output: url to file (if action was uploaddoc), |
| # ok if successful, or diagnostic message otherwise (if action was propagate or copy) |
# ok if successful, or diagnostic message otherwise (if action was propagate or copy) |
|
Line 1919 sub allowuploaded {
|
Line 3636 sub allowuploaded {
|
| # |
# |
| |
|
| sub process_coursefile { |
sub process_coursefile { |
| my ($action,$docuname,$docudom,$file,$source,$parser,$allfiles,$codebase)=@_; |
my ($action,$docuname,$docudom,$file,$source,$parser,$allfiles,$codebase, |
| |
$mimetype)=@_; |
| my $fetchresult; |
my $fetchresult; |
| my $home=&homeserver($docuname,$docudom); |
my $home=&homeserver($docuname,$docudom); |
| if ($action eq 'propagate') { |
if ($action eq 'propagate') { |
|
Line 1942 sub process_coursefile {
|
Line 3660 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') { |
| my $parse_result = &extract_embedded_items($filepath.'/'.$fname,$allfiles,$codebase); |
my $mm = new File::MMagic; |
| unless ($parse_result eq 'ok') { |
my $type = $mm->checktype_filename($filepath.'/'.$fname); |
| &logthis('Failed to parse '.$filepath.'/'.$fname.' for embedded media: '.$parse_result); |
if ($type eq 'text/html') { |
| |
my $parse_result = &extract_embedded_items($filepath.'/'.$fname,$allfiles,$codebase); |
| |
unless ($parse_result eq 'ok') { |
| |
&logthis('Failed to parse '.$filepath.'/'.$fname.' for embedded media: '.$parse_result); |
| |
} |
| } |
} |
| |
if (ref($mimetype)) { |
| |
$$mimetype = $type; |
| |
} |
| } |
} |
| $fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file, |
$fetchresult= &reply('fetchuserfile:'.$docudom.'/'.$docuname.'/'.$file, |
| $home); |
$home); |
|
Line 1993 sub store_edited_file {
|
Line 3718 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 2018 sub clean_filename {
|
Line 3743 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 |
| # numbers |
# numbers |
| $fname=~s/\.(\d+)(?=\.)/_$1/g; |
$fname=~s/\.(\d+)(?=\.)/_$1/g; |
| |
# Replace three or more adjacent underscores with one for consistency |
| |
# with loncfile::filename_check() so complete url can be extracted by |
| |
# lonnet::decode_symb() |
| |
$fname=~s/_{3,}/_/g; |
| return $fname; |
return $fname; |
| } |
} |
| |
|
| |
# 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 |
| |
# image with the same aspect ratio as the original, but with dimensions which do |
| |
# not exceed $resizewidth and $resizeheight. |
| |
|
| |
sub resizeImage { |
| |
my ($img_path,$resizewidth,$resizeheight) = @_; |
| |
my $ima = Image::Magick->new; |
| |
my $resized; |
| |
if (-e $img_path) { |
| |
$ima->Read($img_path); |
| |
if (($resizewidth =~ /^\d+$/) && ($resizeheight > 0)) { |
| |
my $width = $ima->Get('width'); |
| |
my $height = $ima->Get('height'); |
| |
if ($width > $resizewidth) { |
| |
my $factor = $width/$resizewidth; |
| |
my $newheight = $height/$factor; |
| |
$ima->Scale(width=>$resizewidth,height=>$newheight); |
| |
$resized = 1; |
| |
} |
| |
} |
| |
if (($resizeheight =~ /^\d+$/) && ($resizeheight > 0)) { |
| |
my $width = $ima->Get('width'); |
| |
my $height = $ima->Get('height'); |
| |
if ($height > $resizeheight) { |
| |
my $factor = $height/$resizeheight; |
| |
my $newwidth = $width/$factor; |
| |
$ima->Scale(width=>$newwidth,height=>$resizeheight); |
| |
$resized = 1; |
| |
} |
| |
} |
| |
if ($resized) { |
| |
$ima->Write($img_path); |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| # --------------- Take an uploaded file and put it into the userfiles directory |
# --------------- Take an uploaded file and put it into the userfiles directory |
| # 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 filenam is in $env{"form.$formname.filename"} |
# the desired filename is in $env{"form.$formname.filename"} |
| # $coursedoc - if true up to the current course |
# $context - possible values: coursedoc, existingfile, overwrite, |
| # if false |
# canceloverwrite, scantron or ''. |
| |
# if 'coursedoc': upload to the current course |
| |
# if 'existingfile': write file to tmp/overwrites directory |
| |
# if 'canceloverwrite': delete file written to tmp/overwrites directory |
| |
# $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 |
| # $dsetudom - domain for permanaent storage of uploaded file |
# $dsetudom - domain for permanaent storage of uploaded file |
| # $thumbwidth - width (pixels) of thumbnail to make for uploaded image |
# $thumbwidth - width (pixels) of thumbnail to make for uploaded image |
| # $thumbheight - height (pixels) of thumbnail to make for uploaded image |
# $thumbheight - height (pixels) of thumbnail to make for uploaded image |
| |
# $resizewidth - width (pixels) to which to resize uploaded image |
| |
# $resizeheight - height (pixels) to which to resize uploaded image |
| |
# $mimetype - reference to scalar to accommodate mime type determined |
| |
# from File::MMagic. |
| # |
# |
| # output: url of file in userspace, or error: <message> |
# output: url of file in userspace, or error: <message> |
| # or /adm/notfound.html if failure to upload occurse |
# or /adm/notfound.html if failure to upload occurse |
| |
|
| |
|
| sub userfileupload { |
sub userfileupload { |
| my ($formname,$coursedoc,$subdir,$parser,$allfiles,$codebase,$destuname, |
my ($formname,$context,$subdir,$parser,$allfiles,$codebase,$destuname, |
| $destudom,$thumbwidth,$thumbheight)=@_; |
$destudom,$thumbwidth,$thumbheight,$resizewidth,$resizeheight,$mimetype)=@_; |
| if (!defined($subdir)) { $subdir='unknown'; } |
if (!defined($subdir)) { $subdir='unknown'; } |
| my $fname=$env{'form.'.$formname.'.filename'}; |
my $fname=$env{'form.'.$formname.'.filename'}; |
| $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'; } |
| chop($env{'form.'.$formname}); |
# If filename now begins with a . prepend unix timestamp _ milliseconds |
| if (($formname eq 'screenshot') && ($subdir eq 'helprequests')) { #files uploaded to help request form are handled differently |
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 |
| |
if ((($formname eq 'screenshot') && ($subdir eq 'helprequests')) || |
| |
(($formname eq 'coursecreatorxml') && ($subdir eq 'batchupload')) || |
| |
($context eq 'existingfile') || ($context eq 'canceloverwrite')) { |
| my $now = time; |
my $now = time; |
| my $filepath = 'tmp/helprequests/'.$now; |
my $filepath; |
| my @parts=split(/\//,$filepath); |
if (($formname eq 'screenshot') && ($subdir eq 'helprequests')) { |
| my $fullpath = $perlvar{'lonDaemons'}; |
$filepath = 'tmp/helprequests/'.$now; |
| for (my $i=0;$i<@parts;$i++) { |
} elsif (($formname eq 'coursecreatorxml') && ($subdir eq 'batchupload')) { |
| $fullpath .= '/'.$parts[$i]; |
$filepath = 'tmp/addcourse/'.$destudom.'/web/'.$env{'user.name'}. |
| if ((-e $fullpath)!=1) { |
'_'.$env{'user.domain'}.'/pending'; |
| mkdir($fullpath,0777); |
} elsif (($context eq 'existingfile') || ($context eq 'canceloverwrite')) { |
| |
my ($docuname,$docudom); |
| |
if ($destudom =~ /^$match_domain$/) { |
| |
$docudom = $destudom; |
| |
} else { |
| |
$docudom = $env{'user.domain'}; |
| |
} |
| |
if ($destuname =~ /^$match_username$/) { |
| |
$docuname = $destuname; |
| |
} else { |
| |
$docuname = $env{'user.name'}; |
| |
} |
| |
if (exists($env{'form.group'})) { |
| |
$docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
| |
$docudom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
} |
| |
$filepath = 'tmp/overwrites/'.$docudom.'/'.$docuname.'/'.$subdir; |
| |
if ($context eq 'canceloverwrite') { |
| |
my $tempfile = $perlvar{'lonDaemons'}.'/'.$filepath.'/'.$fname; |
| |
if (-e $tempfile) { |
| |
my @info = stat($tempfile); |
| |
if ($info[9] eq $env{'form.timestamp'}) { |
| |
unlink($tempfile); |
| |
} |
| |
} |
| |
return; |
| } |
} |
| } |
} |
| open(my $fh,'>'.$fullpath.'/'.$fname); |
# Create the directory if not present |
| print $fh $env{'form.'.$formname}; |
|
| close($fh); |
|
| return $fullpath.'/'.$fname; |
|
| } elsif (($formname eq 'coursecreatorxml') && ($subdir eq 'batchupload')) { #files uploaded to create course page are handled differently |
|
| my $filepath = 'tmp/addcourse/'.$destudom.'/web/'.$env{'user.name'}. |
|
| '_'.$env{'user.domain'}.'/pending'; |
|
| my @parts=split(/\//,$filepath); |
my @parts=split(/\//,$filepath); |
| my $fullpath = $perlvar{'lonDaemons'}; |
my $fullpath = $perlvar{'lonDaemons'}; |
| for (my $i=0;$i<@parts;$i++) { |
for (my $i=0;$i<@parts;$i++) { |
|
Line 2079 sub userfileupload {
|
Line 3888 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); |
| return $fullpath.'/'.$fname; |
if ($context eq 'existingfile') { |
| |
my @info = stat($fullpath.'/'.$fname); |
| |
return ($fullpath.'/'.$fname,$info[9]); |
| |
} else { |
| |
return $fullpath.'/'.$fname; |
| |
} |
| } |
} |
| |
if ($subdir eq 'scantron') { |
| # Create the directory if not present |
$fname = 'scantron_orig_'.$fname; |
| $fname="$subdir/$fname"; |
} else { |
| if ($coursedoc) { |
$fname="$subdir/$fname"; |
| |
} |
| |
if ($context eq 'coursedoc') { |
| my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
| my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
my $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
| if ($env{'form.folder'} =~ m/^(default|supplemental)/) { |
if ($env{'form.folder'} =~ m/^(default|supplemental)/) { |
| return &finishuserfileupload($docuname,$docudom, |
return &finishuserfileupload($docuname,$docudom, |
| $formname,$fname,$parser,$allfiles, |
$formname,$fname,$parser,$allfiles, |
| $codebase,$thumbwidth,$thumbheight); |
$codebase,$thumbwidth,$thumbheight, |
| |
$resizewidth,$resizeheight,$context,$mimetype); |
| } else { |
} else { |
| $fname=$env{'form.folder'}.'/'.$fname; |
if ($env{'form.folder'}) { |
| |
$fname=$env{'form.folder'}.'/'.$fname; |
| |
} |
| return &process_coursefile('uploaddoc',$docuname,$docudom, |
return &process_coursefile('uploaddoc',$docuname,$docudom, |
| $fname,$formname,$parser, |
$fname,$formname,$parser, |
| $allfiles,$codebase); |
$allfiles,$codebase,$mimetype); |
| } |
} |
| } elsif (defined($destuname)) { |
} elsif (defined($destuname)) { |
| my $docuname=$destuname; |
my $docuname=$destuname; |
| my $docudom=$destudom; |
my $docudom=$destudom; |
| return &finishuserfileupload($docuname,$docudom,$formname,$fname, |
return &finishuserfileupload($docuname,$docudom,$formname,$fname, |
| $parser,$allfiles,$codebase, |
$parser,$allfiles,$codebase, |
| $thumbwidth,$thumbheight); |
$thumbwidth,$thumbheight, |
| |
$resizewidth,$resizeheight,$context,$mimetype); |
| } else { |
} else { |
| my $docuname=$env{'user.name'}; |
my $docuname=$env{'user.name'}; |
| my $docudom=$env{'user.domain'}; |
my $docudom=$env{'user.domain'}; |
| if (exists($env{'form.group'})) { |
if ((exists($env{'form.group'})) || ($context eq 'syllabus')) { |
| $docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
$docuname=$env{'course.'.$env{'request.course.id'}.'.num'}; |
| $docudom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
$docudom=$env{'course.'.$env{'request.course.id'}.'.domain'}; |
| } |
} |
| return &finishuserfileupload($docuname,$docudom,$formname,$fname, |
return &finishuserfileupload($docuname,$docudom,$formname,$fname, |
| $parser,$allfiles,$codebase, |
$parser,$allfiles,$codebase, |
| $thumbwidth,$thumbheight); |
$thumbwidth,$thumbheight, |
| |
$resizewidth,$resizeheight,$context,$mimetype); |
| } |
} |
| } |
} |
| |
|
| sub finishuserfileupload { |
sub finishuserfileupload { |
| my ($docuname,$docudom,$formname,$fname,$parser,$allfiles,$codebase, |
my ($docuname,$docudom,$formname,$fname,$parser,$allfiles,$codebase, |
| $thumbwidth,$thumbheight) = @_; |
$thumbwidth,$thumbheight,$resizewidth,$resizeheight,$context,$mimetype) = @_; |
| my $path=$docudom.'/'.$docuname.'/'; |
my $path=$docudom.'/'.$docuname.'/'; |
| my $filepath=$perlvar{'lonDocRoot'}; |
my $filepath=$perlvar{'lonDocRoot'}; |
| |
|
| my ($fnamepath,$file,$fetchthumb); |
my ($fnamepath,$file,$fetchthumb); |
| $file=$fname; |
$file=$fname; |
| if ($fname=~m|/|) { |
if ($fname=~m|/|) { |
|
Line 2139 sub finishuserfileupload {
|
Line 3960 sub finishuserfileupload {
|
| mkdir($filepath,0777); |
mkdir($filepath,0777); |
| } |
} |
| } |
} |
| |
|
| # 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'; |
| } |
} |
| if (!print FH ($env{'form.'.$formname})) { |
if ($context eq 'overwrite') { |
| |
my $source = LONCAPA::tempdir().'/overwrites/'.$docudom.'/'.$docuname.'/'.$fname; |
| |
my $target = $filepath.'/'.$file; |
| |
if (-e $source) { |
| |
my @info = stat($source); |
| |
if ($info[9] eq $env{'form.timestamp'}) { |
| |
unless (&File::Copy::move($source,$target)) { |
| |
&logthis('Failed to overwrite '.$filepath.'/'.$file); |
| |
return "Moving from $source failed"; |
| |
} |
| |
} else { |
| |
return "Temporary file: $source had unexpected date/time for last modification"; |
| |
} |
| |
} else { |
| |
return "Temporary file: $source missing"; |
| |
} |
| |
} elsif (!print FH ($env{'form.'.$formname})) { |
| &logthis('Failed to write to '.$filepath.'/'.$file); |
&logthis('Failed to write to '.$filepath.'/'.$file); |
| print STDERR ('Failed to write to '.$filepath.'/'.$file."\n"); |
print STDERR ('Failed to write to '.$filepath.'/'.$file."\n"); |
| return '/adm/notfound.html'; |
return '/adm/notfound.html'; |
| } |
} |
| close(FH); |
close(FH); |
| } |
if ($resizewidth && $resizeheight) { |
| if ($parser eq 'parse') { |
my $mm = new File::MMagic; |
| my $parse_result = &extract_embedded_items($filepath.'/'.$file,$allfiles, |
my $mime_type = $mm->checktype_filename($filepath.'/'.$file); |
| $codebase); |
if ($mime_type =~ m{^image/}) { |
| unless ($parse_result eq 'ok') { |
&resizeImage($filepath.'/'.$file,$resizewidth,$resizeheight); |
| &logthis('Failed to parse '.$filepath.$file. |
} |
| ' for embedded media: '.$parse_result); |
} |
| |
} |
| |
if (($context eq 'coursedoc') || ($parser eq 'parse')) { |
| |
if (ref($mimetype)) { |
| |
if ($$mimetype eq '') { |
| |
my $mm = new File::MMagic; |
| |
my $type = $mm->checktype_filename($filepath.'/'.$file); |
| |
$$mimetype = $type; |
| |
} |
| } |
} |
| } |
} |
| |
if (($context ne 'scantron') && ($parser eq 'parse')) { |
| |
if ((ref($mimetype)) && ($$mimetype eq 'text/html')) { |
| |
my $parse_result = &extract_embedded_items($filepath.'/'.$file, |
| |
$allfiles,$codebase); |
| |
unless ($parse_result eq 'ok') { |
| |
&logthis('Failed to parse '.$filepath.$file. |
| |
' 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 2173 sub finishuserfileupload {
|
Line 4033 sub finishuserfileupload {
|
| |
|
| # Notify homeserver to grep it |
# Notify homeserver to grep it |
| # |
# |
| my $docuhome=&homeserver($docuname,$docudom); |
my $docuhome=&homeserver($docuname,$docudom); |
| my $fetchresult= &reply('fetchuserfile:'.$path.$file,$docuhome); |
my $fetchresult= &reply('fetchuserfile:'.$path.$file,$docuhome); |
| if ($fetchresult eq 'ok') { |
if ($fetchresult eq 'ok') { |
| if ($fetchthumb) { |
if ($fetchthumb) { |
|
Line 2196 sub finishuserfileupload {
|
Line 4056 sub finishuserfileupload {
|
| sub extract_embedded_items { |
sub extract_embedded_items { |
| my ($fullpath,$allfiles,$codebase,$content) = @_; |
my ($fullpath,$allfiles,$codebase,$content) = @_; |
| my @state = (); |
my @state = (); |
| |
my (%lastids,%related,%shockwave,%flashvars); |
| my %javafiles = ( |
my %javafiles = ( |
| codebase => '', |
codebase => '', |
| code => '', |
code => '', |
|
Line 2222 sub extract_embedded_items {
|
Line 4083 sub extract_embedded_items {
|
| &add_filetype($allfiles,$attr->{'src'},'src'); |
&add_filetype($allfiles,$attr->{'src'},'src'); |
| } |
} |
| if (lc($tagname) eq 'a') { |
if (lc($tagname) eq 'a') { |
| &add_filetype($allfiles,$attr->{'href'},'href'); |
unless (($attr->{'href'} =~ /^#/) || ($attr->{'href'} eq '')) { |
| |
&add_filetype($allfiles,$attr->{'href'},'href'); |
| |
} |
| } |
} |
| if (lc($tagname) eq 'script') { |
if (lc($tagname) eq 'script') { |
| |
my $src; |
| if ($attr->{'archive'} =~ /\.jar$/i) { |
if ($attr->{'archive'} =~ /\.jar$/i) { |
| &add_filetype($allfiles,$attr->{'archive'},'archive'); |
&add_filetype($allfiles,$attr->{'archive'},'archive'); |
| } else { |
} else { |
| &add_filetype($allfiles,$attr->{'src'},'src'); |
if ($attr->{'src'} ne '') { |
| |
$src = $attr->{'src'}; |
| |
&add_filetype($allfiles,$src,'src'); |
| |
} |
| |
} |
| |
my $text = $p->get_trimmed_text(); |
| |
if ($text =~ /\Qswfobject.registerObject(\E([^\)]+)\)/) { |
| |
my @swfargs = split(/,/,$1); |
| |
foreach my $item (@swfargs) { |
| |
$item =~ s/["']//g; |
| |
$item =~ s/^\s+//; |
| |
$item =~ s/\s+$//; |
| |
} |
| |
if (($swfargs[0] ne'') && ($swfargs[2] ne '')) { |
| |
if (ref($related{$swfargs[0]}) eq 'ARRAY') { |
| |
push(@{$related{$swfargs[0]}},$swfargs[2]); |
| |
} else { |
| |
$related{$swfargs[0]} = [$swfargs[2]]; |
| |
} |
| |
} |
| } |
} |
| } |
} |
| if (lc($tagname) eq 'link') { |
if (lc($tagname) eq 'link') { |
|
Line 2241 sub extract_embedded_items {
|
Line 4124 sub extract_embedded_items {
|
| foreach my $item (keys(%javafiles)) { |
foreach my $item (keys(%javafiles)) { |
| $javafiles{$item} = ''; |
$javafiles{$item} = ''; |
| } |
} |
| |
if ((lc($tagname) eq 'object') && (lc($state[-2]) ne 'object')) { |
| |
$lastids{lc($tagname)} = $attr->{'id'}; |
| |
} |
| } |
} |
| if (lc($state[-2]) eq 'object' && lc($tagname) eq 'param') { |
if (lc($state[-2]) eq 'object' && lc($tagname) eq 'param') { |
| my $name = lc($attr->{'name'}); |
my $name = lc($attr->{'name'}); |
|
Line 2250 sub extract_embedded_items {
|
Line 4136 sub extract_embedded_items {
|
| last; |
last; |
| } |
} |
| } |
} |
| |
my $pathfrom; |
| foreach my $item (keys(%mediafiles)) { |
foreach my $item (keys(%mediafiles)) { |
| if ($name eq $item) { |
if ($name eq $item) { |
| &add_filetype($allfiles, $attr->{'value'}, 'value'); |
$pathfrom = $attr->{'value'}; |
| |
$shockwave{$lastids{lc($state[-2])}} = $pathfrom; |
| |
&add_filetype($allfiles,$pathfrom,$name); |
| last; |
last; |
| } |
} |
| } |
} |
| |
if ($name eq 'flashvars') { |
| |
$flashvars{$lastids{lc($state[-2])}} = $attr->{'value'}; |
| |
} |
| |
if ($pathfrom ne '') { |
| |
&embedded_dependency($allfiles,\%related,$lastids{lc($state[-2])}, |
| |
$pathfrom); |
| |
} |
| } |
} |
| if (lc($tagname) eq 'embed' || lc($tagname) eq 'applet') { |
if (lc($tagname) eq 'embed' || lc($tagname) eq 'applet') { |
| foreach my $item (keys(%javafiles)) { |
foreach my $item (keys(%javafiles)) { |
|
Line 2270 sub extract_embedded_items {
|
Line 4166 sub extract_embedded_items {
|
| last; |
last; |
| } |
} |
| } |
} |
| |
if (lc($tagname) eq 'embed') { |
| |
if (($attr->{'name'} ne '') && ($attr->{'src'} ne '')) { |
| |
&embedded_dependency($allfiles,\%related,$attr->{'name'}, |
| |
$attr->{'src'}); |
| |
} |
| |
} |
| } |
} |
| |
if (lc($tagname) eq 'iframe') { |
| |
my $src = $attr->{'src'} ; |
| |
if (($src ne '') && ($src !~ m{^(/|https?://)})) { |
| |
&add_filetype($allfiles,$src,'src'); |
| |
} elsif ($src =~ m{^/}) { |
| |
if ($env{'request.course.id'}) { |
| |
my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| |
my $url = &hreflocation('',$fullpath); |
| |
if ($url =~ m{^/uploaded/$cdom/$cnum/docs/(\w+/\d+)/}) { |
| |
my $relpath = $1; |
| |
if ($src =~ m{^/uploaded/$cdom/$cnum/docs/\Q$relpath\E/(.+)$}) { |
| |
&add_filetype($allfiles,$1,'src'); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($t->[4] =~ m{/>$}) { |
| |
pop(@state); |
| |
} |
| } elsif ($t->[0] eq 'E') { |
} elsif ($t->[0] eq 'E') { |
| my ($tagname) = ($t->[1]); |
my ($tagname) = ($t->[1]); |
| if ($javafiles{'codebase'} ne '') { |
if ($javafiles{'codebase'} ne '') { |
|
Line 2290 sub extract_embedded_items {
|
Line 4213 sub extract_embedded_items {
|
| pop @state; |
pop @state; |
| } |
} |
| } |
} |
| |
foreach my $id (sort(keys(%flashvars))) { |
| |
if ($shockwave{$id} ne '') { |
| |
my @pairs = split(/\&/,$flashvars{$id}); |
| |
foreach my $pair (@pairs) { |
| |
my ($key,$value) = split(/\=/,$pair); |
| |
if ($key eq 'thumb') { |
| |
&add_filetype($allfiles,$value,$key); |
| |
} elsif ($key eq 'content') { |
| |
my ($path) = ($shockwave{$id} =~ m{^(.+/)[^/]+$}); |
| |
my ($ext) = ($value =~ /\.([^.]+)$/); |
| |
if ($ext ne '') { |
| |
&add_filetype($allfiles,$path.$value,$ext); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| return 'ok'; |
return 'ok'; |
| } |
} |
| |
|
|
Line 2304 sub add_filetype {
|
Line 4244 sub add_filetype {
|
| } |
} |
| } |
} |
| |
|
| |
sub embedded_dependency { |
| |
my ($allfiles,$related,$identifier,$pathfrom) = @_; |
| |
if ((ref($allfiles) eq 'HASH') && (ref($related) eq 'HASH')) { |
| |
if (($identifier ne '') && |
| |
(ref($related->{$identifier}) eq 'ARRAY') && |
| |
($pathfrom ne '')) { |
| |
my ($path) = ($pathfrom =~ m{^(.+/)[^/]+$}); |
| |
foreach my $dep (@{$related->{$identifier}}) { |
| |
&add_filetype($allfiles,$path.$dep,'object'); |
| |
} |
| |
} |
| |
} |
| |
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,-1); |
| |
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); |
| return &removeuserfile($uname,$udom,$fname); |
return &removeuserfile($uname,$udom,$fname); |
| } |
} |
| |
|
| sub removeuserfile { |
sub removeuserfile { |
| my ($docuname,$docudom,$fname)=@_; |
my ($docuname,$docudom,$fname)=@_; |
| my $home=&homeserver($docuname,$docudom); |
my $home=&homeserver($docuname,$docudom); |
| my $result = &reply("removeuserfile:$docudom/$docuname/$fname",$home); |
my $result = &reply("removeuserfile:$docudom/$docuname/$fname",$home); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| if (($fname !~ /\.meta$/) && (&is_portfolio_file($fname))) { |
if (($fname !~ /\.meta$/) && (&is_portfolio_file($fname))) { |
| my $metafile = $fname.'.meta'; |
my $metafile = $fname.'.meta'; |
| my $metaresult = &removeuserfile($docuname,$docudom,$metafile); |
my $metaresult = &removeuserfile($docuname,$docudom,$metafile); |
| my $url = "/uploaded/$docudom/$docuname/$fname"; |
my $url = "/uploaded/$docudom/$docuname/$fname"; |
| my ($file,$group) = (&parse_portfolio_url($url))[3,4]; |
my ($file,$group) = (&parse_portfolio_url($url))[3,4]; |
| my $sqlresult = |
my $sqlresult = |
| &update_portfolio_table($docuname,$docudom,$file, |
&update_portfolio_table($docuname,$docudom,$file, |
| 'portfolio_metadata',$group, |
'portfolio_metadata',$group, |
|
Line 2421 sub flushcourselogs {
|
Line 4616 sub flushcourselogs {
|
| if (! defined($dom) || $dom eq '' || |
if (! defined($dom) || $dom eq '' || |
| ! defined($name) || $name eq '') { |
! defined($name) || $name eq '') { |
| my $cid = $env{'request.course.id'}; |
my $cid = $env{'request.course.id'}; |
| |
# |
| |
# FIXME 11/29/2021 |
| |
# Typo in rev. 1.458 (2003/12/09)?? |
| |
# These should likely by $env{'course.'.$cid.'.domain'} and $env{'course.'.$cid.'.num'} |
| |
# |
| |
# While these ramain as $env{'request.'.$cid.'.domain'} and $env{'request.'.$cid.'.num'} |
| |
# $dom and $name will always be null, so the &inc() call will default to storing this data |
| |
# in a nohist_accesscount.db file for the user rather than the course. |
| |
# |
| |
# That said there is a lot of noise in the data being stored. |
| |
# So counts for prtspool/ and adm/ etc. are recorded. |
| |
# |
| |
# A review of which items ending '___count' are written to %accesshash should likely be |
| |
# made before deciding whether to set these to 'course.' instead of 'request.' |
| |
# |
| |
# Under the current scheme each user receives a nohist_accesscount.db file listing |
| |
# accesses for things which are not published resources, regardless of course, and |
| |
# there is not a nohist_accesscount.db file in a course, which might log accesses from |
| |
# anyone in the course for things which are not published resources. |
| |
# |
| |
# For an author, nohist_accesscount.db ends up having records for other items |
| |
# mixed up with the legitimate access counts for the author's published resources. |
| |
# |
| $dom = $env{'request.'.$cid.'.domain'}; |
$dom = $env{'request.'.$cid.'.domain'}; |
| $name = $env{'request.'.$cid.'.num'}; |
$name = $env{'request.'.$cid.'.num'}; |
| } |
} |
|
Line 2430 sub flushcourselogs {
|
Line 4648 sub flushcourselogs {
|
| my $result = &inc('nohist_accesscount',\%temphash,$dom,$name); |
my $result = &inc('nohist_accesscount',\%temphash,$dom,$name); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| delete $accesshash{$entry}; |
delete $accesshash{$entry}; |
| } elsif ($result eq 'unknown_cmd') { |
|
| # Target server has old code running on it. |
|
| my %temphash=($entry => $value); |
|
| if (&put('nohist_resevaldata',\%temphash,$dom,$name) eq 'ok') { |
|
| delete $accesshash{$entry}; |
|
| } |
|
| } |
} |
| } else { |
} else { |
| my ($dom,$name) = ($entry=~m{___($match_domain)/($match_name)/(.*)___(\w+)$}); |
my ($dom,$name) = ($entry=~m{___($match_domain)/($match_name)/(.*)___(\w+)$}); |
| |
if (($dom eq 'uploaded') || ($dom eq 'adm')) { next; } |
| my %temphash=($entry => $accesshash{$entry}); |
my %temphash=($entry => $accesshash{$entry}); |
| if (&put('nohist_resevaldata',\%temphash,$dom,$name) eq 'ok') { |
if (&put('nohist_resevaldata',\%temphash,$dom,$name) eq 'ok') { |
| delete $accesshash{$entry}; |
delete $accesshash{$entry}; |
|
Line 2459 sub flushcourselogs {
|
Line 4672 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)) { |
| my ($role,$uname,$udom,$runame,$rudom,$rsec)=split(/:/,$entry); |
my ($role,$uname,$udom,$runame,$rudom,$rsec)=split(/:/,$entry); |
| if ($domrolebuffer{$rudom}) { |
if ($domrolebuffer{$rudom}) { |
| $domrolebuffer{$rudom}.='&'.&escape($entry). |
$domrolebuffer{$rudom}.='&'.&escape($entry). |
|
Line 2474 sub flushcourselogs {
|
Line 4687 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 2517 sub courseacclog {
|
Line 4739 sub courseacclog {
|
| my $fnsymb=shift; |
my $fnsymb=shift; |
| unless ($env{'request.course.id'}) { return ''; } |
unless ($env{'request.course.id'}) { return ''; } |
| my $what=$fnsymb.':'.$env{'user.name'}.':'.$env{'user.domain'}; |
my $what=$fnsymb.':'.$env{'user.name'}.':'.$env{'user.domain'}; |
| if ($fnsymb=~/(problem|exam|quiz|assess|survey|form|task|page)$/) { |
if ($fnsymb=~/$LONCAPA::assess_re/) { |
| $what.=':POST'; |
$what.=':POST'; |
| # FIXME: Probably ought to escape things.... |
# FIXME: Probably ought to escape things.... |
| foreach my $key (keys(%env)) { |
foreach my $key (keys(%env)) { |
|
Line 2526 sub courseacclog {
|
Line 4748 sub courseacclog {
|
| if ($formitem =~ /^HWFILE(?:SIZE|TOOBIG)/) { |
if ($formitem =~ /^HWFILE(?:SIZE|TOOBIG)/) { |
| $what.=':'.$formitem.'='.$env{$key}; |
$what.=':'.$formitem.'='.$env{$key}; |
| } elsif ($formitem !~ /^HWFILE(?:[^.]+)$/) { |
} elsif ($formitem !~ /^HWFILE(?:[^.]+)$/) { |
| $what.=':'.$formitem.'='.$env{$key}; |
if ($formitem eq 'proctorpassword') { |
| |
$what.=':'.$formitem.'=' . '*' x length($env{$key}); |
| |
} else { |
| |
$what.=':'.$formitem.'='.$env{$key}; |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 2549 sub countacc {
|
Line 4775 sub countacc {
|
| my $url=&declutter(shift); |
my $url=&declutter(shift); |
| return if (! defined($url) || $url eq ''); |
return if (! defined($url) || $url eq ''); |
| unless ($env{'request.course.id'}) { return ''; } |
unless ($env{'request.course.id'}) { return ''; } |
| |
# |
| |
# Mark that this url was used in this course |
| |
# |
| $accesshash{$env{'request.course.id'}.'___'.$url.'___course'}=1; |
$accesshash{$env{'request.course.id'}.'___'.$url.'___course'}=1; |
| |
# |
| |
# Increase the access count for this resource in this child process |
| |
# |
| my $key=$$.$processmarker.'_'.$dumpcount.'___'.$url.'___count'; |
my $key=$$.$processmarker.'_'.$dumpcount.'___'.$url.'___count'; |
| $accesshash{$key}++; |
$accesshash{$key}++; |
| } |
} |
|
Line 2561 sub linklog {
|
Line 4793 sub linklog {
|
| $accesshash{$from.'___'.$to.'___comefrom'}=1; |
$accesshash{$from.'___'.$to.'___comefrom'}=1; |
| $accesshash{$to.'___'.$from.'___goto'}=1; |
$accesshash{$to.'___'.$from.'___goto'}=1; |
| } |
} |
| |
|
| |
sub statslog { |
| |
my ($symb,$part,$users,$av_attempts,$degdiff)=@_; |
| |
if ($users<2) { return; } |
| |
my %dynstore=&LONCAPA::lonmetadata::dynamic_metadata_storage({ |
| |
'course' => $env{'request.course.id'}, |
| |
'sections' => '"all"', |
| |
'num_students' => $users, |
| |
'part' => $part, |
| |
'symb' => $symb, |
| |
'mean_tries' => $av_attempts, |
| |
'deg_of_diff' => $degdiff}); |
| |
foreach my $key (keys(%dynstore)) { |
| |
$accesshash{$key}=$dynstore{$key}; |
| |
} |
| |
} |
| |
|
| sub userrolelog { |
sub userrolelog { |
| my ($trole,$username,$domain,$area,$tstart,$tend)=@_; |
my ($trole,$username,$domain,$area,$tstart,$tend)=@_; |
| if (($trole=~/^ca/) || ($trole=~/^aa/) || |
if ( $trole =~ /^(ca|aa|in|cc|ep|cr|ta|co)/ ) { |
| ($trole=~/^in/) || ($trole=~/^cc/) || |
|
| ($trole=~/^ep/) || ($trole=~/^cr/) || |
|
| ($trole=~/^ta/)) { |
|
| my (undef,$rudom,$runame,$rsec)=split(/\//,$area); |
my (undef,$rudom,$runame,$rsec)=split(/\//,$area); |
| $userrolehash |
$userrolehash |
| {$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec} |
{$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec} |
| =$tend.':'.$tstart; |
=$tend.':'.$tstart; |
| } |
} |
| if (($env{'request.role'} =~ /dc\./) && |
if ($env{'request.role'} =~ /dc\./ && $trole =~ /^(au|in|cc|ep|cr|ta|co)/) { |
| (($trole=~/^au/) || ($trole=~/^in/) || |
|
| ($trole=~/^cc/) || ($trole=~/^ep/) || |
|
| ($trole=~/^cr/) || ($trole=~/^ta/))) { |
|
| $userrolehash |
$userrolehash |
| {$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/) || ($trole=~/^ad/) || |
if ($trole =~ /^(dc|ad|li|au|dg|sc|dh|da)/ ) { |
| ($trole=~/^li/) || ($trole=~/^li/) || |
|
| ($trole=~/^au/) || ($trole=~/^dg/) || |
|
| ($trole=~/^sc/)) { |
|
| 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 2594 sub userrolelog {
|
Line 4833 sub userrolelog {
|
| |
|
| sub courserolelog { |
sub courserolelog { |
| my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$selfenroll,$context)=@_; |
my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$selfenroll,$context)=@_; |
| if (($trole eq 'cc') || ($trole eq 'in') || |
if ($area =~ m-^/($match_domain)/($match_courseid)/?([^/]*)-) { |
| ($trole eq 'ep') || ($trole eq 'ad') || |
my $cdom = $1; |
| ($trole eq 'ta') || ($trole eq 'st') || |
my $cnum = $2; |
| ($trole=~/^cr/) || ($trole eq 'gr')) { |
my $sec = $3; |
| if ($area =~ m-^/($match_domain)/($match_courseid)/?([^/]*)-) { |
my $namespace = 'rolelog'; |
| my $cdom = $1; |
my %storehash = ( |
| my $cnum = $2; |
role => $trole, |
| my $sec = $3; |
start => $tstart, |
| my $namespace = 'rolelog'; |
end => $tend, |
| my %storehash = ( |
selfenroll => $selfenroll, |
| role => $trole, |
context => $context, |
| start => $tstart, |
); |
| end => $tend, |
if ($trole eq 'gr') { |
| selfenroll => $selfenroll, |
$namespace = 'groupslog'; |
| context => $context, |
$storehash{'group'} = $sec; |
| ); |
} else { |
| if ($trole eq 'gr') { |
$storehash{'section'} = $sec; |
| $namespace = 'groupslog'; |
} |
| $storehash{'group'} = $sec; |
&write_log('course',$namespace,\%storehash,$delflag,$username, |
| } else { |
$domain,$cnum,$cdom); |
| $storehash{'section'} = $sec; |
if (($trole ne 'st') || ($sec ne '')) { |
| } |
&devalidate_cache_new('getcourseroles',$cdom.'_'.$cnum); |
| &instructor_log($namespace,\%storehash,$delflag,$username,$domain,$cnum,$cdom); |
|
| } |
} |
| } |
} |
| return; |
return; |
| } |
} |
| |
|
| |
sub domainrolelog { |
| |
my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$context)=@_; |
| |
if ($area =~ m{^/($match_domain)/$}) { |
| |
my $cdom = $1; |
| |
my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom); |
| |
my $namespace = 'rolelog'; |
| |
my %storehash = ( |
| |
role => $trole, |
| |
start => $tstart, |
| |
end => $tend, |
| |
context => $context, |
| |
); |
| |
&write_log('domain',$namespace,\%storehash,$delflag,$username, |
| |
$domain,$domconfiguser,$cdom); |
| |
} |
| |
return; |
| |
|
| |
} |
| |
|
| |
sub coauthorrolelog { |
| |
my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$context)=@_; |
| |
if ($area =~ m{^/($match_domain)/($match_username)$}) { |
| |
my $audom = $1; |
| |
my $auname = $2; |
| |
my $namespace = 'rolelog'; |
| |
my %storehash = ( |
| |
role => $trole, |
| |
start => $tstart, |
| |
end => $tend, |
| |
context => $context, |
| |
); |
| |
&write_log('author',$namespace,\%storehash,$delflag,$username, |
| |
$domain,$auname,$audom); |
| |
} |
| |
return; |
| |
} |
| |
|
| sub get_course_adv_roles { |
sub get_course_adv_roles { |
| my ($cid,$codes) = @_; |
my ($cid,$codes) = @_; |
| $cid=$env{'request.course.id'} unless (defined($cid)); |
$cid=$env{'request.course.id'} unless (defined($cid)); |
| my %coursehash=&coursedescription($cid); |
my %coursehash=&coursedescription($cid); |
| |
my $crstype = &Apache::loncommon::course_type($cid); |
| my %nothide=(); |
my %nothide=(); |
| foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
| if ($user !~ /:/) { |
if ($user !~ /:/) { |
|
Line 2634 sub get_course_adv_roles {
|
Line 4910 sub get_course_adv_roles {
|
| $nothide{$user}=1; |
$nothide{$user}=1; |
| } |
} |
| } |
} |
| |
my @possdoms = ($coursehash{'domain'}); |
| |
if ($coursehash{'checkforpriv'}) { |
| |
push(@possdoms,split(/,/,$coursehash{'checkforpriv'})); |
| |
} |
| my %returnhash=(); |
my %returnhash=(); |
| my %dumphash= |
my %dumphash= |
| &dump('nohist_userroles',$coursehash{'domain'},$coursehash{'num'}); |
&dump('nohist_userroles',$coursehash{'domain'},$coursehash{'num'}); |
| my $now=time; |
my $now=time; |
| foreach my $entry (keys %dumphash) { |
my %privileged; |
| |
foreach my $entry (keys(%dumphash)) { |
| my ($tend,$tstart)=split(/\:/,$dumphash{$entry}); |
my ($tend,$tstart)=split(/\:/,$dumphash{$entry}); |
| if (($tstart) && ($tstart<0)) { next; } |
if (($tstart) && ($tstart<0)) { next; } |
| if (($tend) && ($tend<$now)) { next; } |
if (($tend) && ($tend<$now)) { next; } |
| if (($tstart) && ($now<$tstart)) { next; } |
if (($tstart) && ($now<$tstart)) { next; } |
| my ($role,$username,$domain,$section)=split(/\:/,$entry); |
my ($role,$username,$domain,$section)=split(/\:/,$entry); |
| if ($username eq '' || $domain eq '') { next; } |
if ($username eq '' || $domain eq '') { next; } |
| if ((&privileged($username,$domain)) && |
if ((&privileged($username,$domain,\@possdoms)) && |
| (!$nothide{$username.':'.$domain})) { next; } |
(!$nothide{$username.':'.$domain})) { next; } |
| if ($role eq 'cr') { next; } |
if ($role eq 'cr') { next; } |
| if ($codes) { |
if ($codes) { |
| if ($section) { $role .= ':'.$section; } |
if ($section) { $role .= ':'.$section; } |
|
Line 2656 sub get_course_adv_roles {
|
Line 4937 sub get_course_adv_roles {
|
| $returnhash{$role}=$username.':'.$domain; |
$returnhash{$role}=$username.':'.$domain; |
| } |
} |
| } else { |
} else { |
| my $key=&plaintext($role); |
my $key=&plaintext($role,$crstype); |
| if ($section) { $key.=' ('.&Apache::lonlocal::mt('Section [_1]',$section).')'; } |
if ($section) { $key.=' ('.&Apache::lonlocal::mt('Section [_1]',$section).')'; } |
| if ($returnhash{$key}) { |
if ($returnhash{$key}) { |
| $returnhash{$key}.=','.$username.':'.$domain; |
$returnhash{$key}.=','.$username.':'.$domain; |
|
Line 2673 sub get_my_roles {
|
Line 4954 sub get_my_roles {
|
| unless (defined($uname)) { $uname=$env{'user.name'}; } |
unless (defined($uname)) { $uname=$env{'user.name'}; } |
| unless (defined($udom)) { $udom=$env{'user.domain'}; } |
unless (defined($udom)) { $udom=$env{'user.domain'}; } |
| my (%dumphash,%nothide); |
my (%dumphash,%nothide); |
| if ($context eq 'userroles') { |
if ($context eq 'userroles') { |
| %dumphash = &dump('roles',$udom,$uname); |
%dumphash = &dump('roles',$udom,$uname); |
| } else { |
} else { |
| %dumphash= |
%dumphash = &dump('nohist_userroles',$udom,$uname); |
| &dump('nohist_userroles',$udom,$uname); |
|
| if ($hidepriv) { |
if ($hidepriv) { |
| my %coursehash=&coursedescription($udom.'_'.$uname); |
my %coursehash=&coursedescription($udom.'_'.$uname); |
| foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
|
Line 2691 sub get_my_roles {
|
Line 4971 sub get_my_roles {
|
| } |
} |
| my %returnhash=(); |
my %returnhash=(); |
| my $now=time; |
my $now=time; |
| |
my %privileged; |
| foreach my $entry (keys(%dumphash)) { |
foreach my $entry (keys(%dumphash)) { |
| my ($role,$tend,$tstart); |
my ($role,$tend,$tstart); |
| if ($context eq 'userroles') { |
if ($context eq 'userroles') { |
| |
next if ($entry =~ /^rolesdef/); |
| ($role,$tend,$tstart)=split(/_/,$dumphash{$entry}); |
($role,$tend,$tstart)=split(/_/,$dumphash{$entry}); |
| } else { |
} else { |
| ($tend,$tstart)=split(/\:/,$dumphash{$entry}); |
($tend,$tstart)=split(/\:/,$dumphash{$entry}); |
|
Line 2717 sub get_my_roles {
|
Line 4999 sub get_my_roles {
|
| } |
} |
| my ($rolecode,$username,$domain,$section,$area); |
my ($rolecode,$username,$domain,$section,$area); |
| if ($context eq 'userroles') { |
if ($context eq 'userroles') { |
| ($area,$rolecode) = split(/_/,$entry); |
($area,$rolecode) = ($entry =~ /^(.+)_([^_]+)$/); |
| (undef,$domain,$username,$section) = split(/\//,$area); |
(undef,$domain,$username,$section) = split(/\//,$area); |
| } else { |
} else { |
| ($role,$username,$domain,$section) = split(/\:/,$entry); |
($role,$username,$domain,$section) = split(/\:/,$entry); |
|
Line 2733 sub get_my_roles {
|
Line 5015 sub get_my_roles {
|
| if (!grep(/^cr$/,@{$roles})) { |
if (!grep(/^cr$/,@{$roles})) { |
| next; |
next; |
| } |
} |
| |
} elsif ($role =~ /^gr\//) { |
| |
if (!grep(/^gr$/,@{$roles})) { |
| |
next; |
| |
} |
| } else { |
} else { |
| next; |
next; |
| } |
} |
| } |
} |
| } |
} |
| if ($hidepriv) { |
if ($hidepriv) { |
| if ((&privileged($username,$domain)) && |
my @privroles = ('dc','su'); |
| (!$nothide{$username.':'.$domain})) { |
if ($context eq 'userroles') { |
| next; |
next if (grep(/^\Q$role\E$/,@privroles)); |
| |
} else { |
| |
my $possdoms = [$domain]; |
| |
if (ref($roledoms) eq 'ARRAY') { |
| |
push(@{$possdoms},@{$roledoms}); |
| |
} |
| |
if (&privileged($username,$domain,$possdoms,\@privroles)) { |
| |
if (!$nothide{$username.':'.$domain}) { |
| |
next; |
| |
} |
| |
} |
| } |
} |
| } |
} |
| if ($withsec) { |
if ($withsec) { |
|
Line 2754 sub get_my_roles {
|
Line 5050 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 2767 sub postannounce {
|
Line 5252 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 2789 sub getannounce {
|
Line 5274 sub getannounce {
|
| |
|
| sub courseidput { |
sub courseidput { |
| my ($domain,$storehash,$coursehome,$caller) = @_; |
my ($domain,$storehash,$coursehome,$caller) = @_; |
| |
return unless (ref($storehash) eq 'HASH'); |
| my $outcome; |
my $outcome; |
| if ($caller eq 'timeonly') { |
if ($caller eq 'timeonly') { |
| my $cids = ''; |
my $cids = ''; |
|
Line 2827 sub courseidput {
|
Line 5313 sub courseidput {
|
| sub courseiddump { |
sub courseiddump { |
| my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter, |
my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter, |
| $coursefilter,$hostidflag,$hostidref,$typefilter,$regexp_ok, |
$coursefilter,$hostidflag,$hostidref,$typefilter,$regexp_ok, |
| $selfenrollonly,$catfilter,$showhidden,$caller)=@_; |
$selfenrollonly,$catfilter,$showhidden,$caller,$cloner,$cc_clone, |
| |
$cloneonly,$createdbefore,$createdafter,$creationcontext,$domcloner, |
| |
$hasuniquecode,$reqcrsdom,$reqinstcode)=@_; |
| my $as_hash = 1; |
my $as_hash = 1; |
| my %returnhash; |
my %returnhash; |
| if (!$domfilter) { $domfilter=''; } |
if (!$domfilter) { $domfilter=''; } |
|
Line 2839 sub courseiddump {
|
Line 5327 sub courseiddump {
|
| |
|
| if (($domfilter eq '') || |
if (($domfilter eq '') || |
| (&host_domain($tryserver) eq $domfilter)) { |
(&host_domain($tryserver) eq $domfilter)) { |
| my $rep = |
my $rep; |
| &reply('courseiddump:'.&host_domain($tryserver).':'. |
if (grep { $_ eq $tryserver } ¤t_machine_ids()) { |
| $sincefilter.':'.&escape($descfilter).':'. |
$rep = &LONCAPA::Lond::dump_course_id_handler( |
| &escape($instcodefilter).':'.&escape($ownerfilter). |
join(":", (&host_domain($tryserver), $sincefilter, |
| ':'.&escape($coursefilter).':'.&escape($typefilter). |
&escape($descfilter), &escape($instcodefilter), |
| ':'.&escape($regexp_ok).':'.$as_hash.':'. |
&escape($ownerfilter), &escape($coursefilter), |
| &escape($selfenrollonly).':'.&escape($catfilter).':'. |
&escape($typefilter), &escape($regexp_ok), |
| $showhidden.':'.$caller,$tryserver); |
$as_hash, &escape($selfenrollonly), |
| |
&escape($catfilter), $showhidden, $caller, |
| |
&escape($cloner), &escape($cc_clone), $cloneonly, |
| |
&escape($createdbefore), &escape($createdafter), |
| |
&escape($creationcontext),$domcloner,$hasuniquecode, |
| |
$reqcrsdom,&escape($reqinstcode)))); |
| |
} else { |
| |
$rep = &reply('courseiddump:'.&host_domain($tryserver).':'. |
| |
$sincefilter.':'.&escape($descfilter).':'. |
| |
&escape($instcodefilter).':'.&escape($ownerfilter). |
| |
':'.&escape($coursefilter).':'.&escape($typefilter). |
| |
':'.&escape($regexp_ok).':'.$as_hash.':'. |
| |
&escape($selfenrollonly).':'.&escape($catfilter).':'. |
| |
$showhidden.':'.$caller.':'.&escape($cloner).':'. |
| |
&escape($cc_clone).':'.$cloneonly.':'. |
| |
&escape($createdbefore).':'.&escape($createdafter).':'. |
| |
&escape($creationcontext).':'.$domcloner.':'.$hasuniquecode. |
| |
':'.$reqcrsdom.':'.&escape($reqinstcode),$tryserver); |
| |
} |
| |
|
| my @pairs=split(/\&/,$rep); |
my @pairs=split(/\&/,$rep); |
| foreach my $item (@pairs) { |
foreach my $item (@pairs) { |
| my ($key,$value)=split(/\=/,$item,2); |
my ($key,$value)=split(/\=/,$item,2); |
|
Line 2861 sub courseiddump {
|
Line 5368 sub courseiddump {
|
| for (my $i=0; $i<@responses; $i++) { |
for (my $i=0; $i<@responses; $i++) { |
| $returnhash{$key}{$items[$i]} = &unescape($responses[$i]); |
$returnhash{$key}{$items[$i]} = &unescape($responses[$i]); |
| } |
} |
| } |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 2869 sub courseiddump {
|
Line 5376 sub courseiddump {
|
| return %returnhash; |
return %returnhash; |
| } |
} |
| |
|
| |
sub courselastaccess { |
| |
my ($cdom,$cnum,$hostidref) = @_; |
| |
my %returnhash; |
| |
if ($cdom && $cnum) { |
| |
my $chome = &homeserver($cnum,$cdom); |
| |
if ($chome ne 'no_host') { |
| |
my $rep = &reply('courselastaccess:'.$cdom.':'.$cnum,$chome); |
| |
&extract_lastaccess(\%returnhash,$rep); |
| |
} |
| |
} else { |
| |
if (!$cdom) { $cdom=''; } |
| |
my %libserv = &all_library(); |
| |
foreach my $tryserver (keys(%libserv)) { |
| |
if (ref($hostidref) eq 'ARRAY') { |
| |
next unless (grep(/^\Q$tryserver\E$/,@{$hostidref})); |
| |
} |
| |
if (($cdom eq '') || (&host_domain($tryserver) eq $cdom)) { |
| |
my $rep = &reply('courselastaccess:'.&host_domain($tryserver).':',$tryserver); |
| |
&extract_lastaccess(\%returnhash,$rep); |
| |
} |
| |
} |
| |
} |
| |
return %returnhash; |
| |
} |
| |
|
| |
sub extract_lastaccess { |
| |
my ($returnhash,$rep) = @_; |
| |
if (ref($returnhash) eq 'HASH') { |
| |
unless ($rep eq 'unknown_command' || $rep eq 'no_such_host' || |
| |
$rep eq 'con_lost' || $rep eq 'rejected' || $rep eq 'refused' || |
| |
$rep eq '') { |
| |
my @pairs=split(/\&/,$rep); |
| |
foreach my $item (@pairs) { |
| |
my ($key,$value)=split(/\=/,$item,2); |
| |
$key = &unescape($key); |
| |
next if ($key =~ /^error: 2 /); |
| |
$returnhash->{$key} = &thaw_unescape($value); |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| # ---------------------------------------------------------- DC e-mail |
# ---------------------------------------------------------- DC e-mail |
| |
|
| sub dcmailput { |
sub dcmailput { |
|
Line 2901 sub dcmaildump {
|
Line 5451 sub dcmaildump {
|
| |
|
| sub get_domain_roles { |
sub get_domain_roles { |
| my ($dom,$roles,$startdate,$enddate)=@_; |
my ($dom,$roles,$startdate,$enddate)=@_; |
| if (undef($startdate) || $startdate eq '') { |
if ((!defined($startdate)) || ($startdate eq '')) { |
| $startdate = '.'; |
$startdate = '.'; |
| } |
} |
| if (undef($enddate) || $enddate eq '') { |
if ((!defined($enddate)) || ($enddate eq '')) { |
| $enddate = '.'; |
$enddate = '.'; |
| } |
} |
| my $rolelist; |
my $rolelist; |
| if (ref($roles) eq 'ARRAY') { |
if (ref($roles) eq 'ARRAY') { |
| $rolelist = join(':',@{$roles}); |
$rolelist = join('&',@{$roles}); |
| } |
} |
| my %personnel = (); |
my %personnel = (); |
| |
|
|
Line 2929 sub get_domain_roles {
|
Line 5479 sub get_domain_roles {
|
| return %personnel; |
return %personnel; |
| } |
} |
| |
|
| # ----------------------------------------------------------- Check out an item |
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 |
| |
|
| |
{ |
| |
# Caches needed for speedup of navmaps |
| |
# We don't want to cache this for very long at all (5 seconds at most) |
| |
# |
| |
# The user for whom we cache |
| |
my $cachedkey=''; |
| |
# The cached times for this user |
| |
my %cachedtimes=(); |
| |
# When this was last done |
| |
my $cachedtime=''; |
| |
|
| |
sub load_all_first_access { |
| |
my ($uname,$udom)=@_; |
| |
if (($cachedkey eq $uname.':'.$udom) && |
| |
(abs($cachedtime-time)<5) && (!$env{'form.markaccess'})) { |
| |
return; |
| |
} |
| |
$cachedtime=time; |
| |
$cachedkey=$uname.':'.$udom; |
| |
%cachedtimes=&dump('firstaccesstimes',$udom,$uname); |
| |
} |
| |
|
| sub get_first_access { |
sub get_first_access { |
| my ($type,$argsymb)=@_; |
my ($type,$argsymb,$argmap)=@_; |
| my ($symb,$courseid,$udom,$uname)=&whichuser(); |
my ($symb,$courseid,$udom,$uname)=&whichuser(); |
| if ($argsymb) { $symb=$argsymb; } |
if ($argsymb) { $symb=$argsymb; } |
| my ($map,$id,$res)=&decode_symb($symb); |
my ($map,$id,$res)=&decode_symb($symb); |
| |
if ($argmap) { $map = $argmap; } |
| if ($type eq 'course') { |
if ($type eq 'course') { |
| $res='course'; |
$res='course'; |
| } elsif ($type eq 'map') { |
} elsif ($type eq 'map') { |
|
Line 2943 sub get_first_access {
|
Line 5531 sub get_first_access {
|
| } else { |
} else { |
| $res=$symb; |
$res=$symb; |
| } |
} |
| my %times=&get('firstaccesstimes',["$courseid\0$res"],$udom,$uname); |
&load_all_first_access($uname,$udom); |
| return $times{"$courseid\0$res"}; |
return $cachedtimes{"$courseid\0$res"}; |
| } |
} |
| |
|
| sub set_first_access { |
sub set_first_access { |
| my ($type)=@_; |
my ($type,$interval)=@_; |
| my ($symb,$courseid,$udom,$uname)=&whichuser(); |
my ($symb,$courseid,$udom,$uname)=&whichuser(); |
| my ($map,$id,$res)=&decode_symb($symb); |
my ($map,$id,$res)=&decode_symb($symb); |
| if ($type eq 'course') { |
if ($type eq 'course') { |
|
Line 2958 sub set_first_access {
|
Line 5546 sub set_first_access {
|
| } else { |
} else { |
| $res=$symb; |
$res=$symb; |
| } |
} |
| my $firstaccess=&get_first_access($type,$symb); |
$cachedkey=''; |
| if (!$firstaccess) { |
my $firstaccess=&get_first_access($type,$symb,$map); |
| return &put('firstaccesstimes',{"$courseid\0$res"=>time},$udom,$uname); |
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 $putres = &put('firstaccesstimes',{"$courseid\0$res"=>$start}, |
| |
$udom,$uname); |
| |
if ($putres eq 'ok') { |
| |
&put('timerinterval',{"$courseid\0$res"=>$interval}, |
| |
$udom,$uname); |
| |
&appenv( |
| |
{ |
| |
'course.'.$courseid.'.firstaccess.'.$res => $start, |
| |
'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 'already_set'; |
return 'already_set'; |
| } |
} |
| |
} |
| |
|
| sub checkout { |
sub checkout { |
| my ($symb,$tuname,$tudom,$tcrsid)=@_; |
my ($symb,$tuname,$tudom,$tcrsid)=@_; |
| my $now=time; |
my $now=time; |
| my $lonhost=$perlvar{'lonHostID'}; |
my $lonhost=$perlvar{'lonHostID'}; |
| |
my $ip = &get_requestor_ip(); |
| my $infostr=&escape( |
my $infostr=&escape( |
| 'CHECKOUTTOKEN&'. |
'CHECKOUTTOKEN&'. |
| $tuname.'&'. |
$tuname.'&'. |
| $tudom.'&'. |
$tudom.'&'. |
| $tcrsid.'&'. |
$tcrsid.'&'. |
| $symb.'&'. |
$symb.'&'. |
| $now.'&'.$ENV{'REMOTE_ADDR'}); |
$now.'&'.$ip); |
| my $token=&reply('tmpput:'.$infostr,$lonhost); |
my $token=&reply('tmpput:'.$infostr,$lonhost); |
| if ($token=~/^error\:/) { |
if ($token=~/^error\:/) { |
| &logthis("<font color=\"blue\">WARNING: ". |
&logthis("<font color=\"blue\">WARNING: ". |
| "Checkout tmpput failed ".$tudom.' - '.$tuname.' - '.$symb. |
"Checkout tmpput failed ".$tudom.' - '.$tuname.' - '.$symb. |
| "</font>"); |
"</font>"); |
| return ''; |
return ''; |
| } |
} |
| |
|
| $token=~s/^(\d+)\_.*\_(\d+)$/$1\*$2\*$lonhost/; |
$token=~s/^(\d+)\_.*\_(\d+)$/$1\*$2\*$lonhost/; |
|
Line 2989 sub checkout {
|
Line 5604 sub checkout {
|
| |
|
| my %infohash=('resource.0.outtoken' => $token, |
my %infohash=('resource.0.outtoken' => $token, |
| 'resource.0.checkouttime' => $now, |
'resource.0.checkouttime' => $now, |
| 'resource.0.outremote' => $ENV{'REMOTE_ADDR'}); |
'resource.0.outremote' => $ip); |
| |
|
| unless (&cstore(\%infohash,$symb,$tcrsid,$tudom,$tuname) eq 'ok') { |
unless (&cstore(\%infohash,$symb,$tcrsid,$tudom,$tuname) eq 'ok') { |
| return ''; |
return ''; |
|
Line 2997 sub checkout {
|
Line 5612 sub checkout {
|
| &logthis("<font color=\"blue\">WARNING: ". |
&logthis("<font color=\"blue\">WARNING: ". |
| "Checkout cstore failed ".$tudom.' - '.$tuname.' - '.$symb. |
"Checkout cstore failed ".$tudom.' - '.$tuname.' - '.$symb. |
| "</font>"); |
"</font>"); |
| } |
} |
| |
|
| if (&log($tudom,$tuname,&homeserver($tuname,$tudom), |
if (&log($tudom,$tuname,&homeserver($tuname,$tudom), |
| &escape('Checkout '.$infostr.' - '. |
&escape('Checkout '.$infostr.' - '. |
| $token)) ne 'ok') { |
$token)) ne 'ok') { |
| return ''; |
return ''; |
| } else { |
} else { |
| &logthis("<font color=\"blue\">WARNING: ". |
&logthis("<font color=\"blue\">WARNING: ". |
| "Checkout log failed ".$tudom.' - '.$tuname.' - '.$symb. |
"Checkout log failed ".$tudom.' - '.$tuname.' - '.$symb. |
|
Line 3020 sub checkin {
|
Line 5635 sub checkin {
|
| $lonhost=~tr/A-Z/a-z/; |
$lonhost=~tr/A-Z/a-z/; |
| my $dtoken=$ta.'_'.&hostname($lonhost).'_'.$tb; |
my $dtoken=$ta.'_'.&hostname($lonhost).'_'.$tb; |
| $dtoken=~s/\W/\_/g; |
$dtoken=~s/\W/\_/g; |
| |
my $ip = &get_requestor_ip(); |
| my ($dummy,$tuname,$tudom,$tcrsid,$symb,$chtim,$rmaddr)= |
my ($dummy,$tuname,$tudom,$tcrsid,$symb,$chtim,$rmaddr)= |
| split(/\&/,&unescape(&reply('tmpget:'.$dtoken,$lonhost))); |
split(/\&/,&unescape(&reply('tmpget:'.$dtoken,$lonhost))); |
| |
|
|
Line 3027 sub checkin {
|
Line 5643 sub checkin {
|
| &logthis('Check in '.$token.' ('.$dtoken.') failed'); |
&logthis('Check in '.$token.' ('.$dtoken.') failed'); |
| return ''; |
return ''; |
| } |
} |
| |
|
| unless (&allowed('mgr',$tcrsid)) { |
unless (&allowed('mgr',$tcrsid)) { |
| &logthis('Check in '.$token.' ('.$dtoken.') unauthorized: '. |
&logthis('Check in '.$token.' ('.$dtoken.') unauthorized: '. |
| $env{'user.name'}.' - '.$env{'user.domain'}); |
$env{'user.name'}.' - '.$env{'user.domain'}); |
|
Line 3036 sub checkin {
|
Line 5652 sub checkin {
|
| |
|
| my %infohash=('resource.0.intoken' => $token, |
my %infohash=('resource.0.intoken' => $token, |
| 'resource.0.checkintime' => $now, |
'resource.0.checkintime' => $now, |
| 'resource.0.inremote' => $ENV{'REMOTE_ADDR'}); |
'resource.0.inremote' => $ip); |
| |
|
| unless (&cstore(\%infohash,$symb,$tcrsid,$tudom,$tuname) eq 'ok') { |
unless (&cstore(\%infohash,$symb,$tcrsid,$tudom,$tuname) eq 'ok') { |
| return ''; |
return ''; |
| } |
} |
| |
|
| if (&log($tudom,$tuname,&homeserver($tuname,$tudom), |
if (&log($tudom,$tuname,&homeserver($tuname,$tudom), |
| &escape('Checkin - '.$token)) ne 'ok') { |
&escape('Checkin - '.$token)) ne 'ok') { |
| return ''; |
return ''; |
| } |
} |
| |
|
| return ($symb,$tuname,$tudom,$tcrsid); |
return ($symb,$tuname,$tudom,$tcrsid); |
| } |
} |
| |
|
| # --------------------------------------------- Set Expire Date for Spreadsheet |
# --------------------------------------------- Set Expire Date for Spreadsheet |
|
Line 3154 sub hashref2str {
|
Line 5770 sub hashref2str {
|
| $result.='='; |
$result.='='; |
| #print("Got a ref of ".(ref($key))." skipping."); |
#print("Got a ref of ".(ref($key))." skipping."); |
| } else { |
} else { |
| if ($key) {$result.=&escape($key).'=';} else { last; } |
if (defined($key)) {$result.=&escape($key).'=';} else { last; } |
| } |
} |
| |
|
| if(ref($hashref->{$key}) eq 'ARRAY') { |
if(ref($hashref->{$key}) eq 'ARRAY') { |
|
Line 3304 sub tmpreset {
|
Line 5920 sub tmpreset {
|
| if (!$domain) { $domain=$env{'user.domain'}; } |
if (!$domain) { $domain=$env{'user.domain'}; } |
| if (!$stuname) { $stuname=$env{'user.name'}; } |
if (!$stuname) { $stuname=$env{'user.name'}; } |
| if ($domain eq 'public' && $stuname eq 'public') { |
if ($domain eq 'public' && $stuname eq 'public') { |
| $stuname=$ENV{'REMOTE_ADDR'}; |
$stuname=&get_requestor_ip(); |
| } |
} |
| my $path=$perlvar{'lonDaemons'}.'/tmp'; |
my $path=LONCAPA::tempdir(); |
| my %hash; |
my %hash; |
| if (tie(%hash,'GDBM_File', |
if (tie(%hash,'GDBM_File', |
| $path.'/tmpstore_'.$stuname.'_'.$domain.'_'.$namespace.'.db', |
$path.'/tmpstore_'.$stuname.'_'.$domain.'_'.$namespace.'.db', |
| &GDBM_WRCREAT(),0640)) { |
&GDBM_WRCREAT(),0640)) { |
| foreach my $key (keys %hash) { |
foreach my $key (keys(%hash)) { |
| if ($key=~ /:$symb/) { |
if ($key=~ /:$symb/) { |
| delete($hash{$key}); |
delete($hash{$key}); |
| } |
} |
|
Line 3341 sub tmpstore {
|
Line 5957 sub tmpstore {
|
| if (!$domain) { $domain=$env{'user.domain'}; } |
if (!$domain) { $domain=$env{'user.domain'}; } |
| if (!$stuname) { $stuname=$env{'user.name'}; } |
if (!$stuname) { $stuname=$env{'user.name'}; } |
| if ($domain eq 'public' && $stuname eq 'public') { |
if ($domain eq 'public' && $stuname eq 'public') { |
| $stuname=$ENV{'REMOTE_ADDR'}; |
$stuname=&get_requestor_ip(); |
| } |
} |
| my $now=time; |
my $now=time; |
| my %hash; |
my %hash; |
| my $path=$perlvar{'lonDaemons'}.'/tmp'; |
my $path=LONCAPA::tempdir(); |
| if (tie(%hash,'GDBM_File', |
if (tie(%hash,'GDBM_File', |
| $path.'/tmpstore_'.$stuname.'_'.$domain.'_'.$namespace.'.db', |
$path.'/tmpstore_'.$stuname.'_'.$domain.'_'.$namespace.'.db', |
| &GDBM_WRCREAT(),0640)) { |
&GDBM_WRCREAT(),0640)) { |
|
Line 3385 sub tmprestore {
|
Line 6001 sub tmprestore {
|
| if (!$domain) { $domain=$env{'user.domain'}; } |
if (!$domain) { $domain=$env{'user.domain'}; } |
| if (!$stuname) { $stuname=$env{'user.name'}; } |
if (!$stuname) { $stuname=$env{'user.name'}; } |
| if ($domain eq 'public' && $stuname eq 'public') { |
if ($domain eq 'public' && $stuname eq 'public') { |
| $stuname=$ENV{'REMOTE_ADDR'}; |
$stuname=&get_requestor_ip(); |
| } |
} |
| my %returnhash; |
my %returnhash; |
| $namespace=~s/\//\_/g; |
$namespace=~s/\//\_/g; |
| $namespace=~s/\W//g; |
$namespace=~s/\W//g; |
| my %hash; |
my %hash; |
| my $path=$perlvar{'lonDaemons'}.'/tmp'; |
my $path=LONCAPA::tempdir(); |
| if (tie(%hash,'GDBM_File', |
if (tie(%hash,'GDBM_File', |
| $path.'/tmpstore_'.$stuname.'_'.$domain.'_'.$namespace.'.db', |
$path.'/tmpstore_'.$stuname.'_'.$domain.'_'.$namespace.'.db', |
| &GDBM_READER(),0640)) { |
&GDBM_READER(),0640)) { |
|
Line 3420 sub tmprestore {
|
Line 6036 sub tmprestore {
|
| # ----------------------------------------------------------------------- Store |
# ----------------------------------------------------------------------- Store |
| |
|
| sub store { |
sub store { |
| my ($storehash,$symb,$namespace,$domain,$stuname) = @_; |
my ($storehash,$symb,$namespace,$domain,$stuname,$laststore) = @_; |
| my $home=''; |
my $home=''; |
| |
|
| if ($stuname) { $home=&homeserver($stuname,$domain); } |
if ($stuname) { $home=&homeserver($stuname,$domain); } |
|
Line 3441 sub store {
|
Line 6057 sub store {
|
| } |
} |
| if (!$home) { $home=$env{'user.home'}; } |
if (!$home) { $home=$env{'user.home'}; } |
| |
|
| $$storehash{'ip'}=$ENV{'REMOTE_ADDR'}; |
$$storehash{'ip'}=&get_requestor_ip(); |
| $$storehash{'host'}=$perlvar{'lonHostID'}; |
$$storehash{'host'}=$perlvar{'lonHostID'}; |
| |
|
| my $namevalue=''; |
my $namevalue=''; |
|
Line 3450 sub store {
|
Line 6066 sub store {
|
| } |
} |
| $namevalue=~s/\&$//; |
$namevalue=~s/\&$//; |
| &courselog($symb.':'.$stuname.':'.$domain.':STORE:'.$namevalue); |
&courselog($symb.':'.$stuname.':'.$domain.':STORE:'.$namevalue); |
| return reply("store:$domain:$stuname:$namespace:$symb:$namevalue","$home"); |
return reply("store:$domain:$stuname:$namespace:$symb:$namevalue:$laststore","$home"); |
| } |
} |
| |
|
| # -------------------------------------------------------------- Critical Store |
# -------------------------------------------------------------- Critical Store |
| |
|
| sub cstore { |
sub cstore { |
| my ($storehash,$symb,$namespace,$domain,$stuname) = @_; |
my ($storehash,$symb,$namespace,$domain,$stuname,$laststore) = @_; |
| my $home=''; |
my $home=''; |
| |
|
| if ($stuname) { $home=&homeserver($stuname,$domain); } |
if ($stuname) { $home=&homeserver($stuname,$domain); } |
|
Line 3477 sub cstore {
|
Line 6093 sub cstore {
|
| } |
} |
| if (!$home) { $home=$env{'user.home'}; } |
if (!$home) { $home=$env{'user.home'}; } |
| |
|
| $$storehash{'ip'}=$ENV{'REMOTE_ADDR'}; |
$$storehash{'ip'}=&get_requestor_ip(); |
| $$storehash{'host'}=$perlvar{'lonHostID'}; |
$$storehash{'host'}=$perlvar{'lonHostID'}; |
| |
|
| my $namevalue=''; |
my $namevalue=''; |
|
Line 3487 sub cstore {
|
Line 6103 sub cstore {
|
| $namevalue=~s/\&$//; |
$namevalue=~s/\&$//; |
| &courselog($symb.':'.$stuname.':'.$domain.':CSTORE:'.$namevalue); |
&courselog($symb.':'.$stuname.':'.$domain.':CSTORE:'.$namevalue); |
| return critical |
return critical |
| ("store:$domain:$stuname:$namespace:$symb:$namevalue","$home"); |
("store:$domain:$stuname:$namespace:$symb:$namevalue:$laststore","$home"); |
| } |
} |
| |
|
| # --------------------------------------------------------------------- Restore |
# --------------------------------------------------------------------- Restore |
|
Line 3499 sub restore {
|
Line 6115 sub restore {
|
| if ($stuname) { $home=&homeserver($stuname,$domain); } |
if ($stuname) { $home=&homeserver($stuname,$domain); } |
| |
|
| if (!$symb) { |
if (!$symb) { |
| unless ($symb=escape(&symbread())) { return ''; } |
return if ($namespace eq 'courserequests'); |
| |
unless ($symb=escape(&symbread())) { return ''; } |
| } else { |
} else { |
| $symb=&escape(&symbclean($symb)); |
unless ($namespace eq 'courserequests') { |
| |
$symb=&escape(&symbclean($symb)); |
| |
} |
| } |
} |
| if (!$namespace) { |
if (!$namespace) { |
| unless ($namespace=$env{'request.course.id'}) { |
unless ($namespace=$env{'request.course.id'}) { |
|
Line 3528 sub restore {
|
Line 6147 sub restore {
|
| } |
} |
| |
|
| # ---------------------------------------------------------- Course Description |
# ---------------------------------------------------------- Course Description |
| |
# |
| |
# |
| |
|
| sub coursedescription { |
sub coursedescription { |
| my ($courseid,$args)=@_; |
my ($courseid,$args)=@_; |
|
Line 3557 sub coursedescription {
|
Line 6178 sub coursedescription {
|
| return %returnhash; |
return %returnhash; |
| } |
} |
| |
|
| # get the data agin |
# get the data again |
| |
|
| if (!$args->{'one_time'}) { |
if (!$args->{'one_time'}) { |
| $envhash{'course.'.$normalid.'.last_cache'}=time; |
$envhash{'course.'.$normalid.'.last_cache'}=time; |
| } |
} |
|
Line 3565 sub coursedescription {
|
Line 6187 sub coursedescription {
|
| if ($chome ne 'no_host') { |
if ($chome ne 'no_host') { |
| %returnhash=&dump('environment',$cdomain,$cnum); |
%returnhash=&dump('environment',$cdomain,$cnum); |
| if (!exists($returnhash{'con_lost'})) { |
if (!exists($returnhash{'con_lost'})) { |
| |
my $username = $env{'user.name'}; # Defult username |
| |
if(defined $args->{'user'}) { |
| |
$username = $args->{'user'}; |
| |
} |
| $returnhash{'home'}= $chome; |
$returnhash{'home'}= $chome; |
| $returnhash{'domain'} = $cdomain; |
$returnhash{'domain'} = $cdomain; |
| $returnhash{'num'} = $cnum; |
$returnhash{'num'} = $cnum; |
|
Line 3575 sub coursedescription {
|
Line 6201 sub coursedescription {
|
| $envhash{'course.'.$normalid.'.'.$name}=$value; |
$envhash{'course.'.$normalid.'.'.$name}=$value; |
| } |
} |
| $returnhash{'url'}=&clutter($returnhash{'url'}); |
$returnhash{'url'}=&clutter($returnhash{'url'}); |
| $returnhash{'fn'}=$perlvar{'lonDaemons'}.'/tmp/'. |
$returnhash{'fn'}=LONCAPA::tempdir() . |
| $env{'user.name'}.'_'.$cdomain.'_'.$cnum; |
$username.'_'.$cdomain.'_'.$cnum; |
| $envhash{'course.'.$normalid.'.home'}=$chome; |
$envhash{'course.'.$normalid.'.home'}=$chome; |
| $envhash{'course.'.$normalid.'.domain'}=$cdomain; |
$envhash{'course.'.$normalid.'.domain'}=$cdomain; |
| $envhash{'course.'.$normalid.'.num'}=$cnum; |
$envhash{'course.'.$normalid.'.num'}=$cnum; |
|
Line 3588 sub coursedescription {
|
Line 6214 sub coursedescription {
|
| return %returnhash; |
return %returnhash; |
| } |
} |
| |
|
| |
sub update_released_required { |
| |
my ($needsrelease,$cdom,$cnum,$chome,$cid) = @_; |
| |
if ($cdom eq '' || $cnum eq '' || $chome eq '' || $cid eq '') { |
| |
$cid = $env{'request.course.id'}; |
| |
$cdom = $env{'course.'.$cid.'.domain'}; |
| |
$cnum = $env{'course.'.$cid.'.num'}; |
| |
$chome = $env{'course.'.$cid.'.home'}; |
| |
} |
| |
if ($needsrelease) { |
| |
my %curr_reqd_hash = &userenvironment($cdom,$cnum,'internal.releaserequired'); |
| |
my $needsupdate; |
| |
if ($curr_reqd_hash{'internal.releaserequired'} eq '') { |
| |
$needsupdate = 1; |
| |
} else { |
| |
my ($currmajor,$currminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'}); |
| |
my ($needsmajor,$needsminor) = split(/\./,$needsrelease); |
| |
if (($currmajor < $needsmajor) || ($currmajor == $needsmajor && $currminor < $needsminor)) { |
| |
$needsupdate = 1; |
| |
} |
| |
} |
| |
if ($needsupdate) { |
| |
my %needshash = ( |
| |
'internal.releaserequired' => $needsrelease, |
| |
); |
| |
my $putresult = &put('environment',\%needshash,$cdom,$cnum); |
| |
if ($putresult eq 'ok') { |
| |
&appenv({'course.'.$cid.'.internal.releaserequired' => $needsrelease}); |
| |
my %crsinfo = &courseiddump($cdom,'.',1,'.','.',$cnum,undef,undef,'.'); |
| |
if (ref($crsinfo{$cid}) eq 'HASH') { |
| |
$crsinfo{$cid}{'releaserequired'} = $needsrelease; |
| |
&courseidput($cdom,\%crsinfo,$chome,'notime'); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| # -------------------------------------------------See if a user is privileged |
# -------------------------------------------------See if a user is privileged |
| |
|
| sub privileged { |
sub privileged { |
| my ($username,$domain)=@_; |
my ($username,$domain,$possdomains,$possroles)=@_; |
| my $rolesdump=&reply("dump:$domain:$username:roles", |
my $now = time; |
| &homeserver($username,$domain)); |
my $roles; |
| if (($rolesdump eq 'con_lost') || ($rolesdump eq '')) { return 0; } |
if (ref($possroles) eq 'ARRAY') { |
| my $now=time; |
$roles = $possroles; |
| if ($rolesdump ne '') { |
} else { |
| foreach my $entry (split(/&/,$rolesdump)) { |
$roles = ['dc','su']; |
| if ($entry!~/^rolesdef_/) { |
} |
| my ($area,$role)=split(/=/,$entry); |
if (ref($possdomains) eq 'ARRAY') { |
| $area=~s/\_\w\w$//; |
my %privileged = &privileged_by_domain($possdomains,$roles); |
| my ($trole,$tend,$tstart)=split(/_/,$role); |
foreach my $dom (@{$possdomains}) { |
| if (($trole eq 'dc') || ($trole eq 'su')) { |
if (($username =~ /^$match_username$/) && ($domain =~ /^$match_domain$/) && |
| my $active=1; |
(ref($privileged{$dom}) eq 'HASH')) { |
| if ($tend) { |
foreach my $role (@{$roles}) { |
| if ($tend<$now) { $active=0; } |
if (ref($privileged{$dom}{$role}) eq 'HASH') { |
| } |
if (exists($privileged{$dom}{$role}{$username.':'.$domain})) { |
| if ($tstart) { |
my ($end,$start) = split(/:/,$privileged{$dom}{$role}{$username.':'.$domain}); |
| if ($tstart>$now) { $active=0; } |
return 1 unless (($end && $end < $now) || |
| } |
($start && $start > $now)); |
| if ($active) { return 1; } |
} |
| } |
} |
| } |
} |
| } |
} |
| |
} |
| |
} else { |
| |
my %rolesdump = &dump("roles", $domain, $username) or return 0; |
| |
my $now = time; |
| |
|
| |
for my $role (@rolesdump{grep { ! /^rolesdef_/ } keys(%rolesdump)}) { |
| |
my ($trole, $tend, $tstart) = split(/_/, $role); |
| |
if (grep(/^\Q$trole\E$/,@{$roles})) { |
| |
return 1 unless ($tend && $tend < $now) |
| |
or ($tstart && $tstart > $now); |
| |
} |
| |
} |
| } |
} |
| return 0; |
return 0; |
| } |
} |
| |
|
| |
sub privileged_by_domain { |
| |
my ($domains,$roles) = @_; |
| |
my %privileged = (); |
| |
my $cachetime = 60*60*24; |
| |
my $now = time; |
| |
unless ((ref($domains) eq 'ARRAY') && (ref($roles) eq 'ARRAY')) { |
| |
return %privileged; |
| |
} |
| |
foreach my $dom (@{$domains}) { |
| |
next if (ref($privileged{$dom}) eq 'HASH'); |
| |
my $needroles; |
| |
foreach my $role (@{$roles}) { |
| |
my ($result,$cached)=&is_cached_new('priv_'.$role,$dom); |
| |
if (defined($cached)) { |
| |
if (ref($result) eq 'HASH') { |
| |
$privileged{$dom}{$role} = $result; |
| |
} |
| |
} else { |
| |
$needroles = 1; |
| |
} |
| |
} |
| |
if ($needroles) { |
| |
my %dompersonnel = &get_domain_roles($dom,$roles); |
| |
$privileged{$dom} = {}; |
| |
foreach my $server (keys(%dompersonnel)) { |
| |
if (ref($dompersonnel{$server}) eq 'HASH') { |
| |
foreach my $item (keys(%{$dompersonnel{$server}})) { |
| |
my ($trole,$uname,$udom,$rest) = split(/:/,$item,4); |
| |
my ($end,$start) = split(/:/,$dompersonnel{$server}{$item}); |
| |
next if ($end && $end < $now); |
| |
$privileged{$dom}{$trole}{$uname.':'.$udom} = |
| |
$dompersonnel{$server}{$item}; |
| |
} |
| |
} |
| |
} |
| |
if (ref($privileged{$dom}) eq 'HASH') { |
| |
foreach my $role (@{$roles}) { |
| |
if (ref($privileged{$dom}{$role}) eq 'HASH') { |
| |
&do_cache_new('priv_'.$role,$dom,$privileged{$dom}{$role},$cachetime); |
| |
} else { |
| |
my %hash = (); |
| |
&do_cache_new('priv_'.$role,$dom,\%hash,$cachetime); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return %privileged; |
| |
} |
| |
|
| # -------------------------------------------------------- Get user privileges |
# -------------------------------------------------------- Get user privileges |
| |
|
| sub rolesinit { |
sub rolesinit { |
| my ($domain,$username,$authhost)=@_; |
my ($domain, $username) = @_; |
| my %userroles; |
my %userroles = ('user.login.time' => time); |
| my $rolesdump=reply("dump:$domain:$username:roles",$authhost); |
my %rolesdump = &dump("roles", $domain, $username) or return \%userroles; |
| if (($rolesdump eq 'con_lost') || ($rolesdump eq '')) { return \%userroles; } |
|
| |
# firstaccess and timerinterval are related to timed maps/resources. |
| |
# also, blocking can be triggered by an activating timer |
| |
# it's saved in the user's %env. |
| |
my %firstaccess = &dump('firstaccesstimes', $domain, $username); |
| |
my %timerinterval = &dump('timerinterval', $domain, $username); |
| |
my (%coursetimerstarts, %firstaccchk, %firstaccenv, %coursetimerintervals, |
| |
%timerintchk, %timerintenv); |
| |
|
| |
foreach my $key (keys(%firstaccess)) { |
| |
my ($cid, $rest) = split(/\0/, $key); |
| |
$coursetimerstarts{$cid}{$rest} = $firstaccess{$key}; |
| |
} |
| |
|
| |
foreach my $key (keys(%timerinterval)) { |
| |
my ($cid,$rest) = split(/\0/,$key); |
| |
$coursetimerintervals{$cid}{$rest} = $timerinterval{$key}; |
| |
} |
| |
|
| my %allroles=(); |
my %allroles=(); |
| my %allgroups=(); |
my %allgroups=(); |
| my $now=time; |
|
| %userroles = ('user.login.time' => $now); |
|
| my $group_privs; |
|
| |
|
| if ($rolesdump ne '') { |
for my $area (grep { ! /^rolesdef_/ } keys(%rolesdump)) { |
| foreach my $entry (split(/&/,$rolesdump)) { |
my $role = $rolesdump{$area}; |
| if ($entry!~/^rolesdef_/) { |
$area =~ s/\_\w\w$//; |
| my ($area,$role)=split(/=/,$entry); |
|
| $area=~s/\_\w\w$//; |
my ($trole, $tend, $tstart, $group_privs); |
| my ($trole,$tend,$tstart,$group_privs); |
|
| if ($role=~/^cr/) { |
if ($role =~ /^cr/) { |
| if ($role=~m|^(cr/$match_domain/$match_username/[a-zA-Z0-9]+)_(.*)$|) { |
# Custom role, defined by a user |
| ($trole,my $trest)=($role=~m|^(cr/$match_domain/$match_username/[a-zA-Z0-9]+)_(.*)$|); |
# e.g., user.role.cr/msu/smith/mynewrole |
| ($tend,$tstart)=split('_',$trest); |
if ($role =~ m|^(cr/$match_domain/$match_username/[a-zA-Z0-9]+)_(.*)$|) { |
| } else { |
$trole = $1; |
| $trole=$role; |
($tend, $tstart) = split('_', $2); |
| } |
} else { |
| } elsif ($role =~ m|^gr/|) { |
$trole = $role; |
| ($trole,$tend,$tstart) = split(/_/,$role); |
|
| ($trole,$group_privs) = split(/\//,$trole); |
|
| $group_privs = &unescape($group_privs); |
|
| } else { |
|
| ($trole,$tend,$tstart)=split(/_/,$role); |
|
| } |
|
| my %new_role = &set_arearole($trole,$area,$tstart,$tend,$domain, |
|
| $username); |
|
| @userroles{keys(%new_role)} = @new_role{keys(%new_role)}; |
|
| if (($tend!=0) && ($tend<$now)) { $trole=''; } |
|
| if (($tstart!=0) && ($tstart>$now)) { $trole=''; } |
|
| if (($area ne '') && ($trole ne '')) { |
|
| my $spec=$trole.'.'.$area; |
|
| my ($tdummy,$tdomain,$trest)=split(/\//,$area); |
|
| if ($trole =~ /^cr\//) { |
|
| &custom_roleprivs(\%allroles,$trole,$tdomain,$trest,$spec,$area); |
|
| } elsif ($trole eq 'gr') { |
|
| &group_roleprivs(\%allgroups,$area,$group_privs,$tend,$tstart); |
|
| } else { |
|
| &standard_roleprivs(\%allroles,$trole,$tdomain,$spec,$trest,$area); |
|
| } |
|
| } |
} |
| } |
} elsif ($role =~ m|^gr/|) { |
| |
# Role of member in a group, defined within a course/community |
| |
# e.g., user.role.gr/msu/04935610a19ee4a5fmsul1/leopards |
| |
($trole, $tend, $tstart) = split(/_/, $role); |
| |
next if $tstart eq '-1'; |
| |
($trole, $group_privs) = split(/\//, $trole); |
| |
$group_privs = &unescape($group_privs); |
| |
} else { |
| |
# Just a normal role, defined in roles.tab |
| |
($trole, $tend, $tstart) = split(/_/,$role); |
| |
} |
| |
|
| |
my %new_role = &set_arearole($trole,$area,$tstart,$tend,$domain, |
| |
$username); |
| |
@userroles{keys(%new_role)} = @new_role{keys(%new_role)}; |
| |
|
| |
# role expired or not available yet? |
| |
$trole = '' if ($tend != 0 && $tend < $userroles{'user.login.time'}) or |
| |
($tstart != 0 && $tstart > $userroles{'user.login.time'}); |
| |
|
| |
next if $area eq '' or $trole eq ''; |
| |
|
| |
my $spec = "$trole.$area"; |
| |
my ($tdummy, $tdomain, $trest) = split(/\//, $area); |
| |
|
| |
if ($trole =~ /^cr\//) { |
| |
# Custom role, defined by a user |
| |
&custom_roleprivs(\%allroles,$trole,$tdomain,$trest,$spec,$area); |
| |
} elsif ($trole eq 'gr') { |
| |
# Role of a member in a group, defined within a course/community |
| |
&group_roleprivs(\%allgroups,$area,$group_privs,$tend,$tstart); |
| |
next; |
| |
} else { |
| |
# Normal role, defined in roles.tab |
| |
&standard_roleprivs(\%allroles,$trole,$tdomain,$spec,$trest,$area); |
| |
} |
| |
|
| |
my $cid = $tdomain.'_'.$trest; |
| |
unless ($firstaccchk{$cid}) { |
| |
if (ref($coursetimerstarts{$cid}) eq 'HASH') { |
| |
foreach my $item (keys(%{$coursetimerstarts{$cid}})) { |
| |
$firstaccenv{'course.'.$cid.'.firstaccess.'.$item} = |
| |
$coursetimerstarts{$cid}{$item}; |
| |
} |
| |
} |
| |
$firstaccchk{$cid} = 1; |
| |
} |
| |
unless ($timerintchk{$cid}) { |
| |
if (ref($coursetimerintervals{$cid}) eq 'HASH') { |
| |
foreach my $item (keys(%{$coursetimerintervals{$cid}})) { |
| |
$timerintenv{'course.'.$cid.'.timerinterval.'.$item} = |
| |
$coursetimerintervals{$cid}{$item}; |
| |
} |
| |
} |
| |
$timerintchk{$cid} = 1; |
| } |
} |
| my ($author,$adv) = &set_userprivs(\%userroles,\%allroles,\%allgroups); |
|
| $userroles{'user.adv'} = $adv; |
|
| $userroles{'user.author'} = $author; |
|
| $env{'user.adv'}=$adv; |
|
| } |
} |
| return \%userroles; |
|
| |
@userroles{'user.author','user.adv','user.rar'} = &set_userprivs(\%userroles, |
| |
\%allroles, \%allgroups); |
| |
$env{'user.adv'} = $userroles{'user.adv'}; |
| |
$env{'user.rar'} = $userroles{'user.rar'}; |
| |
|
| |
return (\%userroles,\%firstaccenv,\%timerintenv); |
| } |
} |
| |
|
| sub set_arearole { |
sub set_arearole { |
| my ($trole,$area,$tstart,$tend,$domain,$username) = @_; |
my ($trole,$area,$tstart,$tend,$domain,$username,$nolog) = @_; |
| |
unless ($nolog) { |
| # log the associated role with the area |
# log the associated role with the area |
| &userrolelog($trole,$username,$domain,$area,$tstart,$tend); |
&userrolelog($trole,$username,$domain,$area,$tstart,$tend); |
| |
} |
| return ('user.role.'.$trole.'.'.$area => $tstart.'.'.$tend); |
return ('user.role.'.$trole.'.'.$area => $tstart.'.'.$tend); |
| } |
} |
| |
|
| sub custom_roleprivs { |
sub custom_roleprivs { |
| my ($allroles,$trole,$tdomain,$trest,$spec,$area) = @_; |
my ($allroles,$trole,$tdomain,$trest,$spec,$area) = @_; |
| my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole); |
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole); |
| my $homsvr=homeserver($rauthor,$rdomain); |
my $homsvr = &homeserver($rauthor,$rdomain); |
| if (&hostname($homsvr) ne '') { |
if (&hostname($homsvr) ne '') { |
| my ($rdummy,$roledef)= |
my ($rdummy,$roledef)= |
| &get('roles',["rolesdef_$rrole"],$rdomain,$rauthor); |
&get('roles',["rolesdef_$rrole"],$rdomain,$rauthor); |
| if (($rdummy ne 'con_lost') && ($roledef ne '')) { |
if (($rdummy ne 'con_lost') && ($roledef ne '')) { |
| my ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); |
my ($syspriv,$dompriv,$coursepriv)=split(/\_/,$roledef); |
| if (defined($syspriv)) { |
if (defined($syspriv)) { |
| |
if ($trest =~ /^$match_community$/) { |
| |
$syspriv =~ s/bre\&S//; |
| |
} |
| $$allroles{'cm./'}.=':'.$syspriv; |
$$allroles{'cm./'}.=':'.$syspriv; |
| $$allroles{$spec.'./'}.=':'.$syspriv; |
$$allroles{$spec.'./'}.=':'.$syspriv; |
| } |
} |
|
Line 3703 sub custom_roleprivs {
|
Line 6484 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 3711 sub custom_roleprivs {
|
Line 6496 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 3742 sub standard_roleprivs {
|
Line 6569 sub standard_roleprivs {
|
| } |
} |
| |
|
| sub set_userprivs { |
sub set_userprivs { |
| my ($userroles,$allroles,$allgroups) = @_; |
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) { |
| foreach my $role (keys %{$allroles}) { |
my @groupkeys; |
| my ($trole,$area,$sec,$extendedarea); |
foreach my $role (keys(%{$allroles})) { |
| if ($role =~ m-^(\w+|cr/$match_domain/$match_username/\w+)\.(/$match_domain/$match_courseid)(/?\w*)\.-) { |
push(@groupkeys,$role); |
| $trole = $1; |
} |
| $area = $2; |
if (ref($groups_roles) eq 'HASH') { |
| $sec = $3; |
foreach my $key (keys(%{$groups_roles})) { |
| $extendedarea = $area.$sec; |
unless (grep(/^\Q$key\E$/,@groupkeys)) { |
| if (exists($$allgroups{$area})) { |
push(@groupkeys,$key); |
| foreach my $group (keys(%{$$allgroups{$area}})) { |
} |
| my $spec = $trole.'.'.$extendedarea; |
} |
| $grouproles{$spec.'.'.$area.'/'.$group} = |
} |
| |
if (@groupkeys > 0) { |
| |
foreach my $role (@groupkeys) { |
| |
my ($trole,$area,$sec,$extendedarea); |
| |
if ($role =~ m-^(\w+|cr/$match_domain/$match_username/\w+)\.(/$match_domain/$match_courseid)(/?\w*)\.-) { |
| |
$trole = $1; |
| |
$area = $2; |
| |
$sec = $3; |
| |
$extendedarea = $area.$sec; |
| |
if (exists($$allgroups{$area})) { |
| |
foreach my $group (keys(%{$$allgroups{$area}})) { |
| |
my $spec = $trole.'.'.$extendedarea; |
| |
$grouproles{$spec.'.'.$area.'/'.$group} = |
| $$allgroups{$area}{$group}; |
$$allgroups{$area}{$group}; |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 3779 sub set_userprivs {
|
Line 6620 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=''; |
| foreach my $priv (keys(%thesepriv)) { |
foreach my $priv (sort(keys(%thesepriv))) { |
| $thesestr.=':'.$priv.'&'.$thesepriv{$priv}; |
$thesestr.=':'.$priv.'&'.$thesepriv{$priv}; |
| } |
} |
| $userroles->{'user.priv.'.$role} = $thesestr; |
$userroles->{'user.priv.'.$role} = $thesestr; |
| } |
} |
| return ($author,$adv); |
return ($author,$adv,$rar); |
| |
} |
| |
|
| |
sub role_status { |
| |
my ($rolekey,$update,$refresh,$now,$role,$where,$trolecode,$tstatus,$tstart,$tend) = @_; |
| |
if (exists($env{$rolekey}) && $env{$rolekey} ne '') { |
| |
my ($one,$two) = split(m{\./},$rolekey,2); |
| |
(undef,undef,$$role) = split(/\./,$one,3); |
| |
unless (!defined($$role) || $$role eq '') { |
| |
$$where = '/'.$two; |
| |
$$trolecode=$$role.'.'.$$where; |
| |
($$tstart,$$tend)=split(/\./,$env{$rolekey}); |
| |
$$tstatus='is'; |
| |
if ($$tstart && $$tstart>$update) { |
| |
$$tstatus='future'; |
| |
if ($$tstart<$now) { |
| |
if ($$tstart && $$tstart>$refresh) { |
| |
if (($$where ne '') && ($$role ne '')) { |
| |
my (%allroles,%allgroups,$group_privs, |
| |
%groups_roles,@rolecodes); |
| |
my %userroles = ( |
| |
'user.role.'.$$role.'.'.$$where => $$tstart.'.'.$$tend |
| |
); |
| |
@rolecodes = ('cm'); |
| |
my $spec=$$role.'.'.$$where; |
| |
my ($tdummy,$tdomain,$trest)=split(/\//,$$where); |
| |
if ($$role =~ /^cr\//) { |
| |
&custom_roleprivs(\%allroles,$$role,$tdomain,$trest,$spec,$$where); |
| |
push(@rolecodes,'cr'); |
| |
} elsif ($$role eq 'gr') { |
| |
push(@rolecodes,$$role); |
| |
my %rolehash = &get('roles',[$$where.'_'.$$role],$env{'user.domain'}, |
| |
$env{'user.name'}); |
| |
my ($trole) = split('_',$rolehash{$$where.'_'.$$role},2); |
| |
(undef,my $group_privs) = split(/\//,$trole); |
| |
$group_privs = &unescape($group_privs); |
| |
&group_roleprivs(\%allgroups,$$where,$group_privs,$$tend,$$tstart); |
| |
my %course_roles = &get_my_roles($env{'user.name'},$env{'user.domain'},'userroles',['active'],['cc','co','in','ta','ep','ad','st','cr'],[$tdomain],1); |
| |
&get_groups_roles($tdomain,$trest, |
| |
\%course_roles,\@rolecodes, |
| |
\%groups_roles); |
| |
} else { |
| |
push(@rolecodes,$$role); |
| |
&standard_roleprivs(\%allroles,$$role,$tdomain,$spec,$trest,$$where); |
| |
} |
| |
my ($author,$adv,$rar)= &set_userprivs(\%userroles,\%allroles,\%allgroups, |
| |
\%groups_roles); |
| |
&appenv(\%userroles,\@rolecodes); |
| |
&log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$spec); |
| |
} |
| |
} |
| |
$$tstatus = 'is'; |
| |
} |
| |
} |
| |
if ($$tend) { |
| |
if ($$tend<$update) { |
| |
$$tstatus='expired'; |
| |
} elsif ($$tend<$now) { |
| |
$$tstatus='will_not'; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
|
| |
sub get_groups_roles { |
| |
my ($cdom,$rest,$cdom_courseroles,$rolecodes,$groups_roles) = @_; |
| |
return unless((ref($cdom_courseroles) eq 'HASH') && |
| |
(ref($rolecodes) eq 'ARRAY') && |
| |
(ref($groups_roles) eq 'HASH')); |
| |
if (keys(%{$cdom_courseroles}) > 0) { |
| |
my ($cnum) = ($rest =~ /^($match_courseid)/); |
| |
if ($cdom ne '' && $cnum ne '') { |
| |
foreach my $key (keys(%{$cdom_courseroles})) { |
| |
if ($key =~ /^\Q$cnum\E:\Q$cdom\E:([^:]+):?([^:]*)/) { |
| |
my $crsrole = $1; |
| |
my $crssec = $2; |
| |
if ($crsrole =~ /^cr/) { |
| |
unless (grep(/^cr$/,@{$rolecodes})) { |
| |
push(@{$rolecodes},'cr'); |
| |
} |
| |
} else { |
| |
unless(grep(/^\Q$crsrole\E$/,@{$rolecodes})) { |
| |
push(@{$rolecodes},$crsrole); |
| |
} |
| |
} |
| |
my $rolekey = "$crsrole./$cdom/$cnum"; |
| |
if ($crssec ne '') { |
| |
$rolekey .= "/$crssec"; |
| |
} |
| |
$rolekey .= './'; |
| |
$groups_roles->{$rolekey} = $rolecodes; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub delete_env_groupprivs { |
| |
my ($where,$courseroles,$possroles) = @_; |
| |
return unless((ref($courseroles) eq 'HASH') && (ref($possroles) eq 'ARRAY')); |
| |
my ($dummy,$udom,$uname,$group) = split(/\//,$where); |
| |
unless (ref($courseroles->{$udom}) eq 'HASH') { |
| |
%{$courseroles->{$udom}} = |
| |
&get_my_roles('','','userroles',['active'], |
| |
$possroles,[$udom],1); |
| |
} |
| |
if (ref($courseroles->{$udom}) eq 'HASH') { |
| |
foreach my $item (keys(%{$courseroles->{$udom}})) { |
| |
my ($cnum,$cdom,$crsrole,$crssec) = split(/:/,$item); |
| |
my $area = '/'.$cdom.'/'.$cnum; |
| |
my $privkey = "user.priv.$crsrole.$area"; |
| |
if ($crssec ne '') { |
| |
$privkey .= '/'.$crssec; |
| |
} |
| |
$privkey .= ".$area/$group"; |
| |
&Apache::lonnet::delenv($privkey,undef,[$crsrole]); |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub check_adhoc_privs { |
| |
my ($cdom,$cnum,$update,$refresh,$now,$checkrole,$caller,$sec) = @_; |
| |
my $cckey = 'user.role.'.$checkrole.'./'.$cdom.'/'.$cnum; |
| |
if ($sec) { |
| |
$cckey .= '/'.$sec; |
| |
} |
| |
my $setprivs; |
| |
if ($env{$cckey}) { |
| |
my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend); |
| |
&role_status($cckey,$update,$refresh,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend); |
| |
unless (($tstatus eq 'is') || ($tstatus eq 'will_not')) { |
| |
&set_adhoc_privileges($cdom,$cnum,$checkrole,$caller,$sec); |
| |
$setprivs = 1; |
| |
} |
| |
} else { |
| |
&set_adhoc_privileges($cdom,$cnum,$checkrole,$caller,$sec); |
| |
$setprivs = 1; |
| |
} |
| |
return $setprivs; |
| |
} |
| |
|
| |
sub set_adhoc_privileges { |
| |
# role can be cc, ca, or cr/<dom>/<dom>-domainconfig/role |
| |
my ($dcdom,$pickedcourse,$role,$caller,$sec) = @_; |
| |
my $area = '/'.$dcdom.'/'.$pickedcourse; |
| |
if ($sec ne '') { |
| |
$area .= '/'.$sec; |
| |
} |
| |
my $spec = $role.'.'.$area; |
| |
my %userroles = &set_arearole($role,$area,'','',$env{'user.domain'}, |
| |
$env{'user.name'},1); |
| |
my %rolehash = (); |
| |
if ($role =~ m{^\Qcr/$dcdom/$dcdom\E\-domainconfig/(\w+)$}) { |
| |
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']); |
| |
&log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$spec); |
| |
unless ($caller eq 'constructaccess' && $env{'request.course.id'}) { |
| |
&appenv( {'request.role' => $spec, |
| |
'request.role.domain' => $dcdom, |
| |
'request.course.sec' => $sec, |
| |
} |
| |
); |
| |
my $tadv=0; |
| |
if (&allowed('adv') eq 'F') { $tadv=1; } |
| |
&appenv({'request.role.adv' => $tadv}); |
| |
} |
| } |
} |
| |
|
| # --------------------------------------------------------------- get interface |
# --------------------------------------------------------------- get interface |
|
Line 3825 sub del {
|
Line 6846 sub del {
|
| foreach my $item (@$storearr) { |
foreach my $item (@$storearr) { |
| $items.=&escape($item).'&'; |
$items.=&escape($item).'&'; |
| } |
} |
| |
|
| $items=~s/\&$//; |
$items=~s/\&$//; |
| if (!$udomain) { $udomain=$env{'user.domain'}; } |
if (!$udomain) { $udomain=$env{'user.domain'}; } |
| if (!$uname) { $uname=$env{'user.name'}; } |
if (!$uname) { $uname=$env{'user.name'}; } |
| my $uhome=&homeserver($uname,$udomain); |
my $uhome=&homeserver($uname,$udomain); |
| |
|
| return &reply("del:$udomain:$uname:$namespace:$items",$uhome); |
return &reply("del:$udomain:$uname:$namespace:$items",$uhome); |
| } |
} |
| |
|
| # -------------------------------------------------------------- dump interface |
# -------------------------------------------------------------- dump interface |
| |
|
| |
sub unserialize { |
| |
my ($rep, $escapedkeys) = @_; |
| |
|
| |
return {} if $rep =~ /^error/; |
| |
|
| |
my %returnhash=(); |
| |
foreach my $item (split(/\&/,$rep)) { |
| |
my ($key, $value) = split(/=/, $item, 2); |
| |
$key = unescape($key) unless $escapedkeys; |
| |
next if $key =~ /^error: 2 /; |
| |
$returnhash{$key} = &thaw_unescape($value); |
| |
} |
| |
return \%returnhash; |
| |
} |
| |
|
| |
# see Lond::dump_with_regexp |
| |
# if $escapedkeys hash keys won't get unescaped. |
| sub dump { |
sub dump { |
| my ($namespace,$udomain,$uname,$regexp,$range)=@_; |
my ($namespace,$udomain,$uname,$regexp,$range,$escapedkeys)=@_; |
| if (!$udomain) { $udomain=$env{'user.domain'}; } |
if (!$udomain) { $udomain=$env{'user.domain'}; } |
| if (!$uname) { $uname=$env{'user.name'}; } |
if (!$uname) { $uname=$env{'user.name'}; } |
| my $uhome=&homeserver($uname,$udomain); |
my $uhome=&homeserver($uname,$udomain); |
| |
|
| if ($regexp) { |
if ($regexp) { |
| $regexp=&escape($regexp); |
$regexp=&escape($regexp); |
| } else { |
} else { |
| $regexp='.'; |
$regexp='.'; |
| |
} |
| |
if (grep { $_ eq $uhome } ¤t_machine_ids()) { |
| |
# user is hosted on this machine |
| |
my $reply = LONCAPA::Lond::dump_with_regexp(join(':', ($udomain, |
| |
$uname, $namespace, $regexp, $range)), $perlvar{'lonVersion'}); |
| |
return %{&unserialize($reply, $escapedkeys)}; |
| } |
} |
| my $rep=&reply("dump:$udomain:$uname:$namespace:$regexp:$range",$uhome); |
my $rep=&reply("dump:$udomain:$uname:$namespace:$regexp:$range",$uhome); |
| my @pairs=split(/\&/,$rep); |
my @pairs=split(/\&/,$rep); |
| my %returnhash=(); |
my %returnhash=(); |
| foreach my $item (@pairs) { |
if (!($rep =~ /^error/ )) { |
| my ($key,$value)=split(/=/,$item,2); |
foreach my $item (@pairs) { |
| $key = &unescape($key); |
my ($key,$value)=split(/=/,$item,2); |
| next if ($key =~ /^error: 2 /); |
$key = &unescape($key) unless ($escapedkeys); |
| $returnhash{$key}=&thaw_unescape($value); |
next if ($key =~ /^error: 2 /); |
| |
$returnhash{$key}=&thaw_unescape($value); |
| |
} |
| } |
} |
| return %returnhash; |
return %returnhash; |
| } |
} |
| |
|
| |
|
| # --------------------------------------------------------- dumpstore interface |
# --------------------------------------------------------- dumpstore interface |
| |
|
| sub dumpstore { |
sub dumpstore { |
| my ($namespace,$udomain,$uname,$regexp,$range)=@_; |
my ($namespace,$udomain,$uname,$regexp,$range)=@_; |
| if (!$udomain) { $udomain=$env{'user.domain'}; } |
# same as dump but keys must be escaped. They may contain colon separated |
| if (!$uname) { $uname=$env{'user.name'}; } |
# lists of values that may themself contain colons (e.g. symbs). |
| my $uhome=&homeserver($uname,$udomain); |
return &dump($namespace, $udomain, $uname, $regexp, $range, 1); |
| if ($regexp) { |
|
| $regexp=&escape($regexp); |
|
| } else { |
|
| $regexp='.'; |
|
| } |
|
| my $rep=&reply("dump:$udomain:$uname:$namespace:$regexp:$range",$uhome); |
|
| my @pairs=split(/\&/,$rep); |
|
| my %returnhash=(); |
|
| foreach my $item (@pairs) { |
|
| my ($key,$value)=split(/=/,$item,2); |
|
| next if ($key =~ /^error: 2 /); |
|
| $returnhash{$key}=&thaw_unescape($value); |
|
| } |
|
| return %returnhash; |
|
| } |
} |
| |
|
| # -------------------------------------------------------------- keys interface |
# -------------------------------------------------------------- keys interface |
|
Line 3903 sub currentdump {
|
Line 6937 sub currentdump {
|
| $sdom = $env{'user.domain'} if (! defined($sdom)); |
$sdom = $env{'user.domain'} if (! defined($sdom)); |
| $sname = $env{'user.name'} if (! defined($sname)); |
$sname = $env{'user.name'} if (! defined($sname)); |
| my $uhome = &homeserver($sname,$sdom); |
my $uhome = &homeserver($sname,$sdom); |
| my $rep=reply('currentdump:'.$sdom.':'.$sname.':'.$courseid,$uhome); |
my $rep; |
| |
|
| |
if (grep { $_ eq $uhome } current_machine_ids()) { |
| |
$rep = LONCAPA::Lond::dump_profile_database(join(":", ($sdom, $sname, |
| |
$courseid))); |
| |
} else { |
| |
$rep = reply('currentdump:'.$sdom.':'.$sname.':'.$courseid,$uhome); |
| |
} |
| |
|
| return if ($rep =~ /^(error:|no_such_host)/); |
return if ($rep =~ /^(error:|no_such_host)/); |
| # |
# |
| my %returnhash=(); |
my %returnhash=(); |
|
Line 4024 sub newput {
|
Line 7066 sub newput {
|
| # --------------------------------------------------------- putstore interface |
# --------------------------------------------------------- putstore interface |
| |
|
| sub putstore { |
sub putstore { |
| my ($namespace,$symb,$version,$storehash,$udomain,$uname)=@_; |
my ($namespace,$symb,$version,$storehash,$udomain,$uname,$tolog)=@_; |
| if (!$udomain) { $udomain=$env{'user.domain'}; } |
if (!$udomain) { $udomain=$env{'user.domain'}; } |
| if (!$uname) { $uname=$env{'user.name'}; } |
if (!$uname) { $uname=$env{'user.name'}; } |
| my $uhome=&homeserver($uname,$udomain); |
my $uhome=&homeserver($uname,$udomain); |
|
Line 4038 sub putstore {
|
Line 7080 sub putstore {
|
| my $reply = |
my $reply = |
| &reply("putstore:$udomain:$uname:$namespace:$esc_symb:$esc_v:$items", |
&reply("putstore:$udomain:$uname:$namespace:$esc_symb:$esc_v:$items", |
| $uhome); |
$uhome); |
| |
if (($tolog) && ($reply eq 'ok')) { |
| |
my $namevalue=''; |
| |
foreach my $key (keys(%{$storehash})) { |
| |
$namevalue.=&escape($key).'='.&freeze_escape($storehash->{$key}).'&'; |
| |
} |
| |
my $ip = &get_requestor_ip(); |
| |
$namevalue .= 'ip='.&escape($ip). |
| |
'&host='.&escape($perlvar{'lonHostID'}). |
| |
'&version='.$esc_v. |
| |
'&by='.&escape($env{'user.name'}.':'.$env{'user.domain'}); |
| |
&Apache::lonnet::courselog($symb.':'.$uname.':'.$udomain.':PUTSTORE:'.$namevalue); |
| |
} |
| if ($reply eq 'unknown_cmd') { |
if ($reply eq 'unknown_cmd') { |
| # gfall back to way things use to be done |
# gfall back to way things use to be done |
| return &old_putstore($namespace,$symb,$version,$storehash,$udomain, |
return &old_putstore($namespace,$symb,$version,$storehash,$udomain, |
|
Line 4131 sub tmpget {
|
Line 7185 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; |
| } |
} |
| |
|
| # ------------------------------------------------------------ tmpget interface |
# ------------------------------------------------------------ tmpdel interface |
| sub tmpdel { |
sub tmpdel { |
| my ($token,$server)=@_; |
my ($token,$server)=@_; |
| if (!defined($server)) { $server = $perlvar{'lonHostID'}; } |
if (!defined($server)) { $server = $perlvar{'lonHostID'}; } |
| return &reply("tmpdel:$token",$server); |
return &reply("tmpdel:$token",$server); |
| } |
} |
| |
|
| |
# ------------------------------------------------------------ get_timebased_id |
| |
|
| |
sub get_timebased_id { |
| |
my ($prefix,$keyid,$namespace,$cdom,$cnum,$idtype,$who,$locktries, |
| |
$maxtries) = @_; |
| |
my ($newid,$error,$dellock); |
| |
unless (($prefix =~ /^\w+$/) && ($keyid =~ /^\w+$/) && ($namespace ne '')) { |
| |
return ('','ok','invalid call to get suffix'); |
| |
} |
| |
|
| |
# set defaults for any optional args for which values were not supplied |
| |
if ($who eq '') { |
| |
$who = $env{'user.name'}.':'.$env{'user.domain'}; |
| |
} |
| |
if (!$locktries) { |
| |
$locktries = 3; |
| |
} |
| |
if (!$maxtries) { |
| |
$maxtries = 10; |
| |
} |
| |
|
| |
if (($cdom eq '') || ($cnum eq '')) { |
| |
if ($env{'request.course.id'}) { |
| |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| |
} |
| |
if (($cdom eq '') || ($cnum eq '')) { |
| |
return ('','ok','call to get suffix not in course context'); |
| |
} |
| |
} |
| |
|
| |
# construct locking item |
| |
my $lockhash = { |
| |
$prefix."\0".'locked_'.$keyid => $who, |
| |
}; |
| |
my $tries = 0; |
| |
|
| |
# attempt to get lock on nohist_$namespace file |
| |
my $gotlock = &Apache::lonnet::newput('nohist_'.$namespace,$lockhash,$cdom,$cnum); |
| |
while (($gotlock ne 'ok') && $tries <$locktries) { |
| |
$tries ++; |
| |
sleep 1; |
| |
$gotlock = &Apache::lonnet::newput('nohist_'.$namespace,$lockhash,$cdom,$cnum); |
| |
} |
| |
|
| |
# attempt to get unique identifier, based on current timestamp |
| |
if ($gotlock eq 'ok') { |
| |
my %inuse = &Apache::lonnet::dump('nohist_'.$namespace,$cdom,$cnum,$prefix); |
| |
my $id = time; |
| |
$newid = $id; |
| |
if ($idtype eq 'addcode') { |
| |
$newid .= &sixnum_code(); |
| |
} |
| |
my $idtries = 0; |
| |
while (exists($inuse{$prefix."\0".$newid}) && $idtries < $maxtries) { |
| |
if ($idtype eq 'concat') { |
| |
$newid = $id.$idtries; |
| |
} elsif ($idtype eq 'addcode') { |
| |
$newid = $newid.&sixnum_code(); |
| |
} else { |
| |
$newid ++; |
| |
} |
| |
$idtries ++; |
| |
} |
| |
if (!exists($inuse{$prefix."\0".$newid})) { |
| |
my %new_item = ( |
| |
$prefix."\0".$newid => $who, |
| |
); |
| |
my $putresult = &Apache::lonnet::put('nohist_'.$namespace,\%new_item, |
| |
$cdom,$cnum); |
| |
if ($putresult ne 'ok') { |
| |
undef($newid); |
| |
$error = 'error saving new item: '.$putresult; |
| |
} |
| |
} else { |
| |
undef($newid); |
| |
$error = ('error: no unique suffix available for the new item '); |
| |
} |
| |
# remove lock |
| |
my @del_lock = ($prefix."\0".'locked_'.$keyid); |
| |
$dellock = &Apache::lonnet::del('nohist_'.$namespace,\@del_lock,$cdom,$cnum); |
| |
} else { |
| |
$error = "error: could not obtain lockfile\n"; |
| |
$dellock = 'ok'; |
| |
if (($prefix eq 'paste') && ($namespace eq 'courseeditor') && ($keyid eq 'num')) { |
| |
$dellock = 'nolock'; |
| |
} |
| |
} |
| |
return ($newid,$dellock,$error); |
| |
} |
| |
|
| |
sub sixnum_code { |
| |
my $code; |
| |
for (0..6) { |
| |
$code .= int( rand(9) ); |
| |
} |
| |
return $code; |
| |
} |
| |
|
| # -------------------------------------------------- portfolio access checking |
# -------------------------------------------------- portfolio access checking |
| |
|
| sub portfolio_access { |
sub portfolio_access { |
| my ($requrl) = @_; |
my ($requrl,$clientip) = @_; |
| my (undef,$udom,$unum,$file_name,$group) = &parse_portfolio_url($requrl); |
my (undef,$udom,$unum,$file_name,$group) = &parse_portfolio_url($requrl); |
| my $result = &get_portfolio_access($udom,$unum,$file_name,$group); |
my $result = &get_portfolio_access($udom,$unum,$file_name,$group,$clientip); |
| if ($result) { |
if ($result) { |
| my %setters; |
my %setters; |
| if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') { |
if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') { |
| my ($startblock,$endblock) = |
my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) = |
| &Apache::loncommon::blockcheck(\%setters,'port',$unum,$udom); |
&Apache::loncommon::blockcheck(\%setters,'port',$clientip,$unum,$udom); |
| if ($startblock && $endblock) { |
if (($startblock && $endblock) || ($by_ip)) { |
| return 'B'; |
return 'B'; |
| } |
} |
| } else { |
} else { |
| my ($startblock,$endblock) = |
my ($startblock,$endblock,$triggerblock,$by_ip,$blockdo) = |
| &Apache::loncommon::blockcheck(\%setters,'port'); |
&Apache::loncommon::blockcheck(\%setters,'port',$clientip); |
| if ($startblock && $endblock) { |
if (($startblock && $endblock) || ($by_ip)) { |
| return 'B'; |
return 'B'; |
| } |
} |
| } |
} |
|
Line 4177 sub portfolio_access {
|
Line 7332 sub portfolio_access {
|
| } |
} |
| |
|
| sub get_portfolio_access { |
sub get_portfolio_access { |
| my ($udom,$unum,$file_name,$group,$access_hash) = @_; |
my ($udom,$unum,$file_name,$group,$clientip,$access_hash) = @_; |
| |
|
| if (!ref($access_hash)) { |
if (!ref($access_hash)) { |
| my $current_perms = &get_portfile_permissions($udom,$unum); |
my $current_perms = &get_portfile_permissions($udom,$unum); |
|
Line 4186 sub get_portfolio_access {
|
Line 7341 sub get_portfolio_access {
|
| $access_hash = $access_controls{$file_name}; |
$access_hash = $access_controls{$file_name}; |
| } |
} |
| |
|
| my ($public,$guest,@domains,@users,@courses,@groups); |
my ($public,$guest,@domains,@users,@courses,@groups,@ips); |
| my $now = time; |
my $now = time; |
| if (ref($access_hash) eq 'HASH') { |
if (ref($access_hash) eq 'HASH') { |
| foreach my $key (keys(%{$access_hash})) { |
foreach my $key (keys(%{$access_hash})) { |
|
Line 4210 sub get_portfolio_access {
|
Line 7365 sub get_portfolio_access {
|
| push(@courses,$key); |
push(@courses,$key); |
| } elsif ($scope eq 'group') { |
} elsif ($scope eq 'group') { |
| push(@groups,$key); |
push(@groups,$key); |
| |
} elsif ($scope eq 'ip') { |
| |
push(@ips,$key); |
| } |
} |
| } |
} |
| if ($public) { |
if ($public) { |
| return 'ok'; |
return 'ok'; |
| |
} elsif (@ips > 0) { |
| |
my $allowed; |
| |
foreach my $ipkey (@ips) { |
| |
if (ref($access_hash->{$ipkey}{'ip'}) eq 'ARRAY') { |
| |
if (&Apache::loncommon::check_ip_acc(join(',',@{$access_hash->{$ipkey}{'ip'}}),$clientip)) { |
| |
$allowed = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
if ($allowed) { |
| |
return 'ok'; |
| |
} |
| } |
} |
| if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') { |
if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') { |
| if ($guest) { |
if ($guest) { |
|
Line 4250 sub get_portfolio_access {
|
Line 7420 sub get_portfolio_access {
|
| my (%allgroups,%allroles); |
my (%allgroups,%allroles); |
| my ($start,$end,$role,$sec,$group); |
my ($start,$end,$role,$sec,$group); |
| foreach my $envkey (%env) { |
foreach my $envkey (%env) { |
| if ($envkey =~ m-^user\.role\.(gr|cc|in|ta|ep|st)\./($match_domain)/($match_courseid)/?([^/]*)$-) { |
if ($envkey =~ m-^user\.role\.(gr|cc|co|in|ta|ep|ad|st)\./($match_domain)/($match_courseid)/?([^/]*)$-) { |
| my $cid = $2.'_'.$3; |
my $cid = $2.'_'.$3; |
| if ($1 eq 'gr') { |
if ($1 eq 'gr') { |
| $group = $4; |
$group = $4; |
|
Line 4390 sub is_portfolio_file {
|
Line 7560 sub is_portfolio_file {
|
| } |
} |
| |
|
| sub usertools_access { |
sub usertools_access { |
| my ($uname,$udom,$tool,$action) = @_; |
my ($uname,$udom,$tool,$action,$context,$userenvref,$domdefref,$is_advref)=@_; |
| my $access; |
my ($access,%tools); |
| my %tools = ( |
if ($context eq '') { |
| aboutme => 1, |
$context = 'tools'; |
| blog => 1, |
} |
| portfolio => 1, |
if ($context eq 'requestcourses') { |
| ); |
%tools = ( |
| |
official => 1, |
| |
unofficial => 1, |
| |
community => 1, |
| |
textbook => 1, |
| |
); |
| |
} elsif ($context eq 'requestauthor') { |
| |
%tools = ( |
| |
requestauthor => 1, |
| |
); |
| |
} else { |
| |
%tools = ( |
| |
aboutme => 1, |
| |
blog => 1, |
| |
webdav => 1, |
| |
portfolio => 1, |
| |
); |
| |
} |
| return if (!defined($tools{$tool})); |
return if (!defined($tools{$tool})); |
| |
|
| if ((!defined($udom)) || (!defined($uname))) { |
if (($udom eq '') || ($uname eq '')) { |
| $udom = $env{'user.domain'}; |
$udom = $env{'user.domain'}; |
| $uname = $env{'user.name'}; |
$uname = $env{'user.name'}; |
| } |
} |
| |
|
| if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'})) { |
if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'})) { |
| if ($action ne 'reload') { |
if ($action ne 'reload') { |
| return $env{'environment.availabletools.'.$tool}; |
if ($context eq 'requestcourses') { |
| |
return $env{'environment.canrequest.'.$tool}; |
| |
} elsif ($context eq 'requestauthor') { |
| |
return $env{'environment.canrequest.author'}; |
| |
} else { |
| |
return $env{'environment.availabletools.'.$tool}; |
| |
} |
| } |
} |
| } |
} |
| |
|
| my ($toolstatus,$inststatus); |
my ($toolstatus,$inststatus,$envkey); |
| |
if ($context eq 'requestauthor') { |
| |
$envkey = $context; |
| |
} else { |
| |
$envkey = $context.'.'.$tool; |
| |
} |
| |
|
| if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'})) { |
if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'}) && |
| $toolstatus = $env{'environment.tools.'.$tool}; |
($action ne 'reload')) { |
| |
$toolstatus = $env{'environment.'.$envkey}; |
| $inststatus = $env{'environment.inststatus'}; |
$inststatus = $env{'environment.inststatus'}; |
| } else { |
} else { |
| my %userenv = &userenvironment($udom,$uname,'tools.'.$tool); |
if (ref($userenvref) eq 'HASH') { |
| $toolstatus = $userenv{'tools.'.$tool}; |
$toolstatus = $userenvref->{$envkey}; |
| $inststatus = $userenv{'inststatus'}; |
$inststatus = $userenvref->{'inststatus'}; |
| |
} else { |
| |
my %userenv = &userenvironment($udom,$uname,$envkey,'inststatus'); |
| |
$toolstatus = $userenv{$envkey}; |
| |
$inststatus = $userenv{'inststatus'}; |
| |
} |
| } |
} |
| |
|
| if ($toolstatus ne '') { |
if ($toolstatus ne '') { |
|
Line 4430 sub usertools_access {
|
Line 7634 sub usertools_access {
|
| return $access; |
return $access; |
| } |
} |
| |
|
| my $is_adv = &is_advanced_user($udom,$uname); |
my ($is_adv,%domdef); |
| my %domdef = &get_domain_defaults($udom); |
if (ref($is_advref) eq 'HASH') { |
| |
$is_adv = $is_advref->{'is_adv'}; |
| |
} else { |
| |
$is_adv = &is_advanced_user($udom,$uname); |
| |
} |
| |
if (ref($domdefref) eq 'HASH') { |
| |
%domdef = %{$domdefref}; |
| |
} else { |
| |
%domdef = &get_domain_defaults($udom); |
| |
} |
| if (ref($domdef{$tool}) eq 'HASH') { |
if (ref($domdef{$tool}) eq 'HASH') { |
| if ($is_adv) { |
if ($is_adv) { |
| if ($domdef{$tool}{'_LC_adv'} ne '') { |
if ($domdef{$tool}{'_LC_adv'} ne '') { |
|
Line 4473 sub usertools_access {
|
Line 7686 sub usertools_access {
|
| } |
} |
| } |
} |
| } else { |
} else { |
| $access = 1; |
if (($context eq 'tools') && ($tool ne 'webdav')) { |
| |
$access = 1; |
| |
} else { |
| |
$access = 0; |
| |
} |
| return $access; |
return $access; |
| } |
} |
| } |
} |
| |
|
| |
sub is_course_owner { |
| |
my ($cdom,$cnum,$udom,$uname) = @_; |
| |
if (($udom eq '') || ($uname eq '')) { |
| |
$udom = $env{'user.domain'}; |
| |
$uname = $env{'user.name'}; |
| |
} |
| |
unless (($udom eq '') || ($uname eq '')) { |
| |
if (exists($env{'course.'.$cdom.'_'.$cnum.'.internal.courseowner'})) { |
| |
if ($env{'course.'.$cdom.'_'.$cnum.'.internal.courseowner'} eq $uname.':'.$udom) { |
| |
return 1; |
| |
} else { |
| |
my %courseinfo = &Apache::lonnet::coursedescription($cdom.'/'.$cnum); |
| |
if ($courseinfo{'internal.courseowner'} eq $uname.':'.$udom) { |
| |
return 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| sub is_advanced_user { |
sub is_advanced_user { |
| my ($udom,$uname) = @_; |
my ($udom,$uname) = @_; |
| |
if ($udom ne '' && $uname ne '') { |
| |
if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'})) { |
| |
if (wantarray) { |
| |
return ($env{'user.adv'},$env{'user.author'}); |
| |
} else { |
| |
return $env{'user.adv'}; |
| |
} |
| |
} |
| |
} |
| my %roleshash = &get_my_roles($uname,$udom,'userroles',undef,undef,undef,1); |
my %roleshash = &get_my_roles($uname,$udom,'userroles',undef,undef,undef,1); |
| my %allroles; |
my %allroles; |
| my $is_adv; |
my ($is_adv,$is_author); |
| foreach my $role (keys(%roleshash)) { |
foreach my $role (keys(%roleshash)) { |
| my ($trest,$tdomain,$trole,$sec) = split(/:/,$role); |
my ($trest,$tdomain,$trole,$sec) = split(/:/,$role); |
| my $area = '/'.$tdomain.'/'.$trest; |
my $area = '/'.$tdomain.'/'.$trest; |
|
Line 4496 sub is_advanced_user {
|
Line 7743 sub is_advanced_user {
|
| } elsif ($trole ne 'gr') { |
} elsif ($trole ne 'gr') { |
| &standard_roleprivs(\%allroles,$trole,$tdomain,$spec,$trest,$area); |
&standard_roleprivs(\%allroles,$trole,$tdomain,$spec,$trest,$area); |
| } |
} |
| |
if ($trole eq 'au') { |
| |
$is_author = 1; |
| |
} |
| } |
} |
| } |
} |
| foreach my $role (keys(%allroles)) { |
foreach my $role (keys(%allroles)) { |
|
Line 4510 sub is_advanced_user {
|
Line 7760 sub is_advanced_user {
|
| } |
} |
| } |
} |
| } |
} |
| |
if (wantarray) { |
| |
return ($is_adv,$is_author); |
| |
} |
| return $is_adv; |
return $is_adv; |
| } |
} |
| |
|
| |
sub check_can_request { |
| |
my ($dom,$can_request,$request_domains) = @_; |
| |
my $canreq = 0; |
| |
my ($types,$typename) = &Apache::loncommon::course_types(); |
| |
my @options = ('approval','validate','autolimit'); |
| |
my $optregex = join('|',@options); |
| |
if ((ref($can_request) eq 'HASH') && (ref($types) eq 'ARRAY')) { |
| |
foreach my $type (@{$types}) { |
| |
if (&usertools_access($env{'user.name'}, |
| |
$env{'user.domain'}, |
| |
$type,undef,'requestcourses')) { |
| |
$canreq ++; |
| |
if (ref($request_domains) eq 'HASH') { |
| |
push(@{$request_domains->{$type}},$env{'user.domain'}); |
| |
} |
| |
if ($dom eq $env{'user.domain'}) { |
| |
$can_request->{$type} = 1; |
| |
} |
| |
} |
| |
if ($env{'environment.reqcrsotherdom.'.$type} ne '') { |
| |
my @curr = split(',',$env{'environment.reqcrsotherdom.'.$type}); |
| |
if (@curr > 0) { |
| |
foreach my $item (@curr) { |
| |
if (ref($request_domains) eq 'HASH') { |
| |
my ($otherdom) = ($item =~ /^($match_domain):($optregex)(=?\d*)$/); |
| |
if ($otherdom ne '') { |
| |
if (ref($request_domains->{$type}) eq 'ARRAY') { |
| |
unless (grep(/^\Q$otherdom\E$/,@{$request_domains->{$type}})) { |
| |
push(@{$request_domains->{$type}},$otherdom); |
| |
} |
| |
} else { |
| |
push(@{$request_domains->{$type}},$otherdom); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
unless($dom eq $env{'user.domain'}) { |
| |
$canreq ++; |
| |
if (grep(/^\Q$dom\E:($optregex)(=?\d*)$/,@curr)) { |
| |
$can_request->{$type} = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return $canreq; |
| |
} |
| |
|
| # ---------------------------------------------- Custom access rule evaluation |
# ---------------------------------------------- Custom access rule evaluation |
| |
|
| sub customaccess { |
sub customaccess { |
|
Line 4565 sub customaccess {
|
Line 7867 sub customaccess {
|
| # ------------------------------------------------- Check for a user privilege |
# ------------------------------------------------- Check for a user privilege |
| |
|
| sub allowed { |
sub allowed { |
| my ($priv,$uri,$symb,$role)=@_; |
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 4582 sub allowed {
|
Line 7884 sub allowed {
|
| |
|
| if (defined($env{'allowed.'.$priv})) { return $env{'allowed.'.$priv}; } |
if (defined($env{'allowed.'.$priv})) { return $env{'allowed.'.$priv}; } |
| # Free bre access to adm and meta resources |
# Free bre access to adm and meta resources |
| if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard)$})) |
if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard|viewclasslist|aboutme)$})) |
| || (($uri=~/\.meta$/) && ($uri!~m|^uploaded/|) )) |
|| (($uri=~/\.meta$/) && ($uri!~m|^uploaded/|) )) |
| && ($priv eq 'bre')) { |
&& ($priv eq 'bre')) { |
| return 'F'; |
return 'F'; |
|
Line 4593 sub allowed {
|
Line 7895 sub allowed {
|
| if (($space=~/^(uploaded|editupload)$/) && ($env{'user.name'} eq $name) && |
if (($space=~/^(uploaded|editupload)$/) && ($env{'user.name'} eq $name) && |
| ($env{'user.domain'} eq $domain) && ('portfolio' eq $dir[0])) { |
($env{'user.domain'} eq $domain) && ('portfolio' eq $dir[0])) { |
| my %setters; |
my %setters; |
| my ($startblock,$endblock) = |
my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) = |
| &Apache::loncommon::blockcheck(\%setters,'port'); |
&Apache::loncommon::blockcheck(\%setters,'port',$clientip); |
| if ($startblock && $endblock) { |
if (($startblock && $endblock) || ($by_ip)) { |
| return 'B'; |
return 'B'; |
| } else { |
} else { |
| return 'F'; |
return 'F'; |
|
Line 4667 sub allowed {
|
Line 7969 sub allowed {
|
| my $statecond=0; |
my $statecond=0; |
| my $courseprivid=''; |
my $courseprivid=''; |
| |
|
| |
my $ownaccess; |
| |
# Community Coordinator or Assistant Co-author browsing resource space. |
| |
if (($priv eq 'bro') && ($env{'user.author'})) { |
| |
if ($uri eq '') { |
| |
$ownaccess = 1; |
| |
} else { |
| |
if (($env{'user.domain'} ne '') && ($env{'user.name'} ne '')) { |
| |
my $udom = $env{'user.domain'}; |
| |
my $uname = $env{'user.name'}; |
| |
if ($uri =~ m{^\Q$udom\E/?$}) { |
| |
$ownaccess = 1; |
| |
} elsif ($uri =~ m{^\Q$udom\E/\Q$uname\E/?}) { |
| |
unless ($uri =~ m{\.\./}) { |
| |
$ownaccess = 1; |
| |
} |
| |
} elsif (($udom ne 'public') && ($uname ne 'public')) { |
| |
my $now = time; |
| |
if ($uri =~ m{^([^/]+)/?$}) { |
| |
my $adom = $1; |
| |
foreach my $key (keys(%env)) { |
| |
if ($key =~ m{^user\.role\.(ca|aa)/\Q$adom\E}) { |
| |
my ($start,$end) = split(/\./,$env{$key}); |
| |
if (($now >= $start) && (!$end || $end > $now)) { |
| |
$ownaccess = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} elsif ($uri =~ m{^([^/]+)/([^/]+)/?}) { |
| |
my $adom = $1; |
| |
my $aname = $2; |
| |
foreach my $role ('ca','aa') { |
| |
if ($env{"user.role.$role./$adom/$aname"}) { |
| |
my ($start,$end) = |
| |
split(/\./,$env{"user.role.$role./$adom/$aname"}); |
| |
if (($now >= $start) && (!$end || $end > $now)) { |
| |
$ownaccess = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
|
| # Course |
# Course |
| |
|
| if ($env{'user.priv.'.$env{'request.role'}.'./'}=~/\Q$priv\E\&([^\:]*)/) { |
if ($env{'user.priv.'.$env{'request.role'}.'./'}=~/\Q$priv\E\&([^\:]*)/) { |
| $thisallowed.=$1; |
unless (($priv eq 'bro') && (!$ownaccess)) { |
| |
$thisallowed.=$1; |
| |
} |
| } |
} |
| |
|
| # Domain |
# Domain |
| |
|
| if ($env{'user.priv.'.$env{'request.role'}.'./'.(split(/\//,$uri))[0].'/'} |
if ($env{'user.priv.'.$env{'request.role'}.'./'.(split(/\//,$uri))[0].'/'} |
| =~/\Q$priv\E\&([^\:]*)/) { |
=~/\Q$priv\E\&([^\:]*)/) { |
| $thisallowed.=$1; |
unless (($priv eq 'bro') && (!$ownaccess)) { |
| |
$thisallowed.=$1; |
| |
} |
| |
} |
| |
|
| |
# User who is not author or co-author might still be able to edit |
| |
# resource of an author in the domain (e.g., if Domain Coordinator). |
| |
if (($priv eq 'eco') && ($thisallowed eq '') && ($env{'request.course.id'}) && |
| |
(&allowed('mdc',$env{'request.course.id'}))) { |
| |
if ($env{"user.priv.cm./$uri/"}=~/\Q$priv\E\&([^\:]*)/) { |
| |
$thisallowed.=$1; |
| |
} |
| } |
} |
| |
|
| # Course: uri itself is a course |
# Course: uri itself is a course |
|
Line 4687 sub allowed {
|
Line 8049 sub allowed {
|
| |
|
| if ($env{'user.priv.'.$env{'request.role'}.'.'.$courseuri} |
if ($env{'user.priv.'.$env{'request.role'}.'.'.$courseuri} |
| =~/\Q$priv\E\&([^\:]*)/) { |
=~/\Q$priv\E\&([^\:]*)/) { |
| $thisallowed.=$1; |
if ($priv eq 'mip') { |
| |
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; |
| |
} |
| |
} |
| } |
} |
| |
|
| # URI is an uploaded document for this course, default permissions don't matter |
# URI is an uploaded document for this course, default permissions don't matter |
|
Line 4698 sub allowed {
|
Line 8088 sub allowed {
|
| if ($match) { |
if ($match) { |
| if ($env{'user.priv.'.$env{'request.role'}.'./'} |
if ($env{'user.priv.'.$env{'request.role'}.'./'} |
| =~/\Q$priv\E\&([^\:]*)/) { |
=~/\Q$priv\E\&([^\:]*)/) { |
| $thisallowed.=$1; |
my $value = $1; |
| |
if ($noblockcheck) { |
| |
$thisallowed.=$value; |
| |
} else { |
| |
my @blockers = &has_comm_blocking($priv,$symb,$uri,$ignorecache); |
| |
if (@blockers > 0) { |
| |
$thisallowed = 'B'; |
| |
} else { |
| |
$thisallowed.=$value; |
| |
} |
| |
} |
| } |
} |
| } else { |
} else { |
| my $refuri = $env{'httpref.'.$orguri} || $env{'httpref.'.$ver_orguri}; |
my $refuri = $env{'httpref.'.$orguri} || $env{'httpref.'.$ver_orguri}; |
|
Line 4709 sub allowed {
|
Line 8109 sub allowed {
|
| $refuri=&declutter($refuri); |
$refuri=&declutter($refuri); |
| my ($match) = &is_on_map($refuri); |
my ($match) = &is_on_map($refuri); |
| if ($match) { |
if ($match) { |
| $thisallowed='F'; |
if ($noblockcheck) { |
| |
$thisallowed='F'; |
| |
} else { |
| |
my @blockers = &has_comm_blocking($priv,'',$refuri,'',1); |
| |
if (@blockers > 0) { |
| |
$thisallowed = 'B'; |
| |
} else { |
| |
$thisallowed='F'; |
| |
} |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 4720 sub allowed {
|
Line 8129 sub allowed {
|
| && $thisallowed ne 'F' |
&& $thisallowed ne 'F' |
| && $thisallowed ne '2' |
&& $thisallowed ne '2' |
| && &is_portfolio_url($uri)) { |
&& &is_portfolio_url($uri)) { |
| $thisallowed = &portfolio_access($uri); |
$thisallowed = &portfolio_access($uri,$clientip); |
| } |
} |
| |
|
| # Full access at system, domain or course-wide level? Exit. |
# Full access at system, domain or course-wide level? Exit. |
|
Line 4750 sub allowed {
|
Line 8159 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 4761 sub allowed {
|
Line 8180 sub allowed {
|
| $statecond=$cond; |
$statecond=$cond; |
| if ($env{'user.priv.'.$env{'request.role'}.'./'.$courseprivid} |
if ($env{'user.priv.'.$env{'request.role'}.'./'.$courseprivid} |
| =~/\Q$priv\E\&([^\:]*)/) { |
=~/\Q$priv\E\&([^\:]*)/) { |
| $thisallowed.=$1; |
my $value = $1; |
| |
if ($priv eq 'bre') { |
| |
if ($noblockcheck) { |
| |
$thisallowed.=$value; |
| |
} else { |
| |
my @blockers = &has_comm_blocking($priv,$symb,$uri,$ignorecache); |
| |
if (@blockers > 0) { |
| |
$thisallowed = 'B'; |
| |
} else { |
| |
$thisallowed.=$value; |
| |
} |
| |
} |
| |
} else { |
| |
$thisallowed.=$value; |
| |
} |
| $checkreferer=0; |
$checkreferer=0; |
| } |
} |
| } |
} |
| |
|
| if ($checkreferer) { |
if ($checkreferer) { |
| my $refuri=$env{'httpref.'.$orguri}; |
my $refuri=$env{'httpref.'.$orguri}; |
| unless ($refuri) { |
unless ($refuri) { |
|
Line 4789 sub allowed {
|
Line 8222 sub allowed {
|
| my $refstatecond=$cond; |
my $refstatecond=$cond; |
| if ($env{'user.priv.'.$env{'request.role'}.'./'.$courseprivid} |
if ($env{'user.priv.'.$env{'request.role'}.'./'.$courseprivid} |
| =~/\Q$priv\E\&([^\:]*)/) { |
=~/\Q$priv\E\&([^\:]*)/) { |
| $thisallowed.=$1; |
my $value = $1; |
| |
if ($priv eq 'bre') { |
| |
if ($noblockcheck) { |
| |
$thisallowed.=$value; |
| |
} else { |
| |
my @blockers = &has_comm_blocking($priv,'',$refuri,'',1); |
| |
if (@blockers > 0) { |
| |
$thisallowed = 'B'; |
| |
} else { |
| |
$thisallowed.=$value; |
| |
} |
| |
} |
| |
} else { |
| |
$thisallowed.=$value; |
| |
} |
| $uri=$refuri; |
$uri=$refuri; |
| $statecond=$refstatecond; |
$statecond=$refstatecond; |
| } |
} |
|
Line 4822 sub allowed {
|
Line 8269 sub allowed {
|
| # |
# |
| |
|
| # Possibly locked functionality, check all courses |
# Possibly locked functionality, check all courses |
| |
# In roles.tab, L (unless locked) available for bre, pch, plc, pac and sma. |
| # Locks might take effect only after 10 minutes cache expiration for other |
# Locks might take effect only after 10 minutes cache expiration for other |
| # courses, and 2 minutes for current course |
# courses, and 2 minutes for current course, in which user has st or ta role |
| |
# which is neither expired nor a future role (unless current course). |
| |
|
| my $envkey; |
my ($needlockcheck,$now,$crsonly); |
| if ($thisallowed=~/L/) { |
if ($thisallowed=~/L/) { |
| foreach $envkey (keys %env) { |
$now = time; |
| |
if ($priv eq 'bre') { |
| |
if ($uri ne '') { |
| |
if ($orguri =~ m{^/+res/}) { |
| |
if ($uri =~ m{^lib/templates/}) { |
| |
if ($env{'request.course.id'}) { |
| |
$crsonly = 1; |
| |
$needlockcheck = 1; |
| |
} |
| |
} else { |
| |
$needlockcheck = 1; |
| |
} |
| |
} elsif ($env{'request.course.id'}) { |
| |
my ($crsdom,$crsnum) = split('_',$env{'request.course.id'}); |
| |
if (($uri =~ m{^(adm|uploaded|public)/$crsdom/$crsnum/}) || |
| |
($uri =~ m{^adm/$match_domain/$match_username/\d+/(smppg|bulletinboard)$})) { |
| |
$crsonly = 1; |
| |
} |
| |
$needlockcheck = 1; |
| |
} |
| |
} |
| |
} elsif (($priv eq 'pch') || ($priv eq 'plc') || ($priv eq 'pac') || ($priv eq 'sma')) { |
| |
$needlockcheck = 1; |
| |
} |
| |
} |
| |
if ($needlockcheck) { |
| |
foreach my $envkey (keys(%env)) { |
| if ($envkey=~/^user\.role\.(st|ta)\.([^\.]*)/) { |
if ($envkey=~/^user\.role\.(st|ta)\.([^\.]*)/) { |
| my $courseid=$2; |
my $courseid=$2; |
| my $roleid=$1.'.'.$2; |
my $roleid=$1.'.'.$2; |
| $courseid=~s/^\///; |
$courseid=~s/^\///; |
| |
unless ($env{'request.role'} eq $roleid) { |
| |
my ($start,$end) = split(/\./,$env{$envkey}); |
| |
next unless (($now >= $start) && (!$end || $end > $now)); |
| |
} |
| my $expiretime=600; |
my $expiretime=600; |
| if ($env{'request.role'} eq $roleid) { |
if ($env{'request.role'} eq $roleid) { |
| $expiretime=120; |
$expiretime=120; |
|
Line 4854 sub allowed {
|
Line 8333 sub allowed {
|
| } |
} |
| if (($env{$prefix.'priv.'.$priv.'.lock.sections'}=~/\,\Q$csec\E\,/) |
if (($env{$prefix.'priv.'.$priv.'.lock.sections'}=~/\,\Q$csec\E\,/) |
| || ($env{$prefix.'priv.'.$priv.'.lock.sections'} eq 'all')) { |
|| ($env{$prefix.'priv.'.$priv.'.lock.sections'} eq 'all')) { |
| if ($env{'priv.'.$priv.'.lock.expire'}>time) { |
if ($env{$prefix.'priv.'.$priv.'.lock.expire'}>time) { |
| &log($env{'user.domain'},$env{'user.name'}, |
&log($env{'user.domain'},$env{'user.name'}, |
| $env{'user.home'}, |
$env{'user.home'}, |
| 'Locked by priv: '.$priv.' for '.$uri.' due to '. |
'Locked by priv: '.$priv.' for '.$uri.' due to '. |
|
Line 4866 sub allowed {
|
Line 8345 sub allowed {
|
| } |
} |
| } |
} |
| } |
} |
| |
|
| # |
# |
| # Rest of the restrictions depend on selected course |
# Rest of the restrictions depend on selected course |
| # |
# |
|
Line 4893 sub allowed {
|
Line 8372 sub allowed {
|
| my $unamedom=$env{'user.name'}.':'.$env{'user.domain'}; |
my $unamedom=$env{'user.name'}.':'.$env{'user.domain'}; |
| if ($env{'course.'.$env{'request.course.id'}.'.'.$priv.'.roles.denied'} |
if ($env{'course.'.$env{'request.course.id'}.'.'.$priv.'.roles.denied'} |
| =~/\Q$rolecode\E/) { |
=~/\Q$rolecode\E/) { |
| if ($priv ne 'pch') { |
if (($priv ne 'pch') && ($priv ne 'plc')) { |
| &logthis($env{'user.domain'}.':'.$env{'user.name'}.':'.$env{'user.home'}.':'. |
&logthis($env{'user.domain'}.':'.$env{'user.name'}.':'.$env{'user.home'}.':'. |
| 'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode.' in '. |
'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode.' in '. |
| $env{'request.course.id'}); |
$env{'request.course.id'}); |
|
Line 4903 sub allowed {
|
Line 8382 sub allowed {
|
| |
|
| if ($env{'course.'.$env{'request.course.id'}.'.'.$priv.'.users.denied'} |
if ($env{'course.'.$env{'request.course.id'}.'.'.$priv.'.users.denied'} |
| =~/\Q$unamedom\E/) { |
=~/\Q$unamedom\E/) { |
| if ($priv ne 'pch') { |
if (($priv ne 'pch') && ($priv ne 'plc')) { |
| &logthis($env{'user.domain'}.':'.$env{'user.name'}.':'.$env{'user.home'}. |
&logthis($env{'user.domain'}.':'.$env{'user.name'}.':'.$env{'user.home'}. |
| 'Denied by user: '.$priv.' for '.$uri.' as '.$unamedom.' in '. |
'Denied by user: '.$priv.' for '.$uri.' as '.$unamedom.' in '. |
| $env{'request.course.id'}); |
$env{'request.course.id'}); |
|
Line 4917 sub allowed {
|
Line 8396 sub allowed {
|
| if ($thisallowed=~/R/) { |
if ($thisallowed=~/R/) { |
| my $rolecode=(split(/\./,$env{'request.role'}))[0]; |
my $rolecode=(split(/\./,$env{'request.role'}))[0]; |
| if (&metadata($uri,'roledeny')=~/\Q$rolecode\E/) { |
if (&metadata($uri,'roledeny')=~/\Q$rolecode\E/) { |
| if ($priv ne 'pch') { |
if (($priv ne 'pch') && ($priv ne 'plc')) { |
| &logthis($env{'user.domain'}.':'.$env{'user.name'}.':'.$env{'user.home'}.':'. |
&logthis($env{'user.domain'}.':'.$env{'user.name'}.':'.$env{'user.home'}.':'. |
| 'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode); |
'Denied by role: '.$priv.' for '.$uri.' as '.$rolecode); |
| } |
} |
|
Line 4949 sub allowed {
|
Line 8428 sub allowed {
|
| return 'F'; |
return 'F'; |
| } |
} |
| |
|
| |
# ------------------------------------------- Check construction space access |
| |
|
| |
sub constructaccess { |
| |
my ($url,$setpriv)=@_; |
| |
|
| |
# We do not allow editing of previous versions of files |
| |
if ($url=~/\.(\d+)\.(\w+)$/) { return ''; } |
| |
|
| |
# Get username and domain from URL |
| |
my ($ownername,$ownerdomain,$ownerhome); |
| |
|
| |
($ownerdomain,$ownername) = |
| |
($url=~ m{^(?:\Q$perlvar{'lonDocRoot'}\E|)/priv/($match_domain)/($match_username)(?:/|$)}); |
| |
|
| |
# The URL does not really point to any authorspace, forget it |
| |
unless (($ownername) && ($ownerdomain)) { return ''; } |
| |
|
| |
# Now we need to see if the user has access to the authorspace of |
| |
# $ownername at $ownerdomain |
| |
|
| |
if (($ownername eq $env{'user.name'}) && ($ownerdomain eq $env{'user.domain'})) { |
| |
# Real author for this? |
| |
$ownerhome = $env{'user.home'}; |
| |
if (exists($env{'user.priv.au./'.$ownerdomain.'/./'})) { |
| |
return ($ownername,$ownerdomain,$ownerhome); |
| |
} |
| |
} else { |
| |
# Co-author for this? |
| |
if (exists($env{'user.priv.ca./'.$ownerdomain.'/'.$ownername.'./'}) || |
| |
exists($env{'user.priv.aa./'.$ownerdomain.'/'.$ownername.'./'}) ) { |
| |
$ownerhome = &homeserver($ownername,$ownerdomain); |
| |
return ($ownername,$ownerdomain,$ownerhome); |
| |
} |
| |
} |
| |
|
| |
# We don't have any access right now. If we are not possibly going to do anything about this, |
| |
# we might as well leave |
| |
unless ($setpriv) { return ''; } |
| |
|
| |
# Backdoor access? |
| |
my $allowed=&allowed('eco',$ownerdomain); |
| |
# Nope |
| |
unless ($allowed) { return ''; } |
| |
# Looks like we may have access, but could be locked by the owner of the construction space |
| |
if ($allowed eq 'U') { |
| |
my %blocked=&get('environment',['domcoord.author'], |
| |
$ownerdomain,$ownername); |
| |
# Is blocked by owner |
| |
if ($blocked{'domcoord.author'} eq 'blocked') { return ''; } |
| |
} |
| |
if (($allowed eq 'F') || ($allowed eq 'U')) { |
| |
# Grant temporary access |
| |
my $then=$env{'user.login.time'}; |
| |
my $update=$env{'user.update.time'}; |
| |
if (!$update) { $update = $then; } |
| |
my $refresh=$env{'user.refresh.time'}; |
| |
if (!$refresh) { $refresh = $update; } |
| |
my $now = time; |
| |
&check_adhoc_privs($ownerdomain,$ownername,$update,$refresh, |
| |
$now,'ca','constructaccess'); |
| |
$ownerhome = &homeserver($ownername,$ownerdomain); |
| |
return($ownername,$ownerdomain,$ownerhome); |
| |
} |
| |
# No business here |
| |
return ''; |
| |
} |
| |
|
| |
# ----------------------------------------------------------- Content Blocking |
| |
|
| |
{ |
| |
# Caches for faster Course Contents display where content blocking |
| |
# is in operation (i.e., interval param set) for timed quiz. |
| |
# |
| |
# User for whom data are being temporarily cached. |
| |
my $cacheduser=''; |
| |
# Course for which data are being temporarily cached. |
| |
my $cachedcid=''; |
| |
# Cached blockers for this user (a hash of blocking items). |
| |
my %cachedblockers=(); |
| |
# When the data were last cached. |
| |
my $cachedlast=''; |
| |
|
| |
sub load_all_blockers { |
| |
my ($uname,$udom)=@_; |
| |
if (($uname ne '') && ($udom ne '')) { |
| |
if (($cacheduser eq $uname.':'.$udom) && |
| |
($cachedcid eq $env{'request.course.id'}) && |
| |
(abs($cachedlast-time)<5)) { |
| |
return; |
| |
} |
| |
} |
| |
$cachedlast=time; |
| |
$cacheduser=$uname.':'.$udom; |
| |
$cachedcid=$env{'request.course.id'}; |
| |
%cachedblockers = &get_commblock_resources(); |
| |
return; |
| |
} |
| |
|
| |
sub get_comm_blocks { |
| |
my ($cdom,$cnum) = @_; |
| |
if ($cdom eq '' || $cnum eq '') { |
| |
return unless ($env{'request.course.id'}); |
| |
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
} |
| |
my %commblocks; |
| |
my $hashid=$cdom.'_'.$cnum; |
| |
my ($blocksref,$cached)=&is_cached_new('comm_block',$hashid); |
| |
if ((defined($cached)) && (ref($blocksref) eq 'HASH')) { |
| |
%commblocks = %{$blocksref}; |
| |
} else { |
| |
%commblocks = &Apache::lonnet::dump('comm_block',$cdom,$cnum); |
| |
my $cachetime = 600; |
| |
&do_cache_new('comm_block',$hashid,\%commblocks,$cachetime); |
| |
} |
| |
return %commblocks; |
| |
} |
| |
|
| |
sub get_commblock_resources { |
| |
my ($blocks) = @_; |
| |
my %blockers = (); |
| |
return %blockers unless ($env{'request.course.id'}); |
| |
my $courseurl = &courseid_to_courseurl($env{'request.course.id'}); |
| |
if ($env{'request.course.sec'}) { |
| |
$courseurl .= '/'.$env{'request.course.sec'}; |
| |
} |
| |
return %blockers if ($env{'user.priv.'.$env{'request.role'}.'.'.$courseurl} =~/evb\&([^\:]*)/); |
| |
my %commblocks; |
| |
if (ref($blocks) eq 'HASH') { |
| |
%commblocks = %{$blocks}; |
| |
} else { |
| |
%commblocks = &get_comm_blocks(); |
| |
} |
| |
return %blockers unless (keys(%commblocks) > 0); |
| |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
return %blockers unless (ref($navmap)); |
| |
my $now = time; |
| |
foreach my $block (keys(%commblocks)) { |
| |
if ($block =~ /^(\d+)____(\d+)$/) { |
| |
my ($start,$end) = ($1,$2); |
| |
if ($start <= $now && $end >= $now) { |
| |
if (ref($commblocks{$block}{'blocks'}) eq 'HASH') { |
| |
if (ref($commblocks{$block}{'blocks'}{'docs'}) eq 'HASH') { |
| |
if (ref($commblocks{$block}{'blocks'}{'docs'}{'maps'}) eq 'HASH') { |
| |
if (keys(%{$commblocks{$block}{'blocks'}{'docs'}{'maps'}})) { |
| |
$blockers{$block}{maps} = $commblocks{$block}{'blocks'}{'docs'}{'maps'}; |
| |
} |
| |
} |
| |
if (ref($commblocks{$block}{'blocks'}{'docs'}{'resources'}) eq 'HASH') { |
| |
if (keys(%{$commblocks{$block}{'blocks'}{'docs'}{'resources'}})) { |
| |
$blockers{$block}{'resources'} = $commblocks{$block}{'blocks'}{'docs'}{'resources'}; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} elsif ($block =~ /^firstaccess____(.+)$/) { |
| |
my $item = $1; |
| |
if (ref($commblocks{$block}{'blocks'}) eq 'HASH') { |
| |
if (ref($commblocks{$block}{'blocks'}{'docs'}) eq 'HASH') { |
| |
my (@interval,$mapname); |
| |
my $type = 'map'; |
| |
if ($item eq 'course') { |
| |
$type = 'course'; |
| |
@interval=&EXT("resource.0.interval"); |
| |
} else { |
| |
if ($item =~ /___\d+___/) { |
| |
$type = 'resource'; |
| |
@interval=&EXT("resource.0.interval",$item); |
| |
} else { |
| |
$mapname = &deversion($item); |
| |
if (ref($navmap)) { |
| |
my $timelimit = $navmap->get_mapparam(undef,$mapname,'0.interval'); |
| |
@interval = ($timelimit,'map'); |
| |
} |
| |
} |
| |
} |
| |
if ($interval[0] =~ /^\d+$/) { |
| |
my $first_access; |
| |
if ($type eq 'resource') { |
| |
$first_access=&get_first_access($interval[1],$item); |
| |
} elsif ($type eq 'map') { |
| |
$first_access=&get_first_access($interval[1],undef,$item); |
| |
} else { |
| |
$first_access=&get_first_access($interval[1]); |
| |
} |
| |
if ($first_access) { |
| |
my $timesup = $first_access+$interval[0]; |
| |
if ($timesup > $now) { |
| |
my $activeblock; |
| |
if ($type eq 'resource') { |
| |
if (ref($navmap)) { |
| |
my $res = $navmap->getBySymb($item); |
| |
if ($res->answerable()) { |
| |
$activeblock = 1; |
| |
} |
| |
} |
| |
} elsif ($type eq 'map') { |
| |
my $mapsymb = &symbread($mapname,1); |
| |
if (($mapsymb) && (ref($navmap))) { |
| |
my $mapres = $navmap->getBySymb($mapsymb); |
| |
if (ref($mapres)) { |
| |
my $first = $mapres->map_start(); |
| |
my $finish = $mapres->map_finish(); |
| |
my $it = $navmap->getIterator($first,$finish,undef,0,0); |
| |
if (ref($it)) { |
| |
my $res; |
| |
while ($res = $it->next(undef,1)) { |
| |
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()) { |
| |
$activeblock = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($activeblock) { |
| |
if (ref($commblocks{$block}{'blocks'}{'docs'}{'maps'}) eq 'HASH') { |
| |
if (keys(%{$commblocks{$block}{'blocks'}{'docs'}{'maps'}})) { |
| |
$blockers{$block}{'maps'} = $commblocks{$block}{'blocks'}{'docs'}{'maps'}; |
| |
} |
| |
} |
| |
if (ref($commblocks{$block}{'blocks'}{'docs'}{'resources'}) eq 'HASH') { |
| |
if (keys(%{$commblocks{$block}{'blocks'}{'docs'}{'resources'}})) { |
| |
$blockers{$block}{'resources'} = $commblocks{$block}{'blocks'}{'docs'}{'resources'}; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return %blockers; |
| |
} |
| |
|
| |
sub has_comm_blocking { |
| |
my ($priv,$symb,$uri,$ignoresymbdb,$noenccheck,$blocked,$blocks) = @_; |
| |
my @blockers; |
| |
return unless ($env{'request.course.id'}); |
| |
return unless ($priv eq 'bre'); |
| |
return if ($env{'request.state'} eq 'construct'); |
| |
my $courseurl = &courseid_to_courseurl($env{'request.course.id'}); |
| |
if ($env{'request.course.sec'}) { |
| |
$courseurl .= '/'.$env{'request.course.sec'}; |
| |
} |
| |
return if ($env{'user.priv.'.$env{'request.role'}.'.'.$courseurl} =~/evb\&([^\:]*)/); |
| |
my %blockinfo; |
| |
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); |
| |
if (!$symb) { |
| |
$symb = &symbread($uri,1,1,1,\%possibles,$ignoresymbdb,$noenccheck); |
| |
} |
| |
if ($symb) { |
| |
@symbs = ($symb); |
| |
} elsif (keys(%possibles)) { |
| |
@symbs = keys(%possibles); |
| |
} |
| |
my $noblock; |
| |
foreach my $symb (@symbs) { |
| |
last if ($noblock); |
| |
my ($map,$resid,$resurl)=&decode_symb($symb); |
| |
foreach my $block (keys(%blockinfo)) { |
| |
if ($block =~ /^firstaccess____(.+)$/) { |
| |
my $item = $1; |
| |
unless ($blocked) { |
| |
if (($item eq $map) || ($item eq $symb)) { |
| |
$noblock = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
if (ref($blockinfo{$block}) eq 'HASH') { |
| |
if (ref($blockinfo{$block}{'resources'}) eq 'HASH') { |
| |
if ($blockinfo{$block}{'resources'}{$symb}) { |
| |
unless (grep(/^\Q$block\E$/,@blockers)) { |
| |
push(@blockers,$block); |
| |
} |
| |
} |
| |
} |
| |
if (ref($blockinfo{$block}{'maps'}) eq 'HASH') { |
| |
if ($blockinfo{$block}{'maps'}{$map}) { |
| |
unless (grep(/^\Q$block\E$/,@blockers)) { |
| |
push(@blockers,$block); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
unless ($noblock) { |
| |
return @blockers; |
| |
} |
| |
return; |
| |
} |
| |
} |
| |
|
| |
# -------------------------------- Deversion and split uri into path an filename |
| |
|
| |
# |
| |
# Removes the version from a URI and |
| |
# splits it in to its filename and path to the filename. |
| |
# Seems like File::Basename could have done this more clearly. |
| |
# Parameters: |
| |
# $uri - input URI |
| |
# Returns: |
| |
# Two element list consisting of |
| |
# $pathname - the URI up to and excluding the trailing / |
| |
# $filename - The part of the URI following the last / |
| |
# NOTE: |
| |
# Another realization of this is simply: |
| |
# use File::Basename; |
| |
# ... |
| |
# $uri = shift; |
| |
# $filename = basename($uri); |
| |
# $path = dirname($uri); |
| |
# return ($filename, $path); |
| |
# |
| |
# The implementation below is probably faster however. |
| |
# |
| sub split_uri_for_cond { |
sub split_uri_for_cond { |
| my $uri=&deversion(&declutter(shift)); |
my $uri=&deversion(&declutter(shift)); |
| my @uriparts=split(/\//,$uri); |
my @uriparts=split(/\//,$uri); |
|
Line 4997 sub get_symb_from_alias {
|
Line 8811 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 5025 sub definerole {
|
Line 8839 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 5038 sub definerole {
|
Line 8860 sub definerole {
|
| # ---------------- Make a metadata query against the network of library servers |
# ---------------- Make a metadata query against the network of library servers |
| |
|
| sub metadata_query { |
sub metadata_query { |
| my ($query,$custom,$customshow,$server_array)=@_; |
my ($query,$custom,$customshow,$server_array,$domains_hash)=@_; |
| my %rhash; |
my %rhash; |
| my %libserv = &all_library(); |
my %libserv = &all_library(); |
| my @server_list = (defined($server_array) ? @$server_array |
my @server_list = (defined($server_array) ? @$server_array |
| : keys(%libserv) ); |
: keys(%libserv) ); |
| for my $server (@server_list) { |
for my $server (@server_list) { |
| |
my $domains = ''; |
| |
if (ref($domains_hash) eq 'HASH') { |
| |
$domains = $domains_hash->{$server}; |
| |
} |
| unless ($custom or $customshow) { |
unless ($custom or $customshow) { |
| my $reply=&reply("querysend:".&escape($query),$server); |
my $reply=&reply("querysend:".&escape($query).':::'.&escape($domains),$server); |
| $rhash{$server}=$reply; |
$rhash{$server}=$reply; |
| } |
} |
| else { |
else { |
| my $reply=&reply("querysend:".&escape($query).':'. |
my $reply=&reply("querysend:".&escape($query).':'. |
| &escape($custom).':'.&escape($customshow), |
&escape($custom).':'.&escape($customshow).':'.&escape($domains), |
| $server); |
$server); |
| $rhash{$server}=$reply; |
$rhash{$server}=$reply; |
| } |
} |
|
Line 5100 sub update_allusers_table {
|
Line 8926 sub update_allusers_table {
|
| 'generation='.&escape($names->{'generation'}).'%%'. |
'generation='.&escape($names->{'generation'}).'%%'. |
| 'permanentemail='.&escape($names->{'permanentemail'}).'%%'. |
'permanentemail='.&escape($names->{'permanentemail'}).'%%'. |
| 'id='.&escape($names->{'id'}),$homeserver); |
'id='.&escape($names->{'id'}),$homeserver); |
| my $reply = &get_query_reply($queryid); |
return; |
| return $reply; |
|
| } |
} |
| |
|
| # ------- Request retrieval of institutional classlists for course(s) |
# ------- Request retrieval of institutional classlists for course(s) |
| |
|
| sub fetch_enrollment_query { |
sub fetch_enrollment_query { |
| my ($context,$affiliatesref,$replyref,$dom,$cnum) = @_; |
my ($context,$affiliatesref,$replyref,$dom,$cnum) = @_; |
| my $homeserver; |
my ($homeserver,$sleep,$loopmax); |
| my $maxtries = 1; |
my $maxtries = 1; |
| if ($context eq 'automated') { |
if ($context eq 'automated') { |
| $homeserver = $perlvar{'lonHostID'}; |
$homeserver = $perlvar{'lonHostID'}; |
| |
$sleep = 2; |
| |
$loopmax = 100; |
| $maxtries = 10; # will wait for up to 2000s for retrieval of classlist data before timeout |
$maxtries = 10; # will wait for up to 2000s for retrieval of classlist data before timeout |
| } else { |
} else { |
| $homeserver = &homeserver($cnum,$dom); |
$homeserver = &homeserver($cnum,$dom); |
| } |
} |
| my $host=&hostname($homeserver); |
my $host=&hostname($homeserver); |
| my $cmd = ''; |
my $cmd = ''; |
| foreach my $affiliate (keys %{$affiliatesref}) { |
foreach my $affiliate (keys(%{$affiliatesref})) { |
| $cmd .= $affiliate.'='.join(",",@{$$affiliatesref{$affiliate}}).'%%'; |
$cmd .= $affiliate.'='.join(",",@{$$affiliatesref{$affiliate}}).'%%'; |
| } |
} |
| $cmd =~ s/%%$//; |
$cmd =~ s/%%$//; |
|
Line 5129 sub fetch_enrollment_query {
|
Line 8956 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); |
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); |
$reply = &get_query_reply($queryid,$sleep,$loopmax); |
| $tries ++; |
$tries ++; |
| } |
} |
| if ( ($reply =~/^timeout/) || ($reply =~/^error/) ) { |
if ( ($reply =~/^timeout/) || ($reply =~/^error/) ) { |
| &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; |
| } |
} |
| } else { |
} else { |
| my $pathname = $perlvar{'lonDaemons'}.'/tmp'; |
my $pathname = LONCAPA::tempdir(); |
| foreach my $line (@responses) { |
foreach my $line (@responses) { |
| my ($key,$value) = split(/=/,$line); |
my ($key,$value) = split(/=/,$line); |
| $$replyref{$key} = $value; |
$$replyref{$key} = $value; |
|
Line 5157 sub fetch_enrollment_query {
|
Line 8984 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 5174 sub fetch_enrollment_query {
|
Line 9001 sub fetch_enrollment_query {
|
| } |
} |
| |
|
| sub get_query_reply { |
sub get_query_reply { |
| my $queryid=shift; |
my ($queryid,$sleep,$loopmax) = @_; |
| my $replyfile=$perlvar{'lonDaemons'}.'/tmp/'.$queryid; |
if (($sleep eq '') || ($sleep !~ /^\d+\.?\d*$/)) { |
| |
$sleep = 0.2; |
| |
} |
| |
if (($loopmax eq '') || ($loopmax =~ /\D/)) { |
| |
$loopmax = 100; |
| |
} |
| |
my $replyfile=LONCAPA::tempdir().$queryid; |
| my $reply=''; |
my $reply=''; |
| for (1..100) { |
for (1..$loopmax) { |
| sleep 2; |
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 5251 sub auto_run {
|
Line 9084 sub auto_run {
|
| |
|
| sub auto_get_sections { |
sub auto_get_sections { |
| my ($cnum,$cdom,$inst_coursecode) = @_; |
my ($cnum,$cdom,$inst_coursecode) = @_; |
| my $homeserver = &homeserver($cnum,$cdom); |
my $homeserver; |
| my @secs = (); |
if (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/)) { |
| my $response=&unescape(&reply('autogetsections:'.$inst_coursecode.':'.$cdom,$homeserver)); |
$homeserver = &homeserver($cnum,$cdom); |
| unless ($response eq 'refused') { |
} |
| @secs = split(/:/,$response); |
if (!defined($homeserver)) { |
| |
if ($cdom =~ /^$match_domain$/) { |
| |
$homeserver = &domain($cdom,'primary'); |
| |
} |
| |
} |
| |
my @secs; |
| |
if (defined($homeserver)) { |
| |
my $response=&unescape(&reply('autogetsections:'.$inst_coursecode.':'.$cdom,$homeserver)); |
| |
unless ($response eq 'refused') { |
| |
@secs = split(/:/,$response); |
| |
} |
| } |
} |
| return @secs; |
return @secs; |
| } |
} |
| |
|
| sub auto_new_course { |
sub auto_new_course { |
| my ($cnum,$cdom,$inst_course_id,$owner) = @_; |
my ($cnum,$cdom,$inst_course_id,$owner,$coowners) = @_; |
| my $homeserver = &homeserver($cnum,$cdom); |
my $homeserver = &homeserver($cnum,$cdom); |
| my $response=&unescape(&reply('autonewcourse:'.$inst_course_id.':'.$owner.':'.$cdom,$homeserver)); |
my $response=&unescape(&reply('autonewcourse:'.$inst_course_id.':'.&escape($owner).':'.$cdom.':'.&escape($coowners),$homeserver)); |
| return $response; |
return $response; |
| } |
} |
| |
|
|
Line 5274 sub auto_validate_courseID {
|
Line 9117 sub auto_validate_courseID {
|
| return $response; |
return $response; |
| } |
} |
| |
|
| |
sub auto_validate_instcode { |
| |
my ($cnum,$cdom,$instcode,$owner) = @_; |
| |
my ($homeserver,$response); |
| |
if (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/)) { |
| |
$homeserver = &homeserver($cnum,$cdom); |
| |
} |
| |
if (!defined($homeserver)) { |
| |
if ($cdom =~ /^$match_domain$/) { |
| |
$homeserver = &domain($cdom,'primary'); |
| |
} |
| |
} |
| |
$response=&unescape(&reply('autovalidateinstcode:'.$cdom.':'. |
| |
&escape($instcode).':'.&escape($owner),$homeserver)); |
| |
my ($outcome,$description,$defaultcredits) = map { &unescape($_); } split('&',$response,3); |
| |
return ($outcome,$description,$defaultcredits); |
| |
} |
| |
|
| |
sub auto_validate_inst_crosslist { |
| |
my ($cnum,$cdom,$instcode,$inst_xlist,$coowner) = @_; |
| |
my ($homeserver,$response); |
| |
if (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/)) { |
| |
$homeserver = &homeserver($cnum,$cdom); |
| |
} |
| |
if (!defined($homeserver)) { |
| |
if ($cdom =~ /^$match_domain$/) { |
| |
$homeserver = &domain($cdom,'primary'); |
| |
} |
| |
} |
| |
unless (($homeserver eq '') || ($homeserver eq 'no_host')) { |
| |
$response=&reply('autovalidateinstcrosslist:'.$cdom.':'. |
| |
&escape($instcode).':'.&escape($inst_xlist).':'. |
| |
&escape($coowner),$homeserver); |
| |
} |
| |
return $response; |
| |
} |
| |
|
| sub auto_create_password { |
sub auto_create_password { |
| my ($cnum,$cdom,$authparam,$udom) = @_; |
my ($cnum,$cdom,$authparam,$udom) = @_; |
| my ($homeserver,$response); |
my ($homeserver,$response); |
|
Line 5388 sub auto_instcode_format {
|
Line 9267 sub auto_instcode_format {
|
| push(@homeservers,$tryserver); |
push(@homeservers,$tryserver); |
| } |
} |
| } |
} |
| |
} elsif ($caller eq 'requests') { |
| |
if ($codedom =~ /^$match_domain$/) { |
| |
my $chome = &domain($codedom,'primary'); |
| |
unless ($chome eq 'no_host') { |
| |
push(@homeservers,$chome); |
| |
} |
| |
} |
| } else { |
} else { |
| push(@homeservers,&homeserver($caller,$codedom)); |
push(@homeservers,&homeserver($caller,$codedom)); |
| } |
} |
|
Line 5445 sub auto_instcode_defaults {
|
Line 9331 sub auto_instcode_defaults {
|
| } |
} |
| |
|
| return $response; |
return $response; |
| } |
} |
| |
|
| |
sub auto_possible_instcodes { |
| |
my ($domain,$codetitles,$cat_titles,$cat_orders,$code_order) = @_; |
| |
unless ((ref($codetitles) eq 'ARRAY') && (ref($cat_titles) eq 'HASH') && |
| |
(ref($cat_orders) eq 'HASH') && (ref($code_order) eq 'ARRAY')) { |
| |
return; |
| |
} |
| |
my (@homeservers,$uhome); |
| |
if (defined(&domain($domain,'primary'))) { |
| |
$uhome=&domain($domain,'primary'); |
| |
push(@homeservers,&domain($domain,'primary')); |
| |
} else { |
| |
my %servers = &get_servers($domain,'library'); |
| |
foreach my $tryserver (keys(%servers)) { |
| |
if (!grep(/^\Q$tryserver\E$/,@homeservers)) { |
| |
push(@homeservers,$tryserver); |
| |
} |
| |
} |
| |
} |
| |
my $response; |
| |
foreach my $server (@homeservers) { |
| |
$response=&reply('autopossibleinstcodes:'.$domain,$server); |
| |
next if ($response =~ /(con_lost|error|no_such_host|refused)/); |
| |
my ($codetitlestr,$codeorderstr,$cat_title,$cat_order) = |
| |
split(':',$response); |
| |
@{$codetitles} = map { &unescape($_); } (split('&',$codetitlestr)); |
| |
@{$code_order} = map { &unescape($_); } (split('&',$codeorderstr)); |
| |
foreach my $item (split('&',$cat_title)) { |
| |
my ($name,$value)=split('=',$item); |
| |
$cat_titles->{&unescape($name)}=&thaw_unescape($value); |
| |
} |
| |
foreach my $item (split('&',$cat_order)) { |
| |
my ($name,$value)=split('=',$item); |
| |
$cat_orders->{&unescape($name)}=&thaw_unescape($value); |
| |
} |
| |
return 'ok'; |
| |
} |
| |
return $response; |
| |
} |
| |
|
| |
sub auto_courserequest_checks { |
| |
my ($dom) = @_; |
| |
my ($homeserver,%validations); |
| |
if ($dom =~ /^$match_domain$/) { |
| |
$homeserver = &domain($dom,'primary'); |
| |
} |
| |
unless ($homeserver eq 'no_host') { |
| |
my $response=&reply('autocrsreqchecks:'.$dom,$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_courserequest_validation { |
| |
my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist,$custominfo) = @_; |
| |
my ($homeserver,$response); |
| |
if ($dom =~ /^$match_domain$/) { |
| |
$homeserver = &domain($dom,'primary'); |
| |
} |
| |
unless ($homeserver eq 'no_host') { |
| |
my $customdata; |
| |
if (ref($custominfo) eq 'HASH') { |
| |
$customdata = &freeze_escape($custominfo); |
| |
} |
| |
$response=&unescape(&reply('autocrsreqvalidation:'.$dom.':'.&escape($owner). |
| |
':'.&escape($crstype).':'.&escape($inststatuslist). |
| |
':'.&escape($instcode).':'.&escape($instseclist).':'. |
| |
$customdata,$homeserver)); |
| |
} |
| |
return $response; |
| |
} |
| |
|
| sub auto_validate_class_sec { |
sub auto_validate_class_sec { |
| my ($cdom,$cnum,$owners,$inst_class) = @_; |
my ($cdom,$cnum,$owners,$inst_class) = @_; |
|
Line 5461 sub auto_validate_class_sec {
|
Line 9424 sub auto_validate_class_sec {
|
| return $response; |
return $response; |
| } |
} |
| |
|
| |
sub auto_instsec_reformat { |
| |
my ($cdom,$action,$instsecref) = @_; |
| |
return unless(($action eq 'clutter') || ($action eq 'declutter')); |
| |
my @homeservers; |
| |
if (defined(&domain($cdom,'primary'))) { |
| |
push(@homeservers,&domain($cdom,'primary')); |
| |
} else { |
| |
my %servers = &get_servers($cdom,'library'); |
| |
foreach my $tryserver (keys(%servers)) { |
| |
if (!grep(/^\Q$tryserver\E$/,@homeservers)) { |
| |
push(@homeservers,$tryserver); |
| |
} |
| |
} |
| |
} |
| |
my $response; |
| |
my %reformatted = %{$instsecref}; |
| |
foreach my $server (@homeservers) { |
| |
if (ref($instsecref) eq 'HASH') { |
| |
my $info = &freeze_escape($instsecref); |
| |
my $response=&reply('autoinstsecreformat:'.$cdom.':'. |
| |
$action.':'.$info,$server); |
| |
next if ($response =~ /(con_lost|error|no_such_host|refused|unknown_command)/); |
| |
my @items = split(/&/,$response); |
| |
foreach my $item (@items) { |
| |
my ($key,$value) = split(/=/,$item); |
| |
$reformatted{&unescape($key)} = &thaw_unescape($value); |
| |
} |
| |
} |
| |
} |
| |
return %reformatted; |
| |
} |
| |
|
| |
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 { |
| |
my ($cdom,$cnum,$crstype,$action,$ownername,$ownerdomain,$fullname,$title, |
| |
$code,$accessstart,$accessend,$inbound) = @_; |
| |
my ($homeserver,%crsreqresponse); |
| |
if ($cdom =~ /^$match_domain$/) { |
| |
$homeserver = &domain($cdom,'primary'); |
| |
} |
| |
unless (($homeserver eq 'no_host') || ($homeserver eq '')) { |
| |
my $info; |
| |
if (ref($inbound) eq 'HASH') { |
| |
$info = &freeze_escape($inbound); |
| |
} |
| |
my $response=&reply('autocrsrequpdate:'.$cdom.':'.$cnum.':'.&escape($crstype). |
| |
':'.&escape($action).':'.&escape($ownername).':'. |
| |
&escape($ownerdomain).':'.&escape($fullname).':'. |
| |
&escape($title).':'.&escape($code).':'. |
| |
&escape($accessstart).':'.&escape($accessend).':'.$info,$homeserver); |
| |
unless ($response =~ /(con_lost|error|no_such_host|refused)/) { |
| |
my @items = split(/&/,$response); |
| |
foreach my $item (@items) { |
| |
my ($key,$value) = split('=',$item); |
| |
$crsreqresponse{&unescape($key)} = &thaw_unescape($value); |
| |
} |
| |
} |
| |
} |
| |
return \%crsreqresponse; |
| |
} |
| |
|
| |
sub auto_export_grades { |
| |
my ($cdom,$cnum,$inforef,$gradesref) = @_; |
| |
my ($homeserver,%exportresponse); |
| |
if ($cdom =~ /^$match_domain$/) { |
| |
$homeserver = &domain($cdom,'primary'); |
| |
} |
| |
unless (($homeserver eq 'no_host') || ($homeserver eq '')) { |
| |
my $info; |
| |
if (ref($inforef) eq 'HASH') { |
| |
$info = &freeze_escape($inforef); |
| |
} |
| |
if (ref($gradesref) eq 'HASH') { |
| |
my $grades = &freeze_escape($gradesref); |
| |
my $response=&reply('encrypt:autoexportgrades:'.$cdom.':'.$cnum.':'. |
| |
$info.':'.$grades,$homeserver); |
| |
unless ($response =~ /(con_lost|error|no_such_host|refused|unknown_command)/) { |
| |
my @items = split(/&/,$response); |
| |
foreach my $item (@items) { |
| |
my ($key,$value) = split('=',$item); |
| |
$exportresponse{&unescape($key)} = &thaw_unescape($value); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return \%exportresponse; |
| |
} |
| |
|
| |
sub check_instcode_cloning { |
| |
my ($codedefaults,$code_order,$cloner,$clonefromcode,$clonetocode) = @_; |
| |
unless ((ref($codedefaults) eq 'HASH') && (ref($code_order) eq 'ARRAY')) { |
| |
return; |
| |
} |
| |
my $canclone; |
| |
if (@{$code_order} > 0) { |
| |
my $instcoderegexp ='^'; |
| |
my @clonecodes = split(/\&/,$cloner); |
| |
foreach my $item (@{$code_order}) { |
| |
if (grep(/^\Q$item\E=/,@clonecodes)) { |
| |
foreach my $pair (@clonecodes) { |
| |
my ($key,$val) = split(/\=/,$pair,2); |
| |
$val = &unescape($val); |
| |
if ($key eq $item) { |
| |
$instcoderegexp .= '('.$val.')'; |
| |
last; |
| |
} |
| |
} |
| |
} else { |
| |
$instcoderegexp .= $codedefaults->{$item}; |
| |
} |
| |
} |
| |
$instcoderegexp .= '$'; |
| |
my (@from,@to); |
| |
eval { |
| |
(@from) = ($clonefromcode =~ /$instcoderegexp/); |
| |
(@to) = ($clonetocode =~ /$instcoderegexp/); |
| |
}; |
| |
if ((@from > 0) && (@to > 0)) { |
| |
my @diffs = &Apache::loncommon::compare_arrays(\@from,\@to); |
| |
if (!@diffs) { |
| |
$canclone = 1; |
| |
} |
| |
} |
| |
} |
| |
return $canclone; |
| |
} |
| |
|
| |
sub default_instcode_cloning { |
| |
my ($clonedom,$domdefclone,$clonefromcode,$clonetocode,$codedefaultsref,$codeorderref) = @_; |
| |
my (%codedefaults,@code_order,$canclone); |
| |
if ((ref($codedefaultsref) eq 'HASH') && (ref($codeorderref) eq 'ARRAY')) { |
| |
%codedefaults = %{$codedefaultsref}; |
| |
@code_order = @{$codeorderref}; |
| |
} elsif ($clonedom) { |
| |
&auto_instcode_defaults($clonedom,\%codedefaults,\@code_order); |
| |
} |
| |
if (($domdefclone) && (@code_order)) { |
| |
my @clonecodes = split(/\+/,$domdefclone); |
| |
my $instcoderegexp ='^'; |
| |
foreach my $item (@code_order) { |
| |
if (grep(/^\Q$item\E$/,@clonecodes)) { |
| |
$instcoderegexp .= '('.$codedefaults{$item}.')'; |
| |
} else { |
| |
$instcoderegexp .= $codedefaults{$item}; |
| |
} |
| |
} |
| |
$instcoderegexp .= '$'; |
| |
my (@from,@to); |
| |
eval { |
| |
(@from) = ($clonefromcode =~ /$instcoderegexp/); |
| |
(@to) = ($clonetocode =~ /$instcoderegexp/); |
| |
}; |
| |
if ((@from > 0) && (@to > 0)) { |
| |
my @diffs = &Apache::loncommon::compare_arrays(\@from,\@to); |
| |
if (!@diffs) { |
| |
$canclone = 1; |
| |
} |
| |
} |
| |
} |
| |
return $canclone; |
| |
} |
| |
|
| # ------------------------------------------------------- Course Group routines |
# ------------------------------------------------------- Course Group routines |
| |
|
| sub get_coursegroups { |
sub get_coursegroups { |
|
Line 5598 sub devalidate_getgroups_cache {
|
Line 9749 sub devalidate_getgroups_cache {
|
| # ------------------------------------------------------------------ Plain Text |
# ------------------------------------------------------------------ Plain Text |
| |
|
| sub plaintext { |
sub plaintext { |
| my ($short,$type,$cid) = @_; |
my ($short,$type,$cid,$forcedefault) = @_; |
| if ($short =~ /^cr/) { |
if ($short =~ m{^cr/}) { |
| return (split('/',$short))[-1]; |
return (split('/',$short))[-1]; |
| } |
} |
| if (!defined($cid)) { |
if (!defined($cid)) { |
| $cid = $env{'request.course.id'}; |
$cid = $env{'request.course.id'}; |
| } |
} |
| if (defined($cid) && defined($env{'course.'.$cid.'.'.$short.'.plaintext'})) { |
|
| return &Apache::lonlocal::mt($env{'course.'.$cid.'.'.$short. |
|
| '.plaintext'}); |
|
| } |
|
| my %rolenames = ( |
my %rolenames = ( |
| Course => 'std', |
Course => 'std', |
| Group => 'alt1', |
Community => 'alt1', |
| ); |
); |
| if (defined($type) && |
if ($cid ne '') { |
| defined($rolenames{$type}) && |
if ($env{'course.'.$cid.'.'.$short.'.plaintext'} ne '') { |
| defined($prp{$short}{$rolenames{$type}})) { |
unless ($forcedefault) { |
| |
my $roletext = $env{'course.'.$cid.'.'.$short.'.plaintext'}; |
| |
&Apache::lonlocal::mt_escape(\$roletext); |
| |
return &Apache::lonlocal::mt($roletext); |
| |
} |
| |
} |
| |
} |
| |
if ((defined($type)) && (defined($rolenames{$type})) && |
| |
(defined($rolenames{$type})) && |
| |
(defined($prp{$short}{$rolenames{$type}}))) { |
| return &Apache::lonlocal::mt($prp{$short}{$rolenames{$type}}); |
return &Apache::lonlocal::mt($prp{$short}{$rolenames{$type}}); |
| } else { |
} elsif ($cid ne '') { |
| return &Apache::lonlocal::mt($prp{$short}{'std'}); |
my $crstype = $env{'course.'.$cid.'.type'}; |
| |
if (($crstype ne '') && (defined($rolenames{$crstype})) && |
| |
(defined($prp{$short}{$rolenames{$crstype}}))) { |
| |
return &Apache::lonlocal::mt($prp{$short}{$rolenames{$crstype}}); |
| |
} |
| } |
} |
| |
return &Apache::lonlocal::mt($prp{$short}{'std'}); |
| } |
} |
| |
|
| # ----------------------------------------------------------------- Assign Role |
# ----------------------------------------------------------------- Assign Role |
|
Line 5632 sub assignrole {
|
Line 9793 sub assignrole {
|
| my $cwosec=$url; |
my $cwosec=$url; |
| $cwosec=~s/^\/($match_domain)\/($match_courseid)\/.*/$1\/$2/; |
$cwosec=~s/^\/($match_domain)\/($match_courseid)\/.*/$1\/$2/; |
| unless (&allowed('ccr',$cwosec)) { |
unless (&allowed('ccr',$cwosec)) { |
| &logthis('Refused custom assignrole: '. |
my $refused = 1; |
| $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '. |
if ($context eq 'requestcourses') { |
| $env{'user.name'}.' at '.$env{'user.domain'}); |
if (($env{'user.name'} ne '') && ($env{'user.domain'} ne '')) { |
| return 'refused'; |
if ($role =~ m{^cr/($match_domain)/($match_username)/([^/]+)$}) { |
| |
if (($1 eq $env{'user.domain'}) && ($2 eq $env{'user.name'})) { |
| |
my ($cdom,$cnum) = ($cwosec =~ m{^/?($match_domain)/($match_courseid)$}); |
| |
my %crsenv = &userenvironment($cdom,$cnum,('internal.courseowner')); |
| |
if ($crsenv{'internal.courseowner'} eq |
| |
$env{'user.name'}.':'.$env{'user.domain'}) { |
| |
$refused = ''; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($refused) { |
| |
&logthis('Refused custom assignrole: '. |
| |
$udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start. |
| |
' by '.$env{'user.name'}.' at '.$env{'user.domain'}); |
| |
return 'refused'; |
| |
} |
| } |
} |
| $mrole='cr'; |
$mrole='cr'; |
| } elsif ($role =~ /^gr\//) { |
} elsif ($role =~ /^gr\//) { |
|
Line 5661 sub assignrole {
|
Line 9839 sub assignrole {
|
| $refused = 1; |
$refused = 1; |
| } |
} |
| if ($refused) { |
if ($refused) { |
| if (($selfenroll == 1) && ($role eq 'st') && ($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'})) { |
my ($cdom,$cnum) = ($cwosec =~ m{^/?($match_domain)/($match_courseid)$}); |
| |
if (!$selfenroll && $context eq 'course') { |
| |
my %crsenv; |
| |
if ($role eq 'cc' || $role eq 'co') { |
| |
%crsenv = &userenvironment($cdom,$cnum,('internal.courseowner')); |
| |
if (($role eq 'cc') && ($cnum !~ /^$match_community$/)) { |
| |
if ($env{'request.role'} eq 'cc./'.$cdom.'/'.$cnum) { |
| |
if ($crsenv{'internal.courseowner'} eq |
| |
$env{'user.name'}.':'.$env{'user.domain'}) { |
| |
$refused = ''; |
| |
} |
| |
} |
| |
} elsif (($role eq 'co') && ($cnum =~ /^$match_community$/)) { |
| |
if ($env{'request.role'} eq 'co./'.$cdom.'/'.$cnum) { |
| |
if ($crsenv{'internal.courseowner'} eq |
| |
$env{'user.name'}.':'.$env{'user.domain'}) { |
| |
$refused = ''; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} elsif (($selfenroll == 1) && ($role eq 'st') && ($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'})) { |
| $refused = ''; |
$refused = ''; |
| } else { |
} elsif ($context eq 'requestcourses') { |
| |
my @possroles = ('st','ta','ep','in','cc','co'); |
| |
if ((grep(/^\Q$role\E$/,@possroles)) && ($env{'user.name'} ne '' && $env{'user.domain'} ne '')) { |
| |
my $wrongcc; |
| |
if ($cnum =~ /^$match_community$/) { |
| |
$wrongcc = 1 if ($role eq 'cc'); |
| |
} else { |
| |
$wrongcc = 1 if ($role eq 'co'); |
| |
} |
| |
unless ($wrongcc) { |
| |
my %crsenv = &userenvironment($cdom,$cnum,('internal.courseowner')); |
| |
if ($crsenv{'internal.courseowner'} eq |
| |
$env{'user.name'}.':'.$env{'user.domain'}) { |
| |
$refused = ''; |
| |
} |
| |
} |
| |
} |
| |
} elsif ($context eq 'requestauthor') { |
| |
if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'}) && |
| |
($url eq '/'.$udom.'/') && ($role eq 'au')) { |
| |
if ($env{'environment.requestauthor'} eq 'automatic') { |
| |
$refused = ''; |
| |
} else { |
| |
my %domdefaults = &get_domain_defaults($udom); |
| |
if (ref($domdefaults{'requestauthor'}) eq 'HASH') { |
| |
my $checkbystatus; |
| |
if ($env{'user.adv'}) { |
| |
my $disposition = $domdefaults{'requestauthor'}{'_LC_adv'}; |
| |
if ($disposition eq 'automatic') { |
| |
$refused = ''; |
| |
} elsif ($disposition eq '') { |
| |
$checkbystatus = 1; |
| |
} |
| |
} else { |
| |
$checkbystatus = 1; |
| |
} |
| |
if ($checkbystatus) { |
| |
if ($env{'environment.inststatus'}) { |
| |
my @inststatuses = split(/,/,$env{'environment.inststatus'}); |
| |
foreach my $type (@inststatuses) { |
| |
if (($type ne '') && |
| |
($domdefaults{'requestauthor'}{$type} eq 'automatic')) { |
| |
$refused = ''; |
| |
} |
| |
} |
| |
} elsif ($domdefaults{'requestauthor'}{'default'} eq 'automatic') { |
| |
$refused = ''; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($refused) { |
| &logthis('Refused assignrole: '.$udom.' '.$uname.' '.$url. |
&logthis('Refused assignrole: '.$udom.' '.$uname.' '.$url. |
| ' '.$role.' '.$end.' '.$start.' by '. |
' '.$role.' '.$end.' '.$start.' by '. |
| $env{'user.name'}.' at '.$env{'user.domain'}); |
$env{'user.name'}.' at '.$env{'user.domain'}); |
| return 'refused'; |
return 'refused'; |
| } |
} |
| } |
} |
| |
} elsif ($role eq 'au') { |
| |
if ($url ne '/'.$udom.'/') { |
| |
&logthis('Attempt by '.$env{'user.name'}.':'.$env{'user.domain'}. |
| |
' to assign author role for '.$uname.':'.$udom. |
| |
' in domain: '.$url.' refused (wrong domain).'); |
| |
return 'refused'; |
| |
} |
| } |
} |
| $mrole=$role; |
$mrole=$role; |
| } |
} |
|
Line 5704 sub assignrole {
|
Line 9963 sub assignrole {
|
| # log new user role if status is ok |
# log new user role if status is ok |
| if ($answer eq 'ok') { |
if ($answer eq 'ok') { |
| &userrolelog($role,$uname,$udom,$url,$start,$end); |
&userrolelog($role,$uname,$udom,$url,$start,$end); |
| |
if (($role eq 'cc') || ($role eq 'in') || |
| |
($role eq 'ep') || ($role eq 'ad') || |
| |
($role eq 'ta') || ($role eq 'st') || |
| |
($role=~/^cr/) || ($role eq 'gr') || |
| |
($role eq 'co')) { |
| # for course roles, perform group memberships changes triggered by role change. |
# for course roles, perform group memberships changes triggered by role change. |
| &courserolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,$selfenroll,$context); |
unless ($role =~ /^gr/) { |
| unless ($role =~ /^gr/) { |
&Apache::longroup::group_changes($udom,$uname,$url,$role,$origend, |
| &Apache::longroup::group_changes($udom,$uname,$url,$role,$origend, |
$origstart,$selfenroll,$context); |
| $origstart,$selfenroll,$context); |
} |
| |
&courserolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag, |
| |
$selfenroll,$context); |
| |
} elsif (($role eq 'li') || ($role eq 'dg') || ($role eq 'sc') || |
| |
($role eq 'au') || ($role eq 'dc') || ($role eq 'dh') || |
| |
($role eq 'da')) { |
| |
&domainrolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag, |
| |
$context); |
| |
} elsif (($role eq 'ca') || ($role eq 'aa')) { |
| |
&coauthorrolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag, |
| |
$context); |
| |
} |
| |
if ($role eq 'cc') { |
| |
&autoupdate_coowners($url,$end,$start,$uname,$udom); |
| } |
} |
| } |
} |
| return $answer; |
return $answer; |
| } |
} |
| |
|
| |
sub autoupdate_coowners { |
| |
my ($url,$end,$start,$uname,$udom) = @_; |
| |
my ($cdom,$cnum) = ($url =~ m{^/($match_domain)/($match_courseid)}); |
| |
if (($cdom ne '') && ($cnum ne '')) { |
| |
my $now = time; |
| |
my %domdesign = &Apache::loncommon::get_domainconf($cdom); |
| |
if ($domdesign{$cdom.'.autoassign.co-owners'}) { |
| |
my %coursehash = &coursedescription($cdom.'_'.$cnum); |
| |
my $instcode = $coursehash{'internal.coursecode'}; |
| |
my $xlists = $coursehash{'internal.crosslistings'}; |
| |
if ($instcode ne '') { |
| |
if (($start && $start <= $now) && ($end == 0) || ($end > $now)) { |
| |
unless ($coursehash{'internal.courseowner'} eq $uname.':'.$udom) { |
| |
my ($delcoowners,@newcoowners,$putresult,$delresult,$coowners); |
| |
my ($result,$desc) = &auto_validate_instcode($cnum,$cdom,$instcode,$uname.':'.$udom); |
| |
unless ($result eq 'valid') { |
| |
if ($xlists ne '') { |
| |
foreach my $xlist (split(',',$xlists)) { |
| |
my ($inst_crosslist,$lcsec) = split(':',$xlist); |
| |
$result = |
| |
&auto_validate_inst_crosslist($cnum,$cdom,$instcode, |
| |
$inst_crosslist,$uname.':'.$udom); |
| |
last if ($result eq 'valid'); |
| |
} |
| |
} |
| |
} |
| |
if ($result eq 'valid') { |
| |
if ($coursehash{'internal.co-owners'}) { |
| |
foreach my $coowner (split(',',$coursehash{'internal.co-owners'})) { |
| |
push(@newcoowners,$coowner); |
| |
} |
| |
unless (grep(/^\Q$uname\E:\Q$udom\E$/,@newcoowners)) { |
| |
push(@newcoowners,$uname.':'.$udom); |
| |
} |
| |
@newcoowners = sort(@newcoowners); |
| |
} else { |
| |
push(@newcoowners,$uname.':'.$udom); |
| |
} |
| |
} elsif ($coursehash{'internal.co-owners'}) { |
| |
foreach my $coowner (split(',',$coursehash{'internal.co-owners'})) { |
| |
unless ($coowner eq $uname.':'.$udom) { |
| |
push(@newcoowners,$coowner); |
| |
} |
| |
} |
| |
unless (@newcoowners > 0) { |
| |
$delcoowners = 1; |
| |
$coowners = ''; |
| |
} |
| |
} |
| |
if (@newcoowners || $delcoowners) { |
| |
&store_coowners($cdom,$cnum,$coursehash{'home'}, |
| |
$delcoowners,@newcoowners); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
|
| |
sub store_coowners { |
| |
my ($cdom,$cnum,$chome,$delcoowners,@newcoowners) = @_; |
| |
my $cid = $cdom.'_'.$cnum; |
| |
my ($coowners,$delresult,$putresult); |
| |
if (@newcoowners) { |
| |
$coowners = join(',',@newcoowners); |
| |
my %coownershash = ( |
| |
'internal.co-owners' => $coowners, |
| |
); |
| |
$putresult = &put('environment',\%coownershash,$cdom,$cnum); |
| |
if ($putresult eq 'ok') { |
| |
if ($env{'course.'.$cid.'.num'} eq $cnum) { |
| |
&appenv({'course.'.$cid.'.internal.co-owners' => $coowners}); |
| |
} |
| |
} |
| |
} |
| |
if ($delcoowners) { |
| |
$delresult = &Apache::lonnet::del('environment',['internal.co-owners'],$cdom,$cnum); |
| |
if ($delresult eq 'ok') { |
| |
if ($env{'course.'.$cid.'.internal.co-owners'}) { |
| |
&Apache::lonnet::delenv('course.'.$cid.'.internal.co-owners'); |
| |
} |
| |
} |
| |
} |
| |
if (($putresult eq 'ok') || ($delresult eq 'ok')) { |
| |
my %crsinfo = |
| |
&Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum,undef,undef,'.'); |
| |
if (ref($crsinfo{$cid}) eq 'HASH') { |
| |
$crsinfo{$cid}{'co-owners'} = \@newcoowners; |
| |
my $cidput = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime'); |
| |
} |
| |
} |
| |
} |
| |
|
| # -------------------------------------------------- Modify user authentication |
# -------------------------------------------------- Modify user authentication |
| # Overrides without validation |
# Overrides without validation |
| |
|
| 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'}); |
| my $reply=&reply('encrypt:changeuserauth:'.$udom.':'.$uname.':'.$umode.':'. |
my $reply=&reply('encrypt:changeuserauth:'.$udom.':'.$uname.':'.$umode.':'. |
| &escape($upass),$uhome); |
&escape($upass),$uhome); |
| |
my $ip = &get_requestor_ip(); |
| &log($env{'user.domain'},$env{'user.name'},$env{'user.home'}, |
&log($env{'user.domain'},$env{'user.name'},$env{'user.home'}, |
| 'Authentication changed for '.$udom.', '.$uname.', '.$umode. |
'Authentication changed for '.$udom.', '.$uname.', '.$umode. |
| '(Remote '.$ENV{'REMOTE_ADDR'}.'): '.$reply); |
'(Remote '.$ip.'): '.$reply); |
| &log($udom,,$uname,$uhome, |
&log($udom,,$uname,$uhome, |
| 'Authentication changed by '.$env{'user.domain'}.', '. |
'Authentication changed by '.$env{'user.domain'}.', '. |
| $env{'user.name'}.', '.$umode. |
$env{'user.name'}.', '.$umode. |
| '(Remote '.$ENV{'REMOTE_ADDR'}.'): '.$reply); |
'(Remote '.$ip.'): '.$reply); |
| unless ($reply eq 'ok') { |
unless ($reply eq 'ok') { |
| &logthis('Authentication mode error: '.$reply); |
&logthis('Authentication mode error: '.$reply); |
| return 'error: '.$reply; |
return 'error: '.$reply; |
|
Line 5746 sub modifyuser {
|
Line 10133 sub modifyuser {
|
| my ($udom, $uname, $uid, |
my ($udom, $uname, $uid, |
| $umode, $upass, $first, |
$umode, $upass, $first, |
| $middle, $last, $gene, |
$middle, $last, $gene, |
| $forceid, $desiredhome, $email, $inststatus)=@_; |
$forceid, $desiredhome, $email, $inststatus, $candelete)=@_; |
| $udom= &LONCAPA::clean_domain($udom); |
$udom= &LONCAPA::clean_domain($udom); |
| $uname=&LONCAPA::clean_username($uname); |
$uname=&LONCAPA::clean_username($uname); |
| |
my $showcandelete = 'none'; |
| |
if (ref($candelete) eq 'ARRAY') { |
| |
if (@{$candelete} > 0) { |
| |
$showcandelete = join(', ',@{$candelete}); |
| |
} |
| |
} |
| &logthis('Call to modify user '.$udom.', '.$uname.', '.$uid.', '. |
&logthis('Call to modify user '.$udom.', '.$uname.', '.$uid.', '. |
| $umode.', '.$first.', '.$middle.', '. |
$umode.', '.$first.', '.$middle.', '. |
| $last.', '.$gene.'(forceid: '.$forceid.')'. |
$last.', '.$gene.'(forceid: '.$forceid.'; candelete: '.$showcandelete.')'. |
| (defined($desiredhome) ? ' desiredhome = '.$desiredhome : |
(defined($desiredhome) ? ' desiredhome = '.$desiredhome : |
| ' desiredhome not specified'). |
' desiredhome not specified'). |
| ' by '.$env{'user.name'}.' at '.$env{'user.domain'}. |
' by '.$env{'user.name'}.' at '.$env{'user.domain'}. |
| ' in domain '.$env{'request.role.domain'}); |
' in domain '.$env{'request.role.domain'}); |
| my $uhome=&homeserver($uname,$udom,'true'); |
my $uhome=&homeserver($uname,$udom,'true'); |
| |
my $newuser; |
| |
if ($uhome eq 'no_host') { |
| |
$newuser = 1; |
| |
} |
| # ----------------------------------------------------------------- Create User |
# ----------------------------------------------------------------- Create User |
| if (($uhome eq 'no_host') && |
if (($uhome eq 'no_host') && |
| (($umode && $upass) || ($umode eq 'localauth'))) { |
(($umode && $upass) || ($umode eq 'localauth'))) { |
|
Line 5809 sub modifyuser {
|
Line 10206 sub modifyuser {
|
| ['firstname','middlename','lastname','generation','id', |
['firstname','middlename','lastname','generation','id', |
| 'permanentemail','inststatus'], |
'permanentemail','inststatus'], |
| $udom,$uname); |
$udom,$uname); |
| my %names; |
my (%names,%oldnames); |
| if ($tmp[0] =~ m/^error:.*/) { |
if ($tmp[0] =~ m/^error:.*/) { |
| %names=(); |
%names=(); |
| } else { |
} else { |
| %names = @tmp; |
%names = @tmp; |
| |
%oldnames = %names; |
| } |
} |
| # |
# |
| # Make sure to not trash student environment if instructor does not bother |
# If name, email and/or uid are blank (e.g., because an uploaded file |
| # to supply name and email information |
# of users did not contain them), do not overwrite existing values |
| # |
# unless field is in $candelete array ref. |
| |
# |
| |
|
| |
my @fields = ('firstname','middlename','lastname','generation', |
| |
'permanentemail','id'); |
| |
my %newvalues; |
| |
if (ref($candelete) eq 'ARRAY') { |
| |
foreach my $field (@fields) { |
| |
if (grep(/^\Q$field\E$/,@{$candelete})) { |
| |
if ($field eq 'firstname') { |
| |
$names{$field} = $first; |
| |
} elsif ($field eq 'middlename') { |
| |
$names{$field} = $middle; |
| |
} elsif ($field eq 'lastname') { |
| |
$names{$field} = $last; |
| |
} elsif ($field eq 'generation') { |
| |
$names{$field} = $gene; |
| |
} elsif ($field eq 'permanentemail') { |
| |
$names{$field} = $email; |
| |
} elsif ($field eq 'id') { |
| |
$names{$field} = $uid; |
| |
} |
| |
} |
| |
} |
| |
} |
| if ($first) { $names{'firstname'} = $first; } |
if ($first) { $names{'firstname'} = $first; } |
| if (defined($middle)) { $names{'middlename'} = $middle; } |
if (defined($middle)) { $names{'middlename'} = $middle; } |
| if ($last) { $names{'lastname'} = $last; } |
if ($last) { $names{'lastname'} = $last; } |
|
Line 5828 sub modifyuser {
|
Line 10250 sub modifyuser {
|
| if ($email=~/\@/) { $names{'permanentemail'} = $email; } |
if ($email=~/\@/) { $names{'permanentemail'} = $email; } |
| } |
} |
| if ($uid) { $names{'id'} = $uid; } |
if ($uid) { $names{'id'} = $uid; } |
| if (defined($inststatus)) { $names{'inststatus'} = $inststatus; } |
if (defined($inststatus)) { |
| my $reply = &put('environment', \%names, $udom,$uname); |
$names{'inststatus'} = ''; |
| if ($reply ne 'ok') { return 'error: '.$reply; } |
my ($usertypes,$typesorder) = &retrieve_inst_usertypes($udom); |
| my $sqlresult = &update_allusers_table($uname,$udom,\%names); |
if (ref($usertypes) eq 'HASH') { |
| &devalidate_cache_new('namescache',$uname.':'.$udom); |
my @okstatuses; |
| my $logmsg = 'Success modifying user '.$udom.', '.$uname.', '.$uid.', '. |
foreach my $item (split(/:/,$inststatus)) { |
| |
if (defined($usertypes->{$item})) { |
| |
push(@okstatuses,$item); |
| |
} |
| |
} |
| |
if (@okstatuses) { |
| |
$names{'inststatus'} = join(':', map { &escape($_); } @okstatuses); |
| |
} |
| |
} |
| |
} |
| |
my $logmsg = $udom.', '.$uname.', '.$uid.', '. |
| $umode.', '.$first.', '.$middle.', '. |
$umode.', '.$first.', '.$middle.', '. |
| $last.', '.$gene.', '.$email.', '.$inststatus; |
$last.', '.$gene.', '.$email.', '.$inststatus; |
| if ($env{'user.name'} ne '' && $env{'user.domain'}) { |
if ($env{'user.name'} ne '' && $env{'user.domain'}) { |
| $logmsg .= ' by '.$env{'user.name'}.' at '.$env{'user.domain'}; |
$logmsg .= ' by '.$env{'user.name'}.' at '.$env{'user.domain'}; |
| } else { |
} else { |
| $logmsg .= ' during self creation'; |
$logmsg .= ' during self creation'; |
| } |
} |
| |
my $changed; |
| |
if ($newuser) { |
| |
$changed = 1; |
| |
} else { |
| |
foreach my $field (@fields) { |
| |
if ($names{$field} ne $oldnames{$field}) { |
| |
$changed = 1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
unless ($changed) { |
| |
$logmsg = 'No changes in user information needed for: '.$logmsg; |
| |
&logthis($logmsg); |
| |
return 'ok'; |
| |
} |
| |
my $reply = &put('environment', \%names, $udom,$uname); |
| |
if ($reply ne 'ok') { |
| |
return 'error: '.$reply; |
| |
} |
| |
if ($names{'permanentemail'} ne $oldnames{'permanentemail'}) { |
| |
&Apache::lonnet::devalidate_cache_new('emailscache',$uname.':'.$udom); |
| |
} |
| |
my $sqlresult = &update_allusers_table($uname,$udom,\%names); |
| |
&devalidate_cache_new('namescache',$uname.':'.$udom); |
| |
$logmsg = 'Success modifying user '.$logmsg; |
| &logthis($logmsg); |
&logthis($logmsg); |
| return 'ok'; |
return 'ok'; |
| } |
} |
|
Line 5850 sub modifyuser {
|
Line 10308 sub modifyuser {
|
| sub modifystudent { |
sub modifystudent { |
| my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec, |
my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec, |
| $end,$start,$forceid,$desiredhome,$email,$type,$locktype,$cid, |
$end,$start,$forceid,$desiredhome,$email,$type,$locktype,$cid, |
| $selfenroll,$context)=@_; |
$selfenroll,$context,$inststatus,$credits,$instsec)=@_; |
| if (!$cid) { |
if (!$cid) { |
| unless ($cid=$env{'request.course.id'}) { |
unless ($cid=$env{'request.course.id'}) { |
| return 'not_in_class'; |
return 'not_in_class'; |
|
Line 5859 sub modifystudent {
|
Line 10317 sub modifystudent {
|
| # --------------------------------------------------------------- Make the user |
# --------------------------------------------------------------- Make the user |
| my $reply=&modifyuser |
my $reply=&modifyuser |
| ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$forceid, |
($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$forceid, |
| $desiredhome,$email); |
$desiredhome,$email,$inststatus); |
| unless ($reply eq 'ok') { return $reply; } |
unless ($reply eq 'ok') { return $reply; } |
| # This will cause &modify_student_enrollment to get the uid from the |
# This will cause &modify_student_enrollment to get the uid from the |
| # students environment |
# student's environment |
| $uid = undef if (!$forceid); |
$uid = undef if (!$forceid); |
| $reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last, |
$reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last, |
| $gene,$usec,$end,$start,$type,$locktype,$cid,$selfenroll,$context); |
$gene,$usec,$end,$start,$type,$locktype, |
| |
$cid,$selfenroll,$context,$credits,$instsec); |
| return $reply; |
return $reply; |
| } |
} |
| |
|
| sub modify_student_enrollment { |
sub modify_student_enrollment { |
| my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,$locktype,$cid,$selfenroll,$context) = @_; |
my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type, |
| |
$locktype,$cid,$selfenroll,$context,$credits,$instsec) = @_; |
| my ($cdom,$cnum,$chome); |
my ($cdom,$cnum,$chome); |
| if (!$cid) { |
if (!$cid) { |
| unless ($cid=$env{'request.course.id'}) { |
unless ($cid=$env{'request.course.id'}) { |
|
Line 5913 sub modify_student_enrollment {
|
Line 10373 sub modify_student_enrollment {
|
| $uid = $tmp{'id'} if (!defined($uid) || $uid eq ''); |
$uid = $tmp{'id'} if (!defined($uid) || $uid eq ''); |
| } |
} |
| my $fullname = &format_name($first,$middle,$last,$gene,'lastname'); |
my $fullname = &format_name($first,$middle,$last,$gene,'lastname'); |
| |
my $user = "$uname:$udom"; |
| |
my %old_entry = &Apache::lonnet::get('classlist',[$user],$cdom,$cnum); |
| my $reply=cput('classlist', |
my $reply=cput('classlist', |
| {"$uname:$udom" => |
{$user => |
| join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype) }, |
join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype,$credits,$instsec) }, |
| $cdom,$cnum); |
$cdom,$cnum); |
| unless (($reply eq 'ok') || ($reply eq 'delayed')) { |
if (($reply eq 'ok') || ($reply eq 'delayed')) { |
| |
&devalidate_getsection_cache($udom,$uname,$cid); |
| |
} else { |
| return 'error: '.$reply; |
return 'error: '.$reply; |
| } else { |
|
| &devalidate_getsection_cache($udom,$uname,$cid); |
|
| } |
} |
| # Add student role to user |
# Add student role to user |
| my $uurl='/'.$cid; |
my $uurl='/'.$cid; |
|
Line 5928 sub modify_student_enrollment {
|
Line 10390 sub modify_student_enrollment {
|
| if ($usec) { |
if ($usec) { |
| $uurl.='/'.$usec; |
$uurl.='/'.$usec; |
| } |
} |
| return &assignrole($udom,$uname,$uurl,'st',$end,$start,undef,$selfenroll,$context); |
my $result = &assignrole($udom,$uname,$uurl,'st',$end,$start,undef, |
| |
$selfenroll,$context); |
| |
if ($result ne 'ok') { |
| |
if ($old_entry{$user} ne '') { |
| |
$reply = &cput('classlist',\%old_entry,$cdom,$cnum); |
| |
} else { |
| |
$reply = &del('classlist',[$user],$cdom,$cnum); |
| |
} |
| |
} |
| |
return $result; |
| } |
} |
| |
|
| sub format_name { |
sub format_name { |
|
Line 5973 sub writecoursepref {
|
Line 10444 sub writecoursepref {
|
| |
|
| sub createcourse { |
sub createcourse { |
| my ($udom,$description,$url,$course_server,$nonstandard,$inst_code, |
my ($udom,$description,$url,$course_server,$nonstandard,$inst_code, |
| $course_owner,$crstype)=@_; |
$course_owner,$crstype,$cnum,$context,$category)=@_; |
| $url=&declutter($url); |
$url=&declutter($url); |
| my $cid=''; |
my $cid=''; |
| unless (&allowed('ccc',$udom)) { |
if ($context eq 'requestcourses') { |
| |
my $can_create = 0; |
| |
my ($ownername,$ownerdom) = split(':',$course_owner); |
| |
if ($udom eq $ownerdom) { |
| |
if (&usertools_access($ownername,$ownerdom,$category,undef, |
| |
$context)) { |
| |
$can_create = 1; |
| |
} |
| |
} else { |
| |
my %userenv = &userenvironment($ownerdom,$ownername,'reqcrsotherdom.'. |
| |
$category); |
| |
if ($userenv{'reqcrsotherdom.'.$category} ne '') { |
| |
my @curr = split(',',$userenv{'reqcrsotherdom.'.$category}); |
| |
if (@curr > 0) { |
| |
my @options = qw(approval validate autolimit); |
| |
my $optregex = join('|',@options); |
| |
if (grep(/^\Q$udom\E:($optregex)(=?\d*)$/,@curr)) { |
| |
$can_create = 1; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
if ($can_create) { |
| |
unless ($ownername eq $env{'user.name'} && $ownerdom eq $env{'user.domain'}) { |
| |
unless (&allowed('ccc',$udom)) { |
| |
return 'refused'; |
| |
} |
| |
} |
| |
} else { |
| |
return 'refused'; |
| |
} |
| |
} elsif (!&allowed('ccc',$udom)) { |
| return 'refused'; |
return 'refused'; |
| } |
} |
| # ------------------------------------------------------------------- Create ID |
# --------------------------------------------------------------- Get Unique ID |
| my $uname=int(1+rand(9)). |
my $uname; |
| ('a'..'z','A'..'Z','0'..'9')[int(rand(62))]. |
if ($cnum =~ /^$match_courseid$/) { |
| substr($$.time,0,5).unpack("H8",pack("I32",time)). |
my $chome=&homeserver($cnum,$udom,'true'); |
| unpack("H2",pack("I32",int(rand(255)))).$perlvar{'lonHostID'}; |
if (($chome eq '') || ($chome eq 'no_host')) { |
| # ----------------------------------------------- Make sure that does not exist |
$uname = $cnum; |
| my $uhome=&homeserver($uname,$udom,'true'); |
} else { |
| unless (($uhome eq '') || ($uhome eq 'no_host')) { |
$uname = &generate_coursenum($udom,$crstype); |
| $uname=substr($$.time,0,5).unpack("H8",pack("I32",time)). |
} |
| unpack("H2",pack("I32",int(rand(255)))).$perlvar{'lonHostID'}; |
} else { |
| $uhome=&homeserver($uname,$udom,'true'); |
$uname = &generate_coursenum($udom,$crstype); |
| unless (($uhome eq '') || ($uhome eq 'no_host')) { |
} |
| return 'error: unable to generate unique course-ID'; |
return $uname if ($uname =~ /^error/); |
| } |
# -------------------------------------------------- Check supplied server name |
| } |
if (!defined($course_server)) { |
| # ------------------------------------------------ Check supplied server name |
if (defined(&domain($udom,'primary'))) { |
| $course_server = $env{'user.homeserver'} if (! defined($course_server)); |
$course_server = &domain($udom,'primary'); |
| if (! &is_library($course_server)) { |
} else { |
| return 'error:bad server name '.$course_server; |
$course_server = $env{'user.home'}; |
| |
} |
| |
} |
| |
my %host_servers = |
| |
&Apache::lonnet::get_servers($udom,'library'); |
| |
unless ($host_servers{$course_server}) { |
| |
return 'error: invalid home server for course: '.$course_server; |
| } |
} |
| # ------------------------------------------------------------- Make the course |
# ------------------------------------------------------------- Make the course |
| my $reply=&reply('encrypt:makeuser:'.$udom.':'.$uname.':none::', |
my $reply=&reply('encrypt:makeuser:'.$udom.':'.$uname.':none::', |
| $course_server); |
$course_server); |
| unless ($reply eq 'ok') { return 'error: '.$reply; } |
unless ($reply eq 'ok') { return 'error: '.$reply; } |
| $uhome=&homeserver($uname,$udom,'true'); |
my $uhome=&homeserver($uname,$udom,'true'); |
| if (($uhome eq '') || ($uhome eq 'no_host')) { |
if (($uhome eq '') || ($uhome eq 'no_host')) { |
| return 'error: no such course'; |
return 'error: no such course'; |
| } |
} |
| # ----------------------------------------------------------------- Course made |
# ----------------------------------------------------------------- Course made |
| # log existence |
# log existence |
| |
my $now = time; |
| my $newcourse = { |
my $newcourse = { |
| $udom.'_'.$uname => { |
$udom.'_'.$uname => { |
| description => $description, |
description => $description, |
| inst_code => $inst_code, |
inst_code => $inst_code, |
| owner => $course_owner, |
owner => $course_owner, |
| type => $crstype, |
type => $crstype, |
| |
creator => $env{'user.name'}.':'. |
| |
$env{'user.domain'}, |
| |
created => $now, |
| |
context => $context, |
| }, |
}, |
| }; |
}; |
| &courseidput($udom,$newcourse,$uhome,'notime'); |
&courseidput($udom,$newcourse,$uhome,'notime'); |
|
Line 6039 ENDINITMAP
|
Line 10552 ENDINITMAP
|
| } |
} |
| # ----------------------------------------------------------- Write preferences |
# ----------------------------------------------------------- Write preferences |
| &writecoursepref($udom.'_'.$uname, |
&writecoursepref($udom.'_'.$uname, |
| ('description' => $description, |
('description' => $description, |
| 'url' => $topurl)); |
'url' => $topurl, |
| |
'internal.creator' => $env{'user.name'}.':'. |
| |
$env{'user.domain'}, |
| |
'internal.created' => $now, |
| |
'internal.creationcontext' => $context) |
| |
); |
| return '/'.$udom.'/'.$uname; |
return '/'.$udom.'/'.$uname; |
| } |
} |
| |
|
| |
# ------------------------------------------------------------------- Create ID |
| |
sub generate_coursenum { |
| |
my ($udom,$crstype) = @_; |
| |
my $domdesc = &domain($udom); |
| |
return 'error: invalid domain' if ($domdesc eq ''); |
| |
my $first; |
| |
if ($crstype eq 'Community') { |
| |
$first = '0'; |
| |
} else { |
| |
$first = int(1+rand(9)); |
| |
} |
| |
my $uname=$first. |
| |
('a'..'z','A'..'Z','0'..'9')[int(rand(62))]. |
| |
substr($$.time,0,5).unpack("H8",pack("I32",time)). |
| |
unpack("H2",pack("I32",int(rand(255)))).$perlvar{'lonHostID'}; |
| |
# ----------------------------------------------- Make sure that does not exist |
| |
my $uhome=&homeserver($uname,$udom,'true'); |
| |
unless (($uhome eq '') || ($uhome eq 'no_host')) { |
| |
if ($crstype eq 'Community') { |
| |
$first = '0'; |
| |
} else { |
| |
$first = int(1+rand(9)); |
| |
} |
| |
$uname=$first. |
| |
('a'..'z','A'..'Z','0'..'9')[int(rand(62))]. |
| |
substr($$.time,0,5).unpack("H8",pack("I32",time)). |
| |
unpack("H2",pack("I32",int(rand(255)))).$perlvar{'lonHostID'}; |
| |
$uhome=&homeserver($uname,$udom,'true'); |
| |
unless (($uhome eq '') || ($uhome eq 'no_host')) { |
| |
return 'error: unable to generate unique course-ID'; |
| |
} |
| |
} |
| |
return $uname; |
| |
} |
| |
|
| sub is_course { |
sub is_course { |
| my ($cdom,$cnum) = @_; |
my ($cdom, $cnum) = scalar(@_) == 1 ? |
| my %courses = &courseiddump($cdom,'.',1,'.','.',$cnum,undef, |
($_[0] =~ /^($match_domain)_($match_courseid)$/) : @_; |
| undef,'.'); |
return unless (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/)); |
| if (exists($courses{$cdom.'_'.$cnum})) { |
my $uhome=&homeserver($cnum,$cdom); |
| return 1; |
my $iscourse; |
| |
if (grep { $_ eq $uhome } current_machine_ids()) { |
| |
$iscourse = &LONCAPA::Lond::is_course($cdom,$cnum); |
| |
} else { |
| |
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 0; |
return unless($iscourse); |
| |
return wantarray ? ($cdom, $cnum) : $cdom.'_'.$cnum; |
| |
} |
| |
|
| |
sub store_userdata { |
| |
my ($storehash,$datakey,$namespace,$udom,$uname) = @_; |
| |
my $result; |
| |
if ($datakey ne '') { |
| |
if (ref($storehash) eq 'HASH') { |
| |
if ($udom eq '' || $uname eq '') { |
| |
$udom = $env{'user.domain'}; |
| |
$uname = $env{'user.name'}; |
| |
} |
| |
my $uhome=&homeserver($uname,$udom); |
| |
if (($uhome eq '') || ($uhome eq 'no_host')) { |
| |
$result = 'error: no_host'; |
| |
} else { |
| |
$storehash->{'ip'} = &get_requestor_ip(); |
| |
$storehash->{'host'} = $perlvar{'lonHostID'}; |
| |
|
| |
my $namevalue=''; |
| |
foreach my $key (keys(%{$storehash})) { |
| |
$namevalue.=&escape($key).'='.&freeze_escape($$storehash{$key}).'&'; |
| |
} |
| |
$namevalue=~s/\&$//; |
| |
unless ($namespace eq 'courserequests') { |
| |
$datakey = &escape($datakey); |
| |
} |
| |
$result = &reply("store:$udom:$uname:$namespace:$datakey:". |
| |
$namevalue,$uhome); |
| |
} |
| |
} else { |
| |
$result = 'error: data to store was not a hash reference'; |
| |
} |
| |
} else { |
| |
$result= 'error: invalid requestkey'; |
| |
} |
| |
return $result; |
| } |
} |
| |
|
| # ---------------------------------------------------------- Assign Custom Role |
# ---------------------------------------------------------- Assign Custom Role |
|
Line 6096 sub diskusage {
|
Line 10700 sub diskusage {
|
| } |
} |
| |
|
| sub is_locked { |
sub is_locked { |
| my ($file_name, $domain, $user) = @_; |
my ($file_name, $domain, $user, $which) = @_; |
| my @check; |
my @check; |
| my $is_locked; |
my $is_locked; |
| push @check, $file_name; |
push (@check,$file_name); |
| my %locked = &get('file_permissions',\@check, |
my %locked = &get('file_permissions',\@check, |
| $env{'user.domain'},$env{'user.name'}); |
$env{'user.domain'},$env{'user.name'}); |
| my ($tmp)=keys(%locked); |
my ($tmp)=keys(%locked); |
|
Line 6108 sub is_locked {
|
Line 10712 sub is_locked {
|
| if (ref($locked{$file_name}) eq 'ARRAY') { |
if (ref($locked{$file_name}) eq 'ARRAY') { |
| $is_locked = 'false'; |
$is_locked = 'false'; |
| foreach my $entry (@{$locked{$file_name}}) { |
foreach my $entry (@{$locked{$file_name}}) { |
| if (ref($entry) eq 'ARRAY') { |
if (ref($entry) eq 'ARRAY') { |
| $is_locked = 'true'; |
$is_locked = 'true'; |
| last; |
if (ref($which) eq 'ARRAY') { |
| |
push(@{$which},$entry); |
| |
} else { |
| |
last; |
| |
} |
| } |
} |
| } |
} |
| } else { |
} else { |
| $is_locked = 'false'; |
$is_locked = 'false'; |
| } |
} |
| |
return $is_locked; |
| } |
} |
| |
|
| sub declutter_portfile { |
sub declutter_portfile { |
|
Line 6145 sub save_selected_files {
|
Line 10754 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 6159 sub save_selected_files {
|
Line 10768 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, '>'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename); |
open (OUT,'>',LONCAPA::tempdir().$filename); |
| print (OUT undef); |
print (OUT undef); |
| close (OUT); |
close (OUT); |
| return ("ok"); |
return ("ok"); |
|
Line 6169 sub files_in_path {
|
Line 10778 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, '<'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$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 6191 sub files_not_in_path {
|
Line 10800 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, '<'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$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 6304 sub modify_access_controls {
|
Line 10913 sub modify_access_controls {
|
| my $tries = 0; |
my $tries = 0; |
| my $gotlock = &newput('file_permissions',$lockhash,$domain,$user); |
my $gotlock = &newput('file_permissions',$lockhash,$domain,$user); |
| |
|
| while (($gotlock ne 'ok') && $tries <3) { |
while (($gotlock ne 'ok') && $tries < 10) { |
| $tries ++; |
$tries ++; |
| sleep 1; |
sleep(0.1); |
| $gotlock = &newput('file_permissions',$lockhash,$domain,$user); |
$gotlock = &newput('file_permissions',$lockhash,$domain,$user); |
| } |
} |
| if ($gotlock eq 'ok') { |
if ($gotlock eq 'ok') { |
|
Line 6539 sub dirlist {
|
Line 11148 sub dirlist {
|
| |
|
| if($udom) { |
if($udom) { |
| if($uname) { |
if($uname) { |
| |
my $uhome = &homeserver($uname,$udom); |
| |
if ($uhome eq 'no_host') { |
| |
return ([],'no_host'); |
| |
} |
| $listing = &reply('ls3:'.&escape('/'.$uri).':'.$getpropath.':' |
$listing = &reply('ls3:'.&escape('/'.$uri).':'.$getpropath.':' |
| .$getuserdir.':'.&escape($dirRoot) |
.$getuserdir.':'.&escape($dirRoot) |
| .':'.&escape($uname).':'.&escape($udom), |
.':'.&escape($uname).':'.&escape($udom),$uhome); |
| &homeserver($uname,$udom)); |
|
| if ($listing eq 'unknown_cmd') { |
if ($listing eq 'unknown_cmd') { |
| $listing = &reply('ls2:'.$dirRoot.'/'.$uri, |
$listing = &reply('ls2:'.$dirRoot.'/'.$uri,$uhome); |
| &homeserver($uname,$udom)); |
|
| } else { |
} else { |
| @listing_results = map { &unescape($_); } split(/:/,$listing); |
@listing_results = map { &unescape($_); } split(/:/,$listing); |
| } |
} |
| if ($listing eq 'unknown_cmd') { |
if ($listing eq 'unknown_cmd') { |
| $listing = &reply('ls:'.$dirRoot.'/'.$uri, |
$listing = &reply('ls:'.$dirRoot.'/'.$uri,$uhome); |
| &homeserver($uname,$udom)); |
|
| @listing_results = split(/:/,$listing); |
@listing_results = split(/:/,$listing); |
| } else { |
} else { |
| @listing_results = map { &unescape($_); } split(/:/,$listing); |
@listing_results = map { &unescape($_); } split(/:/,$listing); |
| } |
} |
| return @listing_results; |
if (($listing eq 'no_such_host') || ($listing eq 'con_lost') || |
| |
($listing eq 'rejected') || ($listing eq 'refused') || |
| |
($listing eq 'no_such_dir') || ($listing eq 'empty')) { |
| |
return ([],$listing); |
| |
} else { |
| |
return (\@listing_results); |
| |
} |
| } elsif(!$alternateRoot) { |
} elsif(!$alternateRoot) { |
| my %allusers; |
my (%allusers,%listerror); |
| my %servers = &get_servers($udom,'library'); |
my %servers = &get_servers($udom,'library'); |
| foreach my $tryserver (keys(%servers)) { |
foreach my $tryserver (keys(%servers)) { |
| $listing = &reply('ls3:'.&escape("/res/$udom").':::::'. |
$listing = &reply('ls3:'.&escape("/res/$udom").':::::'. |
|
Line 6577 sub dirlist {
|
Line 11193 sub dirlist {
|
| @listing_results = |
@listing_results = |
| map { &unescape($_); } split(/:/,$listing); |
map { &unescape($_); } split(/:/,$listing); |
| } |
} |
| if ($listing_results[0] ne 'no_such_dir' && |
if (($listing eq 'no_such_host') || ($listing eq 'con_lost') || |
| $listing_results[0] ne 'empty' && |
($listing eq 'rejected') || ($listing eq 'refused') || |
| $listing_results[0] ne 'con_lost') { |
($listing eq 'no_such_dir') || ($listing eq 'empty')) { |
| |
$listerror{$tryserver} = $listing; |
| |
} else { |
| foreach my $line (@listing_results) { |
foreach my $line (@listing_results) { |
| my ($entry) = split(/&/,$line,2); |
my ($entry) = split(/&/,$line,2); |
| $allusers{$entry} = 1; |
$allusers{$entry} = 1; |
| } |
} |
| } |
} |
| } |
} |
| my $alluserstr=''; |
my @alluserslist=(); |
| foreach my $user (sort(keys(%allusers))) { |
foreach my $user (sort(keys(%allusers))) { |
| $alluserstr.=$user.'&user:'; |
push(@alluserslist,$user.'&user'); |
| |
} |
| |
if (!%listerror) { |
| |
# no errors |
| |
return (\@alluserslist); |
| |
} elsif (scalar(keys(%servers)) == 1) { |
| |
# one library server, one error |
| |
my ($key) = keys(%listerror); |
| |
return (\@alluserslist, $listerror{$key}); |
| |
} elsif ( grep { $_ eq 'con_lost' } values(%listerror) ) { |
| |
# con_lost indicates that we might miss data from at least one |
| |
# library server |
| |
return (\@alluserslist, 'con_lost'); |
| |
} else { |
| |
# multiple library servers and no con_lost -> data should be |
| |
# complete. |
| |
return (\@alluserslist); |
| } |
} |
| $alluserstr=~s/:$//; |
|
| return split(/:/,$alluserstr); |
|
| } else { |
} else { |
| return ('missing user name'); |
return ([],'missing username'); |
| } |
} |
| } elsif(!defined($getpropath)) { |
} elsif(!defined($getpropath)) { |
| my @all_domains = sort(&all_domains()); |
my $path = $perlvar{'lonDocRoot'}.'/res/'; |
| foreach my $domain (@all_domains) { |
my @all_domains = map { $path.$_.'/&domain'; } (sort(&all_domains())); |
| $domain = $perlvar{'lonDocRoot'}.'/res/'.$domain.'/&domain'; |
return (\@all_domains); |
| } |
|
| return @all_domains; |
|
| } else { |
} else { |
| return ('missing domain'); |
return ([],'missing domain'); |
| } |
} |
| } |
} |
| |
|
|
Line 6615 sub GetFileTimestamp {
|
Line 11246 sub GetFileTimestamp {
|
| my ($studentDomain,$studentName,$filename,$getuserdir)=@_; |
my ($studentDomain,$studentName,$filename,$getuserdir)=@_; |
| $studentDomain = &LONCAPA::clean_domain($studentDomain); |
$studentDomain = &LONCAPA::clean_domain($studentDomain); |
| $studentName = &LONCAPA::clean_username($studentName); |
$studentName = &LONCAPA::clean_username($studentName); |
| my ($fileStat) = |
my ($fileref,$error) = &dirlist($filename,$studentDomain,$studentName, |
| &Apache::lonnet::dirlist($filename,$studentDomain,$studentName, |
undef,$getuserdir); |
| undef,$getuserdir); |
if (($error eq 'empty') || ($error eq 'no_such_dir')) { |
| my @stats = split('&', $fileStat); |
return -1; |
| if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') { |
} |
| |
if (ref($fileref) eq 'ARRAY') { |
| |
my @stats = split('&',$fileref->[0]); |
| # @stats contains first the filename, then the stat output |
# @stats contains first the filename, then the stat output |
| return $stats[10]; # so this is 10 instead of 9. |
return $stats[10]; # so this is 10 instead of 9. |
| } else { |
} else { |
|
Line 6651 sub stat_file {
|
Line 11284 sub stat_file {
|
| if ($file =~ /^userfiles\//) { |
if ($file =~ /^userfiles\//) { |
| $getpropath = 1; |
$getpropath = 1; |
| } |
} |
| my ($result) = &dirlist($file,$udom,$uname,$getpropath); |
my ($listref,$error) = &dirlist($file,$udom,$uname,$getpropath); |
| my @stats = split('&', $result); |
if (($error eq 'empty') || ($error eq 'no_such_dir')) { |
| |
return (); |
| if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') { |
} else { |
| shift(@stats); #filename is first |
if (ref($listref) eq 'ARRAY') { |
| return @stats; |
my @stats = split('&',$listref->[0]); |
| |
shift(@stats); #filename is first |
| |
return @stats; |
| |
} |
| } |
} |
| return (); |
return (); |
| } |
} |
|
Line 6805 sub get_userresdata {
|
Line 11441 sub get_userresdata {
|
| } |
} |
| #error 2 occurs when the .db doesn't exist |
#error 2 occurs when the .db doesn't exist |
| if ($tmp!~/error: 2 /) { |
if ($tmp!~/error: 2 /) { |
| &logthis("<font color=\"blue\">WARNING:". |
if ((!defined($cached)) || ($tmp ne 'con_lost')) { |
| " Trying to get resource data for ". |
&logthis("<font color=\"blue\">WARNING:". |
| $uname." at ".$udom.": ". |
" Trying to get resource data for ". |
| $tmp."</font>"); |
$uname." at ".$udom.": ". |
| |
$tmp."</font>"); |
| |
} |
| } elsif ($tmp=~/error: 2 /) { |
} elsif ($tmp=~/error: 2 /) { |
| #&EXT_cache_set($udom,$uname); |
#&EXT_cache_set($udom,$uname); |
| &do_cache_new('userres',$hashid,undef,600); |
&do_cache_new('userres',$hashid,undef,600); |
|
Line 6848 sub resdata {
|
Line 11486 sub resdata {
|
| return undef; |
return undef; |
| } |
} |
| |
|
| |
sub get_numsuppfiles { |
| |
my ($cnum,$cdom,$ignorecache)=@_; |
| |
my $hashid=$cnum.':'.$cdom; |
| |
my ($suppcount,$cached); |
| |
unless ($ignorecache) { |
| |
($suppcount,$cached) = &is_cached_new('suppcount',$hashid); |
| |
} |
| |
unless (defined($cached)) { |
| |
my $chome=&homeserver($cnum,$cdom); |
| |
unless ($chome eq 'no_host') { |
| |
($suppcount,my $errors) = (0,0); |
| |
my $suppmap = 'supplemental.sequence'; |
| |
($suppcount,$errors) = |
| |
&Apache::loncommon::recurse_supplemental($cnum,$cdom,$suppmap,$suppcount,$errors); |
| |
} |
| |
&do_cache_new('suppcount',$hashid,$suppcount,600); |
| |
} |
| |
return $suppcount; |
| |
} |
| |
|
| # |
# |
| # EXT resource caching routines |
# EXT resource caching routines |
| # |
# |
|
Line 6876 sub EXT_cache_set {
|
Line 11534 sub EXT_cache_set {
|
| # --------------------------------------------------------- Value of a Variable |
# --------------------------------------------------------- Value of a Variable |
| sub EXT { |
sub EXT { |
| |
|
| my ($varname,$symbparm,$udom,$uname,$usection,$recurse)=@_; |
my ($varname,$symbparm,$udom,$uname,$usection,$recurse,$cid)=@_; |
| unless ($varname) { return ''; } |
unless ($varname) { return ''; } |
| #get real user name/domain, courseid and symb |
#get real user name/domain, courseid and symb |
| my $courseid; |
my $courseid; |
|
Line 6908 sub EXT {
|
Line 11566 sub EXT {
|
| if ( (defined($Apache::lonhomework::parsing_a_problem) |
if ( (defined($Apache::lonhomework::parsing_a_problem) |
| || defined($Apache::lonhomework::parsing_a_task)) |
|| defined($Apache::lonhomework::parsing_a_task)) |
| && |
&& |
| ($symbparm eq &symbread()) ) { |
($symbparm eq &symbread()) ) { |
| # if we are in the middle of processing the resource the |
# if we are in the middle of processing the resource the |
| # get the value we are planning on committing |
# get the value we are planning on committing |
| if (defined($Apache::lonhomework::results{$qualifierrest})) { |
if (defined($Apache::lonhomework::results{$qualifierrest})) { |
|
Line 6977 sub EXT {
|
Line 11635 sub EXT {
|
| } elsif ($realm eq 'request') { |
} elsif ($realm eq 'request') { |
| # ------------------------------------------------------------- request.browser |
# ------------------------------------------------------------- request.browser |
| if ($space eq 'browser') { |
if ($space eq 'browser') { |
| if ($qualifier eq 'textremote') { |
return $env{'browser.'.$qualifier}; |
| if (&Apache::lonlocal::mt('textual_remote_display') eq 'on') { |
|
| return 1; |
|
| } else { |
|
| return 0; |
|
| } |
|
| } else { |
|
| return $env{'browser.'.$qualifier}; |
|
| } |
|
| # ------------------------------------------------------------ request.filename |
# ------------------------------------------------------------ request.filename |
| } else { |
} else { |
| return $env{'request.'.$spacequalifierrest}; |
return $env{'request.'.$spacequalifierrest}; |
|
Line 6999 sub EXT {
|
Line 11649 sub EXT {
|
| if (!$symbparm) { $symbparm=&symbread(); } |
if (!$symbparm) { $symbparm=&symbread(); } |
| } |
} |
| |
|
| if ($space eq 'title') { |
if ($qualifier eq '') { |
| if (!$symbparm) { $symbparm = $env{'request.filename'}; } |
if ($space eq 'title') { |
| return &gettitle($symbparm); |
if (!$symbparm) { $symbparm = $env{'request.filename'}; } |
| } |
return &gettitle($symbparm); |
| |
|
| if ($space eq 'map') { |
|
| my ($map) = &decode_symb($symbparm); |
|
| return &symbread($map); |
|
| } |
|
| if ($space eq 'filename') { |
|
| if ($symbparm) { |
|
| return &clutter((&decode_symb($symbparm))[2]); |
|
| } |
} |
| return &hreflocation('',$env{'request.filename'}); |
|
| } |
if ($space eq 'map') { |
| |
my ($map) = &decode_symb($symbparm); |
| |
return &symbread($map); |
| |
} |
| |
if ($space eq 'maptitle') { |
| |
my ($map) = &decode_symb($symbparm); |
| |
return &gettitle($map); |
| |
} |
| |
if ($space eq 'filename') { |
| |
if ($symbparm) { |
| |
return &clutter((&decode_symb($symbparm))[2]); |
| |
} |
| |
return &hreflocation('',$env{'request.filename'}); |
| |
} |
| |
|
| |
if ((defined($courseid)) && ($courseid eq $env{'request.course.id'}) && $symbparm) { |
| |
if ($space eq 'visibleparts') { |
| |
my $navmap = Apache::lonnavmaps::navmap->new(); |
| |
my $item; |
| |
if (ref($navmap)) { |
| |
my $res = $navmap->getBySymb($symbparm); |
| |
my $parts = $res->parts(); |
| |
if (ref($parts) eq 'ARRAY') { |
| |
$item = join(',',@{$parts}); |
| |
} |
| |
undef($navmap); |
| |
} |
| |
return $item; |
| |
} |
| |
} |
| |
} |
| |
|
| my ($section, $group, @groups); |
my ($section, $group, @groups); |
| my ($courselevelm,$courselevel); |
my ($courselevelm,$courselevel); |
| if ($symbparm && defined($courseid) && |
if (($courseid eq '') && ($cid)) { |
| $courseid eq $env{'request.course.id'}) { |
$courseid = $cid; |
| |
} |
| |
if (($symbparm && $courseid) && |
| |
(($courseid eq $env{'request.course.id'}) || ($courseid eq $cid))) { |
| |
|
| #print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest; |
#print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest; |
| |
|
|
Line 7258 sub add_prefix_and_part {
|
Line 11933 sub add_prefix_and_part {
|
| # ---------------------------------------------------------------- Get metadata |
# ---------------------------------------------------------------- Get metadata |
| |
|
| my %metaentry; |
my %metaentry; |
| |
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); |
| # if it is a non metadata possible uri return quickly |
# if it is a non metadata possible uri return quickly |
| if (($uri eq '') || |
if (($uri eq '') || |
| (($uri =~ m|^/*adm/|) && |
(($uri =~ m|^/*adm/|) && |
| ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) || |
($uri !~ m|^adm/includes|) && ($uri !~ m{/(smppg|bulletinboard)$})) || |
| ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) ) { |
($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ m{^/*uploaded/.+\.sequence$})) { |
| return undef; |
return undef; |
| } |
} |
| if (($uri =~ /^~/ || $uri =~ m{home/$match_username/public_html/}) |
if (($uri =~ /^priv/ || $uri=~m{^home/httpd/html/priv}) |
| && &Apache::lonxml::get_state('target') =~ /^(|meta)$/) { |
&& &Apache::lonxml::get_state('target') =~ /^(|meta)$/) { |
| return undef; |
return undef; |
| } |
} |
|
Line 7284 sub metadata {
|
Line 11961 sub metadata {
|
| if (defined($cached)) { return $result->{':'.$what}; } |
if (defined($cached)) { return $result->{':'.$what}; } |
| } |
} |
| { |
{ |
| |
# Imported parts would go here |
| |
my @origfiletagids=(); |
| |
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 7301 sub metadata {
|
Line 11984 sub metadata {
|
| my %metathesekeys=(); |
my %metathesekeys=(); |
| unless ($filename=~/\.meta$/) { $filename.='.meta'; } |
unless ($filename=~/\.meta$/) { $filename.='.meta'; } |
| my $metastring; |
my $metastring; |
| if ($uri =~ /^~/ || $uri =~ m{home/$match_username/public_html/}) { |
if ($uri =~ /^priv/ || $uri=~/home\/httpd\/html\/priv/) { |
| my $which = &hreflocation('','/'.($liburi || $uri)); |
my $which = &hreflocation('','/'.($liburi || $uri)); |
| $metastring = |
$metastring = |
| &Apache::lonnet::ssi_body($which, |
&Apache::lonnet::ssi_body($which, |
| ('grade_target' => 'meta')); |
('grade_target' => 'meta')); |
| $cachetime = 1; # only want this cached in the child not long term |
$cachetime = 1; # only want this cached in the child not long term |
| } elsif ($uri !~ m -^(editupload)/-) { |
} elsif (($uri !~ m -^(editupload)/-) && |
| |
($uri !~ m{^/*uploaded/$match_domain/$match_courseid/docs/})) { |
| my $file=&filelocation('',&clutter($filename)); |
my $file=&filelocation('',&clutter($filename)); |
| #push(@{$metaentry{$uri.'.file'}},$file); |
#push(@{$metaentry{$uri.'.file'}},$file); |
| $metastring=&getfile($file); |
$metastring=&getfile($file); |
|
Line 7367 sub metadata {
|
Line 12051 sub metadata {
|
| # This is not a package - some other kind of start tag |
# This is not a package - some other kind of start tag |
| # |
# |
| my $entry=$token->[1]; |
my $entry=$token->[1]; |
| my $unikey; |
my $unikey=''; |
| if ($entry eq 'import') { |
|
| $unikey=''; |
|
| } else { |
|
| $unikey=$entry; |
|
| } |
|
| $unikey.=&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
|
| |
|
| if (defined($token->[2]->{'id'})) { |
|
| $unikey.='_'.$token->[2]->{'id'}; |
|
| } |
|
| |
|
| if ($entry eq 'import') { |
if ($entry eq 'import') { |
| # |
# |
| # Importing a library here |
# Importing a library here |
| # |
# |
| |
my $location=$parser->get_text('/import'); |
| |
my $dir=$filename; |
| |
$dir=~s|[^/]*$||; |
| |
$location=&filelocation($dir,$location); |
| |
|
| |
my $importid=$token->[2]->{'id'}; |
| |
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') { |
| |
# Import as problem/response |
| |
$unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
| |
} elsif ($importmode eq 'part') { |
| |
# Import as part(s) |
| |
$importedparts=1; |
| |
# 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 |
| |
# Load and inspect original file if we didn't do that already |
| |
if ($#origfiletagids<0) { |
| |
undef(%importedrespids); |
| |
undef(%importedpartids); |
| |
if ($origfile eq '') { |
| |
my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri); |
| |
$origfile=&getfile($origfilelocation); |
| |
@origfiletagids=($origfile=~/<(part|import)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs); |
| |
} |
| |
} |
| |
|
| |
# Load and inspect imported file |
| |
my $impfile=&getfile($location); |
| |
my @impfilepartids=($impfile=~/<part[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs); |
| |
if ($#impfilepartids>=0) { |
| |
# This problem had parts |
| |
$importedpartids{$token->[2]->{'id'}}=join(',',@impfilepartids); |
| |
} else { |
| |
# Importing by turning a single problem into a problem part |
| |
# It gets the import-tags ID as part-ID |
| |
$unikey=&add_prefix_and_part($prefix,$token->[2]->{'id'}); |
| |
$importedpartids{$token->[2]->{'id'}}=$token->[2]->{'id'}; |
| |
} |
| |
} else { |
| |
# Normal import |
| |
$unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
| |
if (defined($token->[2]->{'id'})) { |
| |
$unikey.='_'.$token->[2]->{'id'}; |
| |
} |
| |
} |
| |
|
| if ($depthcount<20) { |
if ($depthcount<20) { |
| my $location=$parser->get_text('/import'); |
|
| my $dir=$filename; |
|
| $dir=~s|[^/]*$||; |
|
| $location=&filelocation($dir,$location); |
|
| my $metadata = |
my $metadata = |
| &metadata($uri,'keys', $location,$unikey, |
&metadata($uri,'keys', $location,$unikey, |
| $depthcount+1); |
$depthcount+1); |
|
Line 7395 sub metadata {
|
Line 12139 sub metadata {
|
| $metaentry{':'.$meta}=$metaentry{':'.$meta}; |
$metaentry{':'.$meta}=$metaentry{':'.$meta}; |
| $metathesekeys{$meta}=1; |
$metathesekeys{$meta}=1; |
| } |
} |
| } |
|
| } else { |
|
| |
|
| |
} |
| |
} else { |
| |
# |
| |
# Not importing, some other kind of non-package, non-library start tag |
| |
# |
| |
$unikey=$entry.&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
| |
if (defined($token->[2]->{'id'})) { |
| |
$unikey.='_'.$token->[2]->{'id'}; |
| |
} |
| if (defined($token->[2]->{'name'})) { |
if (defined($token->[2]->{'name'})) { |
| $unikey.='_'.$token->[2]->{'name'}; |
$unikey.='_'.$token->[2]->{'name'}; |
| } |
} |
|
Line 7471 sub metadata {
|
Line 12222 sub metadata {
|
| grep { ! $seen{$_} ++ } (split(',',$metaentry{':packages'})); |
grep { ! $seen{$_} ++ } (split(',',$metaentry{':packages'})); |
| $metaentry{':packages'} = join(',',@uniq_packages); |
$metaentry{':packages'} = join(',',@uniq_packages); |
| |
|
| |
if (($importedresponses) || ($importedparts)) { |
| |
if ($importedparts) { |
| |
# We had imported parts and need to rebuild partorder |
| |
$metaentry{':partorder'}=''; |
| |
$metathesekeys{'partorder'}=1; |
| |
} |
| |
if ($importedresponses) { |
| |
# We had imported responses and need to rebuild responseorder |
| |
$metaentry{':responseorder'}=''; |
| |
$metathesekeys{'responseorder'}=1; |
| |
} |
| |
for (my $index=0;$index<$#origfiletagids;$index+=2) { |
| |
my $origid = $origfiletagids[$index+1]; |
| |
if ($origfiletagids[$index] eq 'part') { |
| |
# 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)); |
| &metadata_generate_part0(\%metathesekeys,\%metaentry,$uri); |
&metadata_generate_part0(\%metathesekeys,\%metaentry,$uri); |
| $metaentry{':allpossiblekeys'}=join(',',keys %metathesekeys); |
$metaentry{':allpossiblekeys'}=join(',',keys(%metathesekeys)); |
| &do_cache_new('meta',$uri,\%metaentry,$cachetime); |
&do_cache_new('meta',$uri,\%metaentry,$cachetime); |
| # this is the end of "was not already recently cached |
# this is the end of "was not already recently cached |
| } |
} |
|
Line 7543 sub devalidate_title_cache {
|
Line 12338 sub devalidate_title_cache {
|
| &devalidate_cache_new('title',$key); |
&devalidate_cache_new('title',$key); |
| } |
} |
| |
|
| |
# ------------------------------------------------- Get the title of a course |
| |
|
| |
sub current_course_title { |
| |
return $env{ 'course.' . $env{'request.course.id'} . '.description' }; |
| |
} |
| # ------------------------------------------------- Get the title of a resource |
# ------------------------------------------------- Get the title of a resource |
| |
|
| sub gettitle { |
sub gettitle { |
|
Line 7568 sub gettitle {
|
Line 12368 sub gettitle {
|
| } |
} |
| $title=~s/\&colon\;/\:/gs; |
$title=~s/\&colon\;/\:/gs; |
| if ($title) { |
if ($title) { |
| |
# Remember both $symb and $title for dynamic metadata |
| |
$accesshash{$symb.'___crstitle'}=$title; |
| |
$accesshash{&declutter($map).'___'.&declutter($url).'___usage'}=time; |
| |
# Cache this title and then return it |
| return &do_cache_new('title',$key,$title,600); |
return &do_cache_new('title',$key,$title,600); |
| } |
} |
| $urlsymb=$url; |
$urlsymb=$url; |
|
Line 7600 sub get_slot {
|
Line 12404 sub get_slot {
|
| } |
} |
| return $slotinfo{$which}; |
return $slotinfo{$which}; |
| } |
} |
| |
|
| |
sub get_reservable_slots { |
| |
my ($cnum,$cdom,$uname,$udom) = @_; |
| |
my $now = time; |
| |
my $reservable_info; |
| |
my $key=join("\0",'reservableslots',$cdom,$cnum,$uname,$udom); |
| |
if (exists($remembered{$key})) { |
| |
$reservable_info = $remembered{$key}; |
| |
} else { |
| |
my %resv; |
| |
($resv{'now_order'},$resv{'now'},$resv{'future_order'},$resv{'future'}) = |
| |
&Apache::loncommon::get_future_slots($cnum,$cdom,$now); |
| |
$reservable_info = \%resv; |
| |
$remembered{$key} = $reservable_info; |
| |
} |
| |
return $reservable_info; |
| |
} |
| |
|
| |
sub get_course_slots { |
| |
my ($cnum,$cdom) = @_; |
| |
my $hashid=$cnum.':'.$cdom; |
| |
my ($result,$cached) = &Apache::lonnet::is_cached_new('allslots',$hashid); |
| |
if (defined($cached)) { |
| |
if (ref($result) eq 'HASH') { |
| |
return %{$result}; |
| |
} |
| |
} else { |
| |
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum); |
| |
my ($tmp) = keys(%slots); |
| |
if ($tmp !~ /^(con_lost|error|no_such_host)/i) { |
| |
&do_cache_new('allslots',$hashid,\%slots,600); |
| |
return %slots; |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub devalidate_slots_cache { |
| |
my ($cnum,$cdom)=@_; |
| |
my $hashid=$cnum.':'.$cdom; |
| |
&devalidate_cache_new('allslots',$hashid); |
| |
} |
| |
|
| |
sub get_coursechange { |
| |
my ($cdom,$cnum) = @_; |
| |
if ($cdom eq '' || $cnum eq '') { |
| |
return unless ($env{'request.course.id'}); |
| |
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
} |
| |
my $hashid=$cdom.'_'.$cnum; |
| |
my ($change,$cached)=&is_cached_new('crschange',$hashid); |
| |
if ((defined($cached)) && ($change ne '')) { |
| |
return $change; |
| |
} else { |
| |
my %crshash; |
| |
%crshash = &get('environment',['internal.contentchange'],$cdom,$cnum); |
| |
if ($crshash{'internal.contentchange'} eq '') { |
| |
$change = $env{'course.'.$cdom.'_'.$cnum.'.internal.created'}; |
| |
if ($change eq '') { |
| |
%crshash = &get('environment',['internal.created'],$cdom,$cnum); |
| |
$change = $crshash{'internal.created'}; |
| |
} |
| |
} else { |
| |
$change = $crshash{'internal.contentchange'}; |
| |
} |
| |
my $cachetime = 600; |
| |
&do_cache_new('crschange',$hashid,$change,$cachetime); |
| |
} |
| |
return $change; |
| |
} |
| |
|
| |
sub devalidate_coursechange_cache { |
| |
my ($cnum,$cdom)=@_; |
| |
my $hashid=$cnum.':'.$cdom; |
| |
&devalidate_cache_new('crschange',$hashid); |
| |
} |
| |
|
| # ------------------------------------------------- Update symbolic store links |
# ------------------------------------------------- Update symbolic store links |
| |
|
| sub symblist { |
sub symblist { |
|
Line 7609 sub symblist {
|
Line 12491 sub symblist {
|
| if (($env{'request.course.fn'}) && (%newhash)) { |
if (($env{'request.course.fn'}) && (%newhash)) { |
| if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db', |
if (tie(%hash,'GDBM_File',$env{'request.course.fn'}.'_symb.db', |
| &GDBM_WRCREAT(),0640)) { |
&GDBM_WRCREAT(),0640)) { |
| foreach my $url (keys %newhash) { |
foreach my $url (keys(%newhash)) { |
| next if ($url eq 'last_known' |
next if ($url eq 'last_known' |
| && $env{'form.no_update_last_known'}); |
&& $env{'form.no_update_last_known'}); |
| $hash{declutter($url)}=&encode_symb($mapname, |
$hash{declutter($url)}=&encode_symb($mapname, |
|
Line 7627 sub symblist {
|
Line 12509 sub symblist {
|
| # --------------------------------------------------------------- Verify a symb |
# --------------------------------------------------------------- Verify a symb |
| |
|
| sub symbverify { |
sub symbverify { |
| my ($symb,$thisurl)=@_; |
my ($symb,$thisurl,$encstate)=@_; |
| my $thisfn=$thisurl; |
my $thisfn=$thisurl; |
| $thisfn=&declutter($thisfn); |
$thisfn=&declutter($thisfn); |
| # direct jump to resource in page or to a sequence - will construct own symbs |
# direct jump to resource in page or to a sequence - will construct own symbs |
|
Line 7646 sub symbverify {
|
Line 12528 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 $ids=$bighash{'ids_'.&clutter($thisurl)}; |
if (($thisurl =~ m{^/adm/wrapper/ext/}) || ($thisurl =~ m{^ext/})) { |
| unless ($ids) { |
$thisurl =~ s/\?.+$//; |
| $ids=$bighash{'ids_/'.$thisurl}; |
if ($map =~ m{^uploaded/.+\.page$}) { |
| |
$thisurl =~ s{^(/adm/wrapper|)/ext/}{http://}; |
| |
$thisurl =~ s{^\Qhttp://https://\E}{https://}; |
| |
} |
| |
} |
| |
my $ids; |
| |
if ($map =~ m{^uploaded/.+\.page$}) { |
| |
$ids=$bighash{'ids_'.&clutter_with_no_wrapper($thisurl)}; |
| |
} else { |
| |
$ids=$bighash{'ids_'.&clutter($thisurl)}; |
| |
} |
| |
unless ($ids) { |
| |
my $idkey = 'ids_'.($thisurl =~ m{^/}? '' : '/').$thisurl; |
| |
$ids=$bighash{$idkey}; |
| } |
} |
| if ($ids) { |
if ($ids) { |
| # ------------------------------------------------------------------- Has ID(s) |
# ------------------------------------------------------------------- Has ID(s) |
| |
if ($thisfn =~ m{^/adm/wrapper/ext/}) { |
| |
$symb =~ s/\?.+$//; |
| |
} |
| foreach my $id (split(/\,/,$ids)) { |
foreach my $id (split(/\,/,$ids)) { |
| my ($mapid,$resid)=split(/\./,$id); |
my ($mapid,$resid)=split(/\./,$id); |
| if ( |
if ( |
| &symbclean(&declutter($bighash{'map_id_'.$mapid}).'___'.$resid.'___'.$thisfn) |
&symbclean(&declutter($bighash{'map_id_'.$mapid}).'___'.$resid.'___'.$thisfn) |
| eq $symb) { |
eq $symb) { |
| if (($env{'request.role.adv'}) || |
if (ref($encstate)) { |
| $bighash{'encrypted_'.$id} eq $env{'request.enc'}) { |
$$encstate = $bighash{'encrypted_'.$id}; |
| $okay=1; |
} |
| } |
if (($env{'request.role.adv'}) || |
| } |
($bighash{'encrypted_'.$id} eq $env{'request.enc'}) || |
| } |
($thisurl eq '/adm/navmaps')) { |
| |
$okay=1; |
| |
last; |
| |
} |
| |
} |
| |
} |
| } |
} |
| untie(%bighash); |
untie(%bighash); |
| } |
} |
|
Line 7734 sub deversion {
|
Line 12637 sub deversion {
|
| # ------------------------------------------------------ Return symb list entry |
# ------------------------------------------------------ Return symb list entry |
| |
|
| sub symbread { |
sub symbread { |
| my ($thisfn,$donotrecurse)=@_; |
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})) { return $env{$cache_str}; } |
if (defined($env{$cache_str})) { |
| |
unless (ref($possibles) eq 'HASH') { |
| |
if ($ignorecachednull) { |
| |
return $env{$cache_str} unless ($env{$cache_str} eq ''); |
| |
} else { |
| |
return $env{$cache_str}; |
| |
} |
| |
} |
| |
} |
| # no filename provided? try from environment |
# no filename provided? try from environment |
| unless ($thisfn) { |
unless ($thisfn) { |
| if ($env{'request.symb'}) { |
if ($env{'request.symb'}) { |
| return $env{$cache_str}=&symbclean($env{'request.symb'}); |
return $env{$cache_str}=&symbclean($env{'request.symb'}); |
| } |
} |
| $thisfn=$env{'request.filename'}; |
$thisfn=$env{'request.filename'}; |
| } |
} |
| if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); } |
if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); } |
| # is that filename actually a symb? Verify, clean, and return |
# is that filename actually a symb? Verify, clean, and return |
|
Line 7763 sub symbread {
|
Line 12675 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 7798 sub symbread {
|
Line 12718 sub symbread {
|
| my ($mapid,$resid)=split(/\./,$ids); |
my ($mapid,$resid)=split(/\./,$ids); |
| $syval=&encode_symb($bighash{'map_id_'.$mapid}, |
$syval=&encode_symb($bighash{'map_id_'.$mapid}, |
| $resid,$thisfn); |
$resid,$thisfn); |
| } elsif (!$donotrecurse) { |
if (ref($possibles) eq 'HASH') { |
| |
unless ($bighash{'randomout_'.$ids} || $env{'request.role.adv'}) { |
| |
$possibles->{$syval} = 1; |
| |
} |
| |
} |
| |
if ($checkforblock) { |
| |
unless ($bighash{'randomout_'.$ids} || $env{'request.role.adv'}) { |
| |
my @blockers = &has_comm_blocking('bre',$syval,$bighash{'src_'.$ids},'',$noenccheck); |
| |
if (@blockers) { |
| |
$syval = ''; |
| |
untie(%bighash); |
| |
return $env{$cache_str}=''; |
| |
} |
| |
} |
| |
} |
| |
} elsif ((!$donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) { |
| # ------------------------------------------ There is more than one possibility |
# ------------------------------------------ There is more than one possibility |
| my $realpossible=0; |
my $realpossible=0; |
| foreach my $id (@possibilities) { |
foreach my $id (@possibilities) { |
| my $file=$bighash{'src_'.$id}; |
my $file=$bighash{'src_'.$id}; |
| if (&allowed('bre',$file)) { |
my $canaccess; |
| my ($mapid,$resid)=split(/\./,$id); |
if (($donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) { |
| if ($bighash{'map_type_'.$mapid} ne 'page') { |
$canaccess = 1; |
| $realpossible++; |
} else { |
| $syval=&encode_symb($bighash{'map_id_'.$mapid}, |
$canaccess = &allowed('bre',$file); |
| $resid,$thisfn); |
} |
| } |
if ($canaccess) { |
| |
my ($mapid,$resid)=split(/\./,$id); |
| |
if ($bighash{'map_type_'.$mapid} ne 'page') { |
| |
my $poss_syval=&encode_symb($bighash{'map_id_'.$mapid}, |
| |
$resid,$thisfn); |
| |
next if ($bighash{'randomout_'.$id} && !$env{'request.role.adv'}); |
| |
next unless (($noenccheck) || ($bighash{'encrypted_'.$id} eq $env{'request.enc'})); |
| |
if ($checkforblock) { |
| |
my @blockers = &has_comm_blocking('bre',$poss_syval,$file,'',$noenccheck); |
| |
if (@blockers > 0) { |
| |
$syval = ''; |
| |
} else { |
| |
$syval = $poss_syval; |
| |
$realpossible++; |
| |
} |
| |
} else { |
| |
$syval = $poss_syval; |
| |
$realpossible++; |
| |
} |
| |
if ($syval) { |
| |
if (ref($possibles) eq 'HASH') { |
| |
$possibles->{$syval} = 1; |
| |
} |
| |
} |
| |
} |
| } |
} |
| } |
} |
| if ($realpossible!=1) { $syval=''; } |
if ($realpossible!=1) { $syval=''; } |
|
Line 7817 sub symbread {
|
Line 12776 sub symbread {
|
| $syval=''; |
$syval=''; |
| } |
} |
| } |
} |
| untie(%bighash) |
untie(%bighash); |
| } |
} |
| } |
} |
| if ($syval) { |
if ($syval) { |
|
Line 7933 sub getCODE {
|
Line 12892 sub getCODE {
|
| } |
} |
| return undef; |
return undef; |
| } |
} |
| |
# |
| |
# Determines the random seed for a specific context: |
| |
# |
| |
# parameters: |
| |
# symb - in course context the symb for the seed. |
| |
# course_id - The course id of the form domain_coursenum. |
| |
# domain - Domain for the user. |
| |
# course - Course for the user. |
| |
# cenv - environment of the course. |
| |
# |
| |
# NOTE: |
| |
# All parameters are picked out of the environment if missing |
| |
# or not defined. |
| |
# If a symb cannot be determined the current time is used instead. |
| |
# |
| |
# For a given well defined symb, courside, domain, username, |
| |
# and course environment, the seed is reproducible. |
| |
# |
| sub rndseed { |
sub rndseed { |
| my ($symb,$courseid,$domain,$username)=@_; |
my ($symb,$courseid,$domain,$username, $cenv)=@_; |
| my ($wsymb,$wcourseid,$wdomain,$wusername)=&whichuser(); |
my ($wsymb,$wcourseid,$wdomain,$wusername)=&whichuser(); |
| if (!defined($symb)) { |
if (!defined($symb)) { |
| unless ($symb=$wsymb) { return time; } |
unless ($symb=$wsymb) { return time; } |
| } |
} |
| if (!$courseid) { $courseid=$wcourseid; } |
if (!defined $courseid) { |
| if (!$domain) { $domain=$wdomain; } |
$courseid=$wcourseid; |
| if (!$username) { $username=$wusername } |
} |
| my $which=&get_rand_alg(); |
if (!defined $domain) { $domain=$wdomain; } |
| |
if (!defined $username) { $username=$wusername } |
| |
|
| |
my $which; |
| |
if (defined($cenv->{'rndseed'})) { |
| |
$which = $cenv->{'rndseed'}; |
| |
} else { |
| |
$which =&get_rand_alg($courseid); |
| |
} |
| if (defined(&getCODE())) { |
if (defined(&getCODE())) { |
| if ($which eq '64bit5') { |
if ($which eq '64bit5') { |
| return &rndseed_CODE_64bit5($symb,$courseid,$domain,$username); |
return &rndseed_CODE_64bit5($symb,$courseid,$domain,$username); |
|
Line 8131 sub rndseed_CODE_64bit5 {
|
Line 13114 sub rndseed_CODE_64bit5 {
|
| sub setup_random_from_rndseed { |
sub setup_random_from_rndseed { |
| my ($rndseed)=@_; |
my ($rndseed)=@_; |
| if ($rndseed =~/([,:])/) { |
if ($rndseed =~/([,:])/) { |
| my ($num1,$num2)=split(/[,:]/,$rndseed); |
my ($num1,$num2) = map { abs($_); } (split(/[,:]/,$rndseed)); |
| &Math::Random::random_set_seed(abs($num1),abs($num2)); |
if ((!$num1) || (!$num2) || ($num1 > 2147483562) || ($num2 > 2147483398)) { |
| |
&Math::Random::random_set_seed_from_phrase($rndseed); |
| |
} else { |
| |
&Math::Random::random_set_seed($num1,$num2); |
| |
} |
| } else { |
} else { |
| &Math::Random::random_set_seed_from_phrase($rndseed); |
&Math::Random::random_set_seed_from_phrase($rndseed); |
| } |
} |
|
Line 8269 sub getfile {
|
Line 13256 sub getfile {
|
| |
|
| sub repcopy_userfile { |
sub repcopy_userfile { |
| my ($file)=@_; |
my ($file)=@_; |
| if ($file =~ m -^/*(uploaded|editupload)/-) { $file=&filelocation("",$file); } |
my $londocroot = $perlvar{'lonDocRoot'}; |
| if ($file =~ m|^/home/httpd/html/lonUsers/|) { return 'ok'; } |
if ($file =~ m{^/*(uploaded|editupload)/}) { $file=&filelocation("",$file); } |
| |
if ($file =~ m{^\Q/home/httpd/lonUsers/\E}) { return 'ok'; } |
| my ($cdom,$cnum,$filename) = |
my ($cdom,$cnum,$filename) = |
| ($file=~m|^\Q$perlvar{'lonDocRoot'}\E/+userfiles/+($match_domain)/+($match_name)/+(.*)|); |
($file=~m|^\Q$perlvar{'lonDocRoot'}\E/+userfiles/+($match_domain)/+($match_name)/+(.*)|); |
| my $uri="/uploaded/$cdom/$cnum/$filename"; |
my $uri="/uploaded/$cdom/$cnum/$filename"; |
|
Line 8317 sub repcopy_userfile {
|
Line 13305 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 8343 sub tokenwrapper {
|
Line 13332 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 8361 sub getuploaded {
|
Line 13351 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 8383 sub readfile {
|
Line 13374 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 8399 sub filelocation {
|
Line 13390 sub filelocation {
|
| $file=~s-^/adm/coursedocs/showdoc/-/-; |
$file=~s-^/adm/coursedocs/showdoc/-/-; |
| } |
} |
| |
|
| if ($file=~m:^/~:) { # is a contruction space reference |
if ($file =~ m-^\Q$Apache::lonnet::perlvar{'lonTabDir'}\E/-) { |
| $location = $file; |
|
| $location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:; |
|
| } elsif ($file=~m{^/home/$match_username/public_html/}) { |
|
| # is a correct contruction space reference |
|
| $location = $file; |
|
| } elsif ($file =~ m-^\Q$Apache::lonnet::perlvar{'lonTabDir'}\E/-) { |
|
| $location = $file; |
$location = $file; |
| } elsif ($file=~/^\/*(uploaded|editupload)/) { # is an uploaded file |
} elsif ($file=~/^\/*(uploaded|editupload)/) { # is an uploaded file |
| my ($udom,$uname,$filename)= |
my ($udom,$uname,$filename)= |
|
Line 8415 sub filelocation {
|
Line 13400 sub filelocation {
|
| my @ids=¤t_machine_ids(); |
my @ids=¤t_machine_ids(); |
| foreach my $id (@ids) { if ($id eq $home) { $is_me=1; } } |
foreach my $id (@ids) { if ($id eq $home) { $is_me=1; } } |
| if ($is_me) { |
if ($is_me) { |
| $location=&propath($udom,$uname).'/userfiles/'.$filename; |
$location=propath($udom,$uname).'/userfiles/'.$filename; |
| } else { |
} else { |
| $location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'. |
$location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'. |
| $udom.'/'.$uname.'/'.$filename; |
$udom.'/'.$uname.'/'.$filename; |
|
Line 8424 sub filelocation {
|
Line 13409 sub filelocation {
|
| $location = $perlvar{'lonDocRoot'}.'/'.$file; |
$location = $perlvar{'lonDocRoot'}.'/'.$file; |
| } else { |
} else { |
| $file=~s/^\Q$perlvar{'lonDocRoot'}\E//; |
$file=~s/^\Q$perlvar{'lonDocRoot'}\E//; |
| $file=~s:^/res/:/:; |
$file=~s:^/(res|priv)/:/:; |
| |
my $space=$1; |
| if ( !( $file =~ m:^/:) ) { |
if ( !( $file =~ m:^/:) ) { |
| $location = $dir. '/'.$file; |
$location = $dir. '/'.$file; |
| } else { |
} else { |
| $location = '/home/httpd/html/res'.$file; |
$location = $perlvar{'lonDocRoot'}.'/'.$space.$file; |
| } |
} |
| } |
} |
| $location=~s://+:/:g; # remove duplicate / |
$location=~s://+:/:g; # remove duplicate / |
|
Line 8453 sub hreflocation {
|
Line 13439 sub hreflocation {
|
| } |
} |
| if ($file=~m-^\Q$perlvar{'lonDocRoot'}\E-) { |
if ($file=~m-^\Q$perlvar{'lonDocRoot'}\E-) { |
| $file=~s-^\Q$perlvar{'lonDocRoot'}\E--; |
$file=~s-^\Q$perlvar{'lonDocRoot'}\E--; |
| } elsif ($file=~m-/home/($match_username)/public_html/-) { |
|
| $file=~s-^/home/($match_username)/public_html/-/~$1/-; |
|
| } elsif ($file=~m-^\Q$perlvar{'lonUsersDir'}\E-) { |
} elsif ($file=~m-^\Q$perlvar{'lonUsersDir'}\E-) { |
| $file=~s-^/home/httpd/lonUsers/($match_domain)/./././($match_name)/userfiles/ |
$file=~s{^/home/httpd/lonUsers/($match_domain)/./././($match_name)/userfiles/} |
| -/uploaded/$1/$2/-x; |
{/uploaded/$1/$2/}x; |
| } |
} |
| if ($file=~ m{^/userfiles/}) { |
if ($file=~ m{^/userfiles/}) { |
| $file =~ s{^/userfiles/}{/uploaded/}; |
$file =~ s{^/userfiles/}{/uploaded/}; |
|
Line 8465 sub hreflocation {
|
Line 13449 sub hreflocation {
|
| return $file; |
return $file; |
| } |
} |
| |
|
| |
|
| |
|
| |
|
| |
|
| sub current_machine_domains { |
sub current_machine_domains { |
| return &machine_domains(&hostname($perlvar{'lonHostID'})); |
return &machine_domains(&hostname($perlvar{'lonHostID'})); |
| } |
} |
|
Line 8499 sub machine_ids {
|
Line 13487 sub machine_ids {
|
| |
|
| sub additional_machine_domains { |
sub additional_machine_domains { |
| my @domains; |
my @domains; |
| open(my $fh,"<$perlvar{'lonTabDir'}/expected_domains.tab"); |
if (-e "$perlvar{'lonTabDir'}/expected_domains.tab") { |
| while( my $line = <$fh>) { |
if (open(my $fh,"<","$perlvar{'lonTabDir'}/expected_domains.tab")) { |
| $line =~ s/\s//g; |
while( my $line = <$fh>) { |
| push(@domains,$line); |
chomp($line); |
| |
$line =~ s/\s//g; |
| |
push(@domains,$line); |
| |
} |
| |
close($fh); |
| |
} |
| } |
} |
| return @domains; |
return @domains; |
| } |
} |
|
Line 8520 sub default_login_domain {
|
Line 13513 sub default_login_domain {
|
| return $domain; |
return $domain; |
| } |
} |
| |
|
| |
sub shared_institution { |
| |
my ($dom,$lonhost) = @_; |
| |
if ($lonhost eq '') { |
| |
$lonhost = $perlvar{'lonHostID'}; |
| |
} |
| |
my $same_intdom; |
| |
my $hostintdom = &internet_dom($lonhost); |
| |
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; |
| |
} |
| |
|
| |
sub waf_allssl { |
| |
my ($host_name) = @_; |
| |
my $alias = &get_proxy_alias(); |
| |
if ($host_name eq '') { |
| |
$host_name = $ENV{'SERVER_NAME'}; |
| |
} |
| |
if (($host_name ne '') && ($alias eq $host_name)) { |
| |
my $serverhomedom = &host_domain($perlvar{'lonHostID'}); |
| |
my %defdomdefaults = &get_domain_defaults($serverhomedom); |
| |
if ($defdomdefaults{'waf_sslopt'}) { |
| |
return $defdomdefaults{'waf_sslopt'}; |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub get_requestor_ip { |
| |
my ($r,$nolookup,$noproxy) = @_; |
| |
my $from_ip; |
| |
if (ref($r)) { |
| |
if ($r->can('useragent_ip')) { |
| |
if ($noproxy && $r->can('client_ip')) { |
| |
$from_ip = $r->client_ip(); |
| |
} else { |
| |
$from_ip = $r->useragent_ip(); |
| |
} |
| |
} elsif ($r->connection->can('remote_ip')) { |
| |
$from_ip = $r->connection->remote_ip(); |
| |
} else { |
| |
$from_ip = $r->get_remote_host($nolookup); |
| |
} |
| |
} else { |
| |
$from_ip = $ENV{'REMOTE_ADDR'}; |
| |
} |
| |
return $from_ip if ($noproxy); |
| |
# Who controls proxy settings for server |
| |
my $dom_in_use = $Apache::lonnet::perlvar{'lonDefDomain'}; |
| |
my $proxyinfo = &get_proxy_settings($dom_in_use); |
| |
if ((ref($proxyinfo) eq 'HASH') && ($from_ip)) { |
| |
if ($proxyinfo->{'vpnint'}) { |
| |
if (&ip_match($from_ip,$proxyinfo->{'vpnint'})) { |
| |
return $from_ip; |
| |
} |
| |
} |
| |
if ($proxyinfo->{'trusted'}) { |
| |
if (&ip_match($from_ip,$proxyinfo->{'trusted'})) { |
| |
my $ipheader = $proxyinfo->{'ipheader'}; |
| |
my ($ip,$xfor); |
| |
if (ref($r)) { |
| |
if ($ipheader) { |
| |
$ip = $r->headers_in->{$ipheader}; |
| |
} |
| |
$xfor = $r->headers_in->{'X-Forwarded-For'}; |
| |
} else { |
| |
if ($ipheader) { |
| |
$ip = $ENV{'HTTP_'.uc($ipheader)}; |
| |
} |
| |
$xfor = $ENV{'HTTP_X_FORWARDED_FOR'}; |
| |
} |
| |
if (($ip eq '') && ($xfor ne '')) { |
| |
foreach my $poss_ip (reverse(split(/\s*,\s*/,$xfor))) { |
| |
unless (&ip_match($poss_ip,$proxyinfo->{'trusted'})) { |
| |
$ip = $poss_ip; |
| |
last; |
| |
} |
| |
} |
| |
} |
| |
if ($ip ne '') { |
| |
return $ip; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return $from_ip; |
| |
} |
| |
|
| |
sub get_proxy_settings { |
| |
my ($dom_in_use) = @_; |
| |
my %domdefaults = &Apache::lonnet::get_domain_defaults($dom_in_use); |
| |
my $proxyinfo = { |
| |
ipheader => $domdefaults{'waf_ipheader'}, |
| |
trusted => $domdefaults{'waf_trusted'}, |
| |
vpnint => $domdefaults{'waf_vpnint'}, |
| |
vpnext => $domdefaults{'waf_vpnext'}, |
| |
sslopt => $domdefaults{'waf_sslopt'}, |
| |
}; |
| |
return $proxyinfo; |
| |
} |
| |
|
| |
sub ip_match { |
| |
my ($ip,$pattern_str) = @_; |
| |
$ip=Net::CIDR::cidrvalidate($ip); |
| |
if ($ip) { |
| |
return Net::CIDR::cidrlookup($ip,split(/\s*,\s*/,$pattern_str)); |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub get_proxy_alias { |
| |
my ($lonid) = @_; |
| |
if ($lonid eq '') { |
| |
$lonid = $perlvar{'lonHostID'}; |
| |
} |
| |
if (!defined(&hostname($lonid))) { |
| |
return; |
| |
} |
| |
if ($lonid ne '') { |
| |
my ($alias,$cached) = &is_cached_new('proxyalias',$lonid); |
| |
if ($cached) { |
| |
return $alias; |
| |
} |
| |
my $dom = &Apache::lonnet::host_domain($lonid); |
| |
if ($dom ne '') { |
| |
my $cachetime = 60*60*24; |
| |
my %domconfig = |
| |
&Apache::lonnet::get_dom('configuration',['wafproxy'],$dom); |
| |
if (ref($domconfig{'wafproxy'}) eq 'HASH') { |
| |
if (ref($domconfig{'wafproxy'}{'alias'}) eq 'HASH') { |
| |
$alias = $domconfig{'wafproxy'}{'alias'}{$lonid}; |
| |
} |
| |
} |
| |
return &do_cache_new('proxyalias',$lonid,$alias,$cachetime); |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub use_proxy_alias { |
| |
my ($r,$lonid) = @_; |
| |
my $alias = &get_proxy_alias($lonid); |
| |
if ($alias) { |
| |
my $dom = &host_domain($lonid); |
| |
if ($dom ne '') { |
| |
my $proxyinfo = &get_proxy_settings($dom); |
| |
my ($vpnint,$remote_ip); |
| |
if (ref($proxyinfo) eq 'HASH') { |
| |
$vpnint = $proxyinfo->{'vpnint'}; |
| |
if ($vpnint) { |
| |
$remote_ip = &get_requestor_ip($r,1,1); |
| |
} |
| |
} |
| |
unless ($vpnint && &ip_match($remote_ip,$vpnint)) { |
| |
return $alias; |
| |
} |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub alias_sso { |
| |
my ($lonid) = @_; |
| |
if ($lonid eq '') { |
| |
$lonid = $perlvar{'lonHostID'}; |
| |
} |
| |
if (!defined(&hostname($lonid))) { |
| |
return; |
| |
} |
| |
if ($lonid ne '') { |
| |
my ($use_alias,$cached) = &is_cached_new('proxysaml',$lonid); |
| |
if ($cached) { |
| |
return $use_alias; |
| |
} |
| |
my $dom = &Apache::lonnet::host_domain($lonid); |
| |
if ($dom ne '') { |
| |
my $cachetime = 60*60*24; |
| |
my %domconfig = |
| |
&Apache::lonnet::get_dom('configuration',['wafproxy'],$dom); |
| |
if (ref($domconfig{'wafproxy'}) eq 'HASH') { |
| |
if (ref($domconfig{'wafproxy'}{'saml'}) eq 'HASH') { |
| |
$use_alias = $domconfig{'wafproxy'}{'saml'}{$lonid}; |
| |
} |
| |
} |
| |
return &do_cache_new('proxysaml',$lonid,$use_alias,$cachetime); |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| |
sub get_saml_landing { |
| |
my ($lonid) = @_; |
| |
if ($lonid eq '') { |
| |
my $defdom = &default_login_domain(); |
| |
my @hosts = ¤t_machine_ids(); |
| |
if (@hosts > 1) { |
| |
foreach my $hostid (@hosts) { |
| |
if (&host_domain($hostid) eq $defdom) { |
| |
$lonid = $hostid; |
| |
last; |
| |
} |
| |
} |
| |
} else { |
| |
$lonid = $perlvar{'lonHostID'}; |
| |
} |
| |
if ($lonid) { |
| |
unless (&Apache::lonnet::host_domain($lonid) eq $defdom) { |
| |
return; |
| |
} |
| |
} else { |
| |
return; |
| |
} |
| |
} elsif (!defined(&hostname($lonid))) { |
| |
return; |
| |
} |
| |
my ($landing,$cached) = &is_cached_new('samllanding',$lonid); |
| |
if ($cached) { |
| |
return $landing; |
| |
} |
| |
my $dom = &Apache::lonnet::host_domain($lonid); |
| |
if ($dom ne '') { |
| |
my $cachetime = 60*60*24; |
| |
my %domconfig = |
| |
&Apache::lonnet::get_dom('configuration',['login'],$dom); |
| |
if (ref($domconfig{'login'}) eq 'HASH') { |
| |
if (ref($domconfig{'login'}{'saml'}) eq 'HASH') { |
| |
if (ref($domconfig{'login'}{'saml'}{$lonid}) eq 'HASH') { |
| |
$landing = 1; |
| |
} |
| |
} |
| |
} |
| |
return &do_cache_new('samllanding',$lonid,$landing,$cachetime); |
| |
} |
| |
return; |
| |
} |
| |
|
| # ------------------------------------------------------------- Declutters URLs |
# ------------------------------------------------------------- Declutters URLs |
| |
|
| sub declutter { |
sub declutter { |
| my $thisfn=shift; |
my $thisfn=shift; |
| if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); } |
if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); } |
| $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//; |
unless ($thisfn=~m{^/home/httpd/html/priv/}) { |
| |
$thisfn=~s{^/home/httpd/html}{}; |
| |
} |
| $thisfn=~s/^\///; |
$thisfn=~s/^\///; |
| $thisfn=~s|^adm/wrapper/||; |
$thisfn=~s|^adm/wrapper/||; |
| $thisfn=~s|^adm/coursedocs/showdoc/||; |
$thisfn=~s|^adm/coursedocs/showdoc/||; |
| $thisfn=~s/^res\///; |
$thisfn=~s/^res\///; |
| $thisfn=~s/\?.+$//; |
$thisfn=~s/^priv\///; |
| |
unless (($thisfn =~ /^ext/) || ($thisfn =~ /\.(page|sequence)___\d+___ext/)) { |
| |
$thisfn=~s/\?.+$//; |
| |
} |
| return $thisfn; |
return $thisfn; |
| } |
} |
| |
|
|
Line 8542 sub clutter {
|
Line 13827 sub clutter {
|
| || $thisfn =~ m{^/adm/(includes|pages)} ) { |
|| $thisfn =~ m{^/adm/(includes|pages)} ) { |
| $thisfn='/res'.$thisfn; |
$thisfn='/res'.$thisfn; |
| } |
} |
| if ($thisfn !~m|/adm|) { |
if ($thisfn !~m|^/adm|) { |
| if ($thisfn =~ m|/ext/|) { |
if ($thisfn =~ m|^/ext/|) { |
| $thisfn='/adm/wrapper'.$thisfn; |
$thisfn='/adm/wrapper'.$thisfn; |
| } else { |
} else { |
| my ($ext) = ($thisfn =~ /\.(\w+)$/); |
my ($ext) = ($thisfn =~ /\.(\w+)$/); |
|
Line 8627 sub goodbye {
|
Line 13912 sub goodbye {
|
| } |
} |
| |
|
| sub get_dns { |
sub get_dns { |
| my ($url,$func,$ignore_cache) = @_; |
my ($url,$func,$ignore_cache,$nocache,$hashref) = @_; |
| if (!$ignore_cache) { |
if (!$ignore_cache) { |
| my ($content,$cached)= |
my ($content,$cached)= |
| &Apache::lonnet::is_cached_new('dns',$url); |
&Apache::lonnet::is_cached_new('dns',$url); |
| if ($cached) { |
if ($cached) { |
| &$func($content); |
&$func($content,$hashref); |
| return; |
return; |
| } |
} |
| } |
} |
| |
|
| 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) = keys(%alldns); |
my ($dns) = sort { $b cmp $a } keys(%alldns); |
| my $ua=new LWP::UserAgent; |
my @content; |
| my $request=new HTTP::Request('GET',"$alldns{$dns}://$dns$url"); |
if ($dns eq Sys::Hostname::FQDN::fqdn()) { |
| my $response=$ua->request($request); |
my $command = (split('/',$url))[3]; |
| delete($alldns{$dns}); |
my ($dir,$file) = &parse_getdns_url($command,$url); |
| next if ($response->is_error()); |
delete($alldns{$dns}); |
| my @content = split("\n",$response->content); |
next if (($dir eq '') || ($file eq '')); |
| &Apache::lonnet::do_cache_new('dns',$url,\@content,30*24*60*60); |
if (open(my $config,'<',"$dir/$file")) { |
| &$func(\@content); |
@content = <$config>; |
| |
close($config); |
| |
} |
| |
} else { |
| |
my $ua=new LWP::UserAgent; |
| |
$ua->timeout(30); |
| |
my $request=new HTTP::Request('GET',"$alldns{$dns}://$dns$url"); |
| |
my $response=$ua->request($request); |
| |
delete($alldns{$dns}); |
| |
next if ($response->is_error()); |
| |
@content = split("\n",$response->content); |
| |
} |
| |
unless ($nocache) { |
| |
&do_cache_new('dns',$url,\@content,30*24*60*60); |
| |
} |
| |
&$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); |
&$func(\@content,$hashref); |
| |
} |
| |
return; |
| |
} |
| |
|
| |
# ------------------------------------------------------Get DNS checksums file |
| |
sub parse_dns_checksums_tab { |
| |
my ($lines,$hashref) = @_; |
| |
my $lonhost = $perlvar{'lonHostID'}; |
| |
my $machine_dom = &Apache::lonnet::host_domain($lonhost); |
| |
my $loncaparev = &get_server_loncaparev($machine_dom); |
| |
my $distro = (split(/\:/,&get_server_distarch($lonhost)))[0]; |
| |
my $webconfdir = '/etc/httpd/conf'; |
| |
if ($distro =~ /^(ubuntu|debian)(\d+)$/) { |
| |
$webconfdir = '/etc/apache2'; |
| |
} elsif ($distro =~ /^sles(\d+)$/) { |
| |
if ($1 >= 10) { |
| |
$webconfdir = '/etc/apache2'; |
| |
} |
| |
} elsif ($distro =~ /^suse(\d+\.\d+)$/) { |
| |
if ($1 >= 10.0) { |
| |
$webconfdir = '/etc/apache2'; |
| |
} |
| |
} |
| |
my ($release,$timestamp) = split(/\-/,$loncaparev); |
| |
my (%chksum,%revnum); |
| |
if (ref($lines) eq 'ARRAY') { |
| |
chomp(@{$lines}); |
| |
my $version = shift(@{$lines}); |
| |
if ($version eq $release) { |
| |
foreach my $line (@{$lines}) { |
| |
my ($file,$version,$shasum) = split(/,/,$line); |
| |
if ($file =~ m{^/etc/httpd/conf}) { |
| |
if ($webconfdir eq '/etc/apache2') { |
| |
$file =~ s{^\Q/etc/httpd/conf/\E}{$webconfdir/}; |
| |
} |
| |
} |
| |
$chksum{$file} = $shasum; |
| |
$revnum{$file} = $version; |
| |
} |
| |
if (ref($hashref) eq 'HASH') { |
| |
%{$hashref} = ( |
| |
sums => \%chksum, |
| |
versions => \%revnum, |
| |
); |
| |
} |
| |
} |
| |
} |
| return; |
return; |
| } |
} |
| |
|
| |
sub fetch_dns_checksums { |
| |
my %checksums; |
| |
my $machine_dom = &Apache::lonnet::host_domain($perlvar{'lonHostID'}); |
| |
my $loncaparev = &get_server_loncaparev($machine_dom,$perlvar{'lonHostID'}); |
| |
my ($release,$timestamp) = split(/\-/,$loncaparev); |
| |
&get_dns("/adm/dns/checksums/$release",\&parse_dns_checksums_tab,1,1, |
| |
\%checksums); |
| |
return \%checksums; |
| |
} |
| |
|
| |
sub parse_getdns_url { |
| |
my ($command,$url) = @_; |
| |
my $dir = $perlvar{'lonTabDir'}; |
| |
my $file; |
| |
if ($command eq 'hosts') { |
| |
$file = 'dns_hosts.tab'; |
| |
} elsif ($command eq 'domain') { |
| |
$file = 'dns_domain.tab'; |
| |
} elsif ($command eq 'checksums') { |
| |
my $version = (split('/',$url))[4]; |
| |
$file = "dns_checksums/$version.tab", |
| |
} |
| |
return ($dir,$file); |
| |
} |
| |
|
| # ------------------------------------------------------------ Read domain file |
# ------------------------------------------------------------ Read domain file |
| { |
{ |
| my $loaded; |
my $loaded; |
|
Line 8696 sub get_dns {
|
Line 14070 sub get_dns {
|
| } |
} |
| |
|
| sub load_domain_tab { |
sub load_domain_tab { |
| my ($ignore_cache) = @_; |
my ($ignore_cache,$nocache) = @_; |
| &get_dns('/adm/dns/domain',\&parse_domain_tab,$ignore_cache); |
&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 8734 sub get_dns {
|
Line 14108 sub get_dns {
|
| my %libserv; |
my %libserv; |
| my $loaded; |
my $loaded; |
| my %name_to_host; |
my %name_to_host; |
| |
my %internetdom; |
| |
my %LC_dns_serv; |
| |
|
| sub parse_hosts_tab { |
sub parse_hosts_tab { |
| my ($file) = @_; |
my ($file) = @_; |
| foreach my $configline (@$file) { |
foreach my $configline (@$file) { |
| next if ($configline =~ /^(\#|\s*$ )/x); |
next if ($configline =~ /^(\#|\s*$ )/x); |
| next if ($configline =~ /^\^/); |
chomp($configline); |
| chomp($configline); |
if ($configline =~ /^\^/) { |
| my ($id,$domain,$role,$name,$protocol)=split(/:/,$configline); |
if ($configline =~ /^\^([\w.\-]+)/) { |
| |
$LC_dns_serv{$1} = 1; |
| |
} |
| |
next; |
| |
} |
| |
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 8757 sub get_dns {
|
Line 14153 sub get_dns {
|
| } else { |
} else { |
| $protocol{$id} = 'http'; |
$protocol{$id} = 'http'; |
| } |
} |
| |
if (defined($intdom)) { |
| |
$internetdom{$id} = $intdom; |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 8773 sub get_dns {
|
Line 14172 sub get_dns {
|
| } |
} |
| |
|
| sub load_hosts_tab { |
sub load_hosts_tab { |
| my ($ignore_cache) = @_; |
my ($ignore_cache,$nocache) = @_; |
| &get_dns('/adm/dns/hosts',\&parse_hosts_tab,$ignore_cache); |
&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 8796 sub get_dns {
|
Line 14195 sub get_dns {
|
| } |
} |
| |
|
| sub all_names { |
sub all_names { |
| &load_hosts_tab() if (!$loaded); |
my ($ignore_cache,$nocache) = @_; |
| |
&load_hosts_tab($ignore_cache,$nocache) if (!$loaded); |
| |
|
| return %name_to_host; |
return %name_to_host; |
| } |
} |
|
Line 8818 sub get_dns {
|
Line 14218 sub get_dns {
|
| return %libserv; |
return %libserv; |
| } |
} |
| |
|
| |
sub unique_library { |
| |
#2x reverse removes all hostnames that appear more than once |
| |
my %unique = reverse &all_library(); |
| |
return reverse %unique; |
| |
} |
| |
|
| sub get_servers { |
sub get_servers { |
| &load_hosts_tab() if (!$loaded); |
&load_hosts_tab() if (!$loaded); |
| |
|
|
Line 8841 sub get_dns {
|
Line 14247 sub get_dns {
|
| return %result; |
return %result; |
| } |
} |
| |
|
| |
sub get_unique_servers { |
| |
my %unique = reverse &get_servers(@_); |
| |
return reverse %unique; |
| |
} |
| |
|
| sub host_domain { |
sub host_domain { |
| &load_hosts_tab() if (!$loaded); |
&load_hosts_tab() if (!$loaded); |
| |
|
|
Line 8855 sub get_dns {
|
Line 14266 sub get_dns {
|
| my @uniq = grep(!$seen{$_}++, values(%hostdom)); |
my @uniq = grep(!$seen{$_}++, values(%hostdom)); |
| return @uniq; |
return @uniq; |
| } |
} |
| |
|
| |
sub internet_dom { |
| |
&load_hosts_tab() if (!$loaded); |
| |
|
| |
my ($lonid) = @_; |
| |
return $internetdom{$lonid}; |
| |
} |
| |
|
| |
sub is_LC_dns { |
| |
&load_hosts_tab() if (!$loaded); |
| |
|
| |
my ($hostname) = @_; |
| |
return exists($LC_dns_serv{$hostname}); |
| |
} |
| |
|
| } |
} |
| |
|
| { |
{ |
|
Line 8892 sub get_dns {
|
Line 14318 sub get_dns {
|
| } |
} |
| |
|
| sub get_iphost { |
sub get_iphost { |
| my ($ignore_cache) = @_; |
my ($ignore_cache,$nocache) = @_; |
| |
|
| if (!$ignore_cache) { |
if (!$ignore_cache) { |
| if (%iphost) { |
if (%iphost) { |
|
Line 8916 sub get_dns {
|
Line 14342 sub get_dns {
|
| %old_name_to_ip = %{$ip_info->[1]}; |
%old_name_to_ip = %{$ip_info->[1]}; |
| } |
} |
| |
|
| my %name_to_host = &all_names(); |
my %name_to_host = &all_names($ignore_cache,$nocache); |
| foreach my $name (keys(%name_to_host)) { |
foreach my $name (keys(%name_to_host)) { |
| my $ip; |
my $ip; |
| if (!exists($name_to_ip{$name})) { |
if (!exists($name_to_ip{$name})) { |
|
Line 8941 sub get_dns {
|
Line 14367 sub get_dns {
|
| } |
} |
| push(@{$iphost{$ip}},@{$name_to_host{$name}}); |
push(@{$iphost{$ip}},@{$name_to_host{$name}}); |
| } |
} |
| &Apache::lonnet::do_cache_new('iphost','iphost', |
unless ($nocache) { |
| [\%iphost,\%name_to_ip,\%lonid_to_ip], |
&do_cache_new('iphost','iphost', |
| 48*60*60); |
[\%iphost,\%name_to_ip,\%lonid_to_ip], |
| |
48*60*60); |
| |
} |
| |
|
| return %iphost; |
return %iphost; |
| } |
} |
| |
|
| |
# |
| |
# Given a DNS returns the loncapa host name for that DNS |
| |
# |
| |
sub host_from_dns { |
| |
my ($dns) = @_; |
| |
my @hosts; |
| |
my $ip; |
| |
|
| |
if (exists($name_to_ip{$dns})) { |
| |
$ip = $name_to_ip{$dns}; |
| |
} |
| |
if (!$ip) { |
| |
$ip = gethostbyname($dns); # Initial translation to IP is in net order. |
| |
if (length($ip) == 4) { |
| |
$ip = &IO::Socket::inet_ntoa($ip); |
| |
} |
| |
} |
| |
if ($ip) { |
| |
@hosts = get_hosts_from_ip($ip); |
| |
return $hosts[0]; |
| |
} |
| |
return undef; |
| |
} |
| |
|
| |
sub get_internet_names { |
| |
my ($lonid) = @_; |
| |
return if ($lonid eq ''); |
| |
my ($idnref,$cached)= |
| |
&Apache::lonnet::is_cached_new('internetnames',$lonid); |
| |
if ($cached) { |
| |
return $idnref; |
| |
} |
| |
my $ip = &get_host_ip($lonid); |
| |
my @hosts = &get_hosts_from_ip($ip); |
| |
my %iphost = &get_iphost(); |
| |
my (@idns,%seen); |
| |
foreach my $id (@hosts) { |
| |
my $dom = &host_domain($id); |
| |
my $prim_id = &domain($dom,'primary'); |
| |
my $prim_ip = &get_host_ip($prim_id); |
| |
next if ($seen{$prim_ip}); |
| |
if (ref($iphost{$prim_ip}) eq 'ARRAY') { |
| |
foreach my $id (@{$iphost{$prim_ip}}) { |
| |
my $intdom = &internet_dom($id); |
| |
unless (grep(/^\Q$intdom\E$/,@idns)) { |
| |
push(@idns,$intdom); |
| |
} |
| |
} |
| |
} |
| |
$seen{$prim_ip} = 1; |
| |
} |
| |
return &do_cache_new('internetnames',$lonid,\@idns,12*60*60); |
| |
} |
| |
|
| |
} |
| |
|
| |
sub all_loncaparevs { |
| |
return qw(1.1 1.2 1.3 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10 2.11); |
| |
} |
| |
|
| |
# ------------------------------------------------------- Read loncaparev table |
| |
{ |
| |
sub load_loncaparevs { |
| |
if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") { |
| |
if (open(my $config,"<","$perlvar{'lonTabDir'}/loncaparevs.tab")) { |
| |
while (my $configline=<$config>) { |
| |
chomp($configline); |
| |
my ($hostid,$loncaparev)=split(/:/,$configline); |
| |
$loncaparevs{$hostid}=$loncaparev; |
| |
} |
| |
close($config); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
|
| |
# ----------------------------------------------------- Read serverhostID table |
| |
{ |
| |
sub load_serverhomeIDs { |
| |
if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") { |
| |
if (open(my $config,"<","$perlvar{'lonTabDir'}/serverhomeIDs.tab")) { |
| |
while (my $configline=<$config>) { |
| |
chomp($configline); |
| |
my ($name,$id)=split(/:/,$configline); |
| |
$serverhomeIDs{$name}=$id; |
| |
} |
| |
close($config); |
| |
} |
| |
} |
| |
} |
| } |
} |
| |
|
| |
|
| BEGIN { |
BEGIN { |
| |
|
| # ----------------------------------- Read loncapa.conf and loncapa_apache.conf |
# ----------------------------------- Read loncapa.conf and loncapa_apache.conf |
|
Line 8961 BEGIN {
|
Line 14481 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 8975 BEGIN {
|
Line 14495 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 8989 BEGIN {
|
Line 14509 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 9009 BEGIN {
|
Line 14529 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 9024 BEGIN {
|
Line 14544 BEGIN {
|
| close($config); |
close($config); |
| } |
} |
| |
|
| |
# --------------------------------------------------------- Read loncaparev table |
| |
|
| |
&load_loncaparevs(); |
| |
|
| |
# ------------------------------------------------------- Read serverhostID table |
| |
|
| |
&load_serverhomeIDs(); |
| |
|
| |
# ---------------------------------------------------------- Read releaseslist XML |
| |
{ |
| |
my $file = $Apache::lonnet::perlvar{'lonTabDir'}.'/releaseslist.xml'; |
| |
if (-e $file) { |
| |
my $parser = HTML::LCParser->new($file); |
| |
while (my $token = $parser->get_token()) { |
| |
if ($token->[0] eq 'S') { |
| |
my $item = $token->[1]; |
| |
my $name = $token->[2]{'name'}; |
| |
my $value = $token->[2]{'value'}; |
| |
if ($item ne '' && $name ne '' && $value ne '') { |
| |
my $release = $parser->get_text(); |
| |
$release =~ s/(^\s*|\s*$ )//gx; |
| |
$needsrelease{$item.':'.$name.':'.$value} = $release; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
|
| |
# ---------------------------------------------------------- Read managers table |
| |
{ |
| |
if (-e "$perlvar{'lonTabDir'}/managers.tab") { |
| |
if (open(my $config,"<","$perlvar{'lonTabDir'}/managers.tab")) { |
| |
while (my $configline=<$config>) { |
| |
chomp($configline); |
| |
next if ($configline =~ /^\#/); |
| |
if (($configline =~ /^[\w\-]+$/) || ($configline =~ /^[\w\-]+\:[\w\-]+$/)) { |
| |
$managerstab{$configline} = 1; |
| |
} |
| |
} |
| |
close($config); |
| |
} |
| |
} |
| |
} |
| |
|
| # ------------- set up temporary directory |
# ------------- set up temporary directory |
| { |
{ |
| $tmpdir = $perlvar{'lonDaemons'}.'/tmp/'; |
$tmpdir = LONCAPA::tempdir(); |
| |
|
| } |
} |
| |
|
| |
# ------------- 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 9187 were new keys. I.E. 1:foo will become 1:
|
Line 14761 were new keys. I.E. 1:foo will become 1:
|
| |
|
| Calling convention: |
Calling convention: |
| |
|
| my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$uname,$home); |
my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$uname); |
| &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname,$home); |
&Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname,$laststore); |
| |
|
| For more detailed information, see lonnet specific documentation. |
For more detailed information, see lonnet specific documentation. |
| |
|
|
Line 9228 in the user's environment.db and in %env
|
Line 14802 in the user's environment.db and in %env
|
| |
|
| =item * |
=item * |
| X<delenv()> |
X<delenv()> |
| B<delenv($regexp)>: removes all items from the session |
B<delenv($delthis,$regexp)>: removes all items from the session |
| environment file that matches the regular expression in $regexp. The |
environment file that begin with $delthis. If the |
| values are also delted from the current processes %env. |
optional second arg - $regexp - is true, $delthis is treated as a |
| |
regular expression, otherwise \Q$delthis\E is used. |
| |
The values are also deleted from the current processes %env. |
| |
|
| =item * get_env_multiple($name) |
=item * get_env_multiple($name) |
| |
|
|
Line 9252 authentication scheme
|
Line 14828 authentication scheme
|
| |
|
| =item * |
=item * |
| X<authenticate()> |
X<authenticate()> |
| B<authenticate($uname,$upass,$udom)>: try to |
B<authenticate($uname,$upass,$udom,$checkdefauth,$clientcancheckhost)>: try to |
| authenticate user from domain's lib servers (first use the current |
authenticate user from domain's lib servers (first use the current |
| one). C<$upass> should be the users password. |
one). C<$upass> should be the users password. |
| |
$checkdefauth is optional (value is 1 if a check should be made to |
| |
authenticate user using default authentication method, and allow |
| |
account creation if username does not have account in the domain). |
| |
$clientcancheckhost is optional (value is 1 if checking whether the |
| |
server can host will occur on the client side in lonauth.pm). |
| |
|
| =item * |
=item * |
| X<homeserver()> |
X<homeserver()> |
|
Line 9280 B<idput($udom,%ids)>: store away a list
|
Line 14861 B<idput($udom,%ids)>: store away a list
|
| |
|
| =item * |
=item * |
| X<rolesinit()> |
X<rolesinit()> |
| B<rolesinit($udom,$username,$authhost)>: get user privileges |
B<rolesinit($udom,$username)>: get user privileges. |
| |
returns user role, first access and timer interval hashes |
| |
|
| |
=item * |
| |
X<privileged()> |
| |
B<privileged($username,$domain)>: returns a true if user has a |
| |
privileged and active role (i.e. su or dc), false otherwise. |
| |
|
| =item * |
=item * |
| X<getsection()> |
X<getsection()> |
|
Line 9311 escaped strings of the action recorded i
|
Line 14898 escaped strings of the action recorded i
|
| |
|
| =item * |
=item * |
| |
|
| allowed($priv,$uri,$symb,$role) : check for a user privilege; returns codes for allowed actions |
allowed($priv,$uri,$symb,$role,$clientip,$noblockcheck) : check for a user privilege; |
| |
returns codes for allowed actions. |
| |
|
| |
The first argument is required, all others are optional. |
| |
|
| |
$priv is the privilege being checked. |
| |
$uri contains additional information about what is being checked for access (e.g., |
| |
URL, course ID etc.). |
| |
$symb is the unique resource instance identifier in a course; if needed, |
| |
but not provided, it will be retrieved via a call to &symbread(). |
| |
$role is the role for which a priv is being checked (only used if priv is evb). |
| |
$clientip is the user's IP address (only used when checking for access to portfolio |
| |
files). |
| |
$noblockcheck, if true, skips calls to &has_comm_blocking() for the bre priv. This |
| |
prevents recursive calls to &allowed. |
| |
|
| F: full access |
F: full access |
| U,I,K: authentication modes (cxx only) |
U,I,K: authentication modes (cxx only) |
| '': forbidden |
'': forbidden |
| 1: user needs to choose course |
1: user needs to choose course |
| 2: browse allowed |
2: browse allowed |
| A: passphrase authentication needed |
A: passphrase authentication needed |
| |
B: access temporarily blocked because of a blocking event in a course. |
| |
|
| =item * |
=item * |
| |
|
| definerole($rolename,$sysrole,$domrole,$courole) : define role; define a custom |
constructaccess($url,$setpriv) : check for access to construction space URL |
| role rolename set privileges in format of lonTabs/roles.tab for system, domain, |
|
| and course level |
See if the owner domain and name in the URL match those in the |
| |
expected environment. If so, return three element list |
| |
($ownername,$ownerdomain,$ownerhome). |
| |
|
| |
Otherwise return the null string. |
| |
|
| |
If second argument 'setpriv' is true, it assigns the privileges, |
| |
and returns the same three element list, unless the owner has |
| |
blocked "ad hoc" Domain Coordinator access to the Author Space, |
| |
in which case the null string is returned. |
| |
|
| =item * |
=item * |
| |
|
| plaintext($short) : return value in %prp hash (rolesplain.tab); plain text |
definerole($rolename,$sysrole,$domrole,$courole,$uname,$udom) : define role; |
| explanation of a user role term |
define a custom role rolename set privileges in format of lonTabs/roles.tab |
| |
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 * |
| |
|
| |
plaintext($short,$type,$cid,$forcedefault) : return value in %prp hash |
| |
(rolesplain.tab); plain text explanation of a user role term. |
| |
$type is Course (default) or Community. |
| |
If $forcedefault evaluates to true, text returned will be default |
| |
text for $type. Otherwise, if this is a course, the text returned |
| |
will be a custom name for the role (if defined in the course's |
| |
environment). If no custom name is defined the default is returned. |
| |
|
| =item * |
=item * |
| |
|
| get_my_roles($uname,$udom,$context,$types,$roles,$roledoms,$withsec) : |
get_my_roles($uname,$udom,$context,$types,$roles,$roledoms,$withsec,$hidepriv) : |
| All arguments are optional. Returns a hash of a roles, either for |
All arguments are optional. Returns a hash of a roles, either for |
| co-author/assistant author roles for a user's Construction Space |
co-author/assistant author roles for a user's Construction Space |
| (default), or if $context is 'userroles', roles for the user himself, |
(default), or if $context is 'userroles', roles for the user himself, |
|
Line 9346 of role statuses (active, future or prev
|
Line 14970 of role statuses (active, future or prev
|
| to restrict the list of roles reported. If no array ref is |
to restrict the list of roles reported. If no array ref is |
| provided for types, will default to return only active roles. |
provided for types, will default to return only active roles. |
| |
|
| |
=item * |
| |
|
| |
in_course($udom,$uname,$cdom,$cnum,$type,$hideprivileged) : determine if |
| |
user: $uname:$udom has a role in the course: $cdom_$cnum. |
| |
|
| |
Additional optional arguments are: $type (if role checking is to be restricted |
| |
to certain user status types -- previous (expired roles), active (currently |
| |
available roles) or future (roles available in the future), and |
| |
$hideprivileged -- if true will not report course roles for users who |
| |
have active Domain Coordinator role in course's domain or in additional |
| |
domains (specified in 'Domains to check for privileged users' in course |
| |
environment -- set via: Course Settings -> Classlists and staff listing). |
| |
|
| |
=item * |
| |
|
| |
privileged($username,$domain,$possdomains,$possroles) : returns 1 if user |
| |
$username:$domain is a privileged user (e.g., Domain Coordinator or Super User) |
| |
$possdomains and $possroles are optional array refs -- to domains to check and |
| |
roles to check. If $possdomains is not specified, a dump will be done of the |
| |
users' roles.db to check for a dc or su role in any domain. This can be |
| |
time consuming if &privileged is called repeatedly (e.g., when displaying a |
| |
classlist), so in such cases, supplying a $possdomains array is preferred, as |
| |
this then allows &privileged_by_domain() to be used, which caches the identity |
| |
of privileged users, eliminating the need for repeated calls to &dump(). |
| |
|
| |
=item * |
| |
|
| |
privileged_by_domain($possdomains,$roles) : returns a hash of a hash of a hash, |
| |
where the outer hash keys are domains specified in the $possdomains array ref, |
| |
next inner hash keys are privileged roles specified in the $roles array ref, |
| |
and the innermost hash contains key = value pairs for username:domain = end:start |
| |
for active or future "privileged" users with that role in that domain. To avoid |
| |
repeated dumps of domain roles -- via &get_domain_roles() -- contents of the |
| |
innerhash are cached using priv_$role and $dom as the identifiers. |
| |
|
| =back |
=back |
| |
|
| =head2 User Modification |
=head2 User Modification |
|
Line 9371 modifyuserauth($udom,$uname,$umode,$upas
|
Line 15030 modifyuserauth($udom,$uname,$umode,$upas
|
| |
|
| =item * |
=item * |
| |
|
| modifyuser($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene, |
modifyuser($udom,$uname,$uid,$umode,$upass,$first,$middle,$last, $gene, |
| $forceid,$desiredhome,$email,$inststatus) : |
$forceid,$desiredhome,$email,$inststatus,$candelete) : |
| modify user |
|
| |
will update user information (firstname,middlename,lastname,generation, |
| |
permanentemail), and if forceid is true, student/employee ID also. |
| |
A user's institutional affiliation(s) can also be updated. |
| |
User information fields will not be overwritten with empty entries |
| |
unless the field is included in the $candelete array reference. |
| |
This array is included when a single user is modified via "Manage Users", |
| |
or when Autoupdate.pl is run by cron in a domain. |
| |
|
| =item * |
=item * |
| |
|
| modifystudent |
modifystudent |
| |
|
| modify a student's enrollment and identification information. |
modify a student's enrollment and identification information. |
| The course id is resolved based on the current users environment. |
The course id is resolved based on the current user's environment. |
| This means the envoking user must be a course coordinator or otherwise |
This means the invoking user must be a course coordinator or otherwise |
| associated with a course. |
associated with a course. |
| |
|
| This call is essentially a wrapper for lonnet::modifyuser and |
This call is essentially a wrapper for lonnet::modifyuser and |
|
Line 9431 Inputs:
|
Line 15097 Inputs:
|
| |
|
| =item B<$context> role change context (shown in User Management Logs display in a course) |
=item B<$context> role change context (shown in User Management Logs display in a course) |
| |
|
| =item B<$inststatus> institutional status of user - : separated string of escaped status types |
=item B<$inststatus> institutional status of user - : separated string of escaped status types |
| |
|
| |
=item B<$credits> Number of credits student will earn from this class - only needs to be supplied if value needs to be different from default credits for class. |
| |
|
| =back |
=back |
| |
|
|
Line 9439 Inputs:
|
Line 15107 Inputs:
|
| |
|
| modify_student_enrollment |
modify_student_enrollment |
| |
|
| Change a students enrollment status in a class. The environment variable |
Change a student's enrollment status in a class. The environment variable |
| 'role.request.course' must be defined for this function to proceed. |
'role.request.course' must be defined for this function to proceed. |
| |
|
| Inputs: |
Inputs: |
| |
|
| =over 4 |
=over 4 |
| |
|
| =item $udom, students domain |
=item $udom, student's domain |
| |
|
| =item $uname, students name |
=item $uname, student's name |
| |
|
| =item $uid, students user id |
=item $uid, student's user id |
| |
|
| =item $first, students first name |
=item $first, student's first name |
| |
|
| =item $middle |
=item $middle |
| |
|
|
Line 9476 Inputs:
|
Line 15144 Inputs:
|
| |
|
| =item $context |
=item $context |
| |
|
| |
=item $credits, number of credits student will earn from this class |
| |
|
| |
=item $instsec, institutional course section code for student |
| |
|
| =back |
=back |
| |
|
| |
|
|
Line 9501 revokecustomrole($udom,$uname,$url,$role
|
Line 15173 revokecustomrole($udom,$uname,$url,$role
|
| |
|
| =item * |
=item * |
| |
|
| coursedescription($courseid) : returns a hash of information about the |
coursedescription($courseid,$options) : returns a hash of information about the |
| specified course id, including all environment settings for the |
specified course id, including all environment settings for the |
| course, the description of the course will be in the hash under the |
course, the description of the course will be in the hash under the |
| key 'description' |
key 'description' |
| |
|
| |
$options is an optional parameter that if supplied is a hash reference that controls |
| |
what how this function works. It has the following key/values: |
| |
|
| |
=over 4 |
| |
|
| |
=item freshen_cache |
| |
|
| |
If defined, and the environment cache for the course is valid, it is |
| |
returned in the returned hash. |
| |
|
| |
=item one_time |
| |
|
| |
If defined, the last cache time is set to _now_ |
| |
|
| |
=item user |
| |
|
| |
If defined, the supplied username is used instead of the current user. |
| |
|
| |
|
| |
=back |
| |
|
| =item * |
=item * |
| |
|
| resdata($name,$domain,$type,@which) : request for current parameter |
resdata($name,$domain,$type,@which) : request for current parameter |
| setting for a specific $type, where $type is either 'course' or 'user', |
setting for a specific $type, where $type is either 'course' or 'user', |
| @what should be a list of parameters to ask about. This routine caches |
@what should be a list of parameters to ask about. This routine caches |
| answers for 5 minutes. |
answers for 10 minutes. |
| |
|
| =item * |
=item * |
| |
|
|
Line 9520 data base, returning a hash that is keye
|
Line 15213 data base, returning a hash that is keye
|
| values that are the resource value. I believe that the timestamps and |
values that are the resource value. I believe that the timestamps and |
| versions are also returned. |
versions are also returned. |
| |
|
| |
get_numsuppfiles($cnum,$cdom) : retrieve number of files in a course's |
| |
supplemental content area. This routine caches the number of files for |
| |
10 minutes. |
| |
|
| =back |
=back |
| |
|
|
Line 9534 database) for a course
|
Line 15230 database) for a course
|
| |
|
| =item * |
=item * |
| |
|
| createcourse($udom,$description,$url) : make/modify course |
createcourse($udom,$description,$url,$course_server,$nonstandard,$inst_code,$course_owner,$crstype,$cnum) : make course |
| |
|
| |
=item * |
| |
|
| |
generate_coursenum($udom,$crstype) : get a unique (unused) course number in domain $udom for course type $crstype (Course or Community). |
| |
|
| |
=item * |
| |
|
| |
is_course($courseid), is_course($cdom, $cnum) |
| |
|
| |
Accepts either a combined $courseid (in the form of domain_courseid) or the |
| |
two component version $cdom, $cnum. It checks if the specified course exists. |
| |
|
| |
Returns: |
| |
undef if the course doesn't exist, otherwise |
| |
in scalar context the combined courseid. |
| |
in list context the two components of the course identifier, domain and |
| |
courseid. |
| |
|
| |
=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 |
=back |
| |
|
|
Line 9563 resource. Expects the local filesystem p
|
Line 15358 resource. Expects the local filesystem p
|
| |
|
| =item * |
=item * |
| |
|
| EXT($varname,$symb,$udom,$uname) : evaluates and returns the value of |
EXT($varname,$symb,$udom,$uname,$usection,$recurse,$cid) : evaluates |
| a vairety of different possible values, $varname should be a request |
and returns the value of a variety of different possible values, |
| string, and the other parameters can be used to specify who and what |
$varname should be a request string, and the other parameters can be |
| one is asking about. |
used to specify who and what one is asking about. Ordinarily, $cid |
| |
does not need to be specified, as it is retrived from |
| |
$env{'request.course.id'}, but &Apache::lonnet::EXT() is called |
| |
within lonuserstate::loadmap() when initializing a course, before |
| |
$env{'request.course.id'} has been set, so it needs to be provided |
| |
in that one case. |
| |
|
| Possible values for $varname are environment.lastname (or other item |
Possible values for $varname are environment.lastname (or other item |
| from the envirnment hash), user.name (or someother aspect about the |
from the envirnment hash), user.name (or someother aspect about the |
|
Line 9599 will be stored for query
|
Line 15399 will be stored for query
|
| |
|
| =item * |
=item * |
| |
|
| symbread($filename) : return symbolic list entry (filename argument optional); |
symbread($filename,$donotrecurse,$ignorecachednull,$checkforblock,$possibles) : |
| |
return symbolic list entry (all arguments optional). |
| |
|
| |
Args: filename is the filename (including path) for the file for which a symb |
| |
is required; donotrecurse, if true will prevent calls to allowed() being made |
| |
to check access status if more than one resource was found in the bighash |
| |
(see rev. 1.249) to avoid an infinite loop if an ambiguous resource is part of |
| |
a randompick); ignorecachednull, if true will prevent a symb of '' being |
| |
returned if $env{$cache_str} is defined as ''; checkforblock if true will |
| |
cause possible symbs to be checked to determine if they are subject to content |
| |
blocking, if so they will not be included as possible symbs; possibles is a |
| |
ref to a hash, which, as a side effect, will be populated with all possible |
| |
symbs (content blocking not tested). |
| |
|
| returns the data handle |
returns the data handle |
| |
|
| =item * |
=item * |
| |
|
| symbverify($symb,$thisfn) : verifies that $symb actually exists and is |
symbverify($symb,$thisfn,$encstate) : verifies that $symb actually exists |
| a possible symb for the URL in $thisfn, and if is an encryypted |
and is a possible symb for the URL in $thisfn, and if is an encrypted |
| resource that the user accessed using /enc/ returns a 1 on success, 0 |
resource that the user accessed using /enc/ returns a 1 on success, 0 |
| on failure, user must be in a course, as it assumes the existance of |
on failure, user must be in a course, as it assumes the existence of |
| the course initial hash, and uses $env('request.course.id'} |
the course initial hash, and uses $env('request.course.id'}. The third |
| |
arg is an optional reference to a scalar. If this arg is passed in the |
| |
call to symbverify, it will be set to 1 if the symb has been set to be |
| |
encrypted; otherwise it will be null. |
| |
|
| =item * |
=item * |
| |
|
|
Line 9662 expirespread($uname,$udom,$stype,$usymb)
|
Line 15477 expirespread($uname,$udom,$stype,$usymb)
|
| devalidate($symb) : devalidate temporary spreadsheet calculations, |
devalidate($symb) : devalidate temporary spreadsheet calculations, |
| forcing spreadsheet to reevaluate the resource scores next time. |
forcing spreadsheet to reevaluate the resource scores next time. |
| |
|
| |
=item * |
| |
|
| |
can_edit_resource($file,$cnum,$cdom,$resurl,$symb,$group) : determine if current user can edit a particular resource, |
| |
when viewing in course context. |
| |
|
| |
input: six args -- filename (decluttered), course number, course domain, |
| |
url, symb (if registered) and group (if this is a |
| |
group item -- e.g., bulletin board, group page etc.). |
| |
|
| |
output: array of five scalars -- |
| |
$cfile -- url for file editing if editable on current server |
| |
$home -- homeserver of resource (i.e., for author if published, |
| |
or course if uploaded.). |
| |
$switchserver -- 1 if server switch will be needed. |
| |
$forceedit -- 1 if icon/link should be to go to edit mode |
| |
$forceview -- 1 if icon/link should be to go to view mode |
| |
|
| |
=item * |
| |
|
| |
is_course_upload($file,$cnum,$cdom) |
| |
|
| |
Used in course context to determine if current file was uploaded to |
| |
the course (i.e., would be found in /userfiles/docs on the course's |
| |
homeserver. |
| |
|
| |
input: 3 args -- filename (decluttered), course number and course domain. |
| |
output: boolean -- 1 if file was uploaded. |
| |
|
| =back |
=back |
| |
|
| =head2 Storing/Retreiving Data |
=head2 Storing/Retreiving Data |
|
Line 9670 forcing spreadsheet to reevaluate the re
|
Line 15513 forcing spreadsheet to reevaluate the re
|
| |
|
| =item * |
=item * |
| |
|
| store($storehash,$symb,$namespace,$udom,$uname) : stores hash permanently |
store($storehash,$symb,$namespace,$udom,$uname,$laststore) : stores hash |
| for this url; hashref needs to be given and should be a \%hashname; the |
permanently for this url; hashref needs to be given and should be a \%hashname; |
| remaining args aren't required and if they aren't passed or are '' they will |
the remaining args aren't required and if they aren't passed or are '' they will |
| be derived from the env |
be derived from the env (with the exception of $laststore, which is an |
| |
optional arg used when a user's submission is stored in grading). |
| |
$laststore is $version=$timestamp, where $version is the most recent version |
| |
number retrieved for the corresponding $symb in the $namespace db file, and |
| |
$timestamp is the timestamp for that transaction (UNIX time). |
| |
$laststore is currently only passed when cstore() is called by |
| |
structuretags::finalize_storage(). |
| |
|
| =item * |
=item * |
| |
|
| cstore($storehash,$symb,$namespace,$udom,$uname) : same as store but |
cstore($storehash,$symb,$namespace,$udom,$uname,$laststore) : same as store |
| uses critical subroutine |
but uses critical subroutine |
| |
|
| =item * |
=item * |
| |
|
|
Line 9701 $range should be either an integer '100'
|
Line 15550 $range should be either an integer '100'
|
| |
|
| =item * |
=item * |
| |
|
| putstore($namespace,$symb,$version,$storehash,$udomain,$uname) : |
putstore($namespace,$symb,$version,$storehash,$udomain,$uname,$tolog) : |
| replaces a &store() version of data with a replacement set of data |
replaces a &store() version of data with a replacement set of data |
| for a particular resource in a namespace passed in the $storehash hash |
for a particular resource in a namespace passed in the $storehash hash |
| reference |
reference. If $tolog is true, the transaction is logged in the courselog |
| |
with an action=PUTSTORE. |
| |
|
| =item * |
=item * |
| |
|
|
Line 9814 server ($udom and $uhome are optional)
|
Line 15664 server ($udom and $uhome are optional)
|
| |
|
| =item * |
=item * |
| |
|
| get_domain_defaults($target_domain) : returns hash with defaults for |
get_domain_defaults($target_domain,$ignore_cache) : returns hash with defaults |
| authentication and language in the domain. Keys are: auth_def, auth_arg_def, |
for: authentication, language, quotas, timezone, date locale, and portal URL in |
| lang_def; corresponsing values are authentication type (internal, krb4, krb5, |
the target domain. |
| or localauth), initial password or a kerberos realm, language (e.g., en-us). |
|
| Values are retrieved from cache (if current), or from domain's configuration.db |
May also include additional key => value pairs for the following groups: |
| (if available), or lastly from values in lonTabs/dns_domain,tab, |
|
| or lonTabs/domain.tab. |
=over |
| |
|
| |
=item |
| |
disk quotas (MB allocated by default to portfolios and authoring spaces). |
| |
|
| |
=over |
| |
|
| |
=item defaultquota, authorquota |
| |
|
| %domdefaults = &get_auth_defaults($target_domain); |
=back |
| |
|
| |
=item |
| |
tools (availability of aboutme page, blog, webDAV access for authoring spaces, |
| |
portfolio for users). |
| |
|
| |
=over |
| |
|
| |
=item |
| |
aboutme, blog, webdav, portfolio |
| |
|
| |
=back |
| |
|
| |
=item |
| |
requestcourses: ability to request courses, and how requests are processed. |
| |
|
| |
=over |
| |
|
| |
=item |
| |
official, unofficial, community, textbook |
| |
|
| |
=back |
| |
|
| |
=item |
| |
inststatus: types of institutional affiliation, and order in which they are displayed. |
| |
|
| |
=over |
| |
|
| |
=item |
| |
inststatustypes, inststatusorder, inststatusguest |
| |
|
| |
=back |
| |
|
| |
=item |
| |
coursedefaults: can PDF forms can be created, default credits for courses, default quotas (MB) |
| |
for course's uploaded content. |
| |
|
| |
=over |
| |
|
| |
=item |
| |
canuse_pdfforms, officialcredits, unofficialcredits, textbookcredits, officialquota, unofficialquota, |
| |
communityquota, textbookquota |
| |
|
| |
=back |
| |
|
| |
=item |
| |
usersessions: set options for hosting of your users in other domains, and hosting of users from other domains |
| |
on your servers. |
| |
|
| |
=over |
| |
|
| |
=item |
| |
remotesessions, hostedsessions |
| |
|
| |
=back |
| |
|
| |
=back |
| |
|
| |
In cases where a domain coordinator has never used the "Set Domain Configuration" |
| |
utility to create a configuration.db file on a domain's primary library server |
| |
only the following domain defaults: auth_def, auth_arg_def, lang_def |
| |
-- corresponding values are authentication type (internal, krb4, krb5, |
| |
or localauth), initial password or a kerberos realm, language (e.g., en-us) -- |
| |
will be available. Values are retrieved from cache (if current), unless the |
| |
optional $ignore_cache arg is true, or from domain's configuration.db (if available), |
| |
or lastly from values in lonTabs/dns_domain,tab, or lonTabs/domain.tab. |
| |
|
| |
Typical usage: |
| |
|
| |
%domdefaults = &get_domain_defaults($target_domain); |
| |
|
| =back |
=back |
| |
|
|
Line 9832 or lonTabs/domain.tab.
|
Line 15758 or lonTabs/domain.tab.
|
| |
|
| =item * |
=item * |
| |
|
| dirlist($uri) : return directory list based on URI |
dirlist() : return directory list based on URI (first arg). |
| |
|
| |
Inputs: 1 required, 5 optional. |
| |
|
| |
=over |
| |
|
| |
=item |
| |
$uri - path to file in filesystem (starts: /res or /userfiles/). Required. |
| |
|
| |
=item |
| |
$userdomain - domain of user/course to be listed. Extracted from $uri if absent. |
| |
|
| |
=item |
| |
$username - username of user/course to be listed. Extracted from $uri if absent. |
| |
|
| |
=item |
| |
$getpropath - boolean: 1 if prepend path using &propath(). |
| |
|
| |
=item |
| |
$getuserdir - boolean: 1 if prepend path for "userfiles". |
| |
|
| |
=item |
| |
$alternateRoot - path to prepend in place of path from $uri. |
| |
|
| |
=back |
| |
|
| |
Returns: Array of up to two items. |
| |
|
| |
=over |
| |
|
| |
a reference to an array of files/subdirectories |
| |
|
| |
=over |
| |
|
| |
Each element in the array of files/subdirectories is a & separated list of |
| |
item name and the result of running stat on the item. If dirlist was requested |
| |
for a file instead of a directory, the item name will be ''. For a directory |
| |
listing, if the item is a metadata file, the element will end &N&M |
| |
(where N amd M are either 0 or 1, corresponding to obsolete set (1), or |
| |
default copyright set (1). |
| |
|
| |
=back |
| |
|
| |
a scalar containing error condition (if encountered). |
| |
|
| |
=over |
| |
|
| |
=item |
| |
no_host (no homeserver identified for $username:$domain). |
| |
|
| |
=item |
| |
no_such_host (server contacted for listing not identified as valid host). |
| |
|
| |
=item |
| |
con_lost (connection to remote server failed). |
| |
|
| |
=item |
| |
refused (invalid $username:$domain received on lond side). |
| |
|
| |
=item |
| |
no_such_dir (directory at specified path on lond side does not exist). |
| |
|
| |
=item |
| |
empty (directory at specified path on lond side is empty). |
| |
|
| |
=over |
| |
|
| |
This is currently not encountered because the &ls3, &ls2, |
| |
&ls (_handler) routines on the lond side do not filter out |
| |
. and .. from a directory listing. |
| |
|
| |
=back |
| |
|
| |
=back |
| |
|
| |
=back |
| |
|
| =item * |
=item * |
| |
|
| spareserver() : find server with least workload from spare.tab |
spareserver() : find server with least workload from spare.tab |
| |
|
| |
|
| |
=item * |
| |
|
| |
host_from_dns($dns) : Returns the loncapa hostname corresponding to a DNS name or undef |
| |
if there is no corresponding loncapa host. |
| |
|
| =back |
=back |
| |
|
| |
|
| =head2 Apache Request |
=head2 Apache Request |
| |
|
| =over 4 |
=over 4 |
|
Line 9887 splitting on '&', supports elements that
|
Line 15895 splitting on '&', supports elements that
|
| |
|
| =head2 Logging Routines |
=head2 Logging Routines |
| |
|
| =over 4 |
|
| |
|
| These routines allow one to make log messages in the lonnet.log and |
These routines allow one to make log messages in the lonnet.log and |
| lonnet.perm logfiles. |
lonnet.perm logfiles. |
| |
|
| |
=over 4 |
| |
|
| =item * |
=item * |
| |
|
| logtouch() : make sure the logfile, lonnet.log, exists |
logtouch() : make sure the logfile, lonnet.log, exists |
|
Line 9907 logperm() : append a permanent message t
|
Line 15916 logperm() : append a permanent message t
|
| file never gets deleted by any automated portion of the system, only |
file never gets deleted by any automated portion of the system, only |
| messages of critical importance should go in here. |
messages of critical importance should go in here. |
| |
|
| |
|
| =back |
=back |
| |
|
| =head2 General File Helper Routines |
=head2 General File Helper Routines |
|
Line 9963 filelocation except for hrefs
|
Line 15973 filelocation except for hrefs
|
| |
|
| =item * |
=item * |
| |
|
| declutter() : declutters URLs (remove docroot, beginning slashes, 'res' etc) |
declutter() : declutters URLs -- remove beginning slashes, 'res' etc. |
| |
also removes beginning /home/httpd/html unless /priv/ follows it. |
| |
|
| =back |
=back |
| |
|
|
Line 9980 userfileupload(): main rotine for puttin
|
Line 15991 userfileupload(): main rotine for puttin
|
| filename, and the contents of the file to create/modifed exist |
filename, and the contents of the file to create/modifed exist |
| the filename is in $env{'form.'.$formname.'.filename'} and the |
the filename is in $env{'form.'.$formname.'.filename'} and the |
| contents of the file is located in $env{'form.'.$formname} |
contents of the file is located in $env{'form.'.$formname} |
| coursedoc - if true, store the file in the course of the active role |
context - if coursedoc, store the file in the course of the active role |
| of the current user |
of the current user; |
| |
if 'existingfile': store in 'overwrites' in /home/httpd/perl/tmp |
| |
if 'canceloverwrite': delete file in tmp/overwrites directory |
| subdir - required - subdirectory to put the file in under ../userfiles/ |
subdir - required - subdirectory to put the file in under ../userfiles/ |
| if undefined, it will be placed in "unknown" |
if undefined, it will be placed in "unknown" |
| |
|
|
Line 10003 returns: the new clean filename
|
Line 16016 returns: the new clean filename
|
| |
|
| =item * |
=item * |
| |
|
| finishuserfileupload(): routine that creaes and sends the file to |
finishuserfileupload(): routine that creates and sends the file to |
| userspace, probably shouldn't be called directly |
userspace, probably shouldn't be called directly |
| |
|
| docuname: username or courseid of destination for the file |
docuname: username or courseid of destination for the file |
| docudom: domain of user/course of destination for the file |
docudom: domain of user/course of destination for the file |
| formname: same as for userfileupload() |
formname: same as for userfileupload() |
| fname: filename (inculding 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. |
| |
if hashref, and context is scantron, will convert csv format to standard format |
| |
allfiles: reference to hash used to store 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 |
| |
thumbheight: height (pixels) of thumbnail to be created for uploaded image |
| |
resizewidth: width to be used to resize image using resizeImage from ImageMagick |
| |
resizeheight: height to be used to resize image using resizeImage from ImageMagick |
| |
context: if 'overwrite', will move the uploaded file from its temporary location to |
| |
userfiles to facilitate overwriting a previously uploaded file with same name. |
| |
mimetype: reference to scalar to accommodate mime type determined |
| |
from File::MMagic if $parser = parse. |
| |
|
| returns either the url of the uploaded file (/uploaded/....) if successful |
returns either the url of the uploaded file (/uploaded/....) if successful |
| and /adm/notfound.html if unsuccessful |
and /adm/notfound.html if unsuccessful (or an error message if context |
| |
was 'overwrite'). |
| |
|
| |
|
| =item * |
=item * |
| |
|
|
Line 10118 Internal notes:
|
Line 16145 Internal notes:
|
| |
|
| Locks on files (resulting from submission of portfolio file to a homework problem stored in array of arrays. |
Locks on files (resulting from submission of portfolio file to a homework problem stored in array of arrays. |
| |
|
| |
=item * |
| |
|
| modify_access_controls(): |
modify_access_controls(): |
| |
|
| Modifies access controls for a portfolio file |
Modifies access controls for a portfolio file |
|
Line 10135 Returns:
|
Line 16164 Returns:
|
| 3. reference to hash of any new or updated access controls. |
3. reference to hash of any new or updated access controls. |
| 4. reference to hash used to map incoming IDs to uniqueIDs assigned to control. |
4. reference to hash used to map incoming IDs to uniqueIDs assigned to control. |
| key = integer (inbound ID) |
key = integer (inbound ID) |
| value = uniqueID |
value = uniqueID |
| |
|
| |
=item * |
| |
|
| |
get_timebased_id(): |
| |
|
| |
Attempts to get a unique timestamp-based suffix for use with items added to a |
| |
course via the Course Editor (e.g., folders, composite pages, |
| |
group bulletin boards). |
| |
|
| |
Args: (first three required; six others optional) |
| |
|
| |
1. prefix (alphanumeric): of keys in hash, e.g., suppsequence, docspage, |
| |
docssequence, or name of group |
| |
|
| |
2. keyid (alphanumeric): name of temporary locking key in hash, |
| |
e.g., num, boardids |
| |
|
| |
3. namespace: name of gdbm file used to store suffixes already assigned; |
| |
file will be named nohist_namespace.db |
| |
|
| |
4. cdom: domain of course; default is current course domain from %env |
| |
|
| |
5. cnum: course number; default is current course number from %env |
| |
|
| |
6. idtype: set to concat if an additional digit is to be appended to the |
| |
unix timestamp to form the suffix, if the plain timestamp is already |
| |
in use. Default is to not do this, but simply increment the unix |
| |
timestamp by 1 until a unique key is obtained. |
| |
|
| |
7. who: holder of locking key; defaults to user:domain for user. |
| |
|
| |
8. locktries: number of attempts to obtain a lock (sleep of 1s before |
| |
retrying); default is 3. |
| |
|
| |
9. maxtries: number of attempts to obtain a unique suffix; default is 20. |
| |
|
| |
Returns: |
| |
|
| |
1. suffix obtained (numeric) |
| |
|
| |
2. result of deleting locking key (ok if deleted, or lock never obtained) |
| |
|
| |
3. error: contains (localized) error message if an error occurred. |
| |
|
| |
|
| =back |
=back |
| |
|
![[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