loncom/publisher/lonpublisher.pm - diff

Return to lonpublisher.pm CVS log

Up to [LON-CAPA] / loncom / publisher

-version 1.195, 2005/05/20 18:28:22
+version 1.196, 2005/05/30 16:56:46
  Line 1398  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(
+ 		      '<font color="red">'.&mt('Unsupported character combination').
+ 		      ' "<tt>'.$1.'</tt>" '.&mt('in filename, FAIL').'</font>');
+ 	    return 0;
+ 	}
+ 	unless ($target=~/\.(\w+)$/) {
+ 	    $r->print('<font color="red">'.&mt('No valid extension found in filename, FAIL').'</font>');
+ 	    return 0;
+ 	}
+ 	if ($target=~/\.(\d+)\.(\w+)$/) {
+ 	    $r->print('<font color="red">'.&mt('Cannot publish versioned resource, FAIL').'</font>');
+ 	    return 0;
+ 	}
      }
+ #
+ # End name check
+ #
      $distarget=~s/\/+/\//g;
      my $logfile;
      unless ($logfile=Apache::File->new('>>'.$source.'.log')) {