version 1.482, 2006/12/01 20:17:47
|
version 1.489, 2006/12/08 20:09:29
|
Line 2855 sub findallcourses {
|
Line 2855 sub findallcourses {
|
} |
} |
} else { |
} else { |
foreach my $key (keys(%env)) { |
foreach my $key (keys(%env)) { |
if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_username)/?(\w*)$} || |
if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_courseid)/?(\w*)$} || |
$key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)/?(\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); |
my ($role,$cdom,$cnum,$sec) = ($1,$2,$3,$4); |
next if ($role eq 'ca' || $role eq 'aa'); |
next if ($role eq 'ca' || $role eq 'aa'); |
next if (%roles && !exists($roles{$role})); |
next if (%roles && !exists($roles{$role})); |
Line 2942 sub blockcheck {
|
Line 2942 sub blockcheck {
|
last; |
last; |
} |
} |
} |
} |
} else { |
} else { |
if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) { |
if (&Apache::lonnet::allowed('evb',undef,undef,$checkrole)) { |
$no_ownblock = 1; |
$no_ownblock = 1; |
last; |
last; |
Line 3503 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 4034 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 5225 sub record_sep {
|
Line 5233 sub record_sep {
|
} |
} |
} else { |
} else { |
my @allfields; |
my @allfields; |
&Apache::lonnet::logthis("file type is ".$env{'form.upfiletype'}); |
|
if ($env{'form.upfiletype'} eq 'semisv') { |
if ($env{'form.upfiletype'} eq 'semisv') { |
@allfields=split(/;/,$record); |
@allfields=split(/;/,$record); |
} else { |
} else { |
Line 6290 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; |
} |
} |
} |
} |
|
|