--- loncom/interface/lonrss.pm 2007/07/27 00:17:17 1.37 +++ loncom/interface/lonrss.pm 2013/05/25 21:50:19 1.52 @@ -1,7 +1,7 @@ # The LearningOnline Network # RSS Feeder # -# $Id: lonrss.pm,v 1.37 2007/07/27 00:17:17 albertel Exp $ +# $Id: lonrss.pm,v 1.52 2013/05/25 21:50:19 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') { @@ -106,8 +122,8 @@ sub advertisefeeds { } } else { $feeds.='
  • '.$feednames{$feed}. - '
    '.($edit?&mt('Edit'):'HTML').': '.$htmlurl.''. - '
    '.&mt('Public RSS/podcast (subscribe to)').': '.$feedurl.'
    • '; + '
    '.($edit?&mt('Edit'):'HTML').': '.$feednames{$feed}.' HTML'. + '
    '.&mt('Public RSS/podcast (subscribe to)').': '.$feednames{$feed}.' RSS/Podcast'; } } if ($feeds) { @@ -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,33 @@ 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); + my $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}]; $r->print(&Apache::loncommon::start_page($title,$rss_link, - {'domain' => $udom, - 'force_register' => - $env{'form.register'}}). + {'bread_crumbs' => $brcrumb, + 'domain' => $udom, + 'force_register' => $env{'form.register'}}). &changed_js()); } else { # render RSS my $server = &Apache::lonnet::absolute_url(); @@ -329,7 +364,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 +396,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 +410,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 +513,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 +530,7 @@ sub handler { 'private' => 'private', 'hidden' => 'hidden', 'delete' => 'delete', - 'store' => 'Save changes', + 'store' => 'Select', 'title' => 'Title', 'link' => 'Link', 'description' => 'Description', @@ -571,13 +610,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