|
version 1.879, 2007/05/17 09:31:13
|
version 1.906, 2007/08/10 23:02:36
|
|
Line 149 sub create_connection {
|
Line 149 sub create_connection {
|
| Type => SOCK_STREAM, |
Type => SOCK_STREAM, |
| Timeout => 10); |
Timeout => 10); |
| return 0 if (!$client); |
return 0 if (!$client); |
| print $client (join(':',$hostname,$lonid,&machine_ids($lonid))."\n"); |
print $client (join(':',$hostname,$lonid,&machine_ids($hostname))."\n"); |
| my $result = <$client>; |
my $result = <$client>; |
| chomp($result); |
chomp($result); |
| return 1 if ($result eq 'done'); |
return 1 if ($result eq 'done'); |
|
Line 214 sub reply {
|
Line 214 sub reply {
|
| # ----------------------------------------------------------- Send USR1 to lonc |
# ----------------------------------------------------------- Send USR1 to lonc |
| |
|
| sub reconlonc { |
sub reconlonc { |
| |
my ($lonid) = @_; |
| |
my $hostname = &hostname($lonid); |
| |
if ($lonid) { |
| |
my $peerfile="$perlvar{'lonSockDir'}/$hostname"; |
| |
if ($hostname && -e $peerfile) { |
| |
&logthis("Trying to reconnect lonc for $lonid ($hostname)"); |
| |
my $client=IO::Socket::UNIX->new(Peer => $peerfile, |
| |
Type => SOCK_STREAM, |
| |
Timeout => 10); |
| |
if ($client) { |
| |
print $client ("reset_retries\n"); |
| |
my $answer=<$client>; |
| |
#reset just this one. |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| &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")) { |
|
Line 770 sub get_dom {
|
Line 788 sub get_dom {
|
| } |
} |
| return %returnhash; |
return %returnhash; |
| } else { |
} else { |
| &logthis("get_dom failed - no homeserver and/or domain"); |
&logthis("get_dom failed - no homeserver and/or domain ($udom) ($uhome)"); |
| } |
} |
| } |
} |
| |
|
|
Line 838 sub is_domainimage {
|
Line 856 sub is_domainimage {
|
| return; |
return; |
| } |
} |
| |
|
| |
sub inst_directory_query { |
| |
my ($srch) = @_; |
| |
my $udom = $srch->{'srchdomain'}; |
| |
my %results; |
| |
my $homeserver = &domain($udom,'primary'); |
| |
if ($homeserver ne '') { |
| |
my $queryid=&reply("querysend:instdirsearch:". |
| |
&escape($srch->{'srchby'}).':'. |
| |
&escape($srch->{'srchterm'}).':'. |
| |
&escape($srch->{'srchtype'}),$homeserver); |
| |
my $host=&hostname($homeserver); |
| |
if ($queryid !~/^\Q$host\E\_/) { |
| |
&logthis('instituional directory search invalid queryid: '.$queryid.' for host: '.$homeserver.'in domain '.$udom); |
| |
return; |
| |
} |
| |
my $response = &get_query_reply($queryid); |
| |
my $maxtries = 5; |
| |
my $tries = 1; |
| |
while (($response=~/^timeout/) && ($tries < $maxtries)) { |
| |
$response = &get_query_reply($queryid); |
| |
$tries ++; |
| |
} |
| |
|
| |
if (!&error($response) && $response ne 'refused') { |
| |
my @matches = split(/\n/,$response); |
| |
foreach my $match (@matches) { |
| |
my ($key,$value) = split(/=/,$match); |
| |
$results{&unescape($key).':'.$udom} = &thaw_unescape($value); |
| |
} |
| |
} |
| |
} |
| |
return %results; |
| |
} |
| |
|
| |
sub usersearch { |
| |
my ($srch) = @_; |
| |
my $dom = $srch->{'srchdomain'}; |
| |
my %results; |
| |
my %libserv = &all_library(); |
| |
my $query = 'usersearch'; |
| |
foreach my $tryserver (keys(%libserv)) { |
| |
if (&host_domain($tryserver) eq $dom) { |
| |
my $host=&hostname($tryserver); |
| |
my $queryid= |
| |
&reply("querysend:".&escape($query).':'.&escape($dom).':'. |
| |
&escape($srch->{'srchby'}).'%%'. |
| |
&escape($srch->{'srchtype'}).':'. |
| |
&escape($srch->{'srchterm'}),$tryserver); |
| |
if ($queryid !~/^\Q$host\E\_/) { |
| |
&logthis('usersearch: invalid queryid: '.$queryid.' for host: '.$host.'in domain '.$dom.' and server: '.$tryserver); |
| |
next; |
| |
} |
| |
my $reply = &get_query_reply($queryid); |
| |
my $maxtries = 1; |
| |
my $tries = 1; |
| |
while (($reply=~/^timeout/) && ($tries < $maxtries)) { |
| |
$reply = &get_query_reply($queryid); |
| |
$tries ++; |
| |
} |
| |
if ( ($reply =~/^timeout/) || ($reply =~/^error/) ) { |
| |
&logthis('usersrch error: '.$reply.' for '.$dom.' - searching for : '.$srch->{'srchterm'}.' by '.$srch->{'srchby'}.' ('.$srch->{'srchtype'}.') - maxtries: '.$maxtries.' tries: '.$tries); |
| |
} else { |
| |
my @matches = split(/&/,$reply); |
| |
foreach my $match (@matches) { |
| |
my @items = split(/:/,$match); |
| |
my ($uname,$udom,%userhash); |
| |
foreach my $entry (@items) { |
| |
my ($key,$value) = split(/=/,$entry); |
| |
$key = &unescape($key); |
| |
$value = &unescape($value); |
| |
$userhash{$key} = $value; |
| |
if ($key eq 'username') { |
| |
$uname = $value; |
| |
} elsif ($key eq 'domain') { |
| |
$udom = $value; |
| |
} |
| |
} |
| |
$results{$uname.':'.$udom} = \%userhash; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return %results; |
| |
} |
| |
|
| # --------------------------------------------------- Assign a key to a student |
# --------------------------------------------------- Assign a key to a student |
| |
|
| sub assign_access_key { |
sub assign_access_key { |
|
Line 1378 sub ssi {
|
Line 1481 sub ssi {
|
| my $request; |
my $request; |
| |
|
| $form{'no_update_last_known'}=1; |
$form{'no_update_last_known'}=1; |
| |
&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 { &escape($_).'='.&escape($form{$_}) } keys %form)); |
|
Line 1739 sub extract_embedded_items {
|
Line 1842 sub extract_embedded_items {
|
| while (my $t=$p->get_token()) { |
while (my $t=$p->get_token()) { |
| if ($t->[0] eq 'S') { |
if ($t->[0] eq 'S') { |
| my ($tagname, $attr) = ($t->[1],$t->[2]); |
my ($tagname, $attr) = ($t->[1],$t->[2]); |
| push (@state, $tagname); |
push(@state, $tagname); |
| if (lc($tagname) eq 'allow') { |
if (lc($tagname) eq 'allow') { |
| &add_filetype($allfiles,$attr->{'src'},'src'); |
&add_filetype($allfiles,$attr->{'src'},'src'); |
| } |
} |
| if (lc($tagname) eq 'img') { |
if (lc($tagname) eq 'img') { |
| &add_filetype($allfiles,$attr->{'src'},'src'); |
&add_filetype($allfiles,$attr->{'src'},'src'); |
| } |
} |
| |
if (lc($tagname) eq 'a') { |
| |
&add_filetype($allfiles,$attr->{'href'},'href'); |
| |
} |
| if (lc($tagname) eq 'script') { |
if (lc($tagname) eq 'script') { |
| if ($attr->{'archive'} =~ /\.jar$/i) { |
if ($attr->{'archive'} =~ /\.jar$/i) { |
| &add_filetype($allfiles,$attr->{'archive'},'archive'); |
&add_filetype($allfiles,$attr->{'archive'},'archive'); |
|
Line 1987 sub flushcourselogs {
|
Line 2093 sub flushcourselogs {
|
| # |
# |
| 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). |
| '='.&escape($domainrolehash{$entry}); |
'='.&escape($domainrolehash{$entry}); |
|
Line 2092 sub userrolelog {
|
Line 2198 sub userrolelog {
|
| {$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec} |
{$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec} |
| =$tend.':'.$tstart; |
=$tend.':'.$tstart; |
| } |
} |
| |
if (($env{'request.role'} =~ /dc\./) && |
| |
(($trole=~/^au/) || ($trole=~/^in/) || |
| |
($trole=~/^cc/) || ($trole=~/^ep/) || |
| |
($trole=~/^cr/) || ($trole=~/^ta/))) { |
| |
$userrolehash |
| |
{$trole.':'.$username.':'.$domain.':'.$env{'user.name'}.':'.$env{'user.domain'}.':'} |
| |
=$tend.':'.$tstart; |
| |
} |
| if (($trole=~/^dc/) || ($trole=~/^ad/) || |
if (($trole=~/^dc/) || ($trole=~/^ad/) || |
| ($trole=~/^li/) || ($trole=~/^li/) || |
($trole=~/^li/) || ($trole=~/^li/) || |
| ($trole=~/^au/) || ($trole=~/^dg/) || |
($trole=~/^au/) || ($trole=~/^dg/) || |
|
Line 3133 sub set_userprivs {
|
Line 3247 sub set_userprivs {
|
| if (keys(%{$allgroups}) > 0) { |
if (keys(%{$allgroups}) > 0) { |
| foreach my $role (keys %{$allroles}) { |
foreach my $role (keys %{$allroles}) { |
| my ($trole,$area,$sec,$extendedarea); |
my ($trole,$area,$sec,$extendedarea); |
| if ($role =~ m-^(\w+|cr/$match_domain/$match_username/\w+)\.(/$match_domain/$match_courseid)(/?\w*)-) { |
if ($role =~ m-^(\w+|cr/$match_domain/$match_username/\w+)\.(/$match_domain/$match_courseid)(/?\w*)\.-) { |
| $trole = $1; |
$trole = $1; |
| $area = $2; |
$area = $2; |
| $sec = $3; |
$sec = $3; |
|
Line 3783 sub customaccess {
|
Line 3897 sub customaccess {
|
| $ucrs = &LONCAPA::clean_username($ucrs); |
$ucrs = &LONCAPA::clean_username($ucrs); |
| my $access=0; |
my $access=0; |
| foreach my $right (split(/\s*\,\s*/,&metadata($uri,'rule_rights'))) { |
foreach my $right (split(/\s*\,\s*/,&metadata($uri,'rule_rights'))) { |
| my ($effect,$realm,$role)=split(/\:/,$right); |
my ($effect,$realm,$role,$type)=split(/\:/,$right); |
| if ($role) { |
if ($type eq 'user') { |
| if ($role ne $urole) { next; } |
foreach my $scope (split(/\s*\,\s*/,$realm)) { |
| } |
my ($tdom,$tuname)=split(m{/},$scope); |
| foreach my $scope (split(/\s*\,\s*/,$realm)) { |
if ($tdom) { |
| my ($tdom,$tcrs,$tsec)=split(/\_/,$scope); |
if ($tdom ne $env{'user.domain'}) { next; } |
| if ($tdom) { |
} |
| if ($tdom ne $udom) { next; } |
if ($tuname) { |
| } |
if ($tuname ne $env{'user.name'}) { next; } |
| if ($tcrs) { |
} |
| if ($tcrs ne $ucrs) { next; } |
$access=($effect eq 'allow'); |
| } |
last; |
| if ($tsec) { |
} |
| if ($tsec ne $usec) { next; } |
} else { |
| } |
if ($role) { |
| $access=($effect eq 'allow'); |
if ($role ne $urole) { next; } |
| last; |
} |
| } |
foreach my $scope (split(/\s*\,\s*/,$realm)) { |
| if ($realm eq '' && $role eq '') { |
my ($tdom,$tcrs,$tsec)=split(/\_/,$scope); |
| $access=($effect eq 'allow'); |
if ($tdom) { |
| |
if ($tdom ne $udom) { next; } |
| |
} |
| |
if ($tcrs) { |
| |
if ($tcrs ne $ucrs) { next; } |
| |
} |
| |
if ($tsec) { |
| |
if ($tsec ne $usec) { next; } |
| |
} |
| |
$access=($effect eq 'allow'); |
| |
last; |
| |
} |
| |
if ($realm eq '' && $role eq '') { |
| |
$access=($effect eq 'allow'); |
| |
} |
| } |
} |
| } |
} |
| return $access; |
return $access; |
|
Line 4331 sub update_portfolio_table {
|
Line 4459 sub update_portfolio_table {
|
| return $reply; |
return $reply; |
| } |
} |
| |
|
| |
# -------------------------- Update MySQL allusers table |
| |
|
| |
sub update_allusers_table { |
| |
my ($uname,$udom,$names) = @_; |
| |
my $homeserver = &homeserver($uname,$udom); |
| |
my $queryid= |
| |
&reply('querysend:allusers:'.&escape($uname).':'.&escape($udom).':'. |
| |
'lastname='.&escape($names->{'lastname'}).'%%'. |
| |
'firstname='.&escape($names->{'firstname'}).'%%'. |
| |
'middlename='.&escape($names->{'middlename'}).'%%'. |
| |
'generation='.&escape($names->{'generation'}).'%%'. |
| |
'permanentemail='.&escape($names->{'permanentemail'}).'%%'. |
| |
'id='.&escape($names->{'id'}),$homeserver); |
| |
my $reply = &get_query_reply($queryid); |
| |
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 { |
|
Line 4365 sub fetch_enrollment_query {
|
Line 4510 sub fetch_enrollment_query {
|
| 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 ($homeserver eq $perlvar{'lonHostID'}) { |
| foreach my $line (@responses) { |
foreach my $line (@responses) { |
| my ($key,$value) = split(/=/,$line,2); |
my ($key,$value) = split(/=/,$line,2); |
|
Line 4408 sub get_query_reply {
|
Line 4553 sub get_query_reply {
|
| sleep 2; |
sleep 2; |
| if (-e $replyfile.'.end') { |
if (-e $replyfile.'.end') { |
| if (open(my $fh,$replyfile)) { |
if (open(my $fh,$replyfile)) { |
| $reply.=<$fh>; |
$reply = join('',<$fh>); |
| close($fh); |
close($fh); |
| } else { return 'error: reply_file_error'; } |
} else { return 'error: reply_file_error'; } |
| return &unescape($reply); |
return &unescape($reply); |
| } |
} |
|
Line 4475 sub auto_get_sections {
|
Line 4620 sub auto_get_sections {
|
| my @secs = (); |
my @secs = (); |
| my $response=&unescape(&reply('autogetsections:'.$inst_coursecode.':'.$cdom,$homeserver)); |
my $response=&unescape(&reply('autogetsections:'.$inst_coursecode.':'.$cdom,$homeserver)); |
| unless ($response eq 'refused') { |
unless ($response eq 'refused') { |
| @secs = split/:/,$response; |
@secs = split(/:/,$response); |
| } |
} |
| return @secs; |
return @secs; |
| } |
} |
|
Line 4514 sub auto_create_password {
|
Line 4659 sub auto_create_password {
|
| if ($response eq 'refused') { |
if ($response eq 'refused') { |
| $authchk = 'refused'; |
$authchk = 'refused'; |
| } else { |
} else { |
| ($authparam,$create_passwd,$authchk) = split/:/,$response; |
($authparam,$create_passwd,$authchk) = split(/:/,$response); |
| } |
} |
| } |
} |
| return ($authparam,$create_passwd,$authchk); |
return ($authparam,$create_passwd,$authchk); |
|
Line 4622 sub auto_instcode_format {
|
Line 4767 sub auto_instcode_format {
|
| $response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$server); |
$response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$server); |
| if ($response !~ /(con_lost|error|no_such_host|refused)/) { |
if ($response !~ /(con_lost|error|no_such_host|refused)/) { |
| my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) = |
my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) = |
| split/:/,$response; |
split(/:/,$response); |
| %{$codes} = (%{$codes},&str2hash($codes_str)); |
%{$codes} = (%{$codes},&str2hash($codes_str)); |
| push(@{$codetitles},&str2array($codetitles_str)); |
push(@{$codetitles},&str2array($codetitles_str)); |
| %{$cat_titles} = (%{$cat_titles},&str2hash($cat_titles_str)); |
%{$cat_titles} = (%{$cat_titles},&str2hash($cat_titles_str)); |
|
Line 5002 sub modifyuser {
|
Line 5147 sub modifyuser {
|
| } |
} |
| # -------------------------------------------------------------- Add names, etc |
# -------------------------------------------------------------- Add names, etc |
| my @tmp=&get('environment', |
my @tmp=&get('environment', |
| ['firstname','middlename','lastname','generation'], |
['firstname','middlename','lastname','generation','id', |
| |
'permanentemail'], |
| $udom,$uname); |
$udom,$uname); |
| my %names; |
my %names; |
| if ($tmp[0] =~ m/^error:.*/) { |
if ($tmp[0] =~ m/^error:.*/) { |
|
Line 5024 sub modifyuser {
|
Line 5170 sub modifyuser {
|
| $names{'critnotification'} = $email; |
$names{'critnotification'} = $email; |
| $names{'permanentemail'} = $email; } |
$names{'permanentemail'} = $email; } |
| } |
} |
| |
if ($uid) { $names{'id'} = $uid; } |
| my $reply = &put('environment', \%names, $udom,$uname); |
my $reply = &put('environment', \%names, $udom,$uname); |
| if ($reply ne 'ok') { return 'error: '.$reply; } |
if ($reply ne 'ok') { return 'error: '.$reply; } |
| |
my $sqlresult = &update_allusers_table($uname,$udom,\%names); |
| &devalidate_cache_new('namescache',$uname.':'.$udom); |
&devalidate_cache_new('namescache',$uname.':'.$udom); |
| &logthis('Success modifying user '.$udom.', '.$uname.', '.$uid.', '. |
&logthis('Success modifying user '.$udom.', '.$uname.', '.$uid.', '. |
| $umode.', '.$first.', '.$middle.', '. |
$umode.', '.$first.', '.$middle.', '. |
|
Line 6169 sub EXT {
|
Line 6317 sub EXT {
|
| my ($map) = &decode_symb($symbparm); |
my ($map) = &decode_symb($symbparm); |
| return &symbread($map); |
return &symbread($map); |
| } |
} |
| |
if ($space eq 'filename') { |
| |
if ($symbparm) { |
| |
return &clutter((&decode_symb($symbparm))[2]); |
| |
} |
| |
return &hreflocation('',$env{'request.filename'}); |
| |
} |
| |
|
| my ($section, $group, @groups); |
my ($section, $group, @groups); |
| my ($courselevelm,$courselevel); |
my ($courselevelm,$courselevel); |
|
Line 6338 sub packages_tab_default {
|
Line 6492 sub packages_tab_default {
|
| $do_default=1; |
$do_default=1; |
| } elsif ($pack_type eq 'extension') { |
} elsif ($pack_type eq 'extension') { |
| push(@extension,[$package,$pack_type,$pack_part]); |
push(@extension,[$package,$pack_type,$pack_part]); |
| } elsif ($pack_part eq $part) { |
} elsif ($pack_part eq $part || $pack_type eq 'part') { |
| # only look at packages defaults for packages that this id is |
# only look at packages defaults for packages that this id is |
| push(@specifics,[$package,$pack_type,$pack_part]); |
push(@specifics,[$package,$pack_type,$pack_part]); |
| } |
} |
|
Line 6555 sub metadata {
|
Line 6709 sub metadata {
|
| } |
} |
| } |
} |
| my ($extension) = ($uri =~ /\.(\w+)$/); |
my ($extension) = ($uri =~ /\.(\w+)$/); |
| |
$extension = lc($extension); |
| |
if ($extension eq 'htm') { $extension='html'; } |
| |
|
| foreach my $key (keys(%packagetab)) { |
foreach my $key (keys(%packagetab)) { |
| #no specific packages #how's our extension |
#no specific packages #how's our extension |
| if ($key!~/^extension_\Q$extension\E&/) { next; } |
if ($key!~/^extension_\Q$extension\E&/) { next; } |
| &metadata_create_package_def($uri,$key,'extension_'.$extension, |
&metadata_create_package_def($uri,$key,'extension_'.$extension, |
| \%metathesekeys); |
\%metathesekeys); |
| } |
} |
| if (!exists($metaentry{':packages'})) { |
|
| |
if (!exists($metaentry{':packages'}) |
| |
|| $packagetab{"import_defaults&extension_$extension"}) { |
| foreach my $key (keys(%packagetab)) { |
foreach my $key (keys(%packagetab)) { |
| #no specific packages well let's get default then |
#no specific packages well let's get default then |
| if ($key!~/^default&/) { next; } |
if ($key!~/^default&/) { next; } |
|
Line 7058 sub getCODE {
|
Line 7217 sub getCODE {
|
| sub rndseed { |
sub rndseed { |
| my ($symb,$courseid,$domain,$username)=@_; |
my ($symb,$courseid,$domain,$username)=@_; |
| my ($wsymb,$wcourseid,$wdomain,$wusername)=&whichuser(); |
my ($wsymb,$wcourseid,$wdomain,$wusername)=&whichuser(); |
| if (!$symb) { |
if (!defined($symb)) { |
| unless ($symb=$wsymb) { return time; } |
unless ($symb=$wsymb) { return time; } |
| } |
} |
| if (!$courseid) { $courseid=$wcourseid; } |
if (!$courseid) { $courseid=$wcourseid; } |
|
Line 7510 sub filelocation {
|
Line 7669 sub filelocation {
|
| $file=~s-^/adm/wrapper/-/-; |
$file=~s-^/adm/wrapper/-/-; |
| $file=~s-^/adm/coursedocs/showdoc/-/-; |
$file=~s-^/adm/coursedocs/showdoc/-/-; |
| } |
} |
| |
|
| if ($file=~m:^/~:) { # is a contruction space reference |
if ($file=~m:^/~:) { # is a contruction space reference |
| $location = $file; |
$location = $file; |
| $location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:; |
$location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:; |
|
Line 7530 sub filelocation {
|
Line 7690 sub filelocation {
|
| $location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'. |
$location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'. |
| $udom.'/'.$uname.'/'.$filename; |
$udom.'/'.$uname.'/'.$filename; |
| } |
} |
| |
} elsif ($file =~ m-^/adm/-) { |
| |
$location = $perlvar{'lonDocRoot'}.'/'.$file; |
| } else { |
} else { |
| $file=~s/^\Q$perlvar{'lonDocRoot'}\E//; |
$file=~s/^\Q$perlvar{'lonDocRoot'}\E//; |
| $file=~s:^/res/:/:; |
$file=~s:^/res/:/:; |
|
Line 7589 sub machine_ids {
|
Line 7751 sub machine_ids {
|
| my ($hostname) = @_; |
my ($hostname) = @_; |
| $hostname ||= &hostname($perlvar{'lonHostID'}); |
$hostname ||= &hostname($perlvar{'lonHostID'}); |
| my @ids; |
my @ids; |
| my %hostname = &all_hostnames(); |
my %name_to_host = &all_names(); |
| while( my($id, $name) = each(%hostname)) { |
if (ref($name_to_host{$hostname}) eq 'ARRAY') { |
| # &logthis("-$id-$name-$hostname-"); |
return @{ $name_to_host{$hostname} }; |
| if ($hostname eq $name) { |
|
| push(@ids,$id); |
|
| } |
|
| } |
} |
| return @ids; |
return; |
| } |
} |
| |
|
| sub additional_machine_domains { |
sub additional_machine_domains { |
|
Line 7640 sub declutter {
|
Line 7799 sub declutter {
|
| |
|
| sub clutter { |
sub clutter { |
| my $thisfn='/'.&declutter(shift); |
my $thisfn='/'.&declutter(shift); |
| unless ($thisfn=~/^\/(uploaded|editupload|adm|userfiles|ext|raw|priv|public)\//) { |
if ($thisfn !~ m{^/(uploaded|editupload|adm|userfiles|ext|raw|priv|public)/} |
| |
|| $thisfn =~ m{^/adm/(includes|pages)} ) { |
| $thisfn='/res'.$thisfn; |
$thisfn='/res'.$thisfn; |
| } |
} |
| if ($thisfn !~m|/adm|) { |
if ($thisfn !~m|/adm|) { |
|
Line 7823 sub get_dns {
|
Line 7983 sub get_dns {
|
| my %hostdom; |
my %hostdom; |
| my %libserv; |
my %libserv; |
| my $loaded; |
my $loaded; |
| |
my %name_to_host; |
| |
|
| sub parse_hosts_tab { |
sub parse_hosts_tab { |
| my ($file) = @_; |
my ($file) = @_; |
|
Line 7834 sub get_dns {
|
Line 7995 sub get_dns {
|
| $name=~s/\s//g; |
$name=~s/\s//g; |
| if ($id && $domain && $role && $name) { |
if ($id && $domain && $role && $name) { |
| $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; } |
| } |
} |
|
Line 7841 sub get_dns {
|
Line 8003 sub get_dns {
|
| } |
} |
| |
|
| sub reset_hosts_info { |
sub reset_hosts_info { |
| |
&purge_remembered(); |
| &reset_domain_info(); |
&reset_domain_info(); |
| &reset_hosts_ip_info(); |
&reset_hosts_ip_info(); |
| |
undef(%name_to_host); |
| undef(%hostname); |
undef(%hostname); |
| undef(%hostdom); |
undef(%hostdom); |
| undef(%libserv); |
undef(%libserv); |
|
Line 7872 sub get_dns {
|
Line 8036 sub get_dns {
|
| return %hostname; |
return %hostname; |
| } |
} |
| |
|
| |
sub all_names { |
| |
&load_hosts_tab() if (!$loaded); |
| |
|
| |
return %name_to_host; |
| |
} |
| |
|
| sub is_library { |
sub is_library { |
| &load_hosts_tab() if (!$loaded); |
&load_hosts_tab() if (!$loaded); |
| |
|
|
Line 7928 sub get_dns {
|
Line 8098 sub get_dns {
|
| my %name_to_ip; |
my %name_to_ip; |
| my %lonid_to_ip; |
my %lonid_to_ip; |
| |
|
| my %valid_ip; |
|
| sub valid_ip { |
|
| my ($ip) = @_; |
|
| if (exists($iphost{$ip}) || exists($valid_ip{$ip})) { |
|
| return 1; |
|
| } |
|
| my $name = gethostbyip($ip); |
|
| my $lonid = &hostname($name); |
|
| if (defined($lonid)) { |
|
| $valid_ip{$ip} = $lonid; |
|
| return 1; |
|
| } |
|
| my %iphosts = &get_iphost(); |
|
| if (ref($iphost{$ip})) { |
|
| return 1; |
|
| } |
|
| } |
|
| |
|
| sub get_hosts_from_ip { |
sub get_hosts_from_ip { |
| my ($ip) = @_; |
my ($ip) = @_; |
| my %iphosts = &get_iphost(); |
my %iphosts = &get_iphost(); |
|
Line 7977 sub get_dns {
|
Line 8129 sub get_dns {
|
| |
|
| sub get_iphost { |
sub get_iphost { |
| my ($ignore_cache) = @_; |
my ($ignore_cache) = @_; |
| |
|
| if (!$ignore_cache) { |
if (!$ignore_cache) { |
| if (%iphost) { |
if (%iphost) { |
| return %iphost; |
return %iphost; |
|
Line 7990 sub get_dns {
|
Line 8143 sub get_dns {
|
| return %iphost; |
return %iphost; |
| } |
} |
| } |
} |
| my %hostname = &all_hostnames(); |
|
| foreach my $id (keys(%hostname)) { |
# get yesterday's info for fallback |
| my $name=&hostname($id); |
my %old_name_to_ip; |
| |
my ($ip_info,$cached)= |
| |
&Apache::lonnet::is_cached_new('iphost','iphost'); |
| |
if ($cached) { |
| |
%old_name_to_ip = %{$ip_info->[1]}; |
| |
} |
| |
|
| |
my %name_to_host = &all_names(); |
| |
foreach my $name (keys(%name_to_host)) { |
| my $ip; |
my $ip; |
| if (!exists($name_to_ip{$name})) { |
if (!exists($name_to_ip{$name})) { |
| $ip = gethostbyname($name); |
$ip = gethostbyname($name); |
| if (!$ip || length($ip) ne 4) { |
if (!$ip || length($ip) ne 4) { |
| &logthis("Skipping host $id name $name no IP found"); |
if (defined($old_name_to_ip{$name})) { |
| next; |
$ip = $old_name_to_ip{$name}; |
| |
&logthis("Can't find $name defaulting to old $ip"); |
| |
} else { |
| |
&logthis("Name $name no IP found"); |
| |
next; |
| |
} |
| |
} else { |
| |
$ip=inet_ntoa($ip); |
| } |
} |
| $ip=inet_ntoa($ip); |
|
| $name_to_ip{$name} = $ip; |
$name_to_ip{$name} = $ip; |
| } else { |
} else { |
| $ip = $name_to_ip{$name}; |
$ip = $name_to_ip{$name}; |
| } |
} |
| $lonid_to_ip{$id} = $ip; |
foreach my $id (@{ $name_to_host{$name} }) { |
| push(@{$iphost{$ip}},$id); |
$lonid_to_ip{$id} = $ip; |
| |
} |
| |
push(@{$iphost{$ip}},@{$name_to_host{$name}}); |
| } |
} |
| &Apache::lonnet::do_cache_new('iphost','iphost', |
&Apache::lonnet::do_cache_new('iphost','iphost', |
| [\%iphost,\%name_to_ip,\%lonid_to_ip], |
[\%iphost,\%name_to_ip,\%lonid_to_ip], |
| 24*60*60); |
48*60*60); |
| |
|
| return %iphost; |
return %iphost; |
| } |
} |
|
Line 8399 explanation of a user role term
|
Line 8568 explanation of a user role term
|
| get_my_roles($uname,$udom,$context,$types,$roles,$roledoms) : |
get_my_roles($uname,$udom,$context,$types,$roles,$roledoms) : |
| 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 'user', roles for the user himself, |
(default), or if $context is 'userroles', roles for the user himself, |
| In the hash, keys are set to colon-sparated $uname,$udom,and $role, |
In the hash, keys are set to colon-sparated $uname,$udom,and $role, |
| and value is set to colon-separated start and end times for the role. |
and value is set to colon-separated start and end times for the role. |
| If no username and domain are specified, will default to current |
If no username and domain are specified, will default to current |
![[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