version 1.40.2.5.2.16, 2012/05/01 14:20:10
|
version 1.40.2.5.2.17, 2012/05/01 16:09:26
|
Line 697 sub process_mailtoken {
|
Line 697 sub process_mailtoken {
|
} |
} |
my %form = &start_session($r,$data{'username'},$domain, |
my %form = &start_session($r,$data{'username'},$domain, |
$lonhost,$data{'courseid'}, |
$lonhost,$data{'courseid'}, |
$token); |
$token,'new'); |
$nostart = 1; |
$nostart = 1; |
$noend = 1; |
$noend = 1; |
} else { |
} else { |
Line 724 sub process_mailtoken {
|
Line 724 sub process_mailtoken {
|
} |
} |
|
|
sub start_session { |
sub start_session { |
my ($r,$username,$domain,$lonhost,$courseid,$token) = @_; |
my ($r,$username,$domain,$lonhost,$courseid,$token,$usertype) = @_; |
my %form = ( |
my %form = ( |
uname => $username, |
uname => $username, |
udom => $domain, |
udom => $domain, |
Line 735 sub start_session {
|
Line 735 sub start_session {
|
if ($courseid ne '') { |
if ($courseid ne '') { |
$form{'courseid'} = $courseid; |
$form{'courseid'} = $courseid; |
$firsturl = '/adm/selfenroll?courseid='.$courseid; |
$firsturl = '/adm/selfenroll?courseid='.$courseid; |
|
if ($usertype) { |
|
$firsturl .= '&usertype='.$usertype; |
|
} |
} |
} |
} |
} |
if ($r->dir_config('lonBalancer') eq 'yes') { |
if ($r->dir_config('lonBalancer') eq 'yes') { |
Line 1144 sub username_activation {
|
Line 1147 sub username_activation {
|
if ($result eq 'ok') { |
if ($result eq 'ok') { |
my $delete = &Apache::lonnet::tmpdel($env{'form.authtoken'}); |
my $delete = &Apache::lonnet::tmpdel($env{'form.authtoken'}); |
$output = &mt('A LON-CAPA account has been created for username: [_1] in domain: [_2].',$username,$domain); |
$output = &mt('A LON-CAPA account has been created for username: [_1] in domain: [_2].',$username,$domain); |
my %form = &start_session($r,$username,$domain,$lonhost,$courseid); |
my %form = &start_session($r,$username,$domain,$lonhost,$courseid,undef,'new'); |
my $nostart = 1; |
my $nostart = 1; |
return ('ok',$output,$nostart); |
return ('ok',$output,$nostart); |
} else { |
} else { |