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

Diff for /loncom/auth/lonroles.pm between versions 1.231.4.8 and 1.231.6.1

version 1.231.4.8, 2010/01/02 19:06:39 version 1.231.6.1, 2009/09/23 16:42:03
Line 226  sub handler { Line 226  sub handler {
             # Check if user is CC trying to select a course role              # Check if user is CC trying to select a course role
             if ($env{'form.switchrole'}) {              if ($env{'form.switchrole'}) {
                 if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {                  if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
                     &adhoc_course_role($refresh,$then);                      &adhoc_course_role($then);
                 }                  }
             }              }
     my %temp=('logout_'.$env{'request.course.id'} => time);      my %temp=('logout_'.$env{'request.course.id'} => time);
Line 659  ENDHEADER Line 659  ENDHEADER
             if ($reinit) {              if ($reinit) {
                 $r->print(                  $r->print(
  '<h3><span class="LC_error">'.   '<h3><span class="LC_error">'.
  &mt('As your session file for the course or community has expired, you will need to re-select the course.').'</span></h3>');   &mt('As your session file for the course has expired, you will need to re-select the course.').'</span></h3>');
             } else {              } else {
         $r->print(          $r->print(
  '<h3><span class="LC_error">'.   '<h3><span class="LC_error">'.
  &mt('You need to choose another user role or enter a specific course or community for this function.').   &mt('You need to choose another user role or enter a specific course for this function').'</span></h3>');
  '</span></h3>');  
     }      }
         }          }
     }      }
Line 692  ENDHEADER Line 691  ENDHEADER
     $refresh = $now;      $refresh = $now;
     &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});      &Apache::lonnet::appenv({'user.refresh.time'  => $refresh});
     if ($env{'user.adv'}) {      if ($env{'user.adv'}) {
           $r->print(
                 '<p><label>'.&mt('Show all roles').': <input type="checkbox" name="showall"');
         if ($env{'form.showall'}) { $r->print(' checked="checked" '); }          if ($env{'form.showall'}) { $r->print(' checked="checked" '); }
         $r->print(' />'.&mt('Show all roles').'</label>'          $r->print(' /></label><input type="submit" value="'.&mt('Display').'" /></p>');
                  .' <input type="submit" value="'.&mt('Update display').'" />'  
                  .'</p>');  
     } else {      } else {
         if ($countactive > 0) {          if ($countactive > 0) {
             &queued_selfenrollment($r);              &queued_selfenrollment($r);
             my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');              my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
             my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');               my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&'); 
               $r->print('<p>'.&mt('[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.','<b>','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a></b>',$domdesc).'<br />'.&mt('If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.','<b>','</b>').'</p>');
             $r->print(  
                 '<p>'  
                .&mt('[_1]Visit the [_2]Course/Community Catalog[_3]'  
                    .' to view all [_4] LON-CAPA courses and communities.'  
                    ,'<b>'  
                    ,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'  
                    ,'</a></b>',$domdesc)  
                .'<br />'  
                .&mt('If a course or community is [_1]not[_2] in your list of current courses and communities below,'  
                    .' you may be able to enroll if self-enrollment is permitted.'  
                    ,'<b>','</b>')  
                .'</p>'  
             );  
         }          }
     }      }
   
 # No active roles  # No active roles
     if ($countactive==0) {      if ($countactive==0) {
  if ($inrole) {   if ($inrole) {
     $r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>');      $r->print('<h2>'.&mt('Currently no additional roles or courses').'</h2>');
  } else {   } else {
     $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');      $r->print('<h2>'.&mt('Currently no active roles or courses').'</h2>');
  }   }
         &findcourse_advice($r);          &findcourse_advice($r);
         &requestcourse_advice($r);  
  $r->print('</form>');   $r->print('</form>');
         if ($countfuture) {          if ($countfuture) {
             $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));              $r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
Line 851  ENDHEADER Line 836  ENDHEADER
                  .'</i><br />'                   .'</i><br />'
                  .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'                   .'<a href="/adm/logout">'.&mt('Logout').'</a>&nbsp;&nbsp;'
                  .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'                   .'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
                  .&mt('Course/Community Catalog')                   .&mt('Course Catalog')
                  .'</a></small></p>');                   .'</a></small></p>');
     }      }
     $r->print(&Apache::loncommon::end_page());      $r->print(&Apache::loncommon::end_page());
Line 1098  sub roletable_headers { Line 1083  sub roletable_headers {
 }  }
   
 sub roletypes {  sub roletypes {
     my @types = ('Domain','Construction Space','Course','Community','Unavailable','System');      my @types = ('Domain','Construction Space','Course','Unavailable','System');
     return @types;       return @types; 
 }  }
   
