version 1.128, 2010/03/03 16:43:41
|
version 1.134, 2010/04/14 04:27:20
|
Line 236 sub handler {
|
Line 236 sub handler {
|
col2 => 'Value'}], |
col2 => 'Value'}], |
}, |
}, |
'quotas' => |
'quotas' => |
{ text => 'User blogs, personal information pages and portfolios', |
{ text => 'User blogs, personal information pages, portfolios', |
help => 'Domain_Configuration_Quotas', |
help => 'Domain_Configuration_Quotas', |
header => [{col1 => 'User affiliation', |
header => [{col1 => 'User affiliation', |
col2 => 'Available tools', |
col2 => 'Available tools', |
Line 253 sub handler {
|
Line 253 sub handler {
|
help => 'Domain_Configuration_Auto_Updates', |
help => 'Domain_Configuration_Auto_Updates', |
header => [{col1 => 'Setting', |
header => [{col1 => 'Setting', |
col2 => 'Value',}, |
col2 => 'Value',}, |
|
{col1 => 'Setting', |
|
col2 => 'Affiliation'}, |
{col1 => 'User population', |
{col1 => 'User population', |
col2 => 'Updataeable user data'}], |
col2 => 'Updateable user data'}], |
}, |
}, |
'autocreate' => |
'autocreate' => |
{ text => 'Auto-course creation settings', |
{ text => 'Auto-course creation settings', |
Line 362 sub handler {
|
Line 364 sub handler {
|
my @actions = &Apache::loncommon::get_env_multiple('form.actions'); |
my @actions = &Apache::loncommon::get_env_multiple('form.actions'); |
&Apache::lonhtmlcommon::add_breadcrumb |
&Apache::lonhtmlcommon::add_breadcrumb |
({href=>"javascript:changePage(document.$phase,'pickactions')", |
({href=>"javascript:changePage(document.$phase,'pickactions')", |
text=>"Pick functionality"}); |
text=>"Settings to display/modify"}); |
my $confname = $dom.'-domainconfig'; |
my $confname = $dom.'-domainconfig'; |
if ($phase eq 'process') { |
if ($phase eq 'process') { |
&Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles); |
&Apache::lonconfigsettings::make_changes($r,$dom,$phase,$context,\@prefs_order,\%prefs,\%domconfig,$confname,\@roles); |
Line 518 sub print_config_box {
|
Line 520 sub print_config_box {
|
</tr>'; |
</tr>'; |
$rowtotal ++; |
$rowtotal ++; |
if ($action eq 'autoupdate') { |
if ($action eq 'autoupdate') { |
$output .= &print_autoupdate('bottom',$dom,$settings,\$rowtotal); |
$output .= &print_autoupdate('middle',$dom,$settings,\$rowtotal).' |
|
</table> |
|
</td> |
|
</tr> |
|
<tr> |
|
<td> |
|
<table class="LC_nested"> |
|
<tr class="LC_info_row"> |
|
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
|
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'. |
|
&print_autoupdate('bottom',$dom,$settings,\$rowtotal); |
|
$rowtotal ++; |
} elsif ($action eq 'usercreation') { |
} elsif ($action eq 'usercreation') { |
$output .= &print_usercreation('middle',$dom,$settings,\$rowtotal).' |
$output .= &print_usercreation('middle',$dom,$settings,\$rowtotal).' |
</table> |
</table> |
Line 543 sub print_config_box {
|
Line 556 sub print_config_box {
|
<tr class="LC_info_row"> |
<tr class="LC_info_row"> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
<td class="LC_left_item"'.$colspan.'>'.&mt($item->{'header'}->[2]->{'col1'}).'</td> |
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'. |
<td class="LC_right_item">'.&mt($item->{'header'}->[2]->{'col2'}).'</td> </tr>'. |
|
|
&print_usermodification('bottom',$dom,$settings,\$rowtotal); |
&print_usermodification('bottom',$dom,$settings,\$rowtotal); |
$rowtotal ++; |
$rowtotal ++; |
} elsif ($action eq 'coursecategories') { |
} elsif ($action eq 'coursecategories') { |
Line 658 sub print_login {
|
Line 670 sub print_login {
|
my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($position,$dom,$confname,$phase,$settings,$rowtotal) = @_; |
my ($css_class,$datatable); |
my ($css_class,$datatable); |
my %choices = &login_choices(); |
my %choices = &login_choices(); |
my $itemcount = 1; |
|
|
|
if ($position eq 'top') { |
if ($position eq 'top') { |
my %servers = &dom_servers($dom); |
my %servers = &dom_servers($dom); |
Line 977 sub display_color_options {
|
Line 988 sub display_color_options {
|
my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, |
my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs, |
$images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_; |
$images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_; |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $css_class = $itemcount%2?' class="LC_odd_row"':''; |
my $datatable = '<tr>'. |
my $datatable = '<tr'.$css_class.'>'. |
'<td>'.$choices->{'font'}.'</td>'; |
'<td>'.$choices->{'font'}.'</td>'; |
if (!$is_custom->{'font'}) { |
if (!$is_custom->{'font'}) { |
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>'; |
$datatable .= '<td>'.&mt('Default in use:').' <span id="css_default_'.$role.'_font" style="color: '.$defaults->{'font'}.';">'.$defaults->{'font'}.'</span></td>'; |
Line 1692 sub print_courserequestmail {
|
Line 1703 sub print_courserequestmail {
|
sub print_autoenroll { |
sub print_autoenroll { |
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my ($defdom,$runon,$runoff); |
my ($defdom,$runon,$runoff,$coownerson,$coownersoff); |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
if (exists($settings->{'run'})) { |
if (exists($settings->{'run'})) { |
if ($settings->{'run'} eq '0') { |
if ($settings->{'run'} eq '0') { |
Line 1711 sub print_autoenroll {
|
Line 1722 sub print_autoenroll {
|
$runon = ' '; |
$runon = ' '; |
} |
} |
} |
} |
|
if (exists($settings->{'co-owners'})) { |
|
if ($settings->{'co-owners'} eq '0') { |
|
$coownersoff = ' checked="checked" '; |
|
$coownerson = ' '; |
|
} else { |
|
$coownerson = ' checked="checked" '; |
|
$coownersoff = ' '; |
|
} |
|
} else { |
|
$coownersoff = ' checked="checked" '; |
|
$coownerson = ' '; |
|
} |
if (exists($settings->{'sender_domain'})) { |
if (exists($settings->{'sender_domain'})) { |
$defdom = $settings->{'sender_domain'}; |
$defdom = $settings->{'sender_domain'}; |
} |
} |
Line 1741 sub print_autoenroll {
|
Line 1764 sub print_autoenroll {
|
&mt('username').': '. |
&mt('username').': '. |
'<input type="text" name="sender_uname" value="'. |
'<input type="text" name="sender_uname" value="'. |
$notif_sender.'" size="10" /> '.&mt('domain'). |
$notif_sender.'" size="10" /> '.&mt('domain'). |
': '.$domform.'</span></td></tr>'; |
': '.$domform.'</span></td></tr>'. |
$$rowtotal += 2; |
'<tr class="LC_odd_row">'. |
|
'<td>'.&mt('Automatically assign co-ownership').'</td>'. |
|
'<td class="LC_right_item"><span class="LC_nobreak"><label>'. |
|
'<input type="radio" name="autoassign_coowners"'. |
|
$coownerson.' value="1" />'.&mt('Yes').'</label> '. |
|
'<label><input type="radio" name="autoassign_coowners"'. |
|
$coownersoff.' value="0" />'.&mt('No').'</label></span></td>'. |
|
'</tr>'; |
|
$$rowtotal += 3; |
return $datatable; |
return $datatable; |
} |
} |
|
|
Line 1784 sub print_autoupdate {
|
Line 1815 sub print_autoupdate {
|
$classlistsoff.'value="0" />'.&mt('No').'</label></span></td>'. |
$classlistsoff.'value="0" />'.&mt('No').'</label></span></td>'. |
'</tr>'; |
'</tr>'; |
$$rowtotal += 2; |
$$rowtotal += 2; |
|
} elsif ($position eq 'middle') { |
|
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
|
my $numinrow = 3; |
|
my $locknamesettings; |
|
$datatable .= &insttypes_row($settings,$types,$usertypes, |
|
$dom,$numinrow,$othertitle, |
|
'lockablenames'); |
|
$$rowtotal ++; |
} else { |
} else { |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom); |
my @fields = ('lastname','firstname','middlename','gen', |
my @fields = ('lastname','firstname','middlename','generation', |
'permanentemail','id'); |
'permanentemail','id'); |
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
my %fieldtitles = &Apache::loncommon::personal_data_fieldtitles(); |
my $numrows = 0; |
my $numrows = 0; |
Line 1975 sub print_contacts {
|
Line 2014 sub print_contacts {
|
my ($dom,$settings,$rowtotal) = @_; |
my ($dom,$settings,$rowtotal) = @_; |
my $datatable; |
my $datatable; |
my @contacts = ('adminemail','supportemail'); |
my @contacts = ('adminemail','supportemail'); |
my (%checked,%to,%otheremails); |
my (%checked,%to,%otheremails,%bccemails); |
my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail', |
my @mailings = ('errormail','packagesmail','lonstatusmail','helpdeskmail', |
'requestsmail'); |
'requestsmail'); |
foreach my $type (@mailings) { |
foreach my $type (@mailings) { |
$otheremails{$type} = ''; |
$otheremails{$type} = ''; |
} |
} |
|
$bccemails{'helpdeskmail'} = ''; |
if (ref($settings) eq 'HASH') { |
if (ref($settings) eq 'HASH') { |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
if (exists($settings->{$item})) { |
if (exists($settings->{$item})) { |
Line 1996 sub print_contacts {
|
Line 2036 sub print_contacts {
|
} |
} |
} |
} |
$otheremails{$type} = $settings->{$type}{'others'}; |
$otheremails{$type} = $settings->{$type}{'others'}; |
|
if ($type eq 'helpdeskmail') { |
|
$bccemails{$type} = $settings->{$type}{'bcc'}; |
|
} |
} |
} |
} elsif ($type eq 'lonstatusmail') { |
} elsif ($type eq 'lonstatusmail') { |
$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; |
$checked{'lonstatusmail'}{'adminemail'} = ' checked="checked" '; |
Line 2039 sub print_contacts {
|
Line 2082 sub print_contacts {
|
} |
} |
$datatable .= '</span><br />'.&mt('Others').': '. |
$datatable .= '</span><br />'.&mt('Others').': '. |
'<input type="text" name="'.$type.'_others" '. |
'<input type="text" name="'.$type.'_others" '. |
'value="'.$otheremails{$type}.'" />'. |
'value="'.$otheremails{$type}.'" />'; |
'</td></tr>'."\n"; |
if ($type eq 'helpdeskmail') { |
|
$datatable .= '<br />'.&mt('Bcc').':'.(' 'x6). |
|
'<input type="text" name="'.$type.'_bcc" '. |
|
'value="'.$bccemails{$type}.'" />'; |
|
} |
|
$datatable .= '</td></tr>'."\n"; |
} |
} |
$$rowtotal += $rownum; |
$$rowtotal += $rownum; |
return $datatable; |
return $datatable; |
Line 2742 sub print_scantronformat {
|
Line 2790 sub print_scantronformat {
|
'<span class="LC_nobreak">'; |
'<span class="LC_nobreak">'; |
if ($scantronurl) { |
if ($scantronurl) { |
$datatable .= '<a href="'.$scantronurl.'" target="_blank">'. |
$datatable .= '<a href="'.$scantronurl.'" target="_blank">'. |
&mt('Default scantron format file').'</a>'; |
&mt('Default bubblesheet format file').'</a>'; |
} else { |
} else { |
$datatable = &mt('File unavailable for display'); |
$datatable = &mt('File unavailable for display'); |
} |
} |
Line 2769 sub print_scantronformat {
|
Line 2817 sub print_scantronformat {
|
} elsif ($scantronurl) { |
} elsif ($scantronurl) { |
$datatable .= '<td><span class="LC_nobreak">'. |
$datatable .= '<td><span class="LC_nobreak">'. |
'<a href="'.$scantronurl.'" target="_blank">'. |
'<a href="'.$scantronurl.'" target="_blank">'. |
&mt('Custom scantron format file').'</a><label>'. |
&mt('Custom bubblesheet format file').'</a><label>'. |
'<input type="checkbox" name="scantronformat_del"'. |
'<input type="checkbox" name="scantronformat_del"'. |
'" value="1" />'.&mt('Delete?').'</label></span></td>'. |
'" value="1" />'.&mt('Delete?').'</label></span></td>'. |
'<td><span class="LC_nobreak"> '. |
'<td><span class="LC_nobreak"> '. |
Line 2798 sub legacy_scantronformat {
|
Line 2846 sub legacy_scantronformat {
|
&publishlogo($r,'copy',$legacyfile,$dom,$confname,'scantron', |
&publishlogo($r,'copy',$legacyfile,$dom,$confname,'scantron', |
'','',$newfile); |
'','',$newfile); |
if ($result ne 'ok') { |
if ($result ne 'ok') { |
$error = &mt("An error occurred publishing the [_1] scantron format file in RES space. Error was: [_2].",$newfile,$result); |
$error = &mt("An error occurred publishing the [_1] bubblesheet format file in RES space. Error was: [_2].",$newfile,$result); |
} |
} |
} |
} |
return ($url,$error); |
return ($url,$error); |
Line 3378 sub insttypes_row {
|
Line 3426 sub insttypes_row {
|
my %lt = &Apache::lonlocal::texthash ( |
my %lt = &Apache::lonlocal::texthash ( |
cansearch => 'Users allowed to search', |
cansearch => 'Users allowed to search', |
statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)', |
statustocreate => 'Institutional affiliation(s) able to create own account (login/SSO)', |
|
lockablenames => 'User preference to lock name', |
); |
); |
my $showdom; |
my $showdom; |
if ($context eq 'cansearch') { |
if ($context eq 'cansearch') { |
Line 3414 sub insttypes_row {
|
Line 3463 sub insttypes_row {
|
$usertypes->{$types->[$i]}.'</label></span></td>'; |
$usertypes->{$types->[$i]}.'</label></span></td>'; |
} |
} |
} |
} |
|
|
$rem = @{$types}%($numinrow); |
$rem = @{$types}%($numinrow); |
} |
} |
my $colsleft = $numinrow - $rem; |
my $colsleft = $numinrow - $rem; |
|
if (($rem == 0) && (@{$types} > 0)) { |
|
$output .= '<tr>'; |
|
} |
if ($colsleft > 1) { |
if ($colsleft > 1) { |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
$output .= '<td colspan="'.$colsleft.'" class="LC_left_item">'; |
} else { |
} else { |
Line 4635 sub modify_autoenroll {
|
Line 4686 sub modify_autoenroll {
|
} |
} |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my $autorun = &Apache::lonnet::auto_run(undef,$dom), |
my %title = ( run => 'Auto-enrollment active', |
my %title = ( run => 'Auto-enrollment active', |
sender => 'Sender for notification messages'); |
sender => 'Sender for notification messages', |
|
coowners => 'Automatic assignment of co-ownership to instructors of record (institutional data)'); |
my @offon = ('off','on'); |
my @offon = ('off','on'); |
my $sender_uname = $env{'form.sender_uname'}; |
my $sender_uname = $env{'form.sender_uname'}; |
my $sender_domain = $env{'form.sender_domain'}; |
my $sender_domain = $env{'form.sender_domain'}; |
Line 4644 sub modify_autoenroll {
|
Line 4696 sub modify_autoenroll {
|
} elsif ($sender_uname eq '') { |
} elsif ($sender_uname eq '') { |
$sender_domain = ''; |
$sender_domain = ''; |
} |
} |
|
my $coowners = $env{'form.autoassign_coowners'}; |
my %autoenrollhash = ( |
my %autoenrollhash = ( |
autoenroll => { run => $env{'form.autoenroll_run'}, |
autoenroll => { 'run' => $env{'form.autoenroll_run'}, |
sender_uname => $sender_uname, |
'sender_uname' => $sender_uname, |
sender_domain => $sender_domain, |
'sender_domain' => $sender_domain, |
|
'co-owners' => $coowners, |
} |
} |
); |
); |
my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%autoenrollhash, |
Line 4669 sub modify_autoenroll {
|
Line 4722 sub modify_autoenroll {
|
if ($currautoenroll{'sender_domain'} ne $sender_domain) { |
if ($currautoenroll{'sender_domain'} ne $sender_domain) { |
$changes{'sender'} = 1; |
$changes{'sender'} = 1; |
} |
} |
|
if ($currautoenroll{'co-owners'} ne '') { |
|
if ($currautoenroll{'co-owners'} ne $coowners) { |
|
$changes{'coowners'} = 1; |
|
} |
|
} elsif ($coowners) { |
|
$changes{'coowners'} = 1; |
|
} |
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
if ($changes{'run'}) { |
if ($changes{'run'}) { |
Line 4681 sub modify_autoenroll {
|
Line 4741 sub modify_autoenroll {
|
$resulttext .= '<li>'.&mt("$title{'sender'} set to [_1]",$sender_uname.':'.$sender_domain).'</li>'; |
$resulttext .= '<li>'.&mt("$title{'sender'} set to [_1]",$sender_uname.':'.$sender_domain).'</li>'; |
} |
} |
} |
} |
|
if ($changes{'coowners'}) { |
|
$resulttext .= '<li>'.&mt("$title{'coowners'} set to $offon[$env{'form.autoassign_coowners'}]").'</li>'; |
|
&Apache::loncommon::devalidate_domconfig_cache($dom); |
|
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('No changes made to auto-enrollment settings'); |
$resulttext = &mt('No changes made to auto-enrollment settings'); |
Line 4712 sub modify_autoupdate {
|
Line 4776 sub modify_autoupdate {
|
lastname => 'Last Name', |
lastname => 'Last Name', |
firstname => 'First Name', |
firstname => 'First Name', |
middlename => 'Middle Name', |
middlename => 'Middle Name', |
gen => 'Generation', |
generation => 'Generation', |
); |
); |
my $othertitle = &mt('All users'); |
my $othertitle = &mt('All users'); |
if (keys(%{$usertypes}) > 0) { |
if (keys(%{$usertypes}) > 0) { |
Line 4720 sub modify_autoupdate {
|
Line 4784 sub modify_autoupdate {
|
} |
} |
foreach my $key (keys(%env)) { |
foreach my $key (keys(%env)) { |
if ($key =~ /^form\.updateable_(.+)_([^_]+)$/) { |
if ($key =~ /^form\.updateable_(.+)_([^_]+)$/) { |
push(@{$fields{$1}},$2); |
my ($usertype,$item) = ($1,$2); |
|
if (grep(/^\Q$item\E$/,keys(%fieldtitles))) { |
|
if ($usertype eq 'default') { |
|
push(@{$fields{$1}},$2); |
|
} elsif (ref($types) eq 'ARRAY') { |
|
if (grep(/^\Q$usertype\E$/,@{$types})) { |
|
push(@{$fields{$1}},$2); |
|
} |
|
} |
|
} |
|
} |
|
} |
|
my @lockablenames = &Apache::loncommon::get_env_multiple('form.lockablenames'); |
|
@lockablenames = sort(@lockablenames); |
|
if (ref($currautoupdate{'lockablenames'}) eq 'ARRAY') { |
|
my @changed = &Apache::loncommon::compare_arrays($currautoupdate{'lockablenames'},\@lockablenames); |
|
if (@changed) { |
|
$changes{'lockablenames'} = 1; |
|
} |
|
} else { |
|
if (@lockablenames) { |
|
$changes{'lockablenames'} = 1; |
} |
} |
} |
} |
my %updatehash = ( |
my %updatehash = ( |
autoupdate => { run => $env{'form.autoupdate_run'}, |
autoupdate => { run => $env{'form.autoupdate_run'}, |
classlists => $env{'form.classlists'}, |
classlists => $env{'form.classlists'}, |
fields => {%fields}, |
fields => {%fields}, |
|
lockablenames => \@lockablenames, |
} |
} |
); |
); |
foreach my $key (keys(%currautoupdate)) { |
foreach my $key (keys(%currautoupdate)) { |
Line 4744 sub modify_autoupdate {
|
Line 4830 sub modify_autoupdate {
|
foreach my $type (@{$currautoupdate{$key}{$item}}) { |
foreach my $type (@{$currautoupdate{$key}{$item}}) { |
if (!exists($fields{$item})) { |
if (!exists($fields{$item})) { |
$change = 1; |
$change = 1; |
|
last; |
} elsif (ref($fields{$item}) eq 'ARRAY') { |
} elsif (ref($fields{$item}) eq 'ARRAY') { |
if (!grep(/^\Q$type\E$/,@{$fields{$item}})) { |
if (!grep(/^\Q$type\E$/,@{$fields{$item}})) { |
$change = 1; |
$change = 1; |
|
last; |
} |
} |
} |
} |
} |
} |
Line 4756 sub modify_autoupdate {
|
Line 4844 sub modify_autoupdate {
|
} |
} |
} |
} |
} |
} |
|
} elsif ($key eq 'lockablenames') { |
|
if (ref($currautoupdate{$key}) eq 'ARRAY') { |
|
my @changed = &Apache::loncommon::compare_arrays($currautoupdate{'lockablenames'},\@lockablenames); |
|
if (@changed) { |
|
$changes{'lockablenames'} = 1; |
|
} |
|
} else { |
|
if (@lockablenames) { |
|
$changes{'lockablenames'} = 1; |
|
} |
|
} |
|
} |
|
} |
|
unless (grep(/^\Qlockablenames\E$/,keys(%currautoupdate))) { |
|
if (@lockablenames) { |
|
$changes{'lockablenames'} = 1; |
} |
} |
} |
} |
foreach my $item (@{$types},'default') { |
foreach my $item (@{$types},'default') { |
if (defined($fields{$item})) { |
if (defined($fields{$item})) { |
if (ref($currautoupdate{'fields'}) eq 'HASH') { |
if (ref($currautoupdate{'fields'}) eq 'HASH') { |
if (!exists($currautoupdate{'fields'}{$item})) { |
if (ref($currautoupdate{'fields'}{$item}) eq 'ARRAY') { |
|
my $change = 0; |
|
if (ref($fields{$item}) eq 'ARRAY') { |
|
foreach my $type (@{$fields{$item}}) { |
|
if (!grep(/^\Q$type\E$/,@{$currautoupdate{'fields'}{$item}})) { |
|
$change = 1; |
|
last; |
|
} |
|
} |
|
} |
|
if ($change) { |
|
push(@{$changes{'fields'}},$item); |
|
} |
|
} else { |
push(@{$changes{'fields'}},$item); |
push(@{$changes{'fields'}},$item); |
} |
} |
} else { |
} else { |
Line 4775 sub modify_autoupdate {
|
Line 4892 sub modify_autoupdate {
|
if (keys(%changes) > 0) { |
if (keys(%changes) > 0) { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
foreach my $key (sort(keys(%changes))) { |
foreach my $key (sort(keys(%changes))) { |
if (ref($changes{$key}) eq 'ARRAY') { |
if ($key eq 'lockablenames') { |
|
$resulttext .= '<li>'; |
|
if (@lockablenames) { |
|
$usertypes->{'default'} = $othertitle; |
|
$resulttext .= &mt("User preference to disable replacement of user's name with institutional data (by auto-update), available for the following affiliations:").' '. |
|
join(', ', map { $usertypes->{$_}; } @lockablenames).'</li>'; |
|
} else { |
|
$resulttext .= &mt("User preference to disable replacement of user's name with institutional data (by auto-update) is unavailable."); |
|
} |
|
$resulttext .= '</li>'; |
|
} elsif (ref($changes{$key}) eq 'ARRAY') { |
foreach my $item (@{$changes{$key}}) { |
foreach my $item (@{$changes{$key}}) { |
my @newvalues; |
my @newvalues; |
foreach my $type (@{$fields{$item}}) { |
foreach my $type (@{$fields{$item}}) { |
Line 5068 sub modify_contacts {
|
Line 5195 sub modify_contacts {
|
$currsetting{$key} = $domconfig{'contacts'}{$key}; |
$currsetting{$key} = $domconfig{'contacts'}{$key}; |
} |
} |
} |
} |
my (%others,%to); |
my (%others,%to,%bcc); |
my @contacts = ('supportemail','adminemail'); |
my @contacts = ('supportemail','adminemail'); |
my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail', |
my @mailings = ('errormail','packagesmail','helpdeskmail','lonstatusmail', |
'requestsmail'); |
'requestsmail'); |
Line 5084 sub modify_contacts {
|
Line 5211 sub modify_contacts {
|
} |
} |
$others{$type} = $env{'form.'.$type.'_others'}; |
$others{$type} = $env{'form.'.$type.'_others'}; |
$contacts_hash{contacts}{$type}{'others'} = $others{$type}; |
$contacts_hash{contacts}{$type}{'others'} = $others{$type}; |
|
if ($type eq 'helpdeskmail') { |
|
$bcc{$type} = $env{'form.'.$type.'_bcc'}; |
|
$contacts_hash{contacts}{$type}{'bcc'} = $bcc{$type}; |
|
} |
} |
} |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
$to{$item} = $env{'form.'.$item}; |
$to{$item} = $env{'form.'.$item}; |
Line 5108 sub modify_contacts {
|
Line 5239 sub modify_contacts {
|
if ($others{$type} ne $currsetting{$type}{'others'}) { |
if ($others{$type} ne $currsetting{$type}{'others'}) { |
push(@{$changes{$type}},'others'); |
push(@{$changes{$type}},'others'); |
} |
} |
|
if ($type eq 'helpdeskmail') { |
|
if ($bcc{$type} ne $currsetting{$type}{'bcc'}) { |
|
push(@{$changes{$type}},'bcc'); |
|
} |
|
} |
} |
} |
} else { |
} else { |
my %default; |
my %default; |
Line 5130 sub modify_contacts {
|
Line 5266 sub modify_contacts {
|
} |
} |
if ($others{$type} ne '') { |
if ($others{$type} ne '') { |
push(@{$changes{$type}},'others'); |
push(@{$changes{$type}},'others'); |
} |
} |
|
if ($type eq 'helpdeskmail') { |
|
if ($bcc{$type} ne '') { |
|
push(@{$changes{$type}},'bcc'); |
|
} |
|
} |
} |
} |
} |
} |
my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash, |
my $putresult = &Apache::lonnet::put_dom('configuration',\%contacts_hash, |
Line 5158 sub modify_contacts {
|
Line 5299 sub modify_contacts {
|
push(@text,$others{$type}); |
push(@text,$others{$type}); |
} |
} |
$resulttext .= '<span class="LC_cusr_emph">'. |
$resulttext .= '<span class="LC_cusr_emph">'. |
join(', ',@text).'</span></li>'; |
join(', ',@text).'</span>'; |
|
if ($type eq 'helpdeskmail') { |
|
if ($bcc{$type} ne '') { |
|
$resulttext .= ' '.&mt('with Bcc to').': <span class="LC_cusr_emph">'.$bcc{$type}.'</span>'; |
|
} |
|
} |
|
$resulttext .= '</li>'; |
} |
} |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
Line 5784 sub modify_scantron {
|
Line 5931 sub modify_scantron {
|
my $error; |
my $error; |
if ($configuserok eq 'ok') { |
if ($configuserok eq 'ok') { |
if ($switchserver) { |
if ($switchserver) { |
$error = &mt("Upload of scantron format file is not permitted to this server: [_1]",$switchserver); |
$error = &mt("Upload of bubblesheet format file is not permitted to this server: [_1]",$switchserver); |
} else { |
} else { |
if ($author_ok eq 'ok') { |
if ($author_ok eq 'ok') { |
my ($result,$scantronurl) = |
my ($result,$scantronurl) = |
Line 5824 sub modify_scantron {
|
Line 5971 sub modify_scantron {
|
if (ref($confhash{'scantron'}) eq 'HASH') { |
if (ref($confhash{'scantron'}) eq 'HASH') { |
$resulttext = &mt('Changes made:').'<ul>'; |
$resulttext = &mt('Changes made:').'<ul>'; |
if ($confhash{'scantron'}{'scantronformat'} eq '') { |
if ($confhash{'scantron'}{'scantronformat'} eq '') { |
$resulttext .= '<li>'.&mt('[_1] scantron format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>'; |
$resulttext .= '<li>'.&mt('[_1] bubblesheet format file removed; [_2] file will be used for courses in this domain.',$custom,$default).'</li>'; |
} else { |
} else { |
$resulttext .= '<li>'.&mt('Custom scantron format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>'; |
$resulttext .= '<li>'.&mt('Custom bubblesheet format file ([_1]) uploaded for use with courses in this domain.',$custom).'</li>'; |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
} else { |
} else { |
$resulttext = &mt('Changes made to scantron format file.'); |
$resulttext = &mt('Changes made to bubblesheet format file.'); |
} |
} |
$resulttext .= '</ul>'; |
$resulttext .= '</ul>'; |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
&Apache::loncommon::devalidate_domconfig_cache($dom); |
} else { |
} else { |
$resulttext = &mt('No changes made to scantron format file'); |
$resulttext = &mt('No changes made to bubblesheet format file'); |
} |
} |
} else { |
} else { |
$resulttext = '<span class="LC_error">'. |
$resulttext = '<span class="LC_error">'. |
&mt('An error occurred: [_1]',$putresult).'</span>'; |
&mt('An error occurred: [_1]',$putresult).'</span>'; |
} |
} |
} else { |
} else { |
$resulttext = &mt('No changes made to scantron format file'); |
$resulttext = &mt('No changes made to bubblesheet format file'); |
} |
} |
if ($errors) { |
if ($errors) { |
$resulttext .= &mt('The following errors occurred: ').'<ul>'. |
$resulttext .= &mt('The following errors occurred: ').'<ul>'. |