--- loncom/interface/lonrss.pm	2006/06/03 21:28:33	1.26
+++ loncom/interface/lonrss.pm	2007/05/02 01:33:49	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.26 2006/06/03 21:28:33 albertel Exp $
+# $Id: lonrss.pm,v 1.35 2007/05/02 01:33:49 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -36,7 +36,7 @@ use Apache::lonnet;
 use Apache::lontexconvert;
 use Apache::lonlocal;
 use Apache::lonhtmlcommon;
-
+use Apache::inputtags();
 
 sub filterfeedname {
     my $filename=shift;
@@ -92,10 +92,11 @@ sub advertisefeeds {
     if ($edit) {
 	$mode='adm';
     }
+    my $server = &Apache::lonnet::absolute_url();
     foreach my $feed (sort(keys(%feednames))) {
 	if (($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) {
-	    my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
-	    my $htmlurl='http://'.$ENV{'HTTP_HOST'}.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';
+	    my $feedurl= $server.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
+	    my $htmlurl= $server.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html';
 	    if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {
 		if ($edit) {
 		    $feeds.='<li><i>'.$feednames{$feed}.'</i><br />'.&mt('Hidden').': <a href="'.$htmlurl.'"><tt>'.$htmlurl.'</tt></a></li>';
@@ -103,7 +104,7 @@ sub advertisefeeds {
 	    } else {
 		$feeds.='<li><b>'.$feednames{$feed}.
 		    '</b><br />'.($edit?&mt('Edit'):'HTML').': <a href="'.$htmlurl.'"><tt>'.$htmlurl.'</tt></a>'.
-		    '<br />RSS: <a href="'.$feedurl.'"><tt>'.$feedurl.'</tt></a></li>';
+		    '<br />'.&mt('Public RSS/podcast (subscribe to)').': <a href="'.$feedurl.'"><tt>'.$feedurl.'</tt></a></li>';
 	    }
 	}
     }
@@ -200,16 +201,62 @@ sub add_blog_entry_link {
     my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype,$linktext)=@_;
     return "<a href='/adm/$udom/$uname/".&filterfeedname($filename).'_rss.html?queryid='.
 	&escape($id).
-	'&title='.&escape($title).
-	'&description='.&escape($description).
-	'&url='.&escape($url).
-	'&status='.&escape($status).
-	'&encurl='.&escape($encurl).
-	'&enctype='.&escape($enctype).
+	'&amp;title='.&escape($title).
+	'&amp;description='.&escape($description).
+	'&amp;url='.&escape($url).
+	'&amp;status='.&escape($status).
+	'&amp;encurl='.&escape($encurl).
+	'&amp;enctype='.&escape($enctype).
 	"'>".$linktext.'</a>';
 
 }
 
+sub blocking_blogdisplay {
+    my ($uname,$udom,$html,$filterfeedname) = @_;
+    my $user = &Apache::loncommon::plainname($uname,$udom);
+    if ($html) {
+        $user = &Apache::loncommon::aboutmewrapper($user,$uname,$udom);
+    } else {
+        $user = $user.' ('.$uname.':'.$udom.')';
+    }
+    my %setters;
+    my ($blocked,$output,$blockcause);
+    my ($startblock,$endblock) =
+             &Apache::loncommon::blockcheck(\%setters,'blogs');
+    if ($startblock && $endblock) {
+        $blockcause = 'user';
+    } else { 
+        if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
+            ($startblock,$endblock) =
+                 &Apache::loncommon::blockcheck(\%setters,'blogs',
+                                                $uname,$udom);
+            $blockcause = 'blogowner';
+        }
+    }
+    if ($startblock && $endblock) {
+        $blocked = 1;
+        my $showstart = &Apache::lonlocal::locallocaltime($startblock);
+        my $showend = &Apache::lonlocal::locallocaltime($endblock);
+        $output = &mt('Blogs belonging to [_1] are unavailable from [_2] to [_3].',$user,$showstart,$showend);
+        if ($html) {$output.='<br />';}
+        if ($blockcause eq 'user') {
+            $output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.');
+            if ($html) {
+                $output .= '<br />'.
+                       &Apache::loncommon::build_block_table($startblock,
+                                                        $endblock,\%setters);
+            }
+        } else {
+            $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');
+        }
+        if (!$html) {
+            my $id = &get_new_feed_id();
+            $output = '<title/><item><title/><description>'.$output."</description><link/><guid isPermaLink='false'>".$id.$filterfeedname.'_'.$udom.'_'.$uname.'</guid></item>';
+        }
+    }
+    return ($blocked,$output);
+}
+
 sub handler {
     my ($r) = @_;
 
@@ -240,6 +287,10 @@ sub handler {
     my $filterfeedname=&filterfeedname($filename);
     my $feedname=&feedname($filename);
     my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
+    my ($blocked,$blocktext);
+    if (!&Apache::lonnet::is_course($udom,$uname)) {
+        ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname);
+    }
     if ($html) {
 	my $title = $displayfeedname?$displayfeedname
                                     :"Available RSS Feeds and Blogs";
@@ -249,8 +300,9 @@ sub handler {
 						      $env{'form.register'}}).
 		  &changed_js());
     } else { # render RSS
+        my $server = &Apache::lonnet::absolute_url();
 	$r->print("<rss version='2.0' xmlns:dc='http://purl.org/dc/elements/1.1'>\n<channel>".
-		  "\n<link>http://".$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.
+		  "\n".'<link>'.$server.'/public/'.$udom.'/'.$uname.'/'.
 		  $filterfeedname.'_rss.html</link>'.
 		  "\n<description>".
 		  &mt('An RSS Feed provided by the LON-CAPA Learning Content Management System').
@@ -260,7 +312,7 @@ sub handler {
     my $newid = &get_new_feed_id();
 # Is this user for real?
     my $homeserver=&Apache::lonnet::homeserver($uname,$udom);
-    if ($html) {
+    if ($html && !$blocked) {
 # Any new feeds or renaming of feeds?
 	if ($edit) {
 # Hide a feed?
@@ -289,10 +341,13 @@ sub handler {
     } 
     if ($homeserver eq 'no_host') {
 	$r->print(($html?'<h3>':'<title>').&mt('No feed available').($html?'</h3>':'</title>'));
+    } elsif ($blocked) {
+        $r->print($blocktext);
+        $r->print(($html?&Apache::loncommon::end_page():'</channel></rss>'."\n"));
     } else { # is indeed a user
 # Course or user?
 	my $name='';
-	if ($uname=~/^\d/) {
+	if (&Apache::lonnet::is_course($udom,$uname)) {
 	    my %cenv=&Apache::lonnet::dump('environment',$udom,$uname);
 	    $name=$cenv{'description'};
 	} else {
@@ -300,7 +355,7 @@ sub handler {
 	}
 # Add a new feed
         if (($html) && ($edit)) {
-	    $r->print('<form method="post">');
+	    $r->print('<form method="post" name="makenewfeed">');
             $r->print(&mt('Name for New Feed').": <input type='text' size='40' name='namenewblog' />");
 	    $r->print('<input type="submit" value="'.&mt('Start a New Feed').'" />');
 	    $r->print('</form>');
@@ -319,8 +374,10 @@ sub handler {
 							     'status',
 							     'enclosureurl',
 							     'enclosuretype']);
+
 #    my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype)=@_;
 
+
 		    &editentry($env{'form.queryid'},
 			       $uname,$udom,$filename,
 			       $env{'form.title'},
@@ -331,6 +388,8 @@ sub handler {
 			       $env{'form.enctype'}
 			       );
 		}
+
+# store away the fields modified in the online form
 		my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);
 		foreach my $entry (sort(keys(%newsfeed)),$env{'form.newid'}.'_status') {
 		    if ($entry=~/^(\d+)\_status$/) {
@@ -339,7 +398,7 @@ sub handler {
 			    &editentry($id,$uname,$udom,$feedname,
 				       $env{'form.'.$id.'_title'},
 				       $env{'form.'.$id.'_description'},
-				       $env{'form.'.$id.'_url'},
+				       $env{'form.'.$id.'_link'},
 				       $env{'form.'.$id.'_status'},
 				       $env{'form.'.$id.'_enclosureurl'},
 				       $env{'form.'.$id.'_enclosuretype'},
@@ -347,21 +406,64 @@ sub handler {
 			}
 		    }
 		}
+
+# see if we have any uploaded or portfolio files
+                my @uploadeditems=();
+
+		if ($env{'form.HWFILE0_0'}) {
+# We have an uploaded file - store it away.
+		    $uploadeditems[0]=&Apache::lonnet::userfileupload('HWFILE0_0',undef,'portfolio/podcasts');
+		}
+		if ($env{'form.HWPORT0_0'}) {
+# Selected portfolio files
+		    foreach my $filename (split(/\,/,$env{'form.HWPORT0_0'})) {
+			if ($filename) {
+# construct full path and remember
+			    push(@uploadeditems,'/uploaded/'.$env{'user.domain'}.'/'.$env{'user.name'}.'/portfolio'.$filename);
+			}
+		    }
+		}
+# the zeroth item should be stored together with the last displayed (newid) field
+		if ($uploadeditems[0]) {
+		    my $id=$env{'form.newid'};
+		    &editentry($id,$uname,$udom,$feedname,
+			       $env{'form.'.$id.'_title'},
+			       $env{'form.'.$id.'_description'},
+			       $env{'form.'.$id.'_link'},
+			       $env{'form.'.$id.'_status'},
+			       $uploadeditems[0],
+			       &Apache::loncommon::filemimetype(($uploadeditems[0]=~/\.(\w+)$/)[0]),
+			       );
+		    &Apache::lonnet::make_public_indefinitely($uploadeditems[0]);
+		}
+# if there are more files, they need new entries, since each can only have one enclosure
+		for (my $i=1; $i<=$#uploadeditems; $i++) {
+		    my $id = &get_new_feed_id().$i;
+		    &editentry($id,$uname,$udom,$feedname,
+			       'New Entry',
+			       '',
+			       '',
+			       'public',
+			       $uploadeditems[$i],
+			       &Apache::loncommon::filemimetype(($uploadeditems[$i]=~/\.(\w+)$/)[0]),
+			       );
+		    &Apache::lonnet::make_public_indefinitely($uploadeditems[$i]);
+		}
 	    } #done storing
 
+# Render private items?
+            my $viewpubliconly=1;
 	    $r->print("\n".
 		      ($html?'<hr /><h3>':'<title>').
 		      &mt('LON-CAPA Feed "[_1]" for [_2]',$displayfeedname,$name).
 		      ($displayoption eq 'hidden'?' ('.&mt('Hidden').')':'').
-		      ($html?'</h3>'.($edit?'<form method="post"><br />'.
+		      ($html?'</h3>'.($edit?'<form method="post" name="lonhomework" enctype="multipart/form-data"><br />'.
 				      &mt('Name of this Feed').
 				      ': <input type="text" size="50" name="newblogname" value="'.
 				      $displayfeedname.'" />':'').'<ul>':'</title>'));
-# Render private items?
-	    my $viewpubliconly=1;
 	    if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) {
 		$viewpubliconly=0;
-	    }
+            }
 # Get feed items
 	    my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);
 	    foreach my $entry (sort(keys(%newsfeed)),$newid.'_status') {
@@ -372,10 +474,21 @@ sub handler {
 							   'private' => 'private',
 							   'hidden' => 'hidden',
 							   'delete' => 'delete',
-							   'store' => 'Store changes',
+							   'store' => 'Save changes',
 							   'title' => 'Title',
 							   'link' => 'Link',
-							   'description' => 'Description');
+							   'description' => 'Description',
+                                                           'enc' => 'Podcasted enclosure');
+                        my $uploadlink;
+                        if ($entry==$newid) {
+# Generate upload link only for last (new) entry
+			    $uploadlink=&Apache::inputtags::file_selector(0,0,'*','both');
+			} else {
+# Otherwise, display
+                            $uploadlink='<tt>'.$newsfeed{$id.'_enclosureurl'}.'</tt>'.
+				"<input type='hidden' name='$id\_enclosureurl' value='$newsfeed{$id.'_enclosureurl'}' />".
+				"<input type='hidden' name='$id\_enclosuretype' value='$newsfeed{$id.'_enclosuretype'}' />";
+			}
 			my %status=();
 			unless ($newsfeed{$id.'_status'}) { $newsfeed{$id.'_status'}='public'; }
 			$status{$newsfeed{$id.'_status'}}='checked="checked"';
@@ -396,27 +509,37 @@ $lt{'title'}:
 $lt{'description'}:<br />
 <textarea name='$id\_description' rows="6" cols="80" onChange="changed(this.form,'$id');">$newsfeed{$id.'_description'}</textarea><br />
 $lt{'link'}:
-<input name='$id\_link' type='text' size='60' value='$newsfeed{$id.'_link'}' onChange="changed(this.form,'$id');" />
+<input name='$id\_link' type='text' size='60' value='$newsfeed{$id.'_link'}' onChange="changed(this.form,'$id');" /><br />
+$lt{'enc'} -
+$uploadlink
 <hr /></li>
 ENDEDIT
 		    } else { # not in edit mode, just displaying
 			if (($newsfeed{$id.'_status'} ne 'public') && ($viewpubliconly)) { next; }
 			if ($newsfeed{$id.'_status'} eq 'hidden') { next; }
+			my $link =  $newsfeed{$id.'_link'};
+			if ($link =~ m|^/| ) {
+			    $link = "http://".$ENV{'HTTP_HOST'}.$link;
+			}
 			$r->print("\n".($html?"\n<li><b>":"<item>\n<title>").$newsfeed{$id.'_title'}.
 				  ($html?"</b><br />\n":"</title>\n<description>").
 				  $newsfeed{$id.'_description'}.
-				  ($html?"<br />\n<a href='":"</description>\n<link>").
-				  "http://".$ENV{'HTTP_HOST'}.
-				  $newsfeed{$id.'_link'}.
-				  ($html?("'>".&mt('Read more')."</a><br />\n"):"</link>\n"));
+				  ($html?"<br />":"</description>\n").
+				  ($link?($html?"\n<a href='":"<link>").
+				  $link.
+				  ($html?("'>".&mt('Read more')."</a><br />\n"):"</link>\n"):''));
+			my $enclosure=$newsfeed{$id.'_enclosureurl'};
 # Enclosure? Get stats
-			if ($newsfeed{$id.'_enclosureurl'}) {
-			    my @stat=&Apache::lonnet::stat_file($newsfeed{$id.'_enclosureurl'});
+			if ($enclosure) {
+			    my @stat=&Apache::lonnet::stat_file($enclosure);
 			    if ($stat[7]) {
 # Has non-zero length (and exists)
-				my $enclosuretype=$newsfeed{$id.'_enclosetype'};
+				my $enclosuretype=$newsfeed{$id.'_enclosuretype'};
+				if ($enclosure =~ m|^/| ) {
+				    $enclosure = "http://".$ENV{'HTTP_HOST'}.$enclosure;
+				}
 				$r->print(($html?"<a href='":"\n<enclosure url='").
-					  $newsfeed{$id.'_enclosureurl'}."' length='".$stat[7].
+					  $enclosure."' length='".$stat[7].
 					  "' type='".$enclosuretype.($html?"'>".&mt('Enclosure')."</a>":"' />"));
 			    }
 			}
@@ -431,7 +554,7 @@ ENDEDIT
 	    if ($html) {
 		$r->print('</ul>');
 		if ($edit) {
-		    $r->print('<input type="hidden" name="newid" value="'.$newid.'"/><input type="submit" value="'.&mt('Store Marked Changes').'" />'.
+		    $r->print('<input type="hidden" name="newid" value="'.$newid.'"/><input type="submit" value="'.&mt('Save Marked Changes').'" />'.
 			      ($displayoption eq 'hidden'?'<input type="submit" name="advertisethisblog" value="'.&mt('Advertise this Feed').'" />':
 			       '<input type="submit" name="hidethisblog" value="'.&mt('Hide this Feed').'" />'));
 		}