--- loncom/publisher/lonpublisher.pm 2006/12/06 22:22:39 1.215
+++ loncom/publisher/lonpublisher.pm 2023/07/14 22:19:22 1.303
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.215 2006/12/06 22:22:39 albertel Exp $
+# $Id: lonpublisher.pm,v 1.303 2023/07/14 22:19:22 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -66,10 +66,10 @@ invocation by F:
=head1 OVERVIEW
-Authors can only write-access the C~authorname/> space. They can
-copy resources into the resource area through the publication step,
-and move them back through a recover step. Authors do not have direct
-write-access to their resource space.
+Authors can only write-access the C space.
+They can copy resources into the resource area through the
+publication step, and move them back through a recover step.
+Authors do not have direct write-access to their resource space.
During the publication step, several events will be
triggered. Metadata is gathered, where a wizard manages default
@@ -102,8 +102,6 @@ to publication space.
Many of the undocumented subroutines implement various magical
parsing shortcuts.
-=over 4
-
=cut
######################################################################
@@ -118,23 +116,21 @@ use Apache::File;
use File::Copy;
use Apache::Constants qw(:common :http :methods);
use HTML::LCParser;
+use HTML::Entities;
+use Encode::Encoder;
use Apache::lonxml;
-use Apache::loncacc;
use DBI;
use Apache::lonnet;
use Apache::loncommon();
+use Apache::lonhtmlcommon;
use Apache::lonmysql;
use Apache::lonlocal;
use Apache::loncfile;
use LONCAPA::lonmetadata;
use Apache::lonmsg;
-use vars qw(%metadatafields %metadatakeys);
+use vars qw(%metadatafields %metadatakeys %addid $readit);
use LONCAPA qw(:DEFAULT :match);
-
-my %addid;
-my %nokey;
-
my $docroot;
my $cuname;
@@ -143,8 +139,12 @@ my $cudom;
my $registered_cleanup;
my $modified_urls;
+my $lock;
+
=pod
+=over 4
+
=item B
Evaluates a string that contains metadata. This subroutine
@@ -183,24 +183,25 @@ sub metaeval {
if ($token->[0] eq 'S') {
my $entry=$token->[1];
my $unikey=$entry;
+ next if ($entry =~ m/^(?:parameter|stores)_/);
if (defined($token->[2]->{'package'})) {
- $unikey.='_package_'.$token->[2]->{'package'};
+ $unikey.="\0package\0".$token->[2]->{'package'};
}
if (defined($token->[2]->{'part'})) {
- $unikey.='_'.$token->[2]->{'part'};
+ $unikey.="\0".$token->[2]->{'part'};
}
if (defined($token->[2]->{'id'})) {
- $unikey.='_'.$token->[2]->{'id'};
+ $unikey.="\0".$token->[2]->{'id'};
}
if (defined($token->[2]->{'name'})) {
- $unikey.='_'.$token->[2]->{'name'};
+ $unikey.="\0".$token->[2]->{'name'};
}
- foreach (@{$token->[3]}) {
- $metadatafields{$unikey.'.'.$_}=$token->[2]->{$_};
+ foreach my $item (@{$token->[3]}) {
+ $metadatafields{$unikey.'.'.$item}=$token->[2]->{$item};
if ($metadatakeys{$unikey}) {
- $metadatakeys{$unikey}.=','.$_;
+ $metadatakeys{$unikey}.=','.$item;
} else {
- $metadatakeys{$unikey}=$_;
+ $metadatakeys{$unikey}=$item;
}
}
my $newentry=$parser->get_text('/'.$entry);
@@ -260,8 +261,9 @@ sub metaread {
my ($logfile,$fn,$prefix)=@_;
unless (-e $fn) {
print($logfile 'No file '.$fn."\n");
- return ''.&mt('No file').': '.
- &Apache::loncfile::display($fn).' ';
+ return ''
+ .&mt('No file: [_1]',&Apache::loncfile::display($fn))
+ .'
';
}
print($logfile 'Processing '.$fn."\n");
my $metastring;
@@ -270,8 +272,9 @@ sub metaread {
$metastring=join('',<$metafh>);
}
&metaeval($metastring,$prefix);
- return ''.&mt('Processed file').': '.
- &Apache::loncfile::display($fn).' ';
+ return ''
+ .&mt('Processed file: [_1]',&Apache::loncfile::display($fn))
+ .'
';
}
#########################################
@@ -286,8 +289,8 @@ sub coursedependencies {
my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
$aauthor,$regexp);
my %courses=();
- foreach (keys %evaldata) {
- if ($_=~/^([a-zA-Z0-9]+_[a-zA-Z0-9]+)___.+___course$/) {
+ foreach my $item (keys(%evaldata)) {
+ if ($item=~/^([a-zA-Z0-9]+_[a-zA-Z0-9]+)___.+___course$/) {
$courses{$1}=1;
}
}
@@ -311,8 +314,12 @@ string which presents the form field (fo
=item B
+=item B
+
=item B
+=item B
+
=item B
=back
@@ -322,30 +329,43 @@ string which presents the form field (fo
#########################################
#########################################
sub textfield {
- my ($title,$name,$value)=@_;
+ my ($title,$name,$value,$noline,$readonly)=@_;
$value=~s/^\s+//gs;
$value=~s/\s+$//gs;
$value=~s/\s+/ /gs;
$title=&mt($title);
$env{'form.'.$name}=$value;
- return "\n$title:".
- "
".
- ' ';
+ return "\n".&Apache::lonhtmlcommon::row_title($title)
+ .' '
+ .&Apache::lonhtmlcommon::row_closure($noline);
}
sub text_with_browse_field {
- my ($title,$name,$value,$restriction)=@_;
+ my ($title,$name,$value,$restriction,$noline,$readonly)=@_;
$value=~s/^\s+//gs;
$value=~s/\s+$//gs;
$value=~s/\s+/ /gs;
$title=&mt($title);
$env{'form.'.$name}=$value;
- return "\n$title:".
- "
".
- ' '.
- 'Select '.
- 'Search ';
-
+ my $disabled;
+ if ($readonly) {
+ $disabled = ' disabled="disabled"';
+ }
+ my $output =
+ "\n".&Apache::lonhtmlcommon::row_title($title)
+ .' ';
+ unless ($readonly) {
+ $output .=
+ ' '
+ .''
+ .&mt('Select')
+ .' '
+ .''
+ .&mt('Search')
+ .' ';
+ }
+ $output .= &Apache::lonhtmlcommon::row_closure($noline);
+ return $output;
}
sub hiddenfield {
@@ -356,12 +376,12 @@ sub hiddenfield {
sub checkbox {
my ($name,$text)=@_;
- return "\n ".
+ return "\n ".
&mt($text)." ";
}
sub selectbox {
- my ($title,$name,$value,$functionref,@idlist)=@_;
+ my ($title,$name,$value,$readonly,$functionref,@idlist)=@_;
$title=&mt($title);
$value=(split(/\s*,\s*/,$value))[-1];
if (defined($value)) {
@@ -369,16 +389,20 @@ sub selectbox {
} else {
$env{'form.'.$name}=$idlist[0];
}
- my $selout="\n$title:".
- '
';
- foreach (@idlist) {
- $selout.=''.&{$functionref}($_).' ';
- }
- else {$selout.='>'.&{$functionref}($_).'';}
+ my $selout="\n".&Apache::lonhtmlcommon::row_title($title)
+ .'';
+ foreach my $id (@idlist) {
+ $selout.=''.&{$functionref}($id).' ';
}
- return $selout.' ';
+ $selout.=' '.&Apache::lonhtmlcommon::row_closure();
+ return $selout;
}
sub select_level_form {
@@ -387,6 +411,58 @@ sub select_level_form {
if (!defined($value)) { $env{'form.'.$name}=0; }
return &Apache::loncommon::select_level_form($value,$name);
}
+
+sub common_access {
+ my ($name,$text,$options)=@_;
+ return unless (ref($options) eq 'ARRAY');
+ my $formname = 'pubdirpref';
+ my $chkname = 'common'.$name;
+ my $chkid = 'LC_'.$chkname;
+ my $divid = $chkid.'div';
+ my $customdivid = 'LC_customfile';
+ my $selname = $chkname.'select';
+ my $selid = $chkid.'select';
+ my $selonchange;
+ if ($name eq 'dist') {
+ $selonchange = ' onchange="showHideCustom(this,'."'$customdivid'".');"';
+ }
+ my %lt = &Apache::lonlocal::texthash(
+ 'default' => 'System wide - can be used for any courses system wide',
+ 'domain' => 'Domain only - use limited to courses in the domai',
+ 'custom' => 'Customized right of use ...',
+ 'public' => 'Public - no authentication or authorization required for use',
+ 'closed' => 'Closed - XML source is closed to everyone',
+ 'open' => 'Open - XML source is open to people who want to use it',
+ 'sel' => 'Select',
+ );
+ my $output = <<"END";
+
+
+
+$text
+
+
+$lt{'sel'}
+END
+ foreach my $val (@{$options}) {
+ $output .= ''.$lt{$val}.' '."\n";
+ }
+ $output .= '
+ ';
+ if ($name eq 'dist') {
+ $output .= <<"END";
+
+END
+ }
+ $output .= '
+
+';
+}
+
#########################################
#########################################
@@ -408,15 +484,14 @@ sub urlfixup {
if ($url =~ /^mailto:/i) { return $url; }
#internal document links need no fixing
if ($url =~ /^\#/) { return $url; }
- my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/);
- foreach (values %Apache::lonnet::hostname) {
- if ($_ eq $host) {
- $url=~s/^http\:\/\///;
- $url=~s/^$host//;
- }
+ my ($host)=($url=~m{(?:(?:http|https|ftp)://)*([^/]+)});
+ my @lonids = &Apache::lonnet::machine_ids($host);
+ if (@lonids) {
+ $url=~s{^(?:http|https|ftp)://}{};
+ $url=~s/^\Q$host\E//;
}
- if ($url=~/^http\:\/\//) { return $url; }
- $url=~s/\~$cuname/res\/$cudom\/$cuname/;
+ if ($url=~m{^(?:http|https|ftp)://}) { return $url; }
+ $url=~s{\Q~$cuname\E}{res/$cudom/$cuname};
return $url;
}
@@ -457,7 +532,7 @@ Currently undocumented
#########################################
#########################################
sub set_allow {
- my ($allow,$logfile,$target,$tag,$oldurl)=@_;
+ my ($allow,$logfile,$target,$tag,$oldurl,$type)=@_;
my $newurl=&urlfixup($oldurl,$target);
my $return_url=$oldurl;
print $logfile 'GUYURL: '.$tag.':'.$oldurl.' - '.$newurl."\n";
@@ -467,11 +542,16 @@ sub set_allow {
}
if (($newurl !~ /^javascript:/i) &&
($newurl !~ /^mailto:/i) &&
- ($newurl !~ /^http:/i) &&
+ ($newurl !~ /^(?:http|https|ftp):/i) &&
($newurl !~ /^\#/)) {
+ if (($type eq 'src') || ($type eq 'href')) {
+ if ($newurl =~ /^([^?]+)\?[^?]*$/) {
+ $newurl = $1;
+ }
+ }
$$allow{&absoluteurl($newurl,$target)}=1;
}
- return $return_url
+ return $return_url;
}
#########################################
@@ -494,11 +574,15 @@ sub get_subscribed_hosts {
$target=~/(.*)\/([^\/]+)$/;
my $srcf=$2;
opendir(DIR,$1);
+ # cycle through listed files, subscriptions used to exist
+ # as "filename.lonid"
while ($filename=readdir(DIR)) {
- if ($filename=~/\Q$srcf\E\.(\w+)$/) {
+ if ($filename=~/\Q$srcf\E\.($match_lonid)$/) {
my $subhost=$1;
- if (($subhost ne 'meta' && $subhost ne 'subscription' &&
- $subhost ne 'tmp') &&
+ if (($subhost ne 'meta'
+ && $subhost ne 'subscription'
+ && $subhost ne 'meta.subscription'
+ && $subhost ne 'tmp') &&
($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) {
push(@subscribed,$subhost);
}
@@ -507,18 +591,13 @@ sub get_subscribed_hosts {
closedir(DIR);
my $sh;
if ( $sh=Apache::File->new("$target.subscription") ) {
- &Apache::lonnet::logthis("opened $target.subscription");
while (my $subline=<$sh>) {
- if ($subline =~ /(^\w+):/) {
+ if ($subline =~ /^($match_lonid):/) {
if ($1 ne $Apache::lonnet::perlvar{'lonHostID'}) {
push(@subscribed,$1);
}
- } else {
- &Apache::lonnet::logthis("No Match for $subline");
}
}
- } else {
- &Apache::lonnet::logthis("Unable to open $target.subscription");
}
return @subscribed;
}
@@ -655,7 +734,7 @@ sub fix_ids_and_indices {
join(', ',@duplicatedids));
if ($duplicateids) {
print $logfile "Duplicate ID(s) exist, ".join(', ',@duplicatedids)."\n";
- my $outstring=''.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).' ';
+ my $outstring=''.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).' ';
return ($outstring,1);
}
if ($needsfixup) {
@@ -664,6 +743,7 @@ sub fix_ids_and_indices {
"Max Index: $maxindex (min 10)\n";
}
my $outstring='';
+ my $responsecounter=1;
my @parser;
$parser[0]=HTML::LCParser->new(\$content);
$parser[-1]->xml_mode(1);
@@ -679,6 +759,11 @@ sub fix_ids_and_indices {
next;
}
if ($lctag eq 'base') { next; }
+ if (($lctag eq 'part') || ($lctag eq 'problem')) {
+ $responsecounter=0;
+ }
+ if ($lctag=~/response$/) { $responsecounter++; }
+ if ($lctag eq 'import') { $responsecounter++; }
my %parms=%{$token->[2]};
$counter=$addid{$tag};
if (!$counter) { $counter=$addid{$lctag}; }
@@ -705,9 +790,11 @@ sub fix_ids_and_indices {
foreach my $type ('src','href','background','bgimg') {
foreach my $key (keys(%parms)) {
if ($key =~ /^$type$/i) {
+ next if (($lctag eq 'img') && ($type eq 'src') &&
+ ($parms{$key} =~ m{^data\:image/gif;base64,}));
$parms{$key}=&set_allow(\%allow,$logfile,
$target,$tag,
- $parms{$key});
+ $parms{$key},$type);
}
}
}
@@ -719,6 +806,7 @@ sub fix_ids_and_indices {
($lctag eq 'image')) {
my $next_token=$parser[-1]->get_token();
if ($next_token->[0] eq 'T') {
+ $next_token->[1] =~ s/[\n\r\f]+//g;
$next_token->[1]=&set_allow(\%allow,$logfile,
$target,$tag,
$next_token->[1]);
@@ -763,26 +851,116 @@ sub fix_ids_and_indices {
}
my $newparmstring='';
my $endtag='';
- foreach (keys %parms) {
- if ($_ eq '/') {
+ foreach my $parkey (keys(%parms)) {
+ if ($parkey eq '/') {
$endtag=' /';
} else {
- my $quote=($parms{$_}=~/\"/?"'":'"');
- $newparmstring.=' '.$_.'='.$quote.$parms{$_}.$quote;
+ my $quote=($parms{$parkey}=~/\"/?"'":'"');
+ $newparmstring.=' '.$parkey.'='.$quote.$parms{$parkey}.$quote;
}
}
if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
$outstring.='<'.$tag.$newparmstring.$endtag.'>';
- if ($lctag eq 'm' || $lctag eq 'script'
- || $lctag eq 'display' || $lctag eq 'tex') {
+ if ($lctag eq 'm' || $lctag eq 'answer' || $lctag eq 'display' ||
+ $lctag eq 'tex') {
$outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
- }
+ } elsif ($lctag eq 'script') {
+ if ($parms{'type'} eq 'loncapa/perl') {
+ $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
+ } else {
+ my $script = &get_all_text_unbalanced('/'.$lctag,\@parser);
+ if ($script =~ m{\.set\w+(Src|Swf)\(["']}i) {
+ my @srcs = split(/\.set/i,$script);
+ if (scalar(@srcs) > 1) {
+ foreach my $item (@srcs) {
+ if ($item =~ m{^(FlashPlayerSwf|MediaSrc|XMPSrc|ConfigurationSrc|PosterImageSrc)\((['"])(?:(?!\2).)+\2\)}is) {
+ my $srctype = $1;
+ my $quote = $2;
+ my ($url) = ($item =~ m{^\Q$srctype($quote\E([^$quote]+)\Q$quote)\E});
+ $url = &urlfixup($url);
+ unless ($url=~m{^(?:http|https|ftp)://}) {
+ $allow{&absoluteurl($url,$target)}=1;
+ if ($srctype eq 'ConfigurationSrc') {
+ if ($url =~ m{^(.+/)configuration_express\.xml$}) {
+#
+# Camtasia 8.1: express_show/spritesheet.png needed, and included in zip archive.
+# Not referenced directly in .html or _player.html files,
+# so add this file to %allow (where is name user gave to file/archive).
+#
+ my $spritesheet = $1.'express_show/spritesheet.png';
+ $allow{&absoluteurl($spritesheet,$target)}=1;
+
+#
+# Camtasia 8.4: skins/express_show/spritesheet.min.css needed, and included in zip archive.
+# Not referenced directly in .html or _player.html files,
+# so add this file to %allow (where is name user gave to file/archive).
+#
+ my $spritecss = $1.'express_show/spritesheet.min.css';
+ $allow{&absoluteurl($spritecss,$target)}=1;
+ }
+ } elsif ($srctype eq 'PosterImageSrc') {
+ if ($url =~ m{^(.+)_First_Frame\.png$}) {
+ my $prefix = $1;
+#
+# Camtasia 8.1: _Thumbnails.png needed, and included in zip archive.
+# Not referenced directly in .html or _player.html files,
+# so add this file to %allow (where is name user gave to file/archive).
+#
+ my $thumbnail = $prefix.'_Thumbnails.png';
+ $allow{&absoluteurl($thumbnail,$target)}=1;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ if ($script =~ m{\.addMediaSrc\((["'])((?!\1).+)\1\);}) {
+ my $src = $2;
+ if ($src) {
+ my $url = &urlfixup($src);
+ unless ($url=~m{^(?:http|https|ftp)://}) {
+ $allow{&absoluteurl($url,$target)}=1;
+ }
+ }
+ }
+ if ($script =~ /\(document,\s*(['"])script\1,\s*\[([^\]]+)\]\);/s) {
+ my $scriptslist = $2;
+ my @srcs = split(/\s*,\s*/,$scriptslist);
+ foreach my $src (@srcs) {
+ if ($src =~ /(["'])(?:(?!\1).)+\.js\1/) {
+ my $quote = $1;
+ my ($url) = ($src =~ m/\Q$quote\E([^$quote]+)\Q$quote\E/);
+ $url = &urlfixup($url);
+ unless ($url=~m{^(?:http|https|ftp)://}) {
+ $allow{&absoluteurl($url,$target)}=1;
+ }
+ }
+ }
+ }
+ if ($script =~ m{loadScript\(\s*(['"])((?:(?!\1).)+\.js)\1,\s*function}is) {
+ my $src = $2;
+ if ($src) {
+ my $url = &urlfixup($src);
+ unless ($url=~m{^(?:http|https|ftp)://}) {
+ $allow{&absoluteurl($url,$target)}=1;
+ }
+ }
+ }
+ $outstring .= $script;
+ }
+ }
} elsif ($token->[0] eq 'E') {
if ($token->[2]) {
unless ($token->[1] eq 'allow') {
$outstring.=''.$token->[1].'>';
}
- }
+ }
+ if ((($token->[1] eq 'part') || ($token->[1] eq 'problem'))
+ && (!$responsecounter)) {
+ my $outstring=''.&mt('Found [_1] without responses. This resource cannot be published.',$token->[1]).' ';
+ return ($outstring,1);
+ }
} else {
$outstring.=$token->[1];
}
@@ -825,31 +1003,34 @@ sub store_metadata {
# Determine if the table exists
my $status = &Apache::lonmysql::check_table('metadata');
if (! defined($status)) {
- $error='WARNING: Cannot connect to '.
- 'database! ';
+ $error=''
+ .&mt('WARNING: Cannot connect to database!')
+ .' ';
&Apache::lonnet::logthis($error);
return ($error,undef);
}
if ($status == 0) {
# It would be nice to actually create the table....
- $error ='WARNING: The metadata table does not '.
- 'exist in the LON-CAPA database. ';
+ $error =''
+ .&mt('WARNING: The metadata table does not exist in the LON-CAPA database!')
+ .' ';
&Apache::lonnet::logthis($error);
return ($error,undef);
}
my $dbh = &Apache::lonmysql::get_dbh();
- if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv') ||
- ($metadata{'copyright'} eq 'custom')) {
+ if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv')) {
# remove this entry
- $status=&LONCAPA::lonmetadata::delete_metadata($dbh,undef,
- $metadata{'url'});
+ my $delitem = 'url = '.$dbh->quote($metadata{'url'});
+ $status = &LONCAPA::lonmetadata::delete_metadata($dbh,undef,$delitem);
+
} else {
$status = &LONCAPA::lonmetadata::update_metadata($dbh,undef,undef,
\%metadata);
}
if (defined($status) && $status ne '') {
- $error='Error occured storing new values in '.
- 'metadata table in LON-CAPA database ';
+ $error=''
+ .&mt('Error occurred saving new values in metadata table in LON-CAPA database!')
+ .' ';
&Apache::lonnet::logthis($error);
&Apache::lonnet::logthis($status);
return ($error,undef);
@@ -869,17 +1050,21 @@ sub checkonthis {
'return_only_error_and_warning_counts' => 1));
my ($errorcount,$warningcount)=split(':',$result);
if (($errorcount) || ($warningcount)) {
- $r->print(''.$uri.' : ');
- if ($errorcount) {
- $r->print(''.
- $errorcount.' '.
- &mt('error(s)').' ');
- }
- if ($warningcount) {
- $r->print(''.
- $warningcount.' '.
- &mt('warning(s)').' ');
- }
+ $r->print(''.&mt('Warnings and Errors').' ');
+ $r->print(''.$uri.' :');
+ $r->print('');
} else {
#$r->print(''.&mt('ok').' ');
}
@@ -918,7 +1103,7 @@ backup copies, performs any automatic pr
especially for rat and ssi files),
Returns a 2 element array, the first is the string to be shown to the
-user, the second is an error code, either 1 (an error occured) or 0
+user, the second is an error code, either 1 (an error occurred) or 0
(no error occurred)
I
@@ -929,7 +1114,7 @@ I
#########################################
sub publish {
- my ($source,$target,$style,$batch)=@_;
+ my ($source,$target,$style,$batch,$nokeyref)=@_;
my $logfile;
my $scrout='';
my $allmeta='';
@@ -937,7 +1122,7 @@ sub publish {
my %allow=();
unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
- return (''.&mt('No write permission to user directory, FAIL').' ',1);
+ return (''.&mt('No write permission to user directory, FAIL').' ',1);
}
print $logfile
"\n\n================= Publish ".localtime()." Phase One ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";
@@ -951,7 +1136,7 @@ sub publish {
print $logfile "Copied original file to ".$copyfile."\n";
} else {
print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
- return ("Failed to write backup copy, $!,FAIL ",1);
+ return ("".&mt("Failed to write backup copy, [_1], FAIL",$1)." ",1);
}
# ------------------------------------------------------------- IDs and indices
@@ -961,27 +1146,37 @@ sub publish {
if ($error) { return ($outstring,$error); }
# ------------------------------------------------------------ Construct Allows
- $scrout.=''.&mt('Dependencies').' ';
+ my $outdep=''; # Collect dependencies output data
my $allowstr='';
- foreach (sort(keys(%allow))) {
- my $thisdep=$_;
+ foreach my $thisdep (sort(keys(%allow))) {
if ($thisdep !~ /[^\s]/) { next; }
+ if ($thisdep =~/\$/) {
+ $outdep.=''
+ .&mt('The resource depends on another resource with variable filename, i.e., [_1].',''.$thisdep.' ').' '
+ .&mt('You likely need to explicitly allow access to all possible dependencies using the [_1]-tag.','<allow> ')
+ ."
\n";
+ }
unless ($style eq 'rat') {
$allowstr.="\n".' ';
}
- $scrout.=' ';
- if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
- $scrout.='';
+ $outdep.='';
+ if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
+ $outdep.='
';
}
- $scrout.=''.$thisdep.' ';
- if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
- $scrout.=' ';
+ $outdep.='
'.$thisdep.' ';
+ if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
+ $outdep.='';
if (
&Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
$thisdep.'.meta') eq '-1') {
- $scrout.= ' -
'.&mt('Currently not available').
- ' ';
+ $outdep.= ' -
'.&mt('Currently not available').
+ ' ';
} else {
+#
+# Store the fact that the dependency has been used by the target file
+# Unfortunately, usage is erroneously named sequsage in lonmeta.pm
+# The translation happens in lonmetadata.pm
+#
my %temphash=(&Apache::lonnet::declutter($target).'___'.
&Apache::lonnet::declutter($thisdep).'___usage'
=> time);
@@ -992,6 +1187,12 @@ sub publish {
}
}
}
+ $outdep.='
';
+ }
+
+ if ($outdep) {
+ $scrout.=''.&mt('Dependencies').' '
+ .$outdep
}
$outstring=~s/\n*(\<\/[^\>]+\>[^<]*)$/$allowstr\n$1\n/s;
@@ -1001,15 +1202,29 @@ sub publish {
my $org;
unless ($org=Apache::File->new('>'.$source)) {
print $logfile "No write permit to $source\n";
- return (''.&mt('No write permission to').
+ return (''.&mt('No write permission to').
' '.$source.
- ', '.&mt('FAIL').' ',1);
+ ', '.&mt('FAIL').'',1);
}
print($org $outstring);
}
$content=$outstring;
}
+
+# ----------------------------------------------------- Course Authoring Space.
+ my ($courseauthor,$crsaurights,$readonly);
+ if ($env{'request.course.id'}) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+ if ($source =~ m{^\Q$docroot/priv/$cdom/$cnum/\E}) {
+ $courseauthor = $cnum.':'.$cdom;
+ $crsaurights = "/res/$cdom/$cnum/default.rights";
+ $readonly = 1;
+ }
+ }
+
# -------------------------------------------- Initial step done, now metadata.
# --------------------------------------- Storage for metadata keys and fields.
@@ -1021,8 +1236,8 @@ sub publish {
my %oldparmstores=();
unless ($batch) {
- $scrout.=''.&mt('Metadata Information').' ' .
- Apache::loncommon::help_open_topic("Metadata_Description")
+ $scrout.=''.&mt('Metadata').' ' .
+ &Apache::loncommon::help_open_topic("Metadata_Description")
. ' ';
}
@@ -1039,16 +1254,16 @@ sub publish {
# ------------------------------------------------ Check out directory hierachy
my $thisdisfn=$source;
- $thisdisfn=~s/^\/home\/\Q$cuname\E\///;
- my @urlparts=split(/\//,$thisdisfn);
+ $thisdisfn=~s/^\Q$docroot\E\/priv\/\Q$cudom\E\/\Q$cuname\E\///;
+ my @urlparts=('.',split(/\//,$thisdisfn));
$#urlparts--;
- my $currentpath='/home/'.$cuname.'/';
+ my $currentpath=$docroot.'/priv/'.$cudom.'/'.$cuname.'/';
my $prefix='../'x($#urlparts);
- foreach (@urlparts) {
- $currentpath.=$_.'/';
+ foreach my $subdir (@urlparts) {
+ $currentpath.=$subdir.'/';
$scrout.=&metaread($logfile,$currentpath.'default.meta',$prefix);
$prefix=~s|^\.\./||;
}
@@ -1060,9 +1275,9 @@ sub publish {
# ------------------- Clear out parameters and stores (there should not be any)
- foreach (keys %metadatafields) {
- if (($_=~/^parameter/) || ($_=~/^stores/)) {
- delete $metadatafields{$_};
+ foreach my $field (keys(%metadatafields)) {
+ if (($field=~/^parameter/) || ($field=~/^stores/)) {
+ delete $metadatafields{$field};
}
}
@@ -1071,23 +1286,21 @@ sub publish {
$scrout.=&metaread($logfile,$source.'.meta');
- foreach (keys %metadatafields) {
- if (($_=~/^parameter/) || ($_=~/^stores/)) {
- $oldparmstores{$_}=1;
- delete $metadatafields{$_};
+ foreach my $field (keys(%metadatafields)) {
+ if (($field=~/^parameter/) || ($field=~/^stores/)) {
+ $oldparmstores{$field}=1;
+ delete $metadatafields{$field};
}
}
# ------------------------------------------------------------- Save some stuff
my %savemeta=();
- foreach ('title') {
- $savemeta{$_}=$metadatafields{$_};
- }
+ if ($metadatafields{'title'}) { $savemeta{'title'}=$metadatafields{'title'}; }
# ------------------------------------------ See if anything new in file itself
$allmeta=&parseformeta($source,$style);
# ----------------------------------------------------------- Restore the stuff
- foreach (keys %savemeta) {
- $metadatafields{$_}=$savemeta{$_};
+ foreach my $item (keys(%savemeta)) {
+ $metadatafields{$item}=$savemeta{$item};
}
}
@@ -1095,36 +1308,46 @@ sub publish {
# ---------------- Find and document discrepancies in the parameters and stores
my $chparms='';
- foreach (sort keys %metadatafields) {
- if (($_=~/^parameter/) || ($_=~/^stores/)) {
- unless ($_=~/\.\w+$/) {
- unless ($oldparmstores{$_}) {
- print $logfile 'New: '.$_."\n";
- $chparms.=$_.' ';
+ foreach my $field (sort(keys(%metadatafields))) {
+ if (($field=~/^parameter/) || ($field=~/^stores/)) {
+ unless ($field=~/\.\w+$/) {
+ unless ($oldparmstores{$field}) {
+ my $disp_key = $field;
+ $disp_key =~ tr/\0/_/;
+ print $logfile ('New: '.$disp_key."\n");
+ $chparms .= $disp_key.' ';
}
}
}
}
if ($chparms) {
- $scrout.=' '.&mt('New parameters or stored values').
+ $scrout.='
'.&mt('New parameters or saved values').
': '.$chparms.'
';
}
$chparms='';
- foreach (sort keys %oldparmstores) {
- if (($_=~/^parameter/) || ($_=~/^stores/)) {
- unless (($metadatafields{$_.'.name'}) ||
- ($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) {
- print $logfile 'Obsolete: '.$_."\n";
- $chparms.=$_.' ';
+ foreach my $olditem (sort(keys(%oldparmstores))) {
+ if (($olditem=~/^parameter/) || ($olditem=~/^stores/)) {
+ unless (($metadatafields{$olditem.'.name'}) ||
+ ($metadatafields{$olditem.'.package'}) || ($olditem=~/\.\w+$/)) {
+ my $disp_key = $olditem;
+ $disp_key =~ tr/\0/_/;
+ print $logfile ('Obsolete: '.$disp_key."\n");
+ $chparms.=$disp_key.' ';
}
}
}
if ($chparms) {
- $scrout.=''.&mt('Obsolete parameters or stored values').': '.
- $chparms.'
'.&mt('Warning!').
- ' '.
- &mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'
';
+ $scrout.=''.&mt('Obsolete parameters or saved values').': '
+ .$chparms.'
'
+ .''.&mt('Warning!').' '
+ .&mt('If this resource is in active use, student performance data from the previous version may become inaccessible.')
+ .'
';
+ }
+ if ($metadatafields{'copyright'} eq 'priv') {
+ $scrout.=''.&mt('Warning!').' '
+ .&mt('Copyright/distribution option "Private" is no longer supported. Select another option from below. Consider "Custom Rights" for maximum control over the usage of your resource.')
+ .'
';
}
# ------------------------------------------------------- Now have all metadata
@@ -1136,17 +1359,22 @@ sub publish {
$textonly=~s/\
-$KEYWORDS:
- $keywords_help
-
-
-
-
END
- $keywordout.=' ';
+ $keywordout.=&Apache::loncommon::end_data_table_row()
+ .&Apache::loncommon::end_data_table()
+ .&Apache::lonhtmlcommon::row_closure();
$intr_scrout.=$keywordout;
@@ -1232,28 +1484,24 @@ END
$intr_scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
- $intr_scrout.=
- "\n".&mt('Abstract').":".
- "
".
- '
';
+ $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Abstract'))
+ .''
+ .&Apache::lonhtmlcommon::row_closure();
$source=~/\.(\w+)$/;
+ $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Grade Levels'))
+ .&mt('Lowest Grade Level:').' '
+ .&select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel')
+# .&Apache::lonhtmlcommon::row_closure();
+# $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Highest Grade Level'))
+ .' '.&mt('Highest Grade Level:').' '
+ .&select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel')
+ .&Apache::lonhtmlcommon::row_closure();
- $intr_scrout.=
- "\n".
- &mt('Lowest Grade Level').':'.
- "
".
- &select_level_form($metadatafields{'lowestgradelevel'},'lowestgradelevel').
- "\n".
- &mt('Highest Grade Level').':'.
- "
".
- &select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel').
- &textfield('Standards','standards',$metadatafields{'standards'});
-
-
-
+ $intr_scrout.=&textfield('Standards','standards',$metadatafields{'standards'});
$intr_scrout.=&hiddenfield('mime',$1);
@@ -1263,7 +1511,7 @@ END
$defaultlanguage =~ s/,\s*$//g;
$intr_scrout.=&selectbox('Language','language',
- $defaultlanguage,
+ $defaultlanguage,'',
\&Apache::loncommon::languagedescription,
(&Apache::loncommon::languageids),
);
@@ -1276,18 +1524,31 @@ END
$intr_scrout.=&hiddenfield('lastrevisiondate',time);
-
+ my $pubowner_last;
+ if ($style eq 'prv') {
+ $pubowner_last = 1;
+ }
+ if ($courseauthor) {
+ $metadatafields{'owner'} = $courseauthor;
+ }
$intr_scrout.=&textfield('Publisher/Owner','owner',
- $metadatafields{'owner'});
+ $metadatafields{'owner'},$pubowner_last,$readonly);
# ---------------------------------------------- Retrofix for unused copyright
if ($metadatafields{'copyright'} eq 'free') {
$metadatafields{'copyright'}='default';
$metadatafields{'sourceavail'}='open';
}
+ if ($metadatafields{'copyright'} eq 'priv') {
+ $metadatafields{'copyright'}='domain';
+ }
# ------------------------------------------------ Dial in reasonable defaults
my $defaultoption=$metadatafields{'copyright'};
unless ($defaultoption) { $defaultoption='default'; }
+ if ($courseauthor) {
+ $defaultoption='custom';
+ $metadatafields{'customdistributionfile'}=$crsaurights;
+ }
my $defaultsourceoption=$metadatafields{'sourceavail'};
unless ($defaultsourceoption) { $defaultsourceoption='closed'; }
unless ($style eq 'prv') {
@@ -1299,35 +1560,34 @@ END
$defaultoption='default';
}
$intr_scrout.=&selectbox('Copyright/Distribution','copyright',
- $defaultoption,
+ $defaultoption,$readonly,
\&Apache::loncommon::copyrightdescription,
- (grep !/^public$/,(&Apache::loncommon::copyrightids)));
+ (grep !/^(public|priv)$/,(&Apache::loncommon::copyrightids)));
} else {
$intr_scrout.=&selectbox('Copyright/Distribution','copyright',
- $defaultoption,
+ $defaultoption,$readonly,
\&Apache::loncommon::copyrightdescription,
- (&Apache::loncommon::copyrightids));
+ (grep !/^priv$/,(&Apache::loncommon::copyrightids)));
}
my $copyright_help =
- Apache::loncommon::help_open_topic('Publishing_Copyright');
- $intr_scrout =~ s/Distribution:/'Distribution: ' . $copyright_help/ge;
- $intr_scrout.=&text_with_browse_field('Custom Distribution File','customdistributionfile',$metadatafields{'customdistributionfile'},'rights').$copyright_help;
+ &Apache::loncommon::help_open_topic('Publishing_Copyright');
+ my $replace=&mt('Copyright/Distribution:');
+ $intr_scrout =~ s/$replace/$replace.' '.$copyright_help/ge;
+
+ $intr_scrout.=&text_with_browse_field('Custom Distribution File','customdistributionfile',$metadatafields{'customdistributionfile'},'rights','',$readonly);
$intr_scrout.=&selectbox('Source Distribution','sourceavail',
- $defaultsourceoption,
+ $defaultsourceoption,'',
\&Apache::loncommon::source_copyrightdescription,
(&Apache::loncommon::source_copyrightids));
# $intr_scrout.=&text_with_browse_field('Source Custom Distribution File','sourcerights',$metadatafields{'sourcerights'},'rights');
my $uctitle=&mt('Obsolete');
- $intr_scrout.=
- "\n$uctitle:".
- '
'.
- &text_with_browse_field('Suggested Replacement for Obsolete File',
+ my $obsolete_checked=($metadatafields{'obsolete'})?' checked="checked"':'';
+ $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle)
+ .' '
+ .&Apache::lonhtmlcommon::row_closure(1);
+ $intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File',
'obsoletereplacement',
- $metadatafields{'obsoletereplacement'});
+ $metadatafields{'obsoletereplacement'},'',1);
} else {
$intr_scrout.=&hiddenfield('copyright','private');
}
@@ -1353,15 +1613,31 @@ END
&hiddenfield('obsolete',1).
&text_with_browse_field('Suggested Replacement for Obsolete File',
'obsoletereplacement',
- $metadatafields{'obsoletereplacement'});
+ $metadatafields{'obsoletereplacement'},'',1);
}
if (!$batch) {
- $scrout.=$intr_scrout.'
';
+ $scrout.=$intr_scrout
+ .&Apache::lonhtmlcommon::end_pick_box()
+ .'
'
+ .'';
}
return($scrout,0);
}
+sub getnokey {
+ my ($includedir) = @_;
+ my $nokey={};
+ my $fh=Apache::File->new($includedir.'/un_keyword.tab');
+ while (<$fh>) {
+ my $word=$_;
+ chomp($word);
+ $nokey->{$word}=1;
+ }
+ return $nokey;
+}
+
#########################################
#########################################
@@ -1384,17 +1660,27 @@ Parameters:
=item I<$distarget>
+=item I<$batch>
+
+=item I<$usebuffer>
+
=back
Returns:
=over 4
-=item integer
+=item integer or array
+
+if $userbuffer arg is true, and if caller wants an array
+then the array ($output,$rtncode) will be returned, otherwise
+just the $rtncode will be returned. $rtncode is an integer:
0: fail
1: success
+=back
+
=cut
#'stupid emacs
@@ -1402,26 +1688,54 @@ Returns:
#########################################
sub phasetwo {
- my ($r,$source,$target,$style,$distarget,$batch)=@_;
+ my ($r,$source,$target,$style,$distarget,$batch,$usebuffer)=@_;
$source=~s/\/+/\//g;
$target=~s/\/+/\//g;
#
# Unless trying to get rid of something, check name validity
#
+ my $output;
unless ($env{'form.obsolete'}) {
if ($target=~/(\_\_\_|\&\&\&|\:\:\:)/) {
- $r->print(
- ''.&mt('Unsupported character combination').
- ' "'.$1.' " '.&mt('in filename, FAIL').' ');
- return 0;
+ $output = ''.
+ &mt('Unsupported character combination [_1] in filename, FAIL.',"'.$1.' ").
+ ' ';
+ if ($usebuffer) {
+ if (wantarray) {
+ return ($output,0);
+ } else {
+ return 0;
+ }
+ } else {
+ $r->print($output);
+ return 0;
+ }
}
unless ($target=~/\.(\w+)$/) {
- $r->print(''.&mt('No valid extension found in filename, FAIL').' ');
- return 0;
+ $output = ''.&mt('No valid extension found in filename, FAIL').' ';
+ if ($usebuffer) {
+ if (wantarray) {
+ return ($output,0);
+ } else {
+ return 0;
+ }
+ } else {
+ $r->print($output);
+ return 0;
+ }
}
if ($target=~/\.(\d+)\.(\w+)$/) {
- $r->print(''.&mt('Cannot publish versioned resource, FAIL').' ');
- return 0;
+ $output = ''.&mt('Filename of resource contains internal version number. Cannot publish such resources, FAIL').' ';
+ if ($usebuffer) {
+ if (wantarray) {
+ return ($output,0);
+ } else {
+ return 0;
+ }
+ } else {
+ $r->print($output);
+ return 0;
+ }
}
}
@@ -1431,11 +1745,27 @@ sub phasetwo {
$distarget=~s/\/+/\//g;
my $logfile;
unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
- $r->print(
- ''.
- &mt('No write permission to user directory, FAIL').' ');
- return 0;
+ $output = ''.
+ &mt('No write permission to user directory, FAIL').' ';
+ if ($usebuffer) {
+ if (wantarray) {
+ return ($output,0);
+ } else {
+ return 0;
+ }
+ } else {
+ return 0;
+ }
+ }
+
+ if ($source =~ /\.rights$/) {
+ $output = ''.&mt('Warning: It can take up to 1 hour for rights changes to fully propagate.').'
';
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
}
+
print $logfile
"\n================= Publish ".localtime()." Phase Two ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";
@@ -1443,7 +1773,33 @@ sub phasetwo {
%metadatakeys=();
&metaeval(&unescape($env{'form.allmeta'}));
-
+
+ if ($batch) {
+ my %commonaccess;
+ map { $commonaccess{$_} = 1; } &Apache::loncommon::get_env_multiple('form.commonaccess');
+ if ($commonaccess{'dist'}) {
+ unless ($style eq 'prv') {
+ if ($env{'form.commondistselect'} eq 'custom') {
+ unless ($source =~ /\.rights$/) {
+ if ($env{'form.commoncustomrights'} =~ m{^/res/.+\.rights$}) {
+ $env{'form.customdistributionfile'} = $env{'form.commoncustomrights'};
+ $env{'form.copyright'} = $env{'form.commondistselect'};
+ }
+ }
+ } elsif ($env{'form.commondistselect'} =~ /^default|domain|public$/) {
+ $env{'form.copyright'} = $env{'form.commondistselect'};
+ }
+ }
+ }
+ unless ($style eq 'prv') {
+ if ($commonaccess{'source'}) {
+ if (($env{'form.commonsourceselect'} eq 'open') || ($env{'form.commonsourceselect'} eq 'closed')) {
+ $env{'form.sourceavail'} = $env{'form.commonsourceselect'};
+ }
+ }
+ }
+ }
+
$metadatafields{'title'}=$env{'form.title'};
$metadatafields{'author'}=$env{'form.author'};
$metadatafields{'subject'}=$env{'form.subject'};
@@ -1469,7 +1825,21 @@ sub phasetwo {
$env{'user.domain'};
$metadatafields{'authorspace'}=$cuname.':'.$cudom;
$metadatafields{'domain'}=$cudom;
-
+
+ my $crsauthor;
+ if ($env{'request.course.id'}) {
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ if ($distarget =~ m{^/res/$cdom/$cnum}) {
+ $crsauthor = 1;
+ my $default_rights = "/res/$cdom/$cnum/default.rights";
+ unless ($distarget eq $default_rights) {
+ $metadatafields{'copyright'} = 'custom';
+ $metadatafields{'customdistributionfile'} = $default_rights;
+ }
+ }
+ }
+
my $allkeywords=$env{'form.addkey'};
if (exists($env{'form.keywords'})) {
if (ref($env{'form.keywords'})) {
@@ -1489,39 +1859,60 @@ sub phasetwo {
if ($metadatafields{'copyright'} eq 'custom') {
my $file=$metadatafields{'customdistributionfile'};
unless ($file=~/\.rights$/) {
- $r->print(
- ''.&mt('No valid custom distribution rights file specified, FAIL').
- ' ');
- return 0;
+ $output .= ''.&mt('No valid custom distribution rights file specified, FAIL').
+ ' ';
+ if ($usebuffer) {
+ if (wantarray) {
+ return ($output,0);
+ } else {
+ return 0;
+ }
+ } else {
+ $r->print($output);
+ return 0;
+ }
}
}
{
print $logfile "\nWrite metadata file for ".$source;
my $mfh;
unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
- $r->print(
- ''.&mt('Could not write metadata, FAIL').
- ' ');
- return 0;
- }
- foreach (sort keys %metadatafields) {
- unless ($_=~/\./) {
- my $unikey=$_;
+ $output .= ''.&mt('Could not write metadata, FAIL').
+ ' ';
+ if ($usebuffer) {
+ if (wantarray) {
+ return ($output,0);
+ } else {
+ return 0;
+ }
+ } else {
+ $r->print($output);
+ return 0;
+ }
+ }
+ foreach my $field (sort(keys(%metadatafields))) {
+ unless ($field=~/\./) {
+ my $unikey=$field;
$unikey=~/^([A-Za-z]+)/;
my $tag=$1;
$tag=~tr/A-Z/a-z/;
print $mfh "\n\<$tag";
- foreach (split(/\,/,$metadatakeys{$unikey})) {
- my $value=$metadatafields{$unikey.'.'.$_};
+ foreach my $item (split(/\,/,$metadatakeys{$unikey})) {
+ my $value=$metadatafields{$unikey.'.'.$item};
$value=~s/\"/\'\'/g;
- print $mfh ' '.$_.'="'.$value.'"';
+ print $mfh ' '.$item.'="'.$value.'"';
}
print $mfh '>'.
&HTML::Entities::encode($metadatafields{$unikey},'<>&"')
.''.$tag.'>';
}
}
- $r->print(''.&mt('Wrote Metadata').'
');
+
+ $output .= ''.&mt('Wrote Metadata').'
';
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
print $logfile "\nWrote metadata";
}
@@ -1530,17 +1921,27 @@ sub phasetwo {
$metadatafields{'url'} = $distarget;
$metadatafields{'version'} = 'current';
- my ($error,$success) = &store_metadata(%metadatafields);
- if ($success) {
- $r->print(''.&mt('Synchronized SQL metadata database').'
');
- print $logfile "\nSynchronized SQL metadata database";
- } else {
- $r->print($error);
- print $logfile "\n".$error;
+ unless ($crsauthor) {
+ my ($error,$success) = &store_metadata(%metadatafields);
+ if ($success) {
+ $output .= ''.&mt('Synchronized SQL metadata database').'
';
+ print $logfile "\nSynchronized SQL metadata database";
+ } else {
+ $output .= $error;
+ print $logfile "\n".$error;
+ }
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
}
# --------------------------------------------- Delete author resource messages
my $delresult=&Apache::lonmsg::del_url_author_res_msg($target);
- $r->print(''.&mt('Removing error messages:').' '.$delresult.'
');
+ $output .= ''.&mt('Removing error messages:').' '.$delresult.'
';
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
print $logfile "\nRemoving error messages: $delresult";
# ----------------------------------------------------------- Copy old versions
@@ -1551,11 +1952,21 @@ sub phasetwo {
my $srcf=$2;
my $srct=$3;
my $srcd=$1;
- unless ($srcd=~/^\/home\/httpd\/html\/res/) {
+ my $docroot = $Apache::lonnet::perlvar{'lonDocRoot'};
+ unless ($srcd=~/^\Q$docroot\E\/res/) {
print $logfile "\nPANIC: Target dir is ".$srcd;
- $r->print(
- "Invalid target directory, FAIL ");
- return 0;
+ $output .=
+ "".&mt('Invalid target directory, FAIL')." ";
+ if ($usebuffer) {
+ if (wantarray) {
+ return ($output,0);
+ } else {
+ return 0;
+ }
+ } else {
+ $r->print($output);
+ return 0;
+ }
}
opendir(DIR,$srcd);
while ($filename=readdir(DIR)) {
@@ -1563,26 +1974,42 @@ sub phasetwo {
unlink($srcd.'/'.$filename);
unlink($srcd.'/'.$filename.'.meta');
} else {
- if ($filename=~/\Q$srcf\E\.(\d+)\.\Q$srct\E$/) {
+ if ($filename=~/^\Q$srcf\E\.(\d+)\.\Q$srct\E$/) {
$maxversion=($1>$maxversion)?$1:$maxversion;
}
}
}
closedir(DIR);
$maxversion++;
- $r->print('Creating old version '.$maxversion.'
');
+ $output .= ''.&mt('Creating old version [_1]',$maxversion).'
';
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
print $logfile "\nCreating old version ".$maxversion."\n";
my $copyfile=$srcd.'/'.$srcf.'.'.$maxversion.'.'.$srct;
if (copy($target,$copyfile)) {
print $logfile "Copied old target to ".$copyfile."\n";
- $r->print(''.&mt('Copied old target file').'
');
+ $output .= &Apache::lonhtmlcommon::confirm_success(&mt('Copied old target file'));
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
} else {
print $logfile "Unable to write ".$copyfile.':'.$!."\n";
- $r->print("".&mt('Failed to copy old target').
- ", $!, ".&mt('FAIL')." ");
- return 0;
+ $output .= &Apache::lonhtmlcommon::confirm_success(&mt('Failed to copy old target').", $!",1);
+ if ($usebuffer) {
+ if (wantarray) {
+ return ($output,0);
+ } else {
+ return 0;
+ }
+ } else {
+ $r->print($output);
+ return 0;
+ }
}
# --------------------------------------------------------------- Copy Metadata
@@ -1591,20 +2018,34 @@ sub phasetwo {
if (copy($target.'.meta',$copyfile)) {
print $logfile "Copied old target metadata to ".$copyfile."\n";
- $r->print(''.&mt('Copied old metadata').'
')
+ $output .= &Apache::lonhtmlcommon::confirm_success(&mt('Copied old metadata'));
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
} else {
print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
if (-e $target.'.meta') {
- $r->print(
- "".
-&mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')." ");
- return 0;
+ $output .= &Apache::lonhtmlcommon::confirm_success(
+ &mt('Failed to write old metadata copy').", $!",1);
+ if ($usebuffer) {
+ if (wantarray) {
+ return ($output,0);
+ } else {
+ return 0;
+ }
+ } else {
+ $r->print($output);
+ return 0;
+ }
}
}
-
-
} else {
- $r->print(''.&mt('Initial version').'
');
+ $output .= ''.&mt('Initial version').'
';
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
print $logfile "\nInitial version";
}
@@ -1619,40 +2060,78 @@ sub phasetwo {
$path.="/$parts[$count]";
if ((-e $path)!=1) {
print $logfile "\nCreating directory ".$path;
- $r->print(''.&mt('Created directory').' '.$parts[$count].'
');
mkdir($path,0777);
+ $output .= ''
+ .&mt('Created directory [_1]'
+ ,''.$parts[$count].' ')
+ .'
';
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
}
}
if (copy($source,$copyfile)) {
print $logfile "\nCopied original source to ".$copyfile."\n";
- $r->print(''.&mt('Copied source file').'
');
+ $output .= &Apache::lonhtmlcommon::confirm_success(&mt('Copied source file'));
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
} else {
print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
- $r->print("".
- &mt('Failed to copy source').", $!, ".&mt('FAIL')." ");
- return 0;
+ $output .= &Apache::lonhtmlcommon::confirm_success(
+ &mt('Failed to copy source').", $!",1);
+ if ($usebuffer) {
+ if (wantarray) {
+ return ($output,0);
+ } else {
+ return 0;
+ }
+ } else {
+ $r->print($output);
+ return 0;
+ }
}
+# ---------------------------------------------- Delete local tmp-preview files
+ unlink($copyfile.'.tmp');
# --------------------------------------------------------------- Copy Metadata
$copyfile=$copyfile.'.meta';
if (copy($source.'.meta',$copyfile)) {
print $logfile "\nCopied original metadata to ".$copyfile."\n";
- $r->print(''.&mt('Copied metadata').'
');
+ $output .= &Apache::lonhtmlcommon::confirm_success(&mt('Copied metadata'));
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
} else {
print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
- $r->print(
- "".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')." ");
- return 0;
+ $output .= &Apache::lonhtmlcommon::confirm_success(
+ &mt('Failed to write metadata copy').", $!",1);
+ if ($usebuffer) {
+ if (wantarray) {
+ return ($output,0);
+ } else {
+ return 0;
+ }
+ } else {
+ $r->print($output);
+ return 0;
+ }
+ }
+ unless ($usebuffer) {
+ $r->rflush;
}
- $r->rflush;
# ------------------------------------------------------------- Trigger updates
push(@{$modified_urls},[$target,$source]);
unless ($registered_cleanup) {
- $r->register_cleanup(\¬ify);
+ my $handlers = $r->get_handlers('PerlCleanupHandler');
+ $r->set_handlers('PerlCleanupHandler' => [\¬ify,@{$handlers}]);
$registered_cleanup=1;
}
@@ -1663,28 +2142,51 @@ sub phasetwo {
&Apache::lonnet::devalidate_cache_new('meta',
&Apache::lonnet::declutter($thisdistarget));
+# ------------------------------------------------------------- Everything done
+ $logfile->close();
+ $output .= ''.&mt('Done').'
';
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
+
# ------------------------------------------------ Provide link to new resource
unless ($batch) {
- my $thissrc=$source;
- $thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};
-
+ my $thissrc=&Apache::loncfile::url($source);
my $thissrcdir=$thissrc;
$thissrcdir=~s/\/[^\/]+$/\//;
-
- $r->print(
- ''.
- &mt('View Published Version').' '.
- ''.
- &mt('Back to Source').'
'.
- ''.
- &mt('Back to Source Directory').'
');
+ $output .=
+ &Apache::lonhtmlcommon::actionbox([
+ ''.
+ &mt('View Published Version').
+ ' ',
+ ''.
+ &mt('Back to Source').
+ ' ',
+ ''.
+ &mt('Back to Source Directory').
+ ' ']);
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
+ }
+
+ if ($usebuffer) {
+ if (wantarray) {
+ return ($output,1);
+ } else {
+ return 1;
+ }
+ } else {
+ if (wantarray) {
+ return ('',1);
+ } else {
+ return 1;
+ }
}
- $logfile->close();
- $r->print(''.&mt('Done').'
');
- return 1;
}
# =============================================================== Notifications
@@ -1711,9 +2213,9 @@ sub notify {
# --------------------------------------------------- Notify subscribed courses
my %courses=&coursedependencies($target);
my $now=time;
- foreach (keys %courses) {
- print $logfile "\nNotifying course ".$_.':';
- my ($cdom,$cname)=split(/\_/,$_);
+ foreach my $course (keys(%courses)) {
+ print $logfile "\nNotifying course ".$course.':';
+ my ($cdom,$cname)=split(/\_/,$course);
my $reply=&Apache::lonnet::cput
('versionupdate',{$target => $now},$cdom,$cname);
print $logfile $reply;
@@ -1721,20 +2223,18 @@ sub notify {
print $logfile "\n============ Done ============\n";
$logfile->close();
}
+ if ($lock) { &Apache::lonnet::remove_lock($lock); }
return OK;
}
#########################################
sub batchpublish {
- my ($r,$srcfile,$targetfile)=@_;
+ my ($r,$srcfile,$targetfile,$nokeyref,$usebuffer)=@_;
#publication pollutes %env with form.* values
my %oldenv=%env;
$srcfile=~s/\/+/\//g;
$targetfile=~s/\/+/\//g;
- my $thisdisfn=$srcfile;
- $thisdisfn=~s/\/home\/korte\/public_html\///;
- $srcfile=~s/\/+/\//g;
my $docroot=$r->dir_config('lonDocRoot');
my $thisdistarget=$targetfile;
@@ -1749,48 +2249,107 @@ sub batchpublish {
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
- $r->print(''.&mt('Publishing').' '.$thisdisfn.' ');
+ my $output = ''
+ .&mt('Publishing [_1]',&Apache::loncfile::display($srcfile))
+ .' ';
+ unless ($usebuffer) {
+ $r->print($output);
+ $output = '';
+ }
# phase one takes
# my ($source,$target,$style,$batch)=@_;
- my ($outstring,$error)=&publish($srcfile,$targetfile,$thisembstyle,1);
- $r->print(''.$outstring.'
');
+ my ($outstring,$error)=&publish($srcfile,$targetfile,$thisembstyle,1,$nokeyref);
+
+ if ($usebuffer) {
+ $output .= ''.$outstring.'
';
+ } else {
+ $r->print(''.$outstring.'
');
+ }
# phase two takes
# my ($source,$target,$style,$distarget,batch)=@_;
# $env{'form.allmeta'},$env{'form.title'},$env{'form.author'},...
if (!$error) {
- $r->print('');
- &phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
- $r->print('
');
+ if ($usebuffer) {
+ my ($result,$error) = &phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1,$usebuffer);
+ $output .= ''.$result.'
';
+ } else {
+ &phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
+ }
}
%env=%oldenv;
- return '';
+ if ($usebuffer) {
+ return $output;
+ } else {
+ return '';
+ }
}
#########################################
sub publishdirectory {
- my ($r,$fn,$thisdisfn)=@_;
+ my ($r,$fn,$thisdisfn,$nokeyref,$crsauthor)=@_;
$fn=~s/\/+/\//g;
$thisdisfn=~s/\/+/\//g;
- my $resdir=
- $Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
- $thisdisfn;
- $r->print(''.&mt('Directory').' '.$thisdisfn.' '.
- &mt('Target').': '.$resdir.' ');
+ my $thisdisresdir=$thisdisfn;
+ $thisdisresdir=~s/^\/priv\//\/res\//;
+ my $resdir = $r->dir_config('lonDocRoot').$thisdisresdir;
+ $r->print('');
+ ''.&mt('Recurse').' '.
+ &checkbox('pubrec','include subdirectories').
+ ' '.
+ ''.&mt('Force').' '.
+ &checkbox('forcerepub','force republication of previously published files').' '.
+ &checkbox('forceoverride','force directory level metadata over existing').
+ ' '.
+ ''.&mt('Exclude').' '.
+ &checkbox('excludeunpub','exclude currently unpublished files').' '.
+ &checkbox('excludemod','exclude modified files').' '.
+ &checkbox('excludemodmeta','exclude files with modified metadata').
+ ' '.
+ ''.&mt('Actions').' '.
+ &checkbox('obsolete','make file(s) obsolete').' ');
+ unless ($crsauthor) {
+ $r->print(&common_access('dist',&mt('apply common copyright/distribution'),
+ ['default','domain','public','custom']).' ');
+ }
+ $r->print(&common_access('source',&mt('apply common source availability'),
+ ['closed','open']).
+ ' '
+ );
+ $r->print(&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ .' '
+ );
+ $lock=0;
} else {
+ $r->print(&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ );
+ my %commonaccess;
+ map { $commonaccess{$_} = 1; } &Apache::loncommon::get_env_multiple('form.commonaccess');
+ unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); }
# actually publish things
opendir(DIR,$fn);
my @files=sort(readdir(DIR));
@@ -1804,12 +2363,13 @@ sub publishdirectory {
if ($filename=~/\.(\w+)$/) { $extension=$1; }
if ($cmode&$dirptr) {
if (($filename!~/^\./) && ($env{'form.pubrec'})) {
- &publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename);
+ &publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename,$nokeyref,$crsauthor);
}
} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
-# find out publication status and/or exiting metadata
+# find out publication status and/or existing metadata
my $publishthis=0;
+ my $skipthis;
if (-e $resdir.'/'.$filename) {
my ($rdev,$rino,$rmode,$rnlink,
$ruid,$rgid,$rrdev,$rsize,
@@ -1817,22 +2377,72 @@ sub publishdirectory {
$rblksize,$rblocks)=stat($resdir.'/'.$filename);
if (($rmtime<$cmtime) || ($env{'form.forcerepub'})) {
# previously published, modified now
- $publishthis=1;
- }
- my $meta_cmtime = (stat($fn.'/'.$filename.'.meta'))[9];
- my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
- if ( $meta_rmtime<$meta_cmtime ) {
- $publishthis=1;
+ if ($env{'form.excludemod'}) {
+ $skipthis='mod';
+ } else {
+ $publishthis=1;
+ }
}
+ unless ($skipthis) {
+ my $meta_cmtime = (stat($fn.'/'.$filename.'.meta'))[9];
+ my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
+ if ( $meta_rmtime<$meta_cmtime ) {
+ if ($env{'form.excludemodmeta'}) {
+ $skipthis='modmeta';
+ $publishthis=0;
+ } else {
+ $publishthis=1;
+ }
+ } else {
+ unless (&Apache::loncommon::fileembstyle($extension) eq 'prv') {
+ if ($commonaccess{'dist'}) {
+ my ($currdist,$currdistfile,$currsourceavail);
+ my $currdist = &Apache::lonnet::metadata($thisdisresdir.'/'.$filename,'copyright');
+ if ($currdist eq 'custom') {
+ $currdistfile = &Apache::lonnet::metadata($thisdisresdir.'/'.$filename,'customdistributionfile');
+ }
+ if ($env{'form.commondistselect'} eq 'custom') {
+ if ($env{'form.commoncustomrights'} =~ m{^/res/.+\.rights$}) {
+ if ($currdist eq 'custom') {
+ unless ($env{'form.commoncustomrights'} eq $currdistfile) {
+ $publishthis=1;
+ }
+ } else {
+ $publishthis=1;
+ }
+ }
+ } elsif ($env{'form.commondistselect'} =~ /^default|domain|public$/) {
+ unless ($currdist eq $env{'form.commondistselect'}) {
+ $publishthis=1;
+ }
+ }
+ }
+ }
+ }
+ }
} else {
# never published
- $publishthis=1;
+ if ($env{'form.excludeunpub'}) {
+ $skipthis='unpub';
+ } else {
+ $publishthis=1;
+ }
}
if ($publishthis) {
- &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
+ &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename,$nokeyref);
} else {
- $r->print(' '.&mt('Skipping').' '.$filename.' ');
+ my $reason;
+ if ($skipthis) {
+ $reason = $reasons{$skipthis};
+ } else {
+ $reason = &mt('No changes needed to published resource or metadata');
+ }
+ $r->print(' '.&mt('Skipping').' '.$filename);
+ if ($reason) {
+ $r->print(' ('.$reason.')');
+ }
+ $r->print(' ');
}
$r->rflush();
}
@@ -1846,18 +2456,17 @@ sub publishdirectory {
sub defaultmetapublish {
my ($r,$fn,$cuname,$cudom)=@_;
- $fn=~s/^\/\~$cuname\//\/home\/$cuname\/public_html\//;
unless (-e $fn) {
return HTTP_NOT_FOUND;
}
my $target=$fn;
- $target=~s/^\/home\/$cuname\/public_html\//$Apache::lonnet::perlvar{'lonDocRoot'}\/res\/$cudom\/$cuname\//;
+ $target=~s/^\Q$Apache::lonnet::perlvar{'lonDocRoot'}\E\/priv\//\Q$Apache::lonnet::perlvar{'lonDocRoot'}\E\/res\//;
&Apache::loncommon::content_type($r,'text/html');
$r->send_http_header;
- $r->print(&Apache::loncommon::start_page('Catalog Information Publication'));
+ $r->print(&Apache::loncommon::start_page('Metadata Publication'));
# ---------------------------------------------------------------- Write Source
my $copyfile=$target;
@@ -1869,16 +2478,20 @@ sub defaultmetapublish {
for ($count=5;$count<$#parts;$count++) {
$path.="/$parts[$count]";
if ((-e $path)!=1) {
- $r->print(''.&mt('Created directory').' '.$parts[$count].'
');
mkdir($path,0777);
+ $r->print(''
+ .&mt('Created directory [_1]'
+ ,''.$parts[$count].' ')
+ .'
'
+ );
}
}
if (copy($fn,$copyfile)) {
$r->print(''.&mt('Copied source file').'
');
} else {
- return "".
- &mt('Failed to copy source').", $!, ".&mt('FAIL')." ";
+ return "".
+ &mt('Failed to copy source').", $!, ".&mt('FAIL')." ";
}
# --------------------------------------------------- Send update notifications
@@ -1890,9 +2503,7 @@ sub defaultmetapublish {
$r->print($reply.' ');$r->rflush;
}
# ------------------------------------------------------------------- Link back
- my $link=$fn;
- $link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//;
- $r->print("".&mt('Back to Catalog Information').' ');
+ $r->print("".&mt('Back to Metadata').' ');
$r->print(&Apache::loncommon::end_page());
return OK;
}
@@ -1956,59 +2567,34 @@ sub handler {
# -------------------------------------------------------------- Check filename
my $fn=&unescape($env{'form.filename'});
+ ($cuname,$cudom)=&Apache::lonnet::constructaccess($fn);
+# ----------------------------------------------------- Do we have permissions?
+ unless (($cuname) && ($cudom)) {
+ $r->log_reason($env{'user.name'}.' at '.$env{'user.domain'}.
+ ' trying to publish file '.$env{'form.filename'}.
+ ' - not authorized',
+ $r->filename);
+ return HTTP_NOT_ACCEPTABLE;
+ }
+# ----------------------------------------------------------------- Get docroot
+ $docroot=$r->dir_config('lonDocRoot');
- ($cuname,$cudom)=
- &Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
# special publication: default.meta file
if ($fn=~/\/default.meta$/) {
return &defaultmetapublish($r,$fn,$cuname,$cudom);
}
$fn=~s/\.meta$//;
-
+
+# sanity test on the filename
+
unless ($fn) {
$r->log_reason($cuname.' at '.$cudom.
' trying to publish empty filename', $r->filename);
return HTTP_NOT_FOUND;
}
- unless (($cuname) && ($cudom)) {
- $r->log_reason($cuname.' at '.$cudom.
- ' trying to publish file '.$env{'form.filename'}.
- ' ('.$fn.') - not authorized',
- $r->filename);
- return HTTP_NOT_ACCEPTABLE;
- }
-
- my $home=&Apache::lonnet::homeserver($cuname,$cudom);
- my $allowed=0;
- my @ids=&Apache::lonnet::current_machine_ids();
- foreach my $id (@ids) { if ($id eq $home) { $allowed = 1; } }
- unless ($allowed) {
- $r->log_reason($cuname.' at '.$cudom.
- ' trying to publish file '.$env{'form.filename'}.
- ' ('.$fn.') - not homeserver ('.$home.')',
- $r->filename);
- return HTTP_NOT_ACCEPTABLE;
- }
-
- $fn=~s{^http://[^/]+}{};
- $fn=~s{^/~($match_username)}{/home/$1/public_html};
-
- my $targetdir='';
- $docroot=$r->dir_config('lonDocRoot');
- if ($1 ne $cuname) {
- $r->log_reason($cuname.' at '.$cudom.
- ' trying to publish unowned file '.
- $env{'form.filename'}.' ('.$fn.')',
- $r->filename);
- return HTTP_NOT_ACCEPTABLE;
- } else {
- $targetdir=$docroot.'/res/'.$cudom;
- }
-
-
- unless (-e $fn) {
+ unless (-e $docroot.$fn) {
$r->log_reason($cuname.' at '.$cudom.
' trying to publish non-existing file '.
$env{'form.filename'}.' ('.$fn.')',
@@ -2016,109 +2602,180 @@ sub handler {
return HTTP_NOT_FOUND;
}
-# -------------------------------- File is there and owned, init lookup tables.
+# --------------------------------- File is there and owned, start page output
- %addid=();
-
- {
- my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab');
- while (<$fh>=~/(\w+)\s+(\w+)/) {
- $addid{$1}=$2;
- }
- }
-
- %nokey=();
+ &Apache::loncommon::content_type($r,'text/html');
+ $r->send_http_header;
- {
- my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab');
- while (<$fh>) {
- my $word=$_;
- chomp($word);
- $nokey{$word}=1;
- }
+ # Breadcrumbs
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ my $crumbtext = 'Authoring Space';
+ my $crumbhref = &Apache::loncommon::authorspace($fn);
+ my $crsauthor;
+ if ($env{'request.course.id'}) {
+ my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ if ($crumbhref eq "/priv/$cdom/$cnum/") {
+ $crumbtext = 'Course Authoring Space';
+ $crsauthor = 1;
+ }
}
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => $crumbtext,
+ 'href' => $crumbhref,
+ });
+ &Apache::lonhtmlcommon::add_breadcrumb({
+ 'text' => 'Resource Publication',
+ 'href' => '',
+ });
-# ---------------------------------------------------------- Start page output.
-
- &Apache::loncommon::content_type($r,'text/html');
- $r->send_http_header;
-
my $js='';
- $r->print(&Apache::loncommon::start_page('Resource Publication',$js));
-
-
- my $thisfn=$fn;
-
- my $thistarget=$thisfn;
-
- $thistarget=~s/^\/home/$targetdir/;
- $thistarget=~s/\/public\_html//;
+ my $startargs = {};
+ if ($fn=~/\/$/) {
+ unless ($env{'form.phase'} eq 'two') {
+ $startargs->{'add_entries'} = { onload => 'javascript:setDefaultAccess();' };
+ $js .= <<"END";
+
- my $thisdisfn=$thisfn;
- $thisdisfn=~s/^\/home\/\Q$cuname\E\/public_html\///;
+END
+ }
+ }
+ $r->print(&Apache::loncommon::start_page('Resource Publication',$js,$startargs)
+ .&Apache::lonhtmlcommon::breadcrumbs()
+ .&Apache::loncommon::head_subbox(
+ &Apache::loncommon::CSTR_pageheader($docroot.$fn))
+ );
+
+ my $thisdisfn=&HTML::Entities::encode($fn,'<>&"');
+ my $thistarget=$fn;
+ $thistarget=~s/^\/priv\//\/res\//;
+ my $thisdistarget=&HTML::Entities::encode($thistarget,'<>&"');
+ my $nokeyref = &getnokey($r->dir_config('lonIncludes'));
if ($fn=~/\/$/) {
# -------------------------------------------------------- This is a directory
- &publishdirectory($r,$fn,$thisdisfn);
- $r->print(''.&mt('Return to Directory').' ');
-
-
+ &publishdirectory($r,$docroot.$fn,$thisdisfn,$nokeyref,$crsauthor);
+ $r->print(
+ ' '.
+ &Apache::lonhtmlcommon::actionbox([
+ ''.&mt('Return to Directory').' ']));
} else {
# ---------------------- Evaluate individual file, and then output information.
- $thisfn=~/\.(\w+)$/;
+ $fn=~/\.(\w+)$/;
my $thistype=$1;
my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
if ($thistype eq 'page') { $thisembstyle = 'rat'; }
- $r->print(''.&mt('Publishing').' '.
- &Apache::loncommon::filedescription($thistype).' ');
+ $r->print(''
+ .&mt('Publishing [_1]'
+ ,''.$thisdisfn.' ')
+ .' '
+ );
+
+ $r->print(''.&mt('Resource Details').' ');
+
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
+
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Type'))
+ .&Apache::loncommon::filedescription($thistype)
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Link to Resource'))
+ .''
+ );
$r->print(<
+
$thisdisfn
ENDCAPTION
- $r->print(' '.&mt('Target').': '.
- $thisdistarget.' ');
-
+ $r->print(''
+ .&Apache::lonhtmlcommon::row_closure()
+ );
+
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Target'))
+ .''.$thisdistarget.' '
+ );
if (($cuname ne $env{'user.name'})||($cudom ne $env{'user.domain'})) {
- $r->print(''.&mt('Co-Author').': '.
- $cuname.&mt(' at ').$cudom.' ');
+ $r->print(&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(&mt('Co-Author'))
+ .''
+ .&Apache::loncommon::plainname($cuname,$cudom) .' ('.$cuname.':'.$cudom.')'
+ .' '
+ );
}
if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
+ $r->print(&Apache::lonhtmlcommon::row_closure()
+ .&Apache::lonhtmlcommon::row_title(&mt('Diffs')));
$r->print(<
-
+
ENDDIFF
- $r->print(&mt('Diffs with Current Version').' ');
+ $r->print(&mt('Diffs with Current Version').'');
}
+
+ $r->print(&Apache::lonhtmlcommon::row_closure(1)
+ .&Apache::lonhtmlcommon::end_pick_box()
+ );
-# ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.
+# ---------------------- Publishing from $fn to $thistarget with $thisembstyle.
unless ($env{'form.phase'} eq 'two') {
# ---------------------------------------------------------- Parse for problems
my ($warningcount,$errorcount);
if ($thisembstyle eq 'ssi') {
- ($warningcount,$errorcount)=&checkonthis($r,$thisfn);
+ ($warningcount,$errorcount)=&checkonthis($r,$fn);
}
unless ($errorcount) {
my ($outstring,$error)=
- &publish($thisfn,$thistarget,$thisembstyle);
- $r->print(' '.$outstring);
+ &publish($docroot.$fn,$docroot.$thistarget,$thisembstyle,undef,$nokeyref);
+ $r->print($outstring);
} else {
- $r->print(''.
+ $r->print(''.
&mt('The document contains errors and cannot be published.').
' ');
}
} else {
- &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget);
- $r->print(' ');
+ my ($output,$error) = &phasetwo($r,$docroot.$fn,$docroot.$thistarget,
+ $thisembstyle,$thisdistarget);
+ $r->print($output);
}
}
$r->print(&Apache::loncommon::end_page());
@@ -2126,6 +2783,24 @@ ENDDIFF
return OK;
}
+BEGIN {
+
+# ----------------------------------- Read addid.tab
+ unless ($readit) {
+ %addid=();
+
+ {
+ my $tabdir = $Apache::lonnet::perlvar{'lonTabDir'};
+ my $fh=Apache::File->new($tabdir.'/addid.tab');
+ while (<$fh>=~/(\w+)\s+(\w+)/) {
+ $addid{$1}=$2;
+ }
+ }
+ }
+ $readit=1;
+}
+
+
1;
__END__
@@ -2133,7 +2808,5 @@ __END__
=back
-=back
-
=cut
500 Internal Server Error
Internal Server Error
The server encountered an internal error or
misconfiguration and was unable to complete
your request.
Please contact the server administrator at
root@localhost to inform them of the time this error occurred,
and the actions you performed just before this error.
More information about this error may be available
in the server error log.