loncom/publisher/lonpublisher.pm - diff

Return to lonpublisher.pm CVS log

Up to [LON-CAPA] / loncom / publisher

Diff for /loncom/publisher/lonpublisher.pm between versions 1.140 and 1.248

-version 1.140, 2003/10/21 20:18:45
+version 1.248, 2008/08/27 13:08:36
  Line 25
  #
  # http://www.lon-capa.org/
  #
- #
- # (TeX Content Handler
- #
- # 05/29/00,05/30,10/11 Gerd Kortemeyer)
- #
- # 11/28,11/29,11/30,12/01,12/02,12/04,12/23 Gerd Kortemeyer
- # 03/23 Guy Albertelli
- # 03/24,03/29,04/03 Gerd Kortemeyer
- # 05/03,05/05,05/07 Gerd Kortemeyer
- # 06/23,08/07,08/11,8/13,8/17,8/18,8/24,9/26,10/16 Gerd Kortemeyer
- # 12/04,12/05 Guy Albertelli
- # 12/05 Gerd Kortemeyer
- # 12/05 Guy Albertelli
- # 12/06,12/07 Gerd Kortemeyer
- # 12/25 Gerd Kortemeyer
- # YEAR=2002
- # 1/17 Gerd Kortemeyer
- #
  ###
  ###############################################################################
- Line 136  use Apache::File;
+ Line 118  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::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 LONCAPA qw(:DEFAULT :match);
  my %addid;
  my %nokey;
- Line 153  my $docroot;
+ Line 143  my $docroot;
  my $cuname;
  my $cudom;
+ my $registered_cleanup;
+ my $modified_urls;
+ my $lock;
  =pod
  =item B<metaeval>
- Line 180  nothing
+ Line 175  nothing
  #########################################
  #########################################
+ #
+ # Modifies global %metadatafields %metadatakeys
+ #
  sub metaeval {
      my ($metastring,$prefix)=@_;
- Line 189  sub metaeval {
+ Line 188  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]->{$_};
  Line 210  sub metaeval {
  		}
  	    }
  	    my $newentry=$parser->get_text('/'.$entry);
