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

Diff for /loncom/LONCAPA.pm between versions 1.15 and 1.24

version 1.15, 2006/11/27 16:34:38 version 1.24, 2007/07/02 21:15:29
Line 41  my $loncapa_max_wait_time = 13; Line 41  my $loncapa_max_wait_time = 13;
   
 use vars qw($match_domain   $match_not_domain  use vars qw($match_domain   $match_not_domain
     $match_username $match_not_username      $match_username $match_not_username
       $match_courseid $match_not_courseid
       $match_name
               $match_lonid
     $match_handle   $match_not_handle);      $match_handle   $match_not_handle);
   
 require Exporter;  require Exporter;
Line 50  our @EXPORT = qw(&add_get_param    &esca Line 53  our @EXPORT = qw(&add_get_param    &esca
  &untie_user_hash  &propath);   &untie_user_hash  &propath);
 our @EXPORT_OK = qw($match_domain   $match_not_domain  our @EXPORT_OK = qw($match_domain   $match_not_domain
     $match_username $match_not_username      $match_username $match_not_username
       $match_courseid $match_not_courseid
       $match_name
       $match_lonid
     $match_handle   $match_not_handle);      $match_handle   $match_not_handle);
 our %EXPORT_TAGS = ( 'match' =>[qw($match_domain   $match_not_domain  our %EXPORT_TAGS = ( 'match' =>[qw($match_domain   $match_not_domain
    $match_username $match_not_username     $match_username $match_not_username
      $match_courseid $match_not_courseid
      $match_name
      $match_lonid
    $match_handle   $match_not_handle)],);     $match_handle   $match_not_handle)],);
 my %perlvar;  my %perlvar;
   
Line 104  sub clean_domain { Line 113  sub clean_domain {
     return $domain;      return $domain;
 }  }
   
 sub split_courseid {  $match_username     = $LONCAPA::username_re     = qr{\w[\w\-.@]+};
     my ($courseid) = @_;  $match_not_username = $LONCAPA::not_username_re = qr{[^\w\-.@]+};
     my  ($domain,$coursenum) =   
  ($courseid=~m{^/($match_domain)/($match_username)});  
     return ($domain,$coursenum);  
 }  
   
 $match_username     = $LONCAPA::username_re     = qr{[\w\-.]+};  
 $match_not_username = $LONCAPA::not_username_re = qr{[^\w\-.]+};  
 sub clean_username {  sub clean_username {
     my ($username) = @_;      my ($username) = @_;
       $username =~ s/^\W+//;
     $username =~ s/$match_not_username//g;      $username =~ s/$match_not_username//g;
     return $username;      return $username;
 }  }
   
 $match_handle     = $LONCAPA::handle_re     = qr{[\w\-.]+};  
 $match_not_handle = $LONCAPA::not_handle_re = qr{[^\w\-.]+};  $match_courseid     = $LONCAPA::courseid_re     = qr{\d[\w\-.]+};
   $match_not_courseid = $LONCAPA::not_courseid_re = qr{[^\w\-.]+};
   sub clean_courseid {
       my ($courseid) = @_;
       $courseid =~ s/^\D+//;
       $courseid =~ s/$match_not_courseid//g;
       return $courseid;
   }
   
   $match_name         = $LONCAPA::name_re = qr{$match_username|$match_courseid};
   sub clean_name {
       my ($name) = @_;
       $name =~ s/$match_not_username//g;
       return $name;
   }
   
   $match_lonid     = $LONCAPA::lonid_re     = qr{[\w\-.]+};
   
   sub split_courseid {
       my ($courseid) = @_;
       my  ($domain,$coursenum) = 
    ($courseid=~m{^/($match_domain)/($match_courseid)});
       return ($domain,$coursenum);
   }
   
   $match_handle     = $LONCAPA::handle_re     = qr{[\w\-.@]+};
   $match_not_handle = $LONCAPA::not_handle_re = qr{[^\w\-.@]+};
 sub clean_handle {  sub clean_handle {
     my ($handle) = @_;      my ($handle) = @_;
     $handle =~ s/$match_not_handle//g;      $handle =~ s/$match_not_handle//g;
Line 132  sub clean_handle { Line 161  sub clean_handle {
 sub propath {  sub propath {
     my ($udom,$uname)=@_;      my ($udom,$uname)=@_;
     $udom = &clean_domain($udom);      $udom = &clean_domain($udom);
     $uname= &clean_username($uname);      $uname= &clean_name($uname);
     my $subdir=$uname.'__';      my $subdir=$uname.'__';
     $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;      $subdir =~ s/(.)(.)(.).*/$1\/$2\/$3/;
     my $proname="$perlvar{'lonUsersDir'}/$udom/$subdir/$uname";      my $proname="$perlvar{'lonUsersDir'}/$udom/$subdir/$uname";
Removed from v.1.15  
changed lines
  Added in v.1.24

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