--- loncom/interface/lonrss.pm 2008/11/11 10:45:22 1.38 +++ loncom/interface/lonrss.pm 2019/08/14 16:06:13 1.58 @@ -1,7 +1,7 @@ # The LearningOnline Network # RSS Feeder # -# $Id: lonrss.pm,v 1.38 2008/11/11 10:45:22 amueller Exp $ +# $Id: lonrss.pm,v 1.58 2019/08/14 16:06:13 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 '

'.&mt('Available RSS Feeds and Blogs').'

'; - } else { - return ''; + } elsif (!$edit) { + return '

'.&mt('No available RSS Feeds and Blogs').'

'; } } @@ -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 .= '
'. - &Apache::loncommon::build_block_table($startblock, - $endblock,\%setters); + #$output .= '
'. + #&Apache::loncommon::build_block_table($startblock, + # $endblock,\%setters); + my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs'); + $output .= '

'.$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; } @@ -303,18 +323,35 @@ sub handler { my $filterfeedname=&filterfeedname($filename); my $feedname=&feedname($filename); my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom); - my ($blocked,$blocktext); + my ($blocked,$blocktext,$disabled,$disabletext); if (!&Apache::lonnet::is_course($udom,$uname)) { ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname); + if (&Apache::lonnet::usertools_access($uname,$udom,'blog')) { + $disabled = 0; + } else { + $disabled = 1; + if ($html) { + $disabletext = '

'.&mt('No user blog available') .'

'. + &mt('This is a result of one of the following:').''; + } else { + $disabletext = &mt('No user blog available'); + } + } } 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); - $r->print(&Apache::loncommon::start_page($title,$rss_link, - {'domain' => $udom, - 'force_register' => - $env{'form.register'}}). + my $head_extra = $rss_link.''; + 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(); @@ -329,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) { + if ($html && !$blocked && !$disabled) { # Any new feeds or renaming of feeds? if ($edit) { # Hide a feed? @@ -361,6 +398,9 @@ sub handler { } elsif ($blocked) { $r->print($blocktext); $r->print(($html?&Apache::loncommon::end_page():''."\n")); + } elsif ($disabled) { + $r->print($disabletext); + $r->print(($html?&Apache::loncommon::end_page():''."\n")); } else { # is indeed a user # Course or user? my $name=''; @@ -372,9 +412,10 @@ sub handler { } # Add a new feed if (($html) && ($edit)) { - $r->print('
'); - $r->print(&mt('Name for New Feed').": "); - $r->print(''); + $r->print('

' . &mt('New RSS Feed or Blog'). '

'); + $r->print(''); + $r->print(&mt('Name').": "); + $r->print(''); $r->print('
'); } if ($displayfeedname) { # this is an existing feed @@ -474,7 +515,7 @@ sub handler { ($html?'

':''). &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>':'')); @@ -491,7 +532,7 @@ sub handler { 'private' => 'private', 'hidden' => 'hidden', 'delete' => 'delete', - 'store' => 'Save changes', + 'store' => 'Select', 'title' => 'Title', 'link' => 'Link', 'description' => 'Description', @@ -499,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=''.$newsfeed{$id.'_enclosureurl'}.''. @@ -513,20 +566,20 @@ sub handler {
  •    - +    - +    - +    - +
    $lt{'title'}: -
    +
    $lt{'description'}:
    -
    +
    $lt{'link'}: -
    +
    $lt{'enc'} - $uploadlink
    • @@ -571,13 +624,14 @@ ENDEDIT if ($html) { $r->print(''); if ($edit) { - $r->print(''. + $r->print(''. ($displayoption eq 'hidden'?'': '')); } + $r->print(''); } } # was a real display feedname - $r->print(($html?''.&Apache::loncommon::end_page():''."\n")); + $r->print(($html?&Apache::loncommon::end_page():''."\n")); } # a real user return OK; } # end handler