--- loncom/interface/lonrss.pm	2006/12/01 20:17:47	1.29
+++ 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.29 2006/12/01 20:17:47 raeburn Exp $
+# $Id: lonrss.pm,v 1.64 2025/03/16 21:04:09 raeburn 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;
@@ -61,6 +61,9 @@ sub displayfeedname {
     my $name=$filterfilename; 
     if ($name=~/^CourseBlog/) {
         $name=&mt('Course Blog');
+        if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') {
+            $name = &mt('Community Blog'); 
+        }
 	if ($env{'course.'.$env{'request.course.id'}.'.description'}) {
 	    $name.=' '.$env{'course.'.$env{'request.course.id'}.'.description'};
 	}
@@ -85,7 +88,7 @@ sub changefeeddisplay {
 }
 
 sub advertisefeeds {
-    my ($uname,$udom,$edit)=@_;
+    my ($uname,$udom,$edit,$count,$hidden,$skipheader)=@_;
     my $feeds='';
     my %feednames=&Apache::lonnet::dump('nohist_all_rss_feeds',$udom,$uname);
     my $mode='public';
@@ -94,30 +97,69 @@ sub advertisefeeds {
     }
     my $server = &Apache::lonnet::absolute_url();
     foreach my $feed (sort(keys(%feednames))) {
-	if (($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) {
-	    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>';
-		}
-	    } 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>';
+	next if ($feed =~/^\s*$/    ||
+		 $feed =~ /^error:/ ||
+		 $feed =~ /^feed_display_option_/);
+        if ($feednames{'feed_display_option_'.$feed} eq 'hidden') {
+            if (ref($hidden)) {
+                $$hidden ++;
+            }
+            if (ref($count)) {
+                unless ($edit) {
+                    next;
+                }
+            }
+        } else {
+            if (ref($count)) {
+                $$count ++;
+            }
+        }
+	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>';
 	    }
+	} else {
+	    $feeds.='<li><b>'.$feednames{$feed}.
+		'</b><br />'.($edit?&mt('Edit'):'HTML').': <a href="'.$htmlurl.'"><tt>'.$feednames{$feed}.' HTML</tt></a>'.
+		'<br />'.&mt('Public RSS/podcast (subscribe to)').': <a href="'.$feedurl.'"><tt>'.$feednames{$feed}.' RSS/Podcast</tt></a></li>';
 	}
     }
     if ($feeds) {
-	return '<h4>'.&mt('Available RSS Feeds and Blogs').'</h4><ul>'.$feeds.'</ul>';
-    } else {
-        return '';
+	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) {
+	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 {
-    my ($url) = @_;
-    return qq|<link rel="alternate" type="application/rss+xml" title="Course Announcements" href="$url" />|;
+    my ($uname,$udom)=@_;
+    my $result;
+    my $server = &Apache::lonnet::absolute_url();
+    my %feednames=&Apache::lonnet::dump('nohist_all_rss_feeds',$udom,$uname);
+    foreach my $feed (sort(keys(%feednames))) {
+	next if ($feed =~/^\s*$/    ||
+		 $feed =~ /^error:/ ||
+		 $feed =~/^feed_display_option_/ );
+	my $url= $server.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
+	my $title = $feed;
+	$title =~ s/_/ /g;
+	$result.=qq|
+<link rel="alternate" type="application/rss+xml" title="$title" href="$url" />
+|;
+    }
+    return $result;
 }
 
 {
@@ -212,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);
@@ -221,31 +263,45 @@ 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.');
             if ($html) {
-                $output .= '<br />'.
-                       &Apache::loncommon::build_block_table($startblock,
-                                                        $endblock,\%setters);
+                #$output .= '<br />'.
+                       #&Apache::loncommon::build_block_table($startblock,
+                       #                                 $endblock,\%setters);
+                 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.');
         }
@@ -267,7 +323,9 @@ sub handler {
 	$edit=1;
 	$html=1;
     }
-    if  (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+    if  (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))
+        && ($uname eq $env{'course.'.$env{'request.course.id'}.'.num'} &&
+            $udom eq $env{'course.'.$env{'request.course.id'}.'.domain'})) {
 	$edit=1;
 	$html=1;
     }
