--- loncom/interface/lonrss.pm	2022/01/20 00:26:02	1.53.2.6
+++ loncom/interface/lonrss.pm	2015/06/18 20:19:06	1.54
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.53.2.6 2022/01/20 00:26:02 raeburn Exp $
+# $Id: lonrss.pm,v 1.54 2015/06/18 20:19:06 musolffc Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -128,8 +128,8 @@ sub advertisefeeds {
     }
     if ($feeds) {
 	return '<h4>'.&mt('Available RSS Feeds and Blogs').'</h4><ul>'.$feeds.'</ul>';
-    } elsif (!$edit) {
-        return '<h4>'.&mt('No available RSS Feeds and Blogs').'</h4>';
+    } else {
+        return '';
     }
 }
 
@@ -244,7 +244,7 @@ sub add_blog_entry_link {
 }
 
 sub blocking_blogdisplay {
-    my ($uname,$udom,$html,$filterfeedname,$clientip) = @_;
+    my ($uname,$udom,$html,$filterfeedname) = @_;
     my $user = &Apache::loncommon::plainname($uname,$udom);
     if ($html) {
         $user = &Apache::loncommon::aboutmewrapper($user,$uname,$udom);
@@ -253,29 +253,23 @@ sub blocking_blogdisplay {
     }
     my %setters;
     my ($blocked,$output,$blockcause);
-    my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
-             &Apache::loncommon::blockcheck(\%setters,'blogs',$clientip);
+    my ($startblock,$endblock) =
+             &Apache::loncommon::blockcheck(\%setters,'blogs');
     if ($startblock && $endblock) {
         $blockcause = 'user';
-    } elsif ($by_ip) {
-        $blockcause = 'ip';
     } else { 
         if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
             ($startblock,$endblock) =
-                 &Apache::loncommon::blockcheck(\%setters,'blogs',$clientip,
+                 &Apache::loncommon::blockcheck(\%setters,'blogs',
                                                 $uname,$udom);
             $blockcause = 'blogowner';
         }
     }
-    if (($startblock && $endblock) || ($by_ip)) {
+    if ($startblock && $endblock) {
         $blocked = 1;
-        if ($startblock && $endblock) {
-            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);
-        } else {
-            $output = &mt('Blogs are unavailable from your current IP address: [_1].',$clientip);
-        }
+        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.');
@@ -283,15 +277,9 @@ sub blocking_blogdisplay {
                 #$output .= '<br />'.
                        #&Apache::loncommon::build_block_table($startblock,
                        #                                 $endblock,\%setters);
-                 my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs',$clientip);
+                 my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs');
                  $output .= '<br /><br />'.$blocktext;
             }
-        } elsif ($blockcause eq 'ip') {
-            my $showdom = &Apache::lonnet::domain($blockdom);
-            if ($showdom eq '') {
-                $showdom = $blockdom;
-            }
-            $output .= &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain.',$showdom);
         } else {
             $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');
         }
@@ -337,8 +325,7 @@ sub handler {
     my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
     my ($blocked,$blocktext,$disabled,$disabletext);
     if (!&Apache::lonnet::is_course($udom,$uname)) {
-        my $clientip = &Apache::lonnet::get_requestor_ip($r);
-        ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname,$clientip);
+        ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname);
         if (&Apache::lonnet::usertools_access($uname,$udom,'blog')) {
             $disabled = 0;
         } else {
@@ -358,8 +345,8 @@ sub handler {
 #	my $title = $displayfeedname?$displayfeedname:"Available RSS Feeds and Blogs";
         my $title = "My Space";
 	my $rss_link = &Apache::lonrss::rss_link($uname,$udom);
-        my $head_extra = $rss_link.'<script type="text/javascript" '
-                                  .'src="/res/adm/includes/file_upload.js"></script>';
+    my $head_extra = $rss_link.'<script type="text/javascript"
+                                src="/res/adm/includes/file_upload.js"></script>';
 	my $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}];
 	$r->print(&Apache::loncommon::start_page($title,$head_extra,
 			 {'bread_crumbs'   => $brcrumb,
@@ -549,23 +536,23 @@ sub handler {
 							   'title' => 'Title',
 							   'link' => 'Link',
 							   'description' => 'Description',
-                                                           'enc' => 'Podcasted enclosure');
-                        my $uploadlink;
-                        if ($entry==$newid) {
+                               'enc' => 'Podcasted enclosure');
+            my $uploadlink;
+            if ($entry==$newid) {
 # Generate upload link only for last (new) entry
-# Calculate the quota space available in the user's portfolio
-                            my $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
-                                                 $env{'user.domain'}); # expressed in MB
-                            my $portfolio_root = '/userfiles/portfolio';
-                            my $getpropath = 1;
-                            my $current_disk_usage = &Apache::lonnet::diskusage(
-                                $env{'user.domain'}, $env{'user.name'},
-                                $portfolio_root, $getpropath); # Expressed in kB
-                            # Convert to MB for use in file_selector()
-                            my $free_space = $disk_quota - ($current_disk_usage / 1024.);
-                            # Format this number since it will be displayed onscreen
-                            $free_space = sprintf("%.1f", $free_space);
-                            $uploadlink=&Apache::inputtags::file_selector(0,0,'*','both','',$free_space);
+                # Calculate the quota space available in the user's portfolio
+                my $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
+                                    $env{'user.domain'}); # expressed in MB
+                my $portfolio_root = '/userfiles/portfolio';
+                my $getpropath = 1;
+                my $current_disk_usage = &Apache::lonnet::diskusage(
+                        $env{'user.domain'}, $env{'user.name'}, 
+                        $portfolio_root, $getpropath); # Expressed in kB
+                # Convert to MB for use in file_selector()
+                my $free_space = $disk_quota - ($current_disk_usage / 1024.); 
+                # Format this number since it will be displayed onscreen
+                $free_space = sprintf("%.1f", $free_space);
+                $uploadlink=&Apache::inputtags::file_selector(0,0,'*','both','',$free_space);
 			} else {
 # Otherwise, display
                             $uploadlink='<tt>'.$newsfeed{$id.'_enclosureurl'}.'</tt>'.