|
version 1.771, 2006/08/18 23:04:01
|
version 1.808, 2006/11/27 20:35:10
|
|
Line 52 use Storable qw(lock_store lock_nstore l
|
Line 52 use Storable qw(lock_store lock_nstore l
|
| use Time::HiRes qw( gettimeofday tv_interval ); |
use Time::HiRes qw( gettimeofday tv_interval ); |
| use Cache::Memcached; |
use Cache::Memcached; |
| use Digest::MD5; |
use Digest::MD5; |
| |
use Math::Random; |
| use lib '/home/httpd/lib/perl'; |
use lib '/home/httpd/lib/perl'; |
| use LONCAPA; |
use LONCAPA qw(:DEFAULT :match); |
| use LONCAPA::Configuration; |
use LONCAPA::Configuration; |
| |
|
| my $readit; |
my $readit; |
|
Line 292 sub error {
|
Line 293 sub error {
|
| return undef; |
return undef; |
| } |
} |
| |
|
| # ------------------------------------------- Transfer profile into environment |
sub convert_and_load_session_env { |
| |
my ($lonidsdir,$handle)=@_; |
| |
my @profile; |
| |
{ |
| |
open(my $idf,"$lonidsdir/$handle.id"); |
| |
flock($idf,LOCK_SH); |
| |
@profile=<$idf>; |
| |
close($idf); |
| |
} |
| |
my %temp_env; |
| |
foreach my $line (@profile) { |
| |
if ($line !~ m/=/) { |
| |
return 0; |
| |
} |
| |
chomp($line); |
| |
my ($envname,$envvalue)=split(/=/,$line,2); |
| |
$temp_env{&unescape($envname)} = &unescape($envvalue); |
| |
} |
| |
unlink("$lonidsdir/$handle.id"); |
| |
if (tie(my %disk_env,'GDBM_File',"$lonidsdir/$handle.id",&GDBM_WRCREAT(), |
| |
0640)) { |
| |
%disk_env = %temp_env; |
| |
@env{keys(%temp_env)} = @disk_env{keys(%temp_env)}; |
| |
untie(%disk_env); |
| |
} |
| |
return 1; |
| |
} |
| |
|
| |
# ------------------------------------------- Transfer profile into environment |
| |
my $env_loaded; |
| sub transfer_profile_to_env { |
sub transfer_profile_to_env { |
| my ($lonidsdir,$handle)=@_; |
my ($lonidsdir,$handle,$force_transfer) = @_; |
| |
if (!$force_transfer && $env_loaded) { return; } |
| |
|
| if (!defined($lonidsdir)) { |
if (!defined($lonidsdir)) { |
| $lonidsdir = $perlvar{'lonIDsDir'}; |
$lonidsdir = $perlvar{'lonIDsDir'}; |
| } |
} |
|
Line 303 sub transfer_profile_to_env {
|
Line 334 sub transfer_profile_to_env {
|
| ($handle) = ($env{'user.environment'} =~m|/([^/]+)\.id$| ); |
($handle) = ($env{'user.environment'} =~m|/([^/]+)\.id$| ); |
| } |
} |
| |
|
| my @profile; |
my $convert; |
| { |
{ |
| open(my $idf,"$lonidsdir/$handle.id"); |
open(my $idf,"$lonidsdir/$handle.id"); |
| flock($idf,LOCK_SH); |
flock($idf,LOCK_SH); |
| @profile=<$idf>; |
if (tie(my %disk_env,'GDBM_File',"$lonidsdir/$handle.id", |
| close($idf); |
&GDBM_READER(),0640)) { |
| |
@env{keys(%disk_env)} = @disk_env{keys(%disk_env)}; |
| |
untie(%disk_env); |
| |
} else { |
| |
$convert = 1; |
| |
} |
| |
} |
| |
if ($convert) { |
| |
if (!&convert_and_load_session_env($lonidsdir,$handle)) { |
| |
&logthis("Failed to load session, or convert session."); |
| |
} |
| } |
} |
| my $envi; |
|
| my %Remove; |
my %remove; |
| for ($envi=0;$envi<=$#profile;$envi++) { |
while ( my $envname = each(%env) ) { |
| chomp($profile[$envi]); |
|
| my ($envname,$envvalue)=split(/=/,$profile[$envi],2); |
|
| $envname=&unescape($envname); |
|
| $envvalue=&unescape($envvalue); |
|
| $env{$envname} = $envvalue; |
|
| if (my ($key,$time) = ($envname =~ /^(cgi\.(\d+)_\d+\.)/)) { |
if (my ($key,$time) = ($envname =~ /^(cgi\.(\d+)_\d+\.)/)) { |
| if ($time < time-300) { |
if ($time < time-300) { |
| $Remove{$key}++; |
$remove{$key}++; |
| } |
} |
| } |
} |
| } |
} |
| |
|
| $env{'user.environment'} = "$lonidsdir/$handle.id"; |
$env{'user.environment'} = "$lonidsdir/$handle.id"; |
| foreach my $expired_key (keys(%Remove)) { |
$env_loaded=1; |
| |
foreach my $expired_key (keys(%remove)) { |
| &delenv($expired_key); |
&delenv($expired_key); |
| } |
} |
| } |
} |
|
Line 344 sub appenv {
|
Line 382 sub appenv {
|
| $env{$key}=$newenv{$key}; |
$env{$key}=$newenv{$key}; |
| } |
} |
| } |
} |
| |
if (tie(my %disk_env,'GDBM_File',$env{'user.environment'},&GDBM_WRITER(), |
| my $lockfh; |
0640)) { |
| unless (open($lockfh,"$env{'user.environment'}")) { |
while (my ($key,$value) = each(%newenv)) { |
| return 'error: '.$!; |
$disk_env{$key} = $value; |
| } |
|
| unless (flock($lockfh,LOCK_EX)) { |
|
| &logthis("<font color=\"blue\">WARNING: ". |
|
| 'Could not obtain exclusive lock in appenv: '.$!); |
|
| close($lockfh); |
|
| return 'error: '.$!; |
|
| } |
|
| |
|
| my @oldenv; |
|
| { |
|
| my $fh; |
|
| unless (open($fh,"$env{'user.environment'}")) { |
|
| return 'error: '.$!; |
|
| } |
} |
| @oldenv=<$fh>; |
untie(%disk_env); |
| close($fh); |
|
| } |
} |
| for (my $i=0; $i<=$#oldenv; $i++) { |
|
| chomp($oldenv[$i]); |
|
| if ($oldenv[$i] ne '') { |
|
| my ($name,$value)=split(/=/,$oldenv[$i],2); |
|
| $name=&unescape($name); |
|
| $value=&unescape($value); |
|
| unless (defined($newenv{$name})) { |
|
| $newenv{$name}=$value; |
|
| } |
|
| } |
|
| } |
|
| { |
|
| my $fh; |
|
| unless (open($fh,">$env{'user.environment'}")) { |
|
| return 'error'; |
|
| } |
|
| my $newname; |
|
| foreach $newname (keys %newenv) { |
|
| print $fh &escape($newname).'='.&escape($newenv{$newname})."\n"; |
|
| } |
|
| close($fh); |
|
| } |
|
| |
|
| close($lockfh); |
|
| return 'ok'; |
return 'ok'; |
| } |
} |
| # ----------------------------------------------------- Delete from Environment |
# ----------------------------------------------------- Delete from Environment |
|
Line 400 sub delenv {
|
Line 400 sub delenv {
|
| "Attempt to delete from environment ".$delthis); |
"Attempt to delete from environment ".$delthis); |
| return 'error'; |
return 'error'; |
| } |
} |
| my @oldenv; |
if (tie(my %disk_env,'GDBM_File',$env{'user.environment'},&GDBM_WRITER(), |
| { |
0640)) { |
| my $fh; |
foreach my $key (keys(%disk_env)) { |
| unless (open($fh,"$env{'user.environment'}")) { |
if ($key=~/^$delthis/) { |
| return 'error'; |
|
| } |
|
| unless (flock($fh,LOCK_SH)) { |
|
| &logthis("<font color=\"blue\">WARNING: ". |
|
| 'Could not obtain shared lock in delenv: '.$!); |
|
| close($fh); |
|
| return 'error: '.$!; |
|
| } |
|
| @oldenv=<$fh>; |
|
| close($fh); |
|
| } |
|
| { |
|
| my $fh; |
|
| unless (open($fh,">$env{'user.environment'}")) { |
|
| return 'error'; |
|
| } |
|
| unless (flock($fh,LOCK_EX)) { |
|
| &logthis("<font color=\"blue\">WARNING: ". |
|
| 'Could not obtain exclusive lock in delenv: '.$!); |
|
| close($fh); |
|
| return 'error: '.$!; |
|
| } |
|
| foreach my $cur_key (@oldenv) { |
|
| my $unescaped_cur_key = &unescape($cur_key); |
|
| if ($unescaped_cur_key=~/^$delthis/) { |
|
| my ($key) = split('=',$cur_key,2); |
|
| $key = &unescape($key); |
|
| delete($env{$key}); |
delete($env{$key}); |
| } else { |
delete($disk_env{$key}); |
| print $fh $cur_key; |
|
| } |
} |
| } |
} |
| close($fh); |
untie(%disk_env); |
| } |
} |
| return 'ok'; |
return 'ok'; |
| } |
} |
| |
|
| |
sub get_env_multiple { |
| |
my ($name) = @_; |
| |
my @values; |
| |
if (defined($env{$name})) { |
| |
# exists is it an array |
| |
if (ref($env{$name})) { |
| |
@values=@{ $env{$name} }; |
| |
} else { |
| |
$values[0]=$env{$name}; |
| |
} |
| |
} |
| |
return(@values); |
| |
} |
| |
|
| # ------------------------------------------ Find out current server userload |
# ------------------------------------------ Find out current server userload |
| # there is a copy in lond |
# there is a copy in lond |
| sub userload { |
sub userload { |
|
Line 493 sub overloaderror {
|
Line 479 sub overloaderror {
|
| |
|
| sub spareserver { |
sub spareserver { |
| my ($loadpercent,$userloadpercent,$want_server_name) = @_; |
my ($loadpercent,$userloadpercent,$want_server_name) = @_; |
| my $tryserver; |
my $spare_server; |
| my $spareserver=''; |
|
| if ($userloadpercent !~ /\d/) { $userloadpercent=0; } |
if ($userloadpercent !~ /\d/) { $userloadpercent=0; } |
| my $lowestserver=$loadpercent > $userloadpercent? |
my $lowest_load=($loadpercent > $userloadpercent) ? $loadpercent |
| $loadpercent : $userloadpercent; |
: $userloadpercent; |
| foreach $tryserver (keys(%spareid)) { |
|
| my $loadans=&reply('load',$tryserver); |
foreach my $try_server (@{ $spareid{'primary'} }) { |
| my $userloadans=&reply('userload',$tryserver); |
($spare_server, $lowest_load) = |
| if ($loadans !~ /\d/ && $userloadans !~ /\d/) { |
&compare_server_load($try_server, $spare_server, $lowest_load); |
| next; #didn't get a number from the server |
} |
| } |
|
| my $answer; |
my $found_server = ($spare_server ne '' && $lowest_load < 100); |
| if ($loadans =~ /\d/) { |
|
| if ($userloadans =~ /\d/) { |
if (!$found_server) { |
| #both are numbers, pick the bigger one |
foreach my $try_server (@{ $spareid{'default'} }) { |
| $answer=$loadans > $userloadans? |
($spare_server, $lowest_load) = |
| $loadans : $userloadans; |
&compare_server_load($try_server, $spare_server, $lowest_load); |
| } else { |
|
| $answer = $loadans; |
|
| } |
|
| } else { |
|
| $answer = $userloadans; |
|
| } |
|
| if (($answer =~ /\d/) && ($answer<$lowestserver)) { |
|
| if ($want_server_name) { |
|
| $spareserver=$tryserver; |
|
| } else { |
|
| $spareserver="http://$hostname{$tryserver}"; |
|
| } |
|
| $lowestserver=$answer; |
|
| } |
} |
| } |
} |
| return $spareserver; |
|
| |
if (!$want_server_name) { |
| |
$spare_server="http://$hostname{$spare_server}"; |
| |
} |
| |
return $spare_server; |
| } |
} |
| |
|
| |
sub compare_server_load { |
| |
my ($try_server, $spare_server, $lowest_load) = @_; |
| |
|
| |
my $loadans = &reply('load', $try_server); |
| |
my $userloadans = &reply('userload',$try_server); |
| |
|
| |
if ($loadans !~ /\d/ && $userloadans !~ /\d/) { |
| |
next; #didn't get a number from the server |
| |
} |
| |
|
| |
my $load; |
| |
if ($loadans =~ /\d/) { |
| |
if ($userloadans =~ /\d/) { |
| |
#both are numbers, pick the bigger one |
| |
$load = ($loadans > $userloadans) ? $loadans |
| |
: $userloadans; |
| |
} else { |
| |
$load = $loadans; |
| |
} |
| |
} else { |
| |
$load = $userloadans; |
| |
} |
| |
|
| |
if (($load =~ /\d/) && ($load < $lowest_load)) { |
| |
$spare_server = $try_server; |
| |
$lowest_load = $load; |
| |
} |
| |
return ($spare_server,$lowest_load); |
| |
} |
| # --------------------------------------------- Try to change a user's password |
# --------------------------------------------- Try to change a user's password |
| |
|
| sub changepass { |
sub changepass { |
| my ($uname,$udom,$currentpass,$newpass,$server)=@_; |
my ($uname,$udom,$currentpass,$newpass,$server,$context)=@_; |
| $currentpass = &escape($currentpass); |
$currentpass = &escape($currentpass); |
| $newpass = &escape($newpass); |
$newpass = &escape($newpass); |
| my $answer = reply("encrypt:passwd:$udom:$uname:$currentpass:$newpass", |
my $answer = reply("encrypt:passwd:$udom:$uname:$currentpass:$newpass:$context", |
| $server); |
$server); |
| if (! $answer) { |
if (! $answer) { |
| &logthis("No reply on password change request to $server ". |
&logthis("No reply on password change request to $server ". |
|
Line 583 sub queryauthenticate {
|
Line 588 sub queryauthenticate {
|
| |
|
| sub authenticate { |
sub authenticate { |
| my ($uname,$upass,$udom)=@_; |
my ($uname,$upass,$udom)=@_; |
| $upass=escape($upass); |
$upass=&escape($upass); |
| $uname=~s/\W//g; |
$uname= &LONCAPA::clean_username($uname); |
| my $uhome=&homeserver($uname,$udom); |
my $uhome=&homeserver($uname,$udom); |
| if (!$uhome) { |
if (!$uhome) { |
| &logthis("User $uname at $udom is unknown in authenticate"); |
&logthis("User $uname at $udom is unknown in authenticate"); |
|
Line 659 sub idget {
|
Line 664 sub idget {
|
| sub idrget { |
sub idrget { |
| my ($udom,@unames)=@_; |
my ($udom,@unames)=@_; |
| my %returnhash=(); |
my %returnhash=(); |
| foreach (@unames) { |
foreach my $uname (@unames) { |
| $returnhash{$_}=(&userenvironment($udom,$_,'id'))[1]; |
$returnhash{$uname}=(&userenvironment($udom,$uname,'id'))[1]; |
| } |
} |
| return %returnhash; |
return %returnhash; |
| } |
} |
|
Line 670 sub idrget {
|
Line 675 sub idrget {
|
| sub idput { |
sub idput { |
| my ($udom,%ids)=@_; |
my ($udom,%ids)=@_; |
| my %servers=(); |
my %servers=(); |
| foreach (keys %ids) { |
foreach my $uname (keys(%ids)) { |
| &cput('environment',{'id'=>$ids{$_}},$udom,$_); |
&cput('environment',{'id'=>$ids{$uname}},$udom,$uname); |
| my $uhom=&homeserver($_,$udom); |
my $uhom=&homeserver($uname,$udom); |
| if ($uhom ne 'no_host') { |
if ($uhom ne 'no_host') { |
| my $id=&escape($ids{$_}); |
my $id=&escape($ids{$uname}); |
| $id=~tr/A-Z/a-z/; |
$id=~tr/A-Z/a-z/; |
| my $unam=&escape($_); |
my $esc_unam=&escape($uname); |
| if ($servers{$uhom}) { |
if ($servers{$uhom}) { |
| $servers{$uhom}.='&'.$id.'='.$unam; |
$servers{$uhom}.='&'.$id.'='.$esc_unam; |
| } else { |
} else { |
| $servers{$uhom}=$id.'='.$unam; |
$servers{$uhom}=$id.'='.$esc_unam; |
| } |
} |
| } |
} |
| } |
} |
| foreach (keys %servers) { |
foreach my $server (keys(%servers)) { |
| &critical('idput:'.$udom.':'.$servers{$_},$_); |
&critical('idput:'.$udom.':'.$servers{$server},$server); |
| |
} |
| |
} |
| |
|
| |
# ------------------------------------------- get items from domain db files |
| |
|
| |
sub get_dom { |
| |
my ($namespace,$storearr,$udom)=@_; |
| |
my $items=''; |
| |
foreach my $item (@$storearr) { |
| |
$items.=&escape($item).'&'; |
| |
} |
| |
$items=~s/\&$//; |
| |
if (!$udom) { $udom=$env{'user.domain'}; } |
| |
if (exists($domain_primary{$udom})) { |
| |
my $uhome=$domain_primary{$udom}; |
| |
my $rep=&reply("getdom:$udom:$namespace:$items",$uhome); |
| |
my @pairs=split(/\&/,$rep); |
| |
if ( $#pairs==0 && $pairs[0] =~ /^(con_lost|error|no_such_host)/i) { |
| |
return @pairs; |
| |
} |
| |
my %returnhash=(); |
| |
my $i=0; |
| |
foreach my $item (@$storearr) { |
| |
$returnhash{$item}=&thaw_unescape($pairs[$i]); |
| |
$i++; |
| |
} |
| |
return %returnhash; |
| |
} else { |
| |
&logthis("get_dom failed - no primary domain server for $udom"); |
| |
} |
| |
} |
| |
|
| |
# -------------------------------------------- put items in domain db files |
| |
|
| |
sub put_dom { |
| |
my ($namespace,$storehash,$udom)=@_; |
| |
if (!$udom) { $udom=$env{'user.domain'}; } |
| |
if (exists($domain_primary{$udom})) { |
| |
my $uhome=$domain_primary{$udom}; |
| |
my $items=''; |
| |
foreach my $item (keys(%$storehash)) { |
| |
$items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&'; |
| |
} |
| |
$items=~s/\&$//; |
| |
return &reply("putdom:$udom:$namespace:$items",$uhome); |
| |
} else { |
| |
&logthis("put_dom failed - no primary domain server for $udom"); |
| } |
} |
| } |
} |
| |
|
|
Line 822 sub validate_access_key {
|
Line 874 sub validate_access_key {
|
| # ------------------------------------- Find the section of student in a course |
# ------------------------------------- Find the section of student in a course |
| sub devalidate_getsection_cache { |
sub devalidate_getsection_cache { |
| my ($udom,$unam,$courseid)=@_; |
my ($udom,$unam,$courseid)=@_; |
| $courseid=~s/\_/\//g; |
|
| $courseid=~s/^(\w)/\/$1/; |
|
| my $hashid="$udom:$unam:$courseid"; |
my $hashid="$udom:$unam:$courseid"; |
| &devalidate_cache_new('getsection',$hashid); |
&devalidate_cache_new('getsection',$hashid); |
| } |
} |
|
Line 831 sub devalidate_getsection_cache {
|
Line 881 sub devalidate_getsection_cache {
|
| sub getsection { |
sub getsection { |
| my ($udom,$unam,$courseid)=@_; |
my ($udom,$unam,$courseid)=@_; |
| my $cachetime=1800; |
my $cachetime=1800; |
| $courseid=~s/\_/\//g; |
|
| $courseid=~s/^(\w)/\/$1/; |
|
| |
|
| my $hashid="$udom:$unam:$courseid"; |
my $hashid="$udom:$unam:$courseid"; |
| my ($result,$cached)=&is_cached_new('getsection',$hashid); |
my ($result,$cached)=&is_cached_new('getsection',$hashid); |
|
Line 853 sub getsection {
|
Line 901 sub getsection {
|
| # If there is more than one expired role, choose the one which ended last. |
# If there is more than one expired role, choose the one which ended last. |
| # If there is a role which has expired, return it. |
# If there is a role which has expired, return it. |
| # |
# |
| foreach (split(/\&/,&reply('dump:'.$udom.':'.$unam.':roles', |
foreach my $line (split(/\&/,&reply('dump:'.$udom.':'.$unam.':roles', |
| &homeserver($unam,$udom)))) { |
&homeserver($unam,$udom)))) { |
| my ($key,$value)=split(/\=/,$_); |
my ($key,$value)=split(/\=/,$line,2); |
| $key=&unescape($key); |
$key=&unescape($key); |
| next if ($key !~/^\Q$courseid\E(?:\/)*(\w+)*\_st$/); |
next if ($key !~/^\Q$courseid\E(?:\/)*(\w+)*\_st$/); |
| my $section=$1; |
my $section=$1; |
|
Line 891 sub save_cache {
|
Line 939 sub save_cache {
|
| &purge_remembered(); |
&purge_remembered(); |
| #&Apache::loncommon::validate_page(); |
#&Apache::loncommon::validate_page(); |
| undef(%env); |
undef(%env); |
| |
undef($env_loaded); |
| } |
} |
| |
|
| my $to_remember=-1; |
my $to_remember=-1; |
|
Line 1176 sub ssi_body {
|
Line 1225 sub ssi_body {
|
| } |
} |
| my $output=($filelink=~/^http\:/?&externalssi($filelink): |
my $output=($filelink=~/^http\:/?&externalssi($filelink): |
| &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*\>.*?$/$1/si; |
| return $output; |
return $output; |
|
Line 1184 sub ssi_body {
|
Line 1233 sub ssi_body {
|
| |
|
| # --------------------------------------------------------- Server Side Include |
# --------------------------------------------------------- Server Side Include |
| |
|
| |
sub absolute_url { |
| |
my ($host_name) = @_; |
| |
my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://'); |
| |
if ($host_name eq '') { |
| |
$host_name = $ENV{'SERVER_NAME'}; |
| |
} |
| |
return $protocol.$host_name; |
| |
} |
| |
|
| sub ssi { |
sub ssi { |
| |
|
| my ($fn,%form)=@_; |
my ($fn,%form)=@_; |
|
Line 1195 sub ssi {
|
Line 1253 sub ssi {
|
| $form{'no_update_last_known'}=1; |
$form{'no_update_last_known'}=1; |
| |
|
| if (%form) { |
if (%form) { |
| $request=new HTTP::Request('POST',"http://".$ENV{'HTTP_HOST'}.$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)); |
| } else { |
} else { |
| $request=new HTTP::Request('GET',"http://".$ENV{'HTTP_HOST'}.$fn); |
$request=new HTTP::Request('GET',&absolute_url().$fn); |
| } |
} |
| |
|
| $request->header(Cookie => $ENV{'HTTP_COOKIE'}); |
$request->header(Cookie => $ENV{'HTTP_COOKIE'}); |
|
Line 1621 sub removeuploadedurl {
|
Line 1679 sub removeuploadedurl {
|
| sub removeuserfile { |
sub removeuserfile { |
| my ($docuname,$docudom,$fname)=@_; |
my ($docuname,$docudom,$fname)=@_; |
| my $home=&homeserver($docuname,$docudom); |
my $home=&homeserver($docuname,$docudom); |
| return &reply("removeuserfile:$docudom/$docuname/$fname",$home); |
my $result = &reply("removeuserfile:$docudom/$docuname/$fname",$home); |
| |
if ($result eq 'ok') { |
| |
if (($fname !~ /\.meta$/) && (&is_portfolio_file($fname))) { |
| |
my $metafile = $fname.'.meta'; |
| |
my $metaresult = &removeuserfile($docuname,$docudom,$metafile); |
| |
} |
| |
} |
| |
return $result; |
| } |
} |
| |
|
| sub mkdiruserfile { |
sub mkdiruserfile { |
|
Line 1633 sub mkdiruserfile {
|
Line 1698 sub mkdiruserfile {
|
| sub renameuserfile { |
sub renameuserfile { |
| my ($docuname,$docudom,$old,$new)=@_; |
my ($docuname,$docudom,$old,$new)=@_; |
| my $home=&homeserver($docuname,$docudom); |
my $home=&homeserver($docuname,$docudom); |
| return &reply("renameuserfile:$docudom:$docuname:".&escape("$old").':'. |
my $result = &reply("renameuserfile:$docudom:$docuname:". |
| &escape("$new"),$home); |
&escape("$old").':'.&escape("$new"),$home); |
| |
if ($result eq 'ok') { |
| |
if (($old !~ /\.meta$/) && (&is_portfolio_file($old))) { |
| |
my $oldmeta = $old.'.meta'; |
| |
my $newmeta = $new.'.meta'; |
| |
my $metaresult = |
| |
&renameuserfile($docuname,$docudom,$oldmeta,$newmeta); |
| |
} |
| |
} |
| |
return $result; |
| } |
} |
| |
|
| # ------------------------------------------------------------------------- Log |
# ------------------------------------------------------------------------- Log |
|
Line 1660 sub flushcourselogs {
|
Line 1734 sub flushcourselogs {
|
| # times and course titles for all courseids |
# times and course titles for all courseids |
| # |
# |
| my %courseidbuffer=(); |
my %courseidbuffer=(); |
| foreach (keys %courselogs) { |
foreach my $crsid (keys %courselogs) { |
| my $crsid=$_; |
|
| 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 1688 sub flushcourselogs {
|
Line 1761 sub flushcourselogs {
|
| # 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 (keys %courseidbuffer) { |
foreach my $crsid (keys(%courseidbuffer)) { |
| &courseidput($hostdom{$_},$courseidbuffer{$_},$_); |
&courseidput($hostdom{$crsid},$courseidbuffer{$crsid},$crsid); |
| } |
} |
| # |
# |
| # File accesses |
# File accesses |
|
Line 1698 sub flushcourselogs {
|
Line 1771 sub flushcourselogs {
|
| foreach my $entry (keys(%accesshash)) { |
foreach my $entry (keys(%accesshash)) { |
| if ($entry =~ /___count$/) { |
if ($entry =~ /___count$/) { |
| my ($dom,$name); |
my ($dom,$name); |
| ($dom,$name,undef)=($entry=~m:___(\w+)/(\w+)/(.*)___count$:); |
($dom,$name,undef)= |
| |
($entry=~m{___($match_domain)/($match_username)/(.*)___count$}); |
| if (! defined($dom) || $dom eq '' || |
if (! defined($dom) || $dom eq '' || |
| ! defined($name) || $name eq '') { |
! defined($name) || $name eq '') { |
| my $cid = $env{'request.course.id'}; |
my $cid = $env{'request.course.id'}; |
|
Line 1719 sub flushcourselogs {
|
Line 1793 sub flushcourselogs {
|
| } |
} |
| } |
} |
| } else { |
} else { |
| my ($dom,$name) = ($entry=~m:___(\w+)/(\w+)/(.*)___(\w+)$:); |
my ($dom,$name) = ($entry=~m{___($match_domain)/($match_username)/(.*)___(\w+)$}); |
| my %temphash=($entry => $accesshash{$entry}); |
my %temphash=($entry => $accesshash{$entry}); |
| if (&put('nohist_resevaldata',\%temphash,$dom,$name) eq 'ok') { |
if (&put('nohist_resevaldata',\%temphash,$dom,$name) eq 'ok') { |
| delete $accesshash{$entry}; |
delete $accesshash{$entry}; |
|
Line 1730 sub flushcourselogs {
|
Line 1804 sub flushcourselogs {
|
| # Roles |
# Roles |
| # Reverse lookup of user roles for course faculty/staff and co-authorship |
# Reverse lookup of user roles for course faculty/staff and co-authorship |
| # |
# |
| foreach (keys %userrolehash) { |
foreach my $entry (keys(%userrolehash)) { |
| my $entry=$_; |
|
| my ($role,$uname,$udom,$runame,$rudom,$rsec)= |
my ($role,$uname,$udom,$runame,$rudom,$rsec)= |
| split(/\:/,$entry); |
split(/\:/,$entry); |
| if (&Apache::lonnet::put('nohist_userroles', |
if (&Apache::lonnet::put('nohist_userroles', |
|
Line 1803 sub courseacclog {
|
Line 1876 sub courseacclog {
|
| if ($fnsymb=~/(problem|exam|quiz|assess|survey|form|task|page)$/) { |
if ($fnsymb=~/(problem|exam|quiz|assess|survey|form|task|page)$/) { |
| $what.=':POST'; |
$what.=':POST'; |
| # FIXME: Probably ought to escape things.... |
# FIXME: Probably ought to escape things.... |
| foreach (keys %env) { |
foreach my $key (keys(%env)) { |
| if ($_=~/^form\.(.*)/) { |
if ($key=~/^form\.(.*)/) { |
| $what.=':'.$1.'='.$env{$_}; |
$what.=':'.$1.'='.$env{$key}; |
| } |
} |
| } |
} |
| } elsif ($fnsymb =~ m:^/adm/searchcat:) { |
} elsif ($fnsymb =~ m:^/adm/searchcat:) { |
|
Line 1867 sub get_course_adv_roles {
|
Line 1940 sub get_course_adv_roles {
|
| $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 (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) { |
| $nothide{join(':',split(/[\@\:]/,$_))}=1; |
$nothide{join(':',split(/[\@\:]/,$user))}=1; |
| } |
} |
| my %returnhash=(); |
my %returnhash=(); |
| my %dumphash= |
my %dumphash= |
| &dump('nohist_userroles',$coursehash{'domain'},$coursehash{'num'}); |
&dump('nohist_userroles',$coursehash{'domain'},$coursehash{'num'}); |
| my $now=time; |
my $now=time; |
| foreach (keys %dumphash) { |
foreach my $entry (keys %dumphash) { |
| my ($tend,$tstart)=split(/\:/,$dumphash{$_}); |
my ($tend,$tstart)=split(/\:/,$dumphash{$entry}); |
| if (($tstart) && ($tstart<0)) { next; } |
if (($tstart) && ($tstart<0)) { next; } |
| if (($tend) && ($tend<$now)) { next; } |
if (($tend) && ($tend<$now)) { next; } |
| if (($tstart) && ($now<$tstart)) { next; } |
if (($tstart) && ($now<$tstart)) { next; } |
| my ($role,$username,$domain,$section)=split(/\:/,$_); |
my ($role,$username,$domain,$section)=split(/\:/,$entry); |
| if ($username eq '' || $domain eq '') { next; } |
if ($username eq '' || $domain eq '') { next; } |
| if ((&privileged($username,$domain)) && |
if ((&privileged($username,$domain)) && |
| (!$nothide{$username.':'.$domain})) { next; } |
(!$nothide{$username.':'.$domain})) { next; } |
|
Line 1903 sub get_my_roles {
|
Line 1976 sub get_my_roles {
|
| &dump('nohist_userroles',$udom,$uname); |
&dump('nohist_userroles',$udom,$uname); |
| my %returnhash=(); |
my %returnhash=(); |
| my $now=time; |
my $now=time; |
| foreach (keys %dumphash) { |
foreach my $entry (keys(%dumphash)) { |
| my ($tend,$tstart)=split(/\:/,$dumphash{$_}); |
my ($tend,$tstart)=split(/\:/,$dumphash{$entry}); |
| if (($tstart) && ($tstart<0)) { next; } |
if (($tstart) && ($tstart<0)) { next; } |
| if (($tend) && ($tend<$now)) { next; } |
if (($tend) && ($tend<$now)) { next; } |
| if (($tstart) && ($now<$tstart)) { next; } |
if (($tstart) && ($now<$tstart)) { next; } |
| my ($role,$username,$domain,$section)=split(/\:/,$_); |
my ($role,$username,$domain,$section)=split(/\:/,$entry); |
| $returnhash{$username.':'.$domain.':'.$role}=$tstart.':'.$tend; |
$returnhash{$username.':'.$domain.':'.$role}=$tstart.':'.$tend; |
| } |
} |
| return %returnhash; |
return %returnhash; |
|
Line 1929 sub getannounce {
|
Line 2002 sub getannounce {
|
| |
|
| if (open(my $fh,$perlvar{'lonDocRoot'}.'/announcement.txt')) { |
if (open(my $fh,$perlvar{'lonDocRoot'}.'/announcement.txt')) { |
| my $announcement=''; |
my $announcement=''; |
| while (<$fh>) { $announcement .=$_; } |
while (my $line = <$fh>) { $announcement .= $line; } |
| close($fh); |
close($fh); |
| if ($announcement=~/\w/) { |
if ($announcement=~/\w/) { |
| return |
return |
|
Line 1953 sub courseidput {
|
Line 2026 sub courseidput {
|
| } |
} |
| |
|
| sub courseiddump { |
sub courseiddump { |
| my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,$coursefilter,$hostidflag,$hostidref,$typefilter)=@_; |
my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,$coursefilter,$hostidflag,$hostidref,$typefilter,$regexp_ok)=@_; |
| my %returnhash=(); |
my %returnhash=(); |
| unless ($domfilter) { $domfilter=''; } |
unless ($domfilter) { $domfilter=''; } |
| foreach my $tryserver (keys %libserv) { |
foreach my $tryserver (keys %libserv) { |
| if ( ($hostidflag == 1 && grep/^$tryserver$/,@{$hostidref}) || (!defined($hostidflag)) ) { |
if ( ($hostidflag == 1 && grep/^$tryserver$/,@{$hostidref}) || (!defined($hostidflag)) ) { |
| if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) { |
if ((!$domfilter) || ($hostdom{$tryserver} eq $domfilter)) { |
| foreach ( |
foreach my $line ( |
| split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'. |
split(/\&/,&reply('courseiddump:'.$hostdom{$tryserver}.':'. |
| $sincefilter.':'.&escape($descfilter).':'. |
$sincefilter.':'.&escape($descfilter).':'. |
| &escape($instcodefilter).':'.&escape($ownerfilter).':'.&escape($coursefilter).':'.&escape($typefilter), |
&escape($instcodefilter).':'.&escape($ownerfilter).':'.&escape($coursefilter).':'.&escape($typefilter).':'.&escape($regexp_ok), |
| $tryserver))) { |
$tryserver))) { |
| my ($key,$value)=split(/\=/,$_); |
my ($key,$value)=split(/\=/,$line,2); |
| if (($key) && ($value)) { |
if (($key) && ($value)) { |
| $returnhash{&unescape($key)}=$value; |
$returnhash{&unescape($key)}=$value; |
| } |
} |
|
Line 1993 sub dcmaildump {
|
Line 2066 sub dcmaildump {
|
| &escape($enddate).':'; |
&escape($enddate).':'; |
| my @esc_senders=map { &escape($_)} @$senders; |
my @esc_senders=map { &escape($_)} @$senders; |
| $cmd.=&escape(join('&',@esc_senders)); |
$cmd.=&escape(join('&',@esc_senders)); |
| foreach (split(/\&/,&reply($cmd,$domain_primary{$dom}))) { |
foreach my $line (split(/\&/,&reply($cmd,$domain_primary{$dom}))) { |
| my ($key,$value) = split(/\=/,$_); |
my ($key,$value) = split(/\=/,$line,2); |
| if (($key) && ($value)) { |
if (($key) && ($value)) { |
| $returnhash{&unescape($key)} = &unescape($value); |
$returnhash{&unescape($key)} = &unescape($value); |
| } |
} |
|
Line 2017 sub get_domain_roles {
|
Line 2090 sub get_domain_roles {
|
| foreach my $tryserver (keys(%libserv)) { |
foreach my $tryserver (keys(%libserv)) { |
| if ($hostdom{$tryserver} eq $dom) { |
if ($hostdom{$tryserver} eq $dom) { |
| %{$personnel{$tryserver}}=(); |
%{$personnel{$tryserver}}=(); |
| foreach ( |
foreach my $line ( |
| split(/\&/,&reply('domrolesdump:'.$dom.':'. |
split(/\&/,&reply('domrolesdump:'.$dom.':'. |
| &escape($startdate).':'.&escape($enddate).':'. |
&escape($startdate).':'.&escape($enddate).':'. |
| &escape($rolelist), $tryserver))) { |
&escape($rolelist), $tryserver))) { |
| my($key,$value) = split(/\=/,$_); |
my ($key,$value) = split(/\=/,$line,2); |
| if (($key) && ($value)) { |
if (($key) && ($value)) { |
| $personnel{$tryserver}{&unescape($key)} = &unescape($value); |
$personnel{$tryserver}{&unescape($key)} = &unescape($value); |
| } |
} |
|
Line 2035 sub get_domain_roles {
|
Line 2108 sub get_domain_roles {
|
| |
|
| sub get_first_access { |
sub get_first_access { |
| my ($type,$argsymb)=@_; |
my ($type,$argsymb)=@_; |
| my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::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 'map') { |
|
Line 2049 sub get_first_access {
|
Line 2122 sub get_first_access {
|
| |
|
| sub set_first_access { |
sub set_first_access { |
| my ($type)=@_; |
my ($type)=@_; |
| my ($symb,$courseid,$udom,$uname)=&Apache::lonxml::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 'map') { |
| $res=&symbread($map); |
$res=&symbread($map); |
|
Line 2243 sub hash2str {
|
Line 2316 sub hash2str {
|
| sub hashref2str { |
sub hashref2str { |
| my ($hashref)=@_; |
my ($hashref)=@_; |
| my $result='__HASH_REF__'; |
my $result='__HASH_REF__'; |
| foreach (sort(keys(%$hashref))) { |
foreach my $key (sort(keys(%$hashref))) { |
| if (ref($_) eq 'ARRAY') { |
if (ref($key) eq 'ARRAY') { |
| $result.=&arrayref2str($_).'='; |
$result.=&arrayref2str($key).'='; |
| } elsif (ref($_) eq 'HASH') { |
} elsif (ref($key) eq 'HASH') { |
| $result.=&hashref2str($_).'='; |
$result.=&hashref2str($key).'='; |
| } elsif (ref($_)) { |
} elsif (ref($key)) { |
| $result.='='; |
$result.='='; |
| #print("Got a ref of ".(ref($_))." skipping."); |
#print("Got a ref of ".(ref($key))." skipping."); |
| } else { |
} else { |
| if ($_) {$result.=&escape($_).'=';} else { last; } |
if ($key) {$result.=&escape($key).'=';} else { last; } |
| } |
} |
| |
|
| if(ref($hashref->{$_}) eq 'ARRAY') { |
if(ref($hashref->{$key}) eq 'ARRAY') { |
| $result.=&arrayref2str($hashref->{$_}).'&'; |
$result.=&arrayref2str($hashref->{$key}).'&'; |
| } elsif(ref($hashref->{$_}) eq 'HASH') { |
} elsif(ref($hashref->{$key}) eq 'HASH') { |
| $result.=&hashref2str($hashref->{$_}).'&'; |
$result.=&hashref2str($hashref->{$key}).'&'; |
| } elsif(ref($hashref->{$_})) { |
} elsif(ref($hashref->{$key})) { |
| $result.='&'; |
$result.='&'; |
| #print("Got a ref of ".(ref($hashref->{$_}))." skipping."); |
#print("Got a ref of ".(ref($hashref->{$key}))." skipping."); |
| } else { |
} else { |
| $result.=&escape($hashref->{$_}).'&'; |
$result.=&escape($hashref->{$key}).'&'; |
| } |
} |
| } |
} |
| $result=~s/\&$//; |
$result=~s/\&$//; |
|
Line 2543 sub store {
|
Line 2616 sub store {
|
| $$storehash{'host'}=$perlvar{'lonHostID'}; |
$$storehash{'host'}=$perlvar{'lonHostID'}; |
| |
|
| my $namevalue=''; |
my $namevalue=''; |
| foreach (keys %$storehash) { |
foreach my $key (keys(%$storehash)) { |
| $namevalue.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&'; |
$namevalue.=&escape($key).'='.&freeze_escape($$storehash{$key}).'&'; |
| } |
} |
| $namevalue=~s/\&$//; |
$namevalue=~s/\&$//; |
| &courselog($symb.':'.$stuname.':'.$domain.':STORE:'.$namevalue); |
&courselog($symb.':'.$stuname.':'.$domain.':STORE:'.$namevalue); |
|
Line 2579 sub cstore {
|
Line 2652 sub cstore {
|
| $$storehash{'host'}=$perlvar{'lonHostID'}; |
$$storehash{'host'}=$perlvar{'lonHostID'}; |
| |
|
| my $namevalue=''; |
my $namevalue=''; |
| foreach (keys %$storehash) { |
foreach my $key (keys(%$storehash)) { |
| $namevalue.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&'; |
$namevalue.=&escape($key).'='.&freeze_escape($$storehash{$key}).'&'; |
| } |
} |
| $namevalue=~s/\&$//; |
$namevalue=~s/\&$//; |
| &courselog($symb.':'.$stuname.':'.$domain.':CSTORE:'.$namevalue); |
&courselog($symb.':'.$stuname.':'.$domain.':CSTORE:'.$namevalue); |
|
Line 2612 sub restore {
|
Line 2685 sub restore {
|
| my $answer=&reply("restore:$domain:$stuname:$namespace:$symb","$home"); |
my $answer=&reply("restore:$domain:$stuname:$namespace:$symb","$home"); |
| |
|
| my %returnhash=(); |
my %returnhash=(); |
| foreach (split(/\&/,$answer)) { |
foreach my $line (split(/\&/,$answer)) { |
| my ($name,$value)=split(/\=/,$_); |
my ($name,$value)=split(/\=/,$line); |
| $returnhash{&unescape($name)}=&thaw_unescape($value); |
$returnhash{&unescape($name)}=&thaw_unescape($value); |
| } |
} |
| my $version; |
my $version; |
| for ($version=1;$version<=$returnhash{'version'};$version++) { |
for ($version=1;$version<=$returnhash{'version'};$version++) { |
| foreach (split(/\:/,$returnhash{$version.':keys'})) { |
foreach my $item (split(/\:/,$returnhash{$version.':keys'})) { |
| $returnhash{$_}=$returnhash{$version.':'.$_}; |
$returnhash{$item}=$returnhash{$version.':'.$item}; |
| } |
} |
| } |
} |
| return %returnhash; |
return %returnhash; |
|
Line 2694 sub privileged {
|
Line 2767 sub privileged {
|
| if (($rolesdump eq 'con_lost') || ($rolesdump eq '')) { return 0; } |
if (($rolesdump eq 'con_lost') || ($rolesdump eq '')) { return 0; } |
| my $now=time; |
my $now=time; |
| if ($rolesdump ne '') { |
if ($rolesdump ne '') { |
| foreach (split(/&/,$rolesdump)) { |
foreach my $entry (split(/&/,$rolesdump)) { |
| if ($_!~/^rolesdef_/) { |
if ($entry!~/^rolesdef_/) { |
| my ($area,$role)=split(/=/,$_); |
my ($area,$role)=split(/=/,$entry); |
| $area=~s/\_\w\w$//; |
$area=~s/\_\w\w$//; |
| my ($trole,$tend,$tstart)=split(/_/,$role); |
my ($trole,$tend,$tstart)=split(/_/,$role); |
| if (($trole eq 'dc') || ($trole eq 'su')) { |
if (($trole eq 'dc') || ($trole eq 'su')) { |
|
Line 2728 sub rolesinit {
|
Line 2801 sub rolesinit {
|
| my $group_privs; |
my $group_privs; |
| |
|
| if ($rolesdump ne '') { |
if ($rolesdump ne '') { |
| foreach (split(/&/,$rolesdump)) { |
foreach my $entry (split(/&/,$rolesdump)) { |
| if ($_!~/^rolesdef_/) { |
if ($entry!~/^rolesdef_/) { |
| my ($area,$role)=split(/=/,$_); |
my ($area,$role)=split(/=/,$entry); |
| $area=~s/\_\w\w$//; |
$area=~s/\_\w\w$//; |
| my ($trole,$tend,$tstart,$group_privs); |
my ($trole,$tend,$tstart,$group_privs); |
| if ($role=~/^cr/) { |
if ($role=~/^cr/) { |
| if ($role=~m|^(cr/\w+/\w+/[a-zA-Z0-9]+)_(.*)$|) { |
if ($role=~m|^(cr/$match_domain/$match_username/[a-zA-Z0-9]+)_(.*)$|) { |
| ($trole,my $trest)=($role=~m|^(cr/\w+/\w+/[a-zA-Z0-9]+)_(.*)$|); |
($trole,my $trest)=($role=~m|^(cr/$match_domain/$match_username/[a-zA-Z0-9]+)_(.*)$|); |
| ($tend,$tstart)=split('_',$trest); |
($tend,$tstart)=split('_',$trest); |
| } else { |
} else { |
| $trole=$role; |
$trole=$role; |
|
Line 2814 sub group_roleprivs {
|
Line 2887 sub group_roleprivs {
|
| if (($tend!=0) && ($tend<$now)) { $access = 0; } |
if (($tend!=0) && ($tend<$now)) { $access = 0; } |
| if (($tstart!=0) && ($tstart>$now)) { $access=0; } |
if (($tstart!=0) && ($tstart>$now)) { $access=0; } |
| if ($access) { |
if ($access) { |
| my ($course,$group) = ($area =~ m|(/\w+/\w+)/([^/]+)$|); |
my ($course,$group) = ($area =~ m|(/$match_domain/$match_username)/([^/]+)$|); |
| $$allgroups{$course}{$group} .=':'.$group_privs; |
$$allgroups{$course}{$group} .=':'.$group_privs; |
| } |
} |
| } |
} |
|
Line 2845 sub set_userprivs {
|
Line 2918 sub set_userprivs {
|
| if (keys(%{$allgroups}) > 0) { |
if (keys(%{$allgroups}) > 0) { |
| foreach my $role (keys %{$allroles}) { |
foreach my $role (keys %{$allroles}) { |
| my ($trole,$area,$sec,$extendedarea); |
my ($trole,$area,$sec,$extendedarea); |
| if ($role =~ m-^(\w+|cr/\w+/\w+/\w+)\.(/\w+/\w+)(/?\w*)-) { |
if ($role =~ m-^(\w+|cr/$match_domain/$match_username/\w+)\.(/$match_domain/$match_username)(/?\w*)-) { |
| $trole = $1; |
$trole = $1; |
| $area = $2; |
$area = $2; |
| $sec = $3; |
$sec = $3; |
|
Line 2860 sub set_userprivs {
|
Line 2933 sub set_userprivs {
|
| } |
} |
| } |
} |
| } |
} |
| foreach (keys(%grouproles)) { |
foreach my $group (keys(%grouproles)) { |
| $$allroles{$_} = $grouproles{$_}; |
$$allroles{$group} = $grouproles{$group}; |
| } |
} |
| foreach (keys %{$allroles}) { |
foreach my $role (keys(%{$allroles})) { |
| my %thesepriv=(); |
my %thesepriv; |
| if (($_=~/^au/) || ($_=~/^ca/)) { $author=1; } |
if (($role=~/^au/) || ($role=~/^ca/)) { $author=1; } |
| foreach (split(/:/,$$allroles{$_})) { |
foreach my $item (split(/:/,$$allroles{$role})) { |
| if ($_ ne '') { |
if ($item ne '') { |
| my ($privilege,$restrictions)=split(/&/,$_); |
my ($privilege,$restrictions)=split(/&/,$item); |
| if ($restrictions eq '') { |
if ($restrictions eq '') { |
| $thesepriv{$privilege}='F'; |
$thesepriv{$privilege}='F'; |
| } elsif ($thesepriv{$privilege} ne 'F') { |
} elsif ($thesepriv{$privilege} ne 'F') { |
|
Line 2878 sub set_userprivs {
|
Line 2951 sub set_userprivs {
|
| } |
} |
| } |
} |
| my $thesestr=''; |
my $thesestr=''; |
| foreach (keys %thesepriv) { $thesestr.=':'.$_.'&'.$thesepriv{$_}; } |
foreach my $priv (keys(%thesepriv)) { |
| $userroles->{'user.priv.'.$_} = $thesestr; |
$thesestr.=':'.$priv.'&'.$thesepriv{$priv}; |
| |
} |
| |
$userroles->{'user.priv.'.$role} = $thesestr; |
| } |
} |
| return ($author,$adv); |
return ($author,$adv); |
| } |
} |
|
Line 2889 sub set_userprivs {
|
Line 2964 sub set_userprivs {
|
| sub get { |
sub get { |
| my ($namespace,$storearr,$udomain,$uname)=@_; |
my ($namespace,$storearr,$udomain,$uname)=@_; |
| my $items=''; |
my $items=''; |
| foreach (@$storearr) { |
foreach my $item (@$storearr) { |
| $items.=escape($_).'&'; |
$items.=&escape($item).'&'; |
| } |
} |
| $items=~s/\&$//; |
$items=~s/\&$//; |
| if (!$udomain) { $udomain=$env{'user.domain'}; } |
if (!$udomain) { $udomain=$env{'user.domain'}; } |
|
Line 2904 sub get {
|
Line 2979 sub get {
|
| } |
} |
| my %returnhash=(); |
my %returnhash=(); |
| my $i=0; |
my $i=0; |
| foreach (@$storearr) { |
foreach my $item (@$storearr) { |
| $returnhash{$_}=&thaw_unescape($pairs[$i]); |
$returnhash{$item}=&thaw_unescape($pairs[$i]); |
| $i++; |
$i++; |
| } |
} |
| return %returnhash; |
return %returnhash; |
|
Line 2916 sub get {
|
Line 2991 sub get {
|
| sub del { |
sub del { |
| my ($namespace,$storearr,$udomain,$uname)=@_; |
my ($namespace,$storearr,$udomain,$uname)=@_; |
| my $items=''; |
my $items=''; |
| foreach (@$storearr) { |
foreach my $item (@$storearr) { |
| $items.=escape($_).'&'; |
$items.=&escape($item).'&'; |
| } |
} |
| $items=~s/\&$//; |
$items=~s/\&$//; |
| if (!$udomain) { $udomain=$env{'user.domain'}; } |
if (!$udomain) { $udomain=$env{'user.domain'}; } |
|
Line 2967 sub getkeys {
|
Line 3042 sub getkeys {
|
| my $uhome=&homeserver($uname,$udomain); |
my $uhome=&homeserver($uname,$udomain); |
| my $rep=reply("keys:$udomain:$uname:$namespace",$uhome); |
my $rep=reply("keys:$udomain:$uname:$namespace",$uhome); |
| my @keyarray=(); |
my @keyarray=(); |
| foreach (split(/\&/,$rep)) { |
foreach my $key (split(/\&/,$rep)) { |
| push (@keyarray,&unescape($_)); |
push(@keyarray,&unescape($key)); |
| } |
} |
| return @keyarray; |
return @keyarray; |
| } |
} |
|
Line 2995 sub currentdump {
|
Line 3070 sub currentdump {
|
| %returnhash = %{&convert_dump_to_currentdump(\%hash)}; |
%returnhash = %{&convert_dump_to_currentdump(\%hash)}; |
| } else { |
} else { |
| my @pairs=split(/\&/,$rep); |
my @pairs=split(/\&/,$rep); |
| foreach (@pairs) { |
foreach my $pair (@pairs) { |
| my ($key,$value)=split(/=/,$_); |
my ($key,$value)=split(/=/,$pair,2); |
| my ($symb,$param) = split(/:/,$key); |
my ($symb,$param) = split(/:/,$key); |
| $returnhash{&unescape($symb)}->{&unescape($param)} = |
$returnhash{&unescape($symb)}->{&unescape($param)} = |
| &thaw_unescape($value); |
&thaw_unescape($value); |
|
Line 3074 sub put {
|
Line 3149 sub put {
|
| if (!$uname) { $uname=$env{'user.name'}; } |
if (!$uname) { $uname=$env{'user.name'}; } |
| my $uhome=&homeserver($uname,$udomain); |
my $uhome=&homeserver($uname,$udomain); |
| my $items=''; |
my $items=''; |
| foreach (keys %$storehash) { |
foreach my $item (keys(%$storehash)) { |
| $items.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&'; |
$items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&'; |
| } |
} |
| $items=~s/\&$//; |
$items=~s/\&$//; |
| return &reply("put:$udomain:$uname:$namespace:$items",$uhome); |
return &reply("put:$udomain:$uname:$namespace:$items",$uhome); |
|
Line 3127 sub old_putstore {
|
Line 3202 sub old_putstore {
|
| if (!$uname) { $uname=$env{'user.name'}; } |
if (!$uname) { $uname=$env{'user.name'}; } |
| my $uhome=&homeserver($uname,$udomain); |
my $uhome=&homeserver($uname,$udomain); |
| my %newstorehash; |
my %newstorehash; |
| foreach (keys %$storehash) { |
foreach my $item (keys(%$storehash)) { |
| my $key = $version.':'.&escape($symb).':'.$_; |
my $key = $version.':'.&escape($symb).':'.$item; |
| $newstorehash{$key} = $storehash->{$_}; |
$newstorehash{$key} = $storehash->{$item}; |
| } |
} |
| my $items=''; |
my $items=''; |
| my %allitems = (); |
my %allitems = (); |
| foreach (keys %newstorehash) { |
foreach my $item (keys(%newstorehash)) { |
| if ($_ =~ m/^([^\:]+):([^\:]+):([^\:]+)$/) { |
if ($item =~ m/^([^\:]+):([^\:]+):([^\:]+)$/) { |
| my $key = $1.':keys:'.$2; |
my $key = $1.':keys:'.$2; |
| $allitems{$key} .= $3.':'; |
$allitems{$key} .= $3.':'; |
| } |
} |
| $items.=$_.'='.&freeze_escape($newstorehash{$_}).'&'; |
$items.=$item.'='.&freeze_escape($newstorehash{$item}).'&'; |
| } |
} |
| foreach (keys %allitems) { |
foreach my $item (keys(%allitems)) { |
| $allitems{$_} =~ s/\:$//; |
$allitems{$item} =~ s/\:$//; |
| $items.= $_.'='.$allitems{$_}.'&'; |
$items.= $item.'='.$allitems{$item}.'&'; |
| } |
} |
| $items=~s/\&$//; |
$items=~s/\&$//; |
| return &reply("put:$udomain:$uname:$namespace:$items",$uhome); |
return &reply("put:$udomain:$uname:$namespace:$items",$uhome); |
|
Line 3156 sub cput {
|
Line 3231 sub cput {
|
| if (!$uname) { $uname=$env{'user.name'}; } |
if (!$uname) { $uname=$env{'user.name'}; } |
| my $uhome=&homeserver($uname,$udomain); |
my $uhome=&homeserver($uname,$udomain); |
| my $items=''; |
my $items=''; |
| foreach (keys %$storehash) { |
foreach my $item (keys(%$storehash)) { |
| $items.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&'; |
$items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&'; |
| } |
} |
| $items=~s/\&$//; |
$items=~s/\&$//; |
| return &critical("put:$udomain:$uname:$namespace:$items",$uhome); |
return &critical("put:$udomain:$uname:$namespace:$items",$uhome); |
|
Line 3168 sub cput {
|
Line 3243 sub cput {
|
| sub eget { |
sub eget { |
| my ($namespace,$storearr,$udomain,$uname)=@_; |
my ($namespace,$storearr,$udomain,$uname)=@_; |
| my $items=''; |
my $items=''; |
| foreach (@$storearr) { |
foreach my $item (@$storearr) { |
| $items.=escape($_).'&'; |
$items.=&escape($item).'&'; |
| } |
} |
| $items=~s/\&$//; |
$items=~s/\&$//; |
| if (!$udomain) { $udomain=$env{'user.domain'}; } |
if (!$udomain) { $udomain=$env{'user.domain'}; } |
|
Line 3179 sub eget {
|
Line 3254 sub eget {
|
| my @pairs=split(/\&/,$rep); |
my @pairs=split(/\&/,$rep); |
| my %returnhash=(); |
my %returnhash=(); |
| my $i=0; |
my $i=0; |
| foreach (@$storearr) { |
foreach my $item (@$storearr) { |
| $returnhash{$_}=&thaw_unescape($pairs[$i]); |
$returnhash{$item}=&thaw_unescape($pairs[$i]); |
| $i++; |
$i++; |
| } |
} |
| return %returnhash; |
return %returnhash; |
|
Line 3188 sub eget {
|
Line 3263 sub eget {
|
| |
|
| # ------------------------------------------------------------ tmpput interface |
# ------------------------------------------------------------ tmpput interface |
| sub tmpput { |
sub tmpput { |
| my ($storehash,$server)=@_; |
my ($storehash,$server,$context)=@_; |
| my $items=''; |
my $items=''; |
| foreach (keys(%$storehash)) { |
foreach my $item (keys(%$storehash)) { |
| $items.=&escape($_).'='.&freeze_escape($$storehash{$_}).'&'; |
$items.=&escape($item).'='.&freeze_escape($$storehash{$item}).'&'; |
| } |
} |
| $items=~s/\&$//; |
$items=~s/\&$//; |
| |
if (defined($context)) { |
| |
$items .= ':'.&escape($context); |
| |
} |
| return &reply("tmpput:$items",$server); |
return &reply("tmpput:$items",$server); |
| } |
} |
| |
|
|
Line 3298 sub get_portfolio_access {
|
Line 3376 sub get_portfolio_access {
|
| my (%allgroups,%allroles); |
my (%allgroups,%allroles); |
| my ($start,$end,$role,$sec,$group); |
my ($start,$end,$role,$sec,$group); |
| foreach my $envkey (%env) { |
foreach my $envkey (%env) { |
| if ($envkey =~ m-^user\.role\.(gr|cc|in|ta|ep|st)\./([^/]+)/([^/]+)/?([^/]*)$-) { |
if ($envkey =~ m-^user\.role\.(gr|cc|in|ta|ep|st)\./($match_domain)/($match_username)/?([^/]*)$-) { |
| my $cid = $2.'_'.$3; |
my $cid = $2.'_'.$3; |
| if ($1 eq 'gr') { |
if ($1 eq 'gr') { |
| $group = $4; |
$group = $4; |
|
Line 3311 sub get_portfolio_access {
|
Line 3389 sub get_portfolio_access {
|
| } |
} |
| $allroles{$cid}{$1}{$sec} = $env{$envkey}; |
$allroles{$cid}{$1}{$sec} = $env{$envkey}; |
| } |
} |
| } elsif ($envkey =~ m-^user\.role\./cr/(\w+/\w+/\w*)./([^/]+)/([^/]+)/?([^/]*)$-) { |
} elsif ($envkey =~ m-^user\.role\./cr/($match_domain/$match_username/\w*)./($match_domain)/($match_username)/?([^/]*)$-) { |
| my $cid = $2.'_'.$3; |
my $cid = $2.'_'.$3; |
| if ($4 eq '') { |
if ($4 eq '') { |
| $sec = 'none'; |
$sec = 'none'; |
|
Line 3406 sub parse_portfolio_url {
|
Line 3484 sub parse_portfolio_url {
|
| |
|
| my ($type,$udom,$unum,$group,$file_name); |
my ($type,$udom,$unum,$group,$file_name); |
| |
|
| if ($url =~ m-^/*uploaded/([^/]+)/([^/]+)/portfolio(/.+)$-) { |
if ($url =~ m-^/*uploaded/($match_domain)/($match_username)/portfolio(/.+)$-) { |
| $type = 1; |
$type = 1; |
| $udom = $1; |
$udom = $1; |
| $unum = $2; |
$unum = $2; |
| $file_name = $3; |
$file_name = $3; |
| } elsif ($url =~ m-^/*uploaded/([^/]+)/([^/]+)/groups/([^/]+)/portfolio/(.+)$-) { |
} elsif ($url =~ m-^/*uploaded/($match_domain)/($match_username)/groups/([^/]+)/portfolio/(.+)$-) { |
| $type = 2; |
$type = 2; |
| $udom = $1; |
$udom = $1; |
| $unum = $2; |
$unum = $2; |
|
Line 3429 sub is_portfolio_url {
|
Line 3507 sub is_portfolio_url {
|
| return scalar(&parse_portfolio_url($url)); |
return scalar(&parse_portfolio_url($url)); |
| } |
} |
| |
|
| |
sub is_portfolio_file { |
| |
my ($file) = @_; |
| |
if (($file =~ /^portfolio/) || ($file =~ /^groups\/$match_username\/portfolio/)) { |
| |
return 1; |
| |
} |
| |
return; |
| |
} |
| |
|
| |
|
| # ---------------------------------------------- Custom access rule evaluation |
# ---------------------------------------------- Custom access rule evaluation |
| |
|
| sub customaccess { |
sub customaccess { |
| my ($priv,$uri)=@_; |
my ($priv,$uri)=@_; |
| my ($urole,$urealm)=split(/\./,$env{'request.role'}); |
my ($urole,$urealm)=split(/\./,$env{'request.role'},2); |
| $urealm=~s/^\W//; |
|
| my ($udom,$ucrs,$usec)=split(/\//,$urealm); |
my ($udom,$ucrs,$usec)=split(/\//,$urealm); |
| |
$udom = &LONCAPA::clean_domain($udom); |
| |
$ucrs = &LONCAPA::clean_username($ucrs); |
| my $access=0; |
my $access=0; |
| foreach (split(/\s*\,\s*/,&metadata($uri,'rule_rights'))) { |
foreach my $right (split(/\s*\,\s*/,&metadata($uri,'rule_rights'))) { |
| my ($effect,$realm,$role)=split(/\:/,$_); |
my ($effect,$realm,$role)=split(/\:/,$right); |
| if ($role) { |
if ($role) { |
| if ($role ne $urole) { next; } |
if ($role ne $urole) { next; } |
| } |
} |
| foreach (split(/\s*\,\s*/,$realm)) { |
foreach my $scope (split(/\s*\,\s*/,$realm)) { |
| my ($tdom,$tcrs,$tsec)=split(/\_/,$_); |
my ($tdom,$tcrs,$tsec)=split(/\_/,$scope); |
| if ($tdom) { |
if ($tdom) { |
| if ($tdom ne $udom) { next; } |
if ($tdom ne $udom) { next; } |
| } |
} |
|
Line 3474 sub allowed {
|
Line 3562 sub allowed {
|
| |
|
| if (defined($env{'allowed.'.$priv})) { return $env{'allowed.'.$priv}; } |
if (defined($env{'allowed.'.$priv})) { return $env{'allowed.'.$priv}; } |
| # Free bre access to adm and meta resources |
# Free bre access to adm and meta resources |
| if (((($uri=~/^adm\//) && ($uri !~ m|/bulletinboard$|)) |
if (((($uri=~/^adm\//) && ($uri !~ m{/(?:smppg|bulletinboard)$})) |
| || (($uri=~/\.meta$/) && ($uri!~m|^uploaded/|) )) |
|| (($uri=~/\.meta$/) && ($uri!~m|^uploaded/|) )) |
| && ($priv eq 'bre')) { |
&& ($priv eq 'bre')) { |
| return 'F'; |
return 'F'; |
|
Line 3655 sub allowed {
|
Line 3743 sub allowed {
|
| if ($checkreferer) { |
if ($checkreferer) { |
| my $refuri=$env{'httpref.'.$orguri}; |
my $refuri=$env{'httpref.'.$orguri}; |
| unless ($refuri) { |
unless ($refuri) { |
| foreach (keys %env) { |
foreach my $key (keys(%env)) { |
| if ($_=~/^httpref\..*\*/) { |
if ($key=~/^httpref\..*\*/) { |
| my $pattern=$_; |
my $pattern=$key; |
| $pattern=~s/^httpref\.\/res\///; |
$pattern=~s/^httpref\.\/res\///; |
| $pattern=~s/\*/\[\^\/\]\+/g; |
$pattern=~s/\*/\[\^\/\]\+/g; |
| $pattern=~s/\//\\\//g; |
$pattern=~s/\//\\\//g; |
| if ($orguri=~/$pattern/) { |
if ($orguri=~/$pattern/) { |
| $refuri=$env{$_}; |
$refuri=$env{$key}; |
| } |
} |
| } |
} |
| } |
} |
|
Line 3880 sub get_symb_from_alias {
|
Line 3968 sub get_symb_from_alias {
|
| sub definerole { |
sub definerole { |
| if (allowed('mcr','/')) { |
if (allowed('mcr','/')) { |
| my ($rolename,$sysrole,$domrole,$courole)=@_; |
my ($rolename,$sysrole,$domrole,$courole)=@_; |
| foreach (split(':',$sysrole)) { |
foreach my $role (split(':',$sysrole)) { |
| my ($crole,$cqual)=split(/\&/,$_); |
my ($crole,$cqual)=split(/\&/,$role); |
| if ($pr{'cr:s'}!~/\Q$crole\E/) { return "refused:s:$crole"; } |
if ($pr{'cr:s'}!~/\Q$crole\E/) { return "refused:s:$crole"; } |
| if ($pr{'cr:s'}=~/\Q$crole\E\&/) { |
if ($pr{'cr:s'}=~/\Q$crole\E\&/) { |
| if ($pr{'cr:s'}!~/\Q$crole\E\&\w*\Q$cqual\E/) { |
if ($pr{'cr:s'}!~/\Q$crole\E\&\w*\Q$cqual\E/) { |
|
Line 3889 sub definerole {
|
Line 3977 sub definerole {
|
| } |
} |
| } |
} |
| } |
} |
| foreach (split(':',$domrole)) { |
foreach my $role (split(':',$domrole)) { |
| my ($crole,$cqual)=split(/\&/,$_); |
my ($crole,$cqual)=split(/\&/,$role); |
| if ($pr{'cr:d'}!~/\Q$crole\E/) { return "refused:d:$crole"; } |
if ($pr{'cr:d'}!~/\Q$crole\E/) { return "refused:d:$crole"; } |
| if ($pr{'cr:d'}=~/\Q$crole\E\&/) { |
if ($pr{'cr:d'}=~/\Q$crole\E\&/) { |
| if ($pr{'cr:d'}!~/\Q$crole\W\&\w*\Q$cqual\E/) { |
if ($pr{'cr:d'}!~/\Q$crole\W\&\w*\Q$cqual\E/) { |
|
Line 3898 sub definerole {
|
Line 3986 sub definerole {
|
| } |
} |
| } |
} |
| } |
} |
| foreach (split(':',$courole)) { |
foreach my $role (split(':',$courole)) { |
| my ($crole,$cqual)=split(/\&/,$_); |
my ($crole,$cqual)=split(/\&/,$role); |
| if ($pr{'cr:c'}!~/\Q$crole\E/) { return "refused:c:$crole"; } |
if ($pr{'cr:c'}!~/\Q$crole\E/) { return "refused:c:$crole"; } |
| if ($pr{'cr:c'}=~/\Q$crole\E\&/) { |
if ($pr{'cr:c'}=~/\Q$crole\E\&/) { |
| if ($pr{'cr:c'}!~/\Q$crole\E\&\w*\Q$cqual\E/) { |
if ($pr{'cr:c'}!~/\Q$crole\E\&\w*\Q$cqual\E/) { |
|
Line 3946 sub log_query {
|
Line 4034 sub log_query {
|
| my $uhome=&homeserver($uname,$udom); |
my $uhome=&homeserver($uname,$udom); |
| if ($uhome eq 'no_host') { return 'error: no_host'; } |
if ($uhome eq 'no_host') { return 'error: no_host'; } |
| my $uhost=$hostname{$uhome}; |
my $uhost=$hostname{$uhome}; |
| my $command=&escape(join(':',map{$_.'='.$filters{$_}} keys %filters)); |
my $command=&escape(join(':',map{$_.'='.$filters{$_}} keys(%filters))); |
| my $queryid=&reply("querysend:".$query.':'.$udom.':'.$uname.':'.$command, |
my $queryid=&reply("querysend:".$query.':'.$udom.':'.$uname.':'.$command, |
| $uhome); |
$uhome); |
| unless ($queryid=~/^\Q$uhost\E\_/) { return 'error: '.$queryid; } |
unless ($queryid=~/^\Q$uhost\E\_/) { return 'error: '.$queryid; } |
|
Line 3967 sub fetch_enrollment_query {
|
Line 4055 sub fetch_enrollment_query {
|
| } |
} |
| my $host=$hostname{$homeserver}; |
my $host=$hostname{$homeserver}; |
| my $cmd = ''; |
my $cmd = ''; |
| foreach (keys %{$affiliatesref}) { |
foreach my $affiliate (keys %{$affiliatesref}) { |
| $cmd .= $_.'='.join(",",@{$$affiliatesref{$_}}).'%%'; |
$cmd .= $affiliate.'='.join(",",@{$$affiliatesref{$affiliate}}).'%%'; |
| } |
} |
| $cmd =~ s/%%$//; |
$cmd =~ s/%%$//; |
| $cmd = &escape($cmd); |
$cmd = &escape($cmd); |
|
Line 3989 sub fetch_enrollment_query {
|
Line 4077 sub fetch_enrollment_query {
|
| } else { |
} else { |
| my @responses = split/:/,$reply; |
my @responses = split/:/,$reply; |
| if ($homeserver eq $perlvar{'lonHostID'}) { |
if ($homeserver eq $perlvar{'lonHostID'}) { |
| foreach (@responses) { |
foreach my $line (@responses) { |
| my ($key,$value) = split/=/,$_; |
my ($key,$value) = split(/=/,$line,2); |
| $$replyref{$key} = $value; |
$$replyref{$key} = $value; |
| } |
} |
| } else { |
} else { |
| my $pathname = $perlvar{'lonDaemons'}.'/tmp'; |
my $pathname = $perlvar{'lonDaemons'}.'/tmp'; |
| foreach (@responses) { |
foreach my $line (@responses) { |
| my ($key,$value) = split/=/,$_; |
my ($key,$value) = split(/=/,$line); |
| $$replyref{$key} = $value; |
$$replyref{$key} = $value; |
| if ($value > 0) { |
if ($value > 0) { |
| foreach (@{$$affiliatesref{$key}}) { |
foreach my $item (@{$$affiliatesref{$key}}) { |
| my $filename = $dom.'_'.$key.'_'.$_.'_classlist.xml'; |
my $filename = $dom.'_'.$key.'_'.$item.'_classlist.xml'; |
| my $destname = $pathname.'/'.$filename; |
my $destname = $pathname.'/'.$filename; |
| my $xml_classlist = &reply("autoretrieve:".$filename,$homeserver); |
my $xml_classlist = &reply("autoretrieve:".$filename,$homeserver); |
| if ($xml_classlist =~ /^error/) { |
if ($xml_classlist =~ /^error/) { |
|
Line 4074 sub auto_run {
|
Line 4162 sub auto_run {
|
| my $response = &reply('autorun:'.$cdom,$homeserver); |
my $response = &reply('autorun:'.$cdom,$homeserver); |
| return $response; |
return $response; |
| } |
} |
| |
|
| sub auto_get_sections { |
sub auto_get_sections { |
| my ($cnum,$cdom,$inst_coursecode) = @_; |
my ($cnum,$cdom,$inst_coursecode) = @_; |
| my $homeserver = &homeserver($cnum,$cdom); |
my $homeserver = &homeserver($cnum,$cdom); |
|
Line 4085 sub auto_get_sections {
|
Line 4173 sub auto_get_sections {
|
| } |
} |
| return @secs; |
return @secs; |
| } |
} |
| |
|
| sub auto_new_course { |
sub auto_new_course { |
| my ($cnum,$cdom,$inst_course_id,$owner) = @_; |
my ($cnum,$cdom,$inst_course_id,$owner) = @_; |
| my $homeserver = &homeserver($cnum,$cdom); |
my $homeserver = &homeserver($cnum,$cdom); |
| my $response=&unescape(&reply('autonewcourse:'.$inst_course_id.':'.$owner.':'.$cdom,$homeserver)); |
my $response=&unescape(&reply('autonewcourse:'.$inst_course_id.':'.$owner.':'.$cdom,$homeserver)); |
| return $response; |
return $response; |
| } |
} |
| |
|
| sub auto_validate_courseID { |
sub auto_validate_courseID { |
| my ($cnum,$cdom,$inst_course_id) = @_; |
my ($cnum,$cdom,$inst_course_id) = @_; |
| my $homeserver = &homeserver($cnum,$cdom); |
my $homeserver = &homeserver($cnum,$cdom); |
| my $response=&unescape(&reply('autovalidatecourse:'.$inst_course_id.':'.$cdom,$homeserver)); |
my $response=&unescape(&reply('autovalidatecourse:'.$inst_course_id.':'.$cdom,$homeserver)); |
| return $response; |
return $response; |
| } |
} |
| |
|
| sub auto_create_password { |
sub auto_create_password { |
| my ($cnum,$cdom,$authparam) = @_; |
my ($cnum,$cdom,$authparam) = @_; |
| my $homeserver = &homeserver($cnum,$cdom); |
my $homeserver = &homeserver($cnum,$cdom); |
|
Line 4159 sub auto_photoupdate {
|
Line 4247 sub auto_photoupdate {
|
| my $host=$hostname{$homeserver}; |
my $host=$hostname{$homeserver}; |
| my $cmd = ''; |
my $cmd = ''; |
| my $maxtries = 1; |
my $maxtries = 1; |
| foreach (keys %{$affiliatesref}) { |
foreach my $affiliate (keys(%{$affiliatesref})) { |
| $cmd .= $_.'='.join(",",@{$$affiliatesref{$_}}).'%%'; |
$cmd .= $affiliate.'='.join(",",@{$$affiliatesref{$affiliate}}).'%%'; |
| } |
} |
| $cmd =~ s/%%$//; |
$cmd =~ s/%%$//; |
| $cmd = &escape($cmd); |
$cmd = &escape($cmd); |
|
Line 4191 sub auto_photoupdate {
|
Line 4279 sub auto_photoupdate {
|
| } |
} |
| |
|
| sub auto_instcode_format { |
sub auto_instcode_format { |
| my ($caller,$codedom,$instcodes,$codes,$codetitles,$cat_titles,$cat_order) = @_; |
my ($caller,$codedom,$instcodes,$codes,$codetitles,$cat_titles, |
| |
$cat_order) = @_; |
| my $courses = ''; |
my $courses = ''; |
| my $homeserver; |
my @homeservers; |
| if ($caller eq 'global') { |
if ($caller eq 'global') { |
| foreach my $tryserver (keys %libserv) { |
foreach my $tryserver (keys(%libserv)) { |
| if ($hostdom{$tryserver} eq $codedom) { |
if ($hostdom{$tryserver} eq $codedom) { |
| $homeserver = $tryserver; |
if (!grep(/^\Q$tryserver\E$/,@homeservers)) { |
| last; |
push(@homeservers,$tryserver); |
| |
} |
| } |
} |
| } |
} |
| if (($env{'user.name'}) && ($env{'user.domain'} eq $codedom)) { |
|
| $homeserver = &homeserver($env{'user.name'},$codedom); |
|
| } |
|
| } else { |
} else { |
| $homeserver = &homeserver($caller,$codedom); |
push(@homeservers,&homeserver($caller,$codedom)); |
| } |
} |
| foreach (keys %{$instcodes}) { |
foreach my $code (keys(%{$instcodes})) { |
| $courses .= &escape($_).'='.&escape($$instcodes{$_}).'&'; |
$courses .= &escape($code).'='.&escape($$instcodes{$code}).'&'; |
| } |
} |
| chop($courses); |
chop($courses); |
| my $response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$homeserver); |
my $ok_response = 0; |
| unless ($response =~ /(con_lost|error|no_such_host|refused)/) { |
my $response; |
| my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) = split/:/,$response; |
while (@homeservers > 0 && $ok_response == 0) { |
| %{$codes} = &str2hash($codes_str); |
my $server = shift(@homeservers); |
| @{$codetitles} = &str2array($codetitles_str); |
$response=&reply('autoinstcodeformat:'.$codedom.':'.$courses,$server); |
| %{$cat_titles} = &str2hash($cat_titles_str); |
if ($response !~ /(con_lost|error|no_such_host|refused)/) { |
| %{$cat_order} = &str2hash($cat_order_str); |
my ($codes_str,$codetitles_str,$cat_titles_str,$cat_order_str) = |
| |
split/:/,$response; |
| |
%{$codes} = (%{$codes},&str2hash($codes_str)); |
| |
push(@{$codetitles},&str2array($codetitles_str)); |
| |
%{$cat_titles} = (%{$cat_titles},&str2hash($cat_titles_str)); |
| |
%{$cat_order} = (%{$cat_order},&str2hash($cat_order_str)); |
| |
$ok_response = 1; |
| |
} |
| |
} |
| |
if ($ok_response) { |
| return 'ok'; |
return 'ok'; |
| |
} else { |
| |
return $response; |
| |
} |
| |
} |
| |
|
| |
sub auto_instcode_defaults { |
| |
my ($domain,$returnhash,$code_order) = @_; |
| |
my @homeservers; |
| |
foreach my $tryserver (keys(%libserv)) { |
| |
if ($hostdom{$tryserver} eq $domain) { |
| |
if (!grep(/^\Q$tryserver\E$/,@homeservers)) { |
| |
push(@homeservers,$tryserver); |
| |
} |
| |
} |
| } |
} |
| |
my $ok_response = 0; |
| |
my $response; |
| |
while (@homeservers > 0 && $ok_response == 0) { |
| |
my $server = shift(@homeservers); |
| |
$response=&reply('autoinstcodedefaults:'.$domain,$server); |
| |
if ($response !~ /(con_lost|error|no_such_host|refused)/) { |
| |
foreach my $pair (split(/\&/,$response)) { |
| |
my ($name,$value)=split(/\=/,$pair); |
| |
if ($name eq 'code_order') { |
| |
@{$code_order} = split(/\&/,&unescape($value)); |
| |
} else { |
| |
$returnhash->{&unescape($name)}=&unescape($value); |
| |
} |
| |
} |
| |
$ok_response = 1; |
| |
} |
| |
} |
| |
if ($ok_response) { |
| |
return 'ok'; |
| |
} else { |
| |
return $response; |
| |
} |
| |
} |
| |
|
| |
sub auto_validate_class_sec { |
| |
my ($cdom,$cnum,$owner,$inst_class) = @_; |
| |
my $homeserver = &homeserver($cnum,$cdom); |
| |
my $response=&reply('autovalidateclass_sec:'.$inst_class.':'. |
| |
&escape($owner).':'.$cdom,$homeserver); |
| return $response; |
return $response; |
| } |
} |
| |
|
|
Line 4230 sub get_coursegroups {
|
Line 4369 sub get_coursegroups {
|
| return(&dump('coursegroups',$cdom,$cnum,$group)); |
return(&dump('coursegroups',$cdom,$cnum,$group)); |
| } |
} |
| |
|
| |
sub get_deleted_groups { |
| |
my ($cdom,$cnum,$group) = @_; |
| |
return(&dump('deleted_groups',$cdom,$cnum,$group)); |
| |
} |
| |
|
| sub modify_coursegroup { |
sub modify_coursegroup { |
| my ($cdom,$cnum,$groupsettings) = @_; |
my ($cdom,$cnum,$groupsettings) = @_; |
| return(&put('coursegroups',$groupsettings,$cdom,$cnum)); |
return(&put('coursegroups',$groupsettings,$cdom,$cnum)); |
| } |
} |
| |
|
| |
sub delete_coursegroup { |
| |
my ($cdom,$cnum,$group) = @_; |
| |
my %curr_group = &get_coursegroups($cdom,$cnum,$group); |
| |
if (my $tmp = &error(%curr_group)) { |
| |
&Apache::lonnet::logthis('Error retrieving group: '.$tmp.' in '.$cnum.':'.$cdom); |
| |
return ('read error',$tmp); |
| |
} else { |
| |
my %savedsettings = %curr_group; |
| |
my $result = &put('deleted_groups',\%savedsettings,$cdom,$cnum); |
| |
my $deloutcome; |
| |
if ($result eq 'ok') { |
| |
$deloutcome = &del('coursegroups',[$group],$cdom,$cnum); |
| |
} else { |
| |
return ('write error',$result); |
| |
} |
| |
if ($deloutcome eq 'ok') { |
| |
return 'ok'; |
| |
} else { |
| |
return ('delete error',$deloutcome); |
| |
} |
| |
} |
| |
} |
| |
|
| 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) = @_; |
| my $url = '/'.$cdom.'/'.$cnum.'/'.$group_id; |
my $url = '/'.$cdom.'/'.$cnum.'/'.$group_id; |
|
Line 4258 sub get_active_groups {
|
Line 4425 sub get_active_groups {
|
| my $now = time; |
my $now = time; |
| my %groups = (); |
my %groups = (); |
| foreach my $key (keys(%env)) { |
foreach my $key (keys(%env)) { |
| if ($key =~ m-user\.role\.gr\./([^/]+)/([^/]+)/(\w+)$-) { |
if ($key =~ m-user\.role\.gr\./($match_domain)/($match_username)/(\w+)$-) { |
| my ($start,$end) = split(/\./,$env{$key}); |
my ($start,$end) = split(/\./,$env{$key}); |
| if (($end!=0) && ($end<$now)) { next; } |
if (($end!=0) && ($end<$now)) { next; } |
| if (($start!=0) && ($start>$now)) { next; } |
if (($start!=0) && ($start>$now)) { next; } |
|
Line 4279 sub get_users_groups {
|
Line 4446 sub get_users_groups {
|
| my ($udom,$uname,$courseid) = @_; |
my ($udom,$uname,$courseid) = @_; |
| my @usersgroups; |
my @usersgroups; |
| my $cachetime=1800; |
my $cachetime=1800; |
| $courseid=~s/\_/\//g; |
|
| $courseid=~s/^(\w)/\/$1/; |
|
| |
|
| my $hashid="$udom:$uname:$courseid"; |
my $hashid="$udom:$uname:$courseid"; |
| my ($grouplist,$cached)=&is_cached_new('getgroups',$hashid); |
my ($grouplist,$cached)=&is_cached_new('getgroups',$hashid); |
|
Line 4327 sub get_users_groups {
|
Line 4492 sub get_users_groups {
|
| sub devalidate_getgroups_cache { |
sub devalidate_getgroups_cache { |
| my ($udom,$uname,$cdom,$cnum)=@_; |
my ($udom,$uname,$cdom,$cnum)=@_; |
| my $courseid = $cdom.'_'.$cnum; |
my $courseid = $cdom.'_'.$cnum; |
| $courseid=~s/\_/\//g; |
|
| $courseid=~s/^(\w)/\/$1/; |
|
| my $hashid="$udom:$uname:$courseid"; |
my $hashid="$udom:$uname:$courseid"; |
| &devalidate_cache_new('getgroups',$hashid); |
&devalidate_cache_new('getgroups',$hashid); |
| } |
} |
|
Line 4367 sub assignrole {
|
Line 4531 sub assignrole {
|
| my $mrole; |
my $mrole; |
| if ($role =~ /^cr\//) { |
if ($role =~ /^cr\//) { |
| my $cwosec=$url; |
my $cwosec=$url; |
| $cwosec=~s/^\/(\w+)\/(\w+)\/.*/$1\/$2/; |
$cwosec=~s/^\/($match_domain)\/($match_username)\/.*/$1\/$2/; |
| unless (&allowed('ccr',$cwosec)) { |
unless (&allowed('ccr',$cwosec)) { |
| &logthis('Refused custom assignrole: '. |
&logthis('Refused custom assignrole: '. |
| $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '. |
$udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '. |
|
Line 4377 sub assignrole {
|
Line 4541 sub assignrole {
|
| $mrole='cr'; |
$mrole='cr'; |
| } elsif ($role =~ /^gr\//) { |
} elsif ($role =~ /^gr\//) { |
| my $cwogrp=$url; |
my $cwogrp=$url; |
| $cwogrp=~s/^\/(\w+)\/(\w+)\/.*/$1\/$2/; |
$cwogrp=~s{^/($match_domain)/($match_username)/.*} |
| |
{$1/$2}x; |
| unless (&allowed('mdg',$cwogrp)) { |
unless (&allowed('mdg',$cwogrp)) { |
| &logthis('Refused group assignrole: '. |
&logthis('Refused group assignrole: '. |
| $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '. |
$udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '. |
|
Line 4387 sub assignrole {
|
Line 4552 sub assignrole {
|
| $mrole='gr'; |
$mrole='gr'; |
| } else { |
} else { |
| my $cwosec=$url; |
my $cwosec=$url; |
| $cwosec=~s/^\/(\w+)\/(\w+)\/.*/$1\/$2/; |
$cwosec=~s/^\/($match_domain)\/($match_username)\/.*/$1\/$2/; |
| unless ((&allowed('c'.$role,$cwosec)) || &allowed('c'.$role,$udom)) { |
unless ((&allowed('c'.$role,$cwosec)) || &allowed('c'.$role,$udom)) { |
| &logthis('Refused assignrole: '. |
&logthis('Refused assignrole: '. |
| $udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '. |
$udom.' '.$uname.' '.$url.' '.$role.' '.$end.' '.$start.' by '. |
|
Line 4467 sub modifyuser {
|
Line 4632 sub modifyuser {
|
| $umode, $upass, $first, |
$umode, $upass, $first, |
| $middle, $last, $gene, |
$middle, $last, $gene, |
| $forceid, $desiredhome, $email)=@_; |
$forceid, $desiredhome, $email)=@_; |
| $udom=~s/\W//g; |
$udom= &LONCAPA::clean_domain($udom); |
| $uname=~s/\W//g; |
$uname=&LONCAPA::clean_username($uname); |
| &logthis('Call to modify user '.$udom.', '.$uname.', '.$uid.', '. |
&logthis('Call to modify user '.$udom.', '.$uname.', '.$uid.', '. |
| $umode.', '.$first.', '.$middle.', '. |
$umode.', '.$first.', '.$middle.', '. |
| $last.', '.$gene.'(forceid: '.$forceid.')'. |
$last.', '.$gene.'(forceid: '.$forceid.')'. |
|
Line 4617 sub modify_student_enrollment {
|
Line 4782 sub modify_student_enrollment {
|
| ['firstname','middlename','lastname', 'generation','id'] |
['firstname','middlename','lastname', 'generation','id'] |
| ,$udom,$uname); |
,$udom,$uname); |
| |
|
| #foreach (keys(%tmp)) { |
#foreach my $key (keys(%tmp)) { |
| # &logthis("key $_ = ".$tmp{$_}); |
# &logthis("key $key = ".$tmp{$key}); |
| #} |
#} |
| $first = $tmp{'firstname'} if (!defined($first) || $first eq ''); |
$first = $tmp{'firstname'} if (!defined($first) || $first eq ''); |
| $middle = $tmp{'middlename'} if (!defined($middle) || $middle eq ''); |
$middle = $tmp{'middlename'} if (!defined($middle) || $middle eq ''); |
|
Line 4676 sub writecoursepref {
|
Line 4841 sub writecoursepref {
|
| return 'error: no such course'; |
return 'error: no such course'; |
| } |
} |
| my $cstring=''; |
my $cstring=''; |
| foreach (keys %prefs) { |
foreach my $pref (keys(%prefs)) { |
| $cstring.=escape($_).'='.escape($prefs{$_}).'&'; |
$cstring.=&escape($pref).'='.&escape($prefs{$pref}).'&'; |
| } |
} |
| $cstring=~s/\&$//; |
$cstring=~s/\&$//; |
| return reply('put:'.$cdomain.':'.$cnum.':environment:'.$cstring,$chome); |
return reply('put:'.$cdomain.':'.$cnum.':environment:'.$cstring,$chome); |
|
Line 4884 sub files_not_in_path {
|
Line 5049 sub files_not_in_path {
|
| my $filename = $user."savedfiles"; |
my $filename = $user."savedfiles"; |
| my @return_files; |
my @return_files; |
| my $path_part; |
my $path_part; |
| open (IN, '<'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename); |
open(IN, '<'.$Apache::lonnet::perlvar{'lonDaemons'}.'/tmp/'.$filename); |
| while (<IN>) { |
while (my $line = <IN>) { |
| #ok, I know it's clunky, but I want it to work |
#ok, I know it's clunky, but I want it to work |
| my @paths_and_file = split m!/!, $_; |
my @paths_and_file = split(m|/|, $line); |
| my $file_part = pop (@paths_and_file); |
my $file_part = pop(@paths_and_file); |
| chomp ($file_part); |
chomp($file_part); |
| my $path_part = join ('/', @paths_and_file); |
my $path_part = join('/', @paths_and_file); |
| $path_part .= '/'; |
$path_part .= '/'; |
| my $path_and_file = $path_part.$file_part; |
my $path_and_file = $path_part.$file_part; |
| if ($path_part ne $path) { |
if ($path_part ne $path) { |
| push (@return_files, ($path_and_file)); |
push(@return_files, ($path_and_file)); |
| } |
} |
| } |
} |
| close (OUT); |
close(OUT); |
| return (@return_files); |
return (@return_files); |
| } |
} |
| |
|
|
Line 4960 sub modify_access_controls {
|
Line 5125 sub modify_access_controls {
|
| for (my $i=0; $i<$numnew; $i++) { |
for (my $i=0; $i<$numnew; $i++) { |
| my $newkey = $newitems[$i]; |
my $newkey = $newitems[$i]; |
| my $newid = &Apache::loncommon::get_cgi_id(); |
my $newid = &Apache::loncommon::get_cgi_id(); |
| $newkey =~ s/^(\d+)/$newid/; |
if ($newkey =~ /^\d+:/) { |
| $translation{$1} = $newid; |
$newkey =~ s/^(\d+)/$newid/; |
| |
$translation{$1} = $newid; |
| |
} elsif ($newkey =~ /^\d+_\d+_\d+:/) { |
| |
$newkey =~ s/^(\d+_\d+_\d+)/$newid/; |
| |
$translation{$1} = $newid; |
| |
} |
| $new_values{$file_name."\0".$newkey} = |
$new_values{$file_name."\0".$newkey} = |
| $$changes{'activate'}{$newitems[$i]}; |
$$changes{'activate'}{$newitems[$i]}; |
| $new_control{$newkey} = $now; |
$new_control{$newkey} = $now; |
|
Line 5161 sub dirlist {
|
Line 5331 sub dirlist {
|
| |
|
| if($udom) { |
if($udom) { |
| if($uname) { |
if($uname) { |
| my $listing=reply('ls2:'.$dirRoot.'/'.$uri, |
my $listing = &reply('ls2:'.$dirRoot.'/'.$uri, |
| homeserver($uname,$udom)); |
&homeserver($uname,$udom)); |
| my @listing_results; |
my @listing_results; |
| 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)); |
| @listing_results = split(/:/,$listing); |
@listing_results = split(/:/,$listing); |
| } else { |
} else { |
| @listing_results = map { &unescape($_); } split(/:/,$listing); |
@listing_results = map { &unescape($_); } split(/:/,$listing); |
| } |
} |
| return @listing_results; |
return @listing_results; |
| } elsif(!defined($alternateDirectoryRoot)) { |
} elsif(!defined($alternateDirectoryRoot)) { |
| my $tryserver; |
my %allusers; |
| my %allusers=(); |
foreach my $tryserver (keys(%libserv)) { |
| foreach $tryserver (keys %libserv) { |
|
| if($hostdom{$tryserver} eq $udom) { |
if($hostdom{$tryserver} eq $udom) { |
| my $listing=reply('ls2:'.$perlvar{'lonDocRoot'}.'/res/'. |
my $listing = &reply('ls2:'.$perlvar{'lonDocRoot'}.'/res/'. |
| $udom, $tryserver); |
$udom, $tryserver); |
| my @listing_results; |
my @listing_results; |
| 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); |
| @listing_results = split(/:/,$listing); |
@listing_results = split(/:/,$listing); |
| } else { |
} else { |
| @listing_results = |
@listing_results = |
|
Line 5191 sub dirlist {
|
Line 5360 sub dirlist {
|
| if ($listing_results[0] ne 'no_such_dir' && |
if ($listing_results[0] ne 'no_such_dir' && |
| $listing_results[0] ne 'empty' && |
$listing_results[0] ne 'empty' && |
| $listing_results[0] ne 'con_lost') { |
$listing_results[0] ne 'con_lost') { |
| foreach (@listing_results) { |
foreach my $line (@listing_results) { |
| my ($entry,@stat)=split(/&/,$_); |
my ($entry) = split(/&/,$line,2); |
| $allusers{$entry}=1; |
$allusers{$entry} = 1; |
| } |
} |
| } |
} |
| } |
} |
| } |
} |
| my $alluserstr=''; |
my $alluserstr=''; |
| foreach (sort keys %allusers) { |
foreach my $user (sort(keys(%allusers))) { |
| $alluserstr.=$_.'&user:'; |
$alluserstr.=$user.'&user:'; |
| } |
} |
| $alluserstr=~s/:$//; |
$alluserstr=~s/:$//; |
| return split(/:/,$alluserstr); |
return split(/:/,$alluserstr); |
| } else { |
} else { |
| my @emptyResults = (); |
return ('missing user name'); |
| push(@emptyResults, 'missing user name'); |
|
| return split(':',@emptyResults); |
|
| } |
} |
| } elsif(!defined($alternateDirectoryRoot)) { |
} elsif(!defined($alternateDirectoryRoot)) { |
| my $tryserver; |
my $tryserver; |
| my %alldom=(); |
my %alldom=(); |
| foreach $tryserver (keys %libserv) { |
foreach $tryserver (keys(%libserv)) { |
| $alldom{$hostdom{$tryserver}}=1; |
$alldom{$hostdom{$tryserver}}=1; |
| } |
} |
| my $alldomstr=''; |
my $alldomstr=''; |
| foreach (sort keys %alldom) { |
foreach my $domain (sort(keys(%alldom))) { |
| $alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$_.'/&domain:'; |
$alldomstr.=$perlvar{'lonDocRoot'}.'/res/'.$domain.'/&domain:'; |
| } |
} |
| $alldomstr=~s/:$//; |
$alldomstr=~s/:$//; |
| return split(/:/,$alldomstr); |
return split(/:/,$alldomstr); |
| } else { |
} else { |
| my @emptyResults = (); |
return ('missing domain'); |
| push(@emptyResults, 'missing domain'); |
|
| return split(':',@emptyResults); |
|
| } |
} |
| } |
} |
| |
|
|
Line 5242 sub dirlist {
|
Line 5407 sub dirlist {
|
| ## |
## |
| sub GetFileTimestamp { |
sub GetFileTimestamp { |
| my ($studentDomain,$studentName,$filename,$root)=@_; |
my ($studentDomain,$studentName,$filename,$root)=@_; |
| $studentDomain=~s/\W//g; |
$studentDomain = &LONCAPA::clean_domain($studentDomain); |
| $studentName=~s/\W//g; |
$studentName = &LONCAPA::clean_username($studentName); |
| my $subdir=$studentName.'__'; |
my $subdir=$studentName.'__'; |
| $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/; |
$subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/; |
| my $proname="$studentDomain/$subdir/$studentName"; |
my $proname="$studentDomain/$subdir/$studentName"; |
|
Line 5261 sub GetFileTimestamp {
|
Line 5426 sub GetFileTimestamp {
|
| |
|
| sub stat_file { |
sub stat_file { |
| my ($uri) = @_; |
my ($uri) = @_; |
| $uri = &clutter($uri); |
$uri = &clutter_with_no_wrapper($uri); |
| |
|
| # we want just the url part without the unneeded accessor url bits |
|
| if ($uri =~ m-^/adm/-) { |
|
| $uri=~s-^/adm/wrapper/-/-; |
|
| $uri=~s-^/adm/coursedocs/showdoc/-/-; |
|
| } |
|
| my ($udom,$uname,$file,$dir); |
my ($udom,$uname,$file,$dir); |
| if ($uri =~ m-^/(uploaded|editupload)/-) { |
if ($uri =~ m-^/(uploaded|editupload)/-) { |
| ($udom,$uname,$file) = |
($udom,$uname,$file) = |
| ($uri =~ m-/(?:uploaded|editupload)/?([^/]*)/?([^/]*)/?(.*)-); |
($uri =~ m-/(?:uploaded|editupload)/?($match_domain)/?($match_username)/?(.*)-); |
| $file = 'userfiles/'.$file; |
$file = 'userfiles/'.$file; |
| $dir = &propath($udom,$uname); |
$dir = &propath($udom,$uname); |
| } |
} |
| if ($uri =~ m-^/res/-) { |
if ($uri =~ m-^/res/-) { |
| ($udom,$uname) = |
($udom,$uname) = |
| ($uri =~ m-/(?:res)/?([^/]*)/?([^/]*)/-); |
($uri =~ m-/(?:res)/?($match_domain)/?($match_username)/-); |
| $file = $uri; |
$file = $uri; |
| } |
} |
| |
|
|
Line 5499 sub EXT {
|
Line 5659 sub EXT {
|
| $symbparm=&get_symb_from_alias($symbparm); |
$symbparm=&get_symb_from_alias($symbparm); |
| } |
} |
| if (!($uname && $udom)) { |
if (!($uname && $udom)) { |
| (my $cursymb,$courseid,$udom,$uname,$publicuser)= |
(my $cursymb,$courseid,$udom,$uname,$publicuser)= &whichuser($symbparm); |
| &Apache::lonxml::whichuser($symbparm); |
|
| if (!$symbparm) { $symbparm=$cursymb; } |
if (!$symbparm) { $symbparm=$cursymb; } |
| } else { |
} else { |
| $courseid=$env{'request.course.id'}; |
$courseid=$env{'request.course.id'}; |
|
Line 5859 sub metadata {
|
Line 6018 sub metadata {
|
| (($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 =~ /^~/) || |
| ($uri =~ m|home/[^/]+/public_html/|)) { |
($uri =~ m|home/$match_username/public_html/|)) { |
| return undef; |
return undef; |
| } |
} |
| my $filename=$uri; |
my $filename=$uri; |
|
Line 6154 sub gettitle {
|
Line 6313 sub gettitle {
|
| sub get_slot { |
sub get_slot { |
| my ($which,$cnum,$cdom)=@_; |
my ($which,$cnum,$cdom)=@_; |
| if (!$cnum || !$cdom) { |
if (!$cnum || !$cdom) { |
| (undef,my $courseid)=&Apache::lonxml::whichuser(); |
(undef,my $courseid)=&whichuser(); |
| $cdom=$env{'course.'.$courseid.'.domain'}; |
$cdom=$env{'course.'.$courseid.'.domain'}; |
| $cnum=$env{'course.'.$courseid.'.num'}; |
$cnum=$env{'course.'.$courseid.'.num'}; |
| } |
} |
|
Line 6203 sub symblist {
|
Line 6362 sub symblist {
|
| sub symbverify { |
sub symbverify { |
| my ($symb,$thisurl)=@_; |
my ($symb,$thisurl)=@_; |
| my $thisfn=$thisurl; |
my $thisfn=$thisurl; |
| # wrapper not part of symbs |
|
| $thisfn=~s/^\/adm\/wrapper//; |
|
| $thisfn=~s/^\/adm\/coursedocs\/showdoc\///; |
|
| $thisfn=&declutter($thisfn); |
$thisfn=&declutter($thisfn); |
| # direct jump to resource in page or to a sequence - will construct own symbs |
# direct jump to resource in page or to a sequence - will construct own symbs |
| if ($thisfn=~/\.(page|sequence)$/) { return 1; } |
if ($thisfn=~/\.(page|sequence)$/) { return 1; } |
|
Line 6229 sub symbverify {
|
Line 6385 sub symbverify {
|
| } |
} |
| if ($ids) { |
if ($ids) { |
| # ------------------------------------------------------------------- Has ID(s) |
# ------------------------------------------------------------------- Has ID(s) |
| foreach (split(/\,/,$ids)) { |
foreach my $id (split(/\,/,$ids)) { |
| my ($mapid,$resid)=split(/\./,$_); |
my ($mapid,$resid)=split(/\./,$id); |
| if ( |
if ( |
| &symbclean(&declutter($bighash{'map_id_'.$mapid}).'___'.$resid.'___'.$thisfn) |
&symbclean(&declutter($bighash{'map_id_'.$mapid}).'___'.$resid.'___'.$thisfn) |
| eq $symb) { |
eq $symb) { |
| if (($env{'request.role.adv'}) || |
if (($env{'request.role.adv'}) || |
| $bighash{'encrypted_'.$_} eq $env{'request.enc'}) { |
$bighash{'encrypted_'.$id} eq $env{'request.enc'}) { |
| $okay=1; |
$okay=1; |
| } |
} |
| } |
} |
|
Line 6378 sub symbread {
|
Line 6534 sub symbread {
|
| } elsif (!$donotrecurse) { |
} elsif (!$donotrecurse) { |
| # ------------------------------------------ There is more than one possibility |
# ------------------------------------------ There is more than one possibility |
| my $realpossible=0; |
my $realpossible=0; |
| foreach (@possibilities) { |
foreach my $id (@possibilities) { |
| my $file=$bighash{'src_'.$_}; |
my $file=$bighash{'src_'.$id}; |
| if (&allowed('bre',$file)) { |
if (&allowed('bre',$file)) { |
| my ($mapid,$resid)=split(/\./,$_); |
my ($mapid,$resid)=split(/\./,$id); |
| if ($bighash{'map_type_'.$mapid} ne 'page') { |
if ($bighash{'map_type_'.$mapid} ne 'page') { |
| $realpossible++; |
$realpossible++; |
| $syval=&encode_symb($bighash{'map_id_'.$mapid}, |
$syval=&encode_symb($bighash{'map_id_'.$mapid}, |
|
Line 6488 sub latest_rnd_algorithm_id {
|
Line 6644 sub latest_rnd_algorithm_id {
|
| |
|
| sub get_rand_alg { |
sub get_rand_alg { |
| my ($courseid)=@_; |
my ($courseid)=@_; |
| if (!$courseid) { $courseid=(&Apache::lonxml::whichuser())[1]; } |
if (!$courseid) { $courseid=(&whichuser())[1]; } |
| if ($courseid) { |
if ($courseid) { |
| return $env{"course.$courseid.rndseed"}; |
return $env{"course.$courseid.rndseed"}; |
| } |
} |
|
Line 6514 sub getCODE {
|
Line 6670 sub getCODE {
|
| sub rndseed { |
sub rndseed { |
| my ($symb,$courseid,$domain,$username)=@_; |
my ($symb,$courseid,$domain,$username)=@_; |
| |
|
| my ($wsymb,$wcourseid,$wdomain,$wusername)=&Apache::lonxml::whichuser(); |
my ($wsymb,$wcourseid,$wdomain,$wusername)=&whichuser(); |
| if (!$symb) { |
if (!$symb) { |
| unless ($symb=$wsymb) { return time; } |
unless ($symb=$wsymb) { return time; } |
| } |
} |
|
Line 6522 sub rndseed {
|
Line 6678 sub rndseed {
|
| if (!$domain) { $domain=$wdomain; } |
if (!$domain) { $domain=$wdomain; } |
| if (!$username) { $username=$wusername } |
if (!$username) { $username=$wusername } |
| my $which=&get_rand_alg(); |
my $which=&get_rand_alg(); |
| |
|
| if (defined(&getCODE())) { |
if (defined(&getCODE())) { |
| if ($which eq '64bit5') { |
if ($which eq '64bit5') { |
| return &rndseed_CODE_64bit5($symb,$courseid,$domain,$username); |
return &rndseed_CODE_64bit5($symb,$courseid,$domain,$username); |
|
Line 6555 sub rndseed_32bit {
|
Line 6712 sub rndseed_32bit {
|
| my $domainseed=unpack("%32C*",$domain) << 7; |
my $domainseed=unpack("%32C*",$domain) << 7; |
| my $courseseed=unpack("%32C*",$courseid); |
my $courseseed=unpack("%32C*",$courseid); |
| my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck; |
my $num=$symbseed+$nameseed+$domainseed+$courseseed+$namechck+$symbchck; |
| #&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
#&logthis("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
| #&Apache::lonxml::debug("rndseed :$num:$symb"); |
#&logthis("rndseed :$num:$symb"); |
| if ($_64bit) { $num=(($num<<32)>>32); } |
if ($_64bit) { $num=(($num<<32)>>32); } |
| return $num; |
return $num; |
| } |
} |
|
Line 6576 sub rndseed_64bit {
|
Line 6733 sub rndseed_64bit {
|
| |
|
| my $num1=$symbchck+$symbseed+$namechck; |
my $num1=$symbchck+$symbseed+$namechck; |
| my $num2=$nameseed+$domainseed+$courseseed; |
my $num2=$nameseed+$domainseed+$courseseed; |
| #&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
#&logthis("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
| #&Apache::lonxml::debug("rndseed :$num:$symb"); |
#&logthis("rndseed :$num:$symb"); |
| if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); } |
|
| if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); } |
if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); } |
| return "$num1,$num2"; |
return "$num1,$num2"; |
| } |
} |
|
Line 6600 sub rndseed_64bit2 {
|
Line 6756 sub rndseed_64bit2 {
|
| |
|
| my $num1=$symbchck+$symbseed+$namechck; |
my $num1=$symbchck+$symbseed+$namechck; |
| my $num2=$nameseed+$domainseed+$courseseed; |
my $num2=$nameseed+$domainseed+$courseseed; |
| #&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
#&logthis("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
| #&Apache::lonxml::debug("rndseed :$num:$symb"); |
#&logthis("rndseed :$num:$symb"); |
| |
if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); } |
| return "$num1,$num2"; |
return "$num1,$num2"; |
| } |
} |
| } |
} |
|
Line 6622 sub rndseed_64bit3 {
|
Line 6779 sub rndseed_64bit3 {
|
| |
|
| my $num1=$symbchck+$symbseed+$namechck; |
my $num1=$symbchck+$symbseed+$namechck; |
| my $num2=$nameseed+$domainseed+$courseseed; |
my $num2=$nameseed+$domainseed+$courseseed; |
| #&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
#&logthis("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
| #&Apache::lonxml::debug("rndseed :$num1:$num2:$_64bit"); |
#&logthis("rndseed :$num1:$num2:$_64bit"); |
| if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); } |
if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); } |
| |
|
| return "$num1:$num2"; |
return "$num1:$num2"; |
|
Line 6646 sub rndseed_64bit4 {
|
Line 6803 sub rndseed_64bit4 {
|
| |
|
| my $num1=$symbchck+$symbseed+$namechck; |
my $num1=$symbchck+$symbseed+$namechck; |
| my $num2=$nameseed+$domainseed+$courseseed; |
my $num2=$nameseed+$domainseed+$courseseed; |
| #&Apache::lonxml::debug("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
#&logthis("$symbseed:$nameseed;$domainseed|$courseseed;$namechck:$symbchck"); |
| #&Apache::lonxml::debug("rndseed :$num1:$num2:$_64bit"); |
#&logthis("rndseed :$num1:$num2:$_64bit"); |
| if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); } |
if ($_64bit) { $num1=(($num1<<32)>>32); $num2=(($num2<<32)>>32); } |
| |
|
| return "$num1:$num2"; |
return "$num1:$num2"; |
|
Line 6671 sub rndseed_CODE_64bit {
|
Line 6828 sub rndseed_CODE_64bit {
|
| my $courseseed=unpack("%32S*",$courseid.' '); |
my $courseseed=unpack("%32S*",$courseid.' '); |
| my $num1=$symbseed+$CODEchck; |
my $num1=$symbseed+$CODEchck; |
| my $num2=$CODEseed+$courseseed+$symbchck; |
my $num2=$CODEseed+$courseseed+$symbchck; |
| #&Apache::lonxml::debug("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck"); |
#&logthis("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck"); |
| #&Apache::lonxml::debug("rndseed :$num1:$num2:$symb"); |
#&logthis("rndseed :$num1:$num2:$symb"); |
| if ($_64bit) { $num1=(($num1<<32)>>32); } |
if ($_64bit) { $num1=(($num1<<32)>>32); } |
| if ($_64bit) { $num2=(($num2<<32)>>32); } |
if ($_64bit) { $num2=(($num2<<32)>>32); } |
| return "$num1:$num2"; |
return "$num1:$num2"; |
|
Line 6690 sub rndseed_CODE_64bit4 {
|
Line 6847 sub rndseed_CODE_64bit4 {
|
| my $courseseed=unpack("%32S*",$courseid.' '); |
my $courseseed=unpack("%32S*",$courseid.' '); |
| my $num1=$symbseed+$CODEchck; |
my $num1=$symbseed+$CODEchck; |
| my $num2=$CODEseed+$courseseed+$symbchck; |
my $num2=$CODEseed+$courseseed+$symbchck; |
| #&Apache::lonxml::debug("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck"); |
#&logthis("$symbseed:$CODEchck|$CODEseed:$courseseed:$symbchck"); |
| #&Apache::lonxml::debug("rndseed :$num1:$num2:$symb"); |
#&logthis("rndseed :$num1:$num2:$symb"); |
| if ($_64bit) { $num1=(($num1<<32)>>32); } |
if ($_64bit) { $num1=(($num1<<32)>>32); } |
| if ($_64bit) { $num2=(($num2<<32)>>32); } |
if ($_64bit) { $num2=(($num2<<32)>>32); } |
| return "$num1:$num2"; |
return "$num1:$num2"; |
|
Line 6752 sub ireceipt {
|
Line 6909 sub ireceipt {
|
| my $return =&recprefix($fucourseid).'-'; |
my $return =&recprefix($fucourseid).'-'; |
| if ($env{"course.$fucourseid.receiptalg"} eq 'receipt2' || |
if ($env{"course.$fucourseid.receiptalg"} eq 'receipt2' || |
| $env{'request.state'} eq 'construct') { |
$env{'request.state'} eq 'construct') { |
| &Apache::lonxml::debug("doing receipt2 using parts $cpart, uname $cuname and udom $cudom gets ".($cpart%$cuname). |
#&logthis("doing receipt2 using parts $cpart, uname $cuname and udom $cudom gets ".($cpart%$cuname)." and ".($cpart%$cudom)); |
| " and ".($cpart%$cudom)); |
|
| |
|
| $return.= ($cunique%$cuname+ |
$return.= ($cunique%$cuname+ |
| $cunique%$cudom+ |
$cunique%$cudom+ |
|
Line 6776 sub ireceipt {
|
Line 6932 sub ireceipt {
|
| |
|
| sub receipt { |
sub receipt { |
| my ($part)=@_; |
my ($part)=@_; |
| my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser(); |
my ($symb,$courseid,$domain,$name) = &whichuser(); |
| return &ireceipt($name,$domain,$courseid,$symb,$part); |
return &ireceipt($name,$domain,$courseid,$symb,$part); |
| } |
} |
| |
|
| |
sub whichuser { |
| |
my ($passedsymb)=@_; |
| |
my ($symb,$courseid,$domain,$name,$publicuser); |
| |
if (defined($env{'form.grade_symb'})) { |
| |
my ($tmp_courseid)=&get_env_multiple('form.grade_courseid'); |
| |
my $allowed=&allowed('vgr',$tmp_courseid); |
| |
if (!$allowed && |
| |
exists($env{'request.course.sec'}) && |
| |
$env{'request.course.sec'} !~ /^\s*$/) { |
| |
$allowed=&allowed('vgr',$tmp_courseid. |
| |
'/'.$env{'request.course.sec'}); |
| |
} |
| |
if ($allowed) { |
| |
($symb)=&get_env_multiple('form.grade_symb'); |
| |
$courseid=$tmp_courseid; |
| |
($domain)=&get_env_multiple('form.grade_domain'); |
| |
($name)=&get_env_multiple('form.grade_username'); |
| |
return ($symb,$courseid,$domain,$name,$publicuser); |
| |
} |
| |
} |
| |
if (!$passedsymb) { |
| |
$symb=&symbread(); |
| |
} else { |
| |
$symb=$passedsymb; |
| |
} |
| |
$courseid=$env{'request.course.id'}; |
| |
$domain=$env{'user.domain'}; |
| |
$name=$env{'user.name'}; |
| |
if ($name eq 'public' && $domain eq 'public') { |
| |
if (!defined($env{'form.username'})) { |
| |
$env{'form.username'}.=time.rand(10000000); |
| |
} |
| |
$name.=$env{'form.username'}; |
| |
} |
| |
return ($symb,$courseid,$domain,$name,$publicuser); |
| |
|
| |
} |
| |
|
| # ------------------------------------------------------------ Serves up a file |
# ------------------------------------------------------------ Serves up a file |
| # returns either the contents of the file or |
# returns either the contents of the file or |
| # -1 if the file doesn't exist |
# -1 if the file doesn't exist |
|
Line 6802 sub repcopy_userfile {
|
Line 6996 sub repcopy_userfile {
|
| if ($file =~ m -^/*(uploaded|editupload)/-) { $file=&filelocation("",$file); } |
if ($file =~ m -^/*(uploaded|editupload)/-) { $file=&filelocation("",$file); } |
| if ($file =~ m|^/home/httpd/html/lonUsers/|) { return 'ok'; } |
if ($file =~ m|^/home/httpd/html/lonUsers/|) { return 'ok'; } |
| my ($cdom,$cnum,$filename) = |
my ($cdom,$cnum,$filename) = |
| ($file=~m|^\Q$perlvar{'lonDocRoot'}\E/+userfiles/+([^/]+)/+([^/]+)/+(.*)|); |
($file=~m|^\Q$perlvar{'lonDocRoot'}\E/+userfiles/+($match_domain)/+($match_username)/+(.*)|); |
| my ($info,$rtncode); |
my ($info,$rtncode); |
| my $uri="/uploaded/$cdom/$cnum/$filename"; |
my $uri="/uploaded/$cdom/$cnum/$filename"; |
| if (-e "$file") { |
if (-e "$file") { |
|
Line 6903 sub readfile {
|
Line 7097 sub readfile {
|
| my $fh; |
my $fh; |
| open($fh,"<$file"); |
open($fh,"<$file"); |
| my $a=''; |
my $a=''; |
| while (<$fh>) { $a .=$_; } |
while (my $line = <$fh>) { $a .= $line; } |
| return $a; |
return $a; |
| } |
} |
| |
|
|
Line 6919 sub filelocation {
|
Line 7113 sub filelocation {
|
| if ($file=~m:^/~:) { # is a contruction space reference |
if ($file=~m:^/~:) { # is a contruction space reference |
| $location = $file; |
$location = $file; |
| $location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:; |
$location =~ s:/~(.*?)/(.*):/home/$1/public_html/$2:; |
| } elsif ($file=~m:^/home/[^/]*/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=~/^\/*(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)/+([^/]+)/+([^/]+)/+(.*)$-); |
($file=~m -^/+(?:uploaded|editupload)/+($match_domain)/+($match_username)/+(.*)$-); |
| my $home=&homeserver($uname,$udom); |
my $home=&homeserver($uname,$udom); |
| my $is_me=0; |
my $is_me=0; |
| my @ids=¤t_machine_ids(); |
my @ids=¤t_machine_ids(); |
|
Line 6961 sub hreflocation {
|
Line 7155 sub hreflocation {
|
| } |
} |
| if ($file=~m-^\Q$perlvar{'lonDocRoot'}\E-) { |
if ($file=~m-^\Q$perlvar{'lonDocRoot'}\E-) { |
| $file=~s-^\Q$perlvar{'lonDocRoot'}\E--; |
$file=~s-^\Q$perlvar{'lonDocRoot'}\E--; |
| } elsif ($file=~m-/home/(\w+)/public_html/-) { |
} elsif ($file=~m-/home/($match_username)/public_html/-) { |
| $file=~s-^/home/(\w+)/public_html/-/~$1/-; |
$file=~s-^/home/($match_username)/public_html/-/~$1/-; |
| } elsif ($file=~m-^\Q$perlvar{'lonUsersDir'}\E-) { |
} elsif ($file=~m-^\Q$perlvar{'lonUsersDir'}\E-) { |
| $file=~s-^/home/httpd/lonUsers/([^/]*)/./././([^/]*)/userfiles/ |
$file=~s-^/home/httpd/lonUsers/($match_domain)/./././($match_username)/userfiles/ |
| -/uploaded/$1/$2/-x; |
-/uploaded/$1/$2/-x; |
| } |
} |
| return $file; |
return $file; |
|
Line 7042 sub clutter {
|
Line 7236 sub clutter {
|
| return $thisfn; |
return $thisfn; |
| } |
} |
| |
|
| |
sub clutter_with_no_wrapper { |
| |
my $uri = &clutter(shift); |
| |
if ($uri =~ m-^/adm/-) { |
| |
$uri =~ s-^/adm/wrapper/-/-; |
| |
$uri =~ s-^/adm/coursedocs/showdoc/-/-; |
| |
} |
| |
return $uri; |
| |
} |
| |
|
| sub freeze_escape { |
sub freeze_escape { |
| my ($value)=@_; |
my ($value)=@_; |
| if (ref($value)) { |
if (ref($value)) { |
|
Line 7094 BEGIN {
|
Line 7297 BEGIN {
|
| # ----------------------------------- Read loncapa.conf and loncapa_apache.conf |
# ----------------------------------- Read loncapa.conf and loncapa_apache.conf |
| unless ($readit) { |
unless ($readit) { |
| { |
{ |
| # FIXME: Use LONCAPA::Configuration::read_conf here and omit next block |
my $configvars = LONCAPA::Configuration::read_conf('loncapa.conf'); |
| open(my $config,"</etc/httpd/conf/loncapa.conf"); |
%perlvar = (%perlvar,%{$configvars}); |
| |
|
| while (my $configline=<$config>) { |
|
| if ($configline=~/\S/ && $configline =~ /^[^\#]*PerlSetVar/) { |
|
| my ($dummy,$varname,$varvalue)=split(/\s+/,$configline); |
|
| chomp($varvalue); |
|
| $perlvar{$varname}=$varvalue; |
|
| } |
|
| } |
|
| close($config); |
|
| } |
|
| { |
|
| open(my $config,"</etc/httpd/conf/loncapa_apache.conf"); |
|
| |
|
| while (my $configline=<$config>) { |
|
| if ($configline =~ /^[^\#]*PerlSetVar/) { |
|
| my ($dummy,$varname,$varvalue)=split(/\s+/,$configline); |
|
| chomp($varvalue); |
|
| $perlvar{$varname}=$varvalue; |
|
| } |
|
| } |
|
| close($config); |
|
| } |
} |
| |
|
| # ------------------------------------------------------------ Read domain file |
# ------------------------------------------------------------ Read domain file |
|
Line 7126 BEGIN {
|
Line 7308 BEGIN {
|
| %domain_auth_arg_def = (); |
%domain_auth_arg_def = (); |
| my $fh; |
my $fh; |
| if (open($fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/domain.tab')) { |
if (open($fh,"<".$Apache::lonnet::perlvar{'lonTabDir'}.'/domain.tab')) { |
| while (<$fh>) { |
while (my $line = <$fh>) { |
| next if (/^(\#|\s*$)/); |
next if ($line =~ /^(\#|\s*$)/); |
| # next if /^\#/; |
# next if /^\#/; |
| chomp; |
chomp $line; |
| my ($domain, $domain_description, $def_auth, $def_auth_arg, |
my ($domain, $domain_description, $def_auth, $def_auth_arg, |
| $def_lang, $city, $longi, $lati, $primary) = split(/:/,$_); |
$def_lang, $city, $longi, $lati, $primary) = split(/:/,$line,9); |
| $domain_auth_def{$domain}=$def_auth; |
$domain_auth_def{$domain}=$def_auth; |
| $domain_auth_arg_def{$domain}=$def_auth_arg; |
$domain_auth_arg_def{$domain}=$def_auth_arg; |
| $domaindescription{$domain}=$domain_description; |
$domaindescription{$domain}=$domain_description; |
|
Line 7198 sub get_iphost {
|
Line 7380 sub get_iphost {
|
| while (my $configline=<$config>) { |
while (my $configline=<$config>) { |
| chomp($configline); |
chomp($configline); |
| if ($configline) { |
if ($configline) { |
| $spareid{$configline}=1; |
my ($host,$type) = split(':',$configline,2); |
| |
if (!defined($type) || $type eq '') { $type = 'default' }; |
| |
push(@{ $spareid{$type} }, $host); |
| } |
} |
| } |
} |
| close($config); |
close($config); |
|
Line 7260 sub get_iphost {
|
Line 7444 sub get_iphost {
|
| |
|
| } |
} |
| |
|
| $memcache=new Cache::Memcached({'servers'=>['127.0.0.1:11211']}); |
$memcache=new Cache::Memcached({'servers' => ['127.0.0.1:11211'], |
| |
'compress_threshold'=> 20_000, |
| |
}); |
| |
|
| $processmarker='_'.time.'_'.$perlvar{'lonHostID'}; |
$processmarker='_'.time.'_'.$perlvar{'lonHostID'}; |
| $dumpcount=0; |
$dumpcount=0; |
|
Line 7457 B<delenv($regexp)>: removes all items fr
|
Line 7643 B<delenv($regexp)>: removes all items fr
|
| environment file that matches the regular expression in $regexp. The |
environment file that matches the regular expression in $regexp. The |
| values are also delted from the current processes %env. |
values are also delted from the current processes %env. |
| |
|
| |
=item * get_env_multiple($name) |
| |
|
| |
gets $name from the %env hash, it seemlessly handles the cases where multiple |
| |
values may be defined and end up as an array ref. |
| |
|
| |
returns an array of values |
| |
|
| =back |
=back |
| |
|
| =head2 User Information |
=head2 User Information |
|
Line 7960 reference filled in from namesp (encrypt
|
Line 8153 reference filled in from namesp (encrypt
|
| log($udom,$name,$home,$message) : write to permanent log for user; use |
log($udom,$name,$home,$message) : write to permanent log for user; use |
| critical subroutine |
critical subroutine |
| |
|
| |
=item * |
| |
|
| |
get_dom($namespace,$storearr,$udomain) : returns hash with keys from array |
| |
reference filled in from namespace found in domain level on primary domain server ($udomain is optional) |
| |
|
| |
=item * |
| |
|
| |
put_dom($namespace,$storehash,$udomain) : stores hash in namespace at domain level on primary domain server ($udomain is optional) |
| |
|
| =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