--- loncom/lonnet/perl/lonnet.pm 2016/08/05 15:34:27 1.1172.2.72
+++ loncom/lonnet/perl/lonnet.pm 2012/08/03 10:55:53 1.1182
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.1172.2.72 2016/08/05 15:34:27 raeburn Exp $
+# $Id: lonnet.pm,v 1.1182 2012/08/03 10:55:53 foxr Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -75,6 +75,9 @@ use LWP::UserAgent();
use HTTP::Date;
use Image::Magick;
+
+use Encode;
+
use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir
$_64bit %env %protocol %loncaparevs %serverhomeIDs %needsrelease
%managerstab);
@@ -109,33 +112,31 @@ require Exporter;
our @ISA = qw (Exporter);
our @EXPORT = qw(%env);
-# ------------------------------------ Logging (parameters, docs, slots, roles)
+
+# --------------------------------------------------------------------- Logging
{
my $logid;
- sub write_log {
- my ($context,$hash_name,$storehash,$delflag,$uname,$udom,$cnum,$cdom)=@_;
- if ($context eq 'course') {
- if (($cnum eq '') || ($cdom eq '')) {
- $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- }
+ sub instructor_log {
+ my ($hash_name,$storehash,$delflag,$uname,$udom,$cnum,$cdom)=@_;
+ if (($cnum eq '') || ($cdom eq '')) {
+ $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
}
- $logid ++;
+ $logid++;
my $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,
- }
- };
- return &put('nohist_'.$hash_name,$logentry,$cdom,$cnum);
+ return &Apache::lonnet::put('nohist_'.$hash_name,
+ { $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,
+ }
+ },$cdom,$cnum);
}
}
@@ -352,11 +353,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
@@ -417,8 +416,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 +463,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;
@@ -601,7 +600,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 +631,6 @@ 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'};
- }
-
return $handle;
}
@@ -671,7 +664,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 +837,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 +851,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 +878,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 +939,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 +966,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 +1139,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;
}
@@ -1275,8 +1237,8 @@ sub get_lonbalancer_config {
sub check_loadbalancing {
my ($uname,$udom) = @_;
- my ($is_balancer,$currtargets,$currrules,$dom_in_use,$homeintdom,
- $rule_in_effect,$offloadto,$otherserver);
+ my ($is_balancer,$dom_in_use,$homeintdom,$rule_in_effect,
+ $offloadto,$otherserver);
my $lonhost = $perlvar{'lonHostID'};
my @hosts = ¤t_machine_ids();
my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
@@ -1301,8 +1263,14 @@ sub check_loadbalancing {
}
}
if (ref($result) eq 'HASH') {
- ($is_balancer,$currtargets,$currrules) =
- &check_balancer_result($result,@hosts);
+ my $currbalancer = $result->{'lonhost'};
+ my $currtargets = $result->{'targets'};
+ my $currrules = $result->{'rules'};
+ if ($currbalancer ne '') {
+ if (grep(/^\Q$currbalancer\E$/,@hosts)) {
+ $is_balancer = 1;
+ }
+ }
if ($is_balancer) {
if (ref($currrules) eq 'HASH') {
if ($homeintdom) {
@@ -1351,7 +1319,7 @@ 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);
@@ -1360,9 +1328,12 @@ sub check_loadbalancing {
}
}
if (ref($result) eq 'HASH') {
- ($is_balancer,$currtargets,$currrules) =
- &check_balancer_result($result,@hosts);
- if ($is_balancer) {
+ my $currbalancer = $result->{'lonhost'};
+ my $currtargets = $result->{'targets'};
+ my $currrules = $result->{'rules'};
+
+ if ($currbalancer eq $lonhost) {
+ $is_balancer = 1;
if (ref($currrules) eq 'HASH') {
if ($currrules->{'_LC_internetdom'} ne '') {
$rule_in_effect = $currrules->{'_LC_internetdom'};
@@ -1416,8 +1387,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});
}
}
@@ -1426,32 +1397,6 @@ sub check_loadbalancing {
return ($is_balancer,$otherserver);
}
-sub check_balancer_result {
- my ($result,@hosts) = @_;
- my ($is_balancer,$currtargets,$currrules);
- if (ref($result) eq 'HASH') {
- if ($result->{'lonhost'} ne '') {
- my $currbalancer = $result->{'lonhost'};
- if (grep(/^\Q$currbalancer\E$/,@hosts)) {
- $is_balancer = 1;
- $currtargets = $result->{'targets'};
- $currrules = $result->{'rules'};
- }
- } else {
- foreach my $key (keys(%{$result})) {
- if (($key ne '') && (grep(/^\Q$key\E$/,@hosts)) &&
- (ref($result->{$key}) eq 'HASH')) {
- $is_balancer = 1;
- $currrules = $result->{$key}{'rules'};
- $currtargets = $result->{$key}{'targets'};
- last;
- }
- }
- }
- }
- return ($is_balancer,$currtargets,$currrules);
-}
-
sub get_loadbalancer_targets {
my ($rule_in_effect,$currtargets,$uname,$udom) = @_;
my $offloadto;
@@ -1606,36 +1551,6 @@ sub idput {
}
}
-# ---------------------------------------- Delete unwanted IDs from ids.db file
-
-sub iddel {
- my ($udom,$idshashref,$uhome)=@_;
- my %result=();
- unless (ref($idshashref) eq 'HASH') {
- return %result;
- }
- my %servers=();
- while (my ($id,$uname) = each(%{$idshashref})) {
- my $uhom;
- if ($uhome) {
- $uhom = $uhome;
- } else {
- $uhom=&homeserver($uname,$udom);
- }
- if ($uhom ne 'no_host') {
- if ($servers{$uhom}) {
- $servers{$uhom}.='&'.&escape($id);
- } else {
- $servers{$uhom}=&escape($id);
- }
- }
- }
- foreach my $server (keys(%servers)) {
- $result{$server} = &critical('iddel:'.$udom.':'.$servers{$server},$uhome);
- }
- return %result;
-}
-
# ------------------------------dump from db file owned by domainconfig user
sub dump_dom {
my ($namespace, $udom, $regexp) = @_;
@@ -1651,7 +1566,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).'&';
@@ -1659,7 +1573,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 {
@@ -1763,13 +1676,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);
@@ -1785,10 +1699,10 @@ 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 {
@@ -1934,63 +1848,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;
@@ -2070,25 +1927,19 @@ 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;
my %domconfig =
&Apache::lonnet::get_dom('configuration',['defaults','quotas',
'requestcourses','inststatus',
- 'coursedefaults','usersessions',
- 'requestauthor','selfenrollment',
- 'coursecategories'],$domain);
- my @coursetypes = ('official','unofficial','community','textbook');
+ 'coursedefaults','usersessions'],$domain);
if (ref($domconfig{'defaults'}) eq 'HASH') {
$domdefaults{'lang_def'} = $domconfig{'defaults'}{'lang_def'};
$domdefaults{'auth_def'} = $domconfig{'defaults'}{'auth_def'};
@@ -2106,61 +1957,27 @@ sub get_domain_defaults {
$domdefaults{'defaultquota'} = $domconfig{'quotas'}{'defaultquota'};
} else {
$domdefaults{'defaultquota'} = $domconfig{'quotas'};
- }
+ }
my @usertools = ('aboutme','blog','webdav','portfolio');
foreach my $item (@usertools) {
if (ref($domconfig{'quotas'}{$item}) eq 'HASH') {
$domdefaults{$item} = $domconfig{'quotas'}{$item};
}
}
- if (ref($domconfig{'quotas'}{'authorquota'}) eq 'HASH') {
- $domdefaults{'authorquota'} = $domconfig{'quotas'}{'authorquota'};
- }
}
if (ref($domconfig{'requestcourses'}) eq 'HASH') {
- foreach my $item ('official','unofficial','community','textbook') {
+ foreach my $item ('official','unofficial','community') {
$domdefaults{$item} = $domconfig{'requestcourses'}{$item};
}
}
- if (ref($domconfig{'requestauthor'}) eq 'HASH') {
- $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'};
+ foreach my $item ('canuse_pdfforms') {
+ $domdefaults{$item} = $domconfig{'coursedefaults'}{$item};
}
}
if (ref($domconfig{'usersessions'}) eq 'HASH') {
@@ -2170,49 +1987,9 @@ 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'};
- }
- }
- &do_cache_new('domdefaults',$domain,\%domdefaults,$cachetime);
+ &Apache::lonnet::do_cache_new('domdefaults',$domain,\%domdefaults,
+ $cachetime);
return %domdefaults;
}
@@ -2622,7 +2399,7 @@ sub chatsend {
sub getversion {
my $fname=&clutter(shift);
- unless ($fname=~m{^(/adm/wrapper|)/res/}) { return -1; }
+ unless ($fname=~/^\/res\//) { return -1; }
return ¤tversion(&filelocation('',$fname));
}
@@ -2802,22 +2579,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;
}
}
@@ -2846,264 +2621,6 @@ sub allowuploaded {
&Apache::lonnet::appenv(\%httpref);
}
-#
-# 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
-# Functions.
-# (b) When displaying folder contents in course editor, used to determine if
-# "Edit" link will be displayed alongside resource.
-#
-# 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 --
-# $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
-# $forceview -- 1 if icon/link should be to go to view mode
-#
-
-sub can_edit_resource {
- my ($file,$cnum,$cdom,$resurl,$symb,$group) = @_;
- my ($cfile,$home,$switchserver,$forceedit,$forceview,$uploaded,$incourse);
-#
-# For aboutme pages user can only edit his/her own.
-#
- if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
- my ($sdom,$sname) = ($1,$2);
- if (($sdom eq $env{'user.domain'}) && ($sname eq $env{'user.name'})) {
- $home = $env{'user.home'};
- $cfile = $resurl;
- if ($env{'form.forceedit'}) {
- $forceview = 1;
- } else {
- $forceedit = 1;
- }
- return ($cfile,$home,$switchserver,$forceedit,$forceview);
- } else {
- return;
- }
- }
-
- if ($env{'request.course.id'}) {
- my $crsedit = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
- if ($group ne '') {
-# if this is a group homepage or group bulletin board, check group privs
- my $allowed = 0;
- if ($resurl =~ m{^/?adm/$cdom/$cnum/$group/smppg$}) {
- if ((&allowed('mdg',$env{'request.course.id'}.
- ($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) ||
- (&allowed('mgh',$env{'request.course.id'}.'/'.$group)) || $crsedit) {
- $allowed = 1;
- }
- } elsif ($resurl =~ m{^/?adm/$cdom/$cnum/\d+/bulletinboard$}) {
- if ((&allowed('mdg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''))) ||
- (&allowed('cgb',$env{'request.course.id'}.'/'.$group)) || $crsedit) {
- $allowed = 1;
- }
- }
- if ($allowed) {
- $home=&homeserver($cnum,$cdom);
- if ($env{'form.forceedit'}) {
- $forceview = 1;
- } else {
- $forceedit = 1;
- }
- $cfile = $resurl;
- } else {
- return;
- }
- } else {
- if ($resurl =~ m{^/?adm/viewclasslist$}) {
- unless (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
- return;
- }
- } elsif (!$crsedit) {
-#
-# No edit allowed where CC has switched to student role.
-#
- return;
- }
- }
- }
-
- if ($file ne '') {
- if (($cnum =~ /$match_courseid/) && ($cdom =~ /$match_domain/)) {
- if (&is_course_upload($file,$cnum,$cdom)) {
- $uploaded = 1;
- $incourse = 1;
- if ($file =~/\.(htm|html|css|js|txt)$/) {
- $cfile = &hreflocation('',$file);
- if ($env{'form.forceedit'}) {
- $forceview = 1;
- } else {
- $forceedit = 1;
- }
- }
- } elsif ($resurl =~ m{^/public/$cdom/$cnum/syllabus}) {
- $incourse = 1;
- if ($env{'form.forceedit'}) {
- $forceview = 1;
- } else {
- $forceedit = 1;
- }
- $cfile = $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'}) {
- $forceview = 1;
- } else {
- $forceedit = 1;
- }
- $cfile = $resurl;
- } elsif ($resurl eq '/res/lib/templates/simpleproblem.problem') {
- $incourse = 1;
- $cfile = $resurl.'/smpedit';
- } elsif ($resurl =~ m{^/adm/wrapper/ext/}) {
- $incourse = 1;
- if ($env{'form.forceedit'}) {
- $forceview = 1;
- } else {
- $forceedit = 1;
- }
- $cfile = $resurl;
- } elsif ($resurl =~ m{^/?adm/viewclasslist$}) {
- $incourse = 1;
- if ($env{'form.forceedit'}) {
- $forceview = 1;
- } else {
- $forceedit = 1;
- }
- $cfile = ($resurl =~ m{^/} ? $resurl : "/$resurl");
- }
- } elsif ($resurl eq '/res/lib/templates/simpleproblem.problem/smpedit') {
- my $template = '/res/lib/templates/simpleproblem.problem';
- if (&is_on_map($template)) {
- $incourse = 1;
- $forceview = 1;
- $cfile = $template;
- }
- } elsif (($resurl =~ m{^/adm/wrapper/ext/}) && ($env{'form.folderpath'} =~ /^supplemental/)) {
- $incourse = 1;
- if ($env{'form.forceedit'}) {
- $forceview = 1;
- } else {
- $forceedit = 1;
- }
- $cfile = $resurl;
- } elsif (($resurl eq '/adm/extresedit') && ($symb || $env{'form.folderpath'})) {
- $incourse = 1;
- $forceview = 1;
- if ($symb) {
- my ($map,$id,$res)=&decode_symb($symb);
- $env{'request.symb'} = $symb;
- $cfile = &clutter($res);
- } else {
- $cfile = $env{'form.suppurl'};
- $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) {
- $home=&homeserver($cnum,$cdom);
- } elsif ($file !~ m{/$}) {
- $file=~s{^(priv/$match_domain/$match_username)}{/$1};
- $file=~s{^($match_domain/$match_username)}{/priv/$1};
- # Check that the user has permission to edit this resource
- my $setpriv = 1;
- my ($cfuname,$cfudom)=&constructaccess($file,$setpriv);
- if (defined($cfudom)) {
- $home=&homeserver($cfuname,$cfudom);
- $cfile=$file;
- }
- }
- if (($cfile ne '') && (!$incourse || $uploaded) &&
- (($home ne '') && ($home ne 'no_host'))) {
- my @ids=¤t_machine_ids();
- unless (grep(/^\Q$home\E$/,@ids)) {
- $switchserver=1;
- }
- }
- }
- return ($cfile,$home,$switchserver,$forceedit,$forceview);
-}
-
-sub is_course_upload {
- my ($file,$cnum,$cdom) = @_;
- my $uploadpath = &LONCAPA::propath($cdom,$cnum);
- $uploadpath =~ s{^\/}{};
- if (($file =~ m{^\Q$uploadpath\E/userfiles/(docs|supplemental)/}) ||
- ($file =~ m{^userfiles/\Q$cdom\E/\Q$cnum\E/(docs|supplemental)/})) {
- return 1;
- }
- return;
-}
-
-sub in_course {
- my ($udom,$uname,$cdom,$cnum,$type,$hideprivileged) = @_;
- if ($hideprivileged) {
- my $skipuser;
- my %coursehash = &coursedescription($cdom.'_'.$cnum);
- my @possdoms = ($cdom);
- if ($coursehash{'checkforpriv'}) {
- push(@possdoms,split(/,/,$coursehash{'checkforpriv'}));
- }
- if (&privileged($uname,$udom,\@possdoms)) {
- $skipuser = 1;
- if ($coursehash{'nothideprivileged'}) {
- foreach my $item (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
- my $user;
- if ($item =~ /:/) {
- $user = $item;
- } else {
- $user = join(':',split(/[\@]/,$item));
- }
- if ($user eq $uname.':'.$udom) {
- undef($skipuser);
- last;
- }
- }
- }
- if ($skipuser) {
- return 0;
- }
- }
- }
- $type ||= 'any';
- if (!defined($cdom) || !defined($cnum)) {
- my $cid = $env{'request.course.id'};
- $cdom = $env{'course.'.$cid.'.domain'};
- $cnum = $env{'course.'.$cid.'.num'};
- }
- my $typesref;
- if (($type eq 'any') || ($type eq 'all')) {
- $typesref = ['active','previous','future'];
- } elsif ($type eq 'previous' || $type eq 'future') {
- $typesref = [$type];
- }
- my %roles = &get_my_roles($uname,$udom,'userroles',
- $typesref,undef,[$cdom]);
- my ($tmp) = keys(%roles);
- return 0 if ($tmp =~ /^(con_lost|error|no_such_host)/i);
- my @course_roles = grep(/^\Q$cnum\E:\Q$cdom\E:/, keys(%roles));
- if (@course_roles > 0) {
- return 1;
- }
- return 0;
-}
-
# --------- File operations in /home/httpd/html/userfiles/$domain/1/2/3/$course
# input: action, courseID, current domain, intended
# path to file, source of file, instruction to parse file for objects,
@@ -3394,9 +2911,7 @@ sub userfileupload {
$codebase,$thumbwidth,$thumbheight,
$resizewidth,$resizeheight,$context,$mimetype);
} else {
- if ($env{'form.folder'}) {
- $fname=$env{'form.folder'}.'/'.$fname;
- }
+ $fname=$env{'form.folder'}.'/'.$fname;
return &process_coursefile('uploaddoc',$docuname,$docudom,
$fname,$formname,$parser,
$allfiles,$codebase,$mimetype);
@@ -3411,7 +2926,7 @@ sub userfileupload {
} else {
my $docuname=$env{'user.name'};
my $docudom=$env{'user.domain'};
- if ((exists($env{'form.group'})) || ($context eq 'syllabus')) {
+ if (exists($env{'form.group'})) {
$docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
$docudom=$env{'course.'.$env{'request.course.id'}.'.domain'};
}
@@ -3561,9 +3076,7 @@ sub extract_embedded_items {
&add_filetype($allfiles,$attr->{'src'},'src');
}
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') {
my $src;
@@ -3651,26 +3164,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]);
@@ -4035,70 +3530,38 @@ sub userrolelog {
sub courserolelog {
my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$selfenroll,$context)=@_;
- if ($area =~ m-^/($match_domain)/($match_courseid)/?([^/]*)-) {
- my $cdom = $1;
- my $cnum = $2;
- my $sec = $3;
- my $namespace = 'rolelog';
- my %storehash = (
- role => $trole,
- start => $tstart,
- end => $tend,
- selfenroll => $selfenroll,
- context => $context,
- );
- if ($trole eq 'gr') {
- $namespace = 'groupslog';
- $storehash{'group'} = $sec;
- } else {
- $storehash{'section'} = $sec;
- }
- &write_log('course',$namespace,\%storehash,$delflag,$username,
- $domain,$cnum,$cdom);
- if (($trole ne 'st') || ($sec ne '')) {
- &devalidate_cache_new('getcourseroles',$cdom.'_'.$cnum);
+ if (($trole eq 'cc') || ($trole eq 'in') ||
+ ($trole eq 'ep') || ($trole eq 'ad') ||
+ ($trole eq 'ta') || ($trole eq 'st') ||
+ ($trole=~/^cr/) || ($trole eq 'gr') ||
+ ($trole eq 'co')) {
+ if ($area =~ m-^/($match_domain)/($match_courseid)/?([^/]*)-) {
+ my $cdom = $1;
+ my $cnum = $2;
+ my $sec = $3;
+ my $namespace = 'rolelog';
+ my %storehash = (
+ role => $trole,
+ start => $tstart,
+ end => $tend,
+ selfenroll => $selfenroll,
+ context => $context,
+ );
+ if ($trole eq 'gr') {
+ $namespace = 'groupslog';
+ $storehash{'group'} = $sec;
+ } else {
+ $storehash{'section'} = $sec;
+ }
+ &instructor_log($namespace,\%storehash,$delflag,$username,$domain,$cnum,$cdom);
+ if (($trole ne 'st') || ($sec ne '')) {
+ &devalidate_cache_new('getcourseroles',$cdom.'_'.$cnum);
+ }
}
}
return;
}
-sub domainrolelog {
- my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$context)=@_;
- if ($area =~ m{^/($match_domain)/$}) {
- my $cdom = $1;
- my $domconfiguser = &Apache::lonnet::get_domainconfiguser($cdom);
- my $namespace = 'rolelog';
- my %storehash = (
- role => $trole,
- start => $tstart,
- end => $tend,
- context => $context,
- );
- &write_log('domain',$namespace,\%storehash,$delflag,$username,
- $domain,$domconfiguser,$cdom);
- }
- return;
-
-}
-
-sub coauthorrolelog {
- my ($trole,$username,$domain,$area,$tstart,$tend,$delflag,$context)=@_;
- if ($area =~ m{^/($match_domain)/($match_username)$}) {
- my $audom = $1;
- my $auname = $2;
- my $namespace = 'rolelog';
- my %storehash = (
- role => $trole,
- start => $tstart,
- end => $tend,
- context => $context,
- );
- &write_log('author',$namespace,\%storehash,$delflag,$username,
- $domain,$auname,$audom);
- }
- return;
-}
-
sub get_course_adv_roles {
my ($cid,$codes) = @_;
$cid=$env{'request.course.id'} unless (defined($cid));
@@ -4112,10 +3575,6 @@ sub get_course_adv_roles {
$nothide{$user}=1;
}
}
- my @possdoms = ($coursehash{'domain'});
- if ($coursehash{'checkforpriv'}) {
- push(@possdoms,split(/,/,$coursehash{'checkforpriv'}));
- }
my %returnhash=();
my %dumphash=
&dump('nohist_userroles',$coursehash{'domain'},$coursehash{'num'});
@@ -4128,7 +3587,20 @@ sub get_course_adv_roles {
if (($tstart) && ($now<$tstart)) { next; }
my ($role,$username,$domain,$section)=split(/\:/,$entry);
if ($username eq '' || $domain eq '') { next; }
- if ((&privileged($username,$domain,\@possdoms)) &&
+ unless (ref($privileged{$domain}) eq 'HASH') {
+ my %dompersonnel =
+ &Apache::lonnet::get_domain_roles($domain,['dc'],$now,$now);
+ $privileged{$domain} = {};
+ foreach my $server (keys(%dompersonnel)) {
+ if (ref($dompersonnel{$server}) eq 'HASH') {
+ foreach my $user (keys(%{$dompersonnel{$server}})) {
+ my ($trole,$uname,$udom) = split(/:/,$user);
+ $privileged{$udom}{$uname} = 1;
+ }
+ }
+ }
+ }
+ if ((exists($privileged{$domain}{$username})) &&
(!$nothide{$username.':'.$domain})) { next; }
if ($role eq 'cr') { next; }
if ($codes) {
@@ -4159,7 +3631,8 @@ sub get_my_roles {
if ($context eq 'userroles') {
%dumphash = &dump('roles',$udom,$uname);
} else {
- %dumphash = &dump('nohist_userroles',$udom,$uname);
+ %dumphash=
+ &dump('nohist_userroles',$udom,$uname);
if ($hidepriv) {
my %coursehash=&coursedescription($udom.'_'.$uname);
foreach my $user (split(/\s*\,\s*/,$coursehash{'nothideprivileged'})) {
@@ -4201,7 +3674,7 @@ sub get_my_roles {
}
my ($rolecode,$username,$domain,$section,$area);
if ($context eq 'userroles') {
- ($area,$rolecode) = ($entry =~ /^(.+)_([^_]+)$/);
+ ($area,$rolecode) = split(/_/,$entry);
(undef,$domain,$username,$section) = split(/\//,$area);
} else {
($role,$username,$domain,$section) = split(/\:/,$entry);
@@ -4227,15 +3700,28 @@ sub get_my_roles {
}
}
if ($hidepriv) {
- my @privroles = ('dc','su');
if ($context eq 'userroles') {
- next if (grep(/^\Q$role\E$/,@privroles));
+ if ((&privileged($username,$domain)) &&
+ (!$nothide{$username.':'.$domain})) {
+ next;
+ }
} else {
- my $possdoms = [$domain];
- if (ref($roledoms) eq 'ARRAY') {
- push(@{$possdoms},@{$roledoms});
+ unless (ref($privileged{$domain}) eq 'HASH') {
+ my %dompersonnel =
+ &Apache::lonnet::get_domain_roles($domain,['dc'],$now,$now);
+ $privileged{$domain} = {};
+ if (keys(%dompersonnel)) {
+ foreach my $server (keys(%dompersonnel)) {
+ if (ref($dompersonnel{$server}) eq 'HASH') {
+ foreach my $user (keys(%{$dompersonnel{$server}})) {
+ my ($trole,$uname,$udom) = split(/:/,$user);
+ $privileged{$udom}{$uname} = $trole;
+ }
+ }
+ }
+ }
}
- if (&privileged($username,$domain,$possdoms,\@privroles)) {
+ if (exists($privileged{$domain}{$username})) {
if (!$nothide{$username.':'.$domain}) {
next;
}
@@ -4327,8 +3813,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=''; }
@@ -4341,18 +3826,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).':'.
@@ -4363,10 +3847,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);
@@ -4472,7 +3956,7 @@ sub get_domain_roles {
}
my $rolelist;
if (ref($roles) eq 'ARRAY') {
- $rolelist = join('&',@{$roles});
+ $rolelist = join(':',@{$roles});
}
my %personnel = ();
@@ -4503,7 +3987,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)=@_;
@@ -4565,92 +4049,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("WARNING: ".
- "Checkout tmpput failed ".$tudom.' - '.$tuname.' - '.$symb.
- "");
- 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("WARNING: ".
- "Checkout cstore failed ".$tudom.' - '.$tuname.' - '.$symb.
- "");
- }
-
- if (&log($tudom,$tuname,&homeserver($tuname,$tudom),
- &escape('Checkout '.$infostr.' - '.
- $token)) ne 'ok') {
- return '';
- } else {
- &logthis("WARNING: ".
- "Checkout log failed ".$tudom.' - '.$tuname.' - '.$symb.
- "");
- }
- 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 {
@@ -5021,7 +4419,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); }
@@ -5051,13 +4449,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); }
@@ -5088,7 +4486,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
@@ -5100,12 +4498,9 @@ sub restore {
if ($stuname) { $home=&homeserver($stuname,$domain); }
if (!$symb) {
- return if ($namespace eq 'courserequests');
- unless ($symb=escape(&symbread())) { return ''; }
+ unless ($symb=escape(&symbread())) { return ''; }
} else {
- unless ($namespace eq 'courserequests') {
- $symb=&escape(&symbclean($symb));
- }
+ $symb=&escape(&symbclean($symb));
}
if (!$namespace) {
unless ($namespace=$env{'request.course.id'}) {
@@ -5240,93 +4635,20 @@ sub update_released_required {
# -------------------------------------------------See if a user is privileged
sub privileged {
- my ($username,$domain,$possdomains,$possroles)=@_;
+ my ($username,$domain)=@_;
+
+ my %rolesdump = &dump("roles", $domain, $username) or return 0;
my $now = time;
- my $roles;
- if (ref($possroles) eq 'ARRAY') {
- $roles = $possroles;
- } else {
- $roles = ['dc','su'];
- }
- if (ref($possdomains) eq 'ARRAY') {
- my %privileged = &privileged_by_domain($possdomains,$roles);
- foreach my $dom (@{$possdomains}) {
- if (($username =~ /^$match_username$/) && ($domain =~ /^$match_domain$/) &&
- (ref($privileged{$dom}) eq 'HASH')) {
- foreach my $role (@{$roles}) {
- if (ref($privileged{$dom}{$role}) eq 'HASH') {
- if (exists($privileged{$dom}{$role}{$username.':'.$domain})) {
- my ($end,$start) = split(/:/,$privileged{$dom}{$role}{$username.':'.$domain});
- return 1 unless (($end && $end < $now) ||
- ($start && $start > $now));
- }
- }
- }
- }
- }
- } else {
- 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)
- or ($tstart && $tstart > $now);
+ if (($trole eq 'dc') || ($trole eq 'su')) {
+ return 1 unless ($tend && $tend < $now)
+ or ($tstart && $tstart > $now);
}
- }
- }
- return 0;
-}
+ }
-sub privileged_by_domain {
- my ($domains,$roles) = @_;
- my %privileged = ();
- my $cachetime = 60*60*24;
- my $now = time;
- unless ((ref($domains) eq 'ARRAY') && (ref($roles) eq 'ARRAY')) {
- return %privileged;
- }
- foreach my $dom (@{$domains}) {
- next if (ref($privileged{$dom}) eq 'HASH');
- my $needroles;
- foreach my $role (@{$roles}) {
- my ($result,$cached)=&is_cached_new('priv_'.$role,$dom);
- if (defined($cached)) {
- if (ref($result) eq 'HASH') {
- $privileged{$dom}{$role} = $result;
- }
- } else {
- $needroles = 1;
- }
- }
- if ($needroles) {
- my %dompersonnel = &get_domain_roles($dom,$roles);
- $privileged{$dom} = {};
- foreach my $server (keys(%dompersonnel)) {
- if (ref($dompersonnel{$server}) eq 'HASH') {
- foreach my $item (keys(%{$dompersonnel{$server}})) {
- 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} =
- $dompersonnel{$server}{$item};
- }
- }
- }
- if (ref($privileged{$dom}) eq 'HASH') {
- foreach my $role (@{$roles}) {
- if (ref($privileged{$dom}{$role}) eq 'HASH') {
- &do_cache_new('priv_'.$role,$dom,$privileged{$dom}{$role},$cachetime);
- } else {
- my %hash = ();
- &do_cache_new('priv_'.$role,$dom,\%hash,$cachetime);
- }
- }
- }
- }
- }
- return %privileged;
+ return 0;
}
# -------------------------------------------------------- Get user privileges
@@ -5357,7 +4679,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$//;
@@ -5438,18 +4760,16 @@ sub rolesinit {
}
sub set_arearole {
- my ($trole,$area,$tstart,$tend,$domain,$username,$nolog) = @_;
- unless ($nolog) {
+ my ($trole,$area,$tstart,$tend,$domain,$username) = @_;
# log the associated role with the area
- &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
- }
+ &userrolelog($trole,$username,$domain,$area,$tstart,$tend);
return ('user.role.'.$trole.'.'.$area => $tstart.'.'.$tend);
}
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);
@@ -5570,11 +4890,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';
@@ -5690,19 +5010,15 @@ sub delete_env_groupprivs {
sub check_adhoc_privs {
my ($cdom,$cnum,$update,$refresh,$now,$checkrole,$caller) = @_;
my $cckey = 'user.role.'.$checkrole.'./'.$cdom.'/'.$cnum;
- my $setprivs;
if ($env{$cckey}) {
my ($role,$where,$trolecode,$tstart,$tend,$tremark,$tstatus,$tpstart,$tpend);
&role_status($cckey,$update,$refresh,$now,\$role,\$where,\$trolecode,\$tstatus,\$tstart,\$tend);
unless (($tstatus eq 'is') || ($tstatus eq 'will_not')) {
&set_adhoc_privileges($cdom,$cnum,$checkrole,$caller);
- $setprivs = 1;
}
} else {
&set_adhoc_privileges($cdom,$cnum,$checkrole,$caller);
- $setprivs = 1;
}
- return $setprivs;
}
sub set_adhoc_privileges {
@@ -5711,7 +5027,7 @@ sub set_adhoc_privileges {
my $area = '/'.$dcdom.'/'.$pickedcourse;
my $spec = $role.'.'.$area;
my %userroles = &set_arearole($role,$area,'','',$env{'user.domain'},
- $env{'user.name'},1);
+ $env{'user.name'});
my %ccrole = ();
&standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);
my ($author,$adv)= &set_userprivs(\%userroles,\%ccrole);
@@ -5780,14 +5096,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.
@@ -5797,16 +5114,17 @@ sub dump {
if (!$uname) { $uname=$env{'user.name'}; }
my $uhome=&homeserver($uname,$udomain);
+ my $reply;
+ if (grep { $_ eq $uhome } current_machine_ids()) {
+ # user is hosted on this machine
+ $reply = LONCAPA::Lond::dump_with_regexp(join(":", ($udomain,
+ $uname, $namespace, $regexp, $range)), $loncaparevs{$uhome});
+ return %{unserialize($reply, $escapedkeys)};
+ }
if ($regexp) {
- $regexp=&escape($regexp);
+ $regexp=&escape($regexp);
} else {
- $regexp='.';
- }
- if (grep { $_ eq $uhome } ¤t_machine_ids()) {
- # user is hosted on this machine
- my $reply = LONCAPA::Lond::dump_with_regexp(join(':', ($udomain,
- $uname, $namespace, $regexp, $range)), $perlvar{'lonVersion'});
- return %{&unserialize($reply, $escapedkeys)};
+ $regexp='.';
}
my $rep=&reply("dump:$udomain:$uname:$namespace:$regexp:$range",$uhome);
my @pairs=split(/\&/,$rep);
@@ -5814,7 +5132,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);
}
@@ -5858,7 +5177,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);
@@ -5984,7 +5303,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);
@@ -5998,17 +5317,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,
@@ -6117,105 +5425,6 @@ sub tmpdel {
return &reply("tmpdel:$token",$server);
}
-# ------------------------------------------------------------ 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 '')) {
- return ('','ok','invalid call to get suffix');
- }
-
-# set defaults for any optional args for which values were not supplied
- if ($who eq '') {
- $who = $env{'user.name'}.':'.$env{'user.domain'};
- }
- if (!$locktries) {
- $locktries = 3;
- }
- if (!$maxtries) {
- $maxtries = 10;
- }
-
- if (($cdom eq '') || ($cnum eq '')) {
- if ($env{'request.course.id'}) {
- $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
- }
- if (($cdom eq '') || ($cnum eq '')) {
- return ('','ok','call to get suffix not in course context');
- }
- }
-
-# construct locking item
- my $lockhash = {
- $prefix."\0".'locked_'.$keyid => $who,
- };
- my $tries = 0;
-
-# attempt to get lock on nohist_$namespace file
- my $gotlock = &Apache::lonnet::newput('nohist_'.$namespace,$lockhash,$cdom,$cnum);
- while (($gotlock ne 'ok') && $tries <$locktries) {
- $tries ++;
- sleep 1;
- $gotlock = &Apache::lonnet::newput('nohist_'.$namespace,$lockhash,$cdom,$cnum);
- }
-
-# attempt to get unique identifier, based on current timestamp
- if ($gotlock eq 'ok') {
- 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 ++;
- }
- $idtries ++;
- }
- if (!exists($inuse{$prefix."\0".$newid})) {
- my %new_item = (
- $prefix."\0".$newid => $who,
- );
- my $putresult = &Apache::lonnet::put('nohist_'.$namespace,\%new_item,
- $cdom,$cnum);
- if ($putresult ne 'ok') {
- undef($newid);
- $error = 'error saving new item: '.$putresult;
- }
- } else {
- undef($newid);
- $error = ('error: no unique suffix available for the new item ');
- }
-# remove lock
- my @del_lock = ($prefix."\0".'locked_'.$keyid);
- $dellock = &Apache::lonnet::del('nohist_'.$namespace,\@del_lock,$cdom,$cnum);
- } 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 {
@@ -6470,11 +5679,6 @@ sub usertools_access {
official => 1,
unofficial => 1,
community => 1,
- textbook => 1,
- );
- } elsif ($context eq 'requestauthor') {
- %tools = (
- requestauthor => 1,
);
} else {
%tools = (
@@ -6486,7 +5690,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'};
}
@@ -6495,32 +5699,25 @@ sub usertools_access {
if ($action ne 'reload') {
if ($context eq 'requestcourses') {
return $env{'environment.canrequest.'.$tool};
- } elsif ($context eq 'requestauthor') {
- return $env{'environment.canrequest.author'};
} else {
return $env{'environment.availabletools.'.$tool};
}
}
}
- my ($toolstatus,$inststatus,$envkey);
- if ($context eq 'requestauthor') {
- $envkey = $context;
- } else {
- $envkey = $context.'.'.$tool;
- }
+ my ($toolstatus,$inststatus);
if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'}) &&
($action ne 'reload')) {
- $toolstatus = $env{'environment.'.$envkey};
+ $toolstatus = $env{'environment.'.$context.'.'.$tool};
$inststatus = $env{'environment.inststatus'};
} else {
if (ref($userenvref) eq 'HASH') {
- $toolstatus = $userenvref->{$envkey};
+ $toolstatus = $userenvref->{$context.'.'.$tool};
$inststatus = $userenvref->{'inststatus'};
} else {
- my %userenv = &userenvironment($udom,$uname,$envkey,'inststatus');
- $toolstatus = $userenv{$envkey};
+ my %userenv = &userenvironment($udom,$uname,$context.'.'.$tool,'inststatus');
+ $toolstatus = $userenv{$context.'.'.$tool};
$inststatus = $userenv{'inststatus'};
}
}
@@ -6767,7 +5964,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;
@@ -6962,16 +6159,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 {
@@ -6983,15 +6175,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';
}
}
}
@@ -7046,15 +6234,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;
@@ -7088,15 +6272,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;
@@ -7260,99 +6440,6 @@ sub allowed {
return 'F';
}
-# ------------------------------------------- Check construction space access
-
-sub constructaccess {
- my ($url,$setpriv)=@_;
-
-# We do not allow editing of previous versions of files
- if ($url=~/\.(\d+)\.(\w+)$/) { return ''; }
-
-# Get username and domain from URL
- my ($ownername,$ownerdomain,$ownerhome);
-
- ($ownerdomain,$ownername) =
- ($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 ''; }
-
-# Now we need to see if the user has access to the authorspace of
-# $ownername at $ownerdomain
-
- if (($ownername eq $env{'user.name'}) && ($ownerdomain eq $env{'user.domain'})) {
-# Real author for this?
- $ownerhome = $env{'user.home'};
- if (exists($env{'user.priv.au./'.$ownerdomain.'/./'})) {
- return ($ownername,$ownerdomain,$ownerhome);
- }
- } else {
-# Co-author for this?
- if (exists($env{'user.priv.ca./'.$ownerdomain.'/'.$ownername.'./'}) ||
- exists($env{'user.priv.aa./'.$ownerdomain.'/'.$ownername.'./'}) ) {
- $ownerhome = &homeserver($ownername,$ownerdomain);
- return ($ownername,$ownerdomain,$ownerhome);
- }
- }
-
-# We don't have any access right now. If we are not possibly going to do anything about this,
-# we might as well leave
- unless ($setpriv) { return ''; }
-
-# Backdoor access?
- my $allowed=&allowed('eco',$ownerdomain);
-# Nope
- unless ($allowed) { return ''; }
-# Looks like we may have access, but could be locked by the owner of the construction space
- if ($allowed eq 'U') {
- my %blocked=&get('environment',['domcoord.author'],
- $ownerdomain,$ownername);
-# Is blocked by owner
- if ($blocked{'domcoord.author'} eq 'blocked') { return ''; }
- }
- if (($allowed eq 'F') || ($allowed eq 'U')) {
-# Grant temporary access
- my $then=$env{'user.login.time'};
- my $update=$env{'user.update.time'};
- if (!$update) { $update = $then; }
- my $refresh=$env{'user.refresh.time'};
- if (!$refresh) { $refresh = $update; }
- my $now = time;
- &check_adhoc_privs($ownerdomain,$ownername,$update,$refresh,
- $now,'ca','constructaccess');
- $ownerhome = &homeserver($ownername,$ownerdomain);
- return($ownername,$ownerdomain,$ownerhome);
- }
-# No business here
- 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 '') {
@@ -7373,21 +6460,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);
@@ -7395,13 +6488,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);
+ }
}
}
}
@@ -7412,31 +6509,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;
}
}
@@ -7444,35 +6542,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;
+ }
}
}
}
@@ -7483,66 +6572,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:
@@ -7651,23 +6707,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;
}
@@ -7913,8 +6965,8 @@ sub auto_validate_instcode {
}
$response=&unescape(&reply('autovalidateinstcode:'.$cdom.':'.
&escape($instcode).':'.&escape($owner),$homeserver));
- my ($outcome,$description,$defaultcredits) = map { &unescape($_); } split('&',$response,3);
- return ($outcome,$description,$defaultcredits);
+ my ($outcome,$description) = map { &unescape($_); } split('&',$response,2);
+ return ($outcome,$description);
}
sub auto_create_password {
@@ -8156,20 +7208,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;
}
@@ -8188,108 +7237,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 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 {
@@ -8557,41 +7504,6 @@ sub assignrole {
}
}
}
- } elsif ($context eq 'requestauthor') {
- if (($udom eq $env{'user.domain'}) && ($uname eq $env{'user.name'}) &&
- ($url eq '/'.$udom.'/') && ($role eq 'au')) {
- if ($env{'environment.requestauthor'} eq 'automatic') {
- $refused = '';
- } else {
- my %domdefaults = &get_domain_defaults($udom);
- if (ref($domdefaults{'requestauthor'}) eq 'HASH') {
- my $checkbystatus;
- if ($env{'user.adv'}) {
- my $disposition = $domdefaults{'requestauthor'}{'_LC_adv'};
- if ($disposition eq 'automatic') {
- $refused = '';
- } elsif ($disposition eq '') {
- $checkbystatus = 1;
- }
- } else {
- $checkbystatus = 1;
- }
- if ($checkbystatus) {
- if ($env{'environment.inststatus'}) {
- my @inststatuses = split(/,/,$env{'environment.inststatus'});
- foreach my $type (@inststatuses) {
- if (($type ne '') &&
- ($domdefaults{'requestauthor'}{$type} eq 'automatic')) {
- $refused = '';
- }
- }
- } elsif ($domdefaults{'requestauthor'}{'default'} eq 'automatic') {
- $refused = '';
- }
- }
- }
- }
- }
}
if ($refused) {
&logthis('Refused assignrole: '.$udom.' '.$uname.' '.$url.
@@ -8641,25 +7553,11 @@ sub assignrole {
# log new user role if status is ok
if ($answer eq 'ok') {
&userrolelog($role,$uname,$udom,$url,$start,$end);
- if (($role eq 'cc') || ($role eq 'in') ||
- ($role eq 'ep') || ($role eq 'ad') ||
- ($role eq 'ta') || ($role eq 'st') ||
- ($role=~/^cr/) || ($role eq 'gr') ||
- ($role eq 'co')) {
# for course roles, perform group memberships changes triggered by role change.
- unless ($role =~ /^gr/) {
- &Apache::longroup::group_changes($udom,$uname,$url,$role,$origend,
- $origstart,$selfenroll,$context);
- }
- &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')) {
- &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);
+ &courserolelog($role,$uname,$udom,$url,$origstart,$origend,$delflag,$selfenroll,$context);
+ unless ($role =~ /^gr/) {
+ &Apache::longroup::group_changes($udom,$uname,$url,$role,$origend,
+ $origstart,$selfenroll,$context);
}
if ($role eq 'cc') {
&autoupdate_coowners($url,$end,$start,$uname,$udom);
@@ -8959,7 +7857,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)=@_;
+ $selfenroll,$context,$inststatus)=@_;
if (!$cid) {
unless ($cid=$env{'request.course.id'}) {
return 'not_in_class';
@@ -8971,17 +7869,15 @@ 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);
+ $gene,$usec,$end,$start,$type,$locktype,$cid,$selfenroll,$context);
return $reply;
}
sub modify_student_enrollment {
- my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,
- $locktype,$cid,$selfenroll,$context,$credits) = @_;
+ my ($udom,$uname,$uid,$first,$middle,$last,$gene,$usec,$end,$start,$type,$locktype,$cid,$selfenroll,$context) = @_;
my ($cdom,$cnum,$chome);
if (!$cid) {
unless ($cid=$env{'request.course.id'}) {
@@ -9028,7 +7924,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) },
+ join(':',$end,$start,$uid,$usec,$fullname,$type,$locktype) },
$cdom,$cnum);
if (($reply eq 'ok') || ($reply eq 'delayed')) {
&devalidate_getsection_cache($udom,$uname,$cid);
@@ -9257,7 +8153,7 @@ sub is_course {
my %courses = &courseiddump($cdom, '.', 1, '.', '.', $cnum, undef, undef,
'.');
- return unless(exists($courses{$cdom.'_'.$cnum}));
+ return unless exists($courses{$cdom.'_'.$cnum});
return wantarray ? ($cdom, $cnum) : $cdom.'_'.$cnum;
}
@@ -9282,9 +8178,6 @@ sub store_userdata {
$namevalue.=&escape($key).'='.&freeze_escape($$storehash{$key}).'&';
}
$namevalue=~s/\&$//;
- unless ($namespace eq 'courserequests') {
- $datakey = &escape($datakey);
- }
$result = &reply("store:$udom:$uname:$namespace:$datakey:".
$namevalue,$uhome);
}
@@ -10064,12 +8957,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("WARNING:".
- " Trying to get resource data for ".
- $uname." at ".$udom.": ".
- $tmp."");
- }
+ &logthis("WARNING:".
+ " Trying to get resource data for ".
+ $uname." at ".$udom.": ".
+ $tmp."");
} elsif ($tmp=~/error: 2 /) {
#&EXT_cache_set($udom,$uname);
&do_cache_new('userres',$hashid,undef,600);
@@ -10109,26 +9000,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
#
@@ -10157,7 +9028,7 @@ sub EXT_cache_set {
# --------------------------------------------------------- Value of a Variable
sub EXT {
- my ($varname,$symbparm,$udom,$uname,$usection,$recurse,$cid)=@_;
+ my ($varname,$symbparm,$udom,$uname,$usection,$recurse)=@_;
unless ($varname) { return ''; }
#get real user name/domain, courseid and symb
my $courseid;
@@ -10272,51 +9143,26 @@ sub EXT {
if (!$symbparm) { $symbparm=&symbread(); }
}
- if ($qualifier eq '') {
- if ($space eq 'title') {
- if (!$symbparm) { $symbparm = $env{'request.filename'}; }
- return &gettitle($symbparm);
- }
+ if ($space eq 'title') {
+ if (!$symbparm) { $symbparm = $env{'request.filename'}; }
+ return &gettitle($symbparm);
+ }
- if ($space eq 'map') {
- my ($map) = &decode_symb($symbparm);
- return &symbread($map);
- }
- if ($space eq 'maptitle') {
- my ($map) = &decode_symb($symbparm);
- return &gettitle($map);
- }
- if ($space eq 'filename') {
- if ($symbparm) {
- return &clutter((&decode_symb($symbparm))[2]);
- }
- return &hreflocation('',$env{'request.filename'});
+ if ($space eq 'map') {
+ my ($map) = &decode_symb($symbparm);
+ return &symbread($map);
+ }
+ if ($space eq 'filename') {
+ if ($symbparm) {
+ return &clutter((&decode_symb($symbparm))[2]);
}
-
- if ((defined($courseid)) && ($courseid eq $env{'request.course.id'}) && $symbparm) {
- if ($space eq 'visibleparts') {
- my $navmap = Apache::lonnavmaps::navmap->new();
- my $item;
- if (ref($navmap)) {
- my $res = $navmap->getBySymb($symbparm);
- my $parts = $res->parts();
- if (ref($parts) eq 'ARRAY') {
- $item = join(',',@{$parts});
- }
- undef($navmap);
- }
- return $item;
- }
- }
- }
+ return &hreflocation('',$env{'request.filename'});
+ }
my ($section, $group, @groups);
my ($courselevelm,$courselevel);
- if (($courseid eq '') && ($cid)) {
- $courseid = $cid;
- }
- if (($symbparm && $courseid) &&
- (($courseid eq $env{'request.course.id'}) || ($courseid eq $cid))) {
+ if ($symbparm && defined($courseid) &&
+ $courseid eq $env{'request.course.id'}) {
#print '
'.$space.' - '.$qualifier.' - '.$spacequalifierrest;
@@ -10563,11 +9409,11 @@ sub metadata {
# if it is a non metadata possible uri return quickly
if (($uri eq '') ||
(($uri =~ m|^/*adm/|) &&
- ($uri !~ m|^adm/includes|) && ($uri !~ m{/(smppg|bulletinboard)$})) ||
+ ($uri !~ m|^adm/includes|) && ($uri !~ m|/bulletinboard$|)) ||
($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;
}
@@ -10828,7 +9674,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
}
@@ -10994,7 +9840,7 @@ sub get_course_slots {
my %slots=&Apache::lonnet::dump('slots',$cdom,$cnum);
my ($tmp) = keys(%slots);
if ($tmp !~ /^(con_lost|error|no_such_host)/i) {
- &do_cache_new('allslots',$hashid,\%slots,600);
+ &Apache::lonnet::do_cache_new('allslots',$hashid,\%slots,600);
return %slots;
}
}
@@ -11069,7 +9915,7 @@ sub symblist {
# --------------------------------------------------------------- Verify a symb
sub symbverify {
- my ($symb,$thisurl,$encstate)=@_;
+ my ($symb,$thisurl)=@_;
my $thisfn=$thisurl;
$thisfn=&declutter($thisfn);
# direct jump to resource in page or to a sequence - will construct own symbs
@@ -11088,46 +9934,31 @@ sub symbverify {
if (tie(%bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
&GDBM_READER(),0640)) {
- my $noclutter;
if (($thisurl =~ m{^/adm/wrapper/ext/}) || ($thisurl =~ m{^ext/})) {
$thisurl =~ s/\?.+$//;
- if ($map =~ m{^uploaded/.+\.page$}) {
- $thisurl =~ s{^(/adm/wrapper|)/ext/}{http://};
- $thisurl =~ s{^\Qhttp://https://\E}{https://};
- $noclutter = 1;
- }
- }
- my $ids;
- if ($noclutter) {
- $ids=$bighash{'ids_'.$thisurl};
- } else {
- $ids=$bighash{'ids_'.&clutter($thisurl)};
}
+ my $ids=$bighash{'ids_'.&clutter($thisurl)};
unless ($ids) {
- my $idkey = 'ids_'.($thisurl =~ m{^/}? '' : '/').$thisurl;
+ my $idkey = 'ids_'.($thisurl =~ m{^/}? '' : '/').$thisurl;
$ids=$bighash{$idkey};
}
if ($ids) {
# ------------------------------------------------------------------- Has ID(s)
- if ($thisfn =~ m{^/adm/wrapper/ext/}) {
- $symb =~ s/\?.+$//;
- }
foreach my $id (split(/\,/,$ids)) {
my ($mapid,$resid)=split(/\./,$id);
+ if ($thisfn =~ m{^/adm/wrapper/ext/}) {
+ $symb =~ s/\?.+$//;
+ }
if (
&symbclean(&declutter($bighash{'map_id_'.$mapid}).'___'.$resid.'___'.$thisfn)
- eq $symb) {
- if (ref($encstate)) {
- $$encstate = $bighash{'encrypted_'.$id};
- }
- if (($env{'request.role.adv'}) ||
- ($bighash{'encrypted_'.$id} eq $env{'request.enc'}) ||
+ eq $symb) {
+ if (($env{'request.role.adv'}) ||
+ ($bighash{'encrypted_'.$id} eq $env{'request.enc'}) ||
($thisurl eq '/adm/navmaps')) {
- $okay=1;
- last;
- }
- }
- }
+ $okay=1;
+ }
+ }
+ }
}
untie(%bighash);
}
@@ -11199,21 +10030,19 @@ sub deversion {
# ------------------------------------------------------ Return symb list entry
sub symbread {
- my ($thisfn,$donotrecurse,$ignorecachednull,$checkforblock,$possibles)=@_;
+ my ($thisfn,$donotrecurse)=@_;
my $cache_str='request.symbread.cached.'.$thisfn;
if (defined($env{$cache_str})) {
- if ($ignorecachednull) {
- return $env{$cache_str} unless ($env{$cache_str} eq '');
- } else {
+ if (($thisfn) || ($env{$cache_str} ne '')) {
return $env{$cache_str};
}
}
# 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
@@ -11269,46 +10098,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=''; }
@@ -11316,7 +10117,7 @@ sub symbread {
$syval='';
}
}
- untie(%bighash);
+ untie(%bighash)
}
}
if ($syval) {
@@ -11469,6 +10270,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') {
@@ -11654,12 +10456,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);
}
@@ -12050,9 +10848,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/||;
@@ -12157,12 +10953,12 @@ sub goodbye {
}
sub get_dns {
- my ($url,$func,$ignore_cache,$nocache,$hashref) = @_;
+ my ($url,$func,$ignore_cache) = @_;
if (!$ignore_cache) {
my ($content,$cached)=
&Apache::lonnet::is_cached_new('dns',$url);
if ($cached) {
- &$func($content,$hashref);
+ &$func($content);
return;
}
}
@@ -12179,7 +10975,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");
@@ -12187,10 +10983,8 @@ sub get_dns {
delete($alldns{$dns});
next if ($response->is_error());
my @content = split("\n",$response->content);
- unless ($nocache) {
- &do_cache_new('dns',$url,\@content,30*24*60*60);
- }
- &$func(\@content,$hashref);
+ &Apache::lonnet::do_cache_new('dns',$url,\@content,30*24*60*60);
+ &$func(\@content);
return;
}
close($config);
@@ -12198,66 +10992,9 @@ sub get_dns {
&logthis("unable to contact DNS defaulting to on disk file dns_$which.tab\n");
open($config,"<$perlvar{'lonTabDir'}/dns_$which.tab");
my @content = <$config>;
- &$func(\@content,$hashref);
- return;
-}
-
-# ------------------------------------------------------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 $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) {
- 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/};
- }
- }
- $chksum{$file} = $shasum;
- $revnum{$file} = $version;
- }
- if (ref($hashref) eq 'HASH') {
- %{$hashref} = (
- sums => \%chksum,
- versions => \%revnum,
- );
- }
- }
- }
+ &$func(\@content);
return;
}
-
-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,
- \%checksums);
- return \%checksums;
-}
-
# ------------------------------------------------------------ Read domain file
{
my $loaded;
@@ -12286,8 +11023,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>;
@@ -12373,8 +11110,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);
@@ -12396,8 +11133,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;
}
@@ -12519,7 +11255,7 @@ sub fetch_dns_checksums {
}
sub get_iphost {
- my ($ignore_cache,$nocache) = @_;
+ my ($ignore_cache) = @_;
if (!$ignore_cache) {
if (%iphost) {
@@ -12543,7 +11279,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})) {
@@ -12568,11 +11304,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);
- }
+ &Apache::lonnet::do_cache_new('iphost','iphost',
+ [\%iphost,\%name_to_ip,\%lonid_to_ip],
+ 48*60*60);
return %iphost;
}
@@ -12628,48 +11362,15 @@ sub fetch_dns_checksums {
}
$seen{$prim_ip} = 1;
}
- return &do_cache_new('internetnames',$lonid,\@idns,12*60*60);
+ return &Apache::lonnet::do_cache_new('internetnames',$lonid,\@idns,12*60*60);
}
}
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);
-}
-
-# ------------------------------------------------------- Read loncaparev table
-{
- sub load_loncaparevs {
- if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") {
- if (open(my $config,"<$perlvar{'lonTabDir'}/loncaparevs.tab")) {
- while (my $configline=<$config>) {
- chomp($configline);
- my ($hostid,$loncaparev)=split(/:/,$configline);
- $loncaparevs{$hostid}=$loncaparev;
- }
- close($config);
- }
- }
- }
+ 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 serverhostID table
-{
- sub load_serverhomeIDs {
- if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") {
- if (open(my $config,"<$perlvar{'lonTabDir'}/serverhomeIDs.tab")) {
- while (my $configline=<$config>) {
- chomp($configline);
- my ($name,$id)=split(/:/,$configline);
- $serverhomeIDs{$name}=$id;
- }
- close($config);
- }
- }
- }
-}
-
-
BEGIN {
# ----------------------------------- Read loncapa.conf and loncapa_apache.conf
@@ -12745,15 +11446,34 @@ BEGIN {
close($config);
}
-# --------------------------------------------------------- Read loncaparev table
-
-&load_loncaparevs();
-
-# ------------------------------------------------------- Read serverhostID table
+# ---------------------------------------------------------- Read loncaparev table
+{
+ if (-e "$perlvar{'lonTabDir'}/loncaparevs.tab") {
+ if (open(my $config,"<$perlvar{'lonTabDir'}/loncaparevs.tab")) {
+ while (my $configline=<$config>) {
+ chomp($configline);
+ my ($hostid,$loncaparev)=split(/:/,$configline);
+ $loncaparevs{$hostid}=$loncaparev;
+ }
+ close($config);
+ }
+ }
+}
-&load_serverhomeIDs();
+# ---------------------------------------------------------- Read serverhostID table
+{
+ if (-e "$perlvar{'lonTabDir'}/serverhomeIDs.tab") {
+ if (open(my $config,"<$perlvar{'lonTabDir'}/serverhomeIDs.tab")) {
+ while (my $configline=<$config>) {
+ chomp($configline);
+ my ($name,$id)=split(/:/,$configline);
+ $serverhomeIDs{$name}=$id;
+ }
+ close($config);
+ }
+ }
+}
-# ---------------------------------------------------------- Read releaseslist XML
{
my $file = $Apache::lonnet::perlvar{'lonTabDir'}.'/releaseslist.xml';
if (-e $file) {
@@ -12952,8 +11672,8 @@ 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);
+ my %record=&Apache::lonnet::restore($symb,$courseid,$domain,$uname,$home);
+ &Apache::lonnet::cstore(\%newrecord,$symb,$courseid,$domain,$uname,$home);
For more detailed information, see lonnet specific documentation.
@@ -13089,44 +11809,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 *
-
-constructaccess($url,$setpriv) : check for access to construction space URL
-
-See if the owner domain and name in the URL match those in the
-expected environment. If so, return three element list
-($ownername,$ownerdomain,$ownerhome).
-
-Otherwise return the null string.
-
-If second argument 'setpriv' is true, it assigns the privileges,
-and returns the same three element list, unless the owner has
-blocked "ad hoc" Domain Coordinator access to the Author Space,
-in which case the null string is returned.
=item *
@@ -13146,7 +11835,7 @@ environment). If no custom name is defi
=item *
-get_my_roles($uname,$udom,$context,$types,$roles,$roledoms,$withsec,$hidepriv) :
+get_my_roles($uname,$udom,$context,$types,$roles,$roledoms,$withsec) :
All arguments are optional. Returns a hash of a roles, either for
co-author/assistant author roles for a user's Construction Space
(default), or if $context is 'userroles', roles for the user himself,
@@ -13160,41 +11849,6 @@ of role statuses (active, future or prev
to restrict the list of roles reported. If no array ref is
provided for types, will default to return only active roles.
-=item *
-
-in_course($udom,$uname,$cdom,$cnum,$type,$hideprivileged) : determine if
-user: $uname:$udom has a role in the course: $cdom_$cnum.
-
-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
-have active Domain Coordinator role in course's domain or in additional
-domains (specified in 'Domains to check for privileged users' in course
-environment -- set via: Course Settings -> Classlists and staff listing).
-
-=item *
-
-privileged($username,$domain,$possdomains,$possroles) : returns 1 if user
-$username:$domain is a privileged user (e.g., Domain Coordinator or Super User)
-$possdomains and $possroles are optional array refs -- to domains to check and
-roles to check. If $possdomains is not specified, a dump will be done of the
-users' roles.db to check for a dc or su role in any domain. This can be
-time consuming if &privileged is called repeatedly (e.g., when displaying a
-classlist), so in such cases, supplying a $possdomains array is preferred, as
-this then allows &privileged_by_domain() to be used, which caches the identity
-of privileged users, eliminating the need for repeated calls to &dump().
-
-=item *
-
-privileged_by_domain($possdomains,$roles) : returns a hash of a hash of a hash,
-where the outer hash keys are domains specified in the $possdomains array ref,
-next inner hash keys are privileged roles specified in the $roles array ref,
-and the innermost hash contains key = value pairs for username:domain = end:start
-for active or future "privileged" users with that role in that domain. To avoid
-repeated dumps of domain roles -- via &get_domain_roles() -- contents of the
-innerhash are cached using priv_$role and $dom as the identifiers.
-
=back
=head2 User Modification
@@ -13236,8 +11890,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
@@ -13287,9 +11941,7 @@ Inputs:
=item B<$context> role change context (shown in User Management Logs display in a course)
-=item B<$inststatus> institutional status of user - : separated string of escaped status types
-
-=item B<$credits> Number of credits student will earn from this class - only needs to be supplied if value needs to be different from default credits for class.
+=item B<$inststatus> institutional status of user - : separated string of escaped status types
=back
@@ -13297,20 +11949,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
@@ -13334,8 +11986,6 @@ Inputs:
=item $context
-=item $credits, number of credits student will earn from this class
-
=back
@@ -13392,7 +12042,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 *
@@ -13401,9 +12051,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
@@ -13464,15 +12111,10 @@ resource. Expects the local filesystem p
=item *
-EXT($varname,$symb,$udom,$uname,$usection,$recurse,$cid) : evaluates
-and returns the value of a variety of different possible values,
-$varname should be a request string, and the other parameters can be
-used to specify who and what one is asking about. Ordinarily, $cid
-does not need to be specified, as it is retrived from
-$env{'request.course.id'}, but &Apache::lonnet::EXT() is called
-within lonuserstate::loadmap() when initializing a course, before
-$env{'request.course.id'} has been set, so it needs to be provided
-in that one case.
+EXT($varname,$symb,$udom,$uname) : evaluates and returns the value of
+a vairety of different possible values, $varname should be a request
+string, and the other parameters can be used to specify who and what
+one is asking about.
Possible values for $varname are environment.lastname (or other item
from the envirnment hash), user.name (or someother aspect about the
@@ -13505,32 +12147,17 @@ 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 *
-symbverify($symb,$thisfn,$encstate) : verifies that $symb actually exists
-and is a possible symb for the URL in $thisfn, and if is an encrypted
+symbverify($symb,$thisfn) : verifies that $symb actually exists and is
+a possible symb for the URL in $thisfn, and if is an encryypted
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
-call to symbverify, it will be set to 1 if the symb has been set to be
-encrypted; otherwise it will be null.
+on failure, user must be in a course, as it assumes the existance of
+the course initial hash, and uses $env('request.course.id'}
+
=item *
@@ -13583,34 +12210,6 @@ expirespread($uname,$udom,$stype,$usymb)
devalidate($symb) : devalidate temporary spreadsheet calculations,
forcing spreadsheet to reevaluate the resource scores next time.
-=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
- group item -- e.g., bulletin board, group page etc.).
-
- 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
- $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
-homeserver.
-
- input: 3 args -- filename (decluttered), course number and course domain.
- output: boolean -- 1 if file was uploaded.
-
=back
=head2 Storing/Retreiving Data
@@ -13619,21 +12218,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 *
@@ -13656,11 +12249,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 *
@@ -13770,91 +12362,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
+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.
-=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:
-
-%domdefaults = &get_domain_defaults($target_domain);
+%domdefaults = &get_auth_defaults($target_domain);
=back
@@ -14079,8 +12595,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
@@ -14250,8 +12765,6 @@ Internal notes:
Locks on files (resulting from submission of portfolio file to a homework problem stored in array of arrays.
-=item *
-
modify_access_controls():
Modifies access controls for a portfolio file
@@ -14269,51 +12782,7 @@ Returns:
3. reference to hash of any new or updated access controls.
4. reference to hash used to map incoming IDs to uniqueIDs assigned to control.
key = integer (inbound ID)
- value = uniqueID
-
-=item *
-
-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,
-group bulletin boards).
-
-Args: (first three required; six others optional)
-
-1. prefix (alphanumeric): of keys in hash, e.g., suppsequence, docspage,
- docssequence, or name of group
-
-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;
- 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
- 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
- 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
- retrying); default is 3.
-
-9. maxtries: number of attempts to obtain a unique suffix; default is 20.
-
-Returns:
-
-1. suffix obtained (numeric)
-
-2. result of deleting locking key (ok if deleted, or lock never obtained)
-
-3. error: contains (localized) error message if an error occurred.
-
+ value = uniqueID
=back