version 1.146, 2003/12/08 18:26:01
|
version 1.148, 2003/12/22 21:57:25
|
Line 277 sub metaread {
|
Line 277 sub metaread {
|
$metastring=join('',<$metafh>); |
$metastring=join('',<$metafh>); |
} |
} |
&metaeval($metastring,$prefix); |
&metaeval($metastring,$prefix); |
return '<br /><b>Processed file:</b> <tt>'. |
return '<br /><b>'.&mt('Processed file').':</b> <tt>'. |
&Apache::loncfile::display($fn).'</tt>'; |
&Apache::loncfile::display($fn).'</tt>'; |
} |
} |
|
|
Line 628 sub fix_ids_and_indices {
|
Line 628 sub fix_ids_and_indices {
|
join(', ',@duplicatedids)); |
join(', ',@duplicatedids)); |
if ($duplicateids) { |
if ($duplicateids) { |
print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n"; |
print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n"; |
my $outstring='<font color="red">Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are: '.join(', ',@duplicatedids).'</font>'; |
my $outstring='<font color="red">'.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).'</font>'; |
return ($outstring,1); |
return ($outstring,1); |
} |
} |
if ($needsfixup) { |
if ($needsfixup) { |
Line 693 sub fix_ids_and_indices {
|
Line 693 sub fix_ids_and_indices {
|
} |
} |
if ($lctag eq 'applet') { |
if ($lctag eq 'applet') { |
my $codebase=''; |
my $codebase=''; |
if (defined($parms{'codebase'})) { |
my $havecodebase=0; |
my $oldcodebase=$parms{'codebase'}; |
foreach my $key (keys(%parms)) { |
|
if (lc($key) eq 'codebase') { |
|
$codebase=$parms{$key}; |
|
$havecodebase=1; |
|
} |
|
} |
|
if ($havecodebase) { |
|
my $oldcodebase=$codebase; |
unless ($oldcodebase=~/\/$/) { |
unless ($oldcodebase=~/\/$/) { |
$oldcodebase.='/'; |
$oldcodebase.='/'; |
} |
} |
Line 708 sub fix_ids_and_indices {
|
Line 715 sub fix_ids_and_indices {
|
} |
} |
$allow{&absoluteurl($codebase,$target).'/*'}=1; |
$allow{&absoluteurl($codebase,$target).'/*'}=1; |
} else { |
} else { |
foreach ('archive','code','object') { |
foreach my $key (keys(%parms)) { |
if (defined($parms{$_})) { |
if ($key =~ /(archive|code|object)/i) { |
my $oldurl=$parms{$_}; |
my $oldurl=$parms{$key}; |
my $newurl=&urlfixup($oldurl,$target); |
my $newurl=&urlfixup($oldurl,$target); |
$newurl=~s/\/[^\/]+$/\/\*/; |
$newurl=~s/\/[^\/]+$/\/\*/; |
print $logfile 'Allow: applet '.$_.':'. |
print $logfile 'Allow: applet '.lc($key).':'. |
$oldurl.' allows '. |
$oldurl.' allows '.$newurl."\n"; |
$newurl."\n"; |
|
$allow{&absoluteurl($newurl,$target)}=1; |
$allow{&absoluteurl($newurl,$target)}=1; |
} |
} |
} |
} |
Line 868 sub publish {
|
Line 874 sub publish {
|
my %allow=(); |
my %allow=(); |
|
|
unless ($logfile=Apache::File->new('>>'.$source.'.log')) { |
unless ($logfile=Apache::File->new('>>'.$source.'.log')) { |
return ('<font color="red">No write permission to user directory, FAIL</font>',1); |
return ('<font color="red">'.&mt('No write permission to user directory, FAIL').'</font>',1); |
} |
} |
print $logfile |
print $logfile |
"\n\n================= Publish ".localtime()." Phase One ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n"; |
"\n\n================= Publish ".localtime()." Phase One ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n"; |
Line 910 sub publish {
|
Line 916 sub publish {
|
if ( |
if ( |
&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'. |
&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'. |
$thisdep.'.meta') eq '-1') { |
$thisdep.'.meta') eq '-1') { |
$scrout.= ' - <font color="red">Currently not available'. |
$scrout.= ' - <font color="red">'.&mt('Currently not available'). |
'</font>'; |
'</font>'; |
} else { |
} else { |
my %temphash=(&Apache::lonnet::declutter($target).'___'. |
my %temphash=(&Apache::lonnet::declutter($target).'___'. |