version 1.479, 2006/11/30 22:29:03
|
version 1.489, 2006/12/08 20:09:29
|
Line 2804 sub maketime {
|
Line 2804 sub maketime {
|
######################################### |
######################################### |
|
|
sub findallcourses { |
sub findallcourses { |
my ($roles) = @_; |
my ($roles,$uname,$udom) = @_; |
my %roles; |
my %roles; |
if (ref($roles)) { %roles = map { $_ => 1 } @{$roles}; } |
if (ref($roles)) { %roles = map { $_ => 1 } @{$roles}; } |
my %courses; |
my %courses; |
my $now=time; |
my $now=time; |
foreach my $key (keys(%env)) { |
if (!defined($uname)) { |
if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_username)/?(\w*)$} || |
$uname = $env{'user.name'}; |
$key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)}) { |
} |
my ($role,$domain,$id,$sec) = ($1,$2,$3,$4); |
if (!defined($udom)) { |
next if ($role eq 'ca' || $role eq 'aa'); |
$udom = $env{'user.domain'}; |
next if (%roles && !exists($roles{$role})); |
} |
my ($starttime,$endtime)=split(/\./,$env{$key}); |
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) { |
my $active=1; |
my %roleshash = &Apache::lonnet::dump('roles',$udom,$uname); |
if ($starttime) { |
if (!%roles) { |
if ($now<$starttime) { $active=0; } |
%roles = ( |
} |
cc => 1, |
if ($endtime) { |
in => 1, |
if ($now>$endtime) { $active=0; } |
ep => 1, |
} |
ta => 1, |
if ($active) { |
cr => 1, |
if ($sec eq '') { |
st => 1, |
$sec = 'none'; |
); |
|
} |
|
foreach my $entry (keys(%roleshash)) { |
|
my ($trole,$tend,$tstart) = split(/_/,$roleshash{$entry}); |
|
if ($trole =~ /^cr/) { |
|
next if (!exists($roles{$trole}) && !exists($roles{'cr'})); |
|
} else { |
|
next if (!exists($roles{$trole})); |
|
} |
|
if ($tend) { |
|
next if ($tend < $now); |
|
} |
|
if ($tstart) { |
|
next if ($tstart > $now); |
|
} |
|
my ($cdom,$cnum,$sec,$cnumpart,$secpart,$role,$realsec); |
|
(undef,$cdom,$cnumpart,$secpart) = split(/\//,$entry); |
|
if ($secpart eq '') { |
|
($cnum,$role) = split(/_/,$cnumpart); |
|
$sec = 'none'; |
|
$realsec = ''; |
|
} else { |
|
$cnum = $cnumpart; |
|
($sec,$role) = split(/_/,$secpart); |
|
$realsec = $sec; |
|
} |
|
$courses{$cdom.'_'.$cnum}{$sec} = $trole.'/'.$cdom.'/'.$cnum.'/'.$realsec; |
|
} |
|
} else { |
|
foreach my $key (keys(%env)) { |
|
if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_courseid)/?(\w*)$} || |
|
$key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_courseid)/?(\w*)$}) { |
|
my ($role,$cdom,$cnum,$sec) = ($1,$2,$3,$4); |
|
next if ($role eq 'ca' || $role eq 'aa'); |
|
next if (%roles && !exists($roles{$role})); |
|
my ($starttime,$endtime)=split(/\./,$env{$key}); |
|
my $active=1; |
|
if ($starttime) { |
|
if ($now<$starttime) { $active=0; } |
|
} |
|
if ($endtime) { |
|
if ($now>$endtime) { $active=0; } |
|
} |
|
if ($active) { |
|
if ($sec eq '') { |
|
$sec = 'none'; |
|
} |
|
$courses{$cdom.'_'.$cnum}{$sec} = |
|
$role.'/'.$cdom.'/'.$cnum.'/'.$sec; |
} |
} |
$courses{$domain.'_'.$id}{$sec} = 1; |
|
} |
} |
} |
} |
} |
} |
Line 2837 sub findallcourses {
|
Line 2884 sub findallcourses {
|
############################################### |
############################################### |
|
|
sub blockcheck { |
sub blockcheck { |
my ($setters,$activity) = @_; |
my ($setters,$activity,$uname,$udom) = @_; |
# Retrieve active student roles and active course coordinator/instructor roles |
# Retrieve active course roles - course coordinator, instructor, exam proctor, ta, student or custom role. |
|
|
my %live_courses = &findallcourses(); |
my %live_courses = &findallcourses(undef,$uname,$udom); |
|
|
# Retrieve blocking times and identity of blocker for active courses |
# Retrieve blocking times and identity of blocker for active courses |
# unless user has 'evb' privilege. |
# of specified user, unless user has 'evb' privilege. |
|
|
my $startblock = 0; |
my $startblock = 0; |
my $endblock = 0; |
my $endblock = 0; |
|
|
foreach my $course (keys(%live_courses)) { |
foreach my $course (keys(%live_courses)) { |
my $cdom = $env{'course.'.$course.'.domain'}; |
my ($cdom,$cnum); |
my $cnum = $env{'course.'.$course.'.num'}; |
if ((defined($env{'course.'.$course.'.domain'})) && (defined($env{'course.'.$course.'.num'}))) { |
my $noblock = 0; |
$cdom = $env{'course.'.$course.'.domain'}; |
|
$cnum = $env{'course.'.$course.'.num'}; |
|
} else { |
|
($cdom,$cnum) = split(/_/,$course); |
|
} |
|
my $no_ownblock = 0; |
|
my $no_userblock = 0; |
foreach my $sec (keys(%{$live_courses{$course}})) { |
foreach my $sec (keys(%{$live_courses{$course}})) { |
my $role = 'cm./'.$cdom.'/'.$cnum; |
my $checkrole = 'cm./'.$cdom.'/'.$cnum; |
if ($sec ne 'none') { |
if ($sec ne 'none') { |
$role .= '/'.$sec; |
$checkrole .= '/'.$sec; |
} |
} |
if (&Apache::lonnet::allowed('evb',undef,undef,$role)) { |
if ((defined($uname) && ($uname ne $env{'user.name'})) || |
$noblock = 1; |
(defined($udom) && ($udom ne $env{'user.domain'}))) { |
last; |
my ($trole,$tdom,$tnum,$tsec); |
|
my $entry = $live_courses{$course}{$sec}; |
|
if ($entry =~ /^cr/) { |
|
($trole,$tdom,$tnum,$tsec) = |
|
($entry =~ m|^(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)/?(\w*)$|); |
|
} else { |
|
($trole,$tdom,$tnum,$tsec) = split(/\//,$entry); |
|
} |
|
my ($spec,$area,$trest,%allroles,%userroles); |
|
$area = '/'.$tdom.'/'.$tnum; |
|
$trest = $tnum; |
|
if ($tsec ne '') { |
|
$area .= '/'.$tsec; |
|
$trest .= '/'.$tsec; |
|
} |
|
$spec = $trole.'.'.$area; |
|
if ($trole =~ /^cr/) { |
|
&Apache::lonnet::custom_roleprivs(\%allroles,$trole, |
|
$tdom,$spec,$trest,$area); |
|
} else { |
|
&Apache::lonnet::standard_roleprivs(\%allroles,$trole, |
|
$tdom,$spec,$trest,$area); |
|
} |
|
my ($author,$adv) = &Apache::lonnet::set_userprivs(\%userroles,\%allroles); |
|
if ($userroles{'user.priv.'.$checkrole} =~ /evb\&([^\:]*)/) { |
|
if ($1) { |
|
$no_userblock = 1; |
|
last; |
|
} |
|
} |
|
} else { |
|
if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) { |
|
$no_ownblock = 1; |
|
last; |
|
} |
} |
} |
} |
} |
# if they have the evb priv and are currently not playing student |
# if they have the evb priv and are currently not playing student |
next if (($noblock) && |
next if (($no_ownblock) && |
($env{'request.role'} !~ m{^st\./$cdom/$cnum})); |
($env{'request.role'} !~ m{^st\./$cdom/$cnum})); |
|
next if ($no_userblock); |
|
|
$setters->{$course} = {}; |
$setters->{$course} = {}; |
$setters->{$course}{'staff'} = []; |
$setters->{$course}{'staff'} = []; |
Line 3415 sub standard_css {
|
Line 3503 sub standard_css {
|
my $mail_other = '#99BBBB'; |
my $mail_other = '#99BBBB'; |
my $mail_other_hover = '#669999'; |
my $mail_other_hover = '#669999'; |
my $table_header = '#DDDDDD'; |
my $table_header = '#DDDDDD'; |
|
my $feedback_link_bg = '#BBBBBB'; |
|
|
my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px' |
my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px' |
: '0px 3px 0px 4px'; |
: '0px 3px 0px 4px'; |
Line 3946 table.LC_descriptive_input td.LC_descrip
|
Line 4035 table.LC_descriptive_input td.LC_descrip
|
text-align: right; |
text-align: right; |
font-weight: bold; |
font-weight: bold; |
} |
} |
|
table.LC_feedback_link { |
|
background: $feedback_link_bg; |
|
} |
|
span.LC_feedback_link { |
|
background: $feedback_link_bg; |
|
font-size: larger; |
|
} |
|
|
END |
END |
} |
} |
Line 5136 sub record_sep {
|
Line 5232 sub record_sep {
|
$i++; |
$i++; |
} |
} |
} else { |
} else { |
my @allfields=split(/\,/,$record); |
my @allfields; |
|
if ($env{'form.upfiletype'} eq 'semisv') { |
|
@allfields=split(/;/,$record); |
|
} else { |
|
@allfields=split(/\,/,$record); |
|
} |
my $i=0; |
my $i=0; |
my $j; |
my $j; |
for ($j=0;$j<=$#allfields;$j++) { |
for ($j=0;$j<=$#allfields;$j++) { |
Line 5174 the file type.
|
Line 5275 the file type.
|
sub upfile_select_html { |
sub upfile_select_html { |
my %Types = ( |
my %Types = ( |
csv => &mt('CSV (comma separated values, spreadsheet)'), |
csv => &mt('CSV (comma separated values, spreadsheet)'), |
|
semisv => &mt('Semicolon separated values'), |
space => &mt('Space separated'), |
space => &mt('Space separated'), |
tab => &mt('Tabulator separated'), |
tab => &mt('Tabulator separated'), |
# xml => &mt('HTML/XML'), |
# xml => &mt('HTML/XML'), |
Line 6195 sub construct_course {
|
Line 6297 sub construct_course {
|
# if specified, key authority is not course, but user |
# if specified, key authority is not course, but user |
# only active if keyaccess is yes |
# only active if keyaccess is yes |
if ($args->{'keyauth'}) { |
if ($args->{'keyauth'}) { |
$args->{'keyauth'}=~s/[^\w\@]//g; |
my ($user,$domain) = split(':',$args->{'keyauth'}); |
if ($args->{'keyauth'}) { |
$user = &LONCAPA::clean_username($user); |
$cenv{'keyauth'}=$args->{'keyauth'}; |
$domain = &LONCAPA::clean_username($domain); |
|
if ($user ne '' && $domain ne '') { |
|
$cenv{'keyauth'}=$user.':'.$domain; |
} |
} |
} |
} |
|
|