|
version 1.1172.2.94, 2018/04/29 00:53:23
|
version 1.1172.2.101, 2018/09/22 03:11:40
|
|
Line 142 our @EXPORT = qw(%env);
|
Line 142 our @EXPORT = qw(%env);
|
| sub logtouch { |
sub logtouch { |
| my $execdir=$perlvar{'lonDaemons'}; |
my $execdir=$perlvar{'lonDaemons'}; |
| unless (-e "$execdir/logs/lonnet.log") { |
unless (-e "$execdir/logs/lonnet.log") { |
| open(my $fh,">>$execdir/logs/lonnet.log"); |
open(my $fh,">>","$execdir/logs/lonnet.log"); |
| close $fh; |
close $fh; |
| } |
} |
| my ($wwwuid,$wwwgid)=(getpwnam('www'))[2,3]; |
my ($wwwuid,$wwwgid)=(getpwnam('www'))[2,3]; |
|
Line 154 sub logthis {
|
Line 154 sub logthis {
|
| my $execdir=$perlvar{'lonDaemons'}; |
my $execdir=$perlvar{'lonDaemons'}; |
| my $now=time; |
my $now=time; |
| my $local=localtime($now); |
my $local=localtime($now); |
| if (open(my $fh,">>$execdir/logs/lonnet.log")) { |
if (open(my $fh,">>","$execdir/logs/lonnet.log")) { |
| my $logstring = $local. " ($$): ".$message."\n"; # Keep any \'s in string. |
my $logstring = $local. " ($$): ".$message."\n"; # Keep any \'s in string. |
| print $fh $logstring; |
print $fh $logstring; |
| close($fh); |
close($fh); |
|
Line 167 sub logperm {
|
Line 167 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 436 sub reconlonc {
|
Line 436 sub reconlonc {
|
| |
|
| &logthis("Trying to reconnect lonc"); |
&logthis("Trying to reconnect lonc"); |
| my $loncfile="$perlvar{'lonDaemons'}/logs/lonc.pid"; |
my $loncfile="$perlvar{'lonDaemons'}/logs/lonc.pid"; |
| if (open(my $fh,"<$loncfile")) { |
if (open(my $fh,"<",$loncfile)) { |
| my $loncpid=<$fh>; |
my $loncpid=<$fh>; |
| chomp($loncpid); |
chomp($loncpid); |
| if (kill 0 => $loncpid) { |
if (kill 0 => $loncpid) { |
|
Line 476 sub critical {
|
Line 476 sub critical {
|
| $dumpcount++; |
$dumpcount++; |
| { |
{ |
| my $dfh; |
my $dfh; |
| if (open($dfh,">$dfilename")) { |
if (open($dfh,">",$dfilename)) { |
| print $dfh "$cmd\n"; |
print $dfh "$cmd\n"; |
| close($dfh); |
close($dfh); |
| } |
} |
|
Line 485 sub critical {
|
Line 485 sub critical {
|
| my $wcmd=''; |
my $wcmd=''; |
| { |
{ |
| my $dfh; |
my $dfh; |
| if (open($dfh,"<$dfilename")) { |
if (open($dfh,"<",$dfilename)) { |
| $wcmd=<$dfh>; |
$wcmd=<$dfh>; |
| close($dfh); |
close($dfh); |
| } |
} |
|
Line 601 sub transfer_profile_to_env {
|
Line 601 sub transfer_profile_to_env {
|
| |
|
| # ---------------------------------------------------- Check for valid session |
# ---------------------------------------------------- Check for valid session |
| sub check_for_valid_session { |
sub check_for_valid_session { |
| my ($r,$name,$userhashref) = @_; |
my ($r,$name,$userhashref,$domref) = @_; |
| my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); |
my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); |
| if ($name eq '') { |
if ($name eq '') { |
| $name = 'lonID'; |
$name = 'lonID'; |
|
Line 616 sub check_for_valid_session {
|
Line 616 sub check_for_valid_session {
|
| } else { |
} else { |
| $lonidsdir=$r->dir_config('lonIDsDir'); |
$lonidsdir=$r->dir_config('lonIDsDir'); |
| } |
} |
| return undef if (!-e "$lonidsdir/$handle.id"); |
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 686 sub appenv {
|
Line 695 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 1829 sub inst_directory_query {
|
Line 1841 sub inst_directory_query {
|
| &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('institutional 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 2828 sub absolute_url {
|
Line 2840 sub absolute_url {
|
| sub ssi { |
sub ssi { |
| |
|
| my ($fn,%form)=@_; |
my ($fn,%form)=@_; |
| my $ua=new LWP::UserAgent; |
my ($request,$response); |
| my $request; |
|
| |
|
| $form{'no_update_last_known'}=1; |
$form{'no_update_last_known'}=1; |
| &Apache::lonenc::check_encrypt(\$fn); |
&Apache::lonenc::check_encrypt(\$fn); |
|
Line 2846 sub ssi {
|
Line 2857 sub ssi {
|
| } |
} |
| |
|
| $request->header(Cookie => $ENV{'HTTP_COOKIE'}); |
$request->header(Cookie => $ENV{'HTTP_COOKIE'}); |
| my $response= $ua->request($request); |
|
| |
if (($env{'request.course.id'}) && |
| |
($form{'grade_courseid'} eq $env{'request.course.id'}) && |
| |
($form{'grade_username'} ne '') && ($form{'grade_domain'} ne '') && |
| |
($form{'grade_symb'} ne '') && |
| |
(&Apache::lonnet::allowed('mgr',$env{'request.course.id'}. |
| |
($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:'')))) { |
| |
if (LWP::UserAgent->VERSION >= 5.834) { |
| |
my $ua=new LWP::UserAgent; |
| |
$ua->local_address('127.0.0.1'); |
| |
$response = $ua->request($request); |
| |
} else { |
| |
{ |
| |
require LWP::Protocol::http; |
| |
local @LWP::Protocol::http::EXTRA_SOCK_OPTS = (LocalAddr => '127.0.0.1'); |
| |
my $ua=new LWP::UserAgent; |
| |
$response = $ua->request($request); |
| |
@LWP::Protocol::http::EXTRA_SOCK_OPTS = (); |
| |
} |
| |
} |
| |
} else { |
| |
my $ua=new LWP::UserAgent; |
| |
$response = $ua->request($request); |
| |
} |
| if (wantarray) { |
if (wantarray) { |
| return ($response->content, $response); |
return ($response->content, $response); |
| } else { |
} else { |
|
Line 2866 sub externalssi {
|
Line 2900 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 $ua=new LWP::UserAgent; |
| |
$ua->timeout(5); |
| |
my $protocol = $protocol{$homeserver}; |
| |
$protocol = 'http' if ($protocol ne 'https'); |
| |
my $hostname = &hostname($homeserver); |
| |
if ($hostname) { |
| |
my $uri = $protocol.'://'.$hostname.'/raw/'.&declutter($url); |
| |
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) { |
| |
unlink($fname); |
| |
if ($uri!~/\.meta$/) { |
| |
unlink($fname.'.meta'); |
| |
} |
| |
&reply("unsub:$fname",$homeserver); |
| |
$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 3194 sub process_coursefile {
|
Line 3294 sub process_coursefile {
|
| $home); |
$home); |
| } |
} |
| } elsif ($action eq 'uploaddoc') { |
} elsif ($action eq 'uploaddoc') { |
| open(my $fh,'>'.$filepath.'/'.$fname); |
open(my $fh,'>',$filepath.'/'.$fname); |
| print $fh $env{'form.'.$source}; |
print $fh $env{'form.'.$source}; |
| close($fh); |
close($fh); |
| if ($parser eq 'parse') { |
if ($parser eq 'parse') { |
|
Line 3252 sub store_edited_file {
|
Line 3352 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 3368 sub userfileupload {
|
Line 3468 sub userfileupload {
|
| '_'.$env{'user.domain'}.'/pending'; |
'_'.$env{'user.domain'}.'/pending'; |
| } elsif (($context eq 'existingfile') || ($context eq 'canceloverwrite')) { |
} elsif (($context eq 'existingfile') || ($context eq 'canceloverwrite')) { |
| my ($docuname,$docudom); |
my ($docuname,$docudom); |
| if ($destudom) { |
if ($destudom =~ /^$match_domain$/) { |
| $docudom = $destudom; |
$docudom = $destudom; |
| } else { |
} else { |
| $docudom = $env{'user.domain'}; |
$docudom = $env{'user.domain'}; |
| } |
} |
| if ($destuname) { |
if ($destuname =~ /^$match_username$/) { |
| $docuname = $destuname; |
$docuname = $destuname; |
| } else { |
} else { |
| $docuname = $env{'user.name'}; |
$docuname = $env{'user.name'}; |
|
Line 3403 sub userfileupload {
|
Line 3503 sub userfileupload {
|
| mkdir($fullpath,0777); |
mkdir($fullpath,0777); |
| } |
} |
| } |
} |
| open(my $fh,'>'.$fullpath.'/'.$fname); |
open(my $fh,'>',$fullpath.'/'.$fname); |
| print $fh $env{'form.'.$formname}; |
print $fh $env{'form.'.$formname}; |
| close($fh); |
close($fh); |
| if ($context eq 'existingfile') { |
if ($context eq 'existingfile') { |
|
Line 3478 sub finishuserfileupload {
|
Line 3578 sub finishuserfileupload {
|
| |
|
| # Save the file |
# Save the file |
| { |
{ |
| if (!open(FH,'>'.$filepath.'/'.$file)) { |
if (!open(FH,'>',$filepath.'/'.$file)) { |
| &logthis('Failed to create '.$filepath.'/'.$file); |
&logthis('Failed to create '.$filepath.'/'.$file); |
| print STDERR ('Failed to create '.$filepath.'/'.$file."\n"); |
print STDERR ('Failed to create '.$filepath.'/'.$file."\n"); |
| return '/adm/notfound.html'; |
return '/adm/notfound.html'; |
|
Line 3536 sub finishuserfileupload {
|
Line 3636 sub finishuserfileupload {
|
| 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 4496 sub postannounce {
|
Line 4597 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 4805 sub set_first_access {
|
Line 4906 sub set_first_access {
|
| 'course.'.$courseid.'.timerinterval.'.$res => $interval, |
'course.'.$courseid.'.timerinterval.'.$res => $interval, |
| } |
} |
| ); |
); |
| |
if (($cachedtime) && (abs($start-$cachedtime) < 5)) { |
| |
$cachedtimes{"$courseid\0$res"} = $start; |
| |
} |
| } |
} |
| return $putres; |
return $putres; |
| } |
} |
|
Line 8113 sub fetch_enrollment_query {
|
Line 8217 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 8142 sub get_query_reply {
|
Line 8246 sub get_query_reply {
|
| for (1..$loopmax) { |
for (1..$loopmax) { |
| sleep($sleep); |
sleep($sleep); |
| if (-e $replyfile.'.end') { |
if (-e $replyfile.'.end') { |
| if (open(my $fh,$replyfile)) { |
if (open(my $fh,"<",$replyfile)) { |
| $reply = join('',<$fh>); |
$reply = join('',<$fh>); |
| close($fh); |
close($fh); |
| } else { return 'error: reply_file_error'; } |
} else { return 'error: reply_file_error'; } |
|
Line 9652 sub generate_coursenum {
|
Line 9756 sub generate_coursenum {
|
| sub is_course { |
sub is_course { |
| my ($cdom, $cnum) = scalar(@_) == 1 ? |
my ($cdom, $cnum) = scalar(@_) == 1 ? |
| ($_[0] =~ /^($match_domain)_($match_courseid)$/) : @_; |
($_[0] =~ /^($match_domain)_($match_courseid)$/) : @_; |
| |
return unless (($cdom =~ /^$match_domain$/) && ($cnum =~ /^$match_courseid$/)); |
| return unless $cdom and $cnum; |
my $uhome=&homeserver($cnum,$cdom); |
| |
my $iscourse; |
| my %courses = &courseiddump($cdom, '.', 1, '.', '.', $cnum, undef, undef, |
if (grep { $_ eq $uhome } current_machine_ids()) { |
| '.'); |
$iscourse = &LONCAPA::Lond::is_course($cdom,$cnum); |
| |
} else { |
| return unless(exists($courses{$cdom.'_'.$cnum})); |
my $hashid = $cdom.':'.$cnum; |
| |
($iscourse,my $cached) = &is_cached_new('iscourse',$hashid); |
| |
unless (defined($cached)) { |
| |
my %courses = &courseiddump($cdom, '.', 1, '.', '.', |
| |
$cnum,undef,undef,'.'); |
| |
$iscourse = 0; |
| |
if (exists($courses{$cdom.'_'.$cnum})) { |
| |
$iscourse = 1; |
| |
} |
| |
&do_cache_new('iscourse',$hashid,$iscourse,3600); |
| |
} |
| |
} |
| |
return unless($iscourse); |
| return wantarray ? ($cdom, $cnum) : $cdom.'_'.$cnum; |
return wantarray ? ($cdom, $cnum) : $cdom.'_'.$cnum; |
| } |
} |
| |
|
|
Line 9794 sub save_selected_files {
|
Line 9910 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 9808 sub save_selected_files {
|
Line 9924 sub save_selected_files {
|
| sub clear_selected_files { |
sub clear_selected_files { |
| my ($user) = @_; |
my ($user) = @_; |
| my $filename = $user."savedfiles"; |
my $filename = $user."savedfiles"; |
| open (OUT, '>'.LONCAPA::tempdir().$filename); |
open (OUT,'>',LONCAPA::tempdir().$filename); |
| print (OUT undef); |
print (OUT undef); |
| close (OUT); |
close (OUT); |
| return ("ok"); |
return ("ok"); |
|
Line 9818 sub files_in_path {
|
Line 9934 sub files_in_path {
|
| my ($user, $path) = @_; |
my ($user, $path) = @_; |
| my $filename = $user."savedfiles"; |
my $filename = $user."savedfiles"; |
| my %return_files; |
my %return_files; |
| open (IN, '<'.LONCAPA::tempdir().$filename); |
open (IN,'<',LONCAPA::tempdir().$filename); |
| while (my $line_in = <IN>) { |
while (my $line_in = <IN>) { |
| chomp ($line_in); |
chomp ($line_in); |
| my @paths_and_file = split (m!/!, $line_in); |
my @paths_and_file = split (m!/!, $line_in); |
|
Line 9840 sub files_not_in_path {
|
Line 9956 sub files_not_in_path {
|
| my $filename = $user."savedfiles"; |
my $filename = $user."savedfiles"; |
| my @return_files; |
my @return_files; |
| my $path_part; |
my $path_part; |
| open(IN, '<'.LONCAPA::.$filename); |
open(IN, '<',LONCAPA::tempdir().$filename); |
| while (my $line = <IN>) { |
while (my $line = <IN>) { |
| #ok, I know it's clunky, but I want it to work |
#ok, I know it's clunky, but I want it to work |
| my @paths_and_file = split(m|/|, $line); |
my @paths_and_file = split(m|/|, $line); |
|
Line 10974 sub add_prefix_and_part {
|
Line 11090 sub add_prefix_and_part {
|
| |
|
| my %metaentry; |
my %metaentry; |
| my %importedpartids; |
my %importedpartids; |
| |
my %importedrespids; |
| sub metadata { |
sub metadata { |
| my ($uri,$what,$liburi,$prefix,$depthcount)=@_; |
my ($uri,$what,$liburi,$prefix,$depthcount)=@_; |
| $uri=&declutter($uri); |
$uri=&declutter($uri); |
|
Line 11001 sub metadata {
|
Line 11118 sub metadata {
|
| } |
} |
| { |
{ |
| # Imported parts would go here |
# Imported parts would go here |
| my %importedids=(); |
my @origfiletagids=(); |
| my @origfileimportpartids=(); |
|
| my $importedparts=0; |
my $importedparts=0; |
| |
|
| |
# Imported responseids would go here |
| |
my $importedresponses=0; |
| # |
# |
| # Is this a recursive call for a library? |
# Is this a recursive call for a library? |
| # |
# |
|
Line 11098 sub metadata {
|
Line 11217 sub metadata {
|
| my $dir=$filename; |
my $dir=$filename; |
| $dir=~s|[^/]*$||; |
$dir=~s|[^/]*$||; |
| $location=&filelocation($dir,$location); |
$location=&filelocation($dir,$location); |
| |
|
| |
my $importid=$token->[2]->{'id'}; |
| my $importmode=$token->[2]->{'importmode'}; |
my $importmode=$token->[2]->{'importmode'}; |
| |
# |
| |
# Check metadata for imported file to |
| |
# see if it contained response items |
| |
# |
| |
my %currmetaentry = %metaentry; |
| |
my $libresponseorder = &metadata($location,'responseorder'); |
| |
my $origfile; |
| |
if ($libresponseorder ne '') { |
| |
if ($#origfiletagids<0) { |
| |
undef(%importedrespids); |
| |
undef(%importedpartids); |
| |
} |
| |
@{$importedrespids{$importid}} = split(/\s*,\s*/,$libresponseorder); |
| |
if (@{$importedrespids{$importid}} > 0) { |
| |
$importedresponses = 1; |
| |
# We need to get the original file and the imported file to get the response order correct |
| |
# Load and inspect original file |
| |
if ($#origfiletagids<0) { |
| |
my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri); |
| |
$origfile=&getfile($origfilelocation); |
| |
@origfiletagids=($origfile=~/<((?:\w+)response|import|part)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs); |
| |
} |
| |
} |
| |
} |
| |
# Do not overwrite contents of %metaentry hash for resource itself with |
| |
# hash populated for imported library file |
| |
%metaentry = %currmetaentry; |
| |
undef(%currmetaentry); |
| if ($importmode eq 'problem') { |
if ($importmode eq 'problem') { |
| # Import as problem/response |
# Import as problem/response |
| $unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
$unikey=&add_prefix_and_part($prefix,$token->[2]->{'part'}); |
|
Line 11108 sub metadata {
|
Line 11256 sub metadata {
|
| $importedparts=1; |
$importedparts=1; |
| # We need to get the original file and the imported file to get the part order correct |
# We need to get the original file and the imported file to get the part order correct |
| # Good news: we do not need to worry about nested libraries, since parts cannot be nested |
# Good news: we do not need to worry about nested libraries, since parts cannot be nested |
| # Load and inspect original file |
# Load and inspect original file if we didn't do that already |
| if ($#origfileimportpartids<0) { |
if ($#origfiletagids<0) { |
| undef(%importedpartids); |
undef(%importedrespids); |
| my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri); |
undef(%importedpartids); |
| my $origfile=&getfile($origfilelocation); |
if ($origfile eq '') { |
| @origfileimportpartids=($origfile=~/<(part|import)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs); |
my $origfilelocation=$perlvar{'lonDocRoot'}.&clutter($uri); |
| |
$origfile=&getfile($origfilelocation); |
| |
@origfiletagids=($origfile=~/<(part|import)[^>]*id\s*=\s*[\"\']([^\"\']+)[\"\'][^>]*>/gs); |
| |
} |
| } |
} |
| |
|
| # Load and inspect imported file |
# Load and inspect imported file |
|
Line 11227 sub metadata {
|
Line 11378 sub metadata {
|
| grep { ! $seen{$_} ++ } (split(',',$metaentry{':packages'})); |
grep { ! $seen{$_} ++ } (split(',',$metaentry{':packages'})); |
| $metaentry{':packages'} = join(',',@uniq_packages); |
$metaentry{':packages'} = join(',',@uniq_packages); |
| |
|
| if ($importedparts) { |
if (($importedresponses) || ($importedparts)) { |
| |
if ($importedparts) { |
| # We had imported parts and need to rebuild partorder |
# We had imported parts and need to rebuild partorder |
| $metaentry{':partorder'}=''; |
$metaentry{':partorder'}=''; |
| $metathesekeys{'partorder'}=1; |
$metathesekeys{'partorder'}=1; |
| for (my $index=0;$index<$#origfileimportpartids;$index+=2) { |
} |
| if ($origfileimportpartids[$index] eq 'part') { |
if ($importedresponses) { |
| # original part, part of the problem |
# We had imported responses and need to rebuild responseorder |
| $metaentry{':partorder'}.=','.$origfileimportpartids[$index+1]; |
$metaentry{':responseorder'}=''; |
| } else { |
$metathesekeys{'responseorder'}=1; |
| # we have imported parts at this position |
} |
| $metaentry{':partorder'}.=','.$importedpartids{$origfileimportpartids[$index+1]}; |
for (my $index=0;$index<$#origfiletagids;$index+=2) { |
| } |
my $origid = $origfiletagids[$index+1]; |
| } |
if ($origfiletagids[$index] eq 'part') { |
| $metaentry{':partorder'}=~s/^\,//; |
# Original part, part of the problem |
| |
if ($importedparts) { |
| |
$metaentry{':partorder'}.=','.$origid; |
| |
} |
| |
} elsif ($origfiletagids[$index] eq 'import') { |
| |
if ($importedparts) { |
| |
# We have imported parts at this position |
| |
$metaentry{':partorder'}.=','.$importedpartids{$origid}; |
| |
} |
| |
if ($importedresponses) { |
| |
# We have imported responses at this position |
| |
if (ref($importedrespids{$origid}) eq 'ARRAY') { |
| |
$metaentry{':responseorder'}.=','.join(',',map { $origid.'_'.$_ } @{$importedrespids{$origid}}); |
| |
} |
| |
} |
| |
} else { |
| |
# Original response item, part of the problem |
| |
if ($importedresponses) { |
| |
$metaentry{':responseorder'}.=','.$origid; |
| |
} |
| |
} |
| |
} |
| |
if ($importedparts) { |
| |
$metaentry{':partorder'}=~s/^\,//; |
| |
} |
| |
if ($importedresponses) { |
| |
$metaentry{':responseorder'}=~s/^\,//; |
| |
} |
| } |
} |
| |
|
| $metaentry{':keys'} = join(',',keys(%metathesekeys)); |
$metaentry{':keys'} = join(',',keys(%metathesekeys)); |
|
Line 12328 sub readfile {
|
Line 12507 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 12441 sub machine_ids {
|
Line 12620 sub machine_ids {
|
| |
|
| sub additional_machine_domains { |
sub additional_machine_domains { |
| my @domains; |
my @domains; |
| open(my $fh,"<$perlvar{'lonTabDir'}/expected_domains.tab"); |
open(my $fh,"<","$perlvar{'lonTabDir'}/expected_domains.tab"); |
| while( my $line = <$fh>) { |
while( my $line = <$fh>) { |
| $line =~ s/\s//g; |
$line =~ s/\s//g; |
| push(@domains,$line); |
push(@domains,$line); |
|
Line 12585 sub get_dns {
|
Line 12764 sub get_dns {
|
| } |
} |
| |
|
| my %alldns; |
my %alldns; |
| open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab"); |
if (open(my $config,"<","$perlvar{'lonTabDir'}/hosts.tab")) { |
| foreach my $dns (<$config>) { |
foreach my $dns (<$config>) { |
| next if ($dns !~ /^\^(\S*)/x); |
next if ($dns !~ /^\^(\S*)/x); |
| my $line = $1; |
my $line = $1; |
| my ($host,$protocol) = split(/:/,$line); |
my ($host,$protocol) = split(/:/,$line); |
| if ($protocol ne 'https') { |
if ($protocol ne 'https') { |
| $protocol = 'http'; |
$protocol = 'http'; |
| |
} |
| |
$alldns{$host} = $protocol; |
| } |
} |
| $alldns{$host} = $protocol; |
close($config); |
| } |
} |
| while (%alldns) { |
while (%alldns) { |
| my ($dns) = sort { $b cmp $a } keys(%alldns); |
my ($dns) = sort { $b cmp $a } keys(%alldns); |
|
Line 12613 sub get_dns {
|
Line 12794 sub get_dns {
|
| close($config); |
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"); |
open($config,"<","$perlvar{'lonTabDir'}/dns_$which.tab"); |
| my @content = <$config>; |
my @content = <$config>; |
| &$func(\@content,$hashref); |
&$func(\@content,$hashref); |
| return; |
return; |
|
Line 12706 sub fetch_dns_checksums {
|
Line 12887 sub fetch_dns_checksums {
|
| my ($ignore_cache,$nocache) = @_; |
my ($ignore_cache,$nocache) = @_; |
| &get_dns('/adm/dns/domain',\&parse_domain_tab,$ignore_cache,$nocache); |
&get_dns('/adm/dns/domain',\&parse_domain_tab,$ignore_cache,$nocache); |
| my $fh; |
my $fh; |
| if (open($fh,"<".$perlvar{'lonTabDir'}.'/domain.tab')) { |
if (open($fh,"<",$perlvar{'lonTabDir'}.'/domain.tab')) { |
| my @lines = <$fh>; |
my @lines = <$fh>; |
| &parse_domain_tab(\@lines); |
&parse_domain_tab(\@lines); |
| } |
} |
|
Line 12758 sub fetch_dns_checksums {
|
Line 12939 sub fetch_dns_checksums {
|
| my ($id,$domain,$role,$name,$protocol,$intdom)=split(/:/,$configline); |
my ($id,$domain,$role,$name,$protocol,$intdom)=split(/:/,$configline); |
| $name=~s/\s//g; |
$name=~s/\s//g; |
| if ($id && $domain && $role && $name) { |
if ($id && $domain && $role && $name) { |
| |
if ((exists($hostname{$id})) && ($hostname{$id} ne '')) { |
| |
my $curr = $hostname{$id}; |
| |
my $skip; |
| |
if (ref($name_to_host{$curr}) eq 'ARRAY') { |
| |
if (($curr eq $name) && (@{$name_to_host{$curr}} == 1)) { |
| |
$skip = 1; |
| |
} else { |
| |
@{$name_to_host{$curr}} = grep { $_ ne $id } @{$name_to_host{$curr}}; |
| |
} |
| |
} |
| |
unless ($skip) { |
| |
push(@{$name_to_host{$name}},$id); |
| |
} |
| |
} else { |
| |
push(@{$name_to_host{$name}},$id); |
| |
} |
| $hostname{$id}=$name; |
$hostname{$id}=$name; |
| push(@{$name_to_host{$name}}, $id); |
|
| $hostdom{$id}=$domain; |
$hostdom{$id}=$domain; |
| if ($role eq 'library') { $libserv{$id}=$name; } |
if ($role eq 'library') { $libserv{$id}=$name; } |
| if (defined($protocol)) { |
if (defined($protocol)) { |
|
Line 12792 sub fetch_dns_checksums {
|
Line 12988 sub fetch_dns_checksums {
|
| sub load_hosts_tab { |
sub load_hosts_tab { |
| my ($ignore_cache,$nocache) = @_; |
my ($ignore_cache,$nocache) = @_; |
| &get_dns('/adm/dns/hosts',\&parse_hosts_tab,$ignore_cache,$nocache); |
&get_dns('/adm/dns/hosts',\&parse_hosts_tab,$ignore_cache,$nocache); |
| open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab"); |
open(my $config,"<","$perlvar{'lonTabDir'}/hosts.tab"); |
| my @config = <$config>; |
my @config = <$config>; |
| &parse_hosts_tab(\@config); |
&parse_hosts_tab(\@config); |
| close($config); |
close($config); |
|
Line 13058 sub all_loncaparevs {
|
Line 13254 sub all_loncaparevs {
|
| { |
{ |
| sub load_loncaparevs { |
sub load_loncaparevs { |
| if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") { |
if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") { |
| if (open(my $config,"<$perlvar{'lonTabDir'}/loncaparevs.tab")) { |
if (open(my $config,"<","$perlvar{'lonTabDir'}/loncaparevs.tab")) { |
| while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
| chomp($configline); |
chomp($configline); |
| my ($hostid,$loncaparev)=split(/:/,$configline); |
my ($hostid,$loncaparev)=split(/:/,$configline); |
|
Line 13074 sub all_loncaparevs {
|
Line 13270 sub all_loncaparevs {
|
| { |
{ |
| sub load_serverhomeIDs { |
sub load_serverhomeIDs { |
| if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") { |
if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") { |
| if (open(my $config,"<$perlvar{'lonTabDir'}/serverhomeIDs.tab")) { |
if (open(my $config,"<","$perlvar{'lonTabDir'}/serverhomeIDs.tab")) { |
| while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
| chomp($configline); |
chomp($configline); |
| my ($name,$id)=split(/:/,$configline); |
my ($name,$id)=split(/:/,$configline); |
|
Line 13099 BEGIN {
|
Line 13295 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 13113 BEGIN {
|
Line 13309 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 13127 BEGIN {
|
Line 13323 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 13147 BEGIN {
|
Line 13343 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 13193 BEGIN {
|
Line 13389 BEGIN {
|
| # ---------------------------------------------------------- Read managers table |
# ---------------------------------------------------------- Read managers table |
| { |
{ |
| if (-e "$perlvar{'lonTabDir'}/managers.tab") { |
if (-e "$perlvar{'lonTabDir'}/managers.tab") { |
| if (open(my $config,"<$perlvar{'lonTabDir'}/managers.tab")) { |
if (open(my $config,"<","$perlvar{'lonTabDir'}/managers.tab")) { |
| while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
| chomp($configline); |
chomp($configline); |
| next if ($configline =~ /^\#/); |
next if ($configline =~ /^\#/); |
![[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