--- loncom/interface/loncommon.pm 2014/02/16 22:04:14 1.1175 +++ loncom/interface/loncommon.pm 2014/02/23 20:52:58 1.1178 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # a pile of common routines # -# $Id: loncommon.pm,v 1.1175 2014/02/16 22:04:14 raeburn Exp $ +# $Id: loncommon.pm,v 1.1178 2014/02/23 20:52:58 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -5151,7 +5151,10 @@ sub bodytag { @design{keys(%$addentries)} = @$addentries{keys(%$addentries)}; # role and realm - my ($role,$realm) = split(/\./,$env{'request.role'},2); + my ($role,$realm) = split(m{\./},$env{'request.role'},2); + if ($realm) { + $realm = '/'.$realm; + } if ($role eq 'ca') { my ($rdom,$rname) = ($realm =~ m{^/($match_domain)/($match_username)$}); $realm = &plainname($rname,$rdom); @@ -14902,7 +14905,7 @@ sub captcha_display { $error = 'recaptcha'; } } - return ($output,$error); + return ($output,$error,$captcha); } sub captcha_response { @@ -14978,8 +14981,9 @@ sub create_captcha { if (-e $Apache::lonnet::perlvar{'lonCaptchaDir'}.'/'.$md5sum.'.png') { $output = ''."\n". &mt('Type in the letters/numbers shown below').' '. - '
'. - 'captcha'; + ''. + '
'. + 'captcha'; last; } } @@ -15050,7 +15054,7 @@ sub check_recaptcha { } sub emailusername_info { - my @fields = ('lastname','firstname','institution','web','location','officialemail'); + my @fields = ('firstname','lastname','institution','web','location','officialemail'); my %titles = &Apache::lonlocal::texthash ( lastname => 'Last Name', firstname => 'First Name',