--- loncom/interface/lonrss.pm 2010/01/03 21:21:25 1.47.8.1 +++ 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.47.8.1 2010/01/03 21:21:25 raeburn Exp $ +# $Id: lonrss.pm,v 1.54 2015/06/18 20:19:06 musolffc Exp $ # # Copyright Michigan State University Board of Trustees # @@ -60,10 +60,10 @@ sub displayfeedname { # no, construct a name my $name=$filterfilename; if ($name=~/^CourseBlog/) { + $name=&mt('Course Blog'); if ($env{'course.'.$env{'request.course.id'}.'.type'} eq 'Community') { $name = &mt('Community Blog'); } - $name=&mt('Course Blog'); if ($env{'course.'.$env{'request.course.id'}.'.description'}) { $name.=' '.$env{'course.'.$env{'request.course.id'}.'.description'}; } @@ -88,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'; @@ -100,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') { @@ -261,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.'); @@ -286,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; } @@ -328,8 +345,10 @@ 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.''; my $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}]; - $r->print(&Apache::loncommon::start_page($title,$rss_link, + $r->print(&Apache::loncommon::start_page($title,$head_extra, {'bread_crumbs' => $brcrumb, 'domain' => $udom, 'force_register' => $env{'form.register'}}). @@ -394,7 +413,7 @@ sub handler { # Add a new feed if (($html) && ($edit)) { $r->print('

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

'); - $r->print('
'); + $r->print(''); $r->print(&mt('Name').": "); $r->print(''); $r->print('
'); @@ -496,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>':'')); @@ -517,11 +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 - $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'}.''. @@ -535,20 +566,20 @@ sub handler {
  •    - +    - +    - +    - +
    $lt{'title'}: -
    +
    $lt{'description'}:
    -
    +
    $lt{'link'}: -
    +
    $lt{'enc'} - $uploadlink
    • @@ -597,9 +628,10 @@ ENDEDIT ($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