|
version 1.892, 2007/06/18 22:52:33
|
version 1.942, 2008/02/21 10:04:35
|
|
Line 320 sub convert_and_load_session_env {
|
Line 320 sub convert_and_load_session_env {
|
| my ($lonidsdir,$handle)=@_; |
my ($lonidsdir,$handle)=@_; |
| my @profile; |
my @profile; |
| { |
{ |
| open(my $idf,"$lonidsdir/$handle.id"); |
my $opened = open(my $idf,'+<',"$lonidsdir/$handle.id"); |
| |
if (!$opened) { |
| |
return 0; |
| |
} |
| flock($idf,LOCK_SH); |
flock($idf,LOCK_SH); |
| @profile=<$idf>; |
@profile=<$idf>; |
| close($idf); |
close($idf); |
|
Line 359 sub transfer_profile_to_env {
|
Line 362 sub transfer_profile_to_env {
|
| |
|
| my $convert; |
my $convert; |
| { |
{ |
| open(my $idf,"$lonidsdir/$handle.id"); |
my $opened = open(my $idf,'+<',"$lonidsdir/$handle.id"); |
| |
if (!$opened) { |
| |
return; |
| |
} |
| flock($idf,LOCK_SH); |
flock($idf,LOCK_SH); |
| if (tie(my %disk_env,'GDBM_File',"$lonidsdir/$handle.id", |
if (tie(my %disk_env,'GDBM_File',"$lonidsdir/$handle.id", |
| &GDBM_READER(),0640)) { |
&GDBM_READER(),0640)) { |
|
Line 391 sub transfer_profile_to_env {
|
Line 397 sub transfer_profile_to_env {
|
| } |
} |
| } |
} |
| |
|
| |
# ---------------------------------------------------- Check for valid session |
| |
sub check_for_valid_session { |
| |
my ($r) = @_; |
| |
my %cookies=CGI::Cookie->parse($r->header_in('Cookie')); |
| |
my $lonid=$cookies{'lonID'}; |
| |
return undef if (!$lonid); |
| |
|
| |
my $handle=&LONCAPA::clean_handle($lonid->value); |
| |
my $lonidsdir=$r->dir_config('lonIDsDir'); |
| |
return undef if (!-e "$lonidsdir/$handle.id"); |
| |
|
| |
my $opened = open(my $idf,'+<',"$lonidsdir/$handle.id"); |
| |
return undef if (!$opened); |
| |
|
| |
flock($idf,LOCK_SH); |
| |
my %disk_env; |
| |
if (!tie(%disk_env,'GDBM_File',"$lonidsdir/$handle.id", |
| |
&GDBM_READER(),0640)) { |
| |
return undef; |
| |
} |
| |
|
| |
if (!defined($disk_env{'user.name'}) |
| |
|| !defined($disk_env{'user.domain'})) { |
| |
return undef; |
| |
} |
| |
return $handle; |
| |
} |
| |
|
| sub timed_flock { |
sub timed_flock { |
| my ($file,$lock_type) = @_; |
my ($file,$lock_type) = @_; |
| my $failed=0; |
my $failed=0; |
|
Line 425 sub appenv {
|
Line 459 sub appenv {
|
| $env{$key}=$newenv{$key}; |
$env{$key}=$newenv{$key}; |
| } |
} |
| } |
} |
| open(my $env_file,$env{'user.environment'}); |
my $opened = open(my $env_file,'+<',$env{'user.environment'}); |
| if (&timed_flock($env_file,LOCK_EX) |
if ($opened |
| |
&& &timed_flock($env_file,LOCK_EX) |
| && |
&& |
| 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)) { |
|
Line 446 sub delenv {
|
Line 481 sub delenv {
|
| "Attempt to delete from environment ".$delthis); |
"Attempt to delete from environment ".$delthis); |
| return 'error'; |
return 'error'; |
| } |
} |
| open(my $env_file,$env{'user.environment'}); |
my $opened = open(my $env_file,'+<',$env{'user.environment'}); |
| if (&timed_flock($env_file,LOCK_EX) |
if ($opened |
| |
&& &timed_flock($env_file,LOCK_EX) |
| && |
&& |
| 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=~/^$delthis/) { |
if ($key=~/^$delthis/) { |
| delete($env{$key}); |
delete($env{$key}); |
| delete($disk_env{$key}); |
delete($disk_env{$key}); |
| } |
} |
| } |
} |
| untie(%disk_env); |
untie(%disk_env); |
| } |
} |
|
Line 477 sub get_env_multiple {
|
Line 513 sub get_env_multiple {
|
| } |
} |
| |
|
| # ------------------------------------------ Find out current server userload |
# ------------------------------------------ Find out current server userload |
| # there is a copy in lond |
|
| sub userload { |
sub userload { |
| my $numusers=0; |
my $numusers=0; |
| { |
{ |
|
Line 485 sub userload {
|
Line 520 sub userload {
|
| my $filename; |
my $filename; |
| my $curtime=time; |
my $curtime=time; |
| while ($filename=readdir(LONIDS)) { |
while ($filename=readdir(LONIDS)) { |
| if ($filename eq '.' || $filename eq '..') {next;} |
next if ($filename eq '.' || $filename eq '..'); |
| |
next if ($filename =~ /publicuser_\d+\.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 582 sub compare_server_load {
|
Line 618 sub compare_server_load {
|
| } |
} |
| return ($spare_server,$lowest_load); |
return ($spare_server,$lowest_load); |
| } |
} |
| |
|
| |
# --------------------------- ask offload servers if user already has a session |
| |
sub find_existing_session { |
| |
my ($udom,$uname) = @_; |
| |
foreach my $try_server (@{ $spareid{'primary'} }, |
| |
@{ $spareid{'default'} }) { |
| |
return $try_server if (&has_user_session($try_server, $udom, $uname)); |
| |
} |
| |
return; |
| |
} |
| |
|
| |
# -------------------------------- ask if server already has a session for user |
| |
sub has_user_session { |
| |
my ($lonid,$udom,$uname) = @_; |
| |
my $result = &reply(join(':','userhassession', |
| |
map {&escape($_)} ($udom,$uname)),$lonid); |
| |
return 1 if ($result eq 'ok'); |
| |
|
| |
return 0; |
| |
} |
| |
|
| # --------------------------------------------- Try to change a user's password |
# --------------------------------------------- Try to change a user's password |
| |
|
| sub changepass { |
sub changepass { |
|
Line 856 sub is_domainimage {
|
Line 913 sub is_domainimage {
|
| return; |
return; |
| } |
} |
| |
|
| |
sub inst_directory_query { |
| |
my ($srch) = @_; |
| |
my $udom = $srch->{'srchdomain'}; |
| |
my %results; |
| |
my $homeserver = &domain($udom,'primary'); |
| |
my $outcome; |
| |
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') { |
| |
if ($response eq 'unavailable') { |
| |
$outcome = $response; |
| |
} else { |
| |
$outcome = 'ok'; |
| |
my @matches = split(/\n/,$response); |
| |
foreach my $match (@matches) { |
| |
my ($key,$value) = split(/=/,$match); |
| |
$results{&unescape($key).':'.$udom} = &thaw_unescape($value); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return ($outcome,%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($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; |
| |
if ($reply =~ /\n/) { |
| |
@matches = split(/\n/,$reply); |
| |
} else { |
| |
@matches = split(/\&/,$reply); |
| |
} |
| |
foreach my $match (@matches) { |
| |
my ($uname,$udom,%userhash); |
| |
foreach my $entry (split(/:/,$match)) { |
| |
my ($key,$value) = |
| |
map {&unescape($_);} split(/=/,$entry); |
| |
$userhash{$key} = $value; |
| |
if ($key eq 'username') { |
| |
$uname = $value; |
| |
} elsif ($key eq 'domain') { |
| |
$udom = $value; |
| |
} |
| |
} |
| |
$results{$uname.':'.$udom} = \%userhash; |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return %results; |
| |
} |
| |
|
| |
sub get_instuser { |
| |
my ($udom,$uname,$id) = @_; |
| |
my $homeserver = &domain($udom,'primary'); |
| |
my ($outcome,%results); |
| |
if ($homeserver ne '') { |
| |
my $queryid=&reply("querysend:getinstuser:".&escape($uname).':'. |
| |
&escape($id).':'.&escape($udom),$homeserver); |
| |
my $host=&hostname($homeserver); |
| |
if ($queryid !~/^\Q$host\E\_/) { |
| |
&logthis('get_instuser 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') { |
| |
if ($response eq 'unavailable') { |
| |
$outcome = $response; |
| |
} else { |
| |
$outcome = 'ok'; |
| |
my @matches = split(/\n/,$response); |
| |
foreach my $match (@matches) { |
| |
my ($key,$value) = split(/=/,$match); |
| |
$results{&unescape($key)} = &thaw_unescape($value); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
my %userinfo; |
| |
if (ref($results{$uname}) eq 'HASH') { |
| |
%userinfo = %{$results{$uname}}; |
| |
} |
| |
return ($outcome,%userinfo); |
| |
} |
| |
|
| |
sub inst_rulecheck { |
| |
my ($udom,$uname,$id,$item,$rules) = @_; |
| |
my %returnhash; |
| |
if ($udom ne '') { |
| |
if (ref($rules) eq 'ARRAY') { |
| |
@{$rules} = map {&escape($_);} (@{$rules}); |
| |
my $rulestr = join(':',@{$rules}); |
| |
my $homeserver=&domain($udom,'primary'); |
| |
if (($homeserver ne '') && ($homeserver ne 'no_host')) { |
| |
my $response; |
| |
if ($item eq 'username') { |
| |
$response=&unescape(&reply('instrulecheck:'.&escape($udom). |
| |
':'.&escape($uname).':'.$rulestr, |
| |
$homeserver)); |
| |
} elsif ($item eq 'id') { |
| |
$response=&unescape(&reply('instidrulecheck:'.&escape($udom). |
| |
':'.&escape($id).':'.$rulestr, |
| |
$homeserver)); |
| |
} |
| |
if ($response ne 'refused') { |
| |
my @pairs=split(/\&/,$response); |
| |
foreach my $item (@pairs) { |
| |
my ($key,$value)=split(/=/,$item,2); |
| |
$key = &unescape($key); |
| |
next if ($key =~ /^error: 2 /); |
| |
$returnhash{$key}=&thaw_unescape($value); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return %returnhash; |
| |
} |
| |
|
| |
sub inst_userrules { |
| |
my ($udom,$check) = @_; |
| |
my (%ruleshash,@ruleorder); |
| |
if ($udom ne '') { |
| |
my $homeserver=&domain($udom,'primary'); |
| |
if (($homeserver ne '') && ($homeserver ne 'no_host')) { |
| |
my $response; |
| |
if ($check eq 'id') { |
| |
$response=&reply('instidrules:'.&escape($udom), |
| |
$homeserver); |
| |
} else { |
| |
$response=&reply('instuserrules:'.&escape($udom), |
| |
$homeserver); |
| |
} |
| |
if (($response ne 'refused') && ($response ne 'error') && |
| |
($response ne 'unknown_cmd') && |
| |
($response ne 'no_such_host')) { |
| |
my ($hashitems,$orderitems) = split(/:/,$response); |
| |
my @pairs=split(/\&/,$hashitems); |
| |
foreach my $item (@pairs) { |
| |
my ($key,$value)=split(/=/,$item,2); |
| |
$key = &unescape($key); |
| |
next if ($key =~ /^error: 2 /); |
| |
$ruleshash{$key}=&thaw_unescape($value); |
| |
} |
| |
my @esc_order = split(/\&/,$orderitems); |
| |
foreach my $item (@esc_order) { |
| |
push(@ruleorder,&unescape($item)); |
| |
} |
| |
} |
| |
} |
| |
} |
| |
return (\%ruleshash,\@ruleorder); |
| |
} |
| |
|
| # --------------------------------------------------- Assign a key to a student |
# --------------------------------------------------- Assign a key to a student |
| |
|
| sub assign_access_key { |
sub assign_access_key { |
|
Line 1132 sub do_cache_new {
|
Line 1391 sub do_cache_new {
|
| $time=600; |
$time=600; |
| } |
} |
| if ($debug) { &Apache::lonnet::logthis("Setting $id to $value"); } |
if ($debug) { &Apache::lonnet::logthis("Setting $id to $value"); } |
| if (!($memcache->set($id,$setvalue,$time))) { |
my $result = $memcache->set($id,$setvalue,$time); |
| |
if (! $result) { |
| &logthis("caching of id -> $id failed"); |
&logthis("caching of id -> $id failed"); |
| |
$memcache->disconnect_all(); |
| } |
} |
| # need to make a copy of $value |
# need to make a copy of $value |
| #&make_room($id,$value,$debug); |
&make_room($id,$value,$debug); |
| return $value; |
return $value; |
| } |
} |
| |
|
| sub make_room { |
sub make_room { |
| my ($id,$value,$debug)=@_; |
my ($id,$value,$debug)=@_; |
| $remembered{$id}=$value; |
|
| |
$remembered{$id}= (ref($value)) ? &Storable::dclone($value) |
| |
: $value; |
| if ($to_remember<0) { return; } |
if ($to_remember<0) { return; } |
| $accessed{$id}=[&gettimeofday()]; |
$accessed{$id}=[&gettimeofday()]; |
| if (scalar(keys(%remembered)) <= $to_remember) { return; } |
if (scalar(keys(%remembered)) <= $to_remember) { return; } |
|
Line 1372 sub ssi_body {
|
Line 1635 sub ssi_body {
|
| &ssi($filelink,%form)); |
&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; |
| $output=~s/^.*?\<body[^\>]*\>//si; |
$output=~s/^.*?\<body[^\>]*\>//si; |
| $output=~s/(.*)\<\/body\s*\>.*?$/$1/si; |
$output=~s/\<\/body\s*\>.*?$//si; |
| return $output; |
return $output; |
| } |
} |
| |
|
|
Line 1387 sub absolute_url {
|
Line 1650 sub absolute_url {
|
| return $protocol.$host_name; |
return $protocol.$host_name; |
| } |
} |
| |
|
| |
# |
| |
# Server side include. |
| |
# Parameters: |
| |
# fn Possibly encrypted resource name/id. |
| |
# form Hash that describes how the rendering should be done |
| |
# and other things. |
| |
# r Optional reference that will be given the response. |
| |
# This is mostly provided so that the caller can implement |
| |
# error detection, recovery and retry policies. |
| |
# |
| |
# Returns: |
| |
# The content of the response. |
| sub ssi { |
sub ssi { |
| |
|
| my ($fn,%form)=@_; |
my ($fn,%form, $r)=@_; |
| |
|
| my $ua=new LWP::UserAgent; |
my $ua=new LWP::UserAgent; |
| |
|
| 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 1407 sub ssi {
|
Line 1682 sub ssi {
|
| $request->header(Cookie => $ENV{'HTTP_COOKIE'}); |
$request->header(Cookie => $ENV{'HTTP_COOKIE'}); |
| my $response=$ua->request($request); |
my $response=$ua->request($request); |
| |
|
| |
if ($r) { |
| |
$$r = $response; |
| |
} |
| |
|
| return $response->content; |
return $response->content; |
| } |
} |
| |
|
|
Line 1923 sub flushcourselogs {
|
Line 2202 sub flushcourselogs {
|
| # times and course titles for all courseids |
# times and course titles for all courseids |
| # |
# |
| my %courseidbuffer=(); |
my %courseidbuffer=(); |
| foreach my $crsid (keys %courselogs) { |
foreach my $crsid (keys(%courselogs)) { |
| if (&reply('log:'.$coursedombuf{$crsid}.':'.$coursenumbuf{$crsid}.':'. |
if (&reply('log:'.$coursedombuf{$crsid}.':'.$coursenumbuf{$crsid}.':'. |
| &escape($courselogs{$crsid}), |
&escape($courselogs{$crsid}), |
| $coursehombuf{$crsid}) eq 'ok') { |
$coursehombuf{$crsid}) eq 'ok') { |
|
Line 1936 sub flushcourselogs {
|
Line 2215 sub flushcourselogs {
|
| delete $courselogs{$crsid}; |
delete $courselogs{$crsid}; |
| } |
} |
| } |
} |
| if ($courseidbuffer{$coursehombuf{$crsid}}) { |
$courseidbuffer{$coursehombuf{$crsid}}{$crsid} = { |
| $courseidbuffer{$coursehombuf{$crsid}}.='&'. |
'description' => $coursedescrbuf{$crsid}, |
| &escape($crsid).'='.&escape($coursedescrbuf{$crsid}). |
'inst_code' => $courseinstcodebuf{$crsid}, |
| ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid}).':'.&escape($coursetypebuf{$crsid}); |
'type' => $coursetypebuf{$crsid}, |
| } else { |
'owner' => $courseownerbuf{$crsid}, |
| $courseidbuffer{$coursehombuf{$crsid}}= |
}; |
| &escape($crsid).'='.&escape($coursedescrbuf{$crsid}). |
|
| ':'.&escape($courseinstcodebuf{$crsid}).':'.&escape($courseownerbuf{$crsid}).':'.&escape($coursetypebuf{$crsid}); |
|
| } |
|
| } |
} |
| # |
# |
| # Write course id database (reverse lookup) to homeserver of courses |
# Write course id database (reverse lookup) to homeserver of courses |
| # Is used in pickcourse |
# Is used in pickcourse |
| # |
# |
| foreach my $crs_home (keys(%courseidbuffer)) { |
foreach my $crs_home (keys(%courseidbuffer)) { |
| &courseidput(&host_domain($crs_home),$courseidbuffer{$crs_home}, |
my $response = &courseidput(&host_domain($crs_home), |
| $crs_home); |
$courseidbuffer{$crs_home}, |
| |
$crs_home,'timeonly'); |
| } |
} |
| # |
# |
| # File accesses |
# File accesses |
|
Line 2008 sub flushcourselogs {
|
Line 2285 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 2113 sub userrolelog {
|
Line 2390 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 2130 sub get_course_adv_roles {
|
Line 2415 sub get_course_adv_roles {
|
| my %coursehash=&coursedescription($cid); |
my %coursehash=&coursedescription($cid); |
| my %nothide=(); |
my %nothide=(); |
| foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
| $nothide{join(':',split(/[\@\:]/,$user))}=1; |
if ($user !~ /:/) { |
| |
$nothide{join(':',split(/[\@]/,$user))}=1; |
| |
} else { |
| |
$nothide{$user}=1; |
| |
} |
| } |
} |
| my %returnhash=(); |
my %returnhash=(); |
| my %dumphash= |
my %dumphash= |
|
Line 2158 sub get_course_adv_roles {
|
Line 2447 sub get_course_adv_roles {
|
| } |
} |
| |
|
| sub get_my_roles { |
sub get_my_roles { |
| my ($uname,$udom,$context,$types,$roles,$roledoms)=@_; |
my ($uname,$udom,$context,$types,$roles,$roledoms,$withsec,$hidepriv)=@_; |
| 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; |
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) { |
| |
my %coursehash=&coursedescription($udom.'_'.$uname); |
| |
foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
| |
if ($user !~ /:/) { |
| |
$nothide{join(':',split(/[\@]/,$user))} = 1; |
| |
} else { |
| |
$nothide{$user} = 1; |
| |
} |
| |
} |
| |
} |
| } |
} |
| my %returnhash=(); |
my %returnhash=(); |
| my $now=time; |
my $now=time; |
|
Line 2179 sub get_my_roles {
|
Line 2478 sub get_my_roles {
|
| } |
} |
| if (($tstart) && ($tstart<0)) { next; } |
if (($tstart) && ($tstart<0)) { next; } |
| my $status = 'active'; |
my $status = 'active'; |
| if (($tend) && ($tend<$now)) { |
if (($tend) && ($tend<=$now)) { |
| $status = 'previous'; |
$status = 'previous'; |
| } |
} |
| if (($tstart) && ($now<$tstart)) { |
if (($tstart) && ($now<$tstart)) { |
|
Line 2208 sub get_my_roles {
|
Line 2507 sub get_my_roles {
|
| } |
} |
| if (ref($roles) eq 'ARRAY') { |
if (ref($roles) eq 'ARRAY') { |
| if (!grep(/^\Q$role\E$/,@{$roles})) { |
if (!grep(/^\Q$role\E$/,@{$roles})) { |
| |
if ($role =~ /^cr\//) { |
| |
if (!grep(/^cr$/,@{$roles})) { |
| |
next; |
| |
} |
| |
} else { |
| |
next; |
| |
} |
| |
} |
| |
} |
| |
if ($hidepriv) { |
| |
if ((&privileged($username,$domain)) && |
| |
(!$nothide{$username.':'.$domain})) { |
| next; |
next; |
| } |
} |
| } |
} |
| $returnhash{$username.':'.$domain.':'.$role}=$tstart.':'.$tend; |
if ($withsec) { |
| |
$returnhash{$username.':'.$domain.':'.$role.':'.$section} = |
| |
$tstart.':'.$tend; |
| |
} else { |
| |
$returnhash{$username.':'.$domain.':'.$role}=$tstart.':'.$tend; |
| |
} |
| } |
} |
| return %returnhash; |
return %returnhash; |
| } |
} |
|
Line 2250 sub getannounce {
|
Line 2566 sub getannounce {
|
| # |
# |
| |
|
| sub courseidput { |
sub courseidput { |
| my ($domain,$what,$coursehome)=@_; |
my ($domain,$storehash,$coursehome,$caller) = @_; |
| return &reply('courseidput:'.$domain.':'.$what,$coursehome); |
my $outcome; |
| |
if ($caller eq 'timeonly') { |
| |
my $cids = ''; |
| |
foreach my $item (keys(%$storehash)) { |
| |
$cids.=&escape($item).'&'; |
| |
} |
| |
$cids=~s/\&$//; |
| |
$outcome = &reply('courseidputhash:'.$domain.':'.$caller.':'.$cids, |
| |
$coursehome); |
| |
} else { |
| |
my $items = ''; |
| |
foreach my $item (keys(%$storehash)) { |
| |
$items.= &escape($item).'='. |
| |
&freeze_escape($$storehash{$item}).'&'; |
| |
} |
| |
$items=~s/\&$//; |
| |
$outcome = &reply('courseidputhash:'.$domain.':'.$caller.':'.$items, |
| |
$coursehome); |
| |
} |
| |
if ($outcome eq 'unknown_cmd') { |
| |
my $what; |
| |
foreach my $cid (keys(%$storehash)) { |
| |
$what .= &escape($cid).'='; |
| |
foreach my $item ('description','inst_code','owner','type') { |
| |
$what .= &escape($storehash->{$cid}{$item}).':'; |
| |
} |
| |
$what =~ s/\:$/&/; |
| |
} |
| |
$what =~ s/\&$//; |
| |
return &reply('courseidput:'.$domain.':'.$what,$coursehome); |
| |
} else { |
| |
return $outcome; |
| |
} |
| } |
} |
| |
|
| sub courseiddump { |
sub courseiddump { |
| my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,$coursefilter,$hostidflag,$hostidref,$typefilter,$regexp_ok)=@_; |
my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter, |
| my %returnhash=(); |
$coursefilter,$hostidflag,$hostidref,$typefilter,$regexp_ok)=@_; |
| unless ($domfilter) { $domfilter=''; } |
my $as_hash = 1; |
| |
my %returnhash; |
| |
if (!$domfilter) { $domfilter=''; } |
| my %libserv = &all_library(); |
my %libserv = &all_library(); |
| foreach my $tryserver (keys(%libserv)) { |
foreach my $tryserver (keys(%libserv)) { |
| if ( ( $hostidflag == 1 |
if ( ( $hostidflag == 1 |
| && grep(/^\Q$tryserver\E$/,@{$hostidref}) ) |
&& grep(/^\Q$tryserver\E$/,@{$hostidref}) ) |
| || (!defined($hostidflag)) ) { |
|| (!defined($hostidflag)) ) { |
| |
|
| if ($domfilter eq '' |
if (($domfilter eq '') || |
| || (&host_domain($tryserver) eq $domfilter)) { |
(&host_domain($tryserver) eq $domfilter)) { |
| foreach my $line ( |
my $rep = |
| split(/\&/,&reply('courseiddump:'.&host_domain($tryserver).':'. |
&reply('courseiddump:'.&host_domain($tryserver).':'. |
| $sincefilter.':'.&escape($descfilter).':'. |
$sincefilter.':'.&escape($descfilter).':'. |
| &escape($instcodefilter).':'.&escape($ownerfilter).':'.&escape($coursefilter).':'.&escape($typefilter).':'.&escape($regexp_ok), |
&escape($instcodefilter).':'.&escape($ownerfilter). |
| $tryserver))) { |
':'.&escape($coursefilter).':'.&escape($typefilter). |
| my ($key,$value)=split(/\=/,$line,2); |
':'.&escape($regexp_ok).':'.$as_hash,$tryserver); |
| if (($key) && ($value)) { |
my @pairs=split(/\&/,$rep); |
| $returnhash{&unescape($key)}=$value; |
foreach my $item (@pairs) { |
| } |
my ($key,$value)=split(/\=/,$item,2); |
| |
$key = &unescape($key); |
| |
next if ($key =~ /^error: 2 /); |
| |
my $result = &thaw_unescape($value); |
| |
if (ref($result) eq 'HASH') { |
| |
$returnhash{$key}=$result; |
| |
} else { |
| |
my @responses = split(/:/,$value); |
| |
my @items = ('description','inst_code','owner','type'); |
| |
for (my $i=0; $i<@responses; $i++) { |
| |
$returnhash{$key}{$items[$i]} = &unescape($responses[$i]); |
| |
} |
| |
} |
| } |
} |
| } |
} |
| } |
} |
|
Line 2320 sub get_domain_roles {
|
Line 2682 sub get_domain_roles {
|
| if (undef($enddate) || $enddate eq '') { |
if (undef($enddate) || $enddate eq '') { |
| $enddate = '.'; |
$enddate = '.'; |
| } |
} |
| my $rolelist = join(':',@{$roles}); |
my $rolelist; |
| |
if (ref($roles) eq 'ARRAY') { |
| |
$rolelist = join(':',@{$roles}); |
| |
} |
| my %personnel = (); |
my %personnel = (); |
| |
|
| my %servers = &get_servers($dom,'library'); |
my %servers = &get_servers($dom,'library'); |
|
Line 2346 sub get_first_access {
|
Line 2711 sub get_first_access {
|
| 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 ($type eq 'map') { |
if ($type eq 'course') { |
| |
$res='course'; |
| |
} elsif ($type eq 'map') { |
| $res=&symbread($map); |
$res=&symbread($map); |
| } else { |
} else { |
| $res=$symb; |
$res=$symb; |
|
Line 2359 sub set_first_access {
|
Line 2726 sub set_first_access {
|
| my ($type)=@_; |
my ($type)=@_; |
| 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 'map') { |
if ($type eq 'course') { |
| |
$res='course'; |
| |
} elsif ($type eq 'map') { |
| $res=&symbread($map); |
$res=&symbread($map); |
| } else { |
} else { |
| $res=$symb; |
$res=$symb; |
|
Line 3174 sub set_userprivs {
|
Line 3543 sub set_userprivs {
|
| } |
} |
| foreach my $role (keys(%{$allroles})) { |
foreach my $role (keys(%{$allroles})) { |
| my %thesepriv; |
my %thesepriv; |
| if (($role=~/^au/) || ($role=~/^ca/)) { $author=1; } |
if (($role=~/^au/) || ($role=~/^ca/) || ($role=~/^aa/)) { $author=1; } |
| foreach my $item (split(/:/,$$allroles{$role})) { |
foreach my $item (split(/:/,$$allroles{$role})) { |
| if ($item ne '') { |
if ($item ne '') { |
| my ($privilege,$restrictions)=split(/&/,$item); |
my ($privilege,$restrictions)=split(/&/,$item); |
|
Line 3804 sub customaccess {
|
Line 4173 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 4352 sub update_portfolio_table {
|
Line 4735 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 4386 sub fetch_enrollment_query {
|
Line 4786 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 4429 sub get_query_reply {
|
Line 4829 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 4484 sub auto_run {
|
Line 4884 sub auto_run {
|
| $response = 1; |
$response = 1; |
| } |
} |
| } else { |
} else { |
| my $homeserver = &homeserver($cnum,$cdom); |
my $homeserver; |
| $response = &reply('autorun:'.$cdom,$homeserver); |
if (&is_course($cdom,$cnum)) { |
| |
$homeserver = &homeserver($cnum,$cdom); |
| |
} else { |
| |
$homeserver = &domain($cdom,'primary'); |
| |
} |
| |
if ($homeserver ne 'no_host') { |
| |
$response = &reply('autorun:'.$cdom,$homeserver); |
| |
} |
| } |
} |
| return $response; |
return $response; |
| } |
} |
|
Line 4496 sub auto_get_sections {
|
Line 4903 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 4535 sub auto_create_password {
|
Line 4942 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 4643 sub auto_instcode_format {
|
Line 5050 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 4689 sub auto_instcode_defaults {
|
Line 5096 sub auto_instcode_defaults {
|
| } |
} |
| |
|
| sub auto_validate_class_sec { |
sub auto_validate_class_sec { |
| my ($cdom,$cnum,$owner,$inst_class) = @_; |
my ($cdom,$cnum,$owners,$inst_class) = @_; |
| my $homeserver = &homeserver($cnum,$cdom); |
my $homeserver = &homeserver($cnum,$cdom); |
| |
my $ownerlist; |
| |
if (ref($owners) eq 'ARRAY') { |
| |
$ownerlist = join(',',@{$owners}); |
| |
} else { |
| |
$ownerlist = $owners; |
| |
} |
| my $response=&reply('autovalidateclass_sec:'.$inst_class.':'. |
my $response=&reply('autovalidateclass_sec:'.$inst_class.':'. |
| &escape($owner).':'.$cdom,$homeserver); |
&escape($ownerlist).':'.$cdom,$homeserver); |
| return $response; |
return $response; |
| } |
} |
| |
|
|
Line 4885 sub assignrole {
|
Line 5298 sub assignrole {
|
| } else { |
} else { |
| my $cwosec=$url; |
my $cwosec=$url; |
| $cwosec=~s/^\/($match_domain)\/($match_courseid)\/.*/$1\/$2/; |
$cwosec=~s/^\/($match_domain)\/($match_courseid)\/.*/$1\/$2/; |
| unless ((&allowed('c'.$role,$cwosec)) || &allowed('c'.$role,$udom)) { |
if (!(&allowed('c'.$role,$cwosec)) && !(&allowed('c'.$role,$udom))) { |
| &logthis('Refused assignrole: '. |
my $refused; |
| $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '. |
if (($env{'request.course.sec'} ne '') && ($role eq 'st')) { |
| $env{'user.name'}.' at '.$env{'user.domain'}); |
if (!(&allowed('c'.$role,$url))) { |
| return 'refused'; |
$refused = 1; |
| |
} |
| |
} else { |
| |
$refused = 1; |
| |
} |
| |
if ($refused) { |
| |
&logthis('Refused assignrole: '.$udom.' '.$uname.' '.$url. |
| |
' '.$role.' '.$end.' '.$start.' by '. |
| |
$env{'user.name'}.' at '.$env{'user.domain'}); |
| |
return 'refused'; |
| |
} |
| } |
} |
| $mrole=$role; |
$mrole=$role; |
| } |
} |
|
Line 5023 sub modifyuser {
|
Line 5446 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 5045 sub modifyuser {
|
Line 5469 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 5218 sub createcourse {
|
Line 5644 sub createcourse {
|
| } |
} |
| # ----------------------------------------------------------------- Course made |
# ----------------------------------------------------------------- Course made |
| # log existence |
# log existence |
| &courseidput($udom,&escape($udom.'_'.$uname).'='.&escape($description). |
my $newcourse = { |
| ':'.&escape($inst_code).':'.&escape($course_owner).':'. |
$udom.'_'.$uname => { |
| &escape($crstype),$uhome); |
description => $description, |
| &flushcourselogs(); |
inst_code => $inst_code, |
| |
owner => $course_owner, |
| |
type => $crstype, |
| |
}, |
| |
}; |
| |
&courseidput($udom,$newcourse,$uhome,'notime'); |
| # set toplevel url |
# set toplevel url |
| my $topurl=$url; |
my $topurl=$url; |
| unless ($nonstandard) { |
unless ($nonstandard) { |
|
Line 5251 ENDINITMAP
|
Line 5682 ENDINITMAP
|
| sub is_course { |
sub is_course { |
| my ($cdom,$cnum) = @_; |
my ($cdom,$cnum) = @_; |
| my %courses = &courseiddump($cdom,'.',1,'.','.',$cnum,undef, |
my %courses = &courseiddump($cdom,'.',1,'.','.',$cnum,undef, |
| undef,'.'); |
undef,'.',undef,1); |
| if (exists($courses{$cdom.'_'.$cnum})) { |
if (exists($courses{$cdom.'_'.$cnum})) { |
| return 1; |
return 1; |
| } |
} |
|
Line 6023 sub resdata {
|
Line 6454 sub resdata {
|
| } |
} |
| if (!ref($result)) { return $result; } |
if (!ref($result)) { return $result; } |
| foreach my $item (@which) { |
foreach my $item (@which) { |
| if (defined($result->{$item})) { |
if (defined($result->{$item->[0]})) { |
| return $result->{$item}; |
return [$result->{$item->[0]},$item->[1]]; |
| } |
} |
| } |
} |
| return undef; |
return undef; |
|
Line 6190 sub EXT {
|
Line 6621 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 6230 sub EXT {
|
Line 6667 sub EXT {
|
| # ----------------------------------------------------------- first, check user |
# ----------------------------------------------------------- first, check user |
| |
|
| my $userreply=&resdata($uname,$udom,'user', |
my $userreply=&resdata($uname,$udom,'user', |
| ($courselevelr,$courselevelm, |
([$courselevelr,'resource'], |
| $courselevel)); |
[$courselevelm,'map' ], |
| if (defined($userreply)) { return $userreply; } |
[$courselevel, 'course' ])); |
| |
if (defined($userreply)) { return &get_reply($userreply); } |
| |
|
| # ------------------------------------------------ second, check some of course |
# ------------------------------------------------ second, check some of course |
| my $coursereply; |
my $coursereply; |
| if (@groups > 0) { |
if (@groups > 0) { |
| $coursereply = &check_group_parms($courseid,\@groups,$symbparm, |
$coursereply = &check_group_parms($courseid,\@groups,$symbparm, |
| $mapparm,$spacequalifierrest); |
$mapparm,$spacequalifierrest); |
| if (defined($coursereply)) { return $coursereply; } |
if (defined($coursereply)) { return &get_reply($coursereply); } |
| } |
} |
| |
|
| $coursereply=&resdata($env{'course.'.$courseid.'.num'}, |
$coursereply=&resdata($env{'course.'.$courseid.'.num'}, |
| $env{'course.'.$courseid.'.domain'}, |
$env{'course.'.$courseid.'.domain'}, |
| 'course', |
'course', |
| ($seclevelr,$seclevelm,$seclevel, |
([$seclevelr, 'resource'], |
| $courselevelr)); |
[$seclevelm, 'map' ], |
| if (defined($coursereply)) { return $coursereply; } |
[$seclevel, 'course' ], |
| |
[$courselevelr,'resource'])); |
| |
if (defined($coursereply)) { return &get_reply($coursereply); } |
| |
|
| # ------------------------------------------------------ third, check map parms |
# ------------------------------------------------------ third, check map parms |
| my %parmhash=(); |
my %parmhash=(); |
|
Line 6258 sub EXT {
|
Line 6698 sub EXT {
|
| $thisparm=$parmhash{$symbparm}; |
$thisparm=$parmhash{$symbparm}; |
| untie(%parmhash); |
untie(%parmhash); |
| } |
} |
| if ($thisparm) { return $thisparm; } |
if ($thisparm) { return &get_reply([$thisparm,'resource']); } |
| } |
} |
| # ------------------------------------------ fourth, look in resource metadata |
# ------------------------------------------ fourth, look in resource metadata |
| |
|
|
Line 6271 sub EXT {
|
Line 6711 sub EXT {
|
| $filename=$env{'request.filename'}; |
$filename=$env{'request.filename'}; |
| } |
} |
| my $metadata=&metadata($filename,$spacequalifierrest); |
my $metadata=&metadata($filename,$spacequalifierrest); |
| if (defined($metadata)) { return $metadata; } |
if (defined($metadata)) { return &get_reply([$metadata,'resource']); } |
| $metadata=&metadata($filename,'parameter_'.$spacequalifierrest); |
$metadata=&metadata($filename,'parameter_'.$spacequalifierrest); |
| if (defined($metadata)) { return $metadata; } |
if (defined($metadata)) { return &get_reply([$metadata,'resource']); } |
| |
|
| # ---------------------------------------------- fourth, look in rest pf course |
# ---------------------------------------------- fourth, look in rest of course |
| if ($symbparm && defined($courseid) && |
if ($symbparm && defined($courseid) && |
| $courseid eq $env{'request.course.id'}) { |
$courseid eq $env{'request.course.id'}) { |
| my $coursereply=&resdata($env{'course.'.$courseid.'.num'}, |
my $coursereply=&resdata($env{'course.'.$courseid.'.num'}, |
| $env{'course.'.$courseid.'.domain'}, |
$env{'course.'.$courseid.'.domain'}, |
| 'course', |
'course', |
| ($courselevelm,$courselevel)); |
([$courselevelm,'map' ], |
| if (defined($coursereply)) { return $coursereply; } |
[$courselevel, 'course'])); |
| |
if (defined($coursereply)) { return &get_reply($coursereply); } |
| } |
} |
| # ------------------------------------------------------------------ Cascade up |
# ------------------------------------------------------------------ Cascade up |
| unless ($space eq '0') { |
unless ($space eq '0') { |
|
Line 6290 sub EXT {
|
Line 6731 sub EXT {
|
| my $id=pop(@parts); |
my $id=pop(@parts); |
| my $part=join('_',@parts); |
my $part=join('_',@parts); |
| if ($part eq '') { $part='0'; } |
if ($part eq '') { $part='0'; } |
| my $partgeneral=&EXT('resource.'.$part.'.'.$qualifierrest, |
my @partgeneral=&EXT('resource.'.$part.'.'.$qualifierrest, |
| $symbparm,$udom,$uname,$section,1); |
$symbparm,$udom,$uname,$section,1); |
| if (defined($partgeneral)) { return $partgeneral; } |
if (defined($partgeneral[0])) { return &get_reply(\@partgeneral); } |
| } |
} |
| if ($recurse) { return undef; } |
if ($recurse) { return undef; } |
| my $pack_def=&packages_tab_default($filename,$varname); |
my $pack_def=&packages_tab_default($filename,$varname); |
| if (defined($pack_def)) { return $pack_def; } |
if (defined($pack_def)) { return &get_reply([$pack_def,'resource']); } |
| |
|
| # ---------------------------------------------------- Any other user namespace |
# ---------------------------------------------------- Any other user namespace |
| } elsif ($realm eq 'environment') { |
} elsif ($realm eq 'environment') { |
| # ----------------------------------------------------------------- environment |
# ----------------------------------------------------------------- environment |
|
Line 6325 sub EXT {
|
Line 6765 sub EXT {
|
| return ''; |
return ''; |
| } |
} |
| |
|
| |
sub get_reply { |
| |
my ($reply_value) = @_; |
| |
if (ref($reply_value) eq 'ARRAY') { |
| |
if (wantarray) { |
| |
return @$reply_value; |
| |
} |
| |
return $reply_value->[0]; |
| |
} else { |
| |
return $reply_value; |
| |
} |
| |
} |
| |
|
| sub check_group_parms { |
sub check_group_parms { |
| my ($courseid,$groups,$symbparm,$mapparm,$what) = @_; |
my ($courseid,$groups,$symbparm,$mapparm,$what) = @_; |
| my @groupitems = (); |
my @groupitems = (); |
| my $resultitem; |
my $resultitem; |
| my @levels = ($symbparm,$mapparm,$what); |
my @levels = ([$symbparm,'resource'],[$mapparm,'map'],[$what,'course']); |
| foreach my $group (@{$groups}) { |
foreach my $group (@{$groups}) { |
| foreach my $level (@levels) { |
foreach my $level (@levels) { |
| my $item = $courseid.'.['.$group.'].'.$level; |
my $item = $courseid.'.['.$group.'].'.$level->[0]; |
| push(@groupitems,$item); |
push(@groupitems,[$item,$level->[1]]); |
| } |
} |
| } |
} |
| my $coursereply = &resdata($env{'course.'.$courseid.'.num'}, |
my $coursereply = &resdata($env{'course.'.$courseid.'.num'}, |
|
Line 6426 sub metadata {
|
Line 6878 sub metadata {
|
| 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|/bulletinboard$|)) || |
| ($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ /^~/) || |
($uri =~ m|/$|) || ($uri =~ m|/.meta$|) ) { |
| ($uri =~ m|home/$match_username/public_html/|)) { |
return undef; |
| |
} |
| |
if (($uri =~ /^~/ || $uri =~ m{home/$match_username/public_html/}) |
| |
&& &Apache::lonxml::get_state('target') =~ /^(|meta)$/) { |
| return undef; |
return undef; |
| } |
} |
| my $filename=$uri; |
my $filename=$uri; |
|
Line 6448 sub metadata {
|
Line 6903 sub metadata {
|
| # if (! exists($metacache{$uri})) { |
# if (! exists($metacache{$uri})) { |
| # $metacache{$uri}={}; |
# $metacache{$uri}={}; |
| # } |
# } |
| |
my $cachetime = 60*60; |
| if ($liburi) { |
if ($liburi) { |
| $liburi=&declutter($liburi); |
$liburi=&declutter($liburi); |
| $filename=$liburi; |
$filename=$liburi; |
|
Line 6458 sub metadata {
|
Line 6914 sub metadata {
|
| my %metathesekeys=(); |
my %metathesekeys=(); |
| unless ($filename=~/\.meta$/) { $filename.='.meta'; } |
unless ($filename=~/\.meta$/) { $filename.='.meta'; } |
| my $metastring; |
my $metastring; |
| if ($uri !~ m -^(editupload)/-) { |
if ($uri =~ /^~/ || $uri =~ m{home/$match_username/public_html/}) { |
| |
my $which = &hreflocation('','/'.($liburi || $uri)); |
| |
$metastring = |
| |
&Apache::lonnet::ssi_body($which, |
| |
('grade_target' => 'meta')); |
| |
$cachetime = 1; # only want this cached in the child not long term |
| |
} elsif ($uri !~ m -^(editupload)/-) { |
| 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 6563 sub metadata {
|
Line 7025 sub metadata {
|
| # only ws inside the tag, and not in default, so use default |
# only ws inside the tag, and not in default, so use default |
| # as value |
# as value |
| $metaentry{':'.$unikey}=$default; |
$metaentry{':'.$unikey}=$default; |
| } else { |
} elsif ( $internaltext =~ /\S/ ) { |
| # either something interesting inside the tag or default |
# something interesting inside the tag |
| # uninteresting |
|
| $metaentry{':'.$unikey}=$internaltext; |
$metaentry{':'.$unikey}=$internaltext; |
| |
} else { |
| |
# no interesting values, don't set a default |
| } |
} |
| # end of not-a-package not-a-library import |
# end of not-a-package not-a-library import |
| } |
} |
|
Line 6624 sub metadata {
|
Line 7087 sub metadata {
|
| $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,60*60); |
&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 |
| } |
} |
| return $metaentry{':'.$what}; |
return $metaentry{':'.$what}; |
|
Line 6706 sub gettitle {
|
Line 7169 sub gettitle {
|
| } |
} |
| my ($map,$resid,$url)=&decode_symb($symb); |
my ($map,$resid,$url)=&decode_symb($symb); |
| my $title=''; |
my $title=''; |
| my %bighash; |
if (!$map && $resid == 0 && $url =~/default\.sequence$/) { |
| if (tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db', |
$title = $env{'course.'.$env{'request.course.id'}.'.description'}; |
| &GDBM_READER(),0640)) { |
} else { |
| my $mapid=$bighash{'map_pc_'.&clutter($map)}; |
if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db', |
| $title=$bighash{'title_'.$mapid.'.'.$resid}; |
&GDBM_READER(),0640)) { |
| untie %bighash; |
my $mapid=$bighash{'map_pc_'.&clutter($map)}; |
| |
$title=$bighash{'title_'.$mapid.'.'.$resid}; |
| |
untie(%bighash); |
| |
} |
| } |
} |
| $title=~s/\&colon\;/\:/gs; |
$title=~s/\&colon\;/\:/gs; |
| if ($title) { |
if ($title) { |
|
Line 7084 sub getCODE {
|
Line 7550 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 7569 sub filelocation {
|
Line 8035 sub filelocation {
|
| } |
} |
| } |
} |
| $location=~s://+:/:g; # remove duplicate / |
$location=~s://+:/:g; # remove duplicate / |
| while ($location=~m:/\.\./:) {$location=~ s:/[^/]+/\.\./:/:g;} #remove dir/.. |
while ($location=~m{/\.\./}) { |
| |
if ($location =~ m{/[^/]+/\.\./}) { |
| |
$location=~ s{/[^/]+/\.\./}{/}g; |
| |
} else { |
| |
$location=~ s{/\.\./}{/}g; |
| |
} |
| |
} #remove dir/.. |
| while ($location=~m:/\./:) {$location=~ s:/\./:/:g;} #remove /./ |
while ($location=~m:/\./:) {$location=~ s:/\./:/:g;} #remove /./ |
| return $location; |
return $location; |
| } |
} |
|
Line 7590 sub hreflocation {
|
Line 8062 sub hreflocation {
|
| $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/}) { |
| |
$file =~ s{^/userfiles/}{/uploaded/}; |
| |
} |
| return $file; |
return $file; |
| } |
} |
| |
|
|
Line 7870 sub get_dns {
|
Line 8345 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(%name_to_host); |
|
Line 7995 sub get_dns {
|
Line 8471 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 8008 sub get_dns {
|
Line 8485 sub get_dns {
|
| return %iphost; |
return %iphost; |
| } |
} |
| } |
} |
| |
|
| |
# get yesterday's info for fallback |
| |
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(); |
my %name_to_host = &all_names(); |
| 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})) { |
| $ip = gethostbyname($name); |
$ip = gethostbyname($name); |
| if (!$ip || length($ip) ne 4) { |
if (!$ip || length($ip) ne 4) { |
| &logthis("Skipping 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}; |
|
Line 8029 sub get_dns {
|
Line 8521 sub get_dns {
|
| } |
} |
| &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 8415 explanation of a user role term
|
Line 8907 explanation of a user role term
|
| |
|
| =item * |
=item * |
| |
|
| get_my_roles($uname,$udom,$context,$types,$roles,$roledoms) : |
get_my_roles($uname,$udom,$context,$types,$roles,$roledoms,$withsec) : |
| 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-separated $uname,$udom,$role, and |
| and value is set to colon-separated start and end times for the role. |
(optionally) if $withsec is true, a fourth colon-separated item - $section. |
| If no username and domain are specified, will default to current |
For each key, value is set to colon-separated start and end times for |
| user/domain. Types, roles, and roledoms are references to arrays, |
the role. If no username and domain are specified, will default to |
| |
current user/domain. Types, roles, and roledoms are references to arrays |
| of role statuses (active, future or previous), roles |
of role statuses (active, future or previous), roles |
| (e.g., cc,in, st etc.) and domains of the roles which can be used |
(e.g., cc,in, st etc.) and domains of the roles which can be used |
| to restrict the list of roles reported. If no array ref is |
to restrict the list of roles reported. If no array ref is |
![[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