--- loncom/interface/loncreatecourse.pm 2004/09/25 17:52:03 1.68
+++ loncom/interface/loncreatecourse.pm 2005/03/03 21:24:24 1.77
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Create a course
#
-# $Id: loncreatecourse.pm,v 1.68 2004/09/25 17:52:03 matthew Exp $
+# $Id: loncreatecourse.pm,v 1.77 2005/03/03 21:24:24 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -38,7 +38,6 @@ use Apache::londocs;
use Apache::lonlocal;
use Apache::londropadd;
use lib '/home/httpd/lib/perl';
-use localenroll;
# ================================================ Get course directory listing
@@ -139,6 +138,9 @@ sub copydb {
my %newcrsdata= &Apache::lonnet::coursedescription($newcrsid);
my %data=&Apache::lonnet::dump
($which,$origcrsdata{'domain'},$origcrsdata{'num'});
+ foreach my $key (keys(%data)) {
+ if ($key=~/^internal./) { delete($data{$key}); }
+ }
return &Apache::lonnet::put
($which,\%data,$newcrsdata{'domain'},$newcrsdata{'num'});
}
@@ -191,7 +193,7 @@ sub copyresourcedb {
my $thiskey=$_;
$thiskey=~s/^$origcrsid/$newcrsid/;
$newdata{$thiskey}=$data{$_};
- if ($data{$_.'.type'}=~/^date/) {
+ if ($data{$_.'.type'}=~/^date_(start|end)$/) {
$newdata{$thiskey}=$newdata{$thiskey}+$delta;
}
}
@@ -204,7 +206,9 @@ sub copyresourcedb {
sub copyuserfiles {
my ($origcrsid,$newcrsid)=@_;
foreach (&crsdirlist($origcrsid,'userfiles')) {
- ©file($origcrsid,$newcrsid,$_);
+ if ($_ !~m|^scantron_|) {
+ ©file($origcrsid,$newcrsid,$_);
+ }
}
}
# ========================================================== Copy all userfiles
@@ -252,7 +256,7 @@ sub print_course_creation_page {
($ENV{'request.role.domain'},'clonedomain').
&Apache::loncommon::selectcourse_link
('ccrs','clonecourse','clonedomain');
- my $coursebrowserjs=&Apache::loncommon::coursebrowser_javascript();
+ my $coursebrowserjs=&Apache::loncommon::coursebrowser_javascript($ENV{'request.role.domain'});
my $starttime = time;
my $endtime = time+(6*30*24*60*60); # 6 months from now, approx
my $enroll_table = &Apache::londropadd::date_setting_table($starttime,$endtime,'create_enrolldates');
@@ -323,12 +327,15 @@ sub print_course_creation_page {
'pcda' => "Please choose the default authentication method to be used by new users added to this LON-CAPA domain by the automated enrollment process",
'nech' => "Notification of enrollment changes",
'nccl' => "Notification to course coordinator via LON-CAPA message when enrollment changes occur during the automated update?",
+ 'ndcl' => "Notification to domain coordinator via LON-CAPA message when enrollment changes occur during the automated update?",
'irsp' => "Include retrieval of student photographs?",
'rshm' => 'Resource Space Home',
'opco' => "Open Course"
);
+ my $html=&Apache::lonxml::xmlbegin();
$r->print(<
$lt{'nccl'}
+
+$lt{'ndcl'}
+
+
$lt{'irsp'}
@@ -543,11 +557,6 @@ $lt{'nccl'}
-
-
@@ -563,22 +572,84 @@ ENDDOCUMENT
sub create_course {
my $r=shift;
- my $topurl='/res/'.&Apache::lonnet::declutter($ENV{'form.topmap'});
- my $this_server = $Apache::lonnet::perlvar{'lonHostID'};
my $ccuname=$ENV{'form.ccuname'};
my $ccdomain=$ENV{'form.ccdomain'};
$ccuname=~s/\W//g;
$ccdomain=~s/\W//g;
- my $cdescr=$ENV{'form.title'};
- my $curl=$ENV{'form.topmap'};
+
+ my $enrollstart = &Apache::lonhtmlcommon::get_date_from_form('startenroll');
+ my $enrollend = &Apache::lonhtmlcommon::get_date_from_form('endenroll');
+ my $startaccess = &Apache::lonhtmlcommon::get_date_from_form('startaccess');
+ my $endaccess = &Apache::lonhtmlcommon::get_date_from_form('endaccess');
+
+ my $autharg;
+ my $authtype;
+
+ if ($ENV{'form.login'} eq 'krb') {
+ $authtype = 'krb';
+ $authtype .=$ENV{'form.krbver'};
+ $autharg = $ENV{'form.krbarg'};
+ } elsif ($ENV{'form.login'} eq 'int') {
+ $authtype ='internal';
+ if ((defined($ENV{'form.intarg'})) && ($ENV{'form.intarg'})) {
+ $autharg = $ENV{'form.intarg'};
+ }
+ } elsif ($ENV{'form.login'} eq 'loc') {
+ $authtype = 'localauth';
+ if ((defined($ENV{'form.locarg'})) && ($ENV{'form.locarg'})) {
+ $autharg = $ENV{'form.locarg'};
+ }
+ }
+
+ my $logmsg;
+ my $html=&Apache::lonxml::xmlbegin();
my $bodytag=&Apache::loncommon::bodytag('Create a New Course');
$r->print(<