version 1.478, 2006/11/29 22:02:47
|
version 1.481, 2006/12/01 00:28:14
|
Line 65 use Apache::lonhtmlcommon();
|
Line 65 use Apache::lonhtmlcommon();
|
use Apache::loncoursedata(); |
use Apache::loncoursedata(); |
use Apache::lontexconvert(); |
use Apache::lontexconvert(); |
use Apache::lonclonecourse(); |
use Apache::lonclonecourse(); |
use LONCAPA; |
use LONCAPA qw(:DEFAULT :match); |
|
|
my $readit; |
my $readit; |
|
|
Line 157 BEGIN {
|
Line 157 BEGIN {
|
opendir(DIR,$designdir); |
opendir(DIR,$designdir); |
while ($filename=readdir(DIR)) { |
while ($filename=readdir(DIR)) { |
if ($filename!~/\.tab$/) { next; } |
if ($filename!~/\.tab$/) { next; } |
my ($domain)=($filename=~/^(\w+)\./); |
my ($domain)=($filename=~/^($match_domain)\./); |
{ |
{ |
my $designfile = $designdir.'/'.$filename; |
my $designfile = $designdir.'/'.$filename; |
if ( open (my $fh,"<$designfile") ) { |
if ( open (my $fh,"<$designfile") ) { |
Line 2810 sub findallcourses {
|
Line 2810 sub findallcourses {
|
my %courses; |
my %courses; |
my $now=time; |
my $now=time; |
foreach my $key (keys(%env)) { |
foreach my $key (keys(%env)) { |
if ( $key=~m{^user\.role\.(\w+)\./(\w+)/(\w+)/?(\w*)$} || |
if ( $key=~m{^user\.role\.(\w+)\./($match_domain)/($match_username)/?(\w*)$} || |
$key=~m{^user\.role\.(cr/\w+/\w+/\w+)\./(\w+)/(\w+)}) { |
$key=~m{^user\.role\.(cr/$match_domain/$match_username/\w+)\./($match_domain)/($match_username)}) { |
my ($role,$domain,$id,$sec) = ($1,$2,$3,$4); |
my ($role,$domain,$id,$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 3118 sub bodytag {
|
Line 3118 sub bodytag {
|
# role and realm |
# role and realm |
my ($role,$realm) = split(/\./,$env{'request.role'},2); |
my ($role,$realm) = split(/\./,$env{'request.role'},2); |
if ($role eq 'ca') { |
if ($role eq 'ca') { |
my ($rdom,$rname) = ($realm =~ m-^/(\w+)/(\w+)$-); |
my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$}); |
$realm = &plainname($rname,$rdom).':'.$rdom; |
$realm = &plainname($rname,$rdom).':'.$rdom; |
} |
} |
# realm |
# realm |
Line 3624 table.LC_whatsnew tr.LC_empty_row td {
|
Line 3624 table.LC_whatsnew tr.LC_empty_row td {
|
table.LC_whatsnew tr.LC_empty_row td { |
table.LC_whatsnew tr.LC_empty_row td { |
padding: 4ex |
padding: 4ex |
} |
} |
|
|
|
|
table.LC_whatsnew { |
table.LC_whatsnew { |
} |
} |
|
|
Line 5138 sub record_sep {
|
Line 5136 sub record_sep {
|
$i++; |
$i++; |
} |
} |
} else { |
} else { |
my @allfields=split(/\,/,$record); |
my @allfields; |
|
&Apache::lonnet::logthis("file type is ".$env{'form.upfiletype'}); |
|
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 5176 the file type.
|
Line 5180 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 6015 sub construct_course {
|
Line 6020 sub construct_course {
|
# |
# |
# Check if created correctly |
# Check if created correctly |
# |
# |
($$crsudom,$$crsunum)=($$courseid=~/^\/(\w+)\/(\w+)$/); |
($$crsudom,$$crsunum)= &LONCAPA::split_courseid($$courseid); |
my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom); |
my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom); |
$outcome .= &mt('Created on').': '.$crsuhome.'<br>'; |
$outcome .= &mt('Created on').': '.$crsuhome.'<br>'; |
# |
# |
Line 6024 sub construct_course {
|
Line 6029 sub construct_course {
|
my $cloneid=''; |
my $cloneid=''; |
if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) { |
if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) { |
$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'}; |
$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'}; |
my ($clonecrsudom,$clonecrsunum)=($cloneid=~/^\/(\w+)\/(\w+)$/); |
my ($clonecrsudom,$clonecrsunum)= &LONCAPA::split_courseid($cloneid); |
my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom); |
my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom); |
if ($clonehome eq 'no_host') { |
if ($clonehome eq 'no_host') { |
$outcome .= |
$outcome .= |