version 1.618, 2007/12/03 22:58:46
|
version 1.622, 2007/12/08 00:03:32
|
Line 2073 sub authform_internal{
|
Line 2073 sub authform_internal{
|
$result = &mt |
$result = &mt |
('[_1] Internally authenticated (with initial password [_2])', |
('[_1] Internally authenticated (with initial password [_2])', |
'<label>'.$authtype,'</label>'.$autharg); |
'<label>'.$authtype,'</label>'.$autharg); |
|
$result.="<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>'; |
return $result; |
return $result; |
} |
} |
|
|
Line 5038 div.LC_clear_float_footer {
|
Line 5039 div.LC_clear_float_footer {
|
|
|
|
|
div.LC_grade_select_mode { |
div.LC_grade_select_mode { |
float: left; |
|
font-family: $sans; |
font-family: $sans; |
} |
} |
div.LC_grade_select_mode div div { |
div.LC_grade_select_mode div div { |
Line 6147 sub default_quota {
|
Line 6147 sub default_quota {
|
my ($udom,$inststatus) = @_; |
my ($udom,$inststatus) = @_; |
my ($defquota,$settingstatus); |
my ($defquota,$settingstatus); |
my %quotahash = &Apache::lonnet::get_dom('configuration', |
my %quotahash = &Apache::lonnet::get_dom('configuration', |
['quota'],$udom); |
['quotas'],$udom); |
if (ref($quotahash{'quota'}) eq 'HASH') { |
if (ref($quotahash{'quotas'}) eq 'HASH') { |
if ($inststatus ne '') { |
if ($inststatus ne '') { |
my @statuses = split(/:/,$inststatus); |
my @statuses = split(/:/,$inststatus); |
foreach my $item (@statuses) { |
foreach my $item (@statuses) { |
if ($quotahash{'quota'}{$item} ne '') { |
if ($quotahash{'quotas'}{$item} ne '') { |
if ($defquota eq '') { |
if ($defquota eq '') { |
$defquota = $quotahash{'quota'}{$item}; |
$defquota = $quotahash{'quotas'}{$item}; |
$settingstatus = $item; |
$settingstatus = $item; |
} elsif ($quotahash{'quota'}{$item} > $defquota) { |
} elsif ($quotahash{'quotas'}{$item} > $defquota) { |
$defquota = $quotahash{'quota'}{$item}; |
$defquota = $quotahash{'quotas'}{$item}; |
$settingstatus = $item; |
$settingstatus = $item; |
} |
} |
} |
} |
} |
} |
} |
} |
if ($defquota eq '') { |
if ($defquota eq '') { |
$defquota = $quotahash{'quota'}{'default'}; |
$defquota = $quotahash{'quotas'}{'default'}; |
$settingstatus = 'default'; |
$settingstatus = 'default'; |
} |
} |
} else { |
} else { |
Line 7649 sub restore_settings {
|
Line 7649 sub restore_settings {
|
|
|
Build recipient lists for three types of e-mail: |
Build recipient lists for three types of e-mail: |
(a) Error Reports, (b) Package Updates, (c) Help requests, generated by |
(a) Error Reports, (b) Package Updates, (c) Help requests, generated by |
lonerrorhandler.pm, CHECKRPMS and lonhelpdesk.pm respectively. |
lonerrorhandler.pm, CHECKRPMS and lonsupportreq.pm respectively. |
|
|
Inputs: |
Inputs: |
Request object, defmail (scalar - email address of default recipient), |
defmail (scalar - email address of default recipient), |
mailing type (scalar - errormail, packagesmail, or helpdeskmail), |
mailing type (scalar - errormail, packagesmail, or helpdeskmail), |
defdom (domain for which to retrieve configuration settings). |
defdom (domain for which to retrieve configuration settings), |
|
origmail (scalar - email address of recipient from loncapa.conf, |
|
i.e., predates configuration by DC via domainprefs.pm |
|
|
Returns: comma separated list of addresses to which to send e-mail. |
Returns: comma separated list of addresses to which to send e-mail. |
|
|
Line 7663 Returns: comma separated list of address
|
Line 7665 Returns: comma separated list of address
|
############################################################ |
############################################################ |
############################################################ |
############################################################ |
sub build_recipient_list { |
sub build_recipient_list { |
my ($r,$defmail,$mailing,$defdom) = @_; |
my ($defmail,$mailing,$defdom,$origmail) = @_; |
my @recipients; |
my @recipients; |
my $otheremails; |
my $otheremails; |
my $defdom = $r->dir_config('lonDefDomain'); |
|
my %domconfig = |
my %domconfig = |
&Apache::lonnet::get_dom('configuration',['contacts'],$defdom); |
&Apache::lonnet::get_dom('configuration',['contacts'],$defdom); |
if (ref($domconfig{'contacts'}) eq 'HASH') { |
if (ref($domconfig{'contacts'}) eq 'HASH') { |
Line 7674 sub build_recipient_list {
|
Line 7675 sub build_recipient_list {
|
my @contacts = ('adminemail','supportemail'); |
my @contacts = ('adminemail','supportemail'); |
foreach my $item (@contacts) { |
foreach my $item (@contacts) { |
if ($domconfig{'contacts'}{$mailing}{$item}) { |
if ($domconfig{'contacts'}{$mailing}{$item}) { |
push(@recipients,$domconfig{'contacts'}{$item}); |
my $addr = $domconfig{'contacts'}{$item}; |
|
if (!grep(/^\Q$addr\E$/,@recipients)) { |
|
push(@recipients,$addr); |
|
} |
} |
} |
$otheremails = $domconfig{'contacts'}{$mailing}{'others'}; |
$otheremails = $domconfig{'contacts'}{$mailing}{'others'}; |
} |
} |
} else { |
|
push(@recipients,$r->dir_config('lonAdmEMail')); |
|
} |
} |
|
} elsif ($origmail ne '') { |
|
push(@recipients,$origmail); |
} |
} |
if ($defmail ne '') { |
if ($defmail ne '') { |
push(@recipients,$defmail); |
push(@recipients,$defmail); |
} |
} |
my $recipientlist = join(',',@recipients); |
|
if ($otheremails) { |
if ($otheremails) { |
if ($recipientlist ne '') { |
my @others; |
$recipientlist .= ','.$otheremails; |
if ($otheremails =~ /,/) { |
|
@others = split(/,/,$otheremails); |
} else { |
} else { |
$recipientlist = $otheremails; |
push(@others,$otheremails); |
|
} |
|
foreach my $addr (@others) { |
|
if (!grep(/^\Q$addr\E$/,@recipients)) { |
|
push(@recipients,$addr); |
|
} |
} |
} |
} |
} |
|
my $recipientlist = join(',',@recipients); |
return $recipientlist; |
return $recipientlist; |
} |
} |
|
|