version 1.369.2.50, 2014/01/06 17:32:58
|
version 1.369.2.51, 2014/02/23 22:36:16
|
Line 1712 sub rawconfig {
|
Line 1712 sub rawconfig {
|
my $pub=($env{'request.state'} eq 'published'); |
my $pub=($env{'request.state'} eq 'published'); |
my $con=($env{'request.state'} eq 'construct'); |
my $con=($env{'request.state'} eq 'construct'); |
my $rol=$env{'request.role'}; |
my $rol=$env{'request.role'}; |
my $requested_domain = $env{'request.role.domain'}; |
my $requested_domain; |
|
if ($rol) { |
|
$requested_domain = $env{'request.role.domain'}; |
|
} |
foreach my $line (@desklines) { |
foreach my $line (@desklines) { |
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line); |
my ($row,$col,$pro,$prt,$img,$top,$bot,$act,$desc,$cat)=split(/\:/,$line); |
$prt=~s/\$uname/$uname/g; |
$prt=~s/\$uname/$uname/g; |
Line 1726 sub rawconfig {
|
Line 1729 sub rawconfig {
|
next if ($crstype ne 'Community'); |
next if ($crstype ne 'Community'); |
$prt=~s/\$cmty/$crs/g; |
$prt=~s/\$cmty/$crs/g; |
} |
} |
$prt=~s/\$requested_domain/$requested_domain/g; |
if ($prt =~ m/\$requested_domain/) { |
|
if ((!$requested_domain) && ($pro eq 'pbre') && ($env{'user.adv'})) { |
|
$prt=~s/\$requested_domain/$env{'user.domain'}/g; |
|
} else { |
|
$prt=~s/\$requested_domain/$requested_domain/g; |
|
} |
|
} |
if ($category_names{$cat}!~/\w/) { $cat='oth'; } |
if ($category_names{$cat}!~/\w/) { $cat='oth'; } |
if ($pro eq 'clear') { |
if ($pro eq 'clear') { |
$output.=&clear($row,$col); |
$output.=&clear($row,$col); |
Line 1762 sub rawconfig {
|
Line 1771 sub rawconfig {
|
next; |
next; |
} |
} |
} |
} |
if (&Apache::lonnet::allowed($priv,$prt)) { |
if ((($priv eq 'bre') && (&Apache::lonnet::allowed($priv,$prt) eq 'F')) || |
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
(($priv ne 'bre') && (&Apache::lonnet::allowed($priv,$prt)))) { |
|
$output.=&switch($uname,$udom,$row,$col,$img,$top,$bot,$act,$desc,$cat); |
} |
} |
} elsif ($pro eq 'course') { |
} elsif ($pro eq 'course') { |
if (($env{'request.course.fn'}) && ($crstype ne 'Community')) { |
if (($env{'request.course.fn'}) && ($crstype ne 'Community')) { |