--- loncom/interface/lonrss.pm	2006/10/02 16:47:57	1.28
+++ loncom/interface/lonrss.pm	2006/12/01 20:17:47	1.29
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.28 2006/10/02 16:47:57 albertel Exp $
+# $Id: lonrss.pm,v 1.29 2006/12/01 20:17:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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>';
@@ -210,6 +211,52 @@ sub add_blog_entry_link {
 
 }
 
+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 ($uname !~ /^\d\w\d[\w\-.]+$/) {
+        ($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 ($uname =~ /^\d\w\d[\w\-.]+$/) {
 	    my %cenv=&Apache::lonnet::dump('environment',$udom,$uname);
 	    $name=$cenv{'description'};
 	} else {
@@ -349,6 +404,8 @@ sub handler {
 		}
 	    } #done storing
 
+# Render private items?
+            my $viewpubliconly=1;
 	    $r->print("\n".
 		      ($html?'<hr /><h3>':'<title>').
 		      &mt('LON-CAPA Feed "[_1]" for [_2]',$displayfeedname,$name).
@@ -357,11 +414,9 @@ sub handler {
 				      &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') {