Diff for /loncom/xml/londefdef.pm between versions 1.368 and 1.369

version 1.368, 2007/06/19 20:25:45 version 1.369, 2007/06/22 00:11:32
Line 481  sub start_accessrule { Line 481  sub start_accessrule {
  ('realm',$parstack,$safeeval,undef,1);   ('realm',$parstack,$safeeval,undef,1);
     my $role=&Apache::lonxml::get_param      my $role=&Apache::lonxml::get_param
  ('role',$parstack,$safeeval,undef,1);   ('role',$parstack,$safeeval,undef,1);
     $realm=~s/\s+//g;      my ($dom,$crs,$sec)=split(/\_/,$realm);
     $realm=~s/\//\_/g;      $dom = &LONCAPA::clean_domain($dom);
     $realm=~s/^\_//;      my $type=&Apache::lonxml::get_param
     $realm=~s/\W/\;/g;   ('type',$parstack,$safeeval,undef,1);
     $role=~s/\s+//g;      if ($type eq 'user') {
     $role=~s/\//\_/g;   $crs = &LONCAPA::clean_username($crs);
     $role=~s/\W/\;/g;      } else {
    $crs = &LONCAPA::clean_courseid($crs);
       }
       $sec =~s/\W//;
       $realm = $dom;
       if ($crs =~ /\S/) { $realm .= '_'.$crs; }
       if ($sec =~ /\S/) { $realm .= '_'.$sec; }
       $role=~s/\W//g;
   
     if ($target eq 'web') {      if ($target eq 'web') {
  my $args='';   my $args='';
  if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }   if ( $#$parstack > -1 ) { $args=$$parstack[$#$parstack]; }
Line 498  sub start_accessrule { Line 506  sub start_accessrule {
  }   }
     }      }
     if ($target eq 'meta') {      if ($target eq 'meta') {
  $currentstring='<rule>'.$eff.':'.$realm.':'.$role.'</rule>';   $currentstring='<rule>'.$eff.':'.$realm.':'.$role.':'.$type.'</rule>';
     }      }
     return $currentstring;      return $currentstring;
 }  }

Removed from v.1.368  
changed lines
  Added in v.1.369


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