--- loncom/interface/lonrss.pm	2008/12/10 21:46:58	1.40
+++ loncom/interface/lonrss.pm	2019/08/14 16:06:42	1.53.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # RSS Feeder
 #
-# $Id: lonrss.pm,v 1.40 2008/12/10 21:46:58 kaisler Exp $
+# $Id: lonrss.pm,v 1.53.2.4 2019/08/14 16:06:42 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -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)=@_;
     my $feeds='';
     my %feednames=&Apache::lonnet::dump('nohist_all_rss_feeds',$udom,$uname);
     my $mode='public';
@@ -97,7 +100,20 @@ sub advertisefeeds {
 	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') {
@@ -112,8 +128,8 @@ sub advertisefeeds {
     }
     if ($feeds) {
 	return '<h4>'.&mt('Available RSS Feeds and Blogs').'</h4><ul>'.$feeds.'</ul>';
-    } else {
-        return '';
+    } elsif (!$edit) {
+        return '<h4>'.&mt('No available RSS Feeds and Blogs').'</h4>';
     }
 }
 
@@ -258,9 +274,11 @@ sub blocking_blogdisplay {
         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');
+                 $output .= '<br /><br />'.$blocktext;
             }
         } else {
             $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');
@@ -283,7 +301,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;
     }
@@ -306,8 +326,10 @@ sub handler {
     my ($blocked,$blocktext,$disabled,$disabletext);
     if (!&Apache::lonnet::is_course($udom,$uname)) {
         ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname);
-        $disabled = &Apache::lonnet::usertools_access($uname,$udom,'blog');
-        if ($disabled) {
+        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>'.
@@ -320,15 +342,16 @@ sub handler {
         }
     }
     if ($html) {
-	my $title = $displayfeedname?$displayfeedname
-                                    :"Available RSS Feeds and Blogs";
+#	my $title = $displayfeedname?$displayfeedname:"Available RSS Feeds and Blogs";
+        my $title = "My Space";
 	my $rss_link = &Apache::lonrss::rss_link($uname,$udom);
-	my @brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}];
-	$r->print(&Apache::loncommon::start_page($title,$rss_link,
-						 {'bread_crumbs' => @brcrumb,
-						  'domain'         => $udom,
-						  'force_register' =>
-						      $env{'form.register'}}).
+        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());
     } else { # render RSS
         my $server = &Apache::lonnet::absolute_url();
@@ -343,7 +366,7 @@ sub handler {
     my $newid = &get_new_feed_id();
 # Is this user for real?
     my $homeserver=&Apache::lonnet::homeserver($uname,$udom);
-    if ($html && !$blocked && !&disabled) {
+    if ($html && !$blocked && !$disabled) {
 # Any new feeds or renaming of feeds?
 	if ($edit) {
 # Hide a feed?
@@ -389,9 +412,10 @@ sub handler {
 	}
 # Add a new feed
         if (($html) && ($edit)) {
-	    $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('<h4>' . &mt('New RSS Feed or Blog'). '</h4>');
+	    $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('</form>');
 	}
         if ($displayfeedname) { # this is an existing feed
@@ -491,7 +515,7 @@ 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" name="lonhomework" enctype="multipart/form-data"><br />'.
+		      ($html?'</h3>'.($edit?'<form method="post" name="lonhomework" enctype="multipart/form-data" action=""><br />'.
 				      &mt('Name of this Feed').
 				      ': <input type="text" size="50" name="newblogname" value="'.
 				      $displayfeedname.'" />':'').'<ul>':'</title>'));
@@ -508,7 +532,7 @@ sub handler {
 							   'private' => 'private',
 							   'hidden' => 'hidden',
 							   'delete' => 'delete',
-							   'store' => 'Save changes',
+							   'store' => 'Select',
 							   'title' => 'Title',
 							   'link' => 'Link',
 							   'description' => 'Description',
@@ -516,7 +540,19 @@ sub handler {
                         my $uploadlink;
                         if ($entry==$newid) {
 # Generate upload link only for last (new) entry
-			    $uploadlink=&Apache::inputtags::file_selector(0,0,'*','both');
+# 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>'.
@@ -530,20 +566,20 @@ 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>
+<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>
 <br />
 $lt{'title'}:
-<input name='$id\_title' type='text' size='60' value='$newsfeed{$id.'_title'}' onChange="changed(this.form,'$id');" /><br />
+<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 />
+<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\_link' type='text' size='60' value='$newsfeed{$id.'_link'}' onchange="changed(this.form,'$id');" /><br />
 $lt{'enc'} -
 $uploadlink
 <hr /></li>
@@ -588,13 +624,14 @@ ENDEDIT
 	    if ($html) {
 		$r->print('</ul>');
 		if ($edit) {
-		    $r->print('<input type="hidden" name="newid" value="'.$newid.'"/><input type="submit" value="'.&mt('Save 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?&Apache::loncommon::end_page():'</channel></rss>'."\n"));
     } # a real user
     return OK;
 } # end handler