--- loncom/publisher/lonpublisher.pm	2001/12/25 21:58:54	1.67
+++ loncom/publisher/lonpublisher.pm	2002/01/16 19:09:31	1.70
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.67 2001/12/25 21:58:54 www Exp $
+# $Id: lonpublisher.pm,v 1.70 2002/01/16 19:09:31 harris41 Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -146,8 +146,9 @@ sub metaread {
 
 # ---------------------------- convert 'time' format into a datetime sql format
 sub sqltime {
+    my $timef=shift @_;
     my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) =
-	localtime(@_[0]);
+	localtime($timef);
     $mon++; $year+=1900;
     return "$year-$mon-$mday $hour:$min:$sec";
 }
@@ -185,6 +186,11 @@ sub selectbox {
 sub urlfixup {
     my ($url,$target)=@_;
     unless ($url) { return ''; }
+    #javascript code needs no fixing
+    if ($url =~ /^javascript:/i) { return $url; }
+    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) {
@@ -510,7 +516,7 @@ sub publish {
                      $chparms;
         }
 
-        my $chparms='';
+        $chparms='';
         foreach (sort keys %oldparmstores) {
 	    if (($_=~/^parameter/) || ($_=~/^stores/)) {
                 unless (($metadatafields{$_.'.name'}) ||
@@ -600,7 +606,7 @@ sub publish {
 
         $scrout.=&selectbox('Language','language',
                             $metadatafields{'language'},
-			    \&{Apache::loncommon::languagedescription},
+			    \&Apache::loncommon::languagedescription,
 			    (&Apache::loncommon::languageids),
 			     );
 
@@ -621,13 +627,13 @@ sub publish {
 	}
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},
-			    \&{Apache::loncommon::copyrightdescription},
+			    \&Apache::loncommon::copyrightdescription,
 		     (grep !/^public$/,(&Apache::loncommon::copyrightids)));
     }
     else {
         $scrout.=&selectbox('Copyright/Distribution','copyright',
                             $metadatafields{'copyright'},
-			    \&{Apache::loncommon::copyrightdescription},
+			    \&Apache::loncommon::copyrightdescription,
 			     (&Apache::loncommon::copyrightids));
     }
     return $scrout.