version 1.48, 2009/11/09 03:50:27
|
version 1.50, 2010/03/08 22:31:27
|
Line 49 sub get_dc_settable {
|
Line 49 sub get_dc_settable {
|
|
|
sub autoenroll_keys { |
sub autoenroll_keys { |
my $internals = ['coursecode','courseowner','authtype','autharg','autoadds','autodrops', |
my $internals = ['coursecode','courseowner','authtype','autharg','autoadds','autodrops', |
'autostart','autoend','sectionnums','crosslistings']; |
'autostart','autoend','sectionnums','crosslistings', |
|
'co-owners']; |
my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date']; |
my $accessdates = ['default_enrollment_start_date','default_enrollment_end_date']; |
return ($internals,$accessdates); |
return ($internals,$accessdates); |
} |
} |
|
|
sub catalog_settable { |
sub catalog_settable { |
my ($confhash) = @_; |
my ($confhash,$type) = @_; |
my @settable; |
my @settable; |
if (ref($confhash) eq 'HASH') { |
if (ref($confhash) eq 'HASH') { |
if ($confhash->{'togglecats'} ne 'crs') { |
if ($type eq 'Community') { |
push(@settable,'togglecats'); |
if ($confhash->{'togglecatscomm'} ne 'comm') { |
} |
push(@settable,'togglecats'); |
if ($confhash->{'categorize'} ne 'crs') { |
} |
push(@settable,'categorize'); |
if ($confhash->{'categorizecomm'} ne 'comm') { |
|
push(@settable,'categorize'); |
|
} |
|
} else { |
|
if ($confhash->{'togglecats'} ne 'crs') { |
|
push(@settable,'togglecats'); |
|
} |
|
if ($confhash->{'categorize'} ne 'crs') { |
|
push(@settable,'categorize'); |
|
} |
} |
} |
} else { |
} else { |
push(@settable,('togglecats','categorize')); |
push(@settable,('togglecats','categorize')); |
Line 97 sub get_enrollment_settings {
|
Line 107 sub get_enrollment_settings {
|
} else { |
} else { |
$enrollvar{$type} = &Apache::lonlocal::locallocaltime($settings{$item}); |
$enrollvar{$type} = &Apache::lonlocal::locallocaltime($settings{$item}); |
} |
} |
} elsif ($type eq "sectionnums") { |
} elsif (($type eq 'sectionnums') || ($type eq 'co-owners')) { |
$enrollvar{$type} = $settings{$item}; |
$enrollvar{$type} = $settings{$item}; |
$enrollvar{$type} =~ s/,/, /g; |
$enrollvar{$type} =~ s/,/, /g; |
} elsif ($type eq "authtype" |
} elsif ($type eq "authtype" |
Line 224 sub print_modification_menu {
|
Line 234 sub print_modification_menu {
|
} |
} |
); |
); |
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom); |
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$dom); |
my @additional_params = &catalog_settable($domconf{'coursecategories'}); |
my @additional_params = &catalog_settable($domconf{'coursecategories'},$type); |
if (@additional_params > 0) { |
if (@additional_params > 0) { |
push (@menu, { text => $cat_text, |
push (@menu, { text => $cat_text, |
phase => 'catsettings', |
phase => 'catsettings', |
Line 326 sub print_settings_display {
|
Line 336 sub print_settings_display {
|
"<td><b>$longtype{$item}</b></td>\n". |
"<td><b>$longtype{$item}</b></td>\n". |
"<td>$enrollvar{$item}</td>\n"; |
"<td>$enrollvar{$item}</td>\n"; |
if (grep(/^\Q$item\E$/,@modifiable_params)) { |
if (grep(/^\Q$item\E$/,@modifiable_params)) { |
$disp_table .= '<td align="right">'.&mt('Yes').'</td>'."\n"; |
$disp_table .= '<td align="right">'.&mt('Yes').'</td>'."\n"; |
} else { |
} else { |
$disp_table .= '<td align="right">'.&mt('No').'</td>'."\n"; |
$disp_table .= '<td align="right">'.&mt('No').'</td>'."\n"; |
} |
} |
Line 399 sub print_catsettings {
|
Line 409 sub print_catsettings {
|
$lt{'catset'} = &mt('Catalog Settings for Community'); |
$lt{'catset'} = &mt('Catalog Settings for Community'); |
$lt{'exclude'} = &mt('Exclude from course catalog'); |
$lt{'exclude'} = &mt('Exclude from course catalog'); |
$lt{'categ'} = &mt('Categorize Community'); |
$lt{'categ'} = &mt('Categorize Community'); |
$lt{'assi'} = &mt('Assign one or more categories and/or subcategories to this community.'); |
$lt{'assi'} = &mt('Assign one or more subcategories to this community.'); |
} |
} |
$r->print('<form action="/adm/modifycourse" method="post" name="catsettings">'. |
$r->print('<form action="/adm/modifycourse" method="post" name="catsettings">'. |
'<h3>'.$lt{'catset'}.' <span class="LC_nobreak">'.$cdesc.'</span></h3>'); |
'<h3>'.$lt{'catset'}.' <span class="LC_nobreak">'.$cdesc.'</span></h3>'); |
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); |
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); |
my @cat_params = &catalog_settable($domconf{'coursecategories'}); |
my @cat_params = &catalog_settable($domconf{'coursecategories'},$type); |
if (@cat_params > 0) { |
if (@cat_params > 0) { |
my %currsettings = |
my %currsettings = |
&Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum); |
&Apache::lonnet::get('environment',['hidefromcat','categories'],$cdom,$cnum); |
Line 434 sub print_catsettings {
|
Line 444 sub print_catsettings {
|
if (ref($cathash) eq 'HASH') { |
if (ref($cathash) eq 'HASH') { |
$r->print($lt{'assi'}.'<br /><br />'. |
$r->print($lt{'assi'}.'<br /><br />'. |
&Apache::loncommon::assign_categories_table($cathash, |
&Apache::loncommon::assign_categories_table($cathash, |
$currsettings{'categories'})); |
$currsettings{'categories'},$type)); |
} else { |
} else { |
$r->print(&mt('No categories defined for this domain')); |
$r->print(&mt('No categories defined for this domain')); |
} |
} |
Line 626 sub gather_authenitems {
|
Line 636 sub gather_authenitems {
|
sub modify_course { |
sub modify_course { |
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; |
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; |
my %longtype = &course_settings_descrip($type); |
my %longtype = &course_settings_descrip($type); |
my @items = ('internal.courseowner','description'); |
my @items = ('internal.courseowner','description','internal.co-owners', |
|
'internal.pendingco-owners'); |
unless ($type eq 'Community') { |
unless ($type eq 'Community') { |
push(@items,('internal.coursecode','internal.authtype','internal.autharg', |
push(@items,('internal.coursecode','internal.authtype','internal.autharg', |
'internal.sectionnums','internal.crosslistings')); |
'internal.sectionnums','internal.crosslistings')); |
Line 702 sub modify_course {
|
Line 713 sub modify_course {
|
} |
} |
} |
} |
|
|
if ($changed{'owner'} || $changed{'code'}) { |
if ($changed{'owner'} || $changed{'code'}) { |
my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum, |
my %crsinfo = &Apache::lonnet::courseiddump($cdom,'.',1,'.','.',$cnum, |
undef,undef,'.'); |
undef,undef,'.'); |
if (ref($crsinfo{$env{'form.pickedcourse'}}) eq 'HASH') { |
if (ref($crsinfo{$env{'form.pickedcourse'}}) eq 'HASH') { |
Line 714 sub modify_course {
|
Line 725 sub modify_course {
|
} |
} |
my $chome = &Apache::lonnet::homeserver($cnum,$cdom); |
my $chome = &Apache::lonnet::homeserver($cnum,$cdom); |
my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime'); |
my $putres = &Apache::lonnet::courseidput($cdom,\%crsinfo,$chome,'notime'); |
|
if ($putres eq 'ok') { |
|
&update_coowners($cdom,$cnum,$chome,\%settings,\%newattr); |
|
} |
} |
} |
} |
} |
foreach my $param (@modifiable_params) { |
foreach my $param (@modifiable_params) { |
Line 852 sub modify_course {
|
Line 866 sub modify_course {
|
return; |
return; |
} |
} |
|
|
|
sub update_coowners { |
|
my ($cdom,$cnum,$chome,$settings,$newattr) = @_; |
|
return unless ((ref($settings) eq 'HASH') && (ref($newattr) eq 'HASH')); |
|
my %designhash = &Apache::loncommon::get_domainconf($cdom); |
|
my (%cchash,$autocoowners); |
|
if ($designhash{$cdom.'.autoassign.co-owners'}) { |
|
$autocoowners = 1; |
|
%cchash = &Apache::lonnet::get_my_roles($cnum,$cdom,undef,undef,['cc']); |
|
} |
|
if ($settings->{'internal.courseowner'} ne $newattr->{'courseowner'}) { |
|
my $oldowner_to_coowner; |
|
if (($newattr->{'coursecode'}) && ($autocoowners)) { |
|
my $oldowner = $settings->{'internal.courseowner'}; |
|
if ($cchash{$oldowner.':cc'}) { |
|
if ($settings->{'internal.co-owner'}) { |
|
my @current = split(',',$settings->{'internal.co-owners'}); |
|
unless (grep(/^\Q$oldowner\E$/,@current)) { |
|
$oldowner_to_coowner = 1; |
|
} |
|
} else { |
|
$oldowner_to_coowner = 1; |
|
} |
|
} |
|
} |
|
foreach my $type ('co-owners','pendingco-owners') { |
|
if ($settings->{'internal.'.$type}) { |
|
my @current = split(',',$settings->{'internal.'.$type}); |
|
my $newowner = $newattr->{'courseowner'}; |
|
my @newvalues = (); |
|
if (($newowner ne '') && (grep(/^\Q$newowner\E$/,@current))) { |
|
foreach my $person (@current) { |
|
unless ($person eq $newowner) { |
|
push(@newvalues,$person); |
|
} |
|
} |
|
} else { |
|
@newvalues = @current; |
|
} |
|
if ($oldowner_to_coowner) { |
|
push(@newvalues,$settings->{'internal.courseowner'}); |
|
@newvalues = sort(@newvalues); |
|
} |
|
my $newownstr = join(',',@newvalues); |
|
if ($newownstr ne $settings->{'internal.'.$type}) { |
|
if ($type eq 'co-owners') { |
|
my $deleted = ''; |
|
unless (@newvalues) { |
|
$deleted = 1; |
|
} |
|
&Apache::lonnet::store_coowners($cdom,$cnum,$chome, |
|
$deleted,@newvalues); |
|
} else { |
|
my $pendingcoowners; |
|
my $cid = $cdom.'_'.$cnum; |
|
if (@newvalues) { |
|
$pendingcoowners = join(',',@newvalues); |
|
my %pendinghash = ( |
|
'internal.pendingco-owners' => $pendingcoowners, |
|
); |
|
my $putresult = &put('environment',\%pendinghash,$cdom,$cnum); |
|
if ($putresult eq 'ok') { |
|
if ($env{'course.'.$cid.'.num'} eq $cnum) { |
|
&appenv({'course.'.$cid.'.internal.pendingco-owners' => $pendingcoowners}); |
|
} |
|
} |
|
} else { |
|
my $delresult = &Apache::lonnet::del('environment',['internal.pendingco-owners'],$cdom,$cnum); |
|
if ($delresult eq 'ok') { |
|
if ($env{'course.'.$cid.'.internal.pendingco-owners'}) { |
|
&Apache::lonnet::delenv('course.'.$cid.'.internal.pendingco-owners'); |
|
} |
|
} |
|
} |
|
} |
|
} elsif ($oldowner_to_coowner) { |
|
&Apache::lonnet::store_coowners($cdom,$cnum,$chome,'', |
|
$settings->{'internal.courseowner'}); |
|
|
|
} |
|
} elsif ($oldowner_to_coowner) { |
|
&Apache::lonnet::store_coowners($cdom,$cnum,$chome,'', |
|
$settings->{'internal.courseowner'}); |
|
} |
|
} |
|
} |
|
if ($settings->{'internal.coursecode'} ne $newattr->{'coursecode'}) { |
|
if ($newattr->{'coursecode'} ne '') { |
|
my %designhash = &Apache::loncommon::get_domainconf($cdom); |
|
if ($designhash{$cdom.'.autoassign.co-owners'}) { |
|
my @newcoowners = (); |
|
if ($settings->{'internal.co-owners'}) { |
|
my @currcoown = split(',',$settings->{'internal.coowners'}); |
|
my ($updatecoowners,$delcoowners); |
|
foreach my $person (@currcoown) { |
|
my ($result,$desc) = &Apache::lonnet::valid_instcode(); |
|
if ($result eq 'valid') { |
|
push(@newcoowners,$person); |
|
} |
|
} |
|
foreach my $item (sort(keys(%cchash))) { |
|
my ($uname,$udom,$urole) = split(':',$item); |
|
unless (grep(/^\Q$uname\E:\Q$udom\E$/,@newcoowners)) { |
|
push(@newcoowners,$uname.':'.$udom); |
|
} |
|
} |
|
if (@newcoowners) { |
|
my $coowners = join(',',sort(@newcoowners)); |
|
unless ($coowners eq $settings->{'internal.co-owners'}) { |
|
$updatecoowners = 1; |
|
} |
|
} else { |
|
$delcoowners = 1; |
|
} |
|
if ($updatecoowners || $delcoowners) { |
|
&Apache::lonnet::store_coowners($cdom,$cnum,$chome, |
|
$delcoowners,@newcoowners); |
|
} |
|
} else { |
|
foreach my $item (sort(keys(%cchash))) { |
|
my ($uname,$udom,$urole) = split(':',$item); |
|
push(@newcoowners,$uname.':'.$udom); |
|
} |
|
if (@newcoowners) { |
|
&Apache::lonnet::store_coowners($cdom,$cnum,$chome,'', |
|
@newcoowners); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
return; |
|
} |
|
|
sub modify_quota { |
sub modify_quota { |
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; |
my ($r,$cdom,$cnum,$cdesc,$domdesc,$type) = @_; |
&print_header($r,$type); |
&print_header($r,$type); |
Line 933 sub modify_catsettings {
|
Line 1080 sub modify_catsettings {
|
<form action="/adm/modifycourse" method="post" name="processcat"> |
<form action="/adm/modifycourse" method="post" name="processcat"> |
<h3>'.&mt('Category settings').'</h3>'); |
<h3>'.&mt('Category settings').'</h3>'); |
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); |
my %domconf = &Apache::lonnet::get_dom('configuration',['coursecategories'],$cdom); |
my @cat_params = &catalog_settable($domconf{'coursecategories'}); |
my @cat_params = &catalog_settable($domconf{'coursecategories'},$type); |
if (@cat_params > 0) { |
if (@cat_params > 0) { |
my (%cenv,@changes,@nochanges); |
my (%cenv,@changes,@nochanges); |
my %currsettings = |
my %currsettings = |
Line 1159 sub course_settings_descrip {
|
Line 1306 sub course_settings_descrip {
|
if ($type eq 'Community') { |
if ($type eq 'Community') { |
%longtype = &Apache::lonlocal::texthash( |
%longtype = &Apache::lonlocal::texthash( |
'courseowner' => "Username:domain of community owner", |
'courseowner' => "Username:domain of community owner", |
|
'co-owners' => "Username:domain of each co-owner", |
); |
); |
|
|
} else { |
} else { |
%longtype = &Apache::lonlocal::texthash( |
%longtype = &Apache::lonlocal::texthash( |
'authtype' => 'Default authentication method', |
'authtype' => 'Default authentication method', |
Line 1173 sub course_settings_descrip {
|
Line 1320 sub course_settings_descrip {
|
'default_enrollment_end_date' => 'Date of last student access', |
'default_enrollment_end_date' => 'Date of last student access', |
'coursecode' => 'Official course code', |
'coursecode' => 'Official course code', |
'courseowner' => "Username:domain of course owner", |
'courseowner' => "Username:domain of course owner", |
|
'co-owners' => "Username:domain of each co-owner", |
'notifylist' => 'Course Coordinators to be notified of enrollment changes', |
'notifylist' => 'Course Coordinators to be notified of enrollment changes', |
'sectionnums' => 'Course section number:LON-CAPA section', |
'sectionnums' => 'Course section number:LON-CAPA section', |
'crosslistings' => 'Crosslisted class:LON-CAPA section', |
'crosslistings' => 'Crosslisted class:LON-CAPA section', |