--- loncom/lonnet/perl/lonnet.pm 2016/10/23 12:21:47 1.1172.2.84
+++ loncom/lonnet/perl/lonnet.pm 2013/08/04 02:55:41 1.1233
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.1172.2.84 2016/10/23 12:21:47 raeburn Exp $
+# $Id: lonnet.pm,v 1.1233 2013/08/04 02:55:41 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -75,7 +75,10 @@ use LWP::UserAgent();
use HTTP::Date;
use Image::Magick;
-use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir
+
+use Encode;
+
+use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir $apache
$_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease
%managerstab);
@@ -89,7 +92,7 @@ use GDBM_File;
use HTML::LCParser;
use Fcntl qw(:flock);
use Storable qw(thaw nfreeze);
-use Time::HiRes qw( sleep gettimeofday tv_interval );
+use Time::HiRes qw( gettimeofday tv_interval );
use Cache::Memcached;
use Digest::MD5;
use Math::Random;
@@ -102,13 +105,14 @@ use LONCAPA::Lond;
use File::Copy;
my $readit;
-my $max_connection_retries = 20; # Or some such value.
+my $max_connection_retries = 10; # Or some such value.
require Exporter;
our @ISA = qw (Exporter);
our @EXPORT = qw(%env);
+
# ------------------------------------ Logging (parameters, docs, slots, roles)
{
my $logid;
@@ -123,19 +127,19 @@ our @EXPORT = qw(%env);
$logid ++;
my $now = time();
my $id=$now.'00000'.$$.'00000'.$logid;
- my $logentry = {
- $id => {
- 'exe_uname' => $env{'user.name'},
- 'exe_udom' => $env{'user.domain'},
- 'exe_time' => $now,
- 'exe_ip' => $ENV{'REMOTE_ADDR'},
- 'delflag' => $delflag,
- 'logentry' => $storehash,
- 'uname' => $uname,
- 'udom' => $udom,
- }
+ my $logentry = {
+ $id => {
+ 'exe_uname' => $env{'user.name'},
+ 'exe_udom' => $env{'user.domain'},
+ 'exe_time' => $now,
+ 'exe_ip' => $ENV{'REMOTE_ADDR'},
+ 'delflag' => $delflag,
+ 'logentry' => $storehash,
+ 'uname' => $uname,
+ 'udom' => $udom,
+ }
};
- return &put('nohist_'.$hash_name,$logentry,$cdom,$cnum);
+ return &put('nohist_'.$hash_name,$logentry,$cdom,$cnum);
}
}
@@ -352,11 +356,9 @@ sub get_remote_globals {
}
sub remote_devalidate_cache {
- my ($lonhost,$cachekeys) = @_;
- my $items;
- return unless (ref($cachekeys) eq 'ARRAY');
- my $cachestr = join('&',@{$cachekeys});
- return &reply('devalidatecache:'.&escape($cachestr),$lonhost);
+ my ($lonhost,$name,$id) = @_;
+ my $response = &reply('devalidatecache:'.&escape($name).':'.&escape($id),$lonhost);
+ return $response;
}
# -------------------------------------------------- Non-critical communication
@@ -370,7 +372,7 @@ sub subreply {
my $lockfile=$peerfile.".lock";
while (-e $lockfile) { # Need to wait for the lockfile to disappear.
- sleep(0.1);
+ sleep(1);
}
# At this point, either a loncnew parent is listening or an old lonc
# or loncnew child is listening so we can connect or everything's dead.
@@ -388,7 +390,7 @@ sub subreply {
} else {
&create_connection(&hostname($server),$server);
}
- sleep(0.1); # Try again later if failed connection.
+ sleep(1); # Try again later if failed connection.
}
my $answer;
if ($client) {
@@ -417,8 +419,8 @@ sub reply {
sub reconlonc {
my ($lonid) = @_;
+ my $hostname = &hostname($lonid);
if ($lonid) {
- my $hostname = &hostname($lonid);
my $peerfile="$perlvar{'lonSockDir'}/$hostname";
if ($hostname && -e $peerfile) {
&logthis("Trying to reconnect lonc for $lonid ($hostname)");
@@ -464,7 +466,7 @@ sub critical {
}
my $answer=reply($cmd,$server);
if ($answer eq 'con_lost') {
- &reconlonc($server);
+ &reconlonc("$perlvar{'lonSockDir'}/$server");
my $answer=reply($cmd,$server);
if ($answer eq 'con_lost') {
my $now=time;
@@ -481,7 +483,7 @@ sub critical {
close($dfh);
}
}
- sleep 1;
+ sleep 2;
my $wcmd='';
{
my $dfh;
@@ -601,7 +603,7 @@ sub transfer_profile_to_env {
# ---------------------------------------------------- Check for valid session
sub check_for_valid_session {
- my ($r,$name,$userhashref) = @_;
+ my ($r,$name) = @_;
my %cookies=CGI::Cookie->parse($r->header_in('Cookie'));
if ($name eq '') {
$name = 'lonID';
@@ -632,12 +634,13 @@ sub check_for_valid_session {
|| !defined($disk_env{'user.domain'})) {
return undef;
}
-
- if (ref($userhashref) eq 'HASH') {
- $userhashref->{'name'} = $disk_env{'user.name'};
- $userhashref->{'domain'} = $disk_env{'user.domain'};
+ if (($r->user() eq '') && ($apache >= 2.4)) {
+ if ($disk_env{'user.domain'} eq $r->dir_config('lonDefDomain')) {
+ $r->user($disk_env{'user.name'});
+ } else {
+ $r->user($disk_env{'user.name'}.':'.$disk_env{'user.domain'});
+ }
}
-
return $handle;
}
@@ -671,7 +674,7 @@ sub appenv {
if (($key =~ /^user\.role/) || ($key =~ /^user\.priv/)) {
$refused = 1;
if (ref($roles) eq 'ARRAY') {
- my ($type,$role) = ($key =~ m{^user\.(role|priv)\.(.+?)\./});
+ my ($type,$role) = ($key =~ /^user\.(role|priv)\.([^.]+)\./);
if (grep(/^\Q$role\E$/,@{$roles})) {
$refused = 0;
}
@@ -844,8 +847,10 @@ sub spareserver {
if (ref($spareshash) eq 'HASH') {
if (ref($spareshash->{'primary'}) eq 'ARRAY') {
foreach my $try_server (@{ $spareshash->{'primary'} }) {
- next unless (&spare_can_host($udom,$uint_dom,$remotesessions,
- $try_server));
+ if ($uint_dom) {
+ next unless (&spare_can_host($udom,$uint_dom,$remotesessions,
+ $try_server));
+ }
($spare_server, $lowest_load) =
&compare_server_load($try_server, $spare_server, $lowest_load);
}
@@ -856,8 +861,10 @@ sub spareserver {
if (!$found_server) {
if (ref($spareshash->{'default'}) eq 'ARRAY') {
foreach my $try_server (@{ $spareshash->{'default'} }) {
- next unless (&spare_can_host($udom,$uint_dom,
- $remotesessions,$try_server));
+ if ($uint_dom) {
+ next unless (&spare_can_host($udom,$uint_dom,
+ $remotesessions,$try_server));
+ }
($spare_server, $lowest_load) =
&compare_server_load($try_server, $spare_server, $lowest_load);
}
@@ -881,17 +888,7 @@ sub spareserver {
}
sub compare_server_load {
- my ($try_server, $spare_server, $lowest_load, $required) = @_;
-
- if ($required) {
- my ($reqdmajor,$reqdminor) = ($required =~ /^(\d+)\.(\d+)$/);
- my $remoterev = &get_server_loncaparev(undef,$try_server);
- my ($major,$minor) = ($remoterev =~ /^\'?(\d+)\.(\d+)\.[\w.\-]+\'?$/);
- if (($major eq '' && $minor eq '') ||
- (($reqdmajor > $major) || (($reqdmajor == $major) && ($reqdminor > $minor)))) {
- return ($spare_server,$lowest_load);
- }
- }
+ my ($try_server, $spare_server, $lowest_load) = @_;
my $loadans = &reply('load', $try_server);
my $userloadans = &reply('userload',$try_server);
@@ -952,43 +949,26 @@ sub has_user_session {
# --------- determine least loaded server in a user's domain which allows login
sub choose_server {
- my ($udom,$checkloginvia,$required,$skiploadbal) = @_;
+ my ($udom,$checkloginvia) = @_;
my %domconfhash = &Apache::loncommon::get_domainconf($udom);
my %servers = &get_servers($udom);
my $lowest_load = 30000;
- my ($login_host,$hostname,$portal_path,$isredirect,$balancers);
- if ($skiploadbal) {
- ($balancers,my $cached)=&is_cached_new('loadbalancing',$udom);
- unless (defined($cached)) {
- my $cachetime = 60*60*24;
- my %domconfig =
- &Apache::lonnet::get_dom('configuration',['loadbalancing'],$udom);
- if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
- $balancers = &do_cache_new('loadbalancing',$udom,$domconfig{'loadbalancing'},
- $cachetime);
- }
- }
- }
+ my ($login_host,$hostname,$portal_path,$isredirect);
foreach my $lonhost (keys(%servers)) {
my $loginvia;
- if ($skiploadbal) {
- if (ref($balancers) eq 'HASH') {
- next if (exists($balancers->{$lonhost}));
- }
- }
if ($checkloginvia) {
$loginvia = $domconfhash{$udom.'.login.loginvia_'.$lonhost};
if ($loginvia) {
my ($server,$path) = split(/:/,$loginvia);
($login_host, $lowest_load) =
- &compare_server_load($server, $login_host, $lowest_load, $required);
+ &compare_server_load($server, $login_host, $lowest_load);
if ($login_host eq $server) {
$portal_path = $path;
$isredirect = 1;
}
} else {
($login_host, $lowest_load) =
- &compare_server_load($lonhost, $login_host, $lowest_load, $required);
+ &compare_server_load($lonhost, $login_host, $lowest_load);
if ($login_host eq $lonhost) {
$portal_path = '';
$isredirect = '';
@@ -996,7 +976,7 @@ sub choose_server {
}
} else {
($login_host, $lowest_load) =
- &compare_server_load($lonhost, $login_host, $lowest_load, $required);
+ &compare_server_load($lonhost, $login_host, $lowest_load);
}
}
if ($login_host ne '') {
@@ -1169,27 +1149,19 @@ sub can_host_session {
sub spare_can_host {
my ($udom,$uint_dom,$remotesessions,$try_server)=@_;
my $canhost=1;
- my $try_server_hostname = &hostname($try_server);
- my $serverhomeID = &get_server_homeID($try_server_hostname);
- my $serverhomedom = &host_domain($serverhomeID);
- my %defdomdefaults = &get_domain_defaults($serverhomedom);
- if (ref($defdomdefaults{'offloadnow'}) eq 'HASH') {
- if ($defdomdefaults{'offloadnow'}{$try_server}) {
- $canhost = 0;
- }
- }
- if (($canhost) && ($uint_dom)) {
- my @intdoms;
- my $internet_names = &get_internet_names($try_server);
- if (ref($internet_names) eq 'ARRAY') {
- @intdoms = @{$internet_names};
- }
- unless (grep(/^\Q$uint_dom\E$/,@intdoms)) {
- my $remoterev = &get_server_loncaparev(undef,$try_server);
- $canhost = &can_host_session($udom,$try_server,$remoterev,
- $remotesessions,
- $defdomdefaults{'hostedsessions'});
- }
+ my @intdoms;
+ my $internet_names = &Apache::lonnet::get_internet_names($try_server);
+ if (ref($internet_names) eq 'ARRAY') {
+ @intdoms = @{$internet_names};
+ }
+ unless (grep(/^\Q$uint_dom\E$/,@intdoms)) {
+ my $serverhomeID = &Apache::lonnet::get_server_homeID($try_server);
+ my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
+ my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom);
+ my $remoterev = &Apache::lonnet::get_server_loncaparev(undef,$try_server);
+ $canhost = &can_host_session($udom,$try_server,$remoterev,
+ $remotesessions,
+ $defdomdefaults{'hostedsessions'});
}
return $canhost;
}
@@ -1283,7 +1255,7 @@ sub check_loadbalancing {
my $uintdom = &Apache::lonnet::internet_dom($uprimary_id);
my $intdom = &Apache::lonnet::internet_dom($lonhost);
my $serverhomedom = &host_domain($lonhost);
- my $domneedscache;
+
my $cachetime = 60*60*24;
if (($uintdom ne '') && ($uintdom eq $intdom)) {
@@ -1298,12 +1270,10 @@ sub check_loadbalancing {
&Apache::lonnet::get_dom('configuration',['loadbalancing'],$dom_in_use);
if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
$result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'loadbalancing'},$cachetime);
- } else {
- $domneedscache = $dom_in_use;
}
}
if (ref($result) eq 'HASH') {
- ($is_balancer,$currtargets,$currrules) =
+ ($is_balancer,$currtargets,$currrules) =
&check_balancer_result($result,@hosts);
if ($is_balancer) {
if (ref($currrules) eq 'HASH') {
@@ -1353,18 +1323,16 @@ sub check_loadbalancing {
}
}
} elsif (($homeintdom) && ($udom ne $serverhomedom)) {
- ($result,$cached)=&is_cached_new('loadbalancing',$serverhomedom);
+ my ($result,$cached)=&is_cached_new('loadbalancing',$serverhomedom);
unless (defined($cached)) {
my %domconfig =
&Apache::lonnet::get_dom('configuration',['loadbalancing'],$serverhomedom);
if (ref($domconfig{'loadbalancing'}) eq 'HASH') {
- $result = &do_cache_new('loadbalancing',$serverhomedom,$domconfig{'loadbalancing'},$cachetime);
- } else {
- $domneedscache = $serverhomedom;
+ $result = &do_cache_new('loadbalancing',$dom_in_use,$domconfig{'loadbalancing'},$cachetime);
}
}
if (ref($result) eq 'HASH') {
- ($is_balancer,$currtargets,$currrules) =
+ ($is_balancer,$currtargets,$currrules) =
&check_balancer_result($result,@hosts);
if ($is_balancer) {
if (ref($currrules) eq 'HASH') {
@@ -1380,21 +1348,12 @@ sub check_loadbalancing {
$is_balancer = 1;
$offloadto = &this_host_spares($dom_in_use);
}
- unless (defined($cached)) {
- $domneedscache = $serverhomedom;
- }
}
} else {
if ($perlvar{'lonBalancer'} eq 'yes') {
$is_balancer = 1;
$offloadto = &this_host_spares($dom_in_use);
}
- unless (defined($cached)) {
- $domneedscache = $serverhomedom;
- }
- }
- if ($domneedscache) {
- &do_cache_new('loadbalancing',$domneedscache,$is_balancer,$cachetime);
}
if ($is_balancer) {
my $lowest_load = 30000;
@@ -1429,8 +1388,8 @@ sub check_loadbalancing {
$is_balancer = 0;
if ($uname ne '' && $udom ne '') {
if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) {
-
- &appenv({'user.loadbalexempt' => $lonhost,
+
+ &appenv({'user.loadbalexempt' => $lonhost,
'user.loadbalcheck.time' => time});
}
}
@@ -1567,7 +1526,7 @@ sub idget {
my %servers = &get_servers($udom,'library');
foreach my $tryserver (keys(%servers)) {
- my $idlist=join('&', map { &escape($_); } @ids);
+ my $idlist=join('&',@ids);
$idlist=~tr/A-Z/a-z/;
my $reply=&reply("idget:$udom:".$idlist,$tryserver);
my @answer=();
@@ -1577,7 +1536,7 @@ sub idget {
my $i;
for ($i=0;$i<=$#ids;$i++) {
if ($answer[$i]) {
- $returnhash{$ids[$i]}=&unescape($answer[$i]);
+ $returnhash{$ids[$i]}=$answer[$i];
}
}
}
@@ -1619,7 +1578,7 @@ sub idput {
}
}
-# ---------------------------------------- Delete unwanted IDs from ids.db file
+# ---------------------------------------- Delete unwanted IDs from ids.db file
sub iddel {
my ($udom,$idshashref,$uhome)=@_;
@@ -1664,7 +1623,6 @@ sub dump_dom {
sub get_dom {
my ($namespace,$storearr,$udom,$uhome)=@_;
- return if ($udom eq 'public');
my $items='';
foreach my $item (@$storearr) {
$items.=&escape($item).'&';
@@ -1672,7 +1630,6 @@ sub get_dom {
$items=~s/\&$//;
if (!$udom) {
$udom=$env{'user.domain'};
- return if ($udom eq 'public');
if (defined(&domain($udom,'primary'))) {
$uhome=&domain($udom,'primary');
} else {
@@ -1776,13 +1733,14 @@ sub retrieve_inst_usertypes {
my %domdefs = &Apache::lonnet::get_domain_defaults($udom);
if ((ref($domdefs{'inststatustypes'}) eq 'HASH') &&
(ref($domdefs{'inststatusorder'}) eq 'ARRAY')) {
- return ($domdefs{'inststatustypes'},$domdefs{'inststatusorder'});
+ %returnhash = %{$domdefs{'inststatustypes'}};
+ @order = @{$domdefs{'inststatusorder'}};
} else {
if (defined(&domain($udom,'primary'))) {
my $uhome=&domain($udom,'primary');
my $rep=&reply("inst_usertypes:$udom",$uhome);
if ($rep =~ /^(con_lost|error|no_such_host|refused)/) {
- &logthis("retrieve_inst_usertypes failed - $rep returned from $uhome in domain: $udom");
+ &logthis("get_dom failed - $rep returned from $uhome in domain: $udom");
return (\%returnhash,\@order);
}
my ($hashitems,$orderitems) = split(/:/,$rep);
@@ -1798,15 +1756,15 @@ sub retrieve_inst_usertypes {
push(@order,&unescape($item));
}
} else {
- &logthis("retrieve_inst_usertypes failed - no primary domain server for $udom");
+ &logthis("get_dom failed - no primary domain server for $udom");
}
- return (\%returnhash,\@order);
}
+ return (\%returnhash,\@order);
}
sub is_domainimage {
my ($url) = @_;
- if ($url=~m-^/+res/+($match_domain)/+\1\-domainconfig/+(img|logo|domlogo)/+[^/]-) {
+ if ($url=~m-^/+res/+($match_domain)/+\1\-domainconfig/+(img|logo|domlogo)/+-) {
if (&domain($1) ne '') {
return '1';
}
@@ -1947,63 +1905,6 @@ sub get_instuser {
return ($outcome,%userinfo);
}
-sub get_multiple_instusers {
- my ($udom,$users,$caller) = @_;
- my ($outcome,$results);
- if (ref($users) eq 'HASH') {
- my $count = keys(%{$users});
- my $requested = &freeze_escape($users);
- my $homeserver = &domain($udom,'primary');
- if ($homeserver ne '') {
- my $queryid=&reply('querysend:getmultinstusers:::'.$caller.'='.$requested,$homeserver);
- my $host=&hostname($homeserver);
- if ($queryid !~/^\Q$host\E\_/) {
- &logthis('get_multiple_instusers invalid queryid: '.$queryid.
- ' for host: '.$homeserver.'in domain '.$udom);
- return ($outcome,$results);
- }
- my $response = &get_query_reply($queryid);
- my $maxtries = 5;
- if ($count > 100) {
- $maxtries = 1+int($count/20);
- }
- my $tries = 1;
- while (($response=~/^timeout/) && ($tries <= $maxtries)) {
- $response = &get_query_reply($queryid);
- $tries ++;
- }
- if ($response eq '') {
- $results = {};
- foreach my $key (keys(%{$users})) {
- my ($uname,$id);
- if ($caller eq 'id') {
- $id = $key;
- } else {
- $uname = $key;
- }
- my ($resp,%info) = &get_instuser($udom,$uname,$id);
- $outcome = $resp;
- if ($resp eq 'ok') {
- %{$results} = (%{$results}, %info);
- } else {
- last;
- }
- }
- } elsif(!&error($response) && ($response ne 'refused')) {
- if (($response eq 'unavailable') || ($response eq 'invalid') || ($response eq 'timeout')) {
- $outcome = $response;
- } else {
- ($outcome,my $userdata) = split(/=/,$response,2);
- if ($outcome eq 'ok') {
- $results = &thaw_unescape($userdata);
- }
- }
- }
- }
- }
- return ($outcome,$results);
-}
-
sub inst_rulecheck {
my ($udom,$uname,$id,$item,$rules) = @_;
my %returnhash;
@@ -2083,15 +1984,12 @@ sub inst_userrules {
# ------------- Get Authentication, Language and User Tools Defaults for Domain
sub get_domain_defaults {
- my ($domain,$ignore_cache) = @_;
- return if (($domain eq '') || ($domain eq 'public'));
+ my ($domain) = @_;
my $cachetime = 60*60*24;
- unless ($ignore_cache) {
- my ($result,$cached)=&is_cached_new('domdefaults',$domain);
- if (defined($cached)) {
- if (ref($result) eq 'HASH') {
- return %{$result};
- }
+ my ($result,$cached)=&is_cached_new('domdefaults',$domain);
+ if (defined($cached)) {
+ if (ref($result) eq 'HASH') {
+ return %{$result};
}
}
my %domdefaults;
@@ -2099,9 +1997,7 @@ sub get_domain_defaults {
&Apache::lonnet::get_dom('configuration',['defaults','quotas',
'requestcourses','inststatus',
'coursedefaults','usersessions',
- 'requestauthor','selfenrollment',
- 'coursecategories','autoenroll'],$domain);
- my @coursetypes = ('official','unofficial','community','textbook');
+ 'requestauthor'],$domain);
if (ref($domconfig{'defaults'}) eq 'HASH') {
$domdefaults{'lang_def'} = $domconfig{'defaults'}{'lang_def'};
$domdefaults{'auth_def'} = $domconfig{'defaults'}{'auth_def'};
@@ -2131,7 +2027,7 @@ sub get_domain_defaults {
}
}
if (ref($domconfig{'requestcourses'}) eq 'HASH') {
- foreach my $item ('official','unofficial','community','textbook') {
+ foreach my $item ('official','unofficial','community') {
$domdefaults{$item} = $domconfig{'requestcourses'}{$item};
}
}
@@ -2139,41 +2035,20 @@ sub get_domain_defaults {
$domdefaults{'requestauthor'} = $domconfig{'requestauthor'};
}
if (ref($domconfig{'inststatus'}) eq 'HASH') {
- foreach my $item ('inststatustypes','inststatusorder','inststatusguest') {
+ foreach my $item ('inststatustypes','inststatusorder') {
$domdefaults{$item} = $domconfig{'inststatus'}{$item};
}
}
if (ref($domconfig{'coursedefaults'}) eq 'HASH') {
- $domdefaults{'usejsme'} = $domconfig{'coursedefaults'}{'usejsme'};
- $domdefaults{'uselcmath'} = $domconfig{'coursedefaults'}{'uselcmath'};
- if (ref($domconfig{'coursedefaults'}{'postsubmit'}) eq 'HASH') {
- $domdefaults{'postsubmit'} = $domconfig{'coursedefaults'}{'postsubmit'}{'client'};
- }
- foreach my $type (@coursetypes) {
- if (ref($domconfig{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
- unless ($type eq 'community') {
- $domdefaults{$type.'credits'} = $domconfig{'coursedefaults'}{'coursecredits'}{$type};
- }
- }
- if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
- $domdefaults{$type.'quota'} = $domconfig{'coursedefaults'}{'uploadquota'}{$type};
- }
- if ($domdefaults{'postsubmit'} eq 'on') {
- if (ref($domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}) eq 'HASH') {
- $domdefaults{$type.'postsubtimeout'} =
- $domconfig{'coursedefaults'}{'postsubmit'}{'timeout'}{$type};
- }
- }
- }
- if (ref($domconfig{'coursedefaults'}{'canclone'}) eq 'HASH') {
- if (ref($domconfig{'coursedefaults'}{'canclone'}{'instcode'}) eq 'ARRAY') {
- my @clonecodes = @{$domconfig{'coursedefaults'}{'canclone'}{'instcode'}};
- if (@clonecodes) {
- $domdefaults{'canclone'} = join('+',@clonecodes);
- }
- }
- } elsif ($domconfig{'coursedefaults'}{'canclone'}) {
- $domdefaults{'canclone'}=$domconfig{'coursedefaults'}{'canclone'};
+ $domdefaults{'canuse_pdfforms'} = $domconfig{'coursedefaults'}{'canuse_pdfforms'};
+ if (ref($domconfig{'coursedefaults'}{'coursecredits'}) eq 'HASH') {
+ $domdefaults{'officialcredits'} = $domconfig{'coursedefaults'}{'coursecredits'}{'official'};
+ $domdefaults{'unofficialcredits'} = $domconfig{'coursedefaults'}{'coursecredits'}{'unofficial'};
+ }
+ if (ref($domconfig{'coursedefaults'}{'uploadquota'}) eq 'HASH') {
+ $domdefaults{'officialquota'} = $domconfig{'coursedefaults'}{'uploadquota'}{'official'};
+ $domdefaults{'unofficialquota'} = $domconfig{'coursedefaults'}{'uploadquota'}{'unofficial'};
+ $domdefaults{'communityquota'} = $domconfig{'coursedefaults'}{'uploadquota'}{'community'};
}
}
if (ref($domconfig{'usersessions'}) eq 'HASH') {
@@ -2183,50 +2058,6 @@ sub get_domain_defaults {
if (ref($domconfig{'usersessions'}{'hosted'}) eq 'HASH') {
$domdefaults{'hostedsessions'} = $domconfig{'usersessions'}{'hosted'};
}
- if (ref($domconfig{'usersessions'}{'offloadnow'}) eq 'HASH') {
- $domdefaults{'offloadnow'} = $domconfig{'usersessions'}{'offloadnow'};
- }
- }
- if (ref($domconfig{'selfenrollment'}) eq 'HASH') {
- if (ref($domconfig{'selfenrollment'}{'admin'}) eq 'HASH') {
- my @settings = ('types','registered','enroll_dates','access_dates','section',
- 'approval','limit');
- foreach my $type (@coursetypes) {
- if (ref($domconfig{'selfenrollment'}{'admin'}{$type}) eq 'HASH') {
- my @mgrdc = ();
- foreach my $item (@settings) {
- if ($domconfig{'selfenrollment'}{'admin'}{$type}{$item} eq '0') {
- push(@mgrdc,$item);
- }
- }
- if (@mgrdc) {
- $domdefaults{$type.'selfenrolladmdc'} = join(',',@mgrdc);
- }
- }
- }
- }
- if (ref($domconfig{'selfenrollment'}{'default'}) eq 'HASH') {
- foreach my $type (@coursetypes) {
- if (ref($domconfig{'selfenrollment'}{'default'}{$type}) eq 'HASH') {
- foreach my $item (keys(%{$domconfig{'selfenrollment'}{'default'}{$type}})) {
- $domdefaults{$type.'selfenroll'.$item} = $domconfig{'selfenrollment'}{'default'}{$type}{$item};
- }
- }
- }
- }
- }
- if (ref($domconfig{'coursecategories'}) eq 'HASH') {
- $domdefaults{'catauth'} = 'std';
- $domdefaults{'catunauth'} = 'std';
- if ($domconfig{'coursecategories'}{'auth'}) {
- $domdefaults{'catauth'} = $domconfig{'coursecategories'}{'auth'};
- }
- if ($domconfig{'coursecategories'}{'unauth'}) {
- $domdefaults{'catunauth'} = $domconfig{'coursecategories'}{'unauth'};
- }
- }
- if (ref($domconfig{'autoenroll'}) eq 'HASH') {
- $domdefaults{'autofailsafe'} = $domconfig{'autoenroll'}{'autofailsafe'};
}
&do_cache_new('domdefaults',$domain,\%domdefaults,$cachetime);
return %domdefaults;
@@ -2468,25 +2299,21 @@ sub make_key {
sub devalidate_cache_new {
my ($name,$id,$debug) = @_;
if ($debug) { &Apache::lonnet::logthis("deleting $name:$id"); }
- my $remembered_id=$name.':'.$id;
$id=&make_key($name,$id);
$memcache->delete($id);
- delete($remembered{$remembered_id});
- delete($accessed{$remembered_id});
+ delete($remembered{$id});
+ delete($accessed{$id});
}
sub is_cached_new {
my ($name,$id,$debug) = @_;
- my $remembered_id=$name.':'.$id; # this is to avoid make_key (which is slow) for
- # keys in %remembered hash, which persists for
- # duration of request (no restriction on key length).
- if (exists($remembered{$remembered_id})) {
- if ($debug) { &Apache::lonnet::logthis("Early return $remembered_id of $remembered{$remembered_id} "); }
- $accessed{$remembered_id}=[&gettimeofday()];
+ $id=&make_key($name,$id);
+ if (exists($remembered{$id})) {
+ if ($debug) { &Apache::lonnet::logthis("Early return $id of $remembered{$id} "); }
+ $accessed{$id}=[&gettimeofday()];
$hits++;
- return ($remembered{$remembered_id},1);
+ return ($remembered{$id},1);
}
- $id=&make_key($name,$id);
my $value = $memcache->get($id);
if (!(defined($value))) {
if ($debug) { &Apache::lonnet::logthis("getting $id is not defined"); }
@@ -2496,14 +2323,13 @@ sub is_cached_new {
if ($debug) { &Apache::lonnet::logthis("getting $id is __undef__"); }
$value=undef;
}
- &make_room($remembered_id,$value,$debug);
+ &make_room($id,$value,$debug);
if ($debug) { &Apache::lonnet::logthis("getting $id is $value"); }
return ($value,1);
}
sub do_cache_new {
my ($name,$id,$value,$time,$debug) = @_;
- my $remembered_id=$name.':'.$id;
$id=&make_key($name,$id);
my $setvalue=$value;
if (!defined($setvalue)) {
@@ -2519,17 +2345,17 @@ sub do_cache_new {
$memcache->disconnect_all();
}
# need to make a copy of $value
- &make_room($remembered_id,$value,$debug);
+ &make_room($id,$value,$debug);
return $value;
}
sub make_room {
- my ($remembered_id,$value,$debug)=@_;
+ my ($id,$value,$debug)=@_;
- $remembered{$remembered_id}= (ref($value)) ? &Storable::dclone($value)
+ $remembered{$id}= (ref($value)) ? &Storable::dclone($value)
: $value;
if ($to_remember<0) { return; }
- $accessed{$remembered_id}=[&gettimeofday()];
+ $accessed{$id}=[&gettimeofday()];
if (scalar(keys(%remembered)) <= $to_remember) { return; }
my $to_kick;
my $max_time=0;
@@ -2823,22 +2649,20 @@ sub ssi {
&Apache::lonenc::check_encrypt(\$fn);
if (%form) {
$request=new HTTP::Request('POST',&absolute_url().$fn);
- $request->content(join('&',map {
- my $name = escape($_);
- "$name=" . ( ref($form{$_}) eq 'ARRAY'
- ? join("&$name=", map {escape($_) } @{$form{$_}})
- : &escape($form{$_}) );
- } keys(%form)));
+ $request->content(join('&',map { &escape($_).'='.&escape($form{$_}) } keys(%form)));
} else {
$request=new HTTP::Request('GET',&absolute_url().$fn);
}
$request->header(Cookie => $ENV{'HTTP_COOKIE'});
my $response= $ua->request($request);
+ my $content = $response->content;
+
+
if (wantarray) {
- return ($response->content, $response);
+ return ($content, $response);
} else {
- return $response->content;
+ return $content;
}
}
@@ -2870,7 +2694,7 @@ sub allowuploaded {
#
# Determine if the current user should be able to edit a particular resource,
# when viewing in course context.
-# (a) When viewing resource used to determine if "Edit" item is included in
+# (a) When viewing resource used to determine if "Edit" item is included in
# Functions.
# (b) When displaying folder contents in course editor, used to determine if
# "Edit" link will be displayed alongside resource.
@@ -2878,12 +2702,12 @@ sub allowuploaded {
# input: six args -- filename (decluttered), course number, course domain,
# url, symb (if registered) and group (if this is a group
# item -- e.g., bulletin board, group page etc.).
-# output: array of five scalars --
+# output: array of five scalars --
# $cfile -- url for file editing if editable on current server
# $home -- homeserver of resource (i.e., for author if published,
# or course if uploaded.).
# $switchserver -- 1 if server switch will be needed.
-# $forceedit -- 1 if icon/link should be to go to edit mode
+# $forceedit -- 1 if icon/link should be to go to edit mode
# $forceview -- 1 if icon/link should be to go to view mode
#
@@ -2972,7 +2796,7 @@ sub can_edit_resource {
$forceedit = 1;
}
$cfile = $resurl;
- } elsif (($resurl ne '') && (&is_on_map($resurl))) {
+ } elsif (($resurl ne '') && (&is_on_map($resurl))) {
if ($resurl =~ m{^/adm/$match_domain/$match_username/\d+/smppg|bulletinboard$}) {
$incourse = 1;
if ($env{'form.forceedit'}) {
@@ -3003,7 +2827,7 @@ sub can_edit_resource {
}
} elsif ($resurl eq '/res/lib/templates/simpleproblem.problem/smpedit') {
my $template = '/res/lib/templates/simpleproblem.problem';
- if (&is_on_map($template)) {
+ if (&is_on_map($template)) {
$incourse = 1;
$forceview = 1;
$cfile = $template;
@@ -3028,13 +2852,6 @@ sub can_edit_resource {
$cfile =~ s{^http://}{};
$cfile = '/adm/wrapper/ext/'.$cfile;
}
- } elsif ($resurl =~ m{^/?adm/viewclasslist$}) {
- if ($env{'form.forceedit'}) {
- $forceview = 1;
- } else {
- $forceedit = 1;
- }
- $cfile = ($resurl =~ m{^/} ? $resurl : "/$resurl");
}
}
if ($uploaded || $incourse) {
@@ -3050,7 +2867,7 @@ sub can_edit_resource {
$cfile=$file;
}
}
- if (($cfile ne '') && (!$incourse || $uploaded) &&
+ if (($cfile ne '') && (!$incourse || $uploaded) &&
(($home ne '') && ($home ne 'no_host'))) {
my @ids=¤t_machine_ids();
unless (grep(/^\Q$home\E$/,@ids)) {
@@ -3077,9 +2894,9 @@ sub in_course {
if ($hideprivileged) {
my $skipuser;
my %coursehash = &coursedescription($cdom.'_'.$cnum);
- my @possdoms = ($cdom);
- if ($coursehash{'checkforpriv'}) {
- push(@possdoms,split(/,/,$coursehash{'checkforpriv'}));
+ my @possdoms = ($cdom);
+ if ($coursehash{'checkforpriv'}) {
+ push(@possdoms,split(/,/,$coursehash{'checkforpriv'}));
}
if (&privileged($uname,$udom,\@possdoms)) {
$skipuser = 1;
@@ -3583,7 +3400,7 @@ sub extract_embedded_items {
}
if (lc($tagname) eq 'a') {
unless (($attr->{'href'} =~ /^#/) || ($attr->{'href'} eq '')) {
- &add_filetype($allfiles,$attr->{'href'},'href');
+ &add_filetype($allfiles,$attr->{'href'},'href');
}
}
if (lc($tagname) eq 'script') {
@@ -3672,26 +3489,8 @@ sub extract_embedded_items {
}
}
}
- if (lc($tagname) eq 'iframe') {
- my $src = $attr->{'src'} ;
- if (($src ne '') && ($src !~ m{^(/|https?://)})) {
- &add_filetype($allfiles,$src,'src');
- } elsif ($src =~ m{^/}) {
- if ($env{'request.course.id'}) {
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- my $url = &hreflocation('',$fullpath);
- if ($url =~ m{^/uploaded/$cdom/$cnum/docs/(\w+/\d+)/}) {
- my $relpath = $1;
- if ($src =~ m{^/uploaded/$cdom/$cnum/docs/\Q$relpath\E/(.+)$}) {
- &add_filetype($allfiles,$1,'src');
- }
- }
- }
- }
- }
if ($t->[4] =~ m{/>$}) {
- pop(@state);
+ pop(@state);
}
} elsif ($t->[0] eq 'E') {
my ($tagname) = ($t->[1]);
@@ -3908,7 +3707,7 @@ sub flushcourselogs {
}
}
#
-# Reverse lookup of domain roles (dc, ad, li, sc, dh, au)
+# Reverse lookup of domain roles (dc, ad, li, sc, au)
#
my %domrolebuffer = ();
foreach my $entry (keys(%domainrolehash)) {
@@ -3923,19 +3722,10 @@ sub flushcourselogs {
delete $domainrolehash{$entry};
}
foreach my $dom (keys(%domrolebuffer)) {
- my %servers;
- if (defined(&domain($dom,'primary'))) {
- my $primary=&domain($dom,'primary');
- my $hostname=&hostname($primary);
- $servers{$primary} = $hostname;
- } else {
- %servers = &get_servers($dom,'library');
- }
+ my %servers = &get_servers($dom,'library');
foreach my $tryserver (keys(%servers)) {
- if (&reply('domroleput:'.$dom.':'.
- $domrolebuffer{$dom},$tryserver) eq 'ok') {
- last;
- } else {
+ unless (&reply('domroleput:'.$dom.':'.
+ $domrolebuffer{$dom},$tryserver) eq 'ok') {
&logthis('Put of domain roles failed for '.$dom.' and '.$tryserver);
}
}
@@ -4055,7 +3845,7 @@ sub userrolelog {
{$trole.':'.$username.':'.$domain.':'.$env{'user.name'}.':'.$env{'user.domain'}.':'}
=$tend.':'.$tstart;
}
- if ($trole =~ /^(dc|ad|li|au|dg|sc|dh)/ ) {
+ if ($trole =~ /^(dc|ad|li|au|dg|sc)/ ) {
my (undef,$rudom,$runame,$rsec)=split(/\//,$area);
$domainrolehash
{$trole.':'.$username.':'.$domain.':'.$runame.':'.$rudom.':'.$rsec}
@@ -4263,7 +4053,7 @@ sub get_my_roles {
} else {
my $possdoms = [$domain];
if (ref($roledoms) eq 'ARRAY') {
- push(@{$possdoms},@{$roledoms});
+ push(@{$possdoms},@{$roledoms});
}
if (&privileged($username,$domain,$possdoms,\@privroles)) {
if (!$nothide{$username.':'.$domain}) {
@@ -4357,8 +4147,7 @@ sub courseiddump {
my ($domfilter,$descfilter,$sincefilter,$instcodefilter,$ownerfilter,
$coursefilter,$hostidflag,$hostidref,$typefilter,$regexp_ok,
$selfenrollonly,$catfilter,$showhidden,$caller,$cloner,$cc_clone,
- $cloneonly,$createdbefore,$createdafter,$creationcontext,$domcloner,
- $hasuniquecode,$reqcrsdom,$reqinstcode)=@_;
+ $cloneonly,$createdbefore,$createdafter,$creationcontext,$domcloner)=@_;
my $as_hash = 1;
my %returnhash;
if (!$domfilter) { $domfilter=''; }
@@ -4371,18 +4160,17 @@ sub courseiddump {
if (($domfilter eq '') ||
(&host_domain($tryserver) eq $domfilter)) {
my $rep;
- if (grep { $_ eq $tryserver } ¤t_machine_ids()) {
- $rep = &LONCAPA::Lond::dump_course_id_handler(
- join(":", (&host_domain($tryserver), $sincefilter,
- &escape($descfilter), &escape($instcodefilter),
+ if (grep { $_ eq $tryserver } current_machine_ids()) {
+ $rep = LONCAPA::Lond::dump_course_id_handler(
+ join(":", (&host_domain($tryserver), $sincefilter,
+ &escape($descfilter), &escape($instcodefilter),
&escape($ownerfilter), &escape($coursefilter),
- &escape($typefilter), &escape($regexp_ok),
- $as_hash, &escape($selfenrollonly),
- &escape($catfilter), $showhidden, $caller,
- &escape($cloner), &escape($cc_clone), $cloneonly,
- &escape($createdbefore), &escape($createdafter),
- &escape($creationcontext),$domcloner,$hasuniquecode,
- $reqcrsdom,&escape($reqinstcode))));
+ &escape($typefilter), &escape($regexp_ok),
+ $as_hash, &escape($selfenrollonly),
+ &escape($catfilter), $showhidden, $caller,
+ &escape($cloner), &escape($cc_clone), $cloneonly,
+ &escape($createdbefore), &escape($createdafter),
+ &escape($creationcontext), $domcloner)));
} else {
$rep = &reply('courseiddump:'.&host_domain($tryserver).':'.
$sincefilter.':'.&escape($descfilter).':'.
@@ -4393,10 +4181,10 @@ sub courseiddump {
$showhidden.':'.$caller.':'.&escape($cloner).':'.
&escape($cc_clone).':'.$cloneonly.':'.
&escape($createdbefore).':'.&escape($createdafter).':'.
- &escape($creationcontext).':'.$domcloner.':'.$hasuniquecode.
- ':'.$reqcrsdom.':'.&escape($reqinstcode),$tryserver);
+ &escape($creationcontext).':'.$domcloner,
+ $tryserver);
}
-
+
my @pairs=split(/\&/,$rep);
foreach my $item (@pairs) {
my ($key,$value)=split(/\=/,$item,2);
@@ -4533,7 +4321,7 @@ my $cachedkey='';
# The cached times for this user
my %cachedtimes=();
# When this was last done
-my $cachedtime='';
+my $cachedtime=();
sub load_all_first_access {
my ($uname,$udom)=@_;
@@ -4595,92 +4383,6 @@ sub set_first_access {
return 'already_set';
}
}
-
-sub checkout {
- my ($symb,$tuname,$tudom,$tcrsid)=@_;
- my $now=time;
- my $lonhost=$perlvar{'lonHostID'};
- my $infostr=&escape(
- 'CHECKOUTTOKEN&'.
- $tuname.'&'.
- $tudom.'&'.
- $tcrsid.'&'.
- $symb.'&'.
- $now.'&'.$ENV{'REMOTE_ADDR'});
- my $token=&reply('tmpput:'.$infostr,$lonhost);
- if ($token=~/^error\:/) {
- &logthis("<font color=\"blue\">WARNING: ".
- "Checkout tmpput failed ".$tudom.' - '.$tuname.' - '.$symb.
- "</font>");
- return '';
- }
-
- $token=~s/^(\d+)\_.*\_(\d+)$/$1\*$2\*$lonhost/;
- $token=~tr/a-z/A-Z/;
-
- my %infohash=('resource.0.outtoken' => $token,
- 'resource.0.checkouttime' => $now,
- 'resource.0.outremote' => $ENV{'REMOTE_ADDR'});
-
- unless (&cstore(\%infohash,$symb,$tcrsid,$tudom,$tuname) eq 'ok') {
- return '';
- } else {
- &logthis("<font color=\"blue\">WARNING: ".
- "Checkout cstore failed ".$tudom.' - '.$tuname.' - '.$symb.
- "</font>");
- }
-
- if (&log($tudom,$tuname,&homeserver($tuname,$tudom),
- &escape('Checkout '.$infostr.' - '.
- $token)) ne 'ok') {
- return '';
- } else {
- &logthis("<font color=\"blue\">WARNING: ".
- "Checkout log failed ".$tudom.' - '.$tuname.' - '.$symb.
- "</font>");
- }
- return $token;
-}
-
-# ------------------------------------------------------------ Check in an item
-
-sub checkin {
- my $token=shift;
- my $now=time;
- my ($ta,$tb,$lonhost)=split(/\*/,$token);
- $lonhost=~tr/A-Z/a-z/;
- my $dtoken=$ta.'_'.&hostname($lonhost).'_'.$tb;
- $dtoken=~s/\W/\_/g;
- my ($dummy,$tuname,$tudom,$tcrsid,$symb,$chtim,$rmaddr)=
- split(/\&/,&unescape(&reply('tmpget:'.$dtoken,$lonhost)));
-
- unless (($tuname) && ($tudom)) {
- &logthis('Check in '.$token.' ('.$dtoken.') failed');
- return '';
- }
-
- unless (&allowed('mgr',$tcrsid)) {
- &logthis('Check in '.$token.' ('.$dtoken.') unauthorized: '.
- $env{'user.name'}.' - '.$env{'user.domain'});
- return '';
- }
-
- my %infohash=('resource.0.intoken' => $token,
- 'resource.0.checkintime' => $now,
- 'resource.0.inremote' => $ENV{'REMOTE_ADDR'});
-
- unless (&cstore(\%infohash,$symb,$tcrsid,$tudom,$tuname) eq 'ok') {
- return '';
- }
-
- if (&log($tudom,$tuname,&homeserver($tuname,$tudom),
- &escape('Checkin - '.$token)) ne 'ok') {
- return '';
- }
-
- return ($symb,$tuname,$tudom,$tcrsid);
-}
-
# --------------------------------------------- Set Expire Date for Spreadsheet
sub expirespread {
@@ -5051,7 +4753,7 @@ sub tmprestore {
# ----------------------------------------------------------------------- Store
sub store {
- my ($storehash,$symb,$namespace,$domain,$stuname,$laststore) = @_;
+ my ($storehash,$symb,$namespace,$domain,$stuname) = @_;
my $home='';
if ($stuname) { $home=&homeserver($stuname,$domain); }
@@ -5081,13 +4783,13 @@ sub store {
}
$namevalue=~s/\&$//;
&courselog($symb.':'.$stuname.':'.$domain.':STORE:'.$namevalue);
- return reply("store:$domain:$stuname:$namespace:$symb:$namevalue:$laststore","$home");
+ return reply("store:$domain:$stuname:$namespace:$symb:$namevalue","$home");
}
# -------------------------------------------------------------- Critical Store
sub cstore {
- my ($storehash,$symb,$namespace,$domain,$stuname,$laststore) = @_;
+ my ($storehash,$symb,$namespace,$domain,$stuname) = @_;
my $home='';
if ($stuname) { $home=&homeserver($stuname,$domain); }
@@ -5118,7 +4820,7 @@ sub cstore {
$namevalue=~s/\&$//;
&courselog($symb.':'.$stuname.':'.$domain.':CSTORE:'.$namevalue);
return critical
- ("store:$domain:$stuname:$namespace:$symb:$namevalue:$laststore","$home");
+ ("store:$domain:$stuname:$namespace:$symb:$namevalue","$home");
}
# --------------------------------------------------------------------- Restore
@@ -5274,7 +4976,7 @@ sub privileged {
my $now = time;
my $roles;
if (ref($possroles) eq 'ARRAY') {
- $roles = $possroles;
+ $roles = $possroles;
} else {
$roles = ['dc','su'];
}
@@ -5298,10 +5000,10 @@ sub privileged {
my %rolesdump = &dump("roles", $domain, $username) or return 0;
my $now = time;
- for my $role (@rolesdump{grep { ! /^rolesdef_/ } keys(%rolesdump)}) {
+ for my $role (@rolesdump{grep { ! /^rolesdef_/ } keys %rolesdump}) {
my ($trole, $tend, $tstart) = split(/_/, $role);
if (grep(/^\Q$trole\E$/,@{$roles})) {
- return 1 unless ($tend && $tend < $now)
+ return 1 unless ($tend && $tend < $now)
or ($tstart && $tstart > $now);
}
}
@@ -5339,7 +5041,7 @@ sub privileged_by_domain {
my ($trole,$uname,$udom,$rest) = split(/:/,$item,4);
my ($end,$start) = split(/:/,$dompersonnel{$server}{$item});
next if ($end && $end < $now);
- $privileged{$dom}{$trole}{$uname.':'.$udom} =
+ $privileged{$dom}{$trole}{$uname.':'.$udom} =
$dompersonnel{$server}{$item};
}
}
@@ -5387,7 +5089,7 @@ sub rolesinit {
my %allroles=();
my %allgroups=();
- for my $area (grep { ! /^rolesdef_/ } keys(%rolesdump)) {
+ for my $area (grep { ! /^rolesdef_/ } keys %rolesdump) {
my $role = $rolesdump{$area};
$area =~ s/\_\w\w$//;
@@ -5479,7 +5181,7 @@ sub set_arearole {
sub custom_roleprivs {
my ($allroles,$trole,$tdomain,$trest,$spec,$area) = @_;
my ($rdummy,$rdomain,$rauthor,$rrole)=split(/\//,$trole);
- my $homsvr = &homeserver($rauthor,$rdomain);
+ my $homsvr=homeserver($rauthor,$rdomain);
if (&hostname($homsvr) ne '') {
my ($rdummy,$roledef)=
&get('roles',["rolesdef_$rrole"],$rdomain,$rauthor);
@@ -5600,11 +5302,11 @@ sub set_userprivs {
sub role_status {
my ($rolekey,$update,$refresh,$now,$role,$where,$trolecode,$tstatus,$tstart,$tend) = @_;
+ my @pwhere = ();
if (exists($env{$rolekey}) && $env{$rolekey} ne '') {
- my ($one,$two) = split(m{\./},$rolekey,2);
- (undef,undef,$$role) = split(/\./,$one,3);
+ (undef,undef,$$role,@pwhere)=split(/\./,$rolekey);
unless (!defined($$role) || $$role eq '') {
- $$where = '/'.$two;
+ $$where=join('.',@pwhere);
$$trolecode=$$role.'.'.$$where;
($$tstart,$$tend)=split(/\./,$env{$rolekey});
$$tstatus='is';
@@ -5736,19 +5438,15 @@ sub check_adhoc_privs {
}
sub set_adhoc_privileges {
-# role can be cc, ca, or cr/<dom>/<dom>-domainconfig/role
+# role can be cc or ca
my ($dcdom,$pickedcourse,$role,$caller) = @_;
my $area = '/'.$dcdom.'/'.$pickedcourse;
my $spec = $role.'.'.$area;
my %userroles = &set_arearole($role,$area,'','',$env{'user.domain'},
$env{'user.name'},1);
- my %rolehash = ();
- if ($role =~ m{^cr/$dcdom/$dcdom\Q-domainconfig\E/}) {
- &custom_roleprivs(\%rolehash,$role,$dcdom,$pickedcourse,$spec,$area);
- } else {
- &standard_roleprivs(\%rolehash,$role,$dcdom,$spec,$pickedcourse,$area);
- }
- my ($author,$adv)= &set_userprivs(\%userroles,\%rolehash);
+ my %ccrole = ();
+ &standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);
+ my ($author,$adv)= &set_userprivs(\%userroles,\%ccrole);
&appenv(\%userroles,[$role,'cm']);
&log($env{'user.domain'},$env{'user.name'},$env{'user.home'},"Role ".$role);
unless ($caller eq 'constructaccess' && $env{'request.course.id'}) {
@@ -5814,14 +5512,15 @@ sub unserialize {
return {} if $rep =~ /^error/;
my %returnhash=();
- foreach my $item (split(/\&/,$rep)) {
- my ($key, $value) = split(/=/, $item, 2);
- $key = unescape($key) unless $escapedkeys;
- next if $key =~ /^error: 2 /;
- $returnhash{$key} = &thaw_unescape($value);
- }
+ foreach my $item (split /\&/, $rep) {
+ my ($key, $value) = split(/=/, $item, 2);
+ $key = unescape($key) unless $escapedkeys;
+ next if $key =~ /^error: 2 /;
+ $returnhash{$key} = Apache::lonnet::thaw_unescape($value);
+ }
+ #return %returnhash;
return \%returnhash;
-}
+}
# see Lond::dump_with_regexp
# if $escapedkeys hash keys won't get unescaped.
@@ -5831,16 +5530,17 @@ sub dump {
if (!$uname) { $uname=$env{'user.name'}; }
my $uhome=&homeserver($uname,$udomain);
- if ($regexp) {
- $regexp=&escape($regexp);
- } else {
- $regexp='.';
- }
- if (grep { $_ eq $uhome } ¤t_machine_ids()) {
+ my $reply;
+ if (grep { $_ eq $uhome } current_machine_ids()) {
# user is hosted on this machine
- my $reply = LONCAPA::Lond::dump_with_regexp(join(':', ($udomain,
+ $reply = LONCAPA::Lond::dump_with_regexp(join(":", ($udomain,
$uname, $namespace, $regexp, $range)), $perlvar{'lonVersion'});
- return %{&unserialize($reply, $escapedkeys)};
+ return %{unserialize($reply, $escapedkeys)};
+ }
+ if ($regexp) {
+ $regexp=&escape($regexp);
+ } else {
+ $regexp='.';
}
my $rep=&reply("dump:$udomain:$uname:$namespace:$regexp:$range",$uhome);
my @pairs=split(/\&/,$rep);
@@ -5848,7 +5548,8 @@ sub dump {
if (!($rep =~ /^error/ )) {
foreach my $item (@pairs) {
my ($key,$value)=split(/=/,$item,2);
- $key = &unescape($key) unless ($escapedkeys);
+ $key = unescape($key) unless $escapedkeys;
+ #$key = &unescape($key);
next if ($key =~ /^error: 2 /);
$returnhash{$key}=&thaw_unescape($value);
}
@@ -5892,7 +5593,7 @@ sub currentdump {
my $rep;
if (grep { $_ eq $uhome } current_machine_ids()) {
- $rep = LONCAPA::Lond::dump_profile_database(join(":", ($sdom, $sname,
+ $rep = LONCAPA::Lond::dump_profile_database(join(":", ($sdom, $sname,
$courseid)));
} else {
$rep = reply('currentdump:'.$sdom.':'.$sname.':'.$courseid,$uhome);
@@ -6018,7 +5719,7 @@ sub newput {
# --------------------------------------------------------- putstore interface
sub putstore {
- my ($namespace,$symb,$version,$storehash,$udomain,$uname,$tolog)=@_;
+ my ($namespace,$symb,$version,$storehash,$udomain,$uname)=@_;
if (!$udomain) { $udomain=$env{'user.domain'}; }
if (!$uname) { $uname=$env{'user.name'}; }
my $uhome=&homeserver($uname,$udomain);
@@ -6032,17 +5733,6 @@ sub putstore {
my $reply =
&reply("putstore:$udomain:$uname:$namespace:$esc_symb:$esc_v:$items",
$uhome);
- if (($tolog) && ($reply eq 'ok')) {
- my $namevalue='';
- foreach my $key (keys(%{$storehash})) {
- $namevalue.=&escape($key).'='.&freeze_escape($storehash->{$key}).'&';
- }
- $namevalue .= 'ip='.&escape($ENV{'REMOTE_ADDR'}).
- '&host='.&escape($perlvar{'lonHostID'}).
- '&version='.$esc_v.
- '&by='.&escape($env{'user.name'}.':'.$env{'user.domain'});
- &Apache::lonnet::courselog($symb.':'.$uname.':'.$udomain.':PUTSTORE:'.$namevalue);
- }
if ($reply eq 'unknown_cmd') {
# gfall back to way things use to be done
return &old_putstore($namespace,$symb,$version,$storehash,$udomain,
@@ -6151,13 +5841,13 @@ sub tmpdel {
return &reply("tmpdel:$token",$server);
}
-# ------------------------------------------------------------ get_timebased_id
+# ------------------------------------------------------------ get_timebased_id
sub get_timebased_id {
my ($prefix,$keyid,$namespace,$cdom,$cnum,$idtype,$who,$locktries,
$maxtries) = @_;
my ($newid,$error,$dellock);
- unless (($prefix =~ /^\w+$/) && ($keyid =~ /^\w+$/) && ($namespace ne '')) {
+ unless (($prefix =~ /^\w+$/) && ($keyid =~ /^\w+$/) && ($namespace ne '')) {
return ('','ok','invalid call to get suffix');
}
@@ -6171,7 +5861,7 @@ sub get_timebased_id {
if (!$maxtries) {
$maxtries = 10;
}
-
+
if (($cdom eq '') || ($cnum eq '')) {
if ($env{'request.course.id'}) {
$cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -6201,15 +5891,10 @@ sub get_timebased_id {
my %inuse = &Apache::lonnet::dump('nohist_'.$namespace,$cdom,$cnum,$prefix);
my $id = time;
$newid = $id;
- if ($idtype eq 'addcode') {
- $newid .= &sixnum_code();
- }
my $idtries = 0;
while (exists($inuse{$prefix."\0".$newid}) && $idtries < $maxtries) {
if ($idtype eq 'concat') {
$newid = $id.$idtries;
- } elsif ($idtype eq 'addcode') {
- $newid = $newid.&sixnum_code();
} else {
$newid ++;
}
@@ -6226,7 +5911,6 @@ sub get_timebased_id {
$error = 'error saving new item: '.$putresult;
}
} else {
- undef($newid);
$error = ('error: no unique suffix available for the new item ');
}
# remove lock
@@ -6235,27 +5919,16 @@ sub get_timebased_id {
} else {
$error = "error: could not obtain lockfile\n";
$dellock = 'ok';
- if (($prefix eq 'paste') && ($namespace eq 'courseeditor') && ($keyid eq 'num')) {
- $dellock = 'nolock';
- }
}
return ($newid,$dellock,$error);
}
-sub sixnum_code {
- my $code;
- for (0..6) {
- $code .= int( rand(9) );
- }
- return $code;
-}
-
# -------------------------------------------------- portfolio access checking
sub portfolio_access {
- my ($requrl,$clientip) = @_;
+ my ($requrl) = @_;
my (undef,$udom,$unum,$file_name,$group) = &parse_portfolio_url($requrl);
- my $result = &get_portfolio_access($udom,$unum,$file_name,$group,$clientip);
+ my $result = &get_portfolio_access($udom,$unum,$file_name,$group);
if ($result) {
my %setters;
if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
@@ -6281,7 +5954,7 @@ sub portfolio_access {
}
sub get_portfolio_access {
- my ($udom,$unum,$file_name,$group,$clientip,$access_hash) = @_;
+ my ($udom,$unum,$file_name,$group,$access_hash) = @_;
if (!ref($access_hash)) {
my $current_perms = &get_portfile_permissions($udom,$unum);
@@ -6290,7 +5963,7 @@ sub get_portfolio_access {
$access_hash = $access_controls{$file_name};
}
- my ($public,$guest,@domains,@users,@courses,@groups,@ips);
+ my ($public,$guest,@domains,@users,@courses,@groups);
my $now = time;
if (ref($access_hash) eq 'HASH') {
foreach my $key (keys(%{$access_hash})) {
@@ -6314,25 +5987,10 @@ sub get_portfolio_access {
push(@courses,$key);
} elsif ($scope eq 'group') {
push(@groups,$key);
- } elsif ($scope eq 'ip') {
- push(@ips,$key);
}
}
if ($public) {
return 'ok';
- } elsif (@ips > 0) {
- my $allowed;
- foreach my $ipkey (@ips) {
- if (ref($access_hash->{$ipkey}{'ip'}) eq 'ARRAY') {
- if (&Apache::loncommon::check_ip_acc(join(',',@{$access_hash->{$ipkey}{'ip'}}),$clientip)) {
- $allowed = 1;
- last;
- }
- }
- }
- if ($allowed) {
- return 'ok';
- }
}
if ($env{'user.name'} eq 'public' && $env{'user.domain'} eq 'public') {
if ($guest) {
@@ -6519,7 +6177,6 @@ sub usertools_access {
official => 1,
unofficial => 1,
community => 1,
- textbook => 1,
);
} elsif ($context eq 'requestauthor') {
%tools = (
@@ -6535,7 +6192,7 @@ sub usertools_access {
}
return if (!defined($tools{$tool}));
- if (($udom eq '') || ($uname eq '')) {
+ if ((!defined($udom)) || (!defined($uname))) {
$udom = $env{'user.domain'};
$uname = $env{'user.name'};
}
@@ -6554,7 +6211,7 @@ sub usertools_access {
my ($toolstatus,$inststatus,$envkey);
if ($context eq 'requestauthor') {
- $envkey = $context;
+ $envkey = $context;
} else {
$envkey = $context.'.'.$tool;
}
@@ -6816,7 +6473,7 @@ sub customaccess {
# ------------------------------------------------- Check for a user privilege
sub allowed {
- my ($priv,$uri,$symb,$role,$clientip,$noblockcheck)=@_;
+ my ($priv,$uri,$symb,$role)=@_;
my $ver_orguri=$uri;
$uri=&deversion($uri);
my $orguri=$uri;
@@ -7011,16 +6668,11 @@ sub allowed {
if ($match) {
if ($env{'user.priv.'.$env{'request.role'}.'./'}
=~/\Q$priv\E\&([^\:]*)/) {
- my $value = $1;
- if ($noblockcheck) {
- $thisallowed.=$value;
+ my @blockers = &has_comm_blocking($priv,$symb,$uri);
+ if (@blockers > 0) {
+ $thisallowed = 'B';
} else {
- my @blockers = &has_comm_blocking($priv,$symb,$uri);
- if (@blockers > 0) {
- $thisallowed = 'B';
- } else {
- $thisallowed.=$value;
- }
+ $thisallowed.=$1;
}
}
} else {
@@ -7032,15 +6684,11 @@ sub allowed {
$refuri=&declutter($refuri);
my ($match) = &is_on_map($refuri);
if ($match) {
- if ($noblockcheck) {
- $thisallowed='F';
+ my @blockers = &has_comm_blocking($priv,$symb,$refuri);
+ if (@blockers > 0) {
+ $thisallowed = 'B';
} else {
- my @blockers = &has_comm_blocking($priv,$symb,$refuri);
- if (@blockers > 0) {
- $thisallowed = 'B';
- } else {
- $thisallowed='F';
- }
+ $thisallowed='F';
}
}
}
@@ -7052,7 +6700,7 @@ sub allowed {
&& $thisallowed ne 'F'
&& $thisallowed ne '2'
&& &is_portfolio_url($uri)) {
- $thisallowed = &portfolio_access($uri,$clientip);
+ $thisallowed = &portfolio_access($uri);
}
# Full access at system, domain or course-wide level? Exit.
@@ -7095,15 +6743,11 @@ sub allowed {
=~/\Q$priv\E\&([^\:]*)/) {
my $value = $1;
if ($priv eq 'bre') {
- if ($noblockcheck) {
- $thisallowed.=$value;
+ my @blockers = &has_comm_blocking($priv,$symb,$uri);
+ if (@blockers > 0) {
+ $thisallowed = 'B';
} else {
- my @blockers = &has_comm_blocking($priv,$symb,$uri);
- if (@blockers > 0) {
- $thisallowed = 'B';
- } else {
- $thisallowed.=$value;
- }
+ $thisallowed.=$value;
}
} else {
$thisallowed.=$value;
@@ -7137,15 +6781,11 @@ sub allowed {
=~/\Q$priv\E\&([^\:]*)/) {
my $value = $1;
if ($priv eq 'bre') {
- if ($noblockcheck) {
- $thisallowed.=$value;
+ my @blockers = &has_comm_blocking($priv,$symb,$refuri);
+ if (@blockers > 0) {
+ $thisallowed = 'B';
} else {
- my @blockers = &has_comm_blocking($priv,$symb,$refuri);
- if (@blockers > 0) {
- $thisallowed = 'B';
- } else {
- $thisallowed.=$value;
- }
+ $thisallowed.=$value;
}
} else {
$thisallowed.=$value;
@@ -7321,7 +6961,7 @@ sub constructaccess {
my ($ownername,$ownerdomain,$ownerhome);
($ownerdomain,$ownername) =
- ($url=~ m{^(?:\Q$perlvar{'lonDocRoot'}\E|)/priv/($match_domain)/($match_username)(?:/|$)});
+ ($url=~ m{^(?:\Q$perlvar{'lonDocRoot'}\E|)/priv/($match_domain)/($match_username)/});
# The URL does not really point to any authorspace, forget it
unless (($ownername) && ($ownerdomain)) { return ''; }
@@ -7376,32 +7016,6 @@ sub constructaccess {
return '';
}
-# ----------------------------------------------------------- Content Blocking
-
-{
-# Caches for faster Course Contents display where content blocking
-# is in operation (i.e., interval param set) for timed quiz.
-#
-# User for whom data are being temporarily cached.
-my $cacheduser='';
-# Cached blockers for this user (a hash of blocking items).
-my %cachedblockers=();
-# When the data were last cached.
-my $cachedlast='';
-
-sub load_all_blockers {
- my ($uname,$udom,$blocks)=@_;
- if (($uname ne '') && ($udom ne '')) {
- if (($cacheduser eq $uname.':'.$udom) &&
- (abs($cachedlast-time)<5)) {
- return;
- }
- }
- $cachedlast=time;
- $cacheduser=$uname.':'.$udom;
- %cachedblockers = &get_commblock_resources($blocks);
-}
-
sub get_comm_blocks {
my ($cdom,$cnum) = @_;
if ($cdom eq '' || $cnum eq '') {
@@ -7422,21 +7036,27 @@ sub get_comm_blocks {
return %commblocks;
}
-sub get_commblock_resources {
- my ($blocks) = @_;
- my %blockers = ();
- return %blockers unless ($env{'request.course.id'});
- return %blockers if ($env{'user.priv.'.$env{'request.role'}} =~/evb\&([^\:]*)/);
+sub has_comm_blocking {
+ my ($priv,$symb,$uri,$blocks) = @_;
+ return unless ($env{'request.course.id'});
+ return unless ($priv eq 'bre');
+ return if ($env{'user.priv.'.$env{'request.role'}} =~/evb\&([^\:]*)/);
my %commblocks;
if (ref($blocks) eq 'HASH') {
%commblocks = %{$blocks};
} else {
%commblocks = &get_comm_blocks();
}
- return %blockers unless (keys(%commblocks) > 0);
- my $navmap = Apache::lonnavmaps::navmap->new();
- return %blockers unless (ref($navmap));
+ return unless (keys(%commblocks) > 0);
+ if (!$symb) { $symb=&symbread($uri,1); }
+ my ($map,$resid,undef)=&decode_symb($symb);
+ my %tocheck = (
+ maps => $map,
+ resources => $symb,
+ );
+ my @blockers;
my $now = time;
+ my $navmap = Apache::lonnavmaps::navmap->new();
foreach my $block (keys(%commblocks)) {
if ($block =~ /^(\d+)____(\d+)$/) {
my ($start,$end) = ($1,$2);
@@ -7444,13 +7064,17 @@ sub get_commblock_resources {
if (ref($commblocks{$block}{'blocks'}) eq 'HASH') {
if (ref($commblocks{$block}{'blocks'}{'docs'}) eq 'HASH') {
if (ref($commblocks{$block}{'blocks'}{'docs'}{'maps'}) eq 'HASH') {
- if (keys(%{$commblocks{$block}{'blocks'}{'docs'}{'maps'}})) {
- $blockers{$block}{maps} = $commblocks{$block}{'blocks'}{'docs'}{'maps'};
+ if ($commblocks{$block}{'blocks'}{'docs'}{'maps'}{$map}) {
+ unless (grep(/^\Q$block\E$/,@blockers)) {
+ push(@blockers,$block);
+ }
}
}
if (ref($commblocks{$block}{'blocks'}{'docs'}{'resources'}) eq 'HASH') {
- if (keys(%{$commblocks{$block}{'blocks'}{'docs'}{'resources'}})) {
- $blockers{$block}{'resources'} = $commblocks{$block}{'blocks'}{'docs'}{'resources'};
+ if ($commblocks{$block}{'blocks'}{'docs'}{'resources'}{$symb}) {
+ unless (grep(/^\Q$block\E$/,@blockers)) {
+ push(@blockers,$block);
+ }
}
}
}
@@ -7461,31 +7085,32 @@ sub get_commblock_resources {
my @to_test;
if (ref($commblocks{$block}{'blocks'}) eq 'HASH') {
if (ref($commblocks{$block}{'blocks'}{'docs'}) eq 'HASH') {
- my @interval;
- my $type = 'map';
- if ($item eq 'course') {
- $type = 'course';
- @interval=&EXT("resource.0.interval");
- } else {
- if ($item =~ /___\d+___/) {
- $type = 'resource';
- @interval=&EXT("resource.0.interval",$item);
- if (ref($navmap)) {
- my $res = $navmap->getBySymb($item);
- push(@to_test,$res);
- }
+ my $check_interval;
+ if (&check_docs_block($commblocks{$block}{'blocks'}{'docs'},\%tocheck)) {
+ my @interval;
+ my $type = 'map';
+ if ($item eq 'course') {
+ $type = 'course';
+ @interval=&EXT("resource.0.interval");
} else {
- my $mapsymb = &symbread($item,1);
- if ($mapsymb) {
- if (ref($navmap)) {
- my $mapres = $navmap->getBySymb($mapsymb);
- @to_test = $mapres->retrieveResources($mapres,undef,0,0,0,1);
- foreach my $res (@to_test) {
- my $symb = $res->symb();
- next if ($symb eq $mapsymb);
- if ($symb ne '') {
- @interval=&EXT("resource.0.interval",$symb);
- if ($interval[1] eq 'map') {
+ if ($item =~ /___\d+___/) {
+ $type = 'resource';
+ @interval=&EXT("resource.0.interval",$item);
+ if (ref($navmap)) {
+ my $res = $navmap->getBySymb($item);
+ push(@to_test,$res);
+ }
+ } else {
+ my $mapsymb = &symbread($item,1);
+ if ($mapsymb) {
+ if (ref($navmap)) {
+ my $mapres = $navmap->getBySymb($mapsymb);
+ @to_test = $mapres->retrieveResources($mapres,undef,0,1);
+ foreach my $res (@to_test) {
+ my $symb = $res->symb();
+ next if ($symb eq $mapsymb);
+ if ($symb ne '') {
+ @interval=&EXT("resource.0.interval",$symb);
last;
}
}
@@ -7493,35 +7118,26 @@ sub get_commblock_resources {
}
}
}
- }
- if ($interval[0] =~ /^\d+$/) {
- my $first_access;
- if ($type eq 'resource') {
- $first_access=&get_first_access($interval[1],$item);
- } elsif ($type eq 'map') {
- $first_access=&get_first_access($interval[1],undef,$item);
- } else {
- $first_access=&get_first_access($interval[1]);
- }
- if ($first_access) {
- my $timesup = $first_access+$interval[0];
- if ($timesup > $now) {
- my $activeblock;
- foreach my $res (@to_test) {
- if ($res->answerable()) {
- $activeblock = 1;
- last;
- }
- }
- if ($activeblock) {
- if (ref($commblocks{$block}{'blocks'}{'docs'}{'maps'}) eq 'HASH') {
- if (keys(%{$commblocks{$block}{'blocks'}{'docs'}{'maps'}})) {
- $blockers{$block}{'maps'} = $commblocks{$block}{'blocks'}{'docs'}{'maps'};
- }
- }
- if (ref($commblocks{$block}{'blocks'}{'docs'}{'resources'}) eq 'HASH') {
- if (keys(%{$commblocks{$block}{'blocks'}{'docs'}{'resources'}})) {
- $blockers{$block}{'resources'} = $commblocks{$block}{'blocks'}{'docs'}{'resources'};
+ if ($interval[0] =~ /\d+/) {
+ my $first_access;
+ if ($type eq 'resource') {
+ $first_access=&get_first_access($interval[1],$item);
+ } elsif ($type eq 'map') {
+ $first_access=&get_first_access($interval[1],undef,$item);
+ } else {
+ $first_access=&get_first_access($interval[1]);
+ }
+ if ($first_access) {
+ my $timesup = $first_access+$interval[0];
+ if ($timesup > $now) {
+ foreach my $res (@to_test) {
+ if ($res->is_problem()) {
+ if ($res->completable()) {
+ unless (grep(/^\Q$block\E$/,@blockers)) {
+ push(@blockers,$block);
+ }
+ last;
+ }
}
}
}
@@ -7532,66 +7148,33 @@ sub get_commblock_resources {
}
}
}
- return %blockers;
+ return @blockers;
}
-sub has_comm_blocking {
- my ($priv,$symb,$uri,$blocks) = @_;
- my @blockers;
- return unless ($env{'request.course.id'});
- return unless ($priv eq 'bre');
- return if ($env{'user.priv.'.$env{'request.role'}} =~/evb\&([^\:]*)/);
- return if ($env{'request.state'} eq 'construct');
- &load_all_blockers($env{'user.name'},$env{'user.domain'},$blocks);
- return unless (keys(%cachedblockers) > 0);
- my (%possibles,@symbs);
- if (!$symb) {
- $symb = &symbread($uri,1,1,1,\%possibles);
+sub check_docs_block {
+ my ($docsblock,$tocheck) =@_;
+ if ((ref($docsblock) ne 'HASH') || (ref($tocheck) ne 'HASH')) {
+ return;
}
- if ($symb) {
- @symbs = ($symb);
- } elsif (keys(%possibles)) {
- @symbs = keys(%possibles);
- }
- my $noblock;
- foreach my $symb (@symbs) {
- last if ($noblock);
- my ($map,$resid,$resurl)=&decode_symb($symb);
- foreach my $block (keys(%cachedblockers)) {
- if ($block =~ /^firstaccess____(.+)$/) {
- my $item = $1;
- if (($item eq $map) || ($item eq $symb)) {
- $noblock = 1;
- last;
- }
- }
- if (ref($cachedblockers{$block}) eq 'HASH') {
- if (ref($cachedblockers{$block}{'resources'}) eq 'HASH') {
- if ($cachedblockers{$block}{'resources'}{$symb}) {
- unless (grep(/^\Q$block\E$/,@blockers)) {
- push(@blockers,$block);
- }
- }
- }
+ if (ref($docsblock->{'maps'}) eq 'HASH') {
+ if ($tocheck->{'maps'}) {
+ if ($docsblock->{'maps'}{$tocheck->{'maps'}}) {
+ return 1;
}
- if (ref($cachedblockers{$block}{'maps'}) eq 'HASH') {
- if ($cachedblockers{$block}{'maps'}{$map}) {
- unless (grep(/^\Q$block\E$/,@blockers)) {
- push(@blockers,$block);
- }
- }
+ }
+ }
+ if (ref($docsblock->{'resources'}) eq 'HASH') {
+ if ($tocheck->{'resources'}) {
+ if ($docsblock->{'resources'}{$tocheck->{'resources'}}) {
+ return 1;
}
}
}
- return if ($noblock);
- return @blockers;
-}
+ return;
}
-# -------------------------------- Deversion and split uri into path an filename
-
#
-# Removes the version from a URI and
+# Removes the versino from a URI and
# splits it in to its filename and path to the filename.
# Seems like File::Basename could have done this more clearly.
# Parameters:
@@ -7659,7 +7242,7 @@ sub get_symb_from_alias {
sub definerole {
if (allowed('mcr','/')) {
- my ($rolename,$sysrole,$domrole,$courole,$uname,$udom)=@_;
+ my ($rolename,$sysrole,$domrole,$courole)=@_;
foreach my $role (split(':',$sysrole)) {
my ($crole,$cqual)=split(/\&/,$role);
if ($pr{'cr:s'}!~/\Q$crole\E/) { return "refused:s:$crole"; }
@@ -7687,19 +7270,11 @@ sub definerole {
}
}
}
- my $uhome;
- if (($uname ne '') && ($udom ne '')) {
- $uhome = &homeserver($uname,$udom);
- return $uhome if ($uhome eq 'no_host');
- } else {
- $uname = $env{'user.name'};
- $udom = $env{'user.domain'};
- $uhome = $env{'user.home'};
- }
my $command="encrypt:rolesput:$env{'user.domain'}:$env{'user.name'}:".
- "$udom:$uname:rolesdef_$rolename=".
+ "$env{'user.domain'}:$env{'user.name'}:".
+ "rolesdef_$rolename=".
escape($sysrole.'_'.$domrole.'_'.$courole);
- return reply($command,$uhome);
+ return reply($command,$env{'user.home'});
} else {
return 'refused';
}
@@ -7708,23 +7283,19 @@ sub definerole {
# ---------------- Make a metadata query against the network of library servers
sub metadata_query {
- my ($query,$custom,$customshow,$server_array,$domains_hash)=@_;
+ my ($query,$custom,$customshow,$server_array)=@_;
my %rhash;
my %libserv = &all_library();
my @server_list = (defined($server_array) ? @$server_array
: keys(%libserv) );
for my $server (@server_list) {
- my $domains = '';
- if (ref($domains_hash) eq 'HASH') {
- $domains = $domains_hash->{$server};
- }
unless ($custom or $customshow) {
- my $reply=&reply("querysend:".&escape($query).':::'.&escape($domains),$server);
+ my $reply=&reply("querysend:".&escape($query),$server);
$rhash{$server}=$reply;
}
else {
my $reply=&reply("querysend:".&escape($query).':'.
- &escape($custom).':'.&escape($customshow).':'.&escape($domains),
+ &escape($custom).':'.&escape($customshow),
$server);
$rhash{$server}=$reply;
}
@@ -7781,12 +7352,10 @@ sub update_allusers_table {
sub fetch_enrollment_query {
my ($context,$affiliatesref,$replyref,$dom,$cnum) = @_;
- my ($homeserver,$sleep,$loopmax);
+ my $homeserver;
my $maxtries = 1;
if ($context eq 'automated') {
$homeserver = $perlvar{'lonHostID'};
- $sleep = 2;
- $loopmax = 100;
$maxtries = 10; # will wait for up to 2000s for retrieval of classlist data before timeout
} else {
$homeserver = &homeserver($cnum,$dom);
@@ -7804,17 +7373,17 @@ sub fetch_enrollment_query {
&logthis('fetch_enrollment_query: invalid queryid: '.$queryid.' for host: '.$host.' and homeserver: '.$homeserver.' context: '.$context.' '.$cnum);
return 'error: '.$queryid;
}
- my $reply = &get_query_reply($queryid,$sleep.$loopmax);
+ my $reply = &get_query_reply($queryid);
my $tries = 1;
while (($reply=~/^timeout/) && ($tries < $maxtries)) {
- $reply = &get_query_reply($queryid,$sleep,$loopmax);
+ $reply = &get_query_reply($queryid);
$tries ++;
}
if ( ($reply =~/^timeout/) || ($reply =~/^error/) ) {
&logthis('fetch_enrollment_query error: '.$reply.' for '.$dom.' '.$env{'user.name'}.' for '.$queryid.' context: '.$context.' '.$cnum.' maxtries: '.$maxtries.' tries: '.$tries);
} else {
my @responses = split(/:/,$reply);
- if (grep { $_ eq $homeserver } ¤t_machine_ids()) {
+ if ($homeserver eq $perlvar{'lonHostID'}) {
foreach my $line (@responses) {
my ($key,$value) = split(/=/,$line,2);
$$replyref{$key} = $value;
@@ -7849,17 +7418,11 @@ sub fetch_enrollment_query {
}
sub get_query_reply {
- my ($queryid,$sleep,$loopmax) = @_;
- if (($sleep eq '') || ($sleep !~ /^\d+\.?\d*$/)) {
- $sleep = 0.2;
- }
- if (($loopmax eq '') || ($loopmax =~ /\D/)) {
- $loopmax = 100;
- }
+ my $queryid=shift;
my $replyfile=LONCAPA::tempdir().$queryid;
my $reply='';
- for (1..$loopmax) {
- sleep($sleep);
+ for (1..100) {
+ sleep 2;
if (-e $replyfile.'.end') {
if (open(my $fh,$replyfile)) {
$reply = join('',<$fh>);
@@ -8221,20 +7784,17 @@ sub auto_courserequest_checks {
}
sub auto_courserequest_validation {
- my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist,$custominfo) = @_;
+ my ($dom,$owner,$crstype,$inststatuslist,$instcode,$instseclist) = @_;
my ($homeserver,$response);
if ($dom =~ /^$match_domain$/) {
$homeserver = &domain($dom,'primary');
}
- unless ($homeserver eq 'no_host') {
- my $customdata;
- if (ref($custominfo) eq 'HASH') {
- $customdata = &freeze_escape($custominfo);
- }
+ unless ($homeserver eq 'no_host') {
+
$response=&unescape(&reply('autocrsreqvalidation:'.$dom.':'.&escape($owner).
':'.&escape($crstype).':'.&escape($inststatuslist).
- ':'.&escape($instcode).':'.&escape($instseclist).':'.
- $customdata,$homeserver));
+ ':'.&escape($instcode).':'.&escape($instseclist),
+ $homeserver));
}
return $response;
}
@@ -8253,135 +7813,6 @@ sub auto_validate_class_sec {
return $response;
}
-sub auto_crsreq_update {
- my ($cdom,$cnum,$crstype,$action,$ownername,$ownerdomain,$fullname,$title,
- $code,$accessstart,$accessend,$inbound) = @_;
- my ($homeserver,%crsreqresponse);
- if ($cdom =~ /^$match_domain$/) {
- $homeserver = &domain($cdom,'primary');
- }
- unless (($homeserver eq 'no_host') || ($homeserver eq '')) {
- my $info;
- if (ref($inbound) eq 'HASH') {
- $info = &freeze_escape($inbound);
- }
- my $response=&reply('autocrsrequpdate:'.$cdom.':'.$cnum.':'.&escape($crstype).
- ':'.&escape($action).':'.&escape($ownername).':'.
- &escape($ownerdomain).':'.&escape($fullname).':'.
- &escape($title).':'.&escape($code).':'.
- &escape($accessstart).':'.&escape($accessend).':'.$info,$homeserver);
- unless ($response =~ /(con_lost|error|no_such_host|refused)/) {
- my @items = split(/&/,$response);
- foreach my $item (@items) {
- my ($key,$value) = split('=',$item);
- $crsreqresponse{&unescape($key)} = &thaw_unescape($value);
- }
- }
- }
- return \%crsreqresponse;
-}
-
-sub auto_export_grades {
- my ($cdom,$cnum,$inforef,$gradesref) = @_;
- my ($homeserver,%exportresponse);
- if ($cdom =~ /^$match_domain$/) {
- $homeserver = &domain($cdom,'primary');
- }
- unless (($homeserver eq 'no_host') || ($homeserver eq '')) {
- my $info;
- if (ref($inforef) eq 'HASH') {
- $info = &freeze_escape($inforef);
- }
- if (ref($gradesref) eq 'HASH') {
- my $grades = &freeze_escape($gradesref);
- my $response=&reply('encrypt:autoexportgrades:'.$cdom.':'.$cnum.':'.
- $info.':'.$grades,$homeserver);
- unless ($response =~ /(con_lost|error|no_such_host|refused|unknown_command)/) {
- my @items = split(/&/,$response);
- foreach my $item (@items) {
- my ($key,$value) = split('=',$item);
- $exportresponse{&unescape($key)} = &thaw_unescape($value);
- }
- }
- }
- }
- return \%exportresponse;
-}
-
-sub check_instcode_cloning {
- my ($codedefaults,$code_order,$cloner,$clonefromcode,$clonetocode) = @_;
- unless ((ref($codedefaults) eq 'HASH') && (ref($code_order) eq 'ARRAY')) {
- return;
- }
- my $canclone;
- if (@{$code_order} > 0) {
- my $instcoderegexp ='^';
- my @clonecodes = split(/\&/,$cloner);
- foreach my $item (@{$code_order}) {
- if (grep(/^\Q$item\E=/,@clonecodes)) {
- foreach my $pair (@clonecodes) {
- my ($key,$val) = split(/\=/,$pair,2);
- $val = &unescape($val);
- if ($key eq $item) {
- $instcoderegexp .= '('.$val.')';
- last;
- }
- }
- } else {
- $instcoderegexp .= $codedefaults->{$item};
- }
- }
- $instcoderegexp .= '$';
- my (@from,@to);
- eval {
- (@from) = ($clonefromcode =~ /$instcoderegexp/);
- (@to) = ($clonetocode =~ /$instcoderegexp/);
- };
- if ((@from > 0) && (@to > 0)) {
- my @diffs = &Apache::loncommon::compare_arrays(\@from,\@to);
- if (!@diffs) {
- $canclone = 1;
- }
- }
- }
- return $canclone;
-}
-
-sub default_instcode_cloning {
- my ($clonedom,$domdefclone,$clonefromcode,$clonetocode,$codedefaultsref,$codeorderref) = @_;
- my (%codedefaults,@code_order,$canclone);
- if ((ref($codedefaultsref) eq 'HASH') && (ref($codeorderref) eq 'ARRAY')) {
- %codedefaults = %{$codedefaultsref};
- @code_order = @{$codeorderref};
- } elsif ($clonedom) {
- &auto_instcode_defaults($clonedom,\%codedefaults,\@code_order);
- }
- if (($domdefclone) && (@code_order)) {
- my @clonecodes = split(/\+/,$domdefclone);
- my $instcoderegexp ='^';
- foreach my $item (@code_order) {
- if (grep(/^\Q$item\E$/,@clonecodes)) {
- $instcoderegexp .= '('.$codedefaults{$item}.')';
- } else {
- $instcoderegexp .= $codedefaults{$item};
- }
- }
- $instcoderegexp .= '$';
- my (@from,@to);
- eval {
- (@from) = ($clonefromcode =~ /$instcoderegexp/);
- (@to) = ($clonetocode =~ /$instcoderegexp/);
- };
- if ((@from > 0) && (@to > 0)) {
- my @diffs = &Apache::loncommon::compare_arrays(\@from,\@to);
- if (!@diffs) {
- $canclone = 1;
- }
- }
- }
- return $canclone;
-}
-
# ------------------------------------------------------- Course Group routines
sub get_coursegroups {
@@ -8650,7 +8081,7 @@ sub assignrole {
}
}
} elsif ($context eq 'requestauthor') {
- if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'}) &&
+ if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'}) &&
($url eq '/'.$udom.'/') && ($role eq 'au')) {
if ($env{'environment.requestauthor'} eq 'automatic') {
$refused = '';
@@ -8658,13 +8089,13 @@ sub assignrole {
my %domdefaults = &get_domain_defaults($udom);
if (ref($domdefaults{'requestauthor'}) eq 'HASH') {
my $checkbystatus;
- if ($env{'user.adv'}) {
+ if ($env{'user.adv'}) {
my $disposition = $domdefaults{'requestauthor'}{'_LC_adv'};
if ($disposition eq 'automatic') {
$refused = '';
} elsif ($disposition eq '') {
$checkbystatus = 1;
- }
+ }
} else {
$checkbystatus = 1;
}
@@ -8746,12 +8177,12 @@ sub assignrole {
&courserolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,
$selfenroll,$context);
} elsif (($role eq 'li') || ($role eq 'dg') || ($role eq 'sc') ||
- ($role eq 'au') || ($role eq 'dc') || ($role eq 'dh')) {
+ ($role eq 'au') || ($role eq 'dc')) {
&domainrolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,
$context);
} elsif (($role eq 'ca') || ($role eq 'aa')) {
&coauthorrolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,
- $context);
+ $context);
}
if ($role eq 'cc') {
&autoupdate_coowners($url,$end,$start,$uname,$udom);
@@ -9051,7 +8482,7 @@ sub modifyuser {
sub modifystudent {
my ($udom,$uname,$uid,$umode,$upass,$first,$middle,$last,$gene,$usec,
$end,$start,$forceid,$desiredhome,$email,$type,$locktype,$cid,
- $selfenroll,$context,$inststatus,$credits,$instsec)=@_;
+ $selfenroll,$context,$inststatus,$credits)=@_;
if (!$cid) {
unless ($cid=$env{'request.course.id'}) {
return 'not_in_class';
@@ -9063,17 +8494,17 @@ sub modifystudent {
$desiredhome,$email,$inststatus);
unless ($reply eq 'ok') { return $reply; }
# This will cause &modify_student_enrollment to get the uid from the
- # student's environment
+ # students environment
$uid = undef if (!$forceid);
$reply = &modify_student_enrollment($udom,$uname,$uid,$first,$middle,$last,
- $gene,$usec,$end,$start,$type,$locktype,
- $cid,$selfenroll,$context,$credits,$instsec);
+ $gene,$usec,$end,$start,$type,$locktype,
+ $cid,$selfenroll,$context,$credits);
return $reply;
}
sub modify_student_enrollment {
my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,
- $locktype,$cid,$selfenroll,$context,$credits,$instsec) = @_;
+ $locktype,$cid,$selfenroll,$context,$credits) = @_;
my ($cdom,$cnum,$chome);
if (!$cid) {
unless ($cid=$env{'request.course.id'}) {
@@ -9120,7 +8551,7 @@ sub modify_student_enrollment {
my %old_entry = &Apache::lonnet::get('classlist',[$user],$cdom,$cnum);
my $reply=cput('classlist',
{$user =>
- join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype,$credits,$instsec) },
+ join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype,$credits) },
$cdom,$cnum);
if (($reply eq 'ok') || ($reply eq 'delayed')) {
&devalidate_getsection_cache($udom,$uname,$cid);
@@ -9644,9 +9075,9 @@ sub modify_access_controls {
my $tries = 0;
my $gotlock = &newput('file_permissions',$lockhash,$domain,$user);
- while (($gotlock ne 'ok') && $tries < 10) {
+ while (($gotlock ne 'ok') && $tries <3) {
$tries ++;
- sleep(0.1);
+ sleep 1;
$gotlock = &newput('file_permissions',$lockhash,$domain,$user);
}
if ($gotlock eq 'ok') {
@@ -9939,23 +9370,7 @@ sub dirlist {
foreach my $user (sort(keys(%allusers))) {
push(@alluserslist,$user.'&user');
}
- if (!%listerror) {
- # no errors
- return (\@alluserslist);
- } elsif (scalar(keys(%servers)) == 1) {
- # one library server, one error
- my ($key) = keys(%listerror);
- return (\@alluserslist, $listerror{$key});
- } elsif ( grep { $_ eq 'con_lost' } values(%listerror) ) {
- # con_lost indicates that we might miss data from at least one
- # library server
- return (\@alluserslist, 'con_lost');
- } else {
- # multiple library servers and no con_lost -> data should be
- # complete.
- return (\@alluserslist);
- }
-
+ return (\@alluserslist);
} else {
return ([],'missing username');
}
@@ -10172,12 +9587,10 @@ sub get_userresdata {
}
#error 2 occurs when the .db doesn't exist
if ($tmp!~/error: 2 /) {
- if ((!defined($cached)) || ($tmp ne 'con_lost')) {
- &logthis("<font color=\"blue\">WARNING:".
- " Trying to get resource data for ".
- $uname." at ".$udom.": ".
- $tmp."</font>");
- }
+ &logthis("<font color=\"blue\">WARNING:".
+ " Trying to get resource data for ".
+ $uname." at ".$udom.": ".
+ $tmp."</font>");
} elsif ($tmp=~/error: 2 /) {
#&EXT_cache_set($udom,$uname);
&do_cache_new('userres',$hashid,undef,600);
@@ -10217,26 +9630,6 @@ sub resdata {
return undef;
}
-sub get_numsuppfiles {
- my ($cnum,$cdom,$ignorecache)=@_;
- my $hashid=$cnum.':'.$cdom;
- my ($suppcount,$cached);
- unless ($ignorecache) {
- ($suppcount,$cached) = &is_cached_new('suppcount',$hashid);
- }
- unless (defined($cached)) {
- my $chome=&homeserver($cnum,$cdom);
- unless ($chome eq 'no_host') {
- ($suppcount,my $errors) = (0,0);
- my $suppmap = 'supplemental.sequence';
- ($suppcount,$errors) =
- &Apache::loncommon::recurse_supplemental($cnum,$cdom,$suppmap,$suppcount,$errors);
- }
- &do_cache_new('suppcount',$hashid,$suppcount,600);
- }
- return $suppcount;
-}
-
#
# EXT resource caching routines
#
@@ -10424,7 +9817,7 @@ sub EXT {
$courseid = $cid;
}
if (($symbparm && $courseid) &&
- (($courseid eq $env{'request.course.id'}) || ($courseid eq $cid))) {
+ (($courseid eq $env{'request.course.id'}) || ($courseid eq $cid))) {
#print '<br>'.$space.' - '.$qualifier.' - '.$spacequalifierrest;
@@ -10675,7 +10068,7 @@ sub metadata {
($uri =~ m|/$|) || ($uri =~ m|/.meta$|) || ($uri =~ m{^/*uploaded/.+\.sequence$})) {
return undef;
}
- if (($uri =~ /^priv/ || $uri=~m{^home/httpd/html/priv})
+ if (($uri =~ /^priv/ || $uri=~/home\/httpd\/html\/priv/)
&& &Apache::lonxml::get_state('target') =~ /^(|meta)$/) {
return undef;
}
@@ -10936,7 +10329,7 @@ sub metadata {
$metaentry{':keys'} = join(',',keys(%metathesekeys));
&metadata_generate_part0(\%metathesekeys,\%metaentry,$uri);
- $metaentry{':allpossiblekeys'}=join(',',keys(%metathesekeys));
+ $metaentry{':allpossiblekeys'}=join(',',keys %metathesekeys);
&do_cache_new('meta',$uri,\%metaentry,$cachetime);
# this is the end of "was not already recently cached
}
@@ -11212,7 +10605,7 @@ sub symbverify {
$ids=$bighash{'ids_'.&clutter($thisurl)};
}
unless ($ids) {
- my $idkey = 'ids_'.($thisurl =~ m{^/}? '' : '/').$thisurl;
+ my $idkey = 'ids_'.($thisurl =~ m{^/}? '' : '/').$thisurl;
$ids=$bighash{$idkey};
}
if ($ids) {
@@ -11228,14 +10621,14 @@ sub symbverify {
if (ref($encstate)) {
$$encstate = $bighash{'encrypted_'.$id};
}
- if (($env{'request.role.adv'}) ||
- ($bighash{'encrypted_'.$id} eq $env{'request.enc'}) ||
+ if (($env{'request.role.adv'}) ||
+ ($bighash{'encrypted_'.$id} eq $env{'request.enc'}) ||
($thisurl eq '/adm/navmaps')) {
- $okay=1;
+ $okay=1;
last;
- }
- }
- }
+ }
+ }
+ }
}
untie(%bighash);
}
@@ -11307,21 +10700,19 @@ sub deversion {
# ------------------------------------------------------ Return symb list entry
sub symbread {
- my ($thisfn,$donotrecurse,$ignorecachednull,$checkforblock,$possibles)=@_;
- my $cache_str='request.symbread.cached.'.$thisfn;
- if (defined($env{$cache_str})) {
- if ($ignorecachednull) {
- return $env{$cache_str} unless ($env{$cache_str} eq '');
- } else {
+ my ($thisfn,$donotrecurse)=@_;
+ my $cache_str;
+ if ($thisfn ne '') {
+ $cache_str='request.symbread.cached.'.$thisfn;
+ if ($env{$cache_str} ne '') {
return $env{$cache_str};
}
- }
+ } else {
# no filename provided? try from environment
- unless ($thisfn) {
if ($env{'request.symb'}) {
- return $env{$cache_str}=&symbclean($env{'request.symb'});
- }
- $thisfn=$env{'request.filename'};
+ return $env{$cache_str}=&symbclean($env{'request.symb'});
+ }
+ $thisfn=$env{'request.filename'};
}
if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
# is that filename actually a symb? Verify, clean, and return
@@ -11377,46 +10768,18 @@ sub symbread {
my ($mapid,$resid)=split(/\./,$ids);
$syval=&encode_symb($bighash{'map_id_'.$mapid},
$resid,$thisfn);
- if (ref($possibles) eq 'HASH') {
- $possibles->{$syval} = 1;
- }
- if ($checkforblock) {
- my @blockers = &has_comm_blocking('bre',$syval,$bighash{'src_'.$ids});
- if (@blockers) {
- $syval = '';
- return;
- }
- }
- } elsif ((!$donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) {
+ } elsif (!$donotrecurse) {
# ------------------------------------------ There is more than one possibility
my $realpossible=0;
foreach my $id (@possibilities) {
my $file=$bighash{'src_'.$id};
- my $canaccess;
- if (($donotrecurse) || ($checkforblock) || (ref($possibles) eq 'HASH')) {
- $canaccess = 1;
- } else {
- $canaccess = &allowed('bre',$file);
- }
- if ($canaccess) {
- my ($mapid,$resid)=split(/\./,$id);
- if ($bighash{'map_type_'.$mapid} ne 'page') {
- my $poss_syval=&encode_symb($bighash{'map_id_'.$mapid},
- $resid,$thisfn);
- if (ref($possibles) eq 'HASH') {
- $possibles->{$syval} = 1;
- }
- if ($checkforblock) {
- my @blockers = &has_comm_blocking('bre',$poss_syval,$file);
- unless (@blockers > 0) {
- $syval = $poss_syval;
- $realpossible++;
- }
- } else {
- $syval = $poss_syval;
- $realpossible++;
- }
- }
+ if (&allowed('bre',$file)) {
+ my ($mapid,$resid)=split(/\./,$id);
+ if ($bighash{'map_type_'.$mapid} ne 'page') {
+ $realpossible++;
+ $syval=&encode_symb($bighash{'map_id_'.$mapid},
+ $resid,$thisfn);
+ }
}
}
if ($realpossible!=1) { $syval=''; }
@@ -11424,7 +10787,7 @@ sub symbread {
$syval='';
}
}
- untie(%bighash);
+ untie(%bighash)
}
}
if ($syval) {
@@ -11577,6 +10940,7 @@ sub rndseed {
$which =&get_rand_alg($courseid);
}
if (defined(&getCODE())) {
+
if ($which eq '64bit5') {
return &rndseed_CODE_64bit5($symb,$courseid,$domain,$username);
} elsif ($which eq '64bit4') {
@@ -11762,12 +11126,8 @@ sub rndseed_CODE_64bit5 {
sub setup_random_from_rndseed {
my ($rndseed)=@_;
if ($rndseed =~/([,:])/) {
- my ($num1,$num2) = map { abs($_); } (split(/[,:]/,$rndseed));
- if ((!$num1) || (!$num2) || ($num1 > 2147483562) || ($num2 > 2147483398)) {
- &Math::Random::random_set_seed_from_phrase($rndseed);
- } else {
- &Math::Random::random_set_seed($num1,$num2);
- }
+ my ($num1,$num2)=split(/[,:]/,$rndseed);
+ &Math::Random::random_set_seed(abs($num1),abs($num2));
} else {
&Math::Random::random_set_seed_from_phrase($rndseed);
}
@@ -12158,9 +11518,7 @@ sub default_login_domain {
sub declutter {
my $thisfn=shift;
if ($thisfn=~m|^/enc/|) { $thisfn=&Apache::lonenc::unencrypted($thisfn); }
- unless ($thisfn=~m{^/home/httpd/html/priv/}) {
- $thisfn=~s{^/home/httpd/html}{};
- }
+ $thisfn=~s/^\Q$perlvar{'lonDocRoot'}\E//;
$thisfn=~s/^\///;
$thisfn=~s|^adm/wrapper/||;
$thisfn=~s|^adm/coursedocs/showdoc/||;
@@ -12287,7 +11645,7 @@ sub get_dns {
$alldns{$host} = $protocol;
}
while (%alldns) {
- my ($dns) = sort { $b cmp $a } keys(%alldns);
+ my ($dns) = keys(%alldns);
my $ua=new LWP::UserAgent;
$ua->timeout(30);
my $request=new HTTP::Request('GET',"$alldns{$dns}://$dns$url");
@@ -12295,9 +11653,9 @@ sub get_dns {
delete($alldns{$dns});
next if ($response->is_error());
my @content = split("\n",$response->content);
- unless ($nocache) {
+ unless ($nocache) {
&do_cache_new('dns',$url,\@content,30*24*60*60);
- }
+ }
&$func(\@content,$hashref);
return;
}
@@ -12313,37 +11671,36 @@ sub get_dns {
# ------------------------------------------------------Get DNS checksums file
sub parse_dns_checksums_tab {
my ($lines,$hashref) = @_;
- my $lonhost = $perlvar{'lonHostID'};
- my $machine_dom = &Apache::lonnet::host_domain($lonhost);
+ my $machine_dom = &Apache::lonnet::host_domain($perlvar{'lonHostID'});
my $loncaparev = &get_server_loncaparev($machine_dom);
- my $distro = (split(/\:/,&get_server_distarch($lonhost)))[0];
- my $webconfdir = '/etc/httpd/conf';
- if ($distro =~ /^(ubuntu|debian)(\d+)$/) {
- $webconfdir = '/etc/apache2';
- } elsif ($distro =~ /^sles(\d+)$/) {
- if ($1 >= 10) {
- $webconfdir = '/etc/apache2';
- }
- } elsif ($distro =~ /^suse(\d+\.\d+)$/) {
- if ($1 >= 10.0) {
- $webconfdir = '/etc/apache2';
- }
- }
my ($release,$timestamp) = split(/\-/,$loncaparev);
my (%chksum,%revnum);
if (ref($lines) eq 'ARRAY') {
chomp(@{$lines});
- my $version = shift(@{$lines});
- if ($version eq $release) {
+ my $versions = shift(@{$lines});
+ my %supported;
+ if ($versions =~ /^VERSIONS\:([\w\.\,]+)$/) {
+ my $releaseslist = $1;
+ if ($releaseslist =~ /,/) {
+ map { $supported{$_} = 1; } split(/,/,$releaseslist);
+ } elsif ($releaseslist) {
+ $supported{$releaseslist} = 1;
+ }
+ }
+ if ($supported{$release}) {
+ my $matchthis = 0;
foreach my $line (@{$lines}) {
- my ($file,$version,$shasum) = split(/,/,$line);
- if ($file =~ m{^/etc/httpd/conf}) {
- if ($webconfdir eq '/etc/apache2') {
- $file =~ s{^\Q/etc/httpd/conf/\E}{$webconfdir/};
+ if ($line =~ /^(\d[\w\.]+)$/) {
+ if ($matchthis) {
+ last;
+ } elsif ($1 eq $release) {
+ $matchthis = 1;
}
+ } elsif ($matchthis) {
+ my ($file,$version,$shasum) = split(/,/,$line);
+ $chksum{$file} = $shasum;
+ $revnum{$file} = $version;
}
- $chksum{$file} = $shasum;
- $revnum{$file} = $version;
}
if (ref($hashref) eq 'HASH') {
%{$hashref} = (
@@ -12357,11 +11714,8 @@ sub parse_dns_checksums_tab {
}
sub fetch_dns_checksums {
- my %checksums;
- my $machine_dom = &Apache::lonnet::host_domain($perlvar{'lonHostID'});
- my $loncaparev = &get_server_loncaparev($machine_dom,$perlvar{'lonHostID'});
- my ($release,$timestamp) = split(/\-/,$loncaparev);
- &get_dns("/adm/dns/checksums/$release",\&parse_dns_checksums_tab,1,1,
+ my %checksums;
+ &get_dns('/adm/dns/checksums',\&parse_dns_checksums_tab,1,1,
\%checksums);
return \%checksums;
}
@@ -12394,8 +11748,8 @@ sub fetch_dns_checksums {
}
sub load_domain_tab {
- my ($ignore_cache,$nocache) = @_;
- &get_dns('/adm/dns/domain',\&parse_domain_tab,$ignore_cache,$nocache);
+ my ($ignore_cache) = @_;
+ &get_dns('/adm/dns/domain',\&parse_domain_tab,$ignore_cache);
my $fh;
if (open($fh,"<".$perlvar{'lonTabDir'}.'/domain.tab')) {
my @lines = <$fh>;
@@ -12481,8 +11835,8 @@ sub fetch_dns_checksums {
}
sub load_hosts_tab {
- my ($ignore_cache,$nocache) = @_;
- &get_dns('/adm/dns/hosts',\&parse_hosts_tab,$ignore_cache,$nocache);
+ my ($ignore_cache) = @_;
+ &get_dns('/adm/dns/hosts',\&parse_hosts_tab,$ignore_cache);
open(my $config,"<$perlvar{'lonTabDir'}/hosts.tab");
my @config = <$config>;
&parse_hosts_tab(\@config);
@@ -12504,8 +11858,7 @@ sub fetch_dns_checksums {
}
sub all_names {
- my ($ignore_cache,$nocache) = @_;
- &load_hosts_tab($ignore_cache,$nocache) if (!$loaded);
+ &load_hosts_tab() if (!$loaded);
return %name_to_host;
}
@@ -12627,7 +11980,7 @@ sub fetch_dns_checksums {
}
sub get_iphost {
- my ($ignore_cache,$nocache) = @_;
+ my ($ignore_cache) = @_;
if (!$ignore_cache) {
if (%iphost) {
@@ -12651,7 +12004,7 @@ sub fetch_dns_checksums {
%old_name_to_ip = %{$ip_info->[1]};
}
- my %name_to_host = &all_names($ignore_cache,$nocache);
+ my %name_to_host = &all_names();
foreach my $name (keys(%name_to_host)) {
my $ip;
if (!exists($name_to_ip{$name})) {
@@ -12676,11 +12029,9 @@ sub fetch_dns_checksums {
}
push(@{$iphost{$ip}},@{$name_to_host{$name}});
}
- unless ($nocache) {
- &do_cache_new('iphost','iphost',
- [\%iphost,\%name_to_ip,\%lonid_to_ip],
- 48*60*60);
- }
+ &do_cache_new('iphost','iphost',
+ [\%iphost,\%name_to_ip,\%lonid_to_ip],
+ 48*60*60);
return %iphost;
}
@@ -12742,12 +12093,12 @@ sub fetch_dns_checksums {
}
sub all_loncaparevs {
- return qw(1.1 1.2 1.3 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10 2.11);
+ return qw(1.1 1.2 1.3 2.0 2.1 2.2 2.3 2.4 2.5 2.6 2.7 2.8 2.9 2.10);
}
-# ------------------------------------------------------- Read loncaparev table
+# ---------------------------------------------------------- Read loncaparev table
{
- sub load_loncaparevs {
+ sub load_loncaparevs {
if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") {
if (open(my $config,"<$perlvar{'lonTabDir'}/loncaparevs.tab")) {
while (my $configline=<$config>) {
@@ -12761,7 +12112,7 @@ sub all_loncaparevs {
}
}
-# ----------------------------------------------------- Read serverhostID table
+# ---------------------------------------------------------- Read serverhostID table
{
sub load_serverhomeIDs {
if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") {
@@ -12853,11 +12204,11 @@ BEGIN {
close($config);
}
-# --------------------------------------------------------- Read loncaparev table
+# ---------------------------------------------------------- Read loncaparev table
&load_loncaparevs();
-# ------------------------------------------------------- Read serverhostID table
+# ---------------------------------------------------------- Read serverhostID table
&load_serverhomeIDs();
@@ -12920,6 +12271,17 @@ $readit=1;
if ($test != 0) { $_64bit=1; } else { $_64bit=0; }
&logthis(" Detected 64bit platform ($_64bit)");
}
+
+ {
+ eval {
+ ($apache) =
+ (Apache2::ServerUtil::get_server_version() =~ m{Apache/(\d+\.\d+)});
+ };
+ if ($@) {
+ $apache = 1.3;
+ }
+ }
+
}
}
@@ -13061,7 +12423,7 @@ were new keys. I.E. 1:foo will become 1:
Calling convention:
my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$uname);
- &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname,$laststore);
+ &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname);
For more detailed information, see lonnet specific documentation.
@@ -13197,29 +12559,13 @@ escaped strings of the action recorded i
=item *
-allowed($priv,$uri,$symb,$role,$clientip,$noblockcheck) : check for a user privilege;
-returns codes for allowed actions.
-
-The first argument is required, all others are optional.
-
-$priv is the privilege being checked.
-$uri contains additional information about what is being checked for access (e.g.,
-URL, course ID etc.).
-$symb is the unique resource instance identifier in a course; if needed,
-but not provided, it will be retrieved via a call to &symbread().
-$role is the role for which a priv is being checked (only used if priv is evb).
-$clientip is the user's IP address (only used when checking for access to portfolio
-files).
-$noblockcheck, if true, skips calls to &has_comm_blocking() for the bre priv. This
-prevents recursive calls to &allowed.
-
+allowed($priv,$uri,$symb,$role) : check for a user privilege; returns codes for allowed actions
F: full access
U,I,K: authentication modes (cxx only)
'': forbidden
1: user needs to choose course
2: browse allowed
A: passphrase authentication needed
- B: access temporarily blocked because of a blocking event in a course.
=item *
@@ -13238,10 +12584,9 @@ in which case the null string is returne
=item *
-definerole($rolename,$sysrole,$domrole,$courole,$uname,$udom) : define role;
-define a custom role rolename set privileges in format of lonTabs/roles.tab
-for system, domain, and course level. $uname and $udom are optional (current
-user's username and domain will be used when either of $uname or $udom are absent.
+definerole($rolename,$sysrole,$domrole,$courole) : define role; define a custom
+role rolename set privileges in format of lonTabs/roles.tab for system, domain,
+and course level
=item *
@@ -13272,9 +12617,9 @@ provided for types, will default to retu
=item *
in_course($udom,$uname,$cdom,$cnum,$type,$hideprivileged) : determine if
-user: $uname:$udom has a role in the course: $cdom_$cnum.
+user: $uname:$udom has a role in the course: $cdom_$cnum.
-Additional optional arguments are: $type (if role checking is to be restricted
+Additional optional arguments are: $type (if role checking is to be restricted
to certain user status types -- previous (expired roles), active (currently
available roles) or future (roles available in the future), and
$hideprivileged -- if true will not report course roles for users who
@@ -13345,8 +12690,8 @@ or when Autoupdate.pl is run by cron in
modifystudent
modify a student's enrollment and identification information.
-The course id is resolved based on the current user's environment.
-This means the invoking user must be a course coordinator or otherwise
+The course id is resolved based on the current users environment.
+This means the envoking user must be a course coordinator or otherwise
associated with a course.
This call is essentially a wrapper for lonnet::modifyuser and
@@ -13406,20 +12751,20 @@ Inputs:
modify_student_enrollment
-Change a student's enrollment status in a class. The environment variable
+Change a students enrollment status in a class. The environment variable
'role.request.course' must be defined for this function to proceed.
Inputs:
=over 4
-=item $udom, student's domain
+=item $udom, students domain
-=item $uname, student's name
+=item $uname, students name
-=item $uid, student's user id
+=item $uid, students user id
-=item $first, student's first name
+=item $first, students first name
=item $middle
@@ -13445,8 +12790,6 @@ Inputs:
=item $credits, number of credits student will earn from this class
-=item $instsec, institutional course section code for student
-
=back
@@ -13503,7 +12846,7 @@ If defined, the supplied username is use
resdata($name,$domain,$type,@which) : request for current parameter
setting for a specific $type, where $type is either 'course' or 'user',
@what should be a list of parameters to ask about. This routine caches
-answers for 10 minutes.
+answers for 5 minutes.
=item *
@@ -13512,10 +12855,6 @@ data base, returning a hash that is keye
values that are the resource value. I believe that the timestamps and
versions are also returned.
-get_numsuppfiles($cnum,$cdom) : retrieve number of files in a course's
-supplemental content area. This routine caches the number of files for
-10 minutes.
-
=back
=head2 Course Modification
@@ -13616,20 +12955,7 @@ will be stored for query
=item *
-symbread($filename,$donotrecurse,$ignorecachednull,$checkforblock,$possibles) :
-return symbolic list entry (all arguments optional).
-
-Args: filename is the filename (including path) for the file for which a symb
-is required; donotrecurse, if true will prevent calls to allowed() being made
-to check access status if more than one resource was found in the bighash
-(see rev. 1.249) to avoid an infinite loop if an ambiguous resource is part of
-a randompick); ignorecachednull, if true will prevent a symb of '' being
-returned if $env{$cache_str} is defined as ''; checkforblock if true will
-cause possible symbs to be checked to determine if they are subject to content
-blocking, if so they will not be included as possible symbs; possibles is a
-ref to a hash, which, as a side effect, will be populated with all possible
-symbs (content blocking not tested).
-
+symbread($filename) : return symbolic list entry (filename argument optional);
returns the data handle
=item *
@@ -13639,9 +12965,9 @@ and is a possible symb for the URL in $t
resource that the user accessed using /enc/ returns a 1 on success, 0
on failure, user must be in a course, as it assumes the existence of
the course initial hash, and uses $env('request.course.id'}. The third
-arg is an optional reference to a scalar. If this arg is passed in the
+arg is an optional reference to a scalar. If this arg is passed in the
call to symbverify, it will be set to 1 if the symb has been set to be
-encrypted; otherwise it will be null.
+encrypted; otherwise it will be null.
=item *
@@ -13694,13 +13020,13 @@ expirespread($uname,$udom,$stype,$usymb)
devalidate($symb) : devalidate temporary spreadsheet calculations,
forcing spreadsheet to reevaluate the resource scores next time.
-=item *
+=item *
can_edit_resource($file,$cnum,$cdom,$resurl,$symb,$group) : determine if current user can edit a particular resource,
when viewing in course context.
input: six args -- filename (decluttered), course number, course domain,
- url, symb (if registered) and group (if this is a
+ url, symb (if registered) and group (if this is a
group item -- e.g., bulletin board, group page etc.).
output: array of five scalars --
@@ -13708,15 +13034,15 @@ when viewing in course context.
$home -- homeserver of resource (i.e., for author if published,
or course if uploaded.).
$switchserver -- 1 if server switch will be needed.
- $forceedit -- 1 if icon/link should be to go to edit mode
+ $forceedit -- 1 if icon/link should be to go to edit mode
$forceview -- 1 if icon/link should be to go to view mode
=item *
is_course_upload($file,$cnum,$cdom)
-Used in course context to determine if current file was uploaded to
-the course (i.e., would be found in /userfiles/docs on the course's
+Used in course context to determine if current file was uploaded to
+the course (i.e., would be found in /userfiles/docs on the course's
homeserver.
input: 3 args -- filename (decluttered), course number and course domain.
@@ -13730,21 +13056,15 @@ homeserver.
=item *
-store($storehash,$symb,$namespace,$udom,$uname,$laststore) : stores hash
-permanently for this url; hashref needs to be given and should be a \%hashname;
-the remaining args aren't required and if they aren't passed or are '' they will
-be derived from the env (with the exception of $laststore, which is an
-optional arg used when a user's submission is stored in grading).
-$laststore is $version=$timestamp, where $version is the most recent version
-number retrieved for the corresponding $symb in the $namespace db file, and
-$timestamp is the timestamp for that transaction (UNIX time).
-$laststore is currently only passed when cstore() is called by
-structuretags::finalize_storage().
+store($storehash,$symb,$namespace,$udom,$uname) : stores hash permanently
+for this url; hashref needs to be given and should be a \%hashname; the
+remaining args aren't required and if they aren't passed or are '' they will
+be derived from the env
=item *
-cstore($storehash,$symb,$namespace,$udom,$uname,$laststore) : same as store
-but uses critical subroutine
+cstore($storehash,$symb,$namespace,$udom,$uname) : same as store but
+uses critical subroutine
=item *
@@ -13767,11 +13087,10 @@ $range should be either an integer '100'
=item *
-putstore($namespace,$symb,$version,$storehash,$udomain,$uname,$tolog) :
+putstore($namespace,$symb,$version,$storehash,$udomain,$uname) :
replaces a &store() version of data with a replacement set of data
for a particular resource in a namespace passed in the $storehash hash
-reference. If $tolog is true, the transaction is logged in the courselog
-with an action=PUTSTORE.
+reference
=item *
@@ -13881,91 +13200,15 @@ server ($udom and $uhome are optional)
=item *
-get_domain_defaults($target_domain,$ignore_cache) : returns hash with defaults
-for: authentication, language, quotas, timezone, date locale, and portal URL in
-the target domain.
-
-May also include additional key => value pairs for the following groups:
-
-=over
-
-=item
-disk quotas (MB allocated by default to portfolios and authoring spaces).
-
-=over
-
-=item defaultquota, authorquota
-
-=back
-
-=item
-tools (availability of aboutme page, blog, webDAV access for authoring spaces,
-portfolio for users).
-
-=over
-
-=item
-aboutme, blog, webdav, portfolio
-
-=back
-
-=item
-requestcourses: ability to request courses, and how requests are processed.
-
-=over
-
-=item
-official, unofficial, community, textbook
-
-=back
-
-=item
-inststatus: types of institutional affiliation, and order in which they are displayed.
-
-=over
-
-=item
-inststatustypes, inststatusorder, inststatusguest
-
-=back
-
-=item
-coursedefaults: can PDF forms can be created, default credits for courses, default quotas (MB)
-for course's uploaded content.
-
-=over
-
-=item
-canuse_pdfforms, officialcredits, unofficialcredits, textbookcredits, officialquota, unofficialquota,
-communityquota, textbookquota
-
-=back
-
-=item
-usersessions: set options for hosting of your users in other domains, and hosting of users from other domains
-on your servers.
-
-=over
-
-=item
-remotesessions, hostedsessions
-
-=back
-
-=back
-
-In cases where a domain coordinator has never used the "Set Domain Configuration"
-utility to create a configuration.db file on a domain's primary library server
-only the following domain defaults: auth_def, auth_arg_def, lang_def
--- corresponding values are authentication type (internal, krb4, krb5,
-or localauth), initial password or a kerberos realm, language (e.g., en-us) --
-will be available. Values are retrieved from cache (if current), unless the
-optional $ignore_cache arg is true, or from domain's configuration.db (if available),
-or lastly from values in lonTabs/dns_domain,tab, or lonTabs/domain.tab.
-
-Typical usage:
+get_domain_defaults($target_domain) : returns hash with defaults for
+authentication and language in the domain. Keys are: auth_def, auth_arg_def,
+lang_def; corresponsing values are authentication type (internal, krb4, krb5,
+or localauth), initial password or a kerberos realm, language (e.g., en-us).
+Values are retrieved from cache (if current), or from domain's configuration.db
+(if available), or lastly from values in lonTabs/dns_domain,tab,
+or lonTabs/domain.tab.
-%domdefaults = &get_domain_defaults($target_domain);
+%domdefaults = &get_auth_defaults($target_domain);
=back
@@ -14190,8 +13433,7 @@ filelocation except for hrefs
=item *
-declutter() : declutters URLs -- remove beginning slashes, 'res' etc.
-also removes beginning /home/httpd/html unless /priv/ follows it.
+declutter() : declutters URLs (remove docroot, beginning slashes, 'res' etc)
=back
@@ -14386,8 +13628,8 @@ Returns:
get_timebased_id():
-Attempts to get a unique timestamp-based suffix for use with items added to a
-course via the Course Editor (e.g., folders, composite pages,
+Attempts to get a unique timestamp-based suffix for use with items added to a
+course via the Course Editor (e.g., folders, composite pages,
group bulletin boards).
Args: (first three required; six others optional)
@@ -14398,24 +13640,24 @@ Args: (first three required; six others
2. keyid (alphanumeric): name of temporary locking key in hash,
e.g., num, boardids
-3. namespace: name of gdbm file used to store suffixes already assigned;
+3. namespace: name of gdbm file used to store suffixes already assigned;
file will be named nohist_namespace.db
4. cdom: domain of course; default is current course domain from %env
5. cnum: course number; default is current course number from %env
-6. idtype: set to concat if an additional digit is to be appended to the
+6. idtype: set to concat if an additional digit is to be appended to the
unix timestamp to form the suffix, if the plain timestamp is already
- in use. Default is to not do this, but simply increment the unix
+ in use. Default is to not do this, but simply increment the unix
timestamp by 1 until a unique key is obtained.
7. who: holder of locking key; defaults to user:domain for user.
-8. locktries: number of attempts to obtain a lock (sleep of 1s before
+8. locktries: number of attempts to obtain a lock (sleep of 1s before
retrying); default is 3.
-9. maxtries: number of attempts to obtain a unique suffix; default is 20.
+9. maxtries: number of attempts to obtain a unique suffix; default is 20.
Returns: