[LON-CAPA-cvs] cvs: loncom /auth lonroles.pm /interface lonrequestcourse.pm /lonnet/perl lonnet.pm
raeburn
raeburn@source.lon-capa.org
Sun, 25 Oct 2009 14:49:07 -0000
This is a MIME encoded message
--raeburn1256482147
Content-Type: text/plain
raeburn Sun Oct 25 14:49:07 2009 EDT
Modified files:
/loncom/auth lonroles.pm
/loncom/interface lonrequestcourse.pm
/loncom/lonnet/perl lonnet.pm
Log:
- Link to course request page if user has no active roles, and has rights to request creation of courses.
- Some wording changes to accommodate communities as well as courses.
- Additional argument for &lonnet::check_can_request() -
hashref: $request_domains used to accumulate domains for each course
type for which user has course request rights.
- New subroutine: &requestcourse_advice() in lonroles.pm
--raeburn1256482147
Content-Type: text/plain
Content-Disposition: attachment; filename="raeburn-20091025144907.txt"
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.233 loncom/auth/lonroles.pm:1.234
--- loncom/auth/lonroles.pm:1.233 Fri Oct 23 16:14:36 2009
+++ loncom/auth/lonroles.pm Sun Oct 25 14:48:43 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# User Roles Screen
#
-# $Id: lonroles.pm,v 1.233 2009/10/23 16:14:36 bisitz Exp $
+# $Id: lonroles.pm,v 1.234 2009/10/25 14:48:43 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -671,11 +671,11 @@
if ($reinit) {
$r->print(
'<h3><span class="LC_error">'.
- &mt('As your session file for the course has expired, you will need to re-select the course.').'</span></h3>');
+ &mt('As your session file for the course or community has expired, you will need to re-select it.').'</span></h3>');
} else {
$r->print(
'<h3><span class="LC_error">'.
- &mt('You need to choose another user role or enter a specific course for this function').'</span></h3>');
+ &mt('You need to choose another user role or enter a specific course or community for this function').'</span></h3>');
}
}
}
@@ -720,7 +720,7 @@
,'<a href="/adm/coursecatalog?showdom='.$esc_dom.'">'
,'</a></b>',$domdesc)
.'<br />'
- .&mt('If a course is [_1]not[_2] in your list of current courses below,'
+ .&mt('If a course or community is [_1]not[_2] in your list of current courses below,'
.' you may be able to enroll if self-enrollment is permitted.'
,'<b>','</b>')
.'</p>'
@@ -731,11 +731,12 @@
# No active roles
if ($countactive==0) {
if ($inrole) {
- $r->print('<h2>'.&mt('Currently no additional roles or courses').'</h2>');
+ $r->print('<h2>'.&mt('Currently no additional roles, courses or communities').'</h2>');
} else {
- $r->print('<h2>'.&mt('Currently no active roles or courses').'</h2>');
+ $r->print('<h2>'.&mt('Currently no active roles, courses or communities').'</h2>');
}
&findcourse_advice($r);
+ &requestcourse_advice($r);
$r->print('</form>');
if ($countfuture) {
$r->print(&mt('The following [quant,_1,role,roles] will become active in the future:',$countfuture));
@@ -1169,12 +1170,60 @@
} 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.').'<br />');
}
- $r->print('<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
- $r->print(&mt('You can search the course catalog for courses which permit self-enrollment, if you would like to enroll in a course.').'</p>');
+ $r->print('<h3>'.&mt('Self Enrollment').'</h3>'.
+ '<p>'.&mt('The [_1]Course/Community Catalog[_2] provides information about all [_3] classes for which LON-CAPA courses have been created, as well as any communities in the domain.','<a href="/adm/coursecatalog?showdom='.$esc_dom.'">','</a>',$domdesc).'<br />');
+ $r->print(&mt('You can search the course catalog for courses and communities which permit self-enrollment, if you would like to enroll in one.').'</p>');
&queued_selfenrollment($r);
return;
}
+sub requestcourse_advice {
+ my ($r) = @_;
+ my $domdesc = &Apache::lonnet::domain($env{'user.domain'},'description');
+ my $esc_dom = &HTML::Entities::encode($env{'user.domain'},'"<>&');
+ my (%can_request,%request_doms);
+ &Apache::lonnet::check_can_request($env{'user.domain'},\%can_request,\%request_doms);
+ if (keys(%request_doms) > 0) {
+ my ($types,$typename) = &Apache::loncommon::course_types();
+ if ((ref($types) eq 'ARRAY') && (ref($typename) eq 'HASH')) {
+ $r->print('<h3>'.&mt('Request creation of a course or community').'</h3>'.
+ '<p>'.&mt('You have rights to create courses and/or communities in the following domain(s):').'<ul>');
+ my (@reqdoms,@reqtypes);
+ foreach my $type (sort(keys(%request_doms))) {
+ push(@reqtypes,$type);
+ if (ref($request_doms{$type}) eq 'ARRAY') {
+ my $domstr = join(', ',map { &Apache::lonnet::domain($_) } sort(@{$request_doms{$type}}));
+ $r->print(&mt('[_1] in domain: [_2]',
+ '<li><i>'.$typename->{$type}.'</i>','<b>'.$domstr.'</b></li>'));
+ foreach my $dom (@{$request_doms{$type}}) {
+ unless (grep(/^\Q$dom\E/,@reqdoms)) {
+ push(@reqdoms,$dom);
+ }
+ }
+ }
+ }
+ my @showtypes;
+ foreach my $type (@{$types}) {
+ if (grep(/^\Q$type\E$/,@reqtypes)) {
+ push(@showtypes,$type);
+ }
+ }
+ my $requrl = '/adm/requestcourse';
+ if (@reqdoms == 1) {
+ $requrl .= '?showdom='.$reqdoms[0];
+ }
+ if (@showtypes > 0) {
+ $requrl.=(($requrl=~/\?/)?'&':'?').'crstype='.$showtypes[0];
+ }
+ if (@reqdoms == 1 || @showtypes > 0) {
+ $requrl .= '&state=crstype&action=new';
+ }
+ $r->print('</ul>'.&mt('Use the [_1]request form[_2] to submit a request for creation of a new course or community.','<a href="'.$requrl.'">','</a>').'</p>');
+ }
+ }
+ return;
+}
+
sub queued_selfenrollment {
my ($r) = @_;
my %selfenrollrequests = &Apache::lonnet::dump('selfenrollrequests');
@@ -1481,8 +1530,8 @@
sub coursepick_jscript {
my %lt = &Apache::lonlocal::texthash(
- plsu => "Please use the 'Select Course' link to open a separate pick course window where you may select the course you wish to enter.",
- youc => 'You can only use this screen to select courses in the current domain.',
+ plsu => "Please use the 'Select Course' link to open a separate pick course window where you may select the course or community you wish to enter.",
+ youc => 'You can only use this screen to select courses and communities in the current domain.',
);
my $verify_script = <<"END";
<script type="text/javascript">
Index: loncom/interface/lonrequestcourse.pm
diff -u loncom/interface/lonrequestcourse.pm:1.37 loncom/interface/lonrequestcourse.pm:1.38
--- loncom/interface/lonrequestcourse.pm:1.37 Sat Oct 24 03:24:13 2009
+++ loncom/interface/lonrequestcourse.pm Sun Oct 25 14:48:55 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Request a course
#
-# $Id: lonrequestcourse.pm,v 1.37 2009/10/24 03:24:13 raeburn Exp $
+# $Id: lonrequestcourse.pm,v 1.38 2009/10/25 14:48:55 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -130,7 +130,7 @@
}
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
- ['action','showdom','cnum','state']);
+ ['action','showdom','cnum','state','crstype']);
&Apache::lonhtmlcommon::clear_breadcrumbs();
my $dom = &get_course_dom();
my $action = $env{'form.action'};
@@ -718,7 +718,7 @@
$r->print('</select></form>'."\n".
&Apache::lonhtmlcommon::row_closure(1)."\n".
&Apache::lonhtmlcommon::end_pick_box().'</div>'."\n".
- '<div><form name="'.$formname.'" method="post" action="">'."\n".
+ '<div><form name="'.$formname.'" method="post" action="/adm/requestcourse">'."\n".
'<input type="hidden" name="state" value="crstype" />'."\n".
'<input type="hidden" name="showdom" value="'.$dom.'" />'."\n".
'<input type="hidden" name="crstype" value="" />'."\n".
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1035 loncom/lonnet/perl/lonnet.pm:1.1036
--- loncom/lonnet/perl/lonnet.pm:1.1035 Sat Oct 24 03:24:25 2009
+++ loncom/lonnet/perl/lonnet.pm Sun Oct 25 14:49:07 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.1035 2009/10/24 03:24:25 raeburn Exp $
+# $Id: lonnet.pm,v 1.1036 2009/10/25 14:49:07 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -4842,7 +4842,7 @@
}
sub check_can_request {
- my ($dom,$can_request) = @_;
+ my ($dom,$can_request,$request_domains) = @_;
my $canreq = 0;
my ($types,$typename) = &Apache::loncommon::course_types();
my @options = ('approval','validate','autolimit');
@@ -4853,6 +4853,9 @@
$env{'user.domain'},
$type,undef,'requestcourses')) {
$canreq ++;
+ if (ref($request_domains) eq 'HASH') {
+ push(@{$request_domains->{$type}},$env{'user.domain'});
+ }
if ($dom eq $env{'user.domain'}) {
$can_request->{$type} = 1;
}
@@ -4860,8 +4863,22 @@
if ($env{'environment.reqcrsotherdom.'.$type} ne '') {
my @curr = split(',',$env{'environment.reqcrsotherdom.'.$type});
if (@curr > 0) {
- $canreq ++;
- unless ($dom eq $env{'user.domain'}) {
+ foreach my $item (@curr) {
+ if (ref($request_domains) eq 'HASH') {
+ my ($otherdom) = ($item =~ /^($match_domain):($optregex)(=?\d*)$/);
+ if ($otherdom ne '') {
+ if (ref($request_domains->{$type}) eq 'ARRAY') {
+ unless (grep(/^\Q$otherdom\E$/,@{$request_domains->{$type}})) {
+ push(@{$request_domains->{$type}},$otherdom);
+ }
+ } else {
+ push(@{$request_domains->{$type}},$otherdom);
+ }
+ }
+ }
+ }
+ unless($dom eq $env{'user.domain'}) {
+ $canreq ++;
if (grep(/^\Q$dom\E:($optregex)(=?\d*)$/,@curr)) {
$can_request->{$type} = 1;
}
--raeburn1256482147--