Line 1160  sub findcourse_advice { Line 1145  sub findcourse_advice {
     } else {      } else {
         $r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />');          $r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').'<br />');
     }      }
     $r->print('<h3>'.&mt('Self-Enrollment').'</h3>'.      $r->print('<p>'.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
               '<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');      $r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'</p>');
     $r->print(&mt('You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>');  
     &queued_selfenrollment($r);      &queued_selfenrollment($r);
     return;      return;
 }  }
   
 sub requestcourse_advice {  
     my ($r) = @_;  
     my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');  
     my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');  
     my (%can_request,%request_doms);  
     &Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms);  
     if (keys(%request_doms) > 0) {  
         my ($types,$typename) = &Apache::loncommon::course_types();  
         if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {  
             $r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'.  
                       '<p>'.&mt('You have rights to request the creation of courses and/or communities in the following domain(s):').'<ul>');  
             my (@reqdoms,@reqtypes);  
             foreach my $type (sort(keys(%request_doms))) {  
                 push(@reqtypes,$type);  
                 if (ref($request_doms{$type}) eq 'ARRAY') {  
                     my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));  
                     $r->print(  
                         '<li>'  
                        .&mt('[_1]'.$typename->{$type}.'[_2] in domain: [_3]',  
                             '<i>',  
                             '</i>',  
                             '<b>'.$domstr.'</b>')  
                        .'</li>'  
                     );  
                     foreach my $dom (@{$request_doms{$type}}) {  
                         unless (grep(/^\Q$dom\E/,@reqdoms)) {  
                             push(@reqdoms,$dom);  
                         }  
                     }  
                 }  
             }  
             my @showtypes;  
             foreach my $type (@{$types}) {  
                 if (grep(/^\Q$type\E$/,@reqtypes)) {  
                     push(@showtypes,$type);  
                 }  
             }  
             my $requrl = '/adm/requestcourse';  
             if (@reqdoms == 1) {  
                 $requrl .= '?showdom='.$reqdoms[0];  
             }  
             if (@showtypes > 0) {  
                 $requrl.=(($requrl=~/\?/)?'&':'?').'crstype='.$showtypes[0];  
             }  
             if (@reqdoms == 1 || @showtypes > 0) {  
                 $requrl .= '&state=crstype&action=new';  
             }  
             $r->print('</ul>'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','<a href="'.$requrl.'">','</a>').'</p>');  
         }  
     }  
     return;  
 }  
   
 sub queued_selfenrollment {  sub queued_selfenrollment {
     my ($r) = @_;      my ($r) = @_;
     my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');      my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
Line 1441  sub check_fordc { Line 1372  sub check_fordc {
 }  }
   
 sub adhoc_course_role {  sub adhoc_course_role {
     my ($refresh,$then) = @_;      my ($then) = @_; 
     my ($cdom,$cnum);      my ($cdom,$cnum);
     $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};      $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
     $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};      $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
     if (&check_forcc($cdom,$cnum,$refresh,$then)) {      if (&check_forcc($cdom,$cnum,$then)) {
         my $setprivs;          my $setprivs;
         if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {          if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
             $setprivs = 1;              $setprivs = 1;
         } else {          } else {
             my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});              my ($start,$end) = split(/\./,$env{'user.role.'.$env{'form.switchrole'}});
             if (($start && ($start>$refresh || $start == -1)) ||              if (($start && ($start>$then || $start == -1)) ||
                 ($end && $end<$then)) {                  ($end && $end<$then)) {
                 $setprivs = 1;                  $setprivs = 1;
             }              }
         }          } 
         if ($setprivs) {          if ($setprivs) {
             if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {              if ($env{'form.switchrole'} =~ m-^(in|ta|ep|ad|st|cr)([\w/]*)\./\Q$cdom\E/\Q$cnum\E/?(\w*)$-) {
                 my $role = $1;                  my $role = $1;
Line 1485  sub adhoc_course_role { Line 1416  sub adhoc_course_role {
                 }                  }
                 &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);                  &Apache::lonnet::standard_roleprivs(\%newrole,$role,$cdom,$spec,$cnum,$area);
                 &Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);                  &Apache::lonnet::set_userprivs(\%userroles,\%newrole,\%newgroups);
                 my $adhocstart = $refresh-1;                  my $adhocstart = $then-1;
                 $userroles{'user.role.'.$spec} = $adhocstart.'.';                  $userroles{'user.role.'.$spec} = $adhocstart.'.';
                 &Apache::lonnet::appenv(\%userroles,[$role,'cm']);                  &Apache::lonnet::appenv(\%userroles,[$role,'cm']);
             }              }
Line 1495  sub adhoc_course_role { Line 1426  sub adhoc_course_role {
 }  }
   
 sub check_forcc {  sub check_forcc {
     my ($cdom,$cnum,$refresh,$then) = @_;      my ($cdom,$cnum,$then) = @_;
     my $is_cc;      my $is_cc;
     if ($cdom ne '' && $cnum ne '') {      if ($cdom ne '' && $cnum ne '') {
         if (&Apache::lonnet::is_course($cdom,$cnum)) {          if (&Apache::lonnet::is_course($cdom,$cnum)) {
Line 1503  sub check_forcc { Line 1434  sub check_forcc {
             if (defined($env{$envkey})) {              if (defined($env{$envkey})) {
                 $is_cc = 1;                  $is_cc = 1;
                 my ($tstart,$tend)=split(/\./,$env{$envkey});                  my ($tstart,$tend)=split(/\./,$env{$envkey});
                 if ($tstart && $tstart>$refresh) { $is_cc = 0; }                  if ($tstart && $tstart>$then) { $is_cc = 0; }
                 if ($tend   && $tend  <$then) { $is_cc = 0; }                  if ($tend   && $tend  <$then) { $is_cc = 0; }
             }              }
         }          }
Line 1526  sub courselink { Line 1457  sub courselink {
   
 sub coursepick_jscript {  sub coursepick_jscript {
     my %lt = &Apache::lonlocal::texthash(      my %lt = &Apache::lonlocal::texthash(
                   plsu => "Please use the 'Select Course/Community' link to open a separate pick course window where you may select the course or community you wish to enter.",                    plsu => "Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.",
                   youc => 'You can only use this screen to select courses and communities in the current domain.',                    youc => 'You can only use this screen to select courses in the current domain.',
              );               );
     my $verify_script = <<"END";      my $verify_script = <<"END";
 <script type="text/javascript">  <script type="text/javascript">
Removed from v.1.231.4.8  
changed lines
  Added in v.1.231.6.1

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