--- loncom/interface/lonrss.pm	2019/08/14 16:06:13	1.58
+++ loncom/interface/lonrss.pm	2025/03/16 21:04:09	1.64
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.58 2019/08/14 16:06:13 raeburn Exp $
+# $Id: lonrss.pm,v 1.64 2025/03/16 21:04:09 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -88,7 +88,7 @@ sub changefeeddisplay {
 }
 
 sub advertisefeeds {
-    my ($uname,$udom,$edit,$count,$hidden)=@_;
+    my ($uname,$udom,$edit,$count,$hidden,$skipheader)=@_;
     my $feeds='';
     my %feednames=&Apache::lonnet::dump('nohist_all_rss_feeds',$udom,$uname);
     my $mode='public';
@@ -127,10 +127,20 @@ sub advertisefeeds {
 	}
     }
     if ($feeds) {
-	return '<h4>'.&mt('Available RSS Feeds and Blogs').'</h4><ul>'.$feeds.'</ul>';
+	if ($skipheader) {
+	    return '<ul>'.$feeds.'</ul>';
+	} else {
+	    return '<h2 class="LC_heading_3">'.&mt('Available RSS Feeds and Blogs').'</h2><ul>'.$feeds.'</ul>';
+	}
     } elsif (!$edit) {
-        return '<h4>'.&mt('No available RSS Feeds and Blogs').'</h4>';
+	my $info = &mt('No available RSS Feeds and Blogs');
+	if ($skipheader) {
+	    return '<p>'.$info.'</p>';
+	} else {
+	    return '<h2 class="LC_heading_3">'.$info.'</h2>';
+	}
     }
+    return;
 }
 
 sub rss_link {
@@ -244,7 +254,7 @@ sub add_blog_entry_link {
 }
 
 sub blocking_blogdisplay {
-    my ($uname,$udom,$html,$filterfeedname) = @_;
+    my ($uname,$udom,$html,$filterfeedname,$clientip) = @_;
     my $user = &Apache::loncommon::plainname($uname,$udom);
     if ($html) {
         $user = &Apache::loncommon::aboutmewrapper($user,$uname,$udom);
@@ -253,23 +263,29 @@ sub blocking_blogdisplay {
     }
     my %setters;
     my ($blocked,$output,$blockcause);
-    my ($startblock,$endblock) =
-             &Apache::loncommon::blockcheck(\%setters,'blogs');
+    my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
+             &Apache::loncommon::blockcheck(\%setters,'blogs',$clientip);
     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',
+                 &Apache::loncommon::blockcheck(\%setters,'blogs',$clientip,
                                                 $uname,$udom);
             $blockcause = 'blogowner';
         }
     }
-    if ($startblock && $endblock) {
+    if (($startblock && $endblock) || ($by_ip)) {
         $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 ($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);
+        }
         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.');
@@ -277,9 +293,15 @@ sub blocking_blogdisplay {
                 #$output .= '<br />'.
                        #&Apache::loncommon::build_block_table($startblock,
                        #                                 $endblock,\%setters);
-                 my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs');
+                 my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs',$clientip);
                  $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.');
         }
@@ -325,7 +347,8 @@ sub handler {
     my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
     my ($blocked,$blocktext,$disabled,$disabletext);
     if (!&Apache::lonnet::is_course($udom,$uname)) {
-        ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname);
+        my $clientip = &Apache::lonnet::get_requestor_ip($r); 
+        ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname,$clientip);
         if (&Apache::lonnet::usertools_access($uname,$udom,'blog')) {
             $disabled = 0;
         } else {
@@ -352,7 +375,8 @@ sub handler {
 			 {'bread_crumbs'   => $brcrumb,
 			  'domain'         => $udom,
 			  'force_register' => $env{'form.register'}}).
-		  &changed_js());
+		  &changed_js().
+	          '<div class="LC_landmark" role="main">');
     } 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>".