@@ -287,18 +345,38 @@ 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);
+    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);
+        if (&Apache::lonnet::usertools_access($uname,$udom,'blog')) {
+            $disabled = 0;
+        } else {
+            $disabled = 1;
+            if ($html) {
+                $disabletext = '<h2>'.&mt('No user blog available') .'</h2>'.
+                               &mt('This is a result of one of the following:').'<ul>'.
+                               '<li>'.&mt('The administrator of this domain has disabled blog functionality for this specific user.').'</li>'.
+                               '<li>'.&mt('The domain has been configured to disable, by default, blog functionality for all users in the domain.').'</li>'.
+                               '</ul>';
+            } else {
+                $disabletext = &mt('No user blog available');
+            }
+        }
     }
     if ($html) {
-	my $title = $displayfeedname?$displayfeedname
-                                    :"Available RSS Feeds and Blogs";
-	$r->print(&Apache::loncommon::start_page($title,undef,
-						 {'domain'         => $udom,
-						  'force_register' =>
-						      $env{'form.register'}}).
-		  &changed_js());
+#	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 $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}];
+	$r->print(&Apache::loncommon::start_page($title,$head_extra,
+			 {'bread_crumbs'   => $brcrumb,
+			  'domain'         => $udom,
+			  'force_register' => $env{'form.register'}}).
+		  &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>".
@@ -312,7 +390,7 @@ sub handler {
     my $newid = &get_new_feed_id();
 # Is this user for real?
     my $homeserver=&Apache::lonnet::homeserver($uname,$udom);
-    if ($html && !$blocked) {
+    if ($html && !$blocked && !$disabled) {
 # Any new feeds or renaming of feeds?
 	if ($edit) {
 # Hide a feed?
@@ -344,10 +422,13 @@ sub handler {
     } elsif ($blocked) {
         $r->print($blocktext);
         $r->print(($html?&Apache::loncommon::end_page():'</channel></rss>'."\n"));
+    } elsif ($disabled) {
+        $r->print($disabletext);
+        $r->print(($html?&Apache::loncommon::end_page():'</channel></rss>'."\n"));
     } else { # is indeed a user
 # Course or user?
 	my $name='';
-	if ($uname =~ /^\d\w\d[\w\-.]+$/) {
+	if (&Apache::lonnet::is_course($udom,$uname)) {
 	    my %cenv=&Apache::lonnet::dump('environment',$udom,$uname);
 	    $name=$cenv{'description'};
 	} else {
@@ -355,9 +436,10 @@ sub handler {
 	}
 # Add a new feed
         if (($html) && ($edit)) {
-	    $r->print('<form method="post">');
-            $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('<h2 class="LC_heading_3">' . &mt('New RSS Feed or Blog'). '</h2>');
+	    $r->print('<form method="post" name="makenewfeed" action="">');
+            $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
@@ -374,8 +456,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'},
@@ -386,6 +470,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$/) {
@@ -402,6 +488,49 @@ 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?
@@ -410,16 +539,16 @@ sub handler {
 		      ($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 />'.
-				      &mt('Name of this Feed').
+		      ($html?'</h3>'.($edit?'<form method="post" name="lonhomework" enctype="multipart/form-data" action=""><br />'.
+				      '<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;
             }
 # Get feed items
 	    my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);
-	    foreach my $entry (sort(keys(%newsfeed)),$newid.'_status') {
+	    foreach my $entry (sort {$b cmp $a} (keys(%newsfeed)),$newid.'_status') {
 		if ($entry=~/^(\d+)\_status$/) { # is an entry
 		    my $id=$1;
 		    if ($edit) {
@@ -427,10 +556,36 @@ sub handler {
 							   'private' => 'private',
 							   'hidden' => 'hidden',
 							   'delete' => 'delete',
-							   'store' => 'Store changes',
+							   'store' => 'Select',
 							   'title' => 'Title',
 							   'link' => 'Link',
-							   'description' => 'Description');
+							   'description' => 'Description',
+                                                           'enc' => 'Podcasted enclosure',
+                                                           'status' => 'Status');
+                        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::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>'.
+				"<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"';
@@ -438,20 +593,26 @@ sub handler {
 <li>
 <label><input name='$id\_modified' type='checkbox' value="modified" /> $lt{'store'}</label>
 &nbsp;&nbsp;
-<label><input name='$id\_status' type="radio" value="public" $status{'public'} onClick="changed(this.form,'$id');" /> $lt{'public'}</label>
+<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>
+<label><input name='$id\_status' type="radio" value="private" $status{'private'} onclick="changed(this.form,'$id');" /> $lt{'private'}</label>
 &nbsp;&nbsp;
-<label><input name='$id\_status' type="radio" value="hidden" $status{'hidden'} onClick="changed(this.form,'$id');" /> $lt{'hidden'}</label>
+<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>
+<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');" />
+<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>
 ENDEDIT
 		    } else { # not in edit mode, just displaying
@@ -464,18 +625,22 @@ ENDEDIT
 			$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>").
-				  
+				  ($html?"<br />":"</description>\n").
+				  ($link?($html?"\n<a href='":"<link>").
 				  $link.
-				  ($html?("'>".&mt('Read more')."</a><br />\n"):"</link>\n"));
+				  ($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>":"' />"));
 			    }
 			}
@@ -490,13 +655,14 @@ 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 Selected').'" />'.
 			      ($displayoption eq 'hidden'?'<input type="submit" name="advertisethisblog" value="'.&mt('Advertise this Feed').'" />':
 			       '<input type="submit" name="hidethisblog" value="'.&mt('Hide this Feed').'" />'));
 		}
+                $r->print('</form>');
 	    }
 	} # was a real display feedname
-	$r->print(($html?'</form>'.&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