Diff for /loncom/interface/spreadsheet/lonspreadsheet.pm between versions 1.60 and 1.61.6.1

version 1.60, 2011/09/26 15:48:06 version 1.61.6.1, 2012/05/10 20:20:07
Line 276  sub handler { Line 276  sub handler {
     $symb = $env{'form.usymb'} if (exists($env{'form.usymb'}));      $symb = $env{'form.usymb'} if (exists($env{'form.usymb'}));
     my $name   = $env{'user.name'};      my $name   = $env{'user.name'};
     my $domain = $env{'user.domain'};      my $domain = $env{'user.domain'};
       my $warning;
     if (exists($env{'form.sname'}) && $env{'form.sname'} ne '') {      if (exists($env{'form.sname'}) && $env{'form.sname'} ne '') {
         $name   = $env{'form.sname'};          if (($env{'form.sname'} ne $env{'user.name'}) ||
         $domain = $env{'form.sdomain'};              ($env{'form.sdomain'} ne $env{'user.domain'})) {
               if (($allowed_to_view) || ($allowed_to_edit)) {
                   if (&Apache::lonnet::homeserver($env{'form.sname'},$env{'form.sdomain'}) ne 'no_host') {
                       $name   = $env{'form.sname'};
                       $domain = $env{'form.sdomain'};
                   } else {
                       $warning = &mt('Requested user: "[_1]" does not exist; your own sheet is displayed instead.',$env{'form.sname'}.':'.$env{'form.sdomain'});
                   }
               } else {
                   $warning = &mt('Your current role is not permitted to display this sheet for the requested user: "[_1]"; your own sheet is displayed instead.',$env{'form.sname'}.':'.$env{'form.sdomain'});
               }
           }
     }      }
     $env{'form.sname'} = $name;      $env{'form.sname'} = $name;
     $env{'form.sdomain'} = $domain;      $env{'form.sdomain'} = $domain;
Line 406  ENDSCRIPT Line 418  ENDSCRIPT
           bug   => 'Spreadsheet'});            bug   => 'Spreadsheet'});
     $r->print(&Apache::loncommon::start_page('Grades Spreadsheet',$js).      $r->print(&Apache::loncommon::start_page('Grades Spreadsheet',$js).
               &Apache::lonhtmlcommon::breadcrumbs('Spreadsheet',                &Apache::lonhtmlcommon::breadcrumbs('Spreadsheet',
   'Spreadsheet_About'));    'Spreadsheet_About').
                 &Apache::lonhtmlcommon::coursepreflink(&mt('Grade display settings'),
     #                                                       'grading'));
     # Tabs  
     #   
     &Apache::lonquickgrades::startGradeScreen($r,'spreadsheet');  
   
     #      #
     # Open the form      # Open the form
     #       # 
       if ($warning) {
           $r->print('<p class="LC_info">'.$warning.'</p>');
       }
     $r->print('<form action="'.$r->uri.'" name="sheet" method="post">');      $r->print('<form action="'.$r->uri.'" name="sheet" method="post">');
     $r->print(&hiddenfield('sname'  ,$env{'form.sname'}).      $r->print(&hiddenfield('sname'  ,$env{'form.sname'}).
               &hiddenfield('sdomain',$env{'form.sdomain'}).                &hiddenfield('sdomain',$env{'form.sdomain'}).
Line 569  END Line 581  END
         $spreadsheet->display($r);          $spreadsheet->display($r);
     }      }
     $r->print('</form>');      $r->print('</form>');
     &Apache::lonquickgrades::endGradeScreen($r);  
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
     $spreadsheet->clear_package();      $spreadsheet->clear_package();
     return OK;      return OK;

Removed from v.1.60  
changed lines
  Added in v.1.61.6.1


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