@@ -412,10 +436,10 @@ sub handler {
 	}
 # Add a new feed
         if (($html) && ($edit)) {
-	    $r->print('<h4>' . &mt('New RSS Feed or Blog'). '</h4>');
+	    $r->print('<h2 class="LC_heading_3">' . &mt('New RSS Feed or Blog'). '</h2>');
 	    $r->print('<form method="post" name="makenewfeed" action="">');
-            $r->print(&mt('Name').": <input type='text' size='40' name='namenewblog' />");
-	    $r->print('<input type="submit" value="'.&mt('New Feed').'" />');
+            $r->print('<label>'.&mt('Name').": <input type='text' size='40' name='namenewblog' />");
+	    $r->print('</label><input type="submit" value="'.&mt('New Feed').'" />');
 	    $r->print('</form>');
 	}
         if ($displayfeedname) { # this is an existing feed
@@ -516,9 +540,9 @@ sub handler {
 		      &mt('LON-CAPA Feed "[_1]" for [_2]',$displayfeedname,$name).
 		      ($displayoption eq 'hidden'?' ('.&mt('Hidden').')':'').
 		      ($html?'</h3>'.($edit?'<form method="post" name="lonhomework" enctype="multipart/form-data" action=""><br />'.
-				      &mt('Name of this Feed').
+				      '<label>'.&mt('Name of this Feed').
 				      ': <input type="text" size="50" name="newblogname" value="'.
-				      $displayfeedname.'" />':'').'<ul>':'</title>'));
+				      $displayfeedname.'" />':'').'</label><br /><ul>':'</title>'));
 	    if (($env{'user.name'} eq $uname) && ($env{'user.domain'} eq $udom)) {
 		$viewpubliconly=0;
             }
@@ -536,7 +560,8 @@ sub handler {
 							   'title' => 'Title',
 							   'link' => 'Link',
 							   'description' => 'Description',
-                                                           'enc' => 'Podcasted enclosure');
+                                                           'enc' => 'Podcasted enclosure',
+                                                           'status' => 'Status');
                         my $uploadlink;
                         if ($entry==$newid) {
 # Generate upload link only for last (new) entry
@@ -552,7 +577,9 @@ sub handler {
                             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);
+                            $uploadlink = &Apache::lonhtmlcommon::start_pick_box().
+                                          &Apache::inputtags::file_selector(0,0,'*','both','',$free_space).
+                                          &Apache::lonhtmlcommon::end_pick_box();
 			} else {
 # Otherwise, display
                             $uploadlink='<tt>'.$newsfeed{$id.'_enclosureurl'}.'</tt>'.
@@ -566,6 +593,7 @@ sub handler {
 <li>
 <label><input name='$id\_modified' type='checkbox' value="modified" /> $lt{'store'}</label>
 &nbsp;&nbsp;
+<fieldset class="LC_landmark" style="display:inline;"><legend class="LC_visually_hidden">$lt{'status'}</legend>
 <label><input name='$id\_status' type="radio" value="public" $status{'public'} onclick="changed(this.form,'$id');" /> $lt{'public'}</label>
 &nbsp;&nbsp;
 <label><input name='$id\_status' type="radio" value="private" $status{'private'} onclick="changed(this.form,'$id');" /> $lt{'private'}</label>
@@ -573,13 +601,16 @@ sub handler {
 <label><input name='$id\_status' type="radio" value="hidden" $status{'hidden'} onclick="changed(this.form,'$id');" /> $lt{'hidden'}</label>
 &nbsp;&nbsp;
 <label><input name='$id\_status' type="radio" value="deleted" onclick="changed(this.form,'$id');" /> $lt{'delete'}</label>
+</fieldset>
+<br />
 <br />
+<label>
 $lt{'title'}:
-<input name='$id\_title' type='text' size='60' value='$newsfeed{$id.'_title'}' onchange="changed(this.form,'$id');" /><br />
-$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');" /><br />
+<input name='$id\_title' type='text' size='60' value='$newsfeed{$id.'_title'}' onchange="changed(this.form,'$id');" /></label><br />
+<label>$lt{'description'}:<br />
+<textarea name='$id\_description' rows="6" cols="80" onchange="changed(this.form,'$id');">$newsfeed{$id.'_description'}</textarea></label><br /><br />
+<label>$lt{'link'}:
+<input name='$id\_link' type='text' size='60' value='$newsfeed{$id.'_link'}' onchange="changed(this.form,'$id');" /></label><br />
 $lt{'enc'} -
 $uploadlink
 <hr /></li>
@@ -631,7 +662,7 @@ ENDEDIT
                 $r->print('</form>');
 	    }
 	} # was a real display feedname
-	$r->print(($html?&Apache::loncommon::end_page():'</channel></rss>'."\n"));
+	$r->print(($html?'</div>'.&Apache::loncommon::end_page():'</channel></rss>'."\n"));
     } # a real user
     return OK;
 } # end handler