version 1.17, 2009/04/29 16:57:29
|
version 1.19, 2009/10/01 17:22:13
|
Line 46 sub handler {
|
Line 46 sub handler {
|
my $contact_name = &mt('LON-CAPA helpdesk'); |
my $contact_name = &mt('LON-CAPA helpdesk'); |
my $contact_email = $r->dir_config('lonSupportEMail'); |
my $contact_email = $r->dir_config('lonSupportEMail'); |
my $server = $r->dir_config('lonHostID'); |
my $server = $r->dir_config('lonHostID'); |
my $defdom = $r->dir_config('lonDefDomain'); |
my $defdom = &Apache::lonnet::default_login_domain(); |
&Apache::lonacc::get_posted_cgi($r); |
&Apache::lonacc::get_posted_cgi($r); |
&Apache::lonlocal::get_language_handle($r); |
&Apache::lonlocal::get_language_handle($r); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']); |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['token']); |
Line 76 sub handler {
|
Line 76 sub handler {
|
my %userinfo = |
my %userinfo = |
&Apache::lonnet::get('environment',\@emailtypes, |
&Apache::lonnet::get('environment',\@emailtypes, |
$udom,$uname); |
$udom,$uname); |
my $email = ''; |
my @allemails; |
my $emailtarget; |
|
foreach my $type (@emailtypes) { |
foreach my $type (@emailtypes) { |
$email = $userinfo{$type}; |
my $email = $userinfo{$type}; |
if ($email =~ /[^\@]+\@[^\@]+/) { |
my @items; |
$emailtarget = $type; |
if ($email =~ /,/) { |
last; |
@items = split(',',$userinfo{$type}); |
|
} else { |
|
@items = ($email); |
|
} |
|
foreach my $item (@items) { |
|
if ($item =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) { |
|
unless(grep(/^\Q$item\E$/,@allemails)) { |
|
push(@allemails,$item); |
|
} |
|
} |
} |
} |
} |
} |
if ($email =~ /^[^\@]+\@[^\@]+\.[^\@\.]+$/) { |
if (@allemails > 0) { |
if ($useremail eq $email) { |
if (grep(/^\Q$useremail\E$/,@allemails)) { |
$output = &send_token($uname,$udom,$email,$server, |
$output = &send_token($uname,$udom,$useremail,$server, |
$domdesc,$contact_name, |
$domdesc,$contact_name, |
$contact_email); |
$contact_email); |
} else { |
} else { |