version 1.128, 2010/03/03 16:43:41
|
version 1.130, 2010/03/11 21:18:24
|
Line 658 sub print_login {
|
Line 658 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 1692 sub print_courserequestmail {
|
Line 1691 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 1710 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 1752 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 2742 sub print_scantronformat {
|
Line 2761 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 2788 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 2817 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 4635 sub modify_autoenroll {
|
Line 4654 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 4664 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 4690 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 4709 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 5784 sub modify_scantron {
|
Line 5816 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 5856 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>'. |