--- loncom/interface/lonsyllabus.pm	2006/10/23 18:48:47	1.55
+++ loncom/interface/lonsyllabus.pm	2007/07/27 00:17:17	1.60
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.55 2006/10/23 18:48:47 albertel Exp $
+# $Id: lonsyllabus.pm,v 1.60 2007/07/27 00:17:17 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -66,9 +66,6 @@ sub handler {
 
 # ------------------------------------------------------------ Print the screen
 
-    my $rss_link =
-	&Apache::lonrss::rss_link('http://'.$ENV{'HTTP_HOST'}.'/public/'.$cdom.'/'.$cnum.'/Course_Announcements.rss');
-
     if ($target eq 'tex') {
 	$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
     } 
@@ -112,6 +109,8 @@ sub handler {
        
 # ----------------------------------------------------------------- Make header 
     if ($target ne 'tex') {
+	my $rss_link = &Apache::lonrss::rss_link($cnum,$cdom);
+    
 	my $start_page = 
 	    &Apache::loncommon::start_page("Syllabus", $rss_link,
 					   {'function'       => $forcestudent,
@@ -120,10 +119,10 @@ sub handler {
 						$env{'form.register'},});
 
 	$r->print($start_page.'<h1>'.$courseenv{'description'}.'</h1><h3>'.
-                 $Apache::lonnet::domaindescription{$cdom}.'</h3>');
+		  &Apache::lonnet::domain($cdom,'description').'</h3>');
     } else {
 	$r->print('\noindent{\large\textbf{'.$courseenv{'description'}.'}}\\\\\\\\\textbf{'.
-                 $Apache::lonnet::domaindescription{$cdom}.'}\\\\');
+		  &Apache::lonnet::domain($cdom,'description').'}\\\\');
     }
 # -------------------------------------------------------------- Announcements?
     my $day = &Apache::lonannounce::showday(time,2,
@@ -192,7 +191,7 @@ sub handler {
           $r->print('<p>'.
 &Apache::loncommon::help_open_topic('Uploaded_Templates_TextBoxes','Help with filling in text boxes').'</p><p>'.&mt('This syllabus can be publicly viewed at')
 		    .' <tt>http://'.
-		    $Apache::lonnet::hostname{$homeserver}.$r->uri.'</tt>'.
+		    &Apache::lonnet::hostname($homeserver).$r->uri.'</tt>'.
                &Apache::loncommon::help_open_topic('Syllabus_ExtLink').'</p>'.
           '<p>'.&mt('You can specify an external URL as Syllabus in the [_1].','<a href="/adm/parmset?action=crsenv">'.&mt('Course Parameters').'</a>').'</p>'.
 	  '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.
@@ -225,9 +224,10 @@ sub handler {
 			  my $host = $1;
                           my $remainder=$2;
 # remove the hostname from internal URLs
-		          foreach my $possible_host (keys(%Apache::lonnet::hostname)) {
-                              if ($possible_host =~
-				     /\Q$Apache::lonnet::hostname{$host}\E/i) {
+			  my $hostname = &Apache::lonnet::hostname($host);
+			  my %all_hostnames = &Apache::lonnet::all_hostnames();
+		          foreach my $possible_host (keys(%all_hostnames)) {
+                              if ($possible_host =~ /\Q$hostname\E/i) {
 			         $url=$remainder;
 			      }
 		          }
@@ -306,7 +306,7 @@ sub handler {
 		   } 
 	       } else {
 		   &Apache::lonfeedback::newline_to_br(\$message);
-		   $message =~s|(https*://[^\s]+)|<a href="$1"><tt>$1</tt></a>/g;
+		   $message =~s|(https*://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
 		   if ($allowed) {
 		       $message=&Apache::lonspeller::markeduptext($message);
 		   }
@@ -323,7 +323,7 @@ sub handler {
 	       if ($allowed) {
 		   $r->print('<br /><textarea cols="80" rows="12" name="'.$field.'" id="'.$field.'">'.
 			     &HTML::Entities::encode($syllabus{$field},'"&<>').
-			     '</textarea> <input type="submit" name="storesyl" value="Store" />');
+			     '</textarea> <input type="submit" name="storesyl" value="Save" />');
 	       }
 	   }
        }