[LON-CAPA-cvs] cvs: loncom /interface loncreatecourse.pm
matthew
lon-capa-cvs@mail.lon-capa.org
Thu, 08 Aug 2002 20:37:37 -0000
matthew Thu Aug 8 16:37:37 2002 EDT
Modified files:
/loncom/interface loncreatecourse.pm
Log:
Bug 263.
Changed oh-so descriptive function names of 'phase_one' and 'phase_two' to
'print_course_creation_page' and 'create_course'.
Rewrote html for course creation page. Now user must specify a home server
for a course. Suggestions on determining a default server would be appreciated.
When creating a course, now deal with course_home form parameter and pass it
to lonnet.
Index: loncom/interface/loncreatecourse.pm
diff -u loncom/interface/loncreatecourse.pm:1.9 loncom/interface/loncreatecourse.pm:1.10
--- loncom/interface/loncreatecourse.pm:1.9 Tue Apr 23 17:05:45 2002
+++ loncom/interface/loncreatecourse.pm Thu Aug 8 16:37:37 2002
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Create a course
#
-# $Id: loncreatecourse.pm,v 1.9 2002/04/23 21:05:45 matthew Exp $
+# $Id: loncreatecourse.pm,v 1.10 2002/08/08 20:37:37 matthew Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -47,9 +47,16 @@
# ===================================================== Phase one: fill-in form
-sub phase_one {
+sub print_course_creation_page {
my $r=shift;
- my $defdom=$ENV{'user.domain'};
+ my $defdom=$ENV{'request.role.domain'};
+ my %host_servers = &Apache::loncommon::get_library_servers($defdom);
+ my $course_home = '<select name="course_home" size="1">'."\n";
+ foreach my $server (sort(keys(%host_servers))) {
+ $course_home .=
+ qq{<option value="$server">$server $host_servers{$server}</option>};
+ }
+ $course_home .= "\n</select>\n";
my $domform = &Apache::loncommon::select_dom_form($defdom,'ccdomain');
$r->print(<<ENDDOCUMENT);
<html>
@@ -79,18 +86,29 @@
<img align="right" src="/adm/lonIcons/lonlogos.gif">
<h1>Create a new Course</h1>
<form action="/adm/createcourse" method="post" name="ccrs">
-<h3>Course Title</h3>
+<h2>Course Information</h2>
+<p>
+<b>Course Title:</b>
<input type="text" size="50" name="title">
-<h3>Top-level Map</h3>
+</p><p>
+<b>Top-level Map:</b>
<input type="text" size="50" name="topmap">
<a href="javascript:openbrowser('ccrs','topmap')">Browse</a>
-<h3>Course ID/Number (optional)</h3>
+</p><p>
+<b>Course Home Server:</b>$course_home
+</p><p>
+<b>Course ID/Number (optional)</b>
<input type="text" size="30" name="crsid">
-<h3>Course Coordinator</h3>
-Username: <input type="text" size="15" name="ccuname" /><br>
+</p><p>
+<h2>Course Coordinator</h2>
+<p>
+Username: <input type="text" size="15" name="ccuname" />
+</p><p>
Domain: $domform
-<input type="hidden" name="phase" value="two" /><p>
+</p><p>
+<input type="hidden" name="phase" value="two" />
<input type="submit" value="Open Course">
+</p>
</form>
</body>
</html>
@@ -99,7 +117,7 @@
# ====================================================== Phase two: make course
-sub phase_two {
+sub create_course {
my $r=shift;
my $topurl='/res/'.&Apache::lonnet::declutter($ENV{'form.topmap'});
my $ccuname=$ENV{'form.ccuname'};
@@ -117,19 +135,28 @@
<img align=right src=/adm/lonIcons/lonlogos.gif>
<h1>Create a new Course</h1>
ENDENHEAD
-#
-# Verify data
-#
+ #
+ # Verify data
+ #
+ # Check the veracity of the course coordinator
if (&Apache::lonnet::homeserver($ccuname,$ccdomain) eq 'no_host') {
$r->print('No such user '.$ccuname.' at '.$ccdomain.'</body></html>');
return;
}
-
+ # Check the proposed home server for the course
+ my %host_servers = &Apache::loncommon::get_library_servers
+ ($ENV{'request.role.domain'});
+ if (! exists($host_servers{$ENV{'form.course_home'}})) {
+ $r->print('Invalid home server for course: '.
+ $ENV{'form.course_home'}.'</body></html>');
+ return;
+ }
#
# Open course
#
- my $courseid=&Apache::lonnet::createcourse($ENV{'user.domain'},
- $cdescr,$curl);
+ my $courseid=&Apache::lonnet::createcourse($ENV{'request.role.domain'},
+ $cdescr,$curl,
+ $ENV{'form.course_home'});
$r->print('New LON-CAPA Course ID: '.$courseid.'<br>');
#
@@ -170,14 +197,14 @@
return OK;
}
- if (&Apache::lonnet::allowed('ccc',$ENV{'user.domain'})) {
+ if (&Apache::lonnet::allowed('ccc',$ENV{'request.role.domain'})) {
$r->content_type('text/html');
$r->send_http_header;
if ($ENV{'form.phase'} eq 'two') {
- &phase_two($r);
+ &create_course($r);
} else {
- &phase_one($r);
+ &print_course_creation_page($r);
}
} else {
$ENV{'user.error.msg'}=