--- loncom/interface/loncommon.pm 2014/02/15 18:25:13 1.1075.2.64
+++ loncom/interface/loncommon.pm 2014/02/22 00:02:13 1.1075.2.67
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1075.2.64 2014/02/15 18:25:13 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.67 2014/02/22 00:02:13 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -7655,9 +7655,11 @@ function set_wishlistlink(title, path) {
title = document.title;
title = title.replace(/^LON-CAPA /,'');
}
+ title = encodeURIComponent(title);
if (!path) {
path = location.pathname;
}
+ path = encodeURIComponent(path);
Win = window.open('/adm/wishlist?mode=newLink&setTitle='+title+'&setPath='+path,
'wishlistNewLink','width=560,height=350,scrollbars=0');
}
@@ -14896,7 +14898,7 @@ sub captcha_display {
$error = 'recaptcha';
}
}
- return ($output,$error);
+ return ($output,$error,$captcha);
}
sub captcha_response {
@@ -14972,8 +14974,9 @@ sub create_captcha {
if (-e $Apache::lonnet::perlvar{'lonCaptchaDir'}.'/'.$md5sum.'.png') {
$output = ''."\n".
&mt('Type in the letters/numbers shown below').' '.
- '
'.
- '
';
+ ''.
+ '
'.
+ '
';
last;
}
}
@@ -15044,7 +15047,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',