--- loncom/interface/createaccount.pm 2009/02/07 00:59:17 1.28
+++ loncom/interface/createaccount.pm 2009/04/01 14:43:06 1.33
@@ -3,7 +3,7 @@
# institutional log-in ID (institutional authentication required - localauth
# or kerberos) or an e-mail address.
#
-# $Id: createaccount.pm,v 1.28 2009/02/07 00:59:17 raeburn Exp $
+# $Id: createaccount.pm,v 1.33 2009/04/01 14:43:06 hauer Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -86,13 +86,13 @@ sub handler {
my $start_page;
my $handle = &Apache::lonnet::check_for_valid_session($r);
- if ($handle ne '') {
+ if (($handle ne '') && ($handle !~ /^publicuser_\d+$/)) {
$start_page =
&Apache::loncommon::start_page('Already logged in');
my $end_page =
&Apache::loncommon::end_page();
$r->print($start_page."\n".'
'.&mt('You are already logged in').'
'.
- ''.&mt('Please either [_1]continue the current session[_2] or [_3]logout[_4].','','','','').
+ '
'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].','','','','').
'
'.&mt('Login problems?').'
'.$end_page);
return OK;
}
@@ -313,9 +313,10 @@ sub validate_course {
sub javascript_setforms {
my ($now) = @_;
my $js = <
+
ENDSCRIPT
@@ -425,7 +426,9 @@ sub print_username_form {
if ($courseid ne '') {
$output .= ''."\n";
}
- $output .= ''.
&Apache::lonhtmlcommon::row_closure(1).
&Apache::lonhtmlcommon::end_pick_box().'
';
@@ -463,31 +466,40 @@ sub login_box {
my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
$lonhost);
$output = &serverform($logtoken,$lonhost,undef,$courseid,$context);
- my $unameform = '';
- my $upassform = '';
- $output .= '';
return $output;
@@ -715,79 +727,65 @@ sub print_dataentry_form {
my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
$lonhost);
- my @userinfo = ('firstname','middlename','lastname','generation','id',
- 'permanentemail');
- my %lt=&Apache::lonlocal::texthash(
- 'pd' => "Personal Data",
- 'firstname' => "First Name",
- 'middlename' => "Middle Name",
- 'lastname' => "Last Name",
- 'generation' => "Generation",
- 'permanentemail' => "Permanent e-mail address",
- 'id' => "Student/Employee ID",
- 'lg' => "Login Data"
- );
- my %textboxsize = (
- firstname => '15',
- middlename => '15',
- lastname => '15',
- generation => '5',
- id => '15',
- );
- my $genhelp=&Apache::loncommon::help_open_topic('Generation');
- $output .= ''.$lt{'pd'}.'
'.
- '
ENDSERVERFORM
+ if ($rowcount) {
+ $output .= '
'.
+ '';
+ }
my $upassone = '
';
my $upasstwo = '
';
my $submit_text = &mt('Create LON-CAPA account');
- $output .= '
'.$lt{'lg'}.'
'."\n".
- ''."\n".
+ $output .= ''.&mt('Login Data').'
'."\n".
+ ''."\n".
- '';
+ '
'."\n".
+ '
'."\n".
+ '
'."\n".
+ '
'."\n".
+ '';
+ if ($rowcount) {
+ $output .= '
'."\n".
+ ''."\n";
+ }
} else {
$output = &mt('Could not load javascript file [_1]','londes.js');
}
@@ -1188,6 +1186,7 @@ sub serverform {
+
$catalog_elements