version 1.443, 2006/08/11 21:55:19
|
version 1.453, 2006/09/12 22:13:05
|
Line 64 use HTML::Entities;
|
Line 64 use HTML::Entities;
|
use Apache::lonhtmlcommon(); |
use Apache::lonhtmlcommon(); |
use Apache::loncoursedata(); |
use Apache::loncoursedata(); |
use Apache::lontexconvert(); |
use Apache::lontexconvert(); |
|
use Apache::lonclonecourse(); |
use LONCAPA; |
use LONCAPA; |
|
|
my $readit; |
my $readit; |
Line 256 of the element the selection from the se
|
Line 257 of the element the selection from the se
|
sub browser_and_searcher_javascript { |
sub browser_and_searcher_javascript { |
my ($mode)=@_; |
my ($mode)=@_; |
if (!defined($mode)) { $mode='edit'; } |
if (!defined($mode)) { $mode='edit'; } |
my $resurl=&lastresurl(); |
my $resurl=&escape_single(&lastresurl()); |
return <<END; |
return <<END; |
// <!-- BEGIN LON-CAPA Internal |
// <!-- BEGIN LON-CAPA Internal |
var editbrowser = null; |
var editbrowser = null; |
Line 728 sub update_help_link {
|
Line 729 sub update_help_link {
|
my $banner_link = "/adm/helpmenu?page=banner&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage"; |
my $banner_link = "/adm/helpmenu?page=banner&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage"; |
my $output .= <<"ENDOUTPUT"; |
my $output .= <<"ENDOUTPUT"; |
<script type="text/javascript"> |
<script type="text/javascript"> |
// <!-- BEGIN LON-CAPA Internal |
|
banner_link = '$banner_link'; |
banner_link = '$banner_link'; |
// END LON-CAPA Internal --> |
|
</script> |
</script> |
ENDOUTPUT |
ENDOUTPUT |
return $output; |
return $output; |
Line 2108 sub noteswrapper {
|
Line 2107 sub noteswrapper {
|
|
|
sub aboutmewrapper { |
sub aboutmewrapper { |
my ($link,$username,$domain,$target)=@_; |
my ($link,$username,$domain,$target)=@_; |
|
if (!defined($username) && !defined($domain)) { |
|
return; |
|
} |
return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'. |
return '<a href="/adm/'.$domain.'/'.$username.'/aboutme"'. |
($target?' target="$target"':'').' title="'.&mt('View this users personal page').'">'.$link.'</a>'; |
($target?' target="$target"':'').' title="'.&mt('View this users personal page').'">'.$link.'</a>'; |
} |
} |
Line 2138 sub track_student_link {
|
Line 2140 sub track_student_link {
|
$target = ''; |
$target = ''; |
} |
} |
if ($start) { $link.='&start='.$start; } |
if ($start) { $link.='&start='.$start; } |
return qq{<a href="$link" title="$title" $target>$linktext</a>}; |
|
|
return qq{<a href="$link" title="$title" $target>$linktext</a>}. |
|
&help_open_topic('View_recent_activity'); |
} |
} |
|
|
=pod |
=pod |
Line 3180 sub standard_css {
|
Line 3184 sub standard_css {
|
|
|
my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px' |
my $border = ($env{'browser.type'} eq 'explorer') ? '0px 2px 0px 2px' |
: '0px 3px 0px 4px'; |
: '0px 3px 0px 4px'; |
|
|
return <<END; |
return <<END; |
h1, h2, h3, th { font-family: $sans } |
h1, h2, h3, th { font-family: $sans } |
a:focus { color: red; background: yellow } |
a:focus { color: red; background: yellow } |
Line 3364 table.LC_aboutme_port tr.LC_even_row td
|
Line 3369 table.LC_aboutme_port tr.LC_even_row td
|
table.LC_data_table tr.LC_data_table_highlight td { |
table.LC_data_table tr.LC_data_table_highlight td { |
background-color: $data_table_darker; |
background-color: $data_table_darker; |
} |
} |
table.LC_data_table tr.LC_empty_row td { |
table.LC_data_table tr.LC_empty_row td, |
|
table.LC_whatsnew tr.LC_empty_row td { |
background-color: #FFFFFF; |
background-color: #FFFFFF; |
font-weight: bold; |
font-weight: bold; |
font-style: italic; |
font-style: italic; |
Line 3372 table.LC_data_table tr.LC_empty_row td {
|
Line 3378 table.LC_data_table tr.LC_empty_row td {
|
padding: 8px; |
padding: 8px; |
} |
} |
|
|
|
table.LC_whatsnew { |
|
} |
|
|
|
table.LC_whatsnew tr th, |
|
table.LC_whatsnew tr.LC_info_row td { |
|
background-color: #CCC; |
|
font-weight: bold; |
|
font-size: small; |
|
text-align: right; |
|
} |
|
table.LC_whatsnew tr td { |
|
background-color: #FFF; |
|
font-size: small; |
|
text-align: right; |
|
} |
|
table.LC_whatsnew tr td.LC_first_item { |
|
text-align: left; |
|
} |
|
|
|
table.LC_whatsnew tr.LC_odd_row td { |
|
background-color: #EEE; |
|
} |
|
|
table.LC_calendar { |
table.LC_calendar { |
border: 1px solid #000000; |
border: 1px solid #000000; |
border-collapse: collapse; |
border-collapse: collapse; |
Line 3698 sub headtag {
|
Line 3727 sub headtag {
|
my $bgcolor = $args->{'bgcolor'} || &designparm($function.'.pgbg',$domain); |
my $bgcolor = $args->{'bgcolor'} || &designparm($function.'.pgbg',$domain); |
my $url = join(':',$env{'user.name'},$env{'user.domain'}, |
my $url = join(':',$env{'user.name'},$env{'user.domain'}, |
#time(), |
#time(), |
|
$Apache::lonnet::perlvar{'lonVersion'}, |
$env{'environment.color.timestamp'}, |
$env{'environment.color.timestamp'}, |
$function,$domain,$bgcolor); |
$function,$domain,$bgcolor); |
|
|
Line 5591 sub commit_studentrole {
|
Line 5621 sub commit_studentrole {
|
############################################################ |
############################################################ |
############################################################ |
############################################################ |
|
|
|
sub construct_course { |
|
my ($args,$logmsg,$courseid,$crsudom,$crsunum,$udom,$uname) = @_; |
|
my $outcome; |
|
|
|
# |
|
# Open course |
|
# |
|
my $crstype = lc($args->{'crstype'}); |
|
my %cenv=(); |
|
$$courseid=&Apache::lonnet::createcourse($args->{'course_domain'}, |
|
$args->{'cdescr'}, |
|
$args->{'curl'}, |
|
$args->{'course_home'}, |
|
$args->{'nonstandard'}, |
|
$args->{'crscode'}, |
|
$args->{'ccuname'}.':'. |
|
$args->{'ccdomain'}, |
|
$args->{'crstype'}); |
|
|
|
# Note: The testing routines depend on this being output; see |
|
# Utils::Course. This needs to at least be output as a comment |
|
# if anyone ever decides to not show this, and Utils::Course::new |
|
# will need to be suitably modified. |
|
$outcome .= &mt('New LON-CAPA [_1] ID: [_2]<br />',$crstype,$$courseid); |
|
# |
|
# Check if created correctly |
|
# |
|
($$crsudom,$$crsunum)=($$courseid=~/^\/(\w+)\/(\w+)$/); |
|
my $crsuhome=&Apache::lonnet::homeserver($$crsunum,$$crsudom); |
|
$outcome .= &mt('Created on').': '.$crsuhome.'<br>'; |
|
# |
|
# Are we cloning? |
|
# |
|
my $cloneid=''; |
|
if (($args->{'clonecourse'}) && ($args->{'clonedomain'})) { |
|
$cloneid='/'.$args->{'clonedomain'}.'/'.$args->{'clonecourse'}; |
|
my ($clonecrsudom,$clonecrsunum)=($cloneid=~/^\/(\w+)\/(\w+)$/); |
|
my $clonehome=&Apache::lonnet::homeserver($clonecrsunum,$clonecrsudom); |
|
if ($clonehome eq 'no_host') { |
|
$outcome .= |
|
'<br /><font color="red">'.&mt('Attempting to clone non-existing [_1]',$crstype).' '.$cloneid.'</font>'; |
|
} else { |
|
$outcome .= |
|
'<br /><font color="green">'.&mt('Cloning [_1] from [_2]',$crstype,$clonehome).'</font>'; |
|
my %oldcenv=&Apache::lonnet::dump('environment',$$crsudom,$$crsunum); |
|
# Copy all files |
|
&Apache::lonclonecourse::copycoursefiles($cloneid,$$courseid); |
|
# Restore URL |
|
$cenv{'url'}=$oldcenv{'url'}; |
|
# Restore title |
|
$cenv{'description'}=$oldcenv{'description'}; |
|
# restore grading mode |
|
if (defined($oldcenv{'grading'})) { |
|
$cenv{'grading'}=$oldcenv{'grading'}; |
|
} |
|
# Mark as cloned |
|
$cenv{'clonedfrom'}=$cloneid; |
|
delete($cenv{'default_enrollment_start_date'}); |
|
delete($cenv{'default_enrollment_end_date'}); |
|
} |
|
} |
|
# |
|
# Set environment (will override cloned, if existing) |
|
# |
|
my @sections = (); |
|
my @xlists = (); |
|
if ($args->{'crstype'}) { |
|
$cenv{'type'}=$args->{'crstype'}; |
|
} |
|
if ($args->{'crsid'}) { |
|
$cenv{'courseid'}=$args->{'crsid'}; |
|
} |
|
if ($args->{'crscode'}) { |
|
$cenv{'internal.coursecode'}=$args->{'crscode'}; |
|
} |
|
if ($args->{'crsquota'} ne '') { |
|
$cenv{'internal.coursequota'}=$args->{'crsquota'}; |
|
} else { |
|
$cenv{'internal.coursequota'}=$args->{'crsquota'} = 20; |
|
} |
|
if ($args->{'ccuname'}) { |
|
$cenv{'internal.courseowner'} = $args->{'ccuname'}. |
|
':'.$args->{'ccdomain'}; |
|
} else { |
|
$cenv{'internal.courseowner'} = $args->{'curruser'}; |
|
} |
|
|
|
my @badclasses = (); # Used to accumulate sections/crosslistings that did not pass classlist access check for course owner. |
|
if ($args->{'crssections'}) { |
|
$cenv{'internal.sectionnums'} = ''; |
|
if ($args->{'crssections'} =~ m/,/) { |
|
@sections = split/,/,$args->{'crssections'}; |
|
} else { |
|
$sections[0] = $args->{'crssections'}; |
|
} |
|
if (@sections > 0) { |
|
foreach my $item (@sections) { |
|
my ($sec,$gp) = split/:/,$item; |
|
my $class = $args->{'crscode'}.$sec; |
|
my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$class,$cenv{'internal.courseowner'}); |
|
$cenv{'internal.sectionnums'} .= $item.','; |
|
unless ($addcheck eq 'ok') { |
|
push @badclasses, $class; |
|
} |
|
} |
|
$cenv{'internal.sectionnums'} =~ s/,$//; |
|
} |
|
} |
|
# do not hide course coordinator from staff listing, |
|
# even if privileged |
|
$cenv{'nothideprivileged'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; |
|
# add crosslistings |
|
if ($args->{'crsxlist'}) { |
|
$cenv{'internal.crosslistings'}=''; |
|
if ($args->{'crsxlist'} =~ m/,/) { |
|
@xlists = split/,/,$args->{'crsxlist'}; |
|
} else { |
|
$xlists[0] = $args->{'crsxlist'}; |
|
} |
|
if (@xlists > 0) { |
|
foreach my $item (@xlists) { |
|
my ($xl,$gp) = split/:/,$item; |
|
my $addcheck = &Apache::lonnet::auto_new_course($$crsunum,$$crsudom,$xl,$cenv{'internal.courseowner'}); |
|
$cenv{'internal.crosslistings'} .= $item.','; |
|
unless ($addcheck eq 'ok') { |
|
push @badclasses, $xl; |
|
} |
|
} |
|
$cenv{'internal.crosslistings'} =~ s/,$//; |
|
} |
|
} |
|
if ($args->{'autoadds'}) { |
|
$cenv{'internal.autoadds'}=$args->{'autoadds'}; |
|
} |
|
if ($args->{'autodrops'}) { |
|
$cenv{'internal.autodrops'}=$args->{'autodrops'}; |
|
} |
|
# check for notification of enrollment changes |
|
my @notified = (); |
|
if ($args->{'notify_owner'}) { |
|
if ($args->{'ccuname'} ne '') { |
|
push(@notified,$args->{'ccuname'}.':'.$args->{'ccdomain'}); |
|
} |
|
} |
|
if ($args->{'notify_dc'}) { |
|
if ($uname ne '') { |
|
push(@notified,$uname.'@'.$udom); |
|
} |
|
} |
|
if (@notified > 0) { |
|
my $notifylist; |
|
if (@notified > 1) { |
|
$notifylist = join(',',@notified); |
|
} else { |
|
$notifylist = $notified[0]; |
|
} |
|
$cenv{'internal.notifylist'} = $notifylist; |
|
} |
|
if (@badclasses > 0) { |
|
my %lt=&Apache::lonlocal::texthash( |
|
'tclb' => 'The courses listed below were included as sections or crosslistings affiliated with your new LON-CAPA course. However, if automated course roster updates are enabled for this class, these particular sections/crosslistings will not contribute towards enrollment, because the user identified as the course owner for this LON-CAPA course', |
|
'dnhr' => 'does not have rights to access enrollment in these classes', |
|
'adby' => 'as determined by the policies of your institution on access to official classlists' |
|
); |
|
$outcome .= '<font color="red">'.$lt{'tclb'}.' ('.$cenv{'internal.courseowner'}.') - '.$lt{'dnhr'}.' ('.$lt{'adby'}.').<br /><ul>'."\n"; |
|
foreach (@badclasses) { |
|
$outcome .= "<li>$_</li>\n"; |
|
} |
|
$outcome .= "</ul><br /><br /></font>\n"; |
|
} |
|
if ($args->{'no_end_date'}) { |
|
$args->{'endaccess'} = 0; |
|
} |
|
$cenv{'internal.autostart'}=$args->{'enrollstart'}; |
|
$cenv{'internal.autoend'}=$args->{'enrollend'}; |
|
$cenv{'default_enrollment_start_date'}=$args->{'startaccess'}; |
|
$cenv{'default_enrollment_end_date'}=$args->{'endaccess'}; |
|
if ($args->{'showphotos'}) { |
|
$cenv{'internal.showphotos'}=$args->{'showphotos'}; |
|
} |
|
$cenv{'internal.authtype'} = $args->{'authtype'}; |
|
$cenv{'internal.autharg'} = $args->{'autharg'}; |
|
if ( ($cenv{'internal.authtype'} =~ /^krb/) && ($cenv{'internal.autoadds'} == 1)) { |
|
if (! defined($cenv{'internal.autharg'}) || $cenv{'internal.autharg'} eq '') { |
|
$outcome .= '<font color="red" size="+1">'. |
|
&mt('As you did not include the default Kerberos domain to be used for authentication in this class, the institutional data used by the automated enrollment process must include the Kerberos domain for each new student').'</font></p>'; |
|
} |
|
} |
|
if (($args->{'ccdomain'}) && ($args->{'ccuname'})) { |
|
if ($args->{'setpolicy'}) { |
|
$cenv{'policy.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; |
|
} |
|
if ($args->{'setcontent'}) { |
|
$cenv{'question.email'}=$args->{'ccuname'}.':'.$args->{'ccdomain'}; |
|
} |
|
} |
|
if ($args->{'reshome'}) { |
|
$cenv{'reshome'}=$args->{'reshome'}.'/'; |
|
$cenv{'reshome'}=~s/\/+$/\//; |
|
} |
|
# |
|
# course has keyed access |
|
# |
|
if ($args->{'setkeys'}) { |
|
$cenv{'keyaccess'}='yes'; |
|
} |
|
# if specified, key authority is not course, but user |
|
# only active if keyaccess is yes |
|
if ($args->{'keyauth'}) { |
|
$args->{'keyauth'}=~s/[^\w\@]//g; |
|
if ($args->{'keyauth'}) { |
|
$cenv{'keyauth'}=$args->{'keyauth'}; |
|
} |
|
} |
|
|
|
if ($args->{'disresdis'}) { |
|
$cenv{'pch.roles.denied'}='st'; |
|
} |
|
if ($args->{'disablechat'}) { |
|
$cenv{'plc.roles.denied'}='st'; |
|
} |
|
|
|
# Record we've not yet viewed the Course Initialization Helper for this |
|
# course |
|
$cenv{'course.helper.not.run'} = 1; |
|
# |
|
# Use new Randomseed |
|
# |
|
$cenv{'rndseed'}=&Apache::lonnet::latest_rnd_algorithm_id();; |
|
$cenv{'receiptalg'}=&Apache::lonnet::latest_receipt_algorithm_id();; |
|
# |
|
# The encryption code and receipt prefix for this course |
|
# |
|
$cenv{'internal.encseed'}=$Apache::lonnet::perlvar{'lonReceipt'}.$$.time.int(rand(9999)); |
|
$cenv{'internal.encpref'}=100+int(9*rand(99)); |
|
# |
|
# By default, use standard grading |
|
if (!defined($cenv{'grading'})) { $cenv{'grading'} = 'standard'; } |
|
|
|
$outcome .= ('<br />'.&mt('Setting environment').': '. |
|
&Apache::lonnet::put('environment',\%cenv,$$crsudom,$$crsunum).'<br>'); |
|
# |
|
# Open all assignments |
|
# |
|
if ($args->{'openall'}) { |
|
my $storeunder=$$crsudom.'_'.$$crsunum.'.0.opendate'; |
|
my %storecontent = ($storeunder => time, |
|
$storeunder.'.type' => 'date_start'); |
|
|
|
$outcome .= &mt('Opening all assignments').': '.&Apache::lonnet::cput |
|
('resourcedata',\%storecontent,$$crsudom,$$crsunum).'<br>'; |
|
} |
|
# |
|
# Set first page |
|
# |
|
unless (($args->{'nonstandard'}) || ($args->{'firstres'} eq 'blank') |
|
|| ($cloneid)) { |
|
use LONCAPA::map; |
|
$outcome .= &mt('Setting first resource').': '; |
|
|
|
my $map = '/uploaded/'.$$crsudom.'/'.$$crsunum.'/default.sequence'; |
|
my ($errtext,$fatal)=&LONCAPA::map::mapread($map); |
|
|
|
$outcome .= ($fatal?$errtext:'read ok').' - '; |
|
my $title; my $url; |
|
if ($args->{'firstres'} eq 'syl') { |
|
$title='Syllabus'; |
|
$url='/public/'.$$crsudom.'/'.$$crsunum.'/syllabus'; |
|
} else { |
|
$title='Navigate Contents'; |
|
$url='/adm/navmaps'; |
|
} |
|
|
|
$LONCAPA::map::resources[1]=$title.':'.$url.':false:start:res'; |
|
(my $outtext,$errtext) = &LONCAPA::map::storemap($map,1); |
|
|
|
if ($errtext) { $fatal=2; } |
|
$outcome .= ($fatal?$errtext:'write ok').'<br />'; |
|
} |
|
return $outcome; |
|
} |
|
|
|
############################################################ |
|
############################################################ |
|
|
sub course_type { |
sub course_type { |
my ($cid) = @_; |
my ($cid) = @_; |
if (!defined($cid)) { |
if (!defined($cid)) { |
Line 5635 sub lonhttpdurl {
|
Line 5950 sub lonhttpdurl {
|
return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url; |
return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url; |
} |
} |
|
|
|
sub absolute_url { |
|
my ($host_name) = @_; |
|
my $protocol = ($ENV{'SERVER_PORT'} == 443?'https://':'http://'); |
|
if ($host_name eq '') { |
|
$host_name = $ENV{'SERVER_NAME'}; |
|
} |
|
return $protocol.$host_name; |
|
} |
|
|
sub connection_aborted { |
sub connection_aborted { |
my ($r)=@_; |
my ($r)=@_; |
$r->print(" ");$r->rflush(); |
$r->print(" ");$r->rflush(); |