--- loncom/publisher/lonpublisher.pm	2007/08/07 01:52:44	1.228
+++ loncom/publisher/lonpublisher.pm	2008/02/14 21:29:08	1.231
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.228 2007/08/07 01:52:44 albertel Exp $
+# $Id: lonpublisher.pm,v 1.231 2008/02/14 21:29:08 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -344,8 +344,8 @@ sub text_with_browse_field {
     return "\n<p><font color=\"#800000\" face=\"helvetica\"><b>$title:".
            "</b></font></p><br />".
            '<input type="text" name="'.$name.'" size=80 value="'.$value.'" />'.
-	   '<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">Select</a>&nbsp;'.
-	   '<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">Search</a>';
+	   '<a href="javascript:openbrowser(\'pubform\',\''.$name.'\',\''.$restriction.'\');">'.&mt('Select').'</a>&nbsp;'.
+	   '<a href="javascript:opensearcher(\'pubform\',\''.$name.'\');">'.&mt('Search').'</a>';
 	   
 }
 
@@ -967,15 +967,21 @@ sub publish {
         foreach (sort(keys(%allow))) {
 	   my $thisdep=$_;
 	   if ($thisdep !~ /[^\s]/) { next; }
+           if ($thisdep =~/\$/) {
+              $scrout.='<br /><span class="LC_warning">'.
+                       &mt('The resource depends on another resource with variable filename, i.e., [_1]. '.
+                           'You likely need to explicitly allow access to all possible dependencies using the [_2]-tag',
+                           '<tt>'.$thisdep.'</tt>','<tt>&lt;allow&gt;</tt>').'</span>'; 
+           }
            unless ($style eq 'rat') { 
               $allowstr.="\n".'<allow src="'.$thisdep.'" />';
 	   }
            $scrout.='<br />';
-           if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
+           if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
 	       $scrout.='<a href="'.$thisdep.'">';
            }
            $scrout.='<tt>'.$thisdep.'</tt>';
-           if ($thisdep!~/\*/ && $thisdep!~m|^/adm/|) {
+           if ($thisdep!~/[\*\$]/ && $thisdep!~m|^/adm/|) {
 	       $scrout.='</a>';
                if (
        &Apache::lonnet::getfile($Apache::lonnet::perlvar{'lonDocRoot'}.'/'.
@@ -1131,6 +1137,11 @@ sub publish {
 	    '</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
 
@@ -1290,6 +1301,9 @@ END
 	$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'; }
@@ -1306,12 +1320,12 @@ END
 	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
 				     $defaultoption,
 				     \&Apache::loncommon::copyrightdescription,
-				    (grep !/^public$/,(&Apache::loncommon::copyrightids)));
+				    (grep !/^(public|priv)$/,(&Apache::loncommon::copyrightids)));
 	} else {
 	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
 				     $defaultoption,
 				     \&Apache::loncommon::copyrightdescription,
-				     (&Apache::loncommon::copyrightids));
+				     (grep !/^priv$/,(&Apache::loncommon::copyrightids)));
 	}
 	my $copyright_help =
 	    Apache::loncommon::help_open_topic('Publishing_Copyright');