- 	    if ($entry eq 'customdistributionfile') {
+ 	    if (($entry eq 'customdistributionfile') ||
+ 		($entry eq 'sourcerights')) {
  		$newentry=~s/^\s*//;
  		if ($newentry !~m|^/res|) { $newentry=$prefix.$newentry; }
  	    }
- 	    if ($metadatafields{$unikey}) {
+ # actually store
- 		unless (($metadatafields{$unikey}=~/\Q$newentry\E/) ||
+ 	    if ( $entry eq 'rule' && exists($metadatafields{$unikey})) {
- 			($newentry eq '')) {
+ 		$metadatafields{$unikey}.=','.$newentry;
- 		    $metadatafields{$unikey}.=', '.$newentry;
- 		}
  	    } else {
  		$metadatafields{$unikey}=$newentry;
  	    }
- Line 267  sub metaread {
+ Line 266  sub metaread {
      my ($logfile,$fn,$prefix)=@_;
      unless (-e $fn) {
  	print($logfile 'No file '.$fn."\n");
-         return '<br /><b>No file:</b> <tt>'.$fn.'</tt>';
+         return '<div><b>'
+               .&mt('No file: [_1]'
+                   ,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>');
      }
      print($logfile 'Processing '.$fn."\n");
      my $metastring;
- Line 276  sub metaread {
+ Line 277  sub metaread {
  	$metastring=join('',<$metafh>);
      }
      &metaeval($metastring,$prefix);
-     return '<br /><b>Processed file:</b> <tt>'.$fn.'</tt>';
+     return '<div><b>'
+           .&mt('Processed file: [_1]'
+               ,'</b> <tt>'.&Apache::loncfile::display($fn).'</tt></div>');
  }
  #########################################
- Line 285  sub metaread {
+ Line 288  sub metaread {
  sub coursedependencies {
      my $url=&Apache::lonnet::declutter(shift);
      $url=~s/\.meta$//;
-     my ($adomain,$aauthor)=($url=~/^(\w+)\/(\w+)\//);
+     my ($adomain,$aauthor)=($url=~ m{^($match_domain)/($match_username)/});
-     my $regexp=$url;
+     my $regexp=quotemeta($url);
-     $regexp=~s/(\W)/\\$1/g;
      $regexp='___'.$regexp.'___course';
      my %evaldata=&Apache::lonnet::dump('nohist_resevaldata',$adomain,
  				       $aauthor,$regexp);
- Line 328  string which presents the form field (fo
+ Line 330  string which presents the form field (fo
  #########################################
  #########################################
  sub textfield {
-     my ($title,$name,$value)=@_;
+     my ($title,$name,$value,$noline)=@_;
+     $value=~s/^\s+//gs;
+     $value=~s/\s+$//gs;
+     $value=~s/\s+/ /gs;
+     $title=&mt($title);
+     $env{'form.'.$name}=$value;
+     return "\n".&Apache::lonhtmlcommon::row_title($title)
+            .'<input type="text" name="'.$name.'" size="80" value="'.$value.'" />'
+            .&Apache::lonhtmlcommon::row_closure($noline);
+ }
+ sub text_with_browse_field {
+     my ($title,$name,$value,$restriction,$noline)=@_;
+     $value=~s/^\s+//gs;
+     $value=~s/\s+$//gs;
+     $value=~s/\s+/ /gs;
      $title=&mt($title);
-     my $uctitle=uc($title);
+     $env{'form.'.$name}=$value;
-     return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+     return "\n".&Apache::lonhtmlcommon::row_title($title)
-            "</b></font></p><br />".
+           .'<input type="text" name="'.$name.'" size="80" value="'.$value.'" />'
-            '<input type="text" name="'.$name.'" size=80 value="'.$value.'" />';
+           .'<br />'
+ 	  .'<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">'
+           .&mt('Select')
+           .'</a>&nbsp;'
+ 	  .'<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">'
+           .&mt('Search')
+           .'</a>'
+           .&Apache::lonhtmlcommon::row_closure($noline);
  }
  sub hiddenfield {
      my ($name,$value)=@_;
+     $env{'form.'.$name}=$value;
      return "\n".'<input type="hidden" name="'.$name.'" value="'.$value.'" />';
  }
+ sub checkbox {
+     my ($name,$text)=@_;
+     return "\n<br /><label><input type='checkbox' name='$name' /> ".
+ 	&mt($text)."</label>";
+ }
  sub selectbox {
      my ($title,$name,$value,$functionref,@idlist)=@_;
      $title=&mt($title);
-     my $uctitle=uc($title);
      $value=(split(/\s*,\s*/,$value))[-1];
-     my $selout="\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
+     if (defined($value)) {
- 	'</b></font></p><br /><select name="'.$name.'">';
+ 	$env{'form.'.$name}=$value;
+     } else {
+ 	$env{'form.'.$name}=$idlist[0];
+     }
+     my $selout="\n".&Apache::lonhtmlcommon::row_title($title)
+               .'<select name="'.$name.'">';
      foreach (@idlist) {
          $selout.='<option value=\''.$_.'\'';
          if ($_ eq $value) {
- Line 355  sub selectbox {
+ Line 390  sub selectbox {
  	}
          else {$selout.='>'.&{$functionref}($_).'</option>';}
      }
-     return $selout.'</select>';
+     $selout.='</select>'.&Apache::lonhtmlcommon::row_closure();
+     return $selout;
  }
+ sub select_level_form {
+     my ($value,$name)=@_;
+     $env{'form.'.$name}=$value;
+     if (!defined($value)) { $env{'form.'.$name}=0; }
+     return  &Apache::loncommon::select_level_form($value,$name);
+ }
  #########################################
  #########################################
- Line 379  sub urlfixup {
+ Line 421  sub urlfixup {
      if ($url =~ /^mailto:/i) { return $url; }
      #internal document links need no fixing
      if ($url =~ /^\#/) { return $url; }
-     my ($host)=($url=~/(?:http\:\/\/)*([^\/]+)/);
+     my ($host)=($url=~m{(?:(?:http|https|ftp)://)*([^/]+)});
-     foreach (values %Apache::lonnet::hostname) {
+     my @lonids = &Apache::lonnet::machine_ids($host);
- 	if ($_ eq $host) {
+     if (@lonids) {
- 	    $url=~s/^http\:\/\///;
+ 	$url=~s{^(?:http|https|ftp)://}{};
-             $url=~s/^$host//;
+ 	$url=~s/^\Q$host\E//;
-         }
      }
-     if ($url=~/^http\:\/\//) { return $url; }
+     if ($url=~m{^(?:http|https|ftp)://}) { return $url; }
-     $url=~s/\~$cuname/res\/$cudom\/$cuname/;
+     $url=~s{\Q~$cuname\E}{res/$cudom/$cuname};
      return $url;
  }
- Line 438  sub set_allow {
+ Line 479  sub set_allow {
      }
      if (($newurl !~ /^javascript:/i) &&
  	($newurl !~ /^mailto:/i) &&
- 	($newurl !~ /^http:/i) &&
+ 	($newurl !~ /^(?:http|https|ftp):/i) &&
  	($newurl !~ /^\#/)) {
  	$$allow{&absoluteurl($newurl,$target)}=1;
      }
-     return $return_url
+     return $return_url;
  }
  #########################################
- Line 465  sub get_subscribed_hosts {
+ Line 506  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') &&
+ 	    if (($subhost ne 'meta'
+ 		 && $subhost ne 'subscription'
+ 		 && $subhost ne 'meta.subscription'
+ 		 && $subhost ne 'tmp') &&
                  ($subhost ne $Apache::lonnet::perlvar{'lonHostID'})) {
  		push(@subscribed,$subhost);
  	    }
- Line 477  sub get_subscribed_hosts {
+ Line 523  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>) {
- 	    &Apache::lonnet::logthis("Trying $subline");
+ 	    if ($subline =~ /^($match_lonid):/) {
- 	    if ($subline =~ /(^\w+):/) {
                  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;
  }
- Line 519  sub get_max_ids_indices {
+ Line 559  sub get_max_ids_indices {
      my %duplicatedids;
      my $parser=HTML::LCParser->new($content);
+     $parser->xml_mode(1);
      my $token;
      while ($token=$parser->get_token) {
  	if ($token->[0] eq 'S') {
  	    my $counter;
  	    if ($counter=$addid{$token->[1]}) {
  		if ($counter eq 'id') {
- 		    if (defined($token->[2]->{'id'})) {
+ 		    if (defined($token->[2]->{'id'}) &&
+ 			$token->[2]->{'id'} !~ /^\s*$/) {
  			$maxid=($token->[2]->{'id'}>$maxid)?$token->[2]->{'id'}:$maxid;
  			if (exists($allids{$token->[2]->{'id'}})) {
  			    $duplicateids=1;
- Line 537  sub get_max_ids_indices {
+ Line 579  sub get_max_ids_indices {
  			$needsfixup=1;
  		    }
  		} else {
- 		    if (defined($token->[2]->{'index'})) {
+ 		    if (defined($token->[2]->{'index'}) &&
+ 			$token->[2]->{'index'} !~ /^\s*$/) {
  			$maxindex=($token->[2]->{'index'}>$maxindex)?$token->[2]->{'index'}:$maxindex;
  		    } else {
  			$needsfixup=1;
- Line 579  sub get_all_text_unbalanced {
+ Line 622  sub get_all_text_unbalanced {
  	} elsif ($token->[0] eq 'E')  {
  	    $result.=$token->[2];
  	}
- 	if ($result =~ /(.*)\Q$tag\E(.*)/s) {
+ 	if ($result =~ /\Q$tag\E/s) {
+ 	    ($result,my $redo)=$result =~ /(.*)\Q$tag\E(.*)/is;
  	    #&Apache::lonnet::logthis('Got a winner with leftovers ::'.$2);
  	    #&Apache::lonnet::logthis('Result is :'.$1);
- 	    $result=$1;
+ 	    $redo=$tag.$redo;
- 	    my $redo=$tag.$2;
  	    push (@$pars,HTML::LCParser->new(\$redo));
  	    $$pars[-1]->xml_mode('1');
  	    last;
- Line 623  sub fix_ids_and_indices {
+ Line 666  sub fix_ids_and_indices {
  			   join(', ',@duplicatedids));
      if ($duplicateids) {
  	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='<span class="LC_error">'.&mt('Unable to publish file, it contains duplicated ID(s), ID(s) need to be unique. The duplicated ID(s) are').': '.join(', ',@duplicatedids).'</span>';
  	return ($outstring,1);
      }
      if ($needsfixup) {
- Line 632  sub fix_ids_and_indices {
+ Line 675  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);
- Line 646  sub fix_ids_and_indices {
+ Line 690  sub fix_ids_and_indices {
  		    $allow{$token->[2]->{'src'}}=1;
  		    next;
  		}
+ 		if ($lctag eq 'base') { next; }
+                 if (($lctag eq 'part') || ($lctag eq 'problem')) {
+                     $responsecounter=0;
+                 }
+                 if ($lctag=~/response$/) { $responsecounter++; }
  		my %parms=%{$token->[2]};
  		$counter=$addid{$tag};
  		if (!$counter) { $counter=$addid{$lctag}; }
  		if ($counter) {
  		    if ($counter eq 'id') {
- 			unless (defined($parms{'id'})) {
+ 			unless (defined($parms{'id'}) &&
+ 				$parms{'id'}!~/^\s*$/) {
  			    $maxid++;
  			    $parms{'id'}=$maxid;
- 			    print $logfile 'ID: '.$tag.':'.$maxid."\n";
+ 			    print $logfile 'ID(new) : '.$tag.':'.$maxid."\n";
+ 			} else {
+ 			    print $logfile 'ID(kept): '.$tag.':'.$parms{'id'}."\n";
  			}
  		    } elsif ($counter eq 'index') {
- 			unless (defined($parms{'index'})) {
+ 			unless (defined($parms{'index'}) &&
+ 				$parms{'index'}!~/^\s*$/) {
  			    $maxindex++;
  			    $parms{'index'}=$maxindex;
  			    print $logfile 'Index: '.$tag.':'.$maxindex."\n";
  			}
  		    }
  		}
- 		foreach my $type ('src','href','background','bgimg') {
+                 unless ($parms{'type'} eq 'zombie') {
- 		    foreach my $key (keys(%parms)) {
+ 		    foreach my $type ('src','href','background','bgimg') {
- 			if ($key =~ /^$type$/i) {
+ 			foreach my $key (keys(%parms)) {
- 			    $parms{$key}=&set_allow(\%allow,$logfile,
+ 			    if ($key =~ /^$type$/i) {
- 						    $target,$tag,
+ 				$parms{$key}=&set_allow(\%allow,$logfile,
- 						    $parms{$key});
+ 							$target,$tag,
+ 							$parms{$key});
+ 			    }
  			}
  		    }
  		}
- Line 680  sub fix_ids_and_indices {
+ Line 735  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]);
- Line 688  sub fix_ids_and_indices {
+ Line 744  sub fix_ids_and_indices {
  		}
  		if ($lctag eq 'applet') {
  		    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=~/\/$/) {
  			    $oldcodebase.='/';
  			}
- Line 703  sub fix_ids_and_indices {
+ Line 766  sub fix_ids_and_indices {
  			}
  			$allow{&absoluteurl($codebase,$target).'/*'}=1;
  		    } 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);
  				$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;
  			    }
  			}
- Line 728  sub fix_ids_and_indices {
+ Line 790  sub fix_ids_and_indices {
  		}
  		if (!$endtag) { if ($token->[4]=~m:/>$:) { $endtag=' /'; }; }
  		$outstring.='<'.$tag.$newparmstring.$endtag.'>';
- 		if ($lctag eq 'm' || $lctag eq 'script'
+ 		if ($lctag eq 'm' || $lctag eq 'script' || $lctag eq 'answer'
                      || $lctag eq 'display' || $lctag eq 'tex') {
  		    $outstring.=&get_all_text_unbalanced('/'.$lctag,\@parser);
  		}
- Line 737  sub fix_ids_and_indices {
+ Line 799  sub fix_ids_and_indices {
  		    unless ($token->[1] eq 'allow') {
  			$outstring.='</'.$token->[1].'>';
  		    }
- 		}
+                 }
+                 if ((($token->[1] eq 'part') || ($token->[1] eq 'problem'))
+                     && (!$responsecounter)) {
+                     my $outstring='<span class="LC_error">'.&mt('Found [_1] without responses. This resource cannot be published.',$token->[1]).'</span>';
+                     return ($outstring,1);
+                 }
  	    } else {
  		$outstring.=$token->[1];
  	    }
- Line 775  Returns: (error,status).  error is undef
+ Line 842  Returns: (error,status).  error is undef
  #########################################
  #########################################
  sub store_metadata {
-     my %metadata = %{shift()};
+     my %metadata = @_;
      my $error;
      # Determine if the table exists
      my $status = &Apache::lonmysql::check_table('metadata');
      if (! defined($status)) {
-         $error='<font color="red">WARNING: Cannot connect to '.
+         $error='<span class="LC_error">'
-             'database!</font>';
+               .&mt('WARNING: Cannot connect to database!')
+               .'</span>';
          &Apache::lonnet::logthis($error);
          return ($error,undef);
      }
      if ($status == 0) {
          # It would be nice to actually create the table....
-         $error ='<font color="red">WARNING: The metadata table does not '.
+         $error ='<span class="LC_error">'
-             'exist in the LON-CAPA database.</font>';
+                .&mt('WARNING: The metadata table does not exist in the LON-CAPA database!')
+                .'</span>';
          &Apache::lonnet::logthis($error);
          return ($error,undef);
      }
-     # Remove old value from table
+     my $dbh = &Apache::lonmysql::get_dbh();
-     $status = &Apache::lonmysql::remove_from_table
+     if (($metadata{'obsolete'}) || ($metadata{'copyright'} eq 'priv')) {
-         ('metadata','url',$metadata{'url'});
+         # remove this entry
-     if (! defined($status)) {
+ 	my $delitem = 'url = '.$dbh->quote($metadata{'url'});
-         $error = '<font color="red">Error when removing old values from '.
+ 	$status = &LONCAPA::lonmetadata::delete_metadata($dbh,undef,$delitem);
-             'metadata table in LON-CAPA database.</font>';
-         &Apache::lonnet::logthis($error);
+     } else {
-         return ($error,undef);
+         $status = &LONCAPA::lonmetadata::update_metadata($dbh,undef,undef,
+                                                          \%metadata);
      }
-     # Store data in table.
+     if (defined($status) && $status ne '') {
-     $status = &Apache::lonmysql::store_row('metadata',\%metadata);
+         $error='<span class="LC_error">'
-     if (! defined($status)) {
+               .&mt('Error occurred saving new values in metadata table in LON-CAPA database!')
-         $error='<font color="red">Error occured storing new values in '.
+               .'</span>';
-             'metadata table in LON-CAPA database</font>';
          &Apache::lonnet::logthis($error);
+         &Apache::lonnet::logthis($status);
          return ($error,undef);
      }
-     return (undef,$status);
+     return (undef,'success');
+ }
+ # ========================================== Parse file for errors and warnings
+ sub checkonthis {
+     my ($r,$source)=@_;
+     my $uri=&Apache::lonnet::hreflocation($source);
+     $uri=~s/\/$//;
+     my $result=&Apache::lonnet::ssi_body($uri,
+ 					 ('grade_target'=>'web',
+ 					  'return_only_error_and_warning_counts' => 1));
+     my ($errorcount,$warningcount)=split(':',$result);
+     if (($errorcount) || ($warningcount)) {
+         $r->print('<h3>'.&mt('Warnings and Errors').'</h3>');
+         $r->print('<tt>'.$uri.'</tt>:');
+         $r->print('<ul>');
+         if ($warningcount) {
+             $r->print('<li><div class="LC_warning">'
+                      .&mt('[quant,_1,warning]',$warningcount)
+                      .'</div></li>');
+         }
+         if ($errorcount) {
+             $r->print('<li><div class="LC_error">'
+                      .&mt('[quant,_1,error]',$errorcount)
+                      .' <img src="/adm/lonMisc/bomb.gif" />'
+                      .'</div></li>');
+         }
+         $r->print('</ul>');
+     } else {
+ 	#$r->print('<font color="green">'.&mt('ok').'</font>');
+     }
+     $r->rflush();
+     return ($warningcount,$errorcount);
+ }
+ # ============================================== Parse file itself for metadata
+ #
+ # parses a file with target meta, sets global %metadatafields %metadatakeys
+ sub parseformeta {
+     my ($source,$style)=@_;
+     my $allmeta='';
+     if (($style eq 'ssi') || ($style eq 'prv')) {
+ 	my $dir=$source;
+ 	$dir=~s-/[^/]*$--;
+ 	my $file=$source;
+ 	$file=(split('/',$file))[-1];
+         $source=&Apache::lonnet::hreflocation($dir,$file);
+ 	$allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta'));
+         &metaeval($allmeta);
+     }
+     return $allmeta;
  }
  #########################################
- Line 824  backup copies, performs any automatic pr
+ Line 947  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<Additional documentation needed.>
- Line 843  sub publish {
+ Line 966  sub publish {
      my %allow=();
      unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
- 	return ('<font color="red">No write permission to user directory, FAIL</font>',1);
+ 	return ('<span class="LC_error">'.&mt('No write permission to user directory, FAIL').'</span>',1);
      }
      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";
      if (($style eq 'ssi') || ($style eq 'rat') || ($style eq 'prv')) {
  # ------------------------------------------------------- This needs processing
- Line 857  sub publish {
+ Line 980  sub publish {
  	    print $logfile "Copied original file to ".$copyfile."\n";
          } else {
  	    print $logfile "Unable to write backup ".$copyfile.':'.$!."\n";
- 	    return ("<font color=\"red\">Failed to write backup copy, $!,FAIL</font>",1);
+ 	    return ("<span class=\"LC_error\">".&mt("Failed to write backup copy, [_1], FAIL",$1)."</span>",1);
          }
  # ------------------------------------------------------------- IDs and indices
- Line 867  sub publish {
+ Line 990  sub publish {
  	if ($error) { return ($outstring,$error); }
  # ------------------------------------------------------------ Construct Allows
- 	$scrout.='<h3>Dependencies</h3>';
+         my $outdep=''; # Collect dependencies output data
          my $allowstr='';
-         foreach (sort(keys(%allow))) {
+         foreach my $thisdep (sort(keys(%allow))) {
- 	   my $thisdep=$_;
  	   if ($thisdep !~ /[^\s]/) { next; }
+            if ($thisdep =~/\$/) {
+               $outdep.='<div class="LC_warning">'
+                        .&mt('The resource depends on another resource with variable filename, i.e., [_1].','<tt>'.$thisdep.'</tt>').'<br />'
+                        .&mt('You likely need to explicitly allow access to all possible dependencies using the [_1]-tag.','<tt>&lt;allow&gt;</tt>')
+                        ."</div>\n";
+            }
             unless ($style eq 'rat') {
                $allowstr.="\n".'<allow src="'.$thisdep.'" />';
  	   }
-            $scrout.='<br />';
+           $outdep.='<div>';
-            unless ($thisdep=~/\*/) {
+            if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
- 	       $scrout.='<a href="'.$thisdep.'">';
+ 	       $outdep.='<a href="'.$thisdep.'">';
             }
-            $scrout.='<tt>'.$thisdep.'</tt>';
+            $outdep.='<tt>'.$thisdep.'</tt>';
-            unless ($thisdep=~/\*/) {
+            if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
- 	       $scrout.='</a>';
+ 	       $outdep.='</a>';
                 if (
         &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
                                              $thisdep.'.meta') eq '-1') {
- 		   $scrout.= ' - <font color="red">Currently not available'.
+ 		   $outdep.= ' - <span class="LC_error">'.&mt('Currently not available').
- 		       '</font>';
+ 		       '</span>';
                 } else {
                     my %temphash=(&Apache::lonnet::declutter($target).'___'.
                               &Apache::lonnet::declutter($thisdep).'___usage'
                                   => time);
-                    $thisdep=~/^\/res\/(\w+)\/(\w+)\//;
+                    $thisdep=~m{^/res/($match_domain)/($match_username)/};
                     if ((defined($1)) && (defined($2))) {
                        &Apache::lonnet::put('nohist_resevaldata',\%temphash,
  					   $1,$2);
  		   }
  	       }
             }
+            $outdep.='</div><br />';
+         }
+         if ($outdep) {
+             $scrout.='<h3>'.&mt('Dependencies').'</h3>'
+                     .$outdep
          }
-         $outstring=~s/\n*(\<\/[^\>]+\>)\s*$/$allowstr\n$1\n/s;
+         $outstring=~s/\n*(\<\/[^\>]+\>[^<]*)$/$allowstr\n$1\n/s;
- ### FIXME: is this really what we want?
- # I dont' think so, to will corrupt any UTF-8 resources at least,
- # and any encoding other than ISO-8859-1 will probably break
- 	#Encode any High ASCII characters
- 	#$outstring=&HTML::Entities::encode($outstring,"\200-\377");
  # ------------------------------------------------------------- Write modified.
          {
            my $org;
            unless ($org=Apache::File->new('>'.$source)) {
               print $logfile "No write permit to $source\n";
-              return ('<font color="red">'.&mt('No write permission to').
+              return ('<span class="LC_error">'.&mt('No write permission to').
  		     ' '.$source.
- 		     ', '.&mt('FAIL').'</font>',1);
+ 		     ', '.&mt('FAIL').'</span>',1);
  	  }
            print($org $outstring);
          }
- Line 924  sub publish {
+ Line 1053  sub publish {
  # -------------------------------------------- Initial step done, now metadata.
  # --------------------------------------- Storage for metadata keys and fields.
+ # these are globals
+ #
       %metadatafields=();
       %metadatakeys=();
- Line 932  sub publish {
+ Line 1062  sub publish {
      unless ($batch) {
       $scrout.='<h3>'.&mt('Metadata Information').' ' .
-        Apache::loncommon::help_open_topic("Metadata_Description")
+        &Apache::loncommon::help_open_topic("Metadata_Description")
         . '</h3>';
      }
  # ------------------------------------------------ First, check out environment
-      unless (-e $source.'.meta') {
+      if ((!(-e $source.'.meta')) || ($env{'form.forceoverride'})) {
-         $metadatafields{'author'}=$ENV{'environment.firstname'}.' '.
+         $metadatafields{'author'}=$env{'environment.firstname'}.' '.
- 	                          $ENV{'environment.middlename'}.' '.
+ 	                          $env{'environment.middlename'}.' '.
- 		                  $ENV{'environment.lastname'}.' '.
+ 		                  $env{'environment.lastname'}.' '.
- 		                  $ENV{'environment.generation'};
+ 		                  $env{'environment.generation'};
          $metadatafields{'author'}=~s/\s+/ /g;
          $metadatafields{'author'}=~s/\s+$//;
-         $metadatafields{'owner'}=$cuname.'@'.$cudom;
+         $metadatafields{'owner'}=$cuname.':'.$cudom;
- 	$metadatafields{'modifyinguser'}=$ENV{'user.name'}.'@'.
- 	                                 $ENV{'user.domain'};
- 	$metadatafields{'authorspace'}=$cuname.'@'.$cudom;
  # ------------------------------------------------ Check out directory hierachy
- Line 966  sub publish {
+ Line 1093  sub publish {
  	    $prefix=~s|^\.\./||;
          }
+ # ----------------------------------------------------------- Parse file itself
+ # read %metadatafields from file itself
+ 	$allmeta=&parseformeta($source,$style);
  # ------------------- Clear out parameters and stores (there should not be any)
          foreach (keys %metadatafields) {
- Line 985  sub publish {
+ Line 1117  sub publish {
  		delete $metadatafields{$_};
              }
          }
+ # ------------------------------------------------------------- Save some stuff
-     }
+         my %savemeta=();
+         foreach ('title') {
- # -------------------------------------------------- Parse content for metadata
+             $savemeta{$_}=$metadatafields{$_};
-     if (($style eq 'ssi') || ($style eq 'prv')) {
+ 	}
- 	my $dir=$source;
+ # ------------------------------------------ See if anything new in file itself
- 	$dir=~s-/[^/]*$--;
- 	my $file=$source;
+ 	$allmeta=&parseformeta($source,$style);
- 	$file=(split('/',$file))[-1];
+ # ----------------------------------------------------------- Restore the stuff
-         $source=&Apache::lonnet::hreflocation($dir,$file);
+         foreach (keys %savemeta) {
- 	$allmeta=&Apache::lonnet::ssi_body($source,('grade_target' => 'meta'));
+ 	    $metadatafields{$_}=$savemeta{$_};
+ 	}
+    }
-         &metaeval($allmeta);
-     }
  # ---------------- Find and document discrepancies in the parameters and stores
      my $chparms='';
- Line 1006  sub publish {
+ Line 1139  sub publish {
  	if (($_=~/^parameter/) || ($_=~/^stores/)) {
  	    unless ($_=~/\.\w+$/) {
  		unless ($oldparmstores{$_}) {
- 		    print $logfile 'New: '.$_."\n";
+ 		    my $disp_key = $_;
- 		    $chparms.=$_.' ';
+ 		    $disp_key =~ tr/\0/_/;
+ 		    print $logfile ('New: '.$disp_key."\n");
+ 		    $chparms .= $disp_key.' ';
  		}
  	    }
  	}
      }
      if ($chparms) {
- 	$scrout.='<p><b>'.&mt('New parameters or stored values').
+ 	$scrout.='<p><b>'.&mt('New parameters or saved values').
  	    ':</b> '.$chparms.'</p>';
      }
- Line 1022  sub publish {
+ Line 1157  sub publish {
  	if (($_=~/^parameter/) || ($_=~/^stores/)) {
  	    unless (($metadatafields{$_.'.name'}) ||
  		    ($metadatafields{$_.'.package'}) || ($_=~/\.\w+$/)) {
- 		print $logfile 'Obsolete: '.$_."\n";
+ 		my $disp_key = $_;
- 		$chparms.=$_.' ';
+ 		$disp_key =~ tr/\0/_/;
+ 		print $logfile ('Obsolete: '.$disp_key."\n");
+ 		$chparms.=$disp_key.' ';
  	    }
  	}
      }
      if ($chparms) {
- 	$scrout.='<p><b>'.&mt('Obsolete parameters or stored values').':</b> '.
+ 	$scrout.='<p><b>'.&mt('Obsolete parameters or saved values').':</b> '.
- 	    $chparms.'</p>';
+ 	    $chparms.'</p><h1><span class="LC_warning">'.&mt('Warning!').
+ 	    '</span></h1><p><span class="LC_warning">'.
+ 	    &mt('If this resource is in active use, student performance data from the previous version may become inaccessible.').'</span></p><hr />';
+     }
+     if ($metadatafields{'copyright'} eq 'priv') {
+         $scrout.='</p><h1><span class="LC_warning">'.&mt('Warning!').
+             '</span></h1><p><span class="LC_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.').'</span></p><hr />';
      }
  # ------------------------------------------------------- Now have all metadata
- Line 1041  sub publish {
+ Line 1185  sub publish {
  	$textonly=~s/\<script[^\<]+\<\/script\>//g;
  	$textonly=~s/\<m\>[^\<]+\<\/m\>//g;
  	$textonly=~s/\<[^\>]*\>//g;
- 	$textonly=~tr/A-Z/a-z/;
- 	$textonly=~s/[\$\&][a-z]\w*//g;
- 	$textonly=~s/[^a-z\s]//g;
- 	foreach ($textonly=~m/(\w+)/g) {
- 	    unless ($nokey{$_}) {
- 		$keywords{$_}=1;
- 	    }
- 	}
-     }
+         #this is a work simplification for german authors for present
+         $textonly=HTML::Entities::decode($textonly);           #decode HTML-character
+         $textonly=Encode::Encoder::encode('utf8', $textonly);  #encode to perl internal unicode
+         $textonly=~tr/A-ZÜÄÖ/a-züäö/;      #add lowercase rule for german "Umlaute"
+         $textonly=~s/[\$\&][a-z]\w*//g;
+         $textonly=~s/[^a-z^ü^ä^ö^ß\s]//g;  #dont delete german "Umlaute"
+         foreach ($textonly=~m/[^\s]+/g) {  #match all but whitespaces
+             unless ($nokey{$_}) {
+                 $keywords{$_}=1;
+             }
+         }
+     }
-     foreach (split(/\W+/,$metadatafields{'keywords'})) {
+     foreach my $addkey (split(/[\"\'\,\;]/,$metadatafields{'keywords'})) {
- 	$keywords{$_}=1;
+ 	$addkey=~s/\s+/ /g;
+ 	$addkey=~s/^\s//;
+ 	$addkey=~s/\s$//;
+ 	if ($addkey=~/\w/) {
+ 	    $keywords{$addkey}=1;
+ 	}
      }
  # --------------------------------------------------- Now we also have keywords
  # =============================================================================
- # INTERACTIVE MODE
+ # interactive mode html goes into $intr_scrout
- #
+ # batch mode throws away this HTML
-     unless ($batch) {
+ # additionally all of the field functions have a by product of setting
-         $scrout.=
+ #   $env{'from.'..} so that it can be used by the phase two handler in
- 	    '<form name="pubform" action="/adm/publish" method="post">'.
+ #    batch mode
-             '<p><input type="submit" value="Finalize Publication" /></p>'.
-             &hiddenfield('phase','two').
+     my $intr_scrout.='<br />'
-             &hiddenfield('filename',$ENV{'form.filename'}).
+                     .'<form name="pubform" action="/adm/publish" method="post">';
- 	    &hiddenfield('allmeta',&Apache::lonnet::escape($allmeta)).
+     unless ($env{'form.makeobsolete'}) {
-             &hiddenfield('dependencies',join(',',keys %allow)).
+        $intr_scrout.='<p class="LC_warning">'
-             &textfield('Title','title',$metadatafields{'title'}).
+                     .&mt('Searching for your resource will be based on the following metadata. Please provide as much data as possible.')
-             &textfield('Author(s)','author',$metadatafields{'author'}).
+                     .'</p>'
- 	    &textfield('Subject','subject',$metadatafields{'subject'});
+                     .'<p><input type="submit" value="'
+                     .&mt('Finalize Publication')
- # --------------------------------------------------- Scan content for keywords
+                     .'" /></p>';
+     }
+     $intr_scrout.=&Apache::lonhtmlcommon::start_pick_box();
+     $intr_scrout.=
+ 	&hiddenfield('phase','two').
+ 	&hiddenfield('filename',$env{'form.filename'}).
+ 	&hiddenfield('allmeta',&escape($allmeta)).
+ 	&hiddenfield('dependencies',join(',',keys %allow));
+     unless ($env{'form.makeobsolete'}) {
+        $intr_scrout.=
+ 	&textfield('Title','title',$metadatafields{'title'}).
+ 	&textfield('Author(s)','author',$metadatafields{'author'}).
+ 	&textfield('Subject','subject',$metadatafields{'subject'});
+  # --------------------------------------------------- Scan content for keywords
-         my $keywords_help = Apache::loncommon::help_open_topic("Publishing_Keywords");
+     my $keywords_help = &Apache::loncommon::help_open_topic("Publishing_Keywords");
- 	my $keywordout=<<"END";
+     my $keywordout=<<"END";
  <script>
  function checkAll(field) {
      for (i = 0; i < field.length; i++)
- Line 1087  function uncheckAll(field) {
+ Line 1254  function uncheckAll(field) {
          field[i].checked = false ;
  }
  </script>
- <p><font color="#800000" face="helvetica"><b>KEYWORDS:</b></font>
-  $keywords_help</b>
- <input type="button" value="check all" onclick="javascript:checkAll(document.pubform.keywords)" />
- <input type="button" value="uncheck all" onclick="javascript:uncheckAll(document.pubform.keywords)" />
- </p>
- <br />
  END
- 	$keywordout.='<table border="2"><tr>';
+     $keywordout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Keywords'))
- 	my $colcount=0;
+                 .$keywords_help
+                 .'<input type="button" value="'.&mt('check all').'" onclick="javascript:checkAll(document.pubform.keywords)" />'
+                 .'<input type="button" value="'.&mt('uncheck all').'" onclick="javascript:uncheckAll(document.pubform.keywords)" />'
+                 .'</p><br />'
+                 .&Apache::loncommon::start_data_table();
+     my $cols_per_row = 10;
+     my $colcount=0;
+     my $wordcount=0;
+     my $numkeywords = scalar(keys(%keywords));
+     foreach my $word (sort(keys(%keywords))) {
+         if ($colcount == 0) {
+             $keywordout .= &Apache::loncommon::start_data_table_row();
+         }
+         $colcount++;
+         $wordcount++;
+         if (($wordcount == $numkeywords) && ($colcount < $cols_per_row)) {
+             my $colspan = 1+$cols_per_row-$colcount;
+             $keywordout .= '<td colspan="'.$colspan.'">';
+         } else {
+             $keywordout .= '<td>';
+         }
+         $keywordout.='<label><input type="checkbox" name="keywords" value="'.$word.'"';
+         if ($metadatafields{'keywords'}) {
+             if ($metadatafields{'keywords'}=~/\Q$word\E/) {
+                 $keywordout.=' checked="on"';
+                 $env{'form.keywords'}.=$word.',';
+             }
+         } elsif (&Apache::loncommon::keyword($word)) {
+             $keywordout.=' checked="on"';
+             $env{'form.keywords'}.=$word.',';
+         }
+         $keywordout.=' />'.$word.'</label></td>';
+         if ($colcount == $cols_per_row) {
+             $keywordout.=&Apache::loncommon::end_data_table_row();
+             $colcount=0;
+         }
+     }
+     if ($colcount > 0) {
+         $keywordout .= &Apache::loncommon::end_data_table_row();
+     }
- 	foreach (sort keys %keywords) {
+     $env{'form.keywords'}=~s/\,$//;
- 	    $keywordout.='<td><input type="checkbox" name="keywords" value="'.$_.'"';
- 	    if ($metadatafields{'keywords'}) {
- 		if ($metadatafields{'keywords'}=~/\Q$_\E/) {
- 		    $keywordout.=' checked="on"';
- 		}
- 	    } elsif (&Apache::loncommon::keyword($_)) {
- 		$keywordout.=' checked="on"';
- 	    }
- 	    $keywordout.=' />'.$_.'</td>';
- 	    if ($colcount>10) {
- 		$keywordout.="</tr><tr>\n";
- 		$colcount=0;
- 	    }
- 	    $colcount++;
- 	}
- 	$keywordout.='</tr></table>';
+     $keywordout.=&Apache::loncommon::end_data_table_row()
+                  .&Apache::loncommon::end_data_table()
+                  .&Apache::lonhtmlcommon::row_closure();
- 	$scrout.=$keywordout;
+     $intr_scrout.=$keywordout;
- 	$scrout.=&textfield('Additional Keywords','addkey','');
+     $intr_scrout.=&textfield('Additional Keywords','addkey','');
- 	$scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
+     $intr_scrout.=&textfield('Notes','notes',$metadatafields{'notes'});
- 	$scrout.=
+     $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Abstract'))
- 	    "\n<p><font color=\"#800000\" face=\"helvetica\"><b>ABSTRACT:".
+                  .'<textarea cols="80" rows="5" name="abstract">'
- 	    "</b></font></p><br />".
+                  .$metadatafields{'abstract'}
- 	    '<textarea cols="80" rows="5" name="abstract">'.
+                  .'</textarea>'
- 	    $metadatafields{'abstract'}.'</textarea></p>';
+                  .&Apache::lonhtmlcommon::row_closure();
- 	$source=~/\.(\w+)$/;
+     $source=~/\.(\w+)$/;
- 	$scrout.=&hiddenfield('mime',$1);
+     $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title(&mt('Grade Levels'))
+                  .&mt('Lowest Grade Level:').'&nbsp;'
+                  .&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:').'&nbsp;'
+                  .&select_level_form($metadatafields{'highestgradelevel'},'highestgradelevel')
+                  .&Apache::lonhtmlcommon::row_closure();
- 	my $defaultlanguage=$metadatafields{'language'};
+     $intr_scrout.=&textfield('Standards','standards',$metadatafields{'standards'});
- 	$defaultlanguage =~ s/\s*notset\s*//g;
- 	$defaultlanguage =~ s/^,\s*//g;
- 	$defaultlanguage =~ s/,\s*$//g;
- 	$scrout.=&selectbox('Language','language',
+     $intr_scrout.=&hiddenfield('mime',$1);
- 			    $defaultlanguage,
- 			    \&Apache::loncommon::languagedescription,
- 			    (&Apache::loncommon::languageids),
- 			   );
- 	unless ($metadatafields{'creationdate'}) {
+     my $defaultlanguage=$metadatafields{'language'};
- 	    $metadatafields{'creationdate'}=time;
+     $defaultlanguage =~ s/\s*notset\s*//g;
- 	}
+     $defaultlanguage =~ s/^,\s*//g;
- 	$scrout.=&hiddenfield('creationdate',
+     $defaultlanguage =~ s/,\s*$//g;
- 			      &Apache::loncommon::unsqltime($metadatafields{'creationdate'}));
+     $intr_scrout.=&selectbox('Language','language',
+ 			     $defaultlanguage,
+ 			     \&Apache::loncommon::languagedescription,
+ 			     (&Apache::loncommon::languageids),
+ 			     );
- 	$scrout.=&hiddenfield('lastrevisiondate',time);
+     unless ($metadatafields{'creationdate'}) {
+ 	$metadatafields{'creationdate'}=time;
+     }
+     $intr_scrout.=&hiddenfield('creationdate',
+ 			       &Apache::lonmysql::unsqltime($metadatafields{'creationdate'}));
+     $intr_scrout.=&hiddenfield('lastrevisiondate',time);
- 	$scrout.=&textfield('Publisher/Owner','owner',
+     my $pubowner_last;
- 			    $metadatafields{'owner'});
+     if ($style eq 'prv') {
+         $pubowner_last = 1;
+     }
+     $intr_scrout.=&textfield('Publisher/Owner','owner',
+ 			     $metadatafields{'owner'},$pubowner_last);
+ # ---------------------------------------------- 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'; }
+     my $defaultsourceoption=$metadatafields{'sourceavail'};
+     unless ($defaultsourceoption) { $defaultsourceoption='closed'; }
+     unless ($style eq 'prv') {
  # -------------------------------------------------- Correct copyright for rat.
-         my $defaultoption=$metadatafields{'copyright'};
+ 	if ($style eq 'rat') {
-         unless ($defaultoption) { $defaultoption='default'; }
+ # -------------------------------------- Retrofix for non-applicable copyright
- 	unless ($style eq 'prv') {
+ 	    if ($metadatafields{'copyright'} eq 'public') {
- 	    if ($style eq 'rat') {
+ 		delete $metadatafields{'copyright'};
- 		if ($metadatafields{'copyright'} eq 'public') {
+ 		$defaultoption='default';
- 		    delete $metadatafields{'copyright'};
+ 	    }
-                     $defaultoption='default';
+ 	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
- 		}
+ 				     $defaultoption,
- 		$scrout.=&selectbox('Copyright/Distribution','copyright',
+ 				     \&Apache::loncommon::copyrightdescription,
- 				    $defaultoption,
+ 				    (grep !/^(public|priv)$/,(&Apache::loncommon::copyrightids)));
- 				    \&Apache::loncommon::copyrightdescription,
- 				    (grep !/^public$/,(&Apache::loncommon::copyrightids)));
- 	    } else {
- 		$scrout.=&selectbox('Copyright/Distribution','copyright',
- 				    $defaultoption,
- 				    \&Apache::loncommon::copyrightdescription,
- 				    (&Apache::loncommon::copyrightids));
- 	    }
- 	    my $copyright_help =
- 		Apache::loncommon::help_open_topic('Publishing_Copyright');
- 	    $scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
- 	    $scrout.=&textfield('Custom Distribution File','customdistributionfile',
- 				$metadatafields{'customdistributionfile'}).
- 				    $copyright_help;
- 	    my $uctitle=uc(&mt('Obsolete'));
-             $scrout.=
- 		"\n<p><font color=\"#800000\" face=\"helvetica\"><b>$uctitle:".
- 		'</b></font> <input type="checkbox" name="obsolete" ';
- 	    if ($metadatafields{'obsolete'}) {
- 		$scrout.=' checked="1" ';
- 	    }
- 	    $scrout.='/ ></p>'.
- 		&textfield('Suggested Replacement for Obsolete File',
- 				    'obsoletereplacement',
- 				    $metadatafields{'obsoletereplacement'});
  	} else {
- 	    $scrout.=&hiddenfield('copyright','private');
+ 	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
- 	}
+ 				     $defaultoption,
- 	return ($scrout.'<p><input type="submit" value="'.
+ 				     \&Apache::loncommon::copyrightdescription,
- 		&mt('Finalize Publication').'" /></p></form>',0);
+ 				     (grep !/^priv$/,(&Apache::loncommon::copyrightids)));
- # =============================================================================
+ 	}
- # BATCH MODE
+ 	my $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');
+ 	$intr_scrout.=&selectbox('Source Distribution','sourceavail',
+ 				 $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');
+         my $obsolete_checked=($metadatafields{'obsolete'})?' checked="1" ':'';
+         $intr_scrout.="\n".&Apache::lonhtmlcommon::row_title($uctitle)
+                      .'<input type="checkbox" name="obsolete" '.$obsolete_checked.'/ >'
+                      .&Apache::lonhtmlcommon::row_closure(1);
+         $intr_scrout.=&text_with_browse_field('Suggested Replacement for Obsolete File',
+ 				    'obsoletereplacement',
+ 				    $metadatafields{'obsoletereplacement'},'',1);
      } else {
- # Transfer metadata directly to environment for stage 2
+ 	$intr_scrout.=&hiddenfield('copyright','private');
- 	foreach (keys %metadatafields) {
+     }
- 	    $ENV{'form.'.$_}=$metadatafields{$_};
+    } else {
- 	}
+        $intr_scrout.=
- 	$ENV{'form.addkey'}='';
+ 	&hiddenfield('title',$metadatafields{'title'}).
- 	$ENV{'form.keywords'}='';
+ 	&hiddenfield('author',$metadatafields{'author'}).
- 	foreach (keys %keywords) {
+ 	&hiddenfield('subject',$metadatafields{'subject'}).
- 	    if ($metadatafields{'keywords'}) {
+ 	&hiddenfield('keywords',$metadatafields{'keywords'}).
- 		if ($metadatafields{'keywords'}=~/\Q$_\E/) {
+ 	&hiddenfield('abstract',$metadatafields{'abstract'}).
- 		    $ENV{'form.keywords'}.=$_.',';
+ 	&hiddenfield('notes',$metadatafields{'notes'}).
- 		}
+ 	&hiddenfield('mime',$metadatafields{'mime'}).
- 	    } elsif (&Apache::loncommon::keyword($_)) {
+ 	&hiddenfield('creationdate',$metadatafields{'creationdate'}).
- 		$ENV{'form.keywords'}.=$_.',';
+ 	&hiddenfield('lastrevisiondate',time).
- 	    }
+ 	&hiddenfield('owner',$metadatafields{'owner'}).
- 	}
+ 	&hiddenfield('lowestgradelevel',$metadatafields{'lowestgradelevel'}).
- 	$ENV{'form.keywords'}=~s/\,$//;
+ 	&hiddenfield('standards',$metadatafields{'standards'}).
- 	unless ($ENV{'form.creationdate'}) { $ENV{'form.creationdate'}=time; }
+ 	&hiddenfield('highestgradelevel',$metadatafields{'highestgradelevel'}).
- 	$ENV{'form.lastrevisiondate'}=time;
+ 	&hiddenfield('language',$metadatafields{'language'}).
- 	if ((($style eq 'rat') && ($ENV{'form.copyright'} eq 'public')) ||
+ 	&hiddenfield('copyright',$metadatafields{'copyright'}).
- 	    (!$ENV{'form.copyright'})) {
+ 	&hiddenfield('sourceavail',$metadatafields{'sourceavail'}).
- 	    $ENV{'form.copyright'}='default';
+ 	&hiddenfield('customdistributionfile',$metadatafields{'customdistributionfile'}).
- 	}
+ 	&hiddenfield('obsolete',1).
- 	$ENV{'form.allmeta'}=&Apache::lonnet::escape($allmeta);
+ 	&text_with_browse_field('Suggested Replacement for Obsolete File',
- 	return ($scrout,0);
+ 				    'obsoletereplacement',
+ 				    $metadatafields{'obsoletereplacement'},'',1);
+    }
+     if (!$batch) {
+ 	$scrout.=$intr_scrout
+             .&Apache::lonhtmlcommon::end_pick_box()
+             .'<p><input type="submit" value="'
+ 	    .&mt($env{'form.makeobsolete'}?'Make Obsolete':'Finalize Publication')
+             .'" /></p>'
+             .'</form>';
      }
+     return($scrout,0);
  }
  #########################################
- Line 1256  Returns:
+ Line 1473  Returns:
  =over 4
- =item Scalar string
+ =item integer
- String contains status (errors and warnings) and information associated with
+: fail
- the server's attempts at publication.
+: success
  =cut
- Line 1271  sub phasetwo {
+ Line 1488  sub phasetwo {
      my ($r,$source,$target,$style,$distarget,$batch)=@_;
      $source=~s/\/+/\//g;
      $target=~s/\/+/\//g;
+ #
-     if ($target=~/\_\_\_/) {
+ # Unless trying to get rid of something, check name validity
- 	$r->print(
+ #
-  '<font color="red">'.&mt('Unsupported character combination').
+     unless ($env{'form.obsolete'}) {
- 		  ' "<tt>___</tt>" '.&mt('in filename, FAIL').'</font>');
+ 	if ($target=~/(\_\_\_|\&\&\&|\:\:\:)/) {
-         return 0;
+ 	    $r->print('<span class="LC_error">'.
+ 		      &mt('Unsupported character combination [_1] in filename, FAIL.',"<tt>'.$1.'</tt>").
+ 		      '</span>');
+ 	    return 0;
+ 	}
+ 	unless ($target=~/\.(\w+)$/) {
+ 	    $r->print('<span class="LC_error">'.&mt('No valid extension found in filename, FAIL').'</span>');
+ 	    return 0;
+ 	}
+ 	if ($target=~/\.(\d+)\.(\w+)$/) {
+ 	    $r->print('<span class="LC_error">'.&mt('Cannot publish versioned resource, FAIL').'</span>');
+ 	    return 0;
+ 	}
      }
+ #
+ # End name check
+ #
      $distarget=~s/\/+/\//g;
      my $logfile;
      unless ($logfile=Apache::File->new('>>'.$source.'.log')) {
  	$r->print(
-         '<font color="red">'.
+         '<span class="LC_error">'.
- 		&mt('No write permission to user directory, FAIL').'</font>');
+ 		&mt('No write permission to user directory, FAIL').'</span>');
          return 0;
      }
+     if ($source =~ /\.rights$/) {
+ 	$r->print('<p><span class="LC_warning">'.&mt('Warning: It can take up to 1 hour for rights changes to fully propagate.').'</span></p>');
+     }
      print $logfile
-         "\n================= Publish ".localtime()." Phase Two  ================\n".$ENV{'user.name'}.'@'.$ENV{'user.domain'}."\n";
+         "\n================= Publish ".localtime()." Phase Two  ================\n".$env{'user.name'}.':'.$env{'user.domain'}."\n";
      %metadatafields=();
      %metadatakeys=();
+     &metaeval(&unescape($env{'form.allmeta'}));
-     &metaeval(&Apache::lonnet::unescape($ENV{'form.allmeta'}));
+     $metadatafields{'title'}=$env{'form.title'};
+     $metadatafields{'author'}=$env{'form.author'};
-     $metadatafields{'title'}=$ENV{'form.title'};
+     $metadatafields{'subject'}=$env{'form.subject'};
-     $metadatafields{'author'}=$ENV{'form.author'};
+     $metadatafields{'notes'}=$env{'form.notes'};
-     $metadatafields{'subject'}=$ENV{'form.subject'};
+     $metadatafields{'abstract'}=$env{'form.abstract'};
-     $metadatafields{'notes'}=$ENV{'form.notes'};
+     $metadatafields{'mime'}=$env{'form.mime'};
-     $metadatafields{'abstract'}=$ENV{'form.abstract'};
+     $metadatafields{'language'}=$env{'form.language'};
-     $metadatafields{'mime'}=$ENV{'form.mime'};
+     $metadatafields{'creationdate'}=$env{'form.creationdate'};
-     $metadatafields{'language'}=$ENV{'form.language'};
+     $metadatafields{'lastrevisiondate'}=$env{'form.lastrevisiondate'};
-     $metadatafields{'creationdate'}=$ENV{'form.creationdate'};
+     $metadatafields{'owner'}=$env{'form.owner'};
-     $metadatafields{'lastrevisiondate'}=$ENV{'form.lastrevisiondate'};
+     $metadatafields{'copyright'}=$env{'form.copyright'};
-     $metadatafields{'owner'}=$ENV{'form.owner'};
+     $metadatafields{'standards'}=$env{'form.standards'};
-     $metadatafields{'copyright'}=$ENV{'form.copyright'};
+     $metadatafields{'lowestgradelevel'}=$env{'form.lowestgradelevel'};
+     $metadatafields{'highestgradelevel'}=$env{'form.highestgradelevel'};
      $metadatafields{'customdistributionfile'}=
-                                  $ENV{'form.customdistributionfile'};
+                                  $env{'form.customdistributionfile'};
-     $metadatafields{'obsolete'}=$ENV{'form.obsolete'};
+     $metadatafields{'sourceavail'}=$env{'form.sourceavail'};
+     $metadatafields{'obsolete'}=$env{'form.obsolete'};
      $metadatafields{'obsoletereplacement'}=
- 	                        $ENV{'form.obsoletereplacement'};
+ 	                        $env{'form.obsoletereplacement'};
-     $metadatafields{'dependencies'}=$ENV{'form.dependencies'};
+     $metadatafields{'dependencies'}=$env{'form.dependencies'};
+     $metadatafields{'modifyinguser'}=$env{'user.name'}.':'.
+ 	                                 $env{'user.domain'};
+     $metadatafields{'authorspace'}=$cuname.':'.$cudom;
+     $metadatafields{'domain'}=$cudom;
-     my $allkeywords=$ENV{'form.addkey'};
+     my $allkeywords=$env{'form.addkey'};
-     if (exists($ENV{'form.keywords'})) {
+     if (exists($env{'form.keywords'})) {
-         if (ref($ENV{'form.keywords'})) {
+         if (ref($env{'form.keywords'})) {
-             $allkeywords .= ','.join(',',@{$ENV{'form.keywords'}});
+             $allkeywords .= ','.join(',',@{$env{'form.keywords'}});
          } else {
-             $allkeywords .= ','.$ENV{'form.keywords'};
+             $allkeywords .= ','.$env{'form.keywords'};
          }
      }
-     $allkeywords=~s/\W+/\,/;
+     $allkeywords=~s/[\"\']//g;
-     $allkeywords=~s/^\,//;
+     $allkeywords=~s/\s*[\;\,]\s*/\,/g;
+     $allkeywords=~s/\s+/ /g;
+     $allkeywords=~s/^[ \,]//;
+     $allkeywords=~s/[ \,]$//;
      $metadatafields{'keywords'}=$allkeywords;
+ # check if custom distribution file is specified
+     if ($metadatafields{'copyright'} eq 'custom') {
+ 	my $file=$metadatafields{'customdistributionfile'};
+ 	unless ($file=~/\.rights$/) {
+             $r->print(
+                 '<span class="LC_error">'.&mt('No valid custom distribution rights file specified, FAIL').
+ 		'</span>');
+ 	    return 0;
+         }
+     }
      {
          print $logfile "\nWrite metadata file for ".$source;
          my $mfh;
          unless ($mfh=Apache::File->new('>'.$source.'.meta')) {
-             return
+             $r->print(
-                 '<font color="red">'.&mt('Could not write metadata, FAIL').
+                 '<span class="LC_error">'.&mt('Could not write metadata, FAIL').
- 		'</font>';
+ 		'</span>');
+ 	    return 0;
          }
          foreach (sort keys %metadatafields) {
              unless ($_=~/\./) {
- Line 1345  sub phasetwo {
+ Line 1605  sub phasetwo {
                      print $mfh ' '.$_.'="'.$value.'"';
                  }
                  print $mfh '>'.
-                     &HTML::Entities::encode($metadatafields{$unikey})
+                     &HTML::Entities::encode($metadatafields{$unikey},'<>&"')
                          .'</'.$tag.'>';
              }
          }
- Line 1357  sub phasetwo {
+ Line 1617  sub phasetwo {
      $metadatafields{'url'} = $distarget;
      $metadatafields{'version'} = 'current';
-     unless ($metadatafields{'copyright'} eq 'priv') {
-         my ($error,$success) = &store_metadata(\%metadatafields);
+     my ($error,$success) = &store_metadata(%metadatafields);
-         if ($success) {
+     if ($success) {
-             $r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');
+ 	$r->print('<p>'.&mt('Synchronized SQL metadata database').'</p>');
-             print $logfile "\nSynchronized SQL metadata database";
+ 	print $logfile "\nSynchronized SQL metadata database";
-         } else {
-             $r->print($error);
-             print $logfile "\n".$error;
-         }
      } else {
-         $r->print('<p>'.
+ 	$r->print($error);
- 	     &mt('Private Publication - did not synchronize database').'</p>');
+ 	print $logfile "\n".$error;
-         print $logfile "\nPrivate: Did not synchronize data into ".
-             "SQL metadata database";
      }
+ # --------------------------------------------- Delete author resource messages
+     my $delresult=&Apache::lonmsg::del_url_author_res_msg($target);
+     $r->print('<p>'.&mt('Removing error messages:').' '.$delresult.'</p>');
+     print $logfile "\nRemoving error messages: $delresult";
  # ----------------------------------------------------------- Copy old versions
      if (-e $target) {
- Line 1383  sub phasetwo {
+ Line 1641  sub phasetwo {
          my $srcd=$1;
          unless ($srcd=~/^\/home\/httpd\/html\/res/) {
              print $logfile "\nPANIC: Target dir is ".$srcd;
-             return "<font color=\"red\">Invalid target directory, FAIL</font>";
+             $r->print(
+ 	 "<span class=\"LC_error\">".&mt('Invalid target directory, FAIL')."</span>");
+ 	    return 0;
          }
          opendir(DIR,$srcd);
          while ($filename=readdir(DIR)) {
- Line 1408  sub phasetwo {
+ Line 1668  sub phasetwo {
              $r->print('<p>'.&mt('Copied old target file').'</p>');
          } else {
  	    print $logfile "Unable to write ".$copyfile.':'.$!."\n";
-             return "<font color=\"red\">".&mt('Failed to copy old target').
+             $r->print("<span class=\"LC_error\">".&mt('Failed to copy old target').
- 		", $!, ".&mt('FAIL')."</font>";
+ 		", $!, ".&mt('FAIL')."</span>");
+ 	    return 0;
          }
  # --------------------------------------------------------------- Copy Metadata
- Line 1422  sub phasetwo {
+ Line 1683  sub phasetwo {
          } else {
  	    print $logfile "Unable to write metadata ".$copyfile.':'.$!."\n";
              if (-e $target.'.meta') {
-                 return
+                 $r->print(
-                     "<font color=\"red\">".
+                     "<span class=\"LC_error\">".
- &mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</font>";
+ &mt('Failed to write old metadata copy').", $!, ".&mt('FAIL')."</span>");
+ 		return 0;
  	    }
          }
- Line 1455  sub phasetwo {
+ Line 1717  sub phasetwo {
          $r->print('<p>'.&mt('Copied source file').'</p>');
      } else {
          print $logfile "\nUnable to write ".$copyfile.':'.$!."\n";
-         return "<font color=\"red\">".
+         $r->print("<span class=\"LC_error\">".
- 	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</font>";
+ 	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>");
+ 	return 0;
      }
  # --------------------------------------------------------------- Copy Metadata
- Line 1468  sub phasetwo {
+ Line 1731  sub phasetwo {
          $r->print('<p>'.&mt('Copied metadata').'</p>');
      } else {
          print $logfile "\nUnable to write metadata ".$copyfile.':'.$!."\n";
-         return
+         $r->print(
-             "<font color=\"red\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</font>";
+             "<span class=\"LC_error\">".&mt('Failed to write metadata copy').", $!, ".&mt('FAIL')."</span>");
+ 	return 0;
      }
      $r->rflush;
- # --------------------------------------------------- Send update notifications
-     my @subscribed=&get_subscribed_hosts($target);
+ # ------------------------------------------------------------- Trigger updates
-     foreach my $subhost (@subscribed) {
+     push(@{$modified_urls},[$target,$source]);
- 	$r->print('<p>'.&mt('Notifying host').' '.$subhost.':');$r->rflush;
+     unless ($registered_cleanup) {
- 	print $logfile "\nNotifying host ".$subhost.':';
+ 	$r->register_cleanup(\&notify);
- 	my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
+ 	$registered_cleanup=1;
- 	$r->print($reply.'</p><br />');$r->rflush;
- 	print $logfile $reply;
      }
- # ---------------------------------------- Send update notifications, meta only
-     my @subscribedmeta=&get_subscribed_hosts("$target.meta");
+ # ---------------------------------------------------------- Clear local caches
-     foreach my $subhost (@subscribedmeta) {
+     my $thisdistarget=$target;
- 	$r->print('<p>'.
+     $thisdistarget=~s/^\Q$docroot\E//;
- &mt('Notifying host for metadata only').' '.$subhost.':');$r->rflush;
+     &Apache::lonnet::devalidate_cache_new('resversion',$target);
- 	print $logfile "\nNotifying host for metadata only ".$subhost.':';
+     &Apache::lonnet::devalidate_cache_new('meta',
- 	my $reply=&Apache::lonnet::critical('update:'.$target.'.meta',
+ 			 &Apache::lonnet::declutter($thisdistarget));
- 					    $subhost);
- 	$r->print($reply.'</p><br />');$r->rflush;
- 	print $logfile $reply;
-     }
- # --------------------------------------------------- Notify subscribed courses
-     my %courses=&coursedependencies($target);
-     my $now=time;
-     foreach (keys %courses) {
- 	$r->print('<p>'.&mt('Notifying course').' '.$_.':');$r->rflush;
- 	print $logfile "\nNotifying host ".$_.':';
-         my ($cdom,$cname)=split(/\_/,$_);
- 	my $reply=&Apache::lonnet::cput
-                   ('versionupdate',{$target => $now},$cdom,$cname);
- 	$r->print($reply.'</p><br />');$r->rflush;
- 	print $logfile $reply;
-     }
  # ------------------------------------------------ Provide link to new resource
      unless ($batch) {
-         my $thisdistarget=$target;
-         $thisdistarget=~s/^\Q$docroot\E//;
          my $thissrc=$source;
-         $thissrc=~s/^\/home\/(\w+)\/public_html/\/priv\/$1/;
+         $thissrc=~s{^/home/($match_username)/public_html}{/priv/$1};
          my $thissrcdir=$thissrc;
          $thissrcdir=~s/\/[^\/]+$/\//;
- Line 1523  sub phasetwo {
+ Line 1764  sub phasetwo {
          $r->print(
             '<hr /><a href="'.$thisdistarget.'"><font size="+2">'.
             &mt('View Published Version').'</font></a>'.
-            '<p><a href="'.$thissrc.'"><font size=+2>'.
+            '<p><a href="'.$thissrc.'"><font size="+2">'.
  		  &mt('Back to Source').'</font></a></p>'.
             '<p><a href="'.$thissrcdir.
                     '"><font size="+2">'.
  		  &mt('Back to Source Directory').'</font></a></p>');
      }
+     $logfile->close();
+     $r->print('<p><font color="green">'.&mt('Done').'</font></p>');
+     return 1;
+ }
+ # =============================================================== Notifications
+ sub notify {
+ # --------------------------------------------------- Send update notifications
+     foreach my $targetsource (@{$modified_urls}){
+ 	my ($target,$source)=@{$targetsource};
+ 	my $logfile=Apache::File->new('>>'.$source.'.log');
+ 	print $logfile "\nCleanup phase: Notifications\n";
+ 	my @subscribed=&get_subscribed_hosts($target);
+ 	foreach my $subhost (@subscribed) {
+ 	    print $logfile "\nNotifying host ".$subhost.':';
+ 	    my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
+ 	    print $logfile $reply;
+ 	}
+ # ---------------------------------------- Send update notifications, meta only
+ 	my @subscribedmeta=&get_subscribed_hosts("$target.meta");
+ 	foreach my $subhost (@subscribedmeta) {
+ 	    print $logfile "\nNotifying host for metadata only ".$subhost.':';
+ 	    my $reply=&Apache::lonnet::critical('update:'.$target.'.meta',
+ 						$subhost);
+ 	    print $logfile $reply;
+ 	}
+ # --------------------------------------------------- Notify subscribed courses
+ 	my %courses=&coursedependencies($target);
+ 	my $now=time;
+ 	foreach (keys %courses) {
+ 	    print $logfile "\nNotifying course ".$_.':';
+ 	    my ($cdom,$cname)=split(/\_/,$_);
+ 	    my $reply=&Apache::lonnet::cput
+ 		('versionupdate',{$target => $now},$cdom,$cname);
+ 	    print $logfile $reply;
+ 	}
+ 	print $logfile "\n============ Done ============\n";
+ 	$logfile->close();
+     }
+     if ($lock) { &Apache::lonnet::remove_lock($lock); }
+     return OK;
  }
  #########################################
  sub batchpublish {
      my ($r,$srcfile,$targetfile)=@_;
-     #publication pollutes %ENV with form.* values
+     #publication pollutes %env with form.* values
-     my %oldENV=%ENV;
+     my %oldenv=%env;
      $srcfile=~s/\/+/\//g;
      $targetfile=~s/\/+/\//g;
      my $thisdisfn=$srcfile;
- Line 1564  sub batchpublish {
+ Line 1846  sub batchpublish {
      $r->print('<p>'.$outstring.'</p>');
  # phase two takes
  # my ($source,$target,$style,$distarget,batch)=@_;
- # $ENV{'form.allmeta'},$ENV{'form.title'},$ENV{'form.author'},...
+ # $env{'form.allmeta'},$env{'form.title'},$env{'form.author'},...
      if (!$error) {
  	$r->print('<p>');
  	&phasetwo($r,$srcfile,$targetfile,$thisembstyle,$thisdistarget,1);
  	$r->print('</p>');
      }
-     %ENV=%oldENV;
+     %env=%oldenv;
      return '';
  }
- Line 1583  sub publishdirectory {
+ Line 1865  sub publishdirectory {
      my $resdir=
  	$Apache::lonnet::perlvar{'lonDocRoot'}.'/res/'.$cudom.'/'.$cuname.'/'.
  	$thisdisfn;
-     $r->print('<h1>Directory <tt>'.$thisdisfn.'</tt></h1>'.
+     $r->print('<h1>'.&mt('Directory').' <tt>'.$thisdisfn.'</tt></h1>'.
- 	      'Target: <tt>'.$resdir.'</tt><br />');
+ 	      &mt('Target').': <tt>'.$resdir.'</tt><br />');
      my $dirptr=16384;		# Mask indicating a directory in stat.cmode.
+     unless ($env{'form.phase'} eq 'two') {
-     opendir(DIR,$fn);
+ # ask user what they want
-     my @files=sort(readdir(DIR));
+         $r->print('<form name="pubdirpref" method="post">'.
-     foreach my $filename (@files) {
+ 		  &hiddenfield('phase','two').
- 	my ($cdev,$cino,$cmode,$cnlink,
+ 		  &hiddenfield('filename',$env{'form.filename'}).
-             $cuid,$cgid,$crdev,$csize,
+ 		  &checkbox('pubrec','include subdirectories').
-             $catime,$cmtime,$cctime,
+ 		  &checkbox('forcerepub','force republication of previously published files').
-             $cblksize,$cblocks)=stat($fn.'/'.$filename);
+                   &checkbox('obsolete','make file(s) obsolete').
+ 		  &checkbox('forceoverride','force directory level catalog information over existing').
- 	my $extension='';
+ 		  '<br /><input type="submit" value="'.&mt('Publish Directory').'" /></form>');
- 	if ($filename=~/\.(\w+)$/) { $extension=$1; }
+         $lock=0;
- 	if ($cmode&$dirptr) {
+     } else {
- 	    if (($filename!~/^\./) && ($ENV{'form.pubrec'})) {
+         unless ($lock) { $lock=&Apache::lonnet::set_lock(&mt('Publishing [_1]',$fn)); }
- 		&publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename);
+ # actually publish things
- 	    }
+ 	opendir(DIR,$fn);
- 	} elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
+ 	my @files=sort(readdir(DIR));
- 		 ($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
+ 	foreach my $filename (@files) {
+ 	    my ($cdev,$cino,$cmode,$cnlink,
+ 		$cuid,$cgid,$crdev,$csize,
+ 		$catime,$cmtime,$cctime,
+ 		$cblksize,$cblocks)=stat($fn.'/'.$filename);
+ 	    my $extension='';
+ 	    if ($filename=~/\.(\w+)$/) { $extension=$1; }
+ 	    if ($cmode&$dirptr) {
+ 		if (($filename!~/^\./) && ($env{'form.pubrec'})) {
+ 		    &publishdirectory($r,$fn.'/'.$filename,$thisdisfn.'/'.$filename);
+ 		}
+ 	    } elsif ((&Apache::loncommon::fileembstyle($extension) ne 'hdn') &&
+ 		     ($filename!~/^[\#\.]/) && ($filename!~/\~$/)) {
  # find out publication status and/or exiting metadata
- 	    my $publishthis=0;
+ 		my $publishthis=0;
- 	    if (-e $resdir.'/'.$filename) {
+ 		if (-e $resdir.'/'.$filename) {
- 	        my ($rdev,$rino,$rmode,$rnlink,
+ 		    my ($rdev,$rino,$rmode,$rnlink,
- 		    $ruid,$rgid,$rrdev,$rsize,
+ 			$ruid,$rgid,$rrdev,$rsize,
- 		    $ratime,$rmtime,$rctime,
+ 			$ratime,$rmtime,$rctime,
- 		    $rblksize,$rblocks)=stat($resdir.'/'.$filename);
+ 			$rblksize,$rblocks)=stat($resdir.'/'.$filename);
- 	        if (($rmtime<$cmtime) || ($ENV{'form.forcerepub'})) {
+ 		    if (($rmtime<$cmtime) || ($env{'form.forcerepub'})) {
  # previously published, modified now
- 		    $publishthis=1;
+ 			$publishthis=1;
-                 }
+ 		    }
- 	    } else {
+ 		    my $meta_cmtime = (stat($fn.'/'.$filename.'.meta'))[9];
+ 		    my $meta_rmtime = (stat($resdir.'/'.$filename.'.meta'))[9];
+ 		    if ( $meta_rmtime<$meta_cmtime ) {
+ 			$publishthis=1;
+ 		    }
+ 		} else {
  # never published
- 		$publishthis=1;
+ 		    $publishthis=1;
- 	    }
+ 		}
- 	    if ($publishthis) {
-                 &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
+ 		if ($publishthis) {
- 	    } else {
+ 		    &batchpublish($r,$fn.'/'.$filename,$resdir.'/'.$filename);
- 		$r->print('<br />Skipping '.$filename.'<br />');
+ 		} else {
+ 		    $r->print('<br />'.&mt('Skipping').' '.$filename.'<br />');
+ 		}
+ 		$r->rflush();
  	    }
- 	    $r->rflush();
  	}
+ 	closedir(DIR);
      }
-     closedir(DIR);
+ }
+ #########################################
+ # publish a default.meta file
+ 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\//;
+     &Apache::loncommon::content_type($r,'text/html');
+     $r->send_http_header;
+     $r->print(&Apache::loncommon::start_page('Catalog Information Publication'));
+ # ---------------------------------------------------------------- Write Source
+     my $copyfile=$target;
+     my @parts=split(/\//,$copyfile);
+     my $path="/$parts[1]/$parts[2]/$parts[3]/$parts[4]";
+     my $count;
+     for ($count=5;$count<$#parts;$count++) {
+         $path.="/$parts[$count]";
+         if ((-e $path)!=1) {
+             $r->print('<p>'.&mt('Created directory').' '.$parts[$count].'</p>');
+             mkdir($path,0777);
+         }
+     }
+     if (copy($fn,$copyfile)) {
+         $r->print('<p>'.&mt('Copied source file').'</p>');
+     } else {
+         return "<span class=\"LC_error\">".
+ 	    &mt('Failed to copy source').", $!, ".&mt('FAIL')."</span>";
+     }
+ # --------------------------------------------------- Send update notifications
+     my @subscribed=&get_subscribed_hosts($target);
+     foreach my $subhost (@subscribed) {
+ 	$r->print('<p>'.&mt('Notifying host').' '.$subhost.':');$r->rflush;
+ 	my $reply=&Apache::lonnet::critical('update:'.$target,$subhost);
+ 	$r->print($reply.'</p><br />');$r->rflush;
+     }
+ # ------------------------------------------------------------------- Link back
+     my $link=$fn;
+     $link=~s/^\/home\/$cuname\/public_html\//\/priv\/$cuname\//;
+     $r->print("<a href='$link'>".&mt('Back to Catalog Information').'</a>');
+     $r->print(&Apache::loncommon::end_page());
+     return OK;
  }
  #########################################
- Line 1683  sub handler {
+ Line 2041  sub handler {
      &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
                                              ['filename']);
+ # -------------------------------------- Flag and buffer for registered cleanup
+     $registered_cleanup=0;
+     @{$modified_urls}=();
  # -------------------------------------------------------------- Check filename
-     my $fn=&Apache::lonnet::unescape($ENV{'form.filename'});
+     my $fn=&unescape($env{'form.filename'});
+     ($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$//;
      unless ($fn) {
  	$r->log_reason($cuname.' at '.$cudom.
- Line 1694  sub handler {
+ Line 2063  sub handler {
  	return HTTP_NOT_FOUND;
      }
-     ($cuname,$cudom)=
- 	&Apache::loncacc::constructaccess($fn,$r->dir_config('lonDefDomain'));
      unless (($cuname) && ($cudom)) {
  	$r->log_reason($cuname.' at '.$cudom.
- 		       ' trying to publish file '.$ENV{'form.filename'}.
+ 		       ' trying to publish file '.$env{'form.filename'}.
  		       ' ('.$fn.') - not authorized',
  		       $r->filename);
  	return HTTP_NOT_ACCEPTABLE;
      }
-     unless (&Apache::lonnet::homeserver($cuname,$cudom)
+     my $home=&Apache::lonnet::homeserver($cuname,$cudom);
- 	    eq $r->dir_config('lonHostID')) {
+     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'}.
+ 		       ' trying to publish file '.$env{'form.filename'}.
- 		       ' ('.$fn.') - not homeserver ('.
+ 		       ' ('.$fn.') - not homeserver ('.$home.')',
- 		       &Apache::lonnet::homeserver($cuname,$cudom).')',
  		       $r->filename);
  	return HTTP_NOT_ACCEPTABLE;
      }
-     $fn=~s/^http\:\/\/[^\/]+//;
+     $fn=~s{^http://[^/]+}{};
-     $fn=~s/^\/\~(\w+)/\/home\/$1\/public_html/;
+     $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.')',
+ 		       $env{'form.filename'}.' ('.$fn.')',
  		       $r->filename);
  	return HTTP_NOT_ACCEPTABLE;
      } else {
- Line 1733  sub handler {
+ Line 2102  sub handler {
      unless (-e $fn) {
  	$r->log_reason($cuname.' at '.$cudom.
  		       ' trying to publish non-existing file '.
- 		       $ENV{'form.filename'}.' ('.$fn.')',
+ 		       $env{'form.filename'}.' ('.$fn.')',
  		       $r->filename);
  	return HTTP_NOT_FOUND;
      }
-     unless ($ENV{'form.phase'} eq 'two') {
  # -------------------------------- File is there and owned, init lookup tables.
- 	%addid=();
+     %addid=();
- 	{
+     {
- 	    my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab');
+ 	my $fh=Apache::File->new($r->dir_config('lonTabDir').'/addid.tab');
- 	    while (<$fh>=~/(\w+)\s+(\w+)/) {
+ 	while (<$fh>=~/(\w+)\s+(\w+)/) {
- 		$addid{$1}=$2;
+ 	    $addid{$1}=$2;
- 	    }
  	}
+     }
- 	%nokey=();
+     %nokey=();
- 	{
+     {
- 	    my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab');
+ 	my $fh=Apache::File->new($r->dir_config('lonIncludes').'/un_keyword.tab');
- 	    while (<$fh>) {
+ 	while (<$fh>) {
- 		my $word=$_;
+ 	    my $word=$_;
- 		chomp($word);
+ 	    chomp($word);
- 		$nokey{$word}=1;
+ 	    $nokey{$word}=1;
- 	    }
  	}
      }
  # ---------------------------------------------------------- Start page output.
      &Apache::loncommon::content_type($r,'text/html');
      $r->send_http_header;
-     $r->print('<html><head><title>LON-CAPA Publishing</title></head>');
+     my $js='<script type="text/javascript">'.
-     $r->print(&Apache::loncommon::bodytag('Resource Publication'));
+ 	&Apache::loncommon::browser_and_searcher_javascript().
+ 	'</script>';
+     $r->print(&Apache::loncommon::start_page('Resource Publication',$js));
      my $thisfn=$fn;
- Line 1789  sub handler {
+ Line 2156  sub handler {
      if ($fn=~/\/$/) {
  # -------------------------------------------------------- This is a directory
  	&publishdirectory($r,$fn,$thisdisfn);
- 	$r->print('<hr><font size="+2">'.&mt('Done').'</font><br><a href="/priv/'
+ 	$r->print('<hr /><a href="/priv/'
  		  .$cuname.'/'.$thisdisfn
  		  .'">'.&mt('Return to Directory').'</a>');
- Line 1799  sub handler {
+ Line 2166  sub handler {
  	$thisfn=~/\.(\w+)$/;
  	my $thistype=$1;
  	my $thisembstyle=&Apache::loncommon::fileembstyle($thistype);
- 	$r->print('<h2>'.&mt('Publishing').' '.
+         if ($thistype eq 'page') {  $thisembstyle = 'rat'; }
- 		  &Apache::loncommon::filedescription($thistype).' <tt>');
+ 	$r->print('<h2>'.&mt('Publishing [_1]','<tt>'.$thisdisfn.'</tt>').'</h2>');
+         $r->print('<h3>'.&mt('Resource Details').'</h3>');
+         $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'))
+                  .'<tt>'
+                  );
  	$r->print(<<ENDCAPTION);
  <a href='javascript:void(window.open("/~$cuname/$thisdisfn","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
  $thisdisfn</a>
  ENDCAPTION
-         $r->print('</tt></h2><b>'.&mt('Target').':</b> <tt>'.
+         $r->print('</tt>'
- 		  $thisdistarget.'</tt><br />');
+                  .&Apache::lonhtmlcommon::row_closure()
+                  );
- 	if (($cuname ne $ENV{'user.name'})||($cudom ne $ENV{'user.domain'})) {
- 	    $r->print('<h3><font color="red">'.&mt('Co-Author').': '.
+         $r->print(&Apache::lonhtmlcommon::row_title(&mt('Target'))
- 		      $cuname.&mt(' at ').$cudom.'</font></h3>');
+                  .'<tt>'.$thisdistarget.'</tt>'
+                  );
+ 	if (($cuname ne $env{'user.name'})||($cudom ne $env{'user.domain'})) {
+             $r->print(&Apache::lonhtmlcommon::row_closure()
+                      .&Apache::lonhtmlcommon::row_title(&mt('Co-Author'))
+                      .'<span class="LC_warning">'
+ 		     .&mt('[_1] at [_2]',$cuname,$cudom)
+                      .'</span>'
+                      );
  	}
  	if (&Apache::loncommon::fileembstyle($thistype) eq 'ssi') {
+             $r->print(&Apache::lonhtmlcommon::row_closure()
+                      .&Apache::lonhtmlcommon::row_title(&mt('Diffs')));
  	    $r->print(<<ENDDIFF);
- <br />
  <a href='javascript:void(window.open("/adm/diff?filename=/~$cuname/$thisdisfn&versiontwo=priv","cat","height=300,width=500,scrollbars=1,resizable=1,menubar=0,location=1"))'>
  ENDDIFF
-             $r->print(&mt('Diffs with Current Version').'</a><br />');
+             $r->print(&mt('Diffs with Current Version').'</a>');
  	}
+         $r->print(&Apache::lonhtmlcommon::row_closure(1)
+                  .&Apache::lonhtmlcommon::end_pick_box()
+                  );
  # ------------------ Publishing from $thisfn to $thistarget with $thisembstyle.
- 	unless ($ENV{'form.phase'} eq 'two') {
+ 	unless ($env{'form.phase'} eq 'two') {
- 	    my ($outstring,$error)=&publish($thisfn,$thistarget,$thisembstyle);
+ # ---------------------------------------------------------- Parse for problems
- 	    $r->print('<hr />'.$outstring);
+ 	    my ($warningcount,$errorcount);
+ 	    if ($thisembstyle eq 'ssi') {
+ 		($warningcount,$errorcount)=&checkonthis($r,$thisfn);
+ 	    }
+ 	    unless ($errorcount) {
+ 		my ($outstring,$error)=
+ 		    &publish($thisfn,$thistarget,$thisembstyle);
+ 		$r->print($outstring);
+ 	    } else {
+ 		$r->print('<h3 class="LC_error">'.
+ 			  &mt('The document contains errors and cannot be published.').
+ 			  '</h3>');
+ 	    }
  	} else {
- 	    $r->print('<hr />');
  	    &phasetwo($r,$thisfn,$thistarget,$thisembstyle,$thisdistarget);
+ 	    $r->print('<hr />');
  	}
      }
-     $r->print('</body></html>');
+     $r->print(&Apache::loncommon::end_page());
      return OK;
  }

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.140
changed lines
	Added in v.1.248