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

Diff for /loncom/auth/lonroles.pm between versions 1.162.2.3 and 1.169

version 1.162.2.3, 2006/10/10 01:55:33 version 1.169, 2006/10/20 22:05:55
Line 40  use Apache::lonhtmlcommon; Line 40  use Apache::lonhtmlcommon;
 use Apache::lonannounce;  use Apache::lonannounce;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonpageflip();  use Apache::lonpageflip();
   use Apache::lonnavdisplay();
 use GDBM_File;  use GDBM_File;
 use LONCAPA;  use LONCAPA;
     
Line 53  sub redirect_user { Line 54  sub redirect_user {
     my $swinfo=&Apache::lonmenu::rawconfig();      my $swinfo=&Apache::lonmenu::rawconfig();
     my $navwindow;      my $navwindow;
     if ($launch_nav eq 'on') {      if ($launch_nav eq 'on') {
  $navwindow.=&Apache::lonnavmaps::launch_win('now',undef,undef,   $navwindow.=&Apache::lonnavdisplay::launch_win('now',undef,undef,
   ($url =~ m-^/adm/whatsnew-));         ($url =~ m-^/adm/whatsnew-));
     } else {      } else {
  $navwindow.=&Apache::lonnavmaps::close();   $navwindow.=&Apache::lonnavmaps::close();
     }      }
Line 312  ENDENTERKEY Line 313  ENDENTERKEY
     }      }
  }   }
 # Are we allowed to look at the first resource?  # Are we allowed to look at the first resource?
  if (!&Apache::lonnet::allowed('bre',$furl)) {   if ($furl !~ m|^/adm/|) {
 # Guess not ...  # Guess not ...
     $furl=&Apache::lonpageflip::first_accessible_resource();      $furl=&Apache::lonpageflip::first_accessible_resource();
  }   }
Line 485  ENDHEADER Line 486  ENDHEADER
  $tstatus='selected';   $tstatus='selected';
             }              }
             my $tbg;              my $tbg;
             if (($tstatus eq 'is') || ($tstatus eq 'selected') ||              if (($tstatus eq 'is') 
                 ($env{'form.showall'})) {   || ($tstatus eq 'selected') 
    || ($tstatus eq 'will') 
    || ($tstatus eq 'future') 
                   || ($env{'form.showall'})) {
                 if ($tstatus eq 'is') {                  if ($tstatus eq 'is') {
                     $tbg='#77FF77';                      $tbg='#77FF77';
                     $tfont='#003300';                      $tfont='#003300';
Line 635  ENDHEADER Line 639  ENDHEADER
 # More than one possible role  # More than one possible role
 # ----------------------------------------------------------------------- Table  # ----------------------------------------------------------------------- Table
     unless (($advanced) || ($nochoose)) {      unless (($advanced) || ($nochoose)) {
  $r->print("<h2>".&mt('Select a Course to Enter')."</h2>\n");   $r->print("<h2>".&mt('Select a Course/Group to Enter')."</h2>\n");
     }      }
     $r->print('<br /><table><tr>');      $r->print('<br /><table><tr>');
     unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }      unless ($nochoose) { $r->print('<th>&nbsp;</th>'); }
Line 831  sub build_roletext { Line 835  sub build_roletext {
                 $roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.                  $roletext.='<td'.$rowspan.'><a href="/adm/switchserver?'.
                 $switchserver.'">'.&mt('Switch Server').'</a></td>';                  $switchserver.'">'.&mt('Switch Server').'</a></td>';
             } else {              } else {
                 $roletext.=('<td>&nbsp;</td>');                  $roletext.=('<td'.$rowspan.'>&nbsp;</td>');
             }              }
         } elsif ($tstatus eq 'is') {          } elsif ($tstatus eq 'is') {
             $roletext.='<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.              $roletext.='<td'.$rowspan.'><input name="'.$buttonname.'" type="button" value="'.
Line 1013  sub allcourses_row { Line 1017  sub allcourses_row {
     my ($dcdom,$rowtype) = @_;      my ($dcdom,$rowtype) = @_;
     my $output = '<tr bgcolor="#77FF77">'.      my $output = '<tr bgcolor="#77FF77">'.
                  ' <td colspan="5">';                   ' <td colspan="5">';
     foreach my $type ('Course') {      foreach my $type ('Course','Group') {
         my $selectlink = &courselink($dcdom,$rowtype,$type);          my $selectlink = &courselink($dcdom,$rowtype,$type);
         my $ccrole = &Apache::lonnet::plaintext('cc',$type);          my $ccrole = &Apache::lonnet::plaintext('cc',$type);
         $output.= '<font color="#002200">'.$ccrole.'</font>'.          $output.= '<font color="#002200">'.$ccrole.'</font>'.
Line 1034  sub set_privileges { Line 1038  sub set_privileges {
     my $area = '/'.$dcdom.'/'.$pickedcourse;      my $area = '/'.$dcdom.'/'.$pickedcourse;
     my $role = 'cc';      my $role = 'cc';
     my $spec = $role.'.'.$area;      my $spec = $role.'.'.$area;
     my %userroles = &Apache::lonnet::set_arearole($role,$area,'','',$dcdom,$env{'user.name'});      my %userroles = &Apache::lonnet::set_arearole($role,$area,'','',
     $env{'user.domain'},
     $env{'user.name'});
     my %ccrole = ();      my %ccrole = ();
     &Apache::lonnet::standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);      &Apache::lonnet::standard_roleprivs(\%ccrole,$role,$dcdom,$spec,$pickedcourse,$area);
     my ($author,$adv)= &Apache::lonnet::set_userprivs(\%userroles,\%ccrole);      my ($author,$adv)= &Apache::lonnet::set_userprivs(\%userroles,\%ccrole);
Removed from v.1.162.2.3  
changed lines
  Added in v.1.169

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