Diff for /loncom/interface/createaccount.pm between versions 1.37.2.5 and 1.37.2.6

version 1.37.2.5, 2010/12/02 02:15:11 version 1.37.2.6, 2010/12/02 22:51:27
Line 1152  sub invalid_state { Line 1152  sub invalid_state {
     if ($msgtext) {      if ($msgtext) {
         $msg .= '<br />'.$msgtext;          $msg .= '<br />'.$msgtext;
     }      }
     $msg .= &linkto_email_help($contact_email,$domdesc);      $msg .= &linkto_email_help($contact_email,$domdesc,$error);
     return $msg;      return $msg;
 }  }
   
 sub linkto_email_help {  sub linkto_email_help {
     my ($contact_email,$domdesc) = @_;      my ($contact_email,$domdesc,$error) = @_;
     my $msg;      my $msg;
     if ($contact_email ne '') {      if ($contact_email ne '') {
         my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');          my $escuri = &HTML::Entities::encode('/adm/createaccount','&<>"');
         $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="/adm/helpdesk?origurl='.$escuri.'">','</a>',$domdesc).'<br />';          my $href = '/adm/helpdesk?origurl='.$escuri;
           if ($error eq 'existinguser') {
               my $escemail = &HTML::Entities::encode($env{'form.useremail'});
               $href .= '&useremail='.$escemail.'&useraccount='.$escemail;
           }
           $msg .= '<br />'.&mt('You may wish to contact the [_1]LON-CAPA helpdesk[_2] for [_3].','<a href="'.$href.'">','</a>',$domdesc).'<br />';
     } else {      } else {
         $msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).'<br />';          $msg .= '<br />'.&mt('You may wish to send an e-mail to the server administrator: [_1] for [_2].',$Apache::lonnet::perlvar{'AdminEmail'},$domdesc).'<br />';
     }      }

Removed from v.1.37.2.5  
changed lines
  Added in v.1.37.2.6


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