--- loncom/interface/loncommon.pm 2014/02/17 17:14:30 1.1075.2.65
+++ loncom/interface/loncommon.pm 2014/02/23 22:39:21 1.1075.2.68
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1075.2.65 2014/02/17 17:14:30 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.68 2014/02/23 22:39:21 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5068,7 +5068,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);
@@ -14898,7 +14901,7 @@ sub captcha_display {
$error = 'recaptcha';
}
}
- return ($output,$error);
+ return ($output,$error,$captcha);
}
sub captcha_response {
@@ -14974,8 +14977,9 @@ sub create_captcha {
if (-e $Apache::lonnet::perlvar{'lonCaptchaDir'}.'/'.$md5sum.'.png') {
$output = ''."\n".
&mt('Type in the letters/numbers shown below').' '.
- '
'.
- '
';
+ ''.
+ '
'.
+ '
';
last;
}
}
@@ -15046,7 +15050,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',