|
version 1.914, 2007/09/29 04:03:51
|
version 1.957, 2008/04/30 22:42:59
|
|
Line 88 delayed.
|
Line 88 delayed.
|
| { |
{ |
| my $logid; |
my $logid; |
| sub instructor_log { |
sub instructor_log { |
| my ($hash_name,$storehash,$delflag,$uname,$udom)=@_; |
my ($hash_name,$storehash,$delflag,$uname,$udom,$cnum,$cdom)=@_; |
| |
if (($cnum eq '') || ($cdom eq '')) { |
| |
$cnum = $env{'course.'.$env{'request.course.id'}.'.num'}; |
| |
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'}; |
| |
} |
| $logid++; |
$logid++; |
| my $id=time().'00000'.$$.'00000'.$logid; |
my $now = time(); |
| |
my $id=$now.'00000'.$$.'00000'.$logid; |
| return &Apache::lonnet::put('nohist_'.$hash_name, |
return &Apache::lonnet::put('nohist_'.$hash_name, |
| { $id => { |
{ $id => { |
| 'exe_uname' => $env{'user.name'}, |
'exe_uname' => $env{'user.name'}, |
| 'exe_udom' => $env{'user.domain'}, |
'exe_udom' => $env{'user.domain'}, |
| 'exe_time' => time(), |
'exe_time' => $now, |
| 'exe_ip' => $ENV{'REMOTE_ADDR'}, |
'exe_ip' => $ENV{'REMOTE_ADDR'}, |
| 'delflag' => $delflag, |
'delflag' => $delflag, |
| 'logentry' => $storehash, |
'logentry' => $storehash, |
| 'uname' => $uname, |
'uname' => $uname, |
| 'udom' => $udom, |
'udom' => $udom, |
| } |
} |
| }, |
},$cdom,$cnum); |
| $env{'course.'.$env{'request.course.id'}.'.domain'}, |
|
| $env{'course.'.$env{'request.course.id'}.'.num'} |
|
| ); |
|
| } |
} |
| } |
} |
| |
|
|
Line 320 sub convert_and_load_session_env {
|
Line 322 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 364 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 399 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 414 sub timed_flock {
|
Line 450 sub timed_flock {
|
| # ---------------------------------------------------------- Append Environment |
# ---------------------------------------------------------- Append Environment |
| |
|
| sub appenv { |
sub appenv { |
| my %newenv=@_; |
my ($newenv,$roles) = @_; |
| foreach my $key (keys(%newenv)) { |
if (ref($newenv) eq 'HASH') { |
| if (($newenv{$key}=~/^user\.role/) || ($newenv{$key}=~/^user\.priv/)) { |
foreach my $key (keys(%{$newenv})) { |
| &logthis("<font color=\"blue\">WARNING: ". |
my $refused = 0; |
| "Attempt to modify environment ".$key." to ".$newenv{$key} |
if (($key =~ /^user\.role/) || ($key =~ /^user\.priv/)) { |
| .'</font>'); |
$refused = 1; |
| delete($newenv{$key}); |
if (ref($roles) eq 'ARRAY') { |
| } else { |
my ($type,$role) = ($key =~ /^user\.(role|priv)\.([^.]+)\./); |
| $env{$key}=$newenv{$key}; |
if (grep(/^\Q$role\E$/,@{$roles})) { |
| |
$refused = 0; |
| |
} |
| |
} |
| |
} |
| |
if ($refused) { |
| |
&logthis("<font color=\"blue\">WARNING: ". |
| |
"Attempt to modify environment ".$key." to ".$newenv->{$key} |
| |
.'</font>'); |
| |
delete($newenv->{$key}); |
| |
} else { |
| |
$env{$key}=$newenv->{$key}; |
| |
} |
| |
} |
| |
my $opened = open(my $env_file,'+<',$env{'user.environment'}); |
| |
if ($opened |
| |
&& &timed_flock($env_file,LOCK_EX) |
| |
&& |
| |
tie(my %disk_env,'GDBM_File',$env{'user.environment'}, |
| |
(&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) { |
| |
while (my ($key,$value) = each(%{$newenv})) { |
| |
$disk_env{$key} = $value; |
| |
} |
| |
untie(%disk_env); |
| } |
} |
| } |
|
| open(my $env_file,$env{'user.environment'}); |
|
| if (&timed_flock($env_file,LOCK_EX) |
|
| && |
|
| tie(my %disk_env,'GDBM_File',$env{'user.environment'}, |
|
| (&GDBM_WRITER()|&GDBM_NOLOCK()),0640)) { |
|
| while (my ($key,$value) = each(%newenv)) { |
|
| $disk_env{$key} = $value; |
|
| } |
|
| untie(%disk_env); |
|
| } |
} |
| return 'ok'; |
return 'ok'; |
| } |
} |
|
Line 446 sub delenv {
|
Line 495 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 527 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 534 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 657 sub queryauthenticate {
|
Line 707 sub queryauthenticate {
|
| # --------- Try to authenticate user from domain's lib servers (first this one) |
# --------- Try to authenticate user from domain's lib servers (first this one) |
| |
|
| sub authenticate { |
sub authenticate { |
| my ($uname,$upass,$udom)=@_; |
my ($uname,$upass,$udom,$checkdefauth)=@_; |
| $upass=&escape($upass); |
$upass=&escape($upass); |
| $uname= &LONCAPA::clean_username($uname); |
$uname= &LONCAPA::clean_username($uname); |
| my $uhome=&homeserver($uname,$udom,1); |
my $uhome=&homeserver($uname,$udom,1); |
| |
my $newhome; |
| if ((!$uhome) || ($uhome eq 'no_host')) { |
if ((!$uhome) || ($uhome eq 'no_host')) { |
| # Maybe the machine was offline and only re-appeared again recently? |
# Maybe the machine was offline and only re-appeared again recently? |
| &reconlonc(); |
&reconlonc(); |
| # One more |
# One more |
| my $uhome=&homeserver($uname,$udom,1); |
$uhome=&homeserver($uname,$udom,1); |
| |
if (($uhome eq 'no_host') && $checkdefauth) { |
| |
if (defined(&domain($udom,'primary'))) { |
| |
$newhome=&domain($udom,'primary'); |
| |
} |
| |
if ($newhome ne '') { |
| |
$uhome = $newhome; |
| |
} |
| |
} |
| if ((!$uhome) || ($uhome eq 'no_host')) { |
if ((!$uhome) || ($uhome eq 'no_host')) { |
| &logthis("User $uname at $udom is unknown in authenticate"); |
&logthis("User $uname at $udom is unknown in authenticate"); |
| } |
return 'no_host'; |
| return 'no_host'; |
} |
| } |
} |
| my $answer=reply("encrypt:auth:$udom:$uname:$upass",$uhome); |
my $answer=reply("encrypt:auth:$udom:$uname:$upass:$checkdefauth",$uhome); |
| if ($answer eq 'authorized') { |
if ($answer eq 'authorized') { |
| &logthis("User $uname at $udom authorized by $uhome"); |
if ($newhome) { |
| return $uhome; |
&logthis("User $uname at $udom authorized by $uhome, but needs account"); |
| |
return 'no_account_on_host'; |
| |
} else { |
| |
&logthis("User $uname at $udom authorized by $uhome"); |
| |
return $uhome; |
| |
} |
| } |
} |
| if ($answer eq 'non_authorized') { |
if ($answer eq 'non_authorized') { |
| &logthis("User $uname at $udom rejected by $uhome"); |
&logthis("User $uname at $udom rejected by $uhome"); |
|
Line 1011 sub get_instuser {
|
Line 1075 sub get_instuser {
|
| } |
} |
| |
|
| sub inst_rulecheck { |
sub inst_rulecheck { |
| my ($udom,$uname,$rules) = @_; |
my ($udom,$uname,$id,$item,$rules) = @_; |
| my %returnhash; |
my %returnhash; |
| if ($udom ne '') { |
if ($udom ne '') { |
| if (ref($rules) eq 'ARRAY') { |
if (ref($rules) eq 'ARRAY') { |
|
Line 1019 sub inst_rulecheck {
|
Line 1083 sub inst_rulecheck {
|
| my $rulestr = join(':',@{$rules}); |
my $rulestr = join(':',@{$rules}); |
| my $homeserver=&domain($udom,'primary'); |
my $homeserver=&domain($udom,'primary'); |
| if (($homeserver ne '') && ($homeserver ne 'no_host')) { |
if (($homeserver ne '') && ($homeserver ne 'no_host')) { |
| my $response=&unescape(&reply('instrulecheck:'.&escape($udom).':'. |
my $response; |
| &escape($uname).':'.$rulestr, |
if ($item eq 'username') { |
| |
$response=&unescape(&reply('instrulecheck:'.&escape($udom). |
| |
':'.&escape($uname).':'.$rulestr, |
| $homeserver)); |
$homeserver)); |
| |
} elsif ($item eq 'id') { |
| |
$response=&unescape(&reply('instidrulecheck:'.&escape($udom). |
| |
':'.&escape($id).':'.$rulestr, |
| |
$homeserver)); |
| |
} elsif ($item eq 'selfcreate') { |
| |
$response=&unescape(&reply('instselfcreatecheck:'. |
| |
&escape($udom).':'.&escape($uname). |
| |
':'.$rulestr,$homeserver)); |
| |
} |
| if ($response ne 'refused') { |
if ($response ne 'refused') { |
| my @pairs=split(/\&/,$response); |
my @pairs=split(/\&/,$response); |
| foreach my $item (@pairs) { |
foreach my $item (@pairs) { |
|
Line 1038 sub inst_rulecheck {
|
Line 1113 sub inst_rulecheck {
|
| } |
} |
| |
|
| sub inst_userrules { |
sub inst_userrules { |
| my ($udom) = @_; |
my ($udom,$check) = @_; |
| my (%ruleshash,@ruleorder); |
my (%ruleshash,@ruleorder); |
| if ($udom ne '') { |
if ($udom ne '') { |
| my $homeserver=&domain($udom,'primary'); |
my $homeserver=&domain($udom,'primary'); |
| if (($homeserver ne '') && ($homeserver ne 'no_host')) { |
if (($homeserver ne '') && ($homeserver ne 'no_host')) { |
| my $response=&reply('instuserrules:'.&escape($udom), |
my $response; |
| |
if ($check eq 'id') { |
| |
$response=&reply('instidrules:'.&escape($udom), |
| $homeserver); |
$homeserver); |
| |
} elsif ($check eq 'email') { |
| |
$response=&reply('instemailrules:'.&escape($udom), |
| |
$homeserver); |
| |
} else { |
| |
$response=&reply('instuserrules:'.&escape($udom), |
| |
$homeserver); |
| |
} |
| if (($response ne 'refused') && ($response ne 'error') && |
if (($response ne 'refused') && ($response ne 'error') && |
| |
($response ne 'unknown_cmd') && |
| ($response ne 'no_such_host')) { |
($response ne 'no_such_host')) { |
| my ($hashitems,$orderitems) = split(/:/,$response); |
my ($hashitems,$orderitems) = split(/:/,$response); |
| my @pairs=split(/\&/,$hashitems); |
my @pairs=split(/\&/,$hashitems); |
|
Line 1065 sub inst_userrules {
|
Line 1150 sub inst_userrules {
|
| return (\%ruleshash,\@ruleorder); |
return (\%ruleshash,\@ruleorder); |
| } |
} |
| |
|
| |
# ------------------------- Get Authentication and Language Defaults for Domain |
| |
|
| |
sub get_domain_defaults { |
| |
my ($domain) = @_; |
| |
my $cachetime = 60*60*24; |
| |
my ($defauthtype,$defautharg,$deflang); |
| |
my ($result,$cached)=&is_cached_new('domdefaults',$domain); |
| |
if (defined($cached)) { |
| |
if (ref($result) eq 'HASH') { |
| |
return %{$result}; |
| |
} |
| |
} |
| |
my %domdefaults; |
| |
my %domconfig = |
| |
&Apache::lonnet::get_dom('configuration',['defaults'],$domain); |
| |
if (ref($domconfig{'defaults'}) eq 'HASH') { |
| |
$domdefaults{'lang_def'} = $domconfig{'defaults'}{'lang_def'}; |
| |
$domdefaults{'auth_def'} = $domconfig{'defaults'}{'auth_def'}; |
| |
$domdefaults{'auth_arg_def'} = $domconfig{'defaults'}{'auth_arg_def'}; |
| |
} else { |
| |
$domdefaults{'lang_def'} = &domain($domain,'lang_def'); |
| |
$domdefaults{'auth_def'} = &domain($domain,'auth_def'); |
| |
$domdefaults{'auth_arg_def'} = &domain($domain,'auth_arg_def'); |
| |
} |
| |
&Apache::lonnet::do_cache_new('domdefaults',$domain,\%domdefaults, |
| |
$cachetime); |
| |
return %domdefaults; |
| |
} |
| |
|
| # --------------------------------------------------- Assign a key to a student |
# --------------------------------------------------- Assign a key to a student |
| |
|
| sub assign_access_key { |
sub assign_access_key { |
|
Line 1097 sub assign_access_key {
|
Line 1211 sub assign_access_key {
|
| # key now belongs to user |
# key now belongs to user |
| my $envkey='key.'.$cdom.'_'.$cnum; |
my $envkey='key.'.$cdom.'_'.$cnum; |
| if (&put('environment',{$envkey => $ckey}) eq 'ok') { |
if (&put('environment',{$envkey => $ckey}) eq 'ok') { |
| &appenv('environment.'.$envkey => $ckey); |
&appenv({'environment.'.$envkey => $ckey}); |
| return 'ok'; |
return 'ok'; |
| } else { |
} else { |
| return |
return |
|
Line 1347 sub do_cache_new {
|
Line 1461 sub do_cache_new {
|
| $memcache->disconnect_all(); |
$memcache->disconnect_all(); |
| } |
} |
| # need to make a copy of $value |
# need to make a copy of $value |
| #&make_room($id,$value,$debug); |
&make_room($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 1579 sub ssi_body {
|
Line 1695 sub ssi_body {
|
| if (! exists($form{'LONCAPA_INTERNAL_no_discussion'})) { |
if (! exists($form{'LONCAPA_INTERNAL_no_discussion'})) { |
| $form{'LONCAPA_INTERNAL_no_discussion'}='true'; |
$form{'LONCAPA_INTERNAL_no_discussion'}='true'; |
| } |
} |
| my $output=($filelink=~/^http\:/?&externalssi($filelink): |
my $output=''; |
| &ssi($filelink,%form)); |
my $response; |
| |
if ($filelink=~/^http\:/) { |
| |
($output,$response)=&externalssi($filelink); |
| |
} else { |
| |
($output,$response)=&ssi($filelink,%form); |
| |
} |
| $output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs; |
$output=~s|//(\s*<!--)? BEGIN LON-CAPA Internal.+?// END LON-CAPA Internal\s*(-->)?\s||gs; |
| $output=~s/^.*?\<body[^\>]*\>//si; |
$output=~s/^.*?\<body[^\>]*\>//si; |
| $output=~s/(.*)\<\/body\s*\>.*?$/$1/si; |
$output=~s/\<\/body\s*\>.*?$//si; |
| return $output; |
if (wantarray) { |
| |
return ($output, $response); |
| |
} else { |
| |
return $output; |
| |
} |
| } |
} |
| |
|
| # --------------------------------------------------------- Server Side Include |
# --------------------------------------------------------- Server Side Include |
|
Line 1598 sub absolute_url {
|
Line 1723 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. |
| |
# Returns: |
| |
# Scalar context: The content of the response. |
| |
# Array context: 2 element list of the content and the full response object. |
| |
# |
| sub ssi { |
sub ssi { |
| |
|
| my ($fn,%form)=@_; |
my ($fn,%form)=@_; |
| |
|
| 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; |
|
Line 1618 sub ssi {
|
Line 1751 sub ssi {
|
| $request->header(Cookie => $ENV{'HTTP_COOKIE'}); |
$request->header(Cookie => $ENV{'HTTP_COOKIE'}); |
| my $response=$ua->request($request); |
my $response=$ua->request($request); |
| |
|
| return $response->content; |
if (wantarray) { |
| |
return ($response->content, $response); |
| |
} else { |
| |
return $response->content; |
| |
} |
| } |
} |
| |
|
| sub externalssi { |
sub externalssi { |
|
Line 1626 sub externalssi {
|
Line 1763 sub externalssi {
|
| my $ua=new LWP::UserAgent; |
my $ua=new LWP::UserAgent; |
| my $request=new HTTP::Request('GET',$url); |
my $request=new HTTP::Request('GET',$url); |
| my $response=$ua->request($request); |
my $response=$ua->request($request); |
| return $response->content; |
if (wantarray) { |
| |
return ($response->content, $response); |
| |
} else { |
| |
return $response->content; |
| |
} |
| } |
} |
| |
|
| # -------------------------------- Allow a /uploaded/ URI to be vouched for |
# -------------------------------- Allow a /uploaded/ URI to be vouched for |
|
Line 1639 sub allowuploaded {
|
Line 1780 sub allowuploaded {
|
| my %httpref=(); |
my %httpref=(); |
| my $httpurl=&hreflocation('',$url); |
my $httpurl=&hreflocation('',$url); |
| $httpref{'httpref.'.$httpurl}=$srcurl; |
$httpref{'httpref.'.$httpurl}=$srcurl; |
| &Apache::lonnet::appenv(%httpref); |
&Apache::lonnet::appenv(\%httpref); |
| } |
} |
| |
|
| # --------- File operations in /home/httpd/html/userfiles/$domain/1/2/3/$course |
# --------- File operations in /home/httpd/html/userfiles/$domain/1/2/3/$course |
|
Line 2134 sub flushcourselogs {
|
Line 2275 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 2147 sub flushcourselogs {
|
Line 2288 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 2343 sub userrolelog {
|
Line 2482 sub userrolelog {
|
| } |
} |
| } |
} |
| |
|
| |
sub courserolelog { |
| |
my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$selfenroll,$context)=@_; |
| |
if (($trole eq 'cc') || ($trole eq 'in') || |
| |
($trole eq 'ep') || ($trole eq 'ad') || |
| |
($trole eq 'ta') || ($trole eq 'st') || |
| |
($trole=~/^cr/) || ($trole eq 'gr')) { |
| |
if ($area =~ m-^/($match_domain)/($match_courseid)/?([^/]*)-) { |
| |
my $cdom = $1; |
| |
my $cnum = $2; |
| |
my $sec = $3; |
| |
my $namespace = 'rolelog'; |
| |
my %storehash = ( |
| |
role => $trole, |
| |
start => $tstart, |
| |
end => $tend, |
| |
selfenroll => $selfenroll, |
| |
context => $context, |
| |
); |
| |
if ($trole eq 'gr') { |
| |
$namespace = 'groupslog'; |
| |
$storehash{'group'} = $sec; |
| |
} else { |
| |
$storehash{'section'} = $sec; |
| |
} |
| |
&instructor_log($namespace,\%storehash,$delflag,$username,$domain,$cnum,$cdom); |
| |
} |
| |
} |
| |
return; |
| |
} |
| |
|
| sub get_course_adv_roles { |
sub get_course_adv_roles { |
| my $cid=shift; |
my ($cid,$codes) = @_; |
| $cid=$env{'request.course.id'} unless (defined($cid)); |
$cid=$env{'request.course.id'} unless (defined($cid)); |
| my %coursehash=&coursedescription($cid); |
my %coursehash=&coursedescription($cid); |
| my %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 2365 sub get_course_adv_roles {
|
Line 2538 sub get_course_adv_roles {
|
| if ((&privileged($username,$domain)) && |
if ((&privileged($username,$domain)) && |
| (!$nothide{$username.':'.$domain})) { next; } |
(!$nothide{$username.':'.$domain})) { next; } |
| if ($role eq 'cr') { next; } |
if ($role eq 'cr') { next; } |
| my $key=&plaintext($role); |
if ($codes) { |
| if ($section) { $key.=' (Sec/Grp '.$section.')'; } |
if ($section) { $role .= ':'.$section; } |
| if ($returnhash{$key}) { |
if ($returnhash{$role}) { |
| $returnhash{$key}.=','.$username.':'.$domain; |
$returnhash{$role}.=','.$username.':'.$domain; |
| |
} else { |
| |
$returnhash{$role}=$username.':'.$domain; |
| |
} |
| } else { |
} else { |
| $returnhash{$key}=$username.':'.$domain; |
my $key=&plaintext($role); |
| |
if ($section) { $key.=' (Section '.$section.')'; } |
| |
if ($returnhash{$key}) { |
| |
$returnhash{$key}.=','.$username.':'.$domain; |
| |
} else { |
| |
$returnhash{$key}=$username.':'.$domain; |
| |
} |
| } |
} |
| } |
} |
| return %returnhash; |
return %returnhash; |
| } |
} |
| |
|
| 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 2398 sub get_my_roles {
|
Line 2590 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 2427 sub get_my_roles {
|
Line 2619 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 2469 sub getannounce {
|
Line 2678 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=''; } |
$selfenrollonly)=@_; |
| |
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.':'. |
| if (($key) && ($value)) { |
&escape($selfenrollonly),$tryserver); |
| $returnhash{&unescape($key)}=$value; |
my @pairs=split(/\&/,$rep); |
| } |
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 2539 sub get_domain_roles {
|
Line 2796 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 2565 sub get_first_access {
|
Line 2825 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 2578 sub set_first_access {
|
Line 2840 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 3208 sub coursedescription {
|
Line 3472 sub coursedescription {
|
| } |
} |
| } |
} |
| if (!$args->{'one_time'}) { |
if (!$args->{'one_time'}) { |
| &appenv(%envhash); |
&appenv(\%envhash); |
| } |
} |
| return %returnhash; |
return %returnhash; |
| } |
} |
|
Line 3393 sub set_userprivs {
|
Line 3657 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 3757 sub tmpget {
|
Line 4021 sub tmpget {
|
| my %returnhash; |
my %returnhash; |
| foreach my $item (split(/\&/,$rep)) { |
foreach my $item (split(/\&/,$rep)) { |
| my ($key,$value)=split(/=/,$item); |
my ($key,$value)=split(/=/,$item); |
| |
next if ($key =~ /^error: 2 /); |
| $returnhash{&unescape($key)}=&thaw_unescape($value); |
$returnhash{&unescape($key)}=&thaw_unescape($value); |
| } |
} |
| return %returnhash; |
return %returnhash; |
|
Line 4734 sub auto_run {
|
Line 4999 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 4939 sub auto_instcode_defaults {
|
Line 5211 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 4990 sub toggle_coursegroup_status {
|
Line 5268 sub toggle_coursegroup_status {
|
| } |
} |
| |
|
| sub modify_group_roles { |
sub modify_group_roles { |
| my ($cdom,$cnum,$group_id,$user,$end,$start,$userprivs) = @_; |
my ($cdom,$cnum,$group_id,$user,$end,$start,$userprivs,$selfenroll,$context) = @_; |
| my $url = '/'.$cdom.'/'.$cnum.'/'.$group_id; |
my $url = '/'.$cdom.'/'.$cnum.'/'.$group_id; |
| my $role = 'gr/'.&escape($userprivs); |
my $role = 'gr/'.&escape($userprivs); |
| my ($uname,$udom) = split(/:/,$user); |
my ($uname,$udom) = split(/:/,$user); |
| my $result = &assignrole($udom,$uname,$url,$role,$end,$start); |
my $result = &assignrole($udom,$uname,$url,$role,$end,$start,'',$selfenroll,$context); |
| if ($result eq 'ok') { |
if ($result eq 'ok') { |
| &devalidate_getgroups_cache($udom,$uname,$cdom,$cnum); |
&devalidate_getgroups_cache($udom,$uname,$cdom,$cnum); |
| } |
} |
|
Line 5110 sub plaintext {
|
Line 5388 sub plaintext {
|
| # ----------------------------------------------------------------- Assign Role |
# ----------------------------------------------------------------- Assign Role |
| |
|
| sub assignrole { |
sub assignrole { |
| my ($udom,$uname,$url,$role,$end,$start,$deleteflag)=@_; |
my ($udom,$uname,$url,$role,$end,$start,$deleteflag,$selfenroll, |
| |
$context)=@_; |
| my $mrole; |
my $mrole; |
| if ($role =~ /^cr\//) { |
if ($role =~ /^cr\//) { |
| my $cwosec=$url; |
my $cwosec=$url; |
|
Line 5135 sub assignrole {
|
Line 5414 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) { |
| |
if (($selfenroll == 1) && ($role eq 'st') && ($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'})) { |
| |
$refused = ''; |
| |
} else { |
| |
&logthis('Refused assignrole: '.$udom.' '.$uname.' '.$url. |
| |
' '.$role.' '.$end.' '.$start.' by '. |
| |
$env{'user.name'}.' at '.$env{'user.domain'}); |
| |
return 'refused'; |
| |
} |
| |
} |
| } |
} |
| $mrole=$role; |
$mrole=$role; |
| } |
} |
|
Line 5155 sub assignrole {
|
Line 5448 sub assignrole {
|
| } |
} |
| my $origstart = $start; |
my $origstart = $start; |
| my $origend = $end; |
my $origend = $end; |
| |
my $delflag; |
| # actually delete |
# actually delete |
| if ($deleteflag) { |
if ($deleteflag) { |
| if ((&allowed('dro',$udom)) || (&allowed('dro',$url))) { |
if ((&allowed('dro',$udom)) || (&allowed('dro',$url))) { |
|
Line 5165 sub assignrole {
|
Line 5459 sub assignrole {
|
| # set start and finish to negative values for userrolelog |
# set start and finish to negative values for userrolelog |
| $start=-1; |
$start=-1; |
| $end=-1; |
$end=-1; |
| |
$delflag = 1; |
| } |
} |
| } |
} |
| # send command |
# send command |
|
Line 5173 sub assignrole {
|
Line 5468 sub assignrole {
|
| if ($answer eq 'ok') { |
if ($answer eq 'ok') { |
| &userrolelog($role,$uname,$udom,$url,$start,$end); |
&userrolelog($role,$uname,$udom,$url,$start,$end); |
| # for course roles, perform group memberships changes triggered by role change. |
# for course roles, perform group memberships changes triggered by role change. |
| |
&courserolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,$selfenroll,$context); |
| unless ($role =~ /^gr/) { |
unless ($role =~ /^gr/) { |
| &Apache::longroup::group_changes($udom,$uname,$url,$role,$origend, |
&Apache::longroup::group_changes($udom,$uname,$url,$role,$origend, |
| $origstart); |
$origstart,$selfenroll,$context); |
| } |
} |
| } |
} |
| return $answer; |
return $answer; |
|
Line 5312 sub modifyuser {
|
Line 5608 sub modifyuser {
|
| |
|
| sub modifystudent { |
sub modifystudent { |
| my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec, |
my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec, |
| $end,$start,$forceid,$desiredhome,$email,$type,$locktype,$cid)=@_; |
$end,$start,$forceid,$desiredhome,$email,$type,$locktype,$cid, |
| |
$selfenroll,$context)=@_; |
| if (!$cid) { |
if (!$cid) { |
| unless ($cid=$env{'request.course.id'}) { |
unless ($cid=$env{'request.course.id'}) { |
| return 'not_in_class'; |
return 'not_in_class'; |
|
Line 5327 sub modifystudent {
|
Line 5624 sub modifystudent {
|
| # students environment |
# students environment |
| $uid = undef if (!$forceid); |
$uid = undef if (!$forceid); |
| $reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last, |
$reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last, |
| $gene,$usec,$end,$start,$type,$locktype,$cid); |
$gene,$usec,$end,$start,$type,$locktype,$cid,$selfenroll,$context); |
| return $reply; |
return $reply; |
| } |
} |
| |
|
| sub modify_student_enrollment { |
sub modify_student_enrollment { |
| my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,$locktype,$cid) = @_; |
my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,$locktype,$cid,$selfenroll,$context) = @_; |
| my ($cdom,$cnum,$chome); |
my ($cdom,$cnum,$chome); |
| if (!$cid) { |
if (!$cid) { |
| unless ($cid=$env{'request.course.id'}) { |
unless ($cid=$env{'request.course.id'}) { |
|
Line 5390 sub modify_student_enrollment {
|
Line 5687 sub modify_student_enrollment {
|
| if ($usec) { |
if ($usec) { |
| $uurl.='/'.$usec; |
$uurl.='/'.$usec; |
| } |
} |
| return &assignrole($udom,$uname,$uurl,'st',$end,$start); |
return &assignrole($udom,$uname,$uurl,'st',$end,$start,undef,$selfenroll,$context); |
| } |
} |
| |
|
| sub format_name { |
sub format_name { |
|
Line 5471 sub createcourse {
|
Line 5768 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 5514 sub is_course {
|
Line 5816 sub is_course {
|
| # ---------------------------------------------------------- Assign Custom Role |
# ---------------------------------------------------------- Assign Custom Role |
| |
|
| sub assigncustomrole { |
sub assigncustomrole { |
| my ($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start,$deleteflag)=@_; |
my ($udom,$uname,$url,$rdom,$rnam,$rolename,$end,$start,$deleteflag,$selfenroll,$context)=@_; |
| return &assignrole($udom,$uname,$url,'cr/'.$rdom.'/'.$rnam.'/'.$rolename, |
return &assignrole($udom,$uname,$url,'cr/'.$rdom.'/'.$rnam.'/'.$rolename, |
| $end,$start,$deleteflag); |
$end,$start,$deleteflag,$selfenroll,$context); |
| } |
} |
| |
|
| # ----------------------------------------------------------------- Revoke Role |
# ----------------------------------------------------------------- Revoke Role |
| |
|
| sub revokerole { |
sub revokerole { |
| my ($udom,$uname,$url,$role,$deleteflag)=@_; |
my ($udom,$uname,$url,$role,$deleteflag,$selfenroll,$context)=@_; |
| my $now=time; |
my $now=time; |
| return &assignrole($udom,$uname,$url,$role,$now,$deleteflag); |
return &assignrole($udom,$uname,$url,$role,$now,$deleteflag,$selfenroll,$context); |
| } |
} |
| |
|
| # ---------------------------------------------------------- Revoke Custom Role |
# ---------------------------------------------------------- Revoke Custom Role |
| |
|
| sub revokecustomrole { |
sub revokecustomrole { |
| my ($udom,$uname,$url,$rdom,$rnam,$rolename,$deleteflag)=@_; |
my ($udom,$uname,$url,$rdom,$rnam,$rolename,$deleteflag,$selfenroll,$context)=@_; |
| my $now=time; |
my $now=time; |
| return &assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$now, |
return &assigncustomrole($udom,$uname,$url,$rdom,$rnam,$rolename,$now, |
| $deleteflag); |
$deleteflag,$selfenroll,$context); |
| } |
} |
| |
|
| # ------------------------------------------------------------ Disk usage |
# ------------------------------------------------------------ Disk usage |
| sub diskusage { |
sub diskusage { |
| my ($udom,$uname,$directoryRoot)=@_; |
my ($udom,$uname,$directorypath,$getpropath)=@_; |
| $directoryRoot =~ s/\/$//; |
$directorypath =~ s/\/$//; |
| my $listing=&reply('du:'.$directoryRoot,homeserver($uname,$udom)); |
my $listing=&reply('du2:'.&escape($directorypath).':' |
| |
.&escape($getpropath).':'.&escape($uname).':' |
| |
.&escape($udom),homeserver($uname,$udom)); |
| |
if ($listing eq 'unknown_cmd') { |
| |
if ($getpropath) { |
| |
$directorypath = &propath($udom,$uname).'/'.$directorypath; |
| |
} |
| |
$listing = &reply('du:'.$directorypath,homeserver($uname,$udom)); |
| |
} |
| return $listing; |
return $listing; |
| } |
} |
| |
|
|
Line 5957 sub unmark_as_readonly {
|
Line 6267 sub unmark_as_readonly {
|
| # ------------------------------------------------------------ Directory lister |
# ------------------------------------------------------------ Directory lister |
| |
|
| sub dirlist { |
sub dirlist { |
| my ($uri,$userdomain,$username,$alternateDirectoryRoot)=@_; |
my ($uri,$userdomain,$username,$getpropath,$getuserdir,$alternateRoot)=@_; |
| |
|
| $uri=~s/^\///; |
$uri=~s/^\///; |
| $uri=~s/\/$//; |
$uri=~s/\/$//; |
| my ($udom, $uname); |
my ($udom, $uname); |
| (undef,$udom,$uname)=split(/\//,$uri); |
if ($getuserdir) { |
| if(defined($userdomain)) { |
|
| $udom = $userdomain; |
$udom = $userdomain; |
| } |
|
| if(defined($username)) { |
|
| $uname = $username; |
$uname = $username; |
| |
} else { |
| |
(undef,$udom,$uname)=split(/\//,$uri); |
| |
if(defined($userdomain)) { |
| |
$udom = $userdomain; |
| |
} |
| |
if(defined($username)) { |
| |
$uname = $username; |
| |
} |
| } |
} |
| |
my ($dirRoot,$listing,@listing_results); |
| |
|
| my $dirRoot = $perlvar{'lonDocRoot'}; |
$dirRoot = $perlvar{'lonDocRoot'}; |
| if(defined($alternateDirectoryRoot)) { |
if (defined($getpropath)) { |
| $dirRoot = $alternateDirectoryRoot; |
$dirRoot = &propath($udom,$uname); |
| $dirRoot =~ s/\/$//; |
$dirRoot =~ s/\/$//; |
| |
} elsif (defined($getuserdir)) { |
| |
my $subdir=$uname.'__'; |
| |
$subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/; |
| |
$dirRoot = $Apache::lonnet::perlvar{'lonUsersDir'} |
| |
."/$udom/$subdir/$uname"; |
| |
} elsif (defined($alternateRoot)) { |
| |
$dirRoot = $alternateRoot; |
| } |
} |
| |
|
| if($udom) { |
if($udom) { |
| if($uname) { |
if($uname) { |
| my $listing = &reply('ls2:'.$dirRoot.'/'.$uri, |
$listing = &reply('ls3:'.&escape('/'.$uri).':'.$getpropath.':' |
| &homeserver($uname,$udom)); |
.$getuserdir.':'.&escape($dirRoot) |
| my @listing_results; |
.':'.&escape($uname).':'.&escape($udom), |
| |
&homeserver($uname,$udom)); |
| |
if ($listing eq 'unknown_cmd') { |
| |
$listing = &reply('ls2:'.$dirRoot.'/'.$uri, |
| |
&homeserver($uname,$udom)); |
| |
} else { |
| |
@listing_results = map { &unescape($_); } split(/:/,$listing); |
| |
} |
| if ($listing eq 'unknown_cmd') { |
if ($listing eq 'unknown_cmd') { |
| $listing = &reply('ls:'.$dirRoot.'/'.$uri, |
$listing = &reply('ls:'.$dirRoot.'/'.$uri, |
| &homeserver($uname,$udom)); |
&homeserver($uname,$udom)); |
|
Line 5989 sub dirlist {
|
Line 6318 sub dirlist {
|
| @listing_results = map { &unescape($_); } split(/:/,$listing); |
@listing_results = map { &unescape($_); } split(/:/,$listing); |
| } |
} |
| return @listing_results; |
return @listing_results; |
| } elsif(!defined($alternateDirectoryRoot)) { |
} elsif(!$alternateRoot) { |
| my %allusers; |
my %allusers; |
| my %servers = &get_servers($udom,'library'); |
my %servers = &get_servers($udom,'library'); |
| foreach my $tryserver (keys(%servers)) { |
foreach my $tryserver (keys(%servers)) { |
| my $listing = &reply('ls2:'.$perlvar{'lonDocRoot'}.'/res/'. |
$listing = &reply('ls3:'.&escape("/res/$udom").':::::'. |
| $udom, $tryserver); |
&escape($udom),$tryserver); |
| my @listing_results; |
if ($listing eq 'unknown_cmd') { |
| |
$listing = &reply('ls2:'.$perlvar{'lonDocRoot'}.'/res/'. |
| |
$udom, $tryserver); |
| |
} else { |
| |
@listing_results = map { &unescape($_); } split(/:/,$listing); |
| |
} |
| if ($listing eq 'unknown_cmd') { |
if ($listing eq 'unknown_cmd') { |
| $listing = &reply('ls:'.$perlvar{'lonDocRoot'}.'/res/'. |
$listing = &reply('ls:'.$perlvar{'lonDocRoot'}.'/res/'. |
| $udom, $tryserver); |
$udom, $tryserver); |
|
Line 6022 sub dirlist {
|
Line 6356 sub dirlist {
|
| } else { |
} else { |
| return ('missing user name'); |
return ('missing user name'); |
| } |
} |
| } elsif(!defined($alternateDirectoryRoot)) { |
} elsif(!defined($getpropath)) { |
| my @all_domains = sort(&all_domains()); |
my @all_domains = sort(&all_domains()); |
| foreach my $domain (@all_domains) { |
foreach my $domain (@all_domains) { |
| $domain = $perlvar{'lonDocRoot'}.'/res/'.$domain.'/&domain'; |
$domain = $perlvar{'lonDocRoot'}.'/res/'.$domain.'/&domain'; |
| } |
} |
| return @all_domains; |
return @all_domains; |
| } else { |
} else { |
| return ('missing domain'); |
return ('missing domain'); |
| } |
} |
| } |
} |
|
Line 6038 sub dirlist {
|
Line 6372 sub dirlist {
|
| # when it was last modified. It will also return an error of -1 |
# when it was last modified. It will also return an error of -1 |
| # if an error occurs |
# if an error occurs |
| |
|
| ## |
|
| ## FIXME: This subroutine assumes its caller knows something about the |
|
| ## directory structure of the home server for the student ($root). |
|
| ## Not a good assumption to make. Since this is for looking up files |
|
| ## in user directories, the full path should be constructed by lond, not |
|
| ## whatever machine we request data from. |
|
| ## |
|
| sub GetFileTimestamp { |
sub GetFileTimestamp { |
| my ($studentDomain,$studentName,$filename,$root)=@_; |
my ($studentDomain,$studentName,$filename,$getuserdir)=@_; |
| $studentDomain = &LONCAPA::clean_domain($studentDomain); |
$studentDomain = &LONCAPA::clean_domain($studentDomain); |
| $studentName = &LONCAPA::clean_username($studentName); |
$studentName = &LONCAPA::clean_username($studentName); |
| my $subdir=$studentName.'__'; |
my ($fileStat) = |
| $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/; |
&Apache::lonnet::dirlist($filename,$studentDomain,$studentName, |
| my $proname="$studentDomain/$subdir/$studentName"; |
undef,$getuserdir); |
| $proname .= '/'.$filename; |
|
| my ($fileStat) = &Apache::lonnet::dirlist($proname, $studentDomain, |
|
| $studentName, $root); |
|
| my @stats = split('&', $fileStat); |
my @stats = split('&', $fileStat); |
| if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') { |
if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') { |
| # @stats contains first the filename, then the stat output |
# @stats contains first the filename, then the stat output |
|
Line 6068 sub stat_file {
|
Line 6392 sub stat_file {
|
| my ($uri) = @_; |
my ($uri) = @_; |
| $uri = &clutter_with_no_wrapper($uri); |
$uri = &clutter_with_no_wrapper($uri); |
| |
|
| my ($udom,$uname,$file,$dir); |
my ($udom,$uname,$file); |
| if ($uri =~ m-^/(uploaded|editupload)/-) { |
if ($uri =~ m-^/(uploaded|editupload)/-) { |
| ($udom,$uname,$file) = |
($udom,$uname,$file) = |
| ($uri =~ m-/(?:uploaded|editupload)/?($match_domain)/?($match_name)/?(.*)-); |
($uri =~ m-/(?:uploaded|editupload)/?($match_domain)/?($match_name)/?(.*)-); |
| $file = 'userfiles/'.$file; |
$file = 'userfiles/'.$file; |
| $dir = &propath($udom,$uname); |
|
| } |
} |
| if ($uri =~ m-^/res/-) { |
if ($uri =~ m-^/res/-) { |
| ($udom,$uname) = |
($udom,$uname) = |
|
Line 6085 sub stat_file {
|
Line 6408 sub stat_file {
|
| # unable to handle the uri |
# unable to handle the uri |
| return (); |
return (); |
| } |
} |
| |
my $getpropath; |
| my ($result) = &dirlist($file,$udom,$uname,$dir); |
if ($file =~ /^userfiles\//) { |
| |
$getpropath = 1; |
| |
} |
| |
my ($result) = &dirlist($file,$udom,$uname,$getpropath); |
| my @stats = split('&', $result); |
my @stats = split('&', $result); |
| |
|
| if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') { |
if($stats[0] ne 'empty' && $stats[0] ne 'no_such_dir') { |
|
Line 6119 sub directcondval {
|
Line 6445 sub directcondval {
|
| untie(%bighash); |
untie(%bighash); |
| } |
} |
| my $value = &docondval($sub_condition); |
my $value = &docondval($sub_condition); |
| &appenv('user.state.'.$env{'request.course.id'}.".$number" => $value); |
&appenv({'user.state.'.$env{'request.course.id'}.".$number" => $value}); |
| return $value; |
return $value; |
| } |
} |
| if ($env{'user.state.'.$env{'request.course.id'}}) { |
if ($env{'user.state.'.$env{'request.course.id'}}) { |
|
Line 6276 sub resdata {
|
Line 6602 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 6305 sub EXT_cache_status {
|
Line 6631 sub EXT_cache_status {
|
| sub EXT_cache_set { |
sub EXT_cache_set { |
| my ($target_domain,$target_user) = @_; |
my ($target_domain,$target_user) = @_; |
| my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain; |
my $cachename = 'cache.EXT.'.$target_user.'.'.$target_domain; |
| #&appenv($cachename => time); |
#&appenv({$cachename => time}); |
| } |
} |
| |
|
| # --------------------------------------------------------- Value of a Variable |
# --------------------------------------------------------- Value of a Variable |
|
Line 6489 sub EXT {
|
Line 6815 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 6517 sub EXT {
|
Line 6846 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 6530 sub EXT {
|
Line 6859 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 6549 sub EXT {
|
Line 6879 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 6584 sub EXT {
|
Line 6913 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 6685 sub metadata {
|
Line 7026 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 6707 sub metadata {
|
Line 7051 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 6717 sub metadata {
|
Line 7062 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 6884 sub metadata {
|
Line 7235 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 7182 sub symbread {
|
Line 7533 sub symbread {
|
| if ($syval) { |
if ($syval) { |
| #unless ($syval=~/\_\d+$/) { |
#unless ($syval=~/\_\d+$/) { |
| #unless ($env{'form.request.prefix'}=~/\.(\d+)\_$/) { |
#unless ($env{'form.request.prefix'}=~/\.(\d+)\_$/) { |
| #&appenv('request.ambiguous' => $thisfn); |
#&appenv({'request.ambiguous' => $thisfn}); |
| #return $env{$cache_str}=''; |
#return $env{$cache_str}=''; |
| #} |
#} |
| #$syval.=$1; |
#$syval.=$1; |
|
Line 7234 sub symbread {
|
Line 7585 sub symbread {
|
| return $env{$cache_str}=$syval; |
return $env{$cache_str}=$syval; |
| } |
} |
| } |
} |
| &appenv('request.ambiguous' => $thisfn); |
&appenv({'request.ambiguous' => $thisfn}); |
| return $env{$cache_str}=''; |
return $env{$cache_str}=''; |
| } |
} |
| |
|
|
Line 7748 sub tokenwrapper {
|
Line 8099 sub tokenwrapper {
|
| my (undef,$udom,$uname,$file)=split('/',$uri,4); |
my (undef,$udom,$uname,$file)=split('/',$uri,4); |
| if ($udom && $uname && $file) { |
if ($udom && $uname && $file) { |
| $file=~s|(\?\.*)*$||; |
$file=~s|(\?\.*)*$||; |
| &appenv("userfile.$udom/$uname/$file" => $env{'request.course.id'}); |
&appenv({"userfile.$udom/$uname/$file" => $env{'request.course.id'}}); |
| return 'http://'.&hostname(&homeserver($uname,$udom)).'/'.$uri. |
return 'http://'.&hostname(&homeserver($uname,$udom)).'/'.$uri. |
| (($uri=~/\?/)?'&':'?').'token='.$token. |
(($uri=~/\?/)?'&':'?').'token='.$token. |
| '&tokenissued='.$perlvar{'lonHostID'}; |
'&tokenissued='.$perlvar{'lonHostID'}; |
|
Line 7806 sub filelocation {
|
Line 8157 sub filelocation {
|
| } elsif ($file=~m{^/home/$match_username/public_html/}) { |
} elsif ($file=~m{^/home/$match_username/public_html/}) { |
| # is a correct contruction space reference |
# is a correct contruction space reference |
| $location = $file; |
$location = $file; |
| |
} elsif ($file =~ m-^\Q$Apache::lonnet::perlvar{'lonTabDir'}\E/-) { |
| |
$location = $file; |
| } elsif ($file=~/^\/*(uploaded|editupload)/) { # is an uploaded file |
} elsif ($file=~/^\/*(uploaded|editupload)/) { # is an uploaded file |
| my ($udom,$uname,$filename)= |
my ($udom,$uname,$filename)= |
| ($file=~m -^/+(?:uploaded|editupload)/+($match_domain)/+($match_name)/+(.*)$-); |
($file=~m -^/+(?:uploaded|editupload)/+($match_domain)/+($match_name)/+(.*)$-); |
|
Line 7814 sub filelocation {
|
Line 8167 sub filelocation {
|
| my @ids=¤t_machine_ids(); |
my @ids=¤t_machine_ids(); |
| foreach my $id (@ids) { if ($id eq $home) { $is_me=1; } } |
foreach my $id (@ids) { if ($id eq $home) { $is_me=1; } } |
| if ($is_me) { |
if ($is_me) { |
| $location=&propath($udom,$uname). |
$location=&propath($udom,$uname).'/userfiles/'.$filename; |
| '/userfiles/'.$filename; |
|
| } else { |
} else { |
| $location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'. |
$location=$Apache::lonnet::perlvar{'lonDocRoot'}.'/userfiles/'. |
| $udom.'/'.$uname.'/'.$filename; |
$udom.'/'.$uname.'/'.$filename; |
|
Line 7832 sub filelocation {
|
Line 8184 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 8587 that was requested
|
Line 8945 that was requested
|
| |
|
| =item * |
=item * |
| X<appenv()> |
X<appenv()> |
| B<appenv(%hash)>: the value of %hash is written to |
B<appenv($hashref,$rolesarrayref)>: the value of %{$hashref} is written to |
| the user envirnoment file, and will be restored for each access this |
the user envirnoment file, and will be restored for each access this |
| user makes during this session, also modifies the %env for the current |
user makes during this session, also modifies the %env for the current |
| process |
process. Optional rolesarrayref - if defined contains a reference to an array |
| |
of roles which are exempt from the restriction on modifying user.role entries |
| |
in the user's environment.db and in %env. |
| |
|
| =item * |
=item * |
| X<delenv()> |
X<delenv()> |
|
Line 8698 explanation of a user role term
|
Line 9058 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 'userroles', 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 |
|
Line 8719 provided for types, will default to retu
|
Line 9080 provided for types, will default to retu
|
| |
|
| =item * |
=item * |
| |
|
| assignrole($udom,$uname,$url,$role,$end,$start) : assign role; give a role to a |
assignrole($udom,$uname,$url,$role,$end,$start,$deleteflag,$selfenroll,$context) : assign role; give a role to a |
| user for the level given by URL. Optional start and end dates (leave empty |
user for the level given by URL. Optional start and end dates (leave empty |
| string or zero for "no date") |
string or zero for "no date") |
| |
|
|
Line 8743 modify user
|
Line 9104 modify user
|
| |
|
| modifystudent |
modifystudent |
| |
|
| modify a students enrollment and identification information. |
modify a student's enrollment and identification information. |
| The course id is resolved based on the current users environment. |
The course id is resolved based on the current users environment. |
| This means the envoking user must be a course coordinator or otherwise |
This means the envoking user must be a course coordinator or otherwise |
| associated with a course. |
associated with a course. |
|
Line 8755 Inputs:
|
Line 9116 Inputs:
|
| |
|
| =over 4 |
=over 4 |
| |
|
| =item B<$udom> Students loncapa domain |
=item B<$udom> Student's loncapa domain |
| |
|
| =item B<$uname> Students loncapa login name |
=item B<$uname> Student's loncapa login name |
| |
|
| =item B<$uid> Students id/student number |
=item B<$uid> Student's id/student number |
| |
|
| =item B<$umode> Students authentication mode |
=item B<$umode> Student's authentication mode |
| |
|
| =item B<$upass> Students password |
=item B<$upass> Student's password |
| |
|
| =item B<$first> Students first name |
=item B<$first> Student's first name |
| |
|
| =item B<$middle> Students middle name |
=item B<$middle> Student's middle name |
| |
|
| =item B<$last> Students last name |
=item B<$last> Student's last name |
| |
|
| =item B<$gene> Students generation |
=item B<$gene> Student's generation |
| |
|
| =item B<$usec> Students section in course |
=item B<$usec> Student's section in course |
| |
|
| =item B<$end> Unix time of the roles expiration |
=item B<$end> Unix time of the roles expiration |
| |
|
|
Line 8783 Inputs:
|
Line 9144 Inputs:
|
| |
|
| =item B<$desiredhome> server to use as home server for student |
=item B<$desiredhome> server to use as home server for student |
| |
|
| |
=item B<$email> Student's permanent e-mail address |
| |
|
| |
=item B<$type> Type of enrollment (auto or manual) |
| |
|
| |
=item B<$locktype> |
| |
|
| |
=item B<$cid> |
| |
|
| |
=item B<$selfenroll> |
| |
|
| |
=item B<$context> |
| |
|
| =back |
=back |
| |
|
| =item * |
=item * |
|
Line 8816 Inputs:
|
Line 9189 Inputs:
|
| |
|
| =item $start |
=item $start |
| |
|
| |
=item $type |
| |
|
| |
=item $locktype |
| |
|
| |
=item $cid |
| |
|
| |
=item $selfenroll |
| |
|
| |
=item $context |
| |
|
| =back |
=back |
| |
|
| |
|
|
Line 9152 put_dom($namespace,$storehash,$udom,$uho
|
Line 9535 put_dom($namespace,$storehash,$udom,$uho
|
| domain level either on specified domain server ($uhome) or primary domain |
domain level either on specified domain server ($uhome) or primary domain |
| server ($udom and $uhome are optional) |
server ($udom and $uhome are optional) |
| |
|
| |
=item * |
| |
|
| |
get_domain_defaults($target_domain) : returns hash with defaults for |
| |
authentication and language in the domain. Keys are: auth_def, auth_arg_def, |
| |
lang_def; corresponsing values are authentication type (internal, krb4, krb5, |
| |
or localauth), initial password or a kerberos realm, language (e.g., en-us). |
| |
Values are retrieved from cache (if current), or from domain's configuration.db |
| |
(if available), or lastly from values in lonTabs/dns_domain,tab, |
| |
or lonTabs/domain.tab. |
| |
|
| |
%domdefaults = &get_auth_defaults($target_domain); |
| |
|
| =back |
=back |
| |
|
| =head2 Network Status Functions |
=head2 Network Status Functions |
![[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