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

Diff for /loncom/interface/loncommon.pm between versions 1.377 and 1.378

version 1.377, 2006/05/30 20:05:05 version 1.378, 2006/06/02 13:58:31
Line 2826  sub bodytag { Line 2826  sub bodytag {
     @$addentries{keys(%design)} = @design{keys(%design)};      @$addentries{keys(%design)} = @design{keys(%design)};
   
  # role and realm   # role and realm
     my ($role,$realm) =      my ($role,$realm) = split(/\./,$env{'request.role'},2);
  &Apache::lonnet::plaintext((split(/\./,$env{'request.role'}))[0]);      if ($role  eq 'ca') {
           my ($rdom,$rname) = ($realm =~ m-^/(\w+)/(\w+)$-);
           $realm = &plainname($rname,$rdom).':'.$rdom;
       } 
 # realm  # realm
     if ($env{'request.course.id'}) {      if ($env{'request.course.id'}) {
         my $type = $env{'course.'.$env{'request.course.id'}.'.type'};          if ($env{'request.role'} !~ /^cr/) {
         if ($type eq 'Group') {              $role = &Apache::lonnet::plaintext($role,&course_type());
             if ($env{'request.role'} !~ /^cr/) { # Change role name if Group          }
                 $role = &convert_role($role,$type);    
             }  
         }   
  $realm = $env{'course.'.$env{'request.course.id'}.'.description'};   $realm = $env{'course.'.$env{'request.course.id'}.'.description'};
       } else {
           $role = &Apache::lonnet::plaintext($role);
     }      }
     if (!$realm) { $realm=' '; }      if (!$realm) { $realm=' '; }
 # Set messages  # Set messages
Line 4981  sub restore_course_settings { Line 4983  sub restore_course_settings {
 ############################################################  ############################################################
 ############################################################  ############################################################
   
 sub convert_role {  sub course_type {
     my ($rolename,$type) = @_;      my ($cid) = @_;
     if ($type eq 'Group') {      if (!defined($cid)) {
         $rolename =~ s/Course/Group/;          $cid = $env{'request.course.id'};
         $rolename =~ s/Instructor/Leader/;      }
         $rolename =~ s/Teaching Assistant/Assistant Leader/;      if (defined($env{'course.'.$cid.'type'})) {
         $rolename =~ s/Student/Member/;          return $env{'course.'.$cid.'type'};
       } else {
           return 'Course';
     }      }
     return $rolename;  
 }  }
   
 sub icon {  sub icon {
Removed from v.1.377  
changed lines
  Added in v.1.378

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