'.$end_page);
- return OK;
+ return OK;
}
- $start_page =
- &Apache::loncommon::start_page('Create a user account in LON-CAPA','',
- {'no_inline_link' => 1,});
- if ($env{'form.phase'} eq 'username_activation') {
+
+ my $courseid;
+ if (defined($env{'form.courseid'})) {
+ $courseid = &validate_course($env{'form.courseid'});
+ }
+ if ($env{'form.phase'} eq 'selfenroll_login') {
if ($env{'form.udom'} ne '') {
$domain = $env{'form.udom'};
}
+ my ($result,$output) =
+ &username_validation($r,$env{'form.uname'},$domain,$domdesc,
+
+ $contact_name,$contact_email,$courseid,
+ $lonhost);
+ if ($result eq 'existingaccount') {
+ $r->print($output);
+ $r->print(&Apache::loncommon::end_page());
+ return OK;
+ } else {
+ $start_page =
+ &Apache::loncommon::start_page('Self-enroll in a LON-CAPA course','',
+ {'no_inline_link' => 1,});
+ &print_header($r,$start_page);
+ $r->print($output.&Apache::loncommon::end_page());
+ return OK;
+ }
}
+
+ $start_page =
+ &Apache::loncommon::start_page('Create a user account in LON-CAPA','',
+ {'no_inline_link' => 1,});
my @cancreate;
my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$domain);
if (ref($domconfig{'usercreation'}) eq 'HASH') {
@@ -120,11 +143,6 @@
return OK;
}
- my $courseid;
- if (defined($env{'form.courseid'})) {
- $courseid = &validate_course($env{'form.courseid'});
- }
-
if ($sso_username ne '') {
&print_header($r,$start_page);
my ($msg,$sso_logout);
@@ -325,31 +343,10 @@
my %domdefaults = &Apache::lonnet::get_domain_defaults($domain);
if ((($domdefaults{'auth_def'} =~/^krb/) && ($domdefaults{'auth_arg_def'} ne '')) || ($domdefaults{'auth_def'} eq 'localauth')) {
$output = '
'.&mt('Create account with a username provided by this institution').'
';
- $output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.',' ').'
'.&mt('Type in your log-in ID and password to find out.').'
';
- my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
- my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
- my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
- $lonhost);
- $output .= &serverform($logtoken,$lonhost,undef,$courseid);
- my $unameform = '';
- my $upassform = '';
my $submit_text = &mt('Create LON-CAPA account');
- $output .= '
';
+ $output .= &mt('If you already have a log-in ID at this institution,[_1] you may be able to use it for LON-CAPA.',' ').'
'.&mt('Type in your log-in ID and password to find out.').'
';
+ $output .= &login_box($now,$lonhost,$courseid,$submit_text,
+ $domain,'createaccount');
}
}
if (grep(/^email$/,@{$cancreate})) {
@@ -389,6 +386,48 @@
return $output;
}
+sub login_box {
+ my ($now,$lonhost,$courseid,$submit_text,$domain,$context) = @_;
+ my $output;
+ my %titles = &Apache::lonlocal::texthash(
+ createaccount => 'Log-in ID',
+ selfenroll => 'Username',
+ );
+ my ($lkey,$ukey) = &Apache::lonpreferences::des_keys();
+ my ($lextkey,$uextkey) = &getkeys($lkey,$ukey);
+ my $logtoken=Apache::lonnet::reply('tmpput:'.$ukey.$lkey.'&createaccount',
+ $lonhost);
+ $output = &serverform($logtoken,$lonhost,undef,$courseid,$context);
+ my $unameform = '';
+ my $upassform = '';
+ $output .= '';
+ return $output;
+}
+
sub process_email_request {
my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
$server,$settings,$courseid) = @_;
@@ -1016,15 +1055,19 @@
}
sub serverform {
- my ($logtoken,$lonhost,$mailtoken,$courseid) = @_;
+ my ($logtoken,$lonhost,$mailtoken,$courseid,$context) = @_;
+ my $phase = 'username_validation"';
+ if ($context eq 'selfenroll') {
+ $phase = 'selfenroll_login';
+ }
my $output .= <
+
ENDSERVERFORM
--raeburn1216024019--
From lon-capa-cvs-allow@mail.lon-capa.org Mon Jul 14 09:32:36 2008
From: lon-capa-cvs-allow@mail.lon-capa.org (raeburn)
Date: Mon, 14 Jul 2008 08:32:36 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface selfenroll.pm
Message-ID:
raeburn Mon Jul 14 04:32:36 2008 EDT
Modified files:
/loncom/interface selfenroll.pm
Log:
- page_header() added to generate start_page and breadcrumbs.
- new phase - login - which causes &createaccount::login_box() to be called to generate log-in box.
- log-in link presented to self-enrollers no longer points at regular log-in screen (sets phase to login instead).
- message provides reasssurance to user that self-enrollment in selected course will occur following log-in.
Index: loncom/interface/selfenroll.pm
diff -u loncom/interface/selfenroll.pm:1.9 loncom/interface/selfenroll.pm:1.10
--- loncom/interface/selfenroll.pm:1.9 Fri Jul 11 09:43:53 2008
+++ loncom/interface/selfenroll.pm Mon Jul 14 04:32:36 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Allow users to self-enroll in a course
#
-# $Id: selfenroll.pm,v 1.9 2008/07/11 13:43:53 raeburn Exp $
+# $Id: selfenroll.pm,v 1.10 2008/07/14 08:32:36 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -33,6 +33,7 @@
use Apache::lonnet;
use Apache::loncommon;
use Apache::lonlocal;
+use Apache::createaccount;
use LONCAPA qw(:DEFAULT :match);
sub handler {
@@ -44,6 +45,7 @@
}
my $handle = &Apache::lonnet::check_for_valid_session($r);
my $lonidsdir=$r->dir_config('lonIDsDir');
+ my $lonhost = $r->dir_config('lonHostID');
if ($handle ne '') {
&Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
}
@@ -51,28 +53,32 @@
&Apache::lonlocal::get_language_handle($r);
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cid']);
my ($coursechk,$cid) = &validate_course_id($env{'form.cid'});
- my $start_page =
- &Apache::loncommon::start_page('Self-enroll in a LON-CAPA course','',
- {'no_inline_link' => 1,});
- $r->print($start_page);
- &Apache::lonhtmlcommon::clear_breadcrumbs();
- &Apache::lonhtmlcommon::add_breadcrumb
- ({href=>"/adm/selfenroll?cid=$cid",
- text=>"Self-enroll"});
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Self-enroll in course'));
if ($coursechk ne 'ok') {
+ &page_header($r,$cid);
$r->print('
'.&mt('Self-enrollment error').'
'.
- ''.&mt('Invalid domain or course number').'');
+ ''.
+ &mt('Invalid domain or course number').'');
$r->print(&Apache::loncommon::end_page());
return OK;
}
- my ($cdom,$cnum,$canenroll,$selfenroll_types,$selfenroll_registered,
+ my $now = time;
+ my $js;
+ if ($env{'form.phase'} eq 'login') {
+ $js = &Apache::createaccount::javascript_setforms($now);
+ }
+ &page_header($r,$cid,$js);
+ my $include = $r->dir_config('lonIncludes');
+ if ($env{'form.phase'} eq 'login') {
+ my $jsh=Apache::File->new($include."/londes.js");
+ $r->print(<$jsh>);
+ }
+ my ($cdom,$cnum,$desc,$canenroll,$selfenroll_types,$selfenroll_registered,
@cancreate,$knownuser,$selfenroll_access_start,$selfenroll_access_end,
$selfenroll_section,$selfenroll_future,%curr_role,%coursehash,$cdomdesc);
- my $now = time;
%coursehash = &Apache::lonnet::coursedescription($cid);
$cdom = $coursehash{'domain'};
$cnum = $coursehash{'num'};
+ $desc = $coursehash{'description'};
$selfenroll_types = $coursehash{'internal.selfenroll_types'};
$selfenroll_registered = $coursehash{'internal.selfenroll_registered'};
$selfenroll_section = $coursehash{'internal.selfenroll_section'};
@@ -184,11 +190,22 @@
&process_self_enroll($r,$cdom,$cnum,$selfenroll_types,$selfenroll_registered,
$selfenroll_access_start,$selfenroll_access_end,
$selfenroll_section,$now);
+ } elsif ($env{'form.phase'} eq 'login') {
+ my $submit_text = &mt('Log in');
+ $r->print('
'.&mt('Log-in to LON-CAPA').'
');
+ my $udom = &Apache::lonnet::default_login_domain();
+ $r->print(&Apache::createaccount::login_box($now,$lonhost,$cid,
+ $submit_text,$udom,'selfenroll'));
+ $r->print(&mt('You will be able to self-enroll in the course you selected ([_1]) after you have successfully logged in.',''.$desc.'').
+ &Apache::loncommon::end_page());
+ return OK;
} elsif (@cancreate > 0) {
$r->print(<
function setPath(formaction,item,arg) {
- document.forms.logmein.action = formaction;
+ if (formaction != '') {
+ document.forms.logmein.action = formaction;
+ }
var itemid = getIndexByName("setting");
if (itemid > -1) {
document.logmein.elements[itemid].name = item;
@@ -211,7 +228,7 @@
END
$r->print('
'.&mt('LON-CAPA account required').'
'.
- &mt('You need to be logged into LON-CAPA to self-enroll in a course.').'
'.&mt('If you have an account in LON-CAPA, [_1]log-in[_2].','','').'
');
+ &mt('You need to be logged into LON-CAPA to self-enroll in a course.').'
'.&mt('If you have an account in LON-CAPA, [_1]log-in[_2].','','').'
');
if (@cancreate > 1) {
$r->print('
'.&mt('Otherwise:').' ');
my $count = 0;
@@ -261,12 +278,27 @@
$r->print(&mt('Submit a request to the LON-CAPA [_1]helpdesk[_2] for [_3] if you require assistance.','','',$cdomdesc));
}
$r->print(''."\n".
&Apache::loncommon::end_page());
return OK;
}
+sub page_header {
+ my ($r,$cid,$js) = @_;
+ my $start_page =
+ &Apache::loncommon::start_page('Self-enroll in a LON-CAPA course',$js,
+ {'no_inline_link' => 1,});
+ $r->print($start_page);
+ &Apache::lonhtmlcommon::clear_breadcrumbs();
+ &Apache::lonhtmlcommon::add_breadcrumb
+ ({href=>"/adm/selfenroll?cid=$cid",
+ text=>"Self-enroll"});
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Self-enroll in course'));
+ return;
+}
+
sub validate_course_id {
my ($cid) = @_;
my ($cdom,$cnum) = ($env{'form.cid'} =~ /^($match_domain)_($match_courseid)$/);
From lon-capa-cvs-allow@mail.lon-capa.org Mon Jul 14 10:14:03 2008
From: lon-capa-cvs-allow@mail.lon-capa.org (raeburn)
Date: Mon, 14 Jul 2008 09:14:03 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_7_X) /build Makefile
Message-ID:
raeburn Mon Jul 14 05:14:03 2008 EDT
Modified files: (Branch: version_2_7_X)
/loncom/build Makefile
Log:
- bump version
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.186.2.1 loncom/build/Makefile:1.186.2.2
--- loncom/build/Makefile:1.186.2.1 Tue Jul 1 00:16:04 2008
+++ loncom/build/Makefile Mon Jul 14 05:14:02 2008
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
-# $Id: Makefile,v 1.186.2.1 2008/07/01 04:16:04 raeburn Exp $
+# $Id: Makefile,v 1.186.2.2 2008/07/14 09:14:02 raeburn Exp $
# TYPICAL USAGE of this Makefile is primarily for two targets:
# "make build" and "make install".
@@ -22,7 +22,7 @@
LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
METAMTARGET=""
MTARGET=""
-VERSION=2.6.99.0
+VERSION=2.6.99.1
# The current working definition for "RELEASE" is: changes not in the software,
# but in the operating system dependent packaging of the software. Thus, the
# generic tarball releases do not need to have a release number specified.
From lon-capa-cvs-allow@mail.lon-capa.org Mon Jul 14 11:16:15 2008
From: lon-capa-cvs-allow@mail.lon-capa.org (raeburn)
Date: Mon, 14 Jul 2008 10:16:15 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface loncommon.pm
Message-ID:
raeburn Mon Jul 14 06:16:15 2008 EDT
Modified files:
/loncom/interface loncommon.pm
Log:
- remove duplicated line.
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.670 loncom/interface/loncommon.pm:1.671
--- loncom/interface/loncommon.pm:1.670 Sun Jul 13 15:36:50 2008
+++ loncom/interface/loncommon.pm Mon Jul 14 06:16:11 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.670 2008/07/13 19:36:50 raeburn Exp $
+# $Id: loncommon.pm,v 1.671 2008/07/14 10:16:11 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -7243,7 +7243,6 @@
}
}
}
- my $getpropath = 1;
if (($current_disk_usage + $filesize) > $disk_quota){
my $msg = ''.
&mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.',''.$fname.'',$filesize).''.
From lon-capa-cvs-allow@mail.lon-capa.org Mon Jul 14 11:17:43 2008
From: lon-capa-cvs-allow@mail.lon-capa.org (raeburn)
Date: Mon, 14 Jul 2008 10:17:43 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface createaccount.pm
Message-ID:
raeburn Mon Jul 14 06:17:43 2008 EDT
Modified files:
/loncom/interface createaccount.pm
Log:
- already declared.
Index: loncom/interface/createaccount.pm
diff -u loncom/interface/createaccount.pm:1.20 loncom/interface/createaccount.pm:1.21
--- loncom/interface/createaccount.pm:1.20 Mon Jul 14 04:26:57 2008
+++ loncom/interface/createaccount.pm Mon Jul 14 06:17:42 2008
@@ -3,7 +3,7 @@
# institutional log-in ID (institutional authentication required - localauth
# or kerberos) or an e-mail address.
#
-# $Id: createaccount.pm,v 1.20 2008/07/14 08:26:57 raeburn Exp $
+# $Id: createaccount.pm,v 1.21 2008/07/14 10:17:42 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -431,7 +431,7 @@
sub process_email_request {
my ($useremail,$domain,$domdesc,$contact_name,$contact_email,$cancreate,
$server,$settings,$courseid) = @_;
- my $useremail = $env{'form.useremail'};
+ $useremail = $env{'form.useremail'};
my $output;
if (ref($cancreate) eq 'ARRAY') {
if (!grep(/^email$/,@{$cancreate})) {
From lon-capa-cvs-allow@mail.lon-capa.org Mon Jul 14 11:21:53 2008
From: lon-capa-cvs-allow@mail.lon-capa.org (raeburn)
Date: Mon, 14 Jul 2008 10:21:53 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /auth lonroles.pm
Message-ID:
raeburn Mon Jul 14 06:21:53 2008 EDT
Modified files:
/loncom/auth lonroles.pm
Log:
- use showdom in coursecatalog query string to default to display of the course catalog for an appropriate domain.
- eliminate duplicate declaration ($cdom, $cnum).
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.200 loncom/auth/lonroles.pm:1.201
--- loncom/auth/lonroles.pm:1.200 Tue Jul 8 16:16:16 2008
+++ loncom/auth/lonroles.pm Mon Jul 14 06:21:52 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.200 2008/07/08 20:16:16 raeburn Exp $
+# $Id: lonroles.pm,v 1.201 2008/07/14 10:21:52 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -43,6 +43,7 @@
use Apache::lonnavdisplay();
use GDBM_File;
use LONCAPA qw(:DEFAULT :match);
+use HTML::Entities;
sub redirect_user {
@@ -675,7 +676,8 @@
} else {
if ($countactive > 0) {
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
- $r->print('
'.&mt('[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.','','','',$domdesc).' '.&mt('If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.','','').'
');
+ my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
+ $r->print('
'.&mt('[_1]Visit the [_2]Course Catalog[_3] to view all [_4] LON-CAPA courses.','','','',$domdesc).' '.&mt('If a course is [_1]not[_2] in your list of current courses below, you may be able to enroll if self-enrollment is permitted.','','').'
');
}
}
@@ -791,11 +793,13 @@
}
$r->print(&Apache::lonnet::getannounce());
if ($advanced) {
+ my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
$r->print('
');
}
$r->print(&Apache::loncommon::end_page());
@@ -866,6 +870,7 @@
sub findcourse_advice {
my ($r) = @_;
my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
+ my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
if (&Apache::lonnet::auto_run(undef,$env{'user.domain'})) {
$r->print(&mt('If you were expecting to see an active role listed for a particular course in the [_1] domain, it may be missing for one of the following reasons:',$domdesc).'
@@ -878,7 +883,7 @@
} else {
$r->print(&mt('If you were expecting to see an active role listed for a particular course, that course may not have been created yet.').' ');
}
- $r->print('
'.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','','',$domdesc).' ');
+ $r->print('
'.&mt('The [_1]Course Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','','',$domdesc).' ');
$r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'
');
return;
}
@@ -1069,8 +1074,8 @@
sub adhoc_course_role {
my ($then) = @_;
my ($cdom,$cnum);
- my $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
- my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+ $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+ $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
if (&check_forcc($cdom,$cnum,$then)) {
my $setprivs;
if (!defined($env{'user.role.'.$env{'form.switchrole'}})) {
From lon-capa-cvs-allow@mail.lon-capa.org Mon Jul 14 11:24:27 2008
From: lon-capa-cvs-allow@mail.lon-capa.org (raeburn)
Date: Mon, 14 Jul 2008 10:24:27 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface coursecatalog.pm
Message-ID:
raeburn Mon Jul 14 06:24:27 2008 EDT
Modified files:
/loncom/interface coursecatalog.pm
Log:
- eliminate duplicate decalarations.
Index: loncom/interface/coursecatalog.pm
diff -u loncom/interface/coursecatalog.pm:1.38 loncom/interface/coursecatalog.pm:1.39
--- loncom/interface/coursecatalog.pm:1.38 Sun Jul 13 16:13:10 2008
+++ loncom/interface/coursecatalog.pm Mon Jul 14 06:24:27 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for displaying the course catalog interface
#
-# $Id: coursecatalog.pm,v 1.38 2008/07/13 20:13:10 raeburn Exp $
+# $Id: coursecatalog.pm,v 1.39 2008/07/14 10:24:27 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -837,7 +837,7 @@
$cleandesc=~s/'/\\'/g;
$cleandesc =~ s/^\s+//;
my ($cdom,$cnum)=split(/\_/,$course);
- my ($descr,$instcode,$singleowner,$ttype,$selfenroll_types,
+ my ($instcode,$singleowner,$ttype,$selfenroll_types,
$selfenroll_start,$selfenroll_end,@owners,%ownernames,$categories);
if (ref($courses->{$course}) eq 'HASH') {
$descr = $courses->{$course}{'description'};
@@ -1093,7 +1093,7 @@
}
}
@secnums = sort {$a <=> $b} @secnums;
- my $seclist = join(', ',@secnums);
+ $seclist = join(', ',@secnums);
my $numsec = @secnums;
return ($seclist,$numsec);
}
From lon-capa-cvs-allow@mail.lon-capa.org Mon Jul 14 11:25:25 2008
From: lon-capa-cvs-allow@mail.lon-capa.org (raeburn)
Date: Mon, 14 Jul 2008 10:25:25 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface selfenroll.pm
Message-ID:
raeburn Mon Jul 14 06:25:25 2008 EDT
Modified files:
/loncom/interface selfenroll.pm
Log:
- eliminate duplicate declaration.
Index: loncom/interface/selfenroll.pm
diff -u loncom/interface/selfenroll.pm:1.10 loncom/interface/selfenroll.pm:1.11
--- loncom/interface/selfenroll.pm:1.10 Mon Jul 14 04:32:36 2008
+++ loncom/interface/selfenroll.pm Mon Jul 14 06:25:25 2008
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Allow users to self-enroll in a course
#
-# $Id: selfenroll.pm,v 1.10 2008/07/14 08:32:36 raeburn Exp $
+# $Id: selfenroll.pm,v 1.11 2008/07/14 10:25:25 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -179,7 +179,7 @@
if ($sso_url eq '') {
$sso_url = $login_path;
}
- my $missing_formitem = &mt('The link to the requested page could not be followed.')."\\n".&mt('The placeholder for the courseID is absent.');
+ $missing_formitem = &mt('The link to the requested page could not be followed.')."\\n".&mt('The placeholder for the courseID is absent.');
if ($knownuser) {
if (keys(%curr_role)) {
$r->print('
From lon-capa-cvs-allow@mail.lon-capa.org Mon Jul 14 09:26:59 2008
From: lon-capa-cvs-allow@mail.lon-capa.org (raeburn)
Date: Mon, 14 Jul 2008 08:26:59 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface createaccount.pm
Message-ID: