[LON-CAPA-cvs] cvs: loncom /interface lonsyllabus.pm

[www]

www		Mon Feb 10 09:44:36 2003 EDT

  Modified files:              
    /loncom/interface	lonsyllabus.pm 
  Log:
  Bug #1019 - can now incorporate internal and external URLs.
  
  
Index: loncom/interface/lonsyllabus.pm
diff -u loncom/interface/lonsyllabus.pm:1.8 loncom/interface/lonsyllabus.pm:1.9
--- loncom/interface/lonsyllabus.pm:1.8	Fri Sep 13 15:40:48 2002
+++ loncom/interface/lonsyllabus.pm	Mon Feb 10 09:44:36 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Syllabus
 #
-# $Id: lonsyllabus.pm,v 1.8 2002/09/13 19:40:48 www Exp $
+# $Id: lonsyllabus.pm,v 1.9 2003/02/10 14:44:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -69,7 +69,8 @@
        'hhh_readings'       => 'Readings',
        'iii_coursepack'     => 'Coursepack',
        'jjj_weblinks'       => 'Web Links',
-       'kkk_textbook'       => 'Textbook');
+       'kkk_textbook'       => 'Textbook',
+       'lll_includeurl'     => 'URLs To Include in Syllabus');
 
 # --------------------------------------------------------------- Force Student
     &Apache::loncommon::get_unprocessed_cgi
@@ -106,6 +107,33 @@
                $field=~s/\</\&lt\;/g;
                $field=~s/\>/\&gt\;/g;
 	       $syllabus{$_}=$field;
+               if ($_ eq 'lll_includeurl') { # clean up included URLs
+                  my $field='';
+	          foreach (split(/\n/,$syllabus{$_})) {
+		      my $url=$_;
+# get rid of leading and trailing spaces
+                      $url=~s/^\s+//;
+                      $url=~s/\s+$//;
+                      if ($url=~/^http\:\/\/([^\/]+)\/(.+)$/) {
+                          my $remainder=$2;
+# remove the hostname from internal URLs
+		          foreach (keys %Apache::lonnet::hostname) {
+                              if ($1=~/$Apache::lonnet::hostname{$_}/i) {
+			         $url=$remainder;
+			      }
+		          }
+		      }
+# norm internal URLs
+                      unless ($url=~/^http\:/) {
+		          $url=&Apache::lonnet::clutter($url);
+                      }
+# re-assemble field
+                      if ($url) {
+		          $field.=$url."\n";
+                      }
+		  }
+                  $syllabus{$_}=$field;
+	      }
            }
            $syllabus{'uploaded.domain'}=$ENV{'user.domain'};
            $syllabus{'uploaded.name'}=$ENV{'user.name'};
@@ -132,12 +160,42 @@
        foreach (sort keys %syllabusfields) {
           if (($syllabus{$_}) || ($allowed)) {
               my $message=$syllabus{$_};
-              $message=~s/\n/\<br \/\>/g;
-              $message
+              if ($_ 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') {
+# make ssi call and remove everything but the body contents
+	                 $output=&Apache::lonnet::ssi($filelink);
+                         $output=~s/^.*\<body[^\>]*\>//si;
+                         $output=~s/\<\/body\s*\>.*$//si;
+	              } elsif ($embstyle eq 'img') {
+# embed as an image
+                         $output='<img src="'.$filelink.'" />';
+		      }
+                      $message.='<p>'.$output.'</p>';
+                  }
+                  if ($allowed) {
+                     $r->print('<h3>'.$syllabusfields{$_}.
+                   '</h3>URLs provided will be included into the page output.'.
+                   '<br />Format:<br /><pre>'.
+	     "http://www.foo.org/foo.html\n/res/foo/author/foo.html\n</pre>".
+	  '<p><a href="'.$r->uri.'?forcestudent=1">Show Student View</a></p>');
+		 } else {
+                  $r->print($message);
+                 } 
+              } else {
+                 $message=~s/\n/\<br \/\>/g;
+                 $message
              =~s/(http\:\/\/[^\s]+)/\<a href=\"$1\"\>\<tt\>$1\<\/tt\>\<\/a\>/g;
-	      $message=&Apache::lontexconvert::msgtexconverted($message);
-              $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
+	         $message=&Apache::lontexconvert::msgtexconverted($message);
+                 $r->print('<h3>'.$syllabusfields{$_}.'</h3><blockquote>'.
                         $message.'</blockquote>');
+	     }
               if ($allowed) {
                  $r->print('<br /><textarea cols="80" rows="6" name="'.$_.'">'.
 			   $syllabus{$_}.