--- loncom/interface/resetpw.pm 2010/12/24 21:21:51 1.23.2.2 +++ loncom/interface/resetpw.pm 2012/02/16 22:18:07 1.27 @@ -1,7 +1,7 @@ # The LearningOnline Network # Allow access to password changing via a token sent to user's e-mail. # -# $Id: resetpw.pm,v 1.23.2.2 2010/12/24 21:21:51 raeburn Exp $ +# $Id: resetpw.pm,v 1.27 2012/02/16 22:18:07 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -66,9 +66,13 @@ sub handler { return OK; } my $contact_name = &mt('LON-CAPA helpdesk'); - my $contact_email = $r->dir_config('lonSupportEMail'); + my $origmail = $r->dir_config('lonSupportEMail'); my $server = $r->dir_config('lonHostID'); my $defdom = &Apache::lonnet::default_login_domain(); + my $contacts = + &Apache::loncommon::build_recipient_list(undef,'helpdeskmail', + $defdom,$origmail); + my ($contact_email) = split(',',$contacts); my $handle = &Apache::lonnet::check_for_valid_session($r); my $lonidsdir=$r->dir_config('lonIDsDir'); if ($handle ne '') { @@ -93,7 +97,7 @@ sub handler { {href => '/adm/resetpw', text => 'Update Password'}); - $bread_crumbs_component = 'Reset Password'; + $bread_crumbs_component = 'Reset Password'; } else { push (@{$brcrum}, {href => '/adm/resetpw', @@ -104,9 +108,8 @@ sub handler { text => 'Result'}); } } - my $args = {bread_crumbs => $brcrum, - bread_crumbs_component => $bread_crumbs_component, - 'no_inline_link' => 1}; + my $args = {bread_crumbs => $brcrum, + bread_crumbs_component => $bread_crumbs_component}; $r->print(&Apache::loncommon::start_page('Reset password','',$args)); $r->print('

'.&mt('Reset forgotten LON-CAPA password').'

'); my $output; @@ -186,7 +189,7 @@ sub get_uname { .'
  • '.&mt('Your LON-CAPA account must be of a type for which LON-CAPA can reset a password.') .''; $msg .= '
    '. - &Apache::lonhtmlcommon::start_pick_box(). + &Apache::lonhtmlcommon::start_pick_box(). &Apache::lonhtmlcommon::row_title('LON-CAPA '.$lt{'unam'}). ''. &Apache::lonhtmlcommon::row_closure(1).