[BACK]Return to lonrss.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/lonrss.pm between versions 1.53.2.6 and 1.54

version 1.53.2.6, 2022/01/20 00:26:02 version 1.54, 2015/06/18 20:19:06
Line 128  sub advertisefeeds { Line 128  sub advertisefeeds {
     }      }
     if ($feeds) {      if ($feeds) {
  return '<h4>'.&mt('Available RSS Feeds and Blogs').'</h4><ul>'.$feeds.'</ul>';   return '<h4>'.&mt('Available RSS Feeds and Blogs').'</h4><ul>'.$feeds.'</ul>';
     } elsif (!$edit) {      } else {
         return '<h4>'.&mt('No available RSS Feeds and Blogs').'</h4>';          return '';
     }      }
 }  }
   
Line 244  sub add_blog_entry_link { Line 244  sub add_blog_entry_link {
 }  }
   
 sub blocking_blogdisplay {  sub blocking_blogdisplay {
     my ($uname,$udom,$html,$filterfeedname,$clientip) = @_;      my ($uname,$udom,$html,$filterfeedname) = @_;
     my $user = &Apache::loncommon::plainname($uname,$udom);      my $user = &Apache::loncommon::plainname($uname,$udom);
     if ($html) {      if ($html) {
         $user = &Apache::loncommon::aboutmewrapper($user,$uname,$udom);          $user = &Apache::loncommon::aboutmewrapper($user,$uname,$udom);
Line 253  sub blocking_blogdisplay { Line 253  sub blocking_blogdisplay {
     }      }
     my %setters;      my %setters;
     my ($blocked,$output,$blockcause);      my ($blocked,$output,$blockcause);
     my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =      my ($startblock,$endblock) =
              &Apache::loncommon::blockcheck(\%setters,'blogs',$clientip);               &Apache::loncommon::blockcheck(\%setters,'blogs');
     if ($startblock && $endblock) {      if ($startblock && $endblock) {
         $blockcause = 'user';          $blockcause = 'user';
     } elsif ($by_ip) {  
         $blockcause = 'ip';  
     } else {       } else { 
         if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {          if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
             ($startblock,$endblock) =              ($startblock,$endblock) =
                  &Apache::loncommon::blockcheck(\%setters,'blogs',$clientip,                   &Apache::loncommon::blockcheck(\%setters,'blogs',
                                                 $uname,$udom);                                                  $uname,$udom);
             $blockcause = 'blogowner';              $blockcause = 'blogowner';
         }          }
     }      }
     if (($startblock && $endblock) || ($by_ip)) {      if ($startblock && $endblock) {
         $blocked = 1;          $blocked = 1;
         if ($startblock && $endblock) {          my $showstart = &Apache::lonlocal::locallocaltime($startblock);
             my $showstart = &Apache::lonlocal::locallocaltime($startblock);          my $showend = &Apache::lonlocal::locallocaltime($endblock);
             my $showend = &Apache::lonlocal::locallocaltime($endblock);          $output = &mt('Blogs belonging to [_1] are unavailable from [_2] to [_3].',$user,$showstart,$showend);
             $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.='<br />';}          if ($html) {$output.='<br />';}
         if ($blockcause eq 'user') {          if ($blockcause eq 'user') {
             $output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.');              $output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.');
Line 283  sub blocking_blogdisplay { Line 277  sub blocking_blogdisplay {
                 #$output .= '<br />'.                  #$output .= '<br />'.
                        #&Apache::loncommon::build_block_table($startblock,                         #&Apache::loncommon::build_block_table($startblock,
                        #                                 $endblock,\%setters);                         #                                 $endblock,\%setters);
                  my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs',$clientip);                   my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs');
                  $output .= '<br /><br />'.$blocktext;                   $output .= '<br /><br />'.$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 {          } else {
             $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');              $output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');
         }          }
Line 337  sub handler { Line 325  sub handler {
     my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);      my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
     my ($blocked,$blocktext,$disabled,$disabletext);      my ($blocked,$blocktext,$disabled,$disabletext);
     if (!&Apache::lonnet::is_course($udom,$uname)) {      if (!&Apache::lonnet::is_course($udom,$uname)) {
         my $clientip = &Apache::lonnet::get_requestor_ip($r);          ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname);
         ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname,$clientip);  
         if (&Apache::lonnet::usertools_access($uname,$udom,'blog')) {          if (&Apache::lonnet::usertools_access($uname,$udom,'blog')) {
             $disabled = 0;              $disabled = 0;
         } else {          } else {
Line 358  sub handler { Line 345  sub handler {
 # my $title = $displayfeedname?$displayfeedname:"Available RSS Feeds and Blogs";  # my $title = $displayfeedname?$displayfeedname:"Available RSS Feeds and Blogs";
         my $title = "My Space";          my $title = "My Space";
  my $rss_link = &Apache::lonrss::rss_link($uname,$udom);   my $rss_link = &Apache::lonrss::rss_link($uname,$udom);
         my $head_extra = $rss_link.'<script type="text/javascript" '      my $head_extra = $rss_link.'<script type="text/javascript"
                                   .'src="/res/adm/includes/file_upload.js"></script>';                                  src="/res/adm/includes/file_upload.js"></script>';
  my $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}];   my $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}];
  $r->print(&Apache::loncommon::start_page($title,$head_extra,   $r->print(&Apache::loncommon::start_page($title,$head_extra,
  {'bread_crumbs'   => $brcrumb,   {'bread_crumbs'   => $brcrumb,
Line 549  sub handler { Line 536  sub handler {
    'title' => 'Title',     'title' => 'Title',
    'link' => 'Link',     'link' => 'Link',
    'description' => 'Description',     'description' => 'Description',
                                                            'enc' => 'Podcasted enclosure');                                 'enc' => 'Podcasted enclosure');
                         my $uploadlink;              my $uploadlink;
                         if ($entry==$newid) {              if ($entry==$newid) {
 # Generate upload link only for last (new) entry  # Generate upload link only for last (new) entry
 # Calculate the quota space available in the user's portfolio                  # Calculate the quota space available in the user's portfolio
                             my $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},                  my $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
                                                  $env{'user.domain'}); # expressed in MB                                      $env{'user.domain'}); # expressed in MB
                             my $portfolio_root = '/userfiles/portfolio';                  my $portfolio_root = '/userfiles/portfolio';
                             my $getpropath = 1;                  my $getpropath = 1;
                             my $current_disk_usage = &Apache::lonnet::diskusage(                  my $current_disk_usage = &Apache::lonnet::diskusage(
                                 $env{'user.domain'}, $env{'user.name'},                          $env{'user.domain'}, $env{'user.name'}, 
                                 $portfolio_root, $getpropath); # Expressed in kB                          $portfolio_root, $getpropath); # Expressed in kB
                             # Convert to MB for use in file_selector()                  # Convert to MB for use in file_selector()
                             my $free_space = $disk_quota - ($current_disk_usage / 1024.);                  my $free_space = $disk_quota - ($current_disk_usage / 1024.); 
                             # Format this number since it will be displayed onscreen                  # Format this number since it will be displayed onscreen
                             $free_space = sprintf("%.1f", $free_space);                  $free_space = sprintf("%.1f", $free_space);
                             $uploadlink=&Apache::inputtags::file_selector(0,0,'*','both','',$free_space);                  $uploadlink=&Apache::inputtags::file_selector(0,0,'*','both','',$free_space);
  } else {   } else {
 # Otherwise, display  # Otherwise, display
                             $uploadlink='<tt>'.$newsfeed{$id.'_enclosureurl'}.'</tt>'.                              $uploadlink='<tt>'.$newsfeed{$id.'_enclosureurl'}.'</tt>'.
Removed from v.1.53.2.6  
changed lines
  Added in v.1.54

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>