|
version 1.548, 2004/09/27 19:00:16
|
version 1.561, 2004/11/04 23:43:07
|
|
Line 39 qw(%perlvar %hostname %homecache %badSer
|
Line 39 qw(%perlvar %hostname %homecache %badSer
|
| %libserv %pr %prp %metacache %packagetab %titlecache %courseresversioncache %resversioncache |
%libserv %pr %prp %metacache %packagetab %titlecache %courseresversioncache %resversioncache |
| %courselogs %accesshash %userrolehash $processmarker $dumpcount |
%courselogs %accesshash %userrolehash $processmarker $dumpcount |
| %coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseresdatacache |
%coursedombuf %coursenumbuf %coursehombuf %coursedescrbuf %courseinstcodebuf %courseresdatacache |
| %userresdatacache %usectioncache %domaindescription %domain_auth_def %domain_auth_arg_def |
%userresdatacache %getsectioncache %domaindescription %domain_auth_def %domain_auth_arg_def |
| %domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir); |
%domain_lang_def %domain_city %domain_longi %domain_lati $tmpdir); |
| |
|
| use IO::Socket; |
use IO::Socket; |
|
Line 47 use GDBM_File;
|
Line 47 use GDBM_File;
|
| use Apache::Constants qw(:common :http); |
use Apache::Constants qw(:common :http); |
| use HTML::LCParser; |
use HTML::LCParser; |
| use Fcntl qw(:flock); |
use Fcntl qw(:flock); |
| use Apache::loncoursedata; |
|
| use Apache::lonlocal; |
use Apache::lonlocal; |
| use Storable qw(lock_store lock_nstore lock_retrieve freeze thaw); |
use Storable qw(lock_store lock_nstore lock_retrieve freeze thaw nfreeze); |
| use Time::HiRes qw( gettimeofday tv_interval ); |
use Time::HiRes qw( gettimeofday tv_interval ); |
| my $readit; |
my $readit; |
| |
my $max_connection_retries = 10; # Or some such value. |
| |
|
| =pod |
=pod |
| |
|
|
Line 116 sub logperm {
|
Line 116 sub logperm {
|
| sub subreply { |
sub subreply { |
| my ($cmd,$server)=@_; |
my ($cmd,$server)=@_; |
| my $peerfile="$perlvar{'lonSockDir'}/$server"; |
my $peerfile="$perlvar{'lonSockDir'}/$server"; |
| my $client=IO::Socket::UNIX->new(Peer =>"$peerfile", |
# |
| Type => SOCK_STREAM, |
# With loncnew process trimming, there's a timing hole between lonc server |
| Timeout => 10) |
# process exit and the master server picking up the listen on the AF_UNIX |
| or return "con_lost"; |
# socket. In that time interval, a lock file will exist: |
| print $client "$cmd\n"; |
|
| my $answer=<$client>; |
my $lockfile=$peerfile.".lock"; |
| if (!$answer) { $answer="con_lost"; } |
while (-e $lockfile) { # Need to wait for the lockfile to disappear. |
| chomp($answer); |
sleep(1); |
| |
} |
| |
# 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. |
| |
# |
| |
# We'll give the connection a few tries before abandoning it. If |
| |
# connection is not possible, we'll con_lost back to the client. |
| |
# |
| |
my $client; |
| |
for (my $retries = 0; $retries < $max_connection_retries; $retries++) { |
| |
$client=IO::Socket::UNIX->new(Peer =>"$peerfile", |
| |
Type => SOCK_STREAM, |
| |
Timeout => 10); |
| |
if($client) { |
| |
last; # Connected! |
| |
} |
| |
sleep(1); # Try again later if failed connection. |
| |
} |
| |
my $answer; |
| |
if ($client) { |
| |
print $client "$cmd\n"; |
| |
$answer=<$client>; |
| |
if (!$answer) { $answer="con_lost"; } |
| |
chomp($answer); |
| |
} else { |
| |
$answer = 'con_lost'; # Failed connection. |
| |
} |
| return $answer; |
return $answer; |
| } |
} |
| |
|
|
Line 434 sub overloaderror {
|
Line 460 sub overloaderror {
|
| if ($overload>0) { |
if ($overload>0) { |
| $r->err_headers_out->{'Retry-After'}=$overload; |
$r->err_headers_out->{'Retry-After'}=$overload; |
| $r->log_error('Overload of '.$overload.' on '.$checkserver); |
$r->log_error('Overload of '.$overload.' on '.$checkserver); |
| return 409; |
return 413; |
| } |
} |
| return ''; |
return ''; |
| } |
} |
|
Line 771 sub getsection {
|
Line 797 sub getsection {
|
| my ($udom,$unam,$courseid)=@_; |
my ($udom,$unam,$courseid)=@_; |
| $courseid=~s/\_/\//g; |
$courseid=~s/\_/\//g; |
| $courseid=~s/^(\w)/\/$1/; |
$courseid=~s/^(\w)/\/$1/; |
| |
|
| |
my $hashid="$udom:$unam:$courseid"; |
| |
my ($result,$cached)=&is_cached(\%getsectioncache,$hashid,'getsection'); |
| |
if (defined($cached)) { return $result; } |
| |
|
| my %Pending; |
my %Pending; |
| my %Expired; |
my %Expired; |
| # |
# |
|
Line 803 sub getsection {
|
Line 834 sub getsection {
|
| $Pending{$start}=$section; |
$Pending{$start}=$section; |
| next; |
next; |
| } |
} |
| return $section; |
return &do_cache(\%getsectioncache,$hashid,$section,'getsection'); |
| } |
} |
| # |
# |
| # Presumedly there will be few matching roles from the above |
# Presumedly there will be few matching roles from the above |
| # loop and the sorting time will be negligible. |
# loop and the sorting time will be negligible. |
| if (scalar(keys(%Pending))) { |
if (scalar(keys(%Pending))) { |
| my ($time) = sort {$a <=> $b} keys(%Pending); |
my ($time) = sort {$a <=> $b} keys(%Pending); |
| return $Pending{$time}; |
return &do_cache(\%getsectioncache,$hashid,$Pending{$time},'getsection'); |
| } |
} |
| if (scalar(keys(%Expired))) { |
if (scalar(keys(%Expired))) { |
| my @sorted = sort {$a <=> $b} keys(%Expired); |
my @sorted = sort {$a <=> $b} keys(%Expired); |
| my $time = pop(@sorted); |
my $time = pop(@sorted); |
| return $Expired{$time}; |
return &do_cache(\%getsectioncache,$hashid,$Expired{$time},'getsection'); |
| } |
} |
| return '-1'; |
return &do_cache(\%getsectioncache,$hashid,'-1','getsection'); |
| } |
} |
| |
|
| |
|
| my $disk_caching_disabled=0; |
my $disk_caching_disabled=1; |
| |
|
| sub devalidate_cache { |
sub devalidate_cache { |
| my ($cache,$id,$name) = @_; |
my ($cache,$id,$name) = @_; |
|
Line 1008 EVALBLOCK
|
Line 1039 EVALBLOCK
|
| # &logthis("load_cache_item $name took ".(&Time::HiRes::time()-$starttime)); |
# &logthis("load_cache_item $name took ".(&Time::HiRes::time()-$starttime)); |
| } |
} |
| |
|
| sub usection { |
|
| my ($udom,$unam,$courseid)=@_; |
|
| my $hashid="$udom:$unam:$courseid"; |
|
| |
|
| my ($result,$cached)=&is_cached(\%usectioncache,$hashid,'usection'); |
|
| if (defined($cached)) { return $result; } |
|
| $courseid=~s/\_/\//g; |
|
| $courseid=~s/^(\w)/\/$1/; |
|
| foreach (split(/\&/,&reply('dump:'.$udom.':'.$unam.':roles', |
|
| &homeserver($unam,$udom)))) { |
|
| my ($key,$value)=split(/\=/,$_); |
|
| $key=&unescape($key); |
|
| if ($key=~/^\Q$courseid\E(?:\/)*(\w+)*\_st$/) { |
|
| my $section=$1; |
|
| if ($key eq $courseid.'_st') { $section=''; } |
|
| my ($dummy,$end,$start)=split(/\_/,&unescape($value)); |
|
| my $now=time; |
|
| my $notactive=0; |
|
| if ($start) { |
|
| if ($now<$start) { $notactive=1; } |
|
| } |
|
| if ($end) { |
|
| if ($now>$end) { $notactive=1; } |
|
| } |
|
| unless ($notactive) { |
|
| return &do_cache(\%usectioncache,$hashid,$section,'usection'); |
|
| } |
|
| } |
|
| } |
|
| return &do_cache(\%usectioncache,$hashid,'-1','usection'); |
|
| } |
|
| |
|
| # ------------------------------------- Read an entry from a user's environment |
# ------------------------------------- Read an entry from a user's environment |
| |
|
| sub userenvironment { |
sub userenvironment { |
|
Line 1873 sub devalidate {
|
Line 1872 sub devalidate {
|
| # - the student level sheet of this user in course's homespace |
# - the student level sheet of this user in course's homespace |
| # - the assessment level sheet for this resource |
# - the assessment level sheet for this resource |
| # for this user in user's homespace |
# for this user in user's homespace |
| |
# - current conditional state info |
| my $key=$uname.':'.$udom.':'; |
my $key=$uname.':'.$udom.':'; |
| my $status= |
my $status= |
| &del('nohist_calculatedsheets', |
&del('nohist_calculatedsheets', |
|
Line 1887 sub devalidate {
|
Line 1887 sub devalidate {
|
| $uname.' at '.$udom.' for '. |
$uname.' at '.$udom.' for '. |
| $symb.': '.$status); |
$symb.': '.$status); |
| } |
} |
| |
&delenv('user.state.'.$cid); |
| } |
} |
| } |
} |
| |
|
|
Line 2468 sub rolesinit {
|
Line 2469 sub rolesinit {
|
| my $author=0; |
my $author=0; |
| foreach (keys %allroles) { |
foreach (keys %allroles) { |
| %thesepriv=(); |
%thesepriv=(); |
| if (($_!~/^st/) && ($_!~/^ta/) && ($_!~/^cm/)) { $adv=1; } |
|
| if (($_=~/^au/) || ($_=~/^ca/)) { $author=1; } |
if (($_=~/^au/) || ($_=~/^ca/)) { $author=1; } |
| foreach (split(/:/,$allroles{$_})) { |
foreach (split(/:/,$allroles{$_})) { |
| if ($_ ne '') { |
if ($_ ne '') { |
|
Line 2480 sub rolesinit {
|
Line 2480 sub rolesinit {
|
| $thesepriv{$privilege}.=$restrictions; |
$thesepriv{$privilege}.=$restrictions; |
| } |
} |
| } |
} |
| |
if ($thesepriv{'adv'} eq 'F') { $adv=1; } |
| } |
} |
| } |
} |
| $thesestr=''; |
$thesestr=''; |
|
Line 2514 sub get {
|
Line 2515 sub get {
|
| my %returnhash=(); |
my %returnhash=(); |
| my $i=0; |
my $i=0; |
| foreach (@$storearr) { |
foreach (@$storearr) { |
| $returnhash{$_}=unescape($pairs[$i]); |
$returnhash{$_}=&thaw_unescape($pairs[$i]); |
| $i++; |
$i++; |
| } |
} |
| return %returnhash; |
return %returnhash; |
|
Line 2553 sub dump {
|
Line 2554 sub dump {
|
| my %returnhash=(); |
my %returnhash=(); |
| foreach (@pairs) { |
foreach (@pairs) { |
| my ($key,$value)=split(/=/,$_); |
my ($key,$value)=split(/=/,$_); |
| $returnhash{unescape($key)}=unescape($value); |
$returnhash{unescape($key)}=&thaw_unescape($value); |
| } |
} |
| return %returnhash; |
return %returnhash; |
| } |
} |
|
Line 2599 sub currentdump {
|
Line 2600 sub currentdump {
|
| my ($key,$value)=split(/=/,$_); |
my ($key,$value)=split(/=/,$_); |
| my ($symb,$param) = split(/:/,$key); |
my ($symb,$param) = split(/:/,$key); |
| $returnhash{&unescape($symb)}->{&unescape($param)} = |
$returnhash{&unescape($symb)}->{&unescape($param)} = |
| &unescape($value); |
&thaw_unescape($value); |
| } |
} |
| } |
} |
| return %returnhash; |
return %returnhash; |
|
Line 2665 sub put {
|
Line 2666 sub put {
|
| my $uhome=&homeserver($uname,$udomain); |
my $uhome=&homeserver($uname,$udomain); |
| my $items=''; |
my $items=''; |
| foreach (keys %$storehash) { |
foreach (keys %$storehash) { |
| $items.=&escape($_).'='.&escape($$storehash{$_}).'&'; |
$items.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&'; |
| } |
} |
| $items=~s/\&$//; |
$items=~s/\&$//; |
| return &reply("put:$udomain:$uname:$namespace:$items",$uhome); |
return &reply("put:$udomain:$uname:$namespace:$items",$uhome); |
|
Line 2704 sub cput {
|
Line 2705 sub cput {
|
| my $uhome=&homeserver($uname,$udomain); |
my $uhome=&homeserver($uname,$udomain); |
| my $items=''; |
my $items=''; |
| foreach (keys %$storehash) { |
foreach (keys %$storehash) { |
| $items.=escape($_).'='.escape($$storehash{$_}).'&'; |
$items.=escape($_).'='.&freeze_escape($$storehash{$_}).'&'; |
| } |
} |
| $items=~s/\&$//; |
$items=~s/\&$//; |
| return &critical("put:$udomain:$uname:$namespace:$items",$uhome); |
return &critical("put:$udomain:$uname:$namespace:$items",$uhome); |
|
Line 2727 sub eget {
|
Line 2728 sub eget {
|
| my %returnhash=(); |
my %returnhash=(); |
| my $i=0; |
my $i=0; |
| foreach (@$storearr) { |
foreach (@$storearr) { |
| $returnhash{$_}=unescape($pairs[$i]); |
$returnhash{$_}=&thaw_unescape($pairs[$i]); |
| $i++; |
$i++; |
| } |
} |
| return %returnhash; |
return %returnhash; |
|
Line 3626 sub modify_student_enrollment {
|
Line 3627 sub modify_student_enrollment {
|
| $gene = $tmp{'generation'} if (!defined($gene) || $gene eq ''); |
$gene = $tmp{'generation'} if (!defined($gene) || $gene eq ''); |
| $uid = $tmp{'id'} if (!defined($uid) || $uid eq ''); |
$uid = $tmp{'id'} if (!defined($uid) || $uid eq ''); |
| } |
} |
| my $fullname = &Apache::loncoursedata::ProcessFullName($last,$gene, |
my $fullname = &format_name($first,$middle,$last,$gene,'lastname'); |
| $first,$middle); |
|
| my $reply=cput('classlist', |
my $reply=cput('classlist', |
| {"$uname:$udom" => |
{"$uname:$udom" => |
| join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype) }, |
join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype) }, |
|
Line 3644 sub modify_student_enrollment {
|
Line 3644 sub modify_student_enrollment {
|
| return &assignrole($udom,$uname,$uurl,'st',$end,$start); |
return &assignrole($udom,$uname,$uurl,'st',$end,$start); |
| } |
} |
| |
|
| |
sub format_name { |
| |
my ($firstname,$middlename,$lastname,$generation,$first)=@_; |
| |
my $name; |
| |
if ($first ne 'lastname') { |
| |
$name=$firstname.' '.$middlename.' '.$lastname.' '.$generation; |
| |
} else { |
| |
if ($lastname=~/\S/) { |
| |
$name.= $lastname.' '.$generation.', '.$firstname.' '.$middlename; |
| |
$name=~s/\s+,/,/; |
| |
} else { |
| |
$name.= $firstname.' '.$middlename.' '.$generation; |
| |
} |
| |
} |
| |
$name=~s/^\s+//; |
| |
$name=~s/\s+$//; |
| |
$name=~s/\s+/ /g; |
| |
return $name; |
| |
} |
| |
|
| # ------------------------------------------------- Write to course preferences |
# ------------------------------------------------- Write to course preferences |
| |
|
| sub writecoursepref { |
sub writecoursepref { |
|
Line 3762 sub diskusage {
|
Line 3781 sub diskusage {
|
| return $listing; |
return $listing; |
| } |
} |
| |
|
| |
# ------------------------------------------------------------- Mark as Read Only |
| |
|
| |
sub mark_as_readonly { |
| |
my ($domain,$user,$files,$what) = @_; |
| |
my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user); |
| |
foreach my $file (@{$files}) { |
| |
push(@{$current_permissions{$file}},$what); |
| |
} |
| |
&Apache::lonnet::put('file_permissions',\%current_permissions,$domain,$user); |
| |
return; |
| |
} |
| |
|
| |
#--------------------------------------------------------------Get Marked as Read Only |
| |
|
| |
sub get_marked_as_readonly { |
| |
my ($domain,$user,$what) = @_; |
| |
my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user); |
| |
my @readonly_files = []; |
| |
while ((my $file_name, my $value) = each %current_permissions) { |
| |
if (ref($value) eq "ARRAY"){ |
| |
foreach my $stored_what (@{$value}) { |
| |
if ($stored_what eq $what) { |
| |
push(@readonly_files, $file_name); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return @readonly_files; |
| |
} |
| |
|
| |
# ------------------------------------------------------------ Unmark as Read Only |
| |
|
| |
sub unmark_as_readonly { |
| |
# unmarks all files locked by $what |
| |
# for portfolio submissions, $what contains $crsid and $symb |
| |
my ($domain,$user,$what) = @_; |
| |
my %current_permissions = &Apache::lonnet::dump('file_permissions',$domain,$user); |
| |
my @readonly_files = &Apache::lonnet::get_marked_as_readonly($domain,$user,$what); |
| |
foreach my $file(@readonly_files){ |
| |
|
| |
} |
| |
&Apache::lonnet::put('file_permissions',\%current_permissions,$domain,$user); |
| |
return; |
| |
} |
| |
|
| # ------------------------------------------------------------ Directory lister |
# ------------------------------------------------------------ Directory lister |
| |
|
|
Line 3871 sub GetFileTimestamp {
|
Line 3934 sub GetFileTimestamp {
|
| |
|
| sub directcondval { |
sub directcondval { |
| my $number=shift; |
my $number=shift; |
| |
if (!defined($ENV{'user.state.'.$ENV{'request.course.id'}})) { |
| |
&Apache::lonuserstate::evalstate(); |
| |
} |
| if ($ENV{'user.state.'.$ENV{'request.course.id'}}) { |
if ($ENV{'user.state.'.$ENV{'request.course.id'}}) { |
| return substr($ENV{'user.state.'.$ENV{'request.course.id'}},$number,1); |
return substr($ENV{'user.state.'.$ENV{'request.course.id'}},$number,1); |
| } else { |
} else { |
|
Line 4115 sub EXT {
|
Line 4181 sub EXT {
|
| $section=$ENV{'request.course.sec'}; |
$section=$ENV{'request.course.sec'}; |
| } else { |
} else { |
| if (! defined($usection)) { |
if (! defined($usection)) { |
| $section=&usection($udom,$uname,$courseid); |
$section=&getsection($udom,$uname,$courseid); |
| } else { |
} else { |
| $section = $usection; |
$section = $usection; |
| } |
} |
|
Line 5091 sub repcopy_userfile {
|
Line 5157 sub repcopy_userfile {
|
| |
|
| sub tokenwrapper { |
sub tokenwrapper { |
| my $uri=shift; |
my $uri=shift; |
| $uri=~s/^http\:\/\/([^\/]+)//; |
$uri=~s|^http\://([^/]+)||; |
| $uri=~s/^\///; |
$uri=~s|^/||; |
| $ENV{'user.environment'}=~/\/([^\/]+)\.id/; |
$ENV{'user.environment'}=~/\/([^\/]+)\.id/; |
| my $token=$1; |
my $token=$1; |
| if ($uri=~/^uploaded\/([^\/]+)\/([^\/]+)\/([^\/]+)(\?\.*)*$/) { |
my (undef,$udom,$uname,$file)=split('/',$uri,4); |
| &appenv('userfile.'.$1.'/'.$2.'/'.$3 => $ENV{'request.course.id'}); |
if ($udom && $uname && $file) { |
| return 'http://'.$hostname{ &homeserver($2,$1)}.'/'.$uri. |
$file=~s|(\?\.*)*$||; |
| |
&appenv("userfile.$udom/$uname/$file" => $ENV{'request.course.id'}); |
| |
return 'http://'.$hostname{ &homeserver($uname,$udom)}.'/'.$uri. |
| (($uri=~/\?/)?'&':'?').'token='.$token. |
(($uri=~/\?/)?'&':'?').'token='.$token. |
| '&tokenissued='.$perlvar{'lonHostID'}; |
'&tokenissued='.$perlvar{'lonHostID'}; |
| } else { |
} else { |
|
Line 5230 sub clutter {
|
Line 5298 sub clutter {
|
| return $thisfn; |
return $thisfn; |
| } |
} |
| |
|
| |
sub freeze_escape { |
| |
my ($value)=@_; |
| |
if (ref($value)) { |
| |
$value=&nfreeze($value); |
| |
return '__FROZEN__'.&escape($value); |
| |
} |
| |
return &escape($value); |
| |
} |
| |
|
| # -------------------------------------------------------- Escape Special Chars |
# -------------------------------------------------------- Escape Special Chars |
| |
|
| sub escape { |
sub escape { |
|
Line 5246 sub unescape {
|
Line 5323 sub unescape {
|
| return $str; |
return $str; |
| } |
} |
| |
|
| |
sub thaw_unescape { |
| |
my ($value)=@_; |
| |
if ($value =~ /^__FROZEN__/) { |
| |
substr($value,0,10,undef); |
| |
$value=&unescape($value); |
| |
return &thaw($value); |
| |
} |
| |
return &unescape($value); |
| |
} |
| |
|
| sub mod_perl_version { |
sub mod_perl_version { |
| if (defined($perlvar{'MODPERL2'})) { |
if (defined($perlvar{'MODPERL2'})) { |
| return 2; |
return 2; |
|
Line 5271 sub goodbye {
|
Line 5358 sub goodbye {
|
| &logthis(sprintf("%-20s is %s",'%courseresdatacache',scalar(%courseresdatacache))); |
&logthis(sprintf("%-20s is %s",'%courseresdatacache',scalar(%courseresdatacache))); |
| #1.1 only |
#1.1 only |
| &logthis(sprintf("%-20s is %s",'%userresdatacache',scalar(%userresdatacache))); |
&logthis(sprintf("%-20s is %s",'%userresdatacache',scalar(%userresdatacache))); |
| &logthis(sprintf("%-20s is %s",'%usectioncache',scalar(%usectioncache))); |
&logthis(sprintf("%-20s is %s",'%getsectioncache',scalar(%getsectioncache))); |
| &logthis(sprintf("%-20s is %s",'%courseresversioncache',scalar(%courseresversioncache))); |
&logthis(sprintf("%-20s is %s",'%courseresversioncache',scalar(%courseresversioncache))); |
| &logthis(sprintf("%-20s is %s",'%resversioncache',scalar(%resversioncache))); |
&logthis(sprintf("%-20s is %s",'%resversioncache',scalar(%resversioncache))); |
| &flushcourselogs(); |
&flushcourselogs(); |
|
Line 5653 X<rolesinit()>
|
Line 5740 X<rolesinit()>
|
| B<rolesinit($udom,$username,$authhost)>: get user privileges |
B<rolesinit($udom,$username,$authhost)>: get user privileges |
| |
|
| =item * |
=item * |
| X<usection()> |
X<getsection()> |
| B<usection($udom,$uname,$cname)>: finds the section of student in the |
B<getsection($udom,$uname,$cname)>: finds the section of student in the |
| course $cname, return section name/number or '' for "not in course" |
course $cname, return section name/number or '' for "not in course" |
| and '-1' for "no section" |
and '-1' for "no section" |
| |
|
![[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