Diff for /loncom/interface/lonmenu.pm between versions 1.512 and 1.514

version 1.512, 2021/11/15 23:29:20 version 1.514, 2021/11/30 15:55:37
Line 811  sub build_submenu { Line 811  sub build_submenu {
                     }                      }
                 }                  }
   
                 $menu .= '<li '.                  $menu .= '<li ';
                 $menu .= ($listclass?'class="'.$listclass.'" ':'');                  $menu .= ($listclass?'class="'.$listclass.'" ':'');
                 $menu .= 'style="margin:0;padding:0;'. $bordertop . $borderbot .'">';                  $menu .= 'style="margin:0;padding:0;'. $bordertop . $borderbot .'">';
                 $menu .= '<a href="'.$href.'"'.$target.' '.$linkattr.'>' .  $title . '</a>';                  $menu .= '<a href="'.$href.'"'.$target.' '.$linkattr.'>' .  $title . '</a>';
Line 1348  sub prepare_functions { Line 1348  sub prepare_functions {
   
     my $editbutton = '';      my $editbutton = '';
     my $viewsrcbutton = '';      my $viewsrcbutton = '';
       my $clientip = &Apache::lonnet::get_requestor_ip();
 #  #
 # Determine whether or not to display 'Edit' or 'View Source' icon/button  # Determine whether or not to display 'Edit' or 'View Source' icon/button
 #  #
     if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {      if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
         my $blocked = &Apache::loncommon::blocking_status('about',$2,$1);          my $blocked = &Apache::loncommon::blocking_status('about',$clientip,$2,$1);
         my $file=&Apache::lonnet::declutter($env{'request.filename'});          my $file=&Apache::lonnet::declutter($env{'request.filename'});
         ($cfile,$home,$switchserver,$forceedit,$forceview) =          ($cfile,$home,$switchserver,$forceedit,$forceview) =
             &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,              &Apache::lonnet::can_edit_resource($file,$cnum,$cdom,
Line 1470  sub prepare_functions { Line 1471  sub prepare_functions {
         if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {          if ($resurl =~ m{^/?adm/($match_domain)/($match_username)/aboutme$}) {
             my ($sdom,$sname) = ($1,$2);              my ($sdom,$sname) = ($1,$2);
             unless (&Apache::lonnet::is_course($sdom,$sname)) {              unless (&Apache::lonnet::is_course($sdom,$sname)) {
                 my $blocked = &Apache::loncommon::blocking_status('about',$sname,$sdom);                  my $blocked = &Apache::loncommon::blocking_status('about',$clientip,$sname,$sdom);
                 unless ($blocked) {                  unless ($blocked) {
                     &switch('','',6,4,'mail-message-new-22x22.png','Message to user',                      &switch('','',6,4,'mail-message-new-22x22.png','Message to user',
                             '',                              '',

Removed from v.1.512  
changed lines
  Added in v.1.514


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