--- loncom/interface/lonrss.pm 2010/01/03 21:21:25 1.47.8.1 +++ loncom/interface/lonrss.pm 2021/11/30 15:55:37 1.59 @@ -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.59 2021/11/30 15:55:37 raeburn 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') { @@ -115,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').'

'; } } @@ -231,7 +244,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); @@ -240,31 +253,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.='
';} 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',$clientip); + $output .= '

'.$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.'); } @@ -286,7 +313,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; } @@ -308,7 +337,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 { @@ -328,8 +358,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 +426,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 +528,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>':'')); @@ -521,7 +553,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'}.''. @@ -535,20 +579,20 @@ sub handler {
  •    - +    - +    - +    - +
    $lt{'title'}: -
    +
    $lt{'description'}:
    -
    +
    $lt{'link'}: -
    +
    $lt{'enc'} - $uploadlink
    • @@ -597,9 +641,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