--- loncom/interface/lonsyllabus.pm	2006/03/21 21:50:49	1.50
+++ loncom/interface/lonsyllabus.pm	2007/03/08 01:58:45	1.58
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.50 2006/03/21 21:50:49 albertel Exp $
+# $Id: lonsyllabus.pm,v 1.58 2007/03/08 01:58:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -38,6 +38,7 @@ use Apache::lonannounce;
 use Apache::lonlocal;
 use Apache::lonhtmlcommon;
 use Apache::lonspeller();
+use HTML::Entities();
 
 sub handler {
     my $r = shift;
@@ -71,12 +72,6 @@ sub handler {
     if ($target eq 'tex') {
 	$r->print(&Apache::lonprintout::print_latex_header($env{'form.latex_type'}));
     } 
-# ----------------------------------------------------- Force menu registration
-    my $addentries='';
-    if ($env{'form.register'}) {
-       $addentries=' onLoad="'.&Apache::lonmenu::loadevents().
-           '" onUnload="'.&Apache::lonmenu::unloadevents().'"';
-    }
 # -------------------------------------------------- Let's see who handles this
     my $externalsyllabus=$courseenv{'externalsyllabus'};
 
@@ -120,22 +115,21 @@ sub handler {
 	my $start_page = 
 	    &Apache::loncommon::start_page("Syllabus", $rss_link,
 					   {'function'       => $forcestudent,
-					    'add_entries'    => $addentries,
 					    'domain'         => $cdom,
 					    'force_register' =>
 						$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,
 			 &Apache::lonannounce::readcalendar($cdom.'_'.$cnum));
     if ($target ne 'tex') {
-	$r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom));
+	$r->print($day. &Apache::lonrss::advertisefeeds($cnum,$cdom,$forceedit));
     } else {
 	$r->print(&Apache::lonxml::xmlparse($r,'tex',$day));
     }
@@ -184,7 +178,9 @@ sub handler {
 # ----------------------------------------------------- Only if not public call
     if ($env{'user.environment'}) {
 # does this user have privileges to post, etc?
-       if ($env{'request.course.id'}) {
+       if ($env{'request.course.id'}
+	   && $cdom eq $env{'course.'.$env{'request.course.id'}.'.domain'}
+	   && $cnum eq $env{'course.'.$env{'request.course.id'}.'.num'}) {
           $allowed=&Apache::lonnet::allowed('mdc',$env{'request.course.id'});
 	  $privileged=$allowed;
 	  if (($syllabus{'uploaded.lastmodified'}) && (!$forceedit)) {
@@ -196,7 +192,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">'.
@@ -210,26 +206,29 @@ sub handler {
 	  }
       }
        if (($allowed) && ($env{'form.storesyl'})) {
-	   foreach (keys %syllabusfields) {
-               my $field=$env{'form.'.$_};
+	   foreach my $syl_field (keys(%syllabusfields)) {
+               my $field=$env{'form.'.$syl_field};
 	       chomp($field);
                $field=~s/\s+$//s;
 	       $field=~s/^\s+//s;
 	       $field=~s/\<br\s*\/*\>$//s;
 	       $field=&Apache::lonfeedback::clear_out_html($field,1);
-	       $syllabus{$_}=$field;
-               if ($_ eq 'lll_includeurl') { # clean up included URLs
+	       $syllabus{$syl_field}=$field;
+               if ($syl_field eq 'lll_includeurl') { # clean up included URLs
                   my $field='';
-	          foreach (split(/\n/,$syllabus{$_})) {
-		      my $url=$_;
+	          foreach my $value (split(/\n/,$syllabus{$syl_field})) {
+		      my $url=$value;
 # get rid of leading and trailing spaces
                       $url=~s/^\s+//;
                       $url=~s/\s+$//;
-                      if ($url=~/^http\:\/\/([^\/]+)\/(.+)$/) {
+                      if ($url=~m|^http://([^/]+)/(.+)$|) {
+			  my $host = $1;
                           my $remainder=$2;
 # remove the hostname from internal URLs
-		          foreach (keys %Apache::lonnet::hostname) {
-                              if ($1=~/$Apache::lonnet::hostname{$_}/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;
 			      }
 		          }
@@ -243,7 +242,7 @@ sub handler {
 		          $field.=$url."\n";
                       }
 		  }
-                  $syllabus{$_}=$field;
+                  $syllabus{$syl_field}=$field;
 	      }
            }
            $syllabus{'uploaded.domain'}=$env{'user.domain'};
@@ -274,62 +273,60 @@ sub handler {
 		     '<input type="hidden" name="forceedit" value="edit" />');
        }
        my @htmlids=();
-       foreach (sort keys %syllabusfields) {
-          if (($syllabus{$_}=~/\w/) || ($allowed)) {
-              my $message=$syllabus{$_};
-              if ($_ eq 'lll_includeurl') { # this is the "included" field
-		  my $urls=$message;
-                  $message='';
-                  foreach my $filelink (split(/\n/,$urls)) {
-		      my $output='';
+       foreach my $field (sort(keys(%syllabusfields))) {
+	   if (($syllabus{$field}=~/\w/) || ($allowed)) {
+	       my $message=$syllabus{$field};
+	       if ($field eq 'lll_includeurl') { # this is the "included" field
+		   my $urls=$message;
+		   $message='';
+		   foreach my $filelink (split(/\n/,$urls)) {
+		       my $output='';
 # embed style?
-		      my ($curfext)=($filelink=~/\.([^\.]+)$/);
-                      my $embstyle=&Apache::loncommon::fileembstyle($curfext);
-	              if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {
+		       my ($curfext)=($filelink=~/\.([^\.]+)$/);
+		       my $embstyle=&Apache::loncommon::fileembstyle($curfext);
+		       if (($embstyle eq 'ssi') || ($curfext=~/\/$/)) {
 # make ssi call and remove everything but the body contents
-			  $output=&Apache::lonnet::ssi_body($filelink);
-	              } elsif ($embstyle eq 'img') {
+			   $output=&Apache::lonnet::ssi_body($filelink);
+		       } elsif ($embstyle eq 'img') {
 # embed as an image
-                         $output='<img src="'.$filelink.'" />';
-		      }
-		      if ($target ne 'tex') {
-			  $message.='<p>'.$output.'</p>';
-		      } else {
-			  $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
-		      }		      
-                  }
-                  if ($allowed) {
-                     $r->print('<h3>'.$syllabusfields{$_}.
-          &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>'.
-	  '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Public View').'</font></a>'.
- &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
-		 } else {
-                  $r->print($message);
-                 } 
-              } else {
-		  &Apache::lonfeedback::newline_to_br(\$message);
-                 $message
-           =~s/(https*\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
-		 if ($allowed) {
-		     $message=&Apache::lonspeller::markeduptext($message);
-		 }
-	         $message=&Apache::lontexconvert::msgtexconverted($message);
-		 if ($target ne 'tex') {
-		     $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
-                               $message.'</blockquote>');
-		 } else {
-		     $r->print('\\\\\textbf{'.$syllabusfields{$_}.'}\\\\'.
-			       &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
-		 }
-		 push @htmlids,$_;
-	     }
-              if ($allowed) {
-                 $r->print(
-	   '<br /><textarea cols="80" rows="12" name="'.$_.'" id="'.$_.'">'.
-			   $syllabus{$_}.
-           '</textarea> <input type="submit" name="storesyl" value="Store" />');
-	      }
-	  }
+			   $output='<img src="'.$filelink.'" />';
+		       }
+		       if ($target ne 'tex') {
+			   $message.='<p>'.$output.'</p>';
+		       } else {
+			   $message.=' '.&Apache::lonxml::xmlparse($r,'tex','<p>'.$output.'</p>').' ';
+		       }      
+		   }
+		   if ($allowed) {
+		       $r->print('<h3>'.$syllabusfields{$field}.
+				 &Apache::loncommon::help_open_topic('Syllabus_URLs').'</h3>'.
+				 '<p><a href="'.$r->uri.'?forcestudent=1"><font size="+1">'.&mt('Show Public View').'</font></a>'.
+				 &Apache::loncommon::help_open_topic('Uploaded_Templates_PublicView').'</p>');
+		   } else {
+		       $r->print($message);
+		   } 
+	       } else {
+		   &Apache::lonfeedback::newline_to_br(\$message);
+		   $message =~s|(https*://[^\s]+)|<a href="$1"><tt>$1</tt></a>|g;
+		   if ($allowed) {
+		       $message=&Apache::lonspeller::markeduptext($message);
+		   }
+		   $message=&Apache::lontexconvert::msgtexconverted($message);
+		   if ($target ne 'tex') {
+		       $r->print('<h3>'.$syllabusfields{$field}.'</h3><blockquote>'.
+				 $message.'</blockquote>');
+		   } else {
+		       $r->print('\\\\\textbf{'.$syllabusfields{$field}.'}\\\\'.
+				 &Apache::lonxml::xmlparse($r,'tex',$message).'\\\\');
+		   }
+		   push(@htmlids,$field);
+	       }
+	       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" />');
+	       }
+	   }
        }
        if ($allowed) {
 	   $r->print('</form>'.