version 1.203, 2007/12/06 04:03:35
|
version 1.205, 2007/12/08 19:19:03
|
Line 76 my $authformfsys;
|
Line 76 my $authformfsys;
|
my $authformloc; |
my $authformloc; |
|
|
sub initialize_authen_forms { |
sub initialize_authen_forms { |
my ($dom,$curr_authtype) = @_; |
my ($dom,$curr_authtype,$mode) = @_; |
my ($krbdefdom)=( $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/); |
my ($krbdefdom)=( $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/); |
$krbdefdom= uc($krbdefdom); |
$krbdefdom= uc($krbdefdom); |
my %param = ( formname => 'document.cu', |
my %param = ( formname => 'document.cu', |
Line 91 sub initialize_authen_forms {
|
Line 91 sub initialize_authen_forms {
|
if ($long_auth =~ /^krb(4|5)$/) { |
if ($long_auth =~ /^krb(4|5)$/) { |
$param{'curr_kerb_ver'} = $1; |
$param{'curr_kerb_ver'} = $1; |
} |
} |
|
if ($mode eq 'modifyuser') { |
|
$param{'mode'} = $mode; |
|
} |
} |
} |
# no longer static due to configurable kerberos defaults |
# no longer static due to configurable kerberos defaults |
# $loginscript = &Apache::loncommon::authform_header(%param); |
# $loginscript = &Apache::loncommon::authform_header(%param); |
Line 1197 $lt{'uuas'} ($currentauth). $lt{'adcs'}.
|
Line 1200 $lt{'uuas'} ($currentauth). $lt{'adcs'}.
|
ENDBADAUTH |
ENDBADAUTH |
} |
} |
} else { # Authentication type is valid |
} else { # Authentication type is valid |
&initialize_authen_forms($ccdomain,$currentauth); |
&initialize_authen_forms($ccdomain,$currentauth,'modifyuser'); |
my $authformnop_row; |
my ($authformcurrent,$can_modify,@authform_others) = |
if (&Apache::lonnet::allowed('mau',$ccdomain)) { |
|
$authformnop_row = &Apache::loncommon::start_data_table_row(); |
|
} |
|
my ($authformcurrent,$authform_other,$can_modify) = |
|
&modify_login_block($ccdomain,$currentauth); |
&modify_login_block($ccdomain,$currentauth); |
if (&Apache::lonnet::allowed('mau',$ccdomain)) { |
if (&Apache::lonnet::allowed('mau',$ccdomain)) { |
# Current user has login modification privileges |
# Current user has login modification privileges |
Line 1217 ENDBADAUTH
|
Line 1216 ENDBADAUTH
|
'</script>'."\n". |
'</script>'."\n". |
'<h3>'.$lt{'ld'}.'</h3>'. |
'<h3>'.$lt{'ld'}.'</h3>'. |
&Apache::loncommon::start_data_table(). |
&Apache::loncommon::start_data_table(). |
$authformnop_row. |
&Apache::loncommon::start_data_table_row(). |
'<td>'.$authformnop; |
'<td>'.$authformnop; |
if ($can_modify) { |
if ($can_modify) { |
$outcome .= '</td>'."\n". |
$outcome .= '</td>'."\n". |
Line 1229 ENDBADAUTH
|
Line 1228 ENDBADAUTH
|
$outcome .= ' ('.$authformcurrent.')</td>'. |
$outcome .= ' ('.$authformcurrent.')</td>'. |
&Apache::loncommon::end_data_table_row()."\n"; |
&Apache::loncommon::end_data_table_row()."\n"; |
} |
} |
if ($authform_other ne '') { |
foreach my $item (@authform_others) { |
$outcome .= $authform_other; |
$outcome .= &Apache::loncommon::start_data_table_row(). |
|
'<td>'.$item.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n"; |
} |
} |
$outcome .= &Apache::loncommon::end_data_table_row(). |
$outcome .= &Apache::loncommon::end_data_table(); |
&Apache::loncommon::end_data_table(); |
|
} else { |
} else { |
if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) { |
if (&Apache::lonnet::allowed('mau',$env{'request.role.domain'})) { |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
Line 1256 sub modify_login_block {
|
Line 1256 sub modify_login_block {
|
my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); |
my %domconfig = &Apache::lonnet::get_dom('configuration',['usercreation'],$dom); |
my ($authnum,%can_assign) = |
my ($authnum,%can_assign) = |
&Apache::loncommon::get_assignable_auth($dom); |
&Apache::loncommon::get_assignable_auth($dom); |
my ($authformcurrent,$authform_other,$show_override_msg); |
my ($authformcurrent,@authform_others,$show_override_msg); |
if ($currentauth=~/^krb(4|5):/) { |
if ($currentauth=~/^krb(4|5):/) { |
$authformcurrent=$authformkrb; |
$authformcurrent=$authformkrb; |
if ($can_assign{'int'}) { |
if ($can_assign{'int'}) { |
$authform_other = &Apache::loncommon::start_data_table_row(). |
push(@authform_others,$authformint); |
'<td>'.$authformint.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n" |
|
} |
} |
if ($can_assign{'loc'}) { |
if ($can_assign{'loc'}) { |
$authform_other .= &Apache::loncommon::start_data_table_row(). |
push(@authform_others,$authformloc); |
'<td>'.$authformloc.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n"; |
|
} |
} |
if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { |
if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { |
$show_override_msg = 1; |
$show_override_msg = 1; |
Line 1275 sub modify_login_block {
|
Line 1271 sub modify_login_block {
|
} elsif ($currentauth=~/^internal:/) { |
} elsif ($currentauth=~/^internal:/) { |
$authformcurrent=$authformint; |
$authformcurrent=$authformint; |
if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { |
if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { |
$authform_other = &Apache::loncommon::start_data_table_row(). |
push(@authform_others,$authformkrb); |
'<td>'.$authformkrb.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n"; |
|
} |
} |
if ($can_assign{'loc'}) { |
if ($can_assign{'loc'}) { |
$authform_other .= &Apache::loncommon::start_data_table_row(). |
push(@authform_others,$authformloc); |
'<td>'.$authformloc.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n"; |
|
} |
} |
if ($can_assign{'int'}) { |
if ($can_assign{'int'}) { |
$show_override_msg = 1; |
$show_override_msg = 1; |
Line 1290 sub modify_login_block {
|
Line 1282 sub modify_login_block {
|
} elsif ($currentauth=~/^unix:/) { |
} elsif ($currentauth=~/^unix:/) { |
$authformcurrent=$authformfsys; |
$authformcurrent=$authformfsys; |
if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { |
if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { |
$authform_other = &Apache::loncommon::start_data_table_row(). |
push(@authform_others,$authformkrb); |
'<td>'.$authformkrb.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n"; |
|
} |
} |
if ($can_assign{'int'}) { |
if ($can_assign{'int'}) { |
$authform_other .= &Apache::loncommon::start_data_table_row(). |
push(@authform_others,$authformint); |
'<td>'.$authformint.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n" |
|
} |
} |
if ($can_assign{'loc'}) { |
if ($can_assign{'loc'}) { |
$authform_other .= &Apache::loncommon::start_data_table_row(). |
push(@authform_others,$authformloc); |
'<td>'.$authformloc.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n"; |
|
} |
} |
if ($can_assign{'fsys'}) { |
if ($can_assign{'fsys'}) { |
$show_override_msg = 1; |
$show_override_msg = 1; |
Line 1310 sub modify_login_block {
|
Line 1296 sub modify_login_block {
|
} elsif ($currentauth=~/^localauth:/) { |
} elsif ($currentauth=~/^localauth:/) { |
$authformcurrent=$authformloc; |
$authformcurrent=$authformloc; |
if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { |
if (($can_assign{'krb4'}) || ($can_assign{'krb5'})) { |
$authform_other = &Apache::loncommon::start_data_table_row(). |
push(@authform_others,$authformkrb); |
'<td>'.$authformkrb.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n"; |
|
} |
} |
if ($can_assign{'int'}) { |
if ($can_assign{'int'}) { |
$authform_other .= &Apache::loncommon::start_data_table_row(). |
push(@authform_others,$authformint); |
'<td>'.$authformint.'</td>'. |
|
&Apache::loncommon::end_data_table_row()."\n" |
|
} |
} |
if ($can_assign{'loc'}) { |
if ($can_assign{'loc'}) { |
$show_override_msg = 1; |
$show_override_msg = 1; |
} |
} |
} |
} |
if ($show_override_msg) { |
if ($show_override_msg) { |
$authformcurrent.= ' <span class="LC_cusr_emph">'. |
$authformcurrent = '<table><tr><td colspan="3">'.$authformcurrent. |
|
'</td></tr>'."\n". |
|
'<tr><td> </td>'. |
|
'<td><b>'.&mt('Currently in use').'</b></td>'. |
|
'<td align="right"><span class="LC_cusr_emph">'. |
&mt('will override current values'). |
&mt('will override current values'). |
'</span><br />'; |
'</span></td></tr></table>'; |
} |
} |
return ($authformcurrent,$authform_other,$show_override_msg); |
return ($authformcurrent,$show_override_msg,@authform_others); |
} |
} |
|
|
sub personal_data_display { |
sub personal_data_display { |
Line 1623 sub update_user_data {
|
Line 1609 sub update_user_data {
|
} |
} |
} |
} |
my ($quotachanged,$namechanged,$oldportfolioquota,$newportfolioquota, |
my ($quotachanged,$namechanged,$oldportfolioquota,$newportfolioquota, |
$inststatus,$isdefault,$defquotatext); |
$inststatus,$oldisdefault,$newisdefault,$olddefquotatext, |
|
$newdefquotatext); |
my ($defquota,$settingstatus) = |
my ($defquota,$settingstatus) = |
&Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus); |
&Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus); |
my %changeHash; |
my %changeHash; |
|
$changeHash{'portfolioquota'} = $userenv{'portfolioquota'}; |
if ($userenv{'portfolioquota'} ne '') { |
if ($userenv{'portfolioquota'} ne '') { |
$oldportfolioquota = $userenv{'portfolioquota'}; |
$oldportfolioquota = $userenv{'portfolioquota'}; |
if ($env{'form.customquota'} == 1) { |
if ($env{'form.customquota'} == 1) { |
Line 1636 sub update_user_data {
|
Line 1624 sub update_user_data {
|
$newportfolioquota = $env{'form.portfolioquota'}; |
$newportfolioquota = $env{'form.portfolioquota'}; |
$newportfolioquota =~ s/[^\d\.]//g; |
$newportfolioquota =~ s/[^\d\.]//g; |
} |
} |
if ($newportfolioquota != $userenv{'portfolioquota'}) { |
if ($newportfolioquota != $oldportfolioquota) { |
$quotachanged = "a_admin($newportfolioquota,\%changeHash); |
$quotachanged = "a_admin($newportfolioquota,\%changeHash); |
} |
} |
} else { |
} else { |
$quotachanged = "a_admin('',\%changeHash); |
$quotachanged = "a_admin('',\%changeHash); |
$newportfolioquota = $defquota; |
$newportfolioquota = $defquota; |
$isdefault = 1; |
$newisdefault = 1; |
} |
} |
} else { |
} else { |
|
$oldisdefault = 1; |
$oldportfolioquota = $defquota; |
$oldportfolioquota = $defquota; |
if ($env{'form.customquota'} == 1) { |
if ($env{'form.customquota'} == 1) { |
if ($env{'form.portfolioquota'} eq '') { |
if ($env{'form.portfolioquota'} eq '') { |
Line 1656 sub update_user_data {
|
Line 1645 sub update_user_data {
|
$quotachanged = "a_admin($newportfolioquota,\%changeHash); |
$quotachanged = "a_admin($newportfolioquota,\%changeHash); |
} else { |
} else { |
$newportfolioquota = $defquota; |
$newportfolioquota = $defquota; |
$isdefault = 1; |
$newisdefault = 1; |
} |
} |
} |
} |
if ($isdefault) { |
if ($oldisdefault) { |
if ($settingstatus eq '') { |
$olddefquotatext = &get_defaultquota_text($settingstatus); |
$defquotatext = &mt('(default)'); |
} |
} else { |
if ($newisdefault) { |
my ($usertypes,$order) = |
$newdefquotatext = &get_defaultquota_text($settingstatus); |
&Apache::lonnet::retrieve_inst_usertypes($env{'form.ccdomain'}); |
|
if ($usertypes->{$settingstatus} eq '') { |
|
$defquotatext = &mt('(default)'); |
|
} else { |
|
$defquotatext = &mt('(default for [_1])',$usertypes->{$settingstatus}); |
|
} |
|
} |
|
} |
} |
if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}) && |
if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}) && |
($env{'form.cfirstname'} ne $userenv{'firstname'} || |
($env{'form.cfirstname'} ne $userenv{'firstname'} || |
Line 1681 sub update_user_data {
|
Line 1663 sub update_user_data {
|
$env{'form.cpermanentemail'} ne $userenv{'permanentemail'} )) { |
$env{'form.cpermanentemail'} ne $userenv{'permanentemail'} )) { |
$namechanged = 1; |
$namechanged = 1; |
} |
} |
if ($namechanged) { |
if ($namechanged || $quotachanged) { |
# Make the change |
|
$changeHash{'firstname'} = $env{'form.cfirstname'}; |
$changeHash{'firstname'} = $env{'form.cfirstname'}; |
$changeHash{'middlename'} = $env{'form.cmiddlename'}; |
$changeHash{'middlename'} = $env{'form.cmiddlename'}; |
$changeHash{'lastname'} = $env{'form.clastname'}; |
$changeHash{'lastname'} = $env{'form.clastname'}; |
$changeHash{'generation'} = $env{'form.cgeneration'}; |
$changeHash{'generation'} = $env{'form.cgeneration'}; |
$changeHash{'id'} = $env{'form.cid'}; |
$changeHash{'id'} = $env{'form.cid'}; |
$changeHash{'permanentemail'} = $env{'form.cpermanentemail'}; |
$changeHash{'permanentemail'} = $env{'form.cpermanentemail'}; |
my $putresult = &Apache::lonnet::put |
my ($quotachgresult,$namechgresult); |
('environment',\%changeHash, |
if ($quotachanged) { |
$env{'form.ccdomain'},$env{'form.ccuname'}); |
$quotachgresult = |
if ($putresult eq 'ok') { |
&Apache::lonnet::put('environment',\%changeHash, |
|
$env{'form.ccdomain'},$env{'form.ccuname'}); |
|
} |
|
if ($namechanged) { |
|
# Make the change |
|
$namechgresult = |
|
&Apache::lonnet::modifyuser($env{'form.ccdomain'}, |
|
$env{'form.ccuname'},$changeHash{'id'},undef,undef, |
|
$changeHash{'firstname'},$changeHash{'middlename'}, |
|
$changeHash{'lastname'},$changeHash{'generation'}, |
|
$changeHash{'id'},undef,$changeHash{'permanentemail'}); |
|
} |
|
if (($namechanged && $namechgresult eq 'ok') || |
|
($quotachanged && $quotachgresult eq 'ok')) { |
# Tell the user we changed the name |
# Tell the user we changed the name |
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'uic' => "User Information Changed", |
'uic' => "User Information Changed", |
Line 1729 END
|
Line 1723 END
|
<td>$userenv{'generation'} </td> |
<td>$userenv{'generation'} </td> |
<td>$userenv{'id'}</td> |
<td>$userenv{'id'}</td> |
<td>$userenv{'permanentemail'} </td> |
<td>$userenv{'permanentemail'} </td> |
<td>$oldportfolioquota Mb</td> |
<td>$oldportfolioquota Mb $olddefquotatext </td> |
END |
END |
$r->print(&Apache::loncommon::end_data_table_row(). |
$r->print(&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::start_data_table_row()); |
&Apache::loncommon::start_data_table_row()); |
Line 1741 END
|
Line 1735 END
|
<td>$env{'form.cgeneration'} </td> |
<td>$env{'form.cgeneration'} </td> |
<td>$env{'form.cid'} </td> |
<td>$env{'form.cid'} </td> |
<td>$env{'form.cpermanentemail'} </td> |
<td>$env{'form.cpermanentemail'} </td> |
<td>$newportfolioquota Mb $defquotatext </td> |
<td>$newportfolioquota Mb $newdefquotatext </td> |
END |
END |
$r->print(&Apache::loncommon::end_data_table_row(). |
$r->print(&Apache::loncommon::end_data_table_row(). |
&Apache::loncommon::end_data_table()); |
&Apache::loncommon::end_data_table()); |
Line 1778 END
|
Line 1772 END
|
$env{'form.ccdomain'}.'</span>'); |
$env{'form.ccdomain'}.'</span>'); |
} |
} |
} else { # End of if ($env ... ) logic |
} else { # End of if ($env ... ) logic |
my $putresult; |
# They did not want to change the users name or quota but we can |
if ($quotachanged) { |
# still tell them what the name and quota are |
$putresult = &Apache::lonnet::put |
|
('environment',\%changeHash, |
|
$env{'form.ccdomain'},$env{'form.ccuname'}); |
|
} |
|
# They did not want to change the users name but we can |
|
# still tell them what the name is |
|
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'id' => "ID/Student number", |
'id' => "ID/Student number", |
'mail' => "Permanent e-mail", |
'mail' => "Permanent e-mail", |
Line 1794 END
|
Line 1782 END
|
$r->print(<<"END"); |
$r->print(<<"END"); |
<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'} |
<h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'} |
END |
END |
if ($userenv{'permanentemail'} eq '') { |
if ($userenv{'permanentemail'} ne '') { |
$r->print('</h4>'); |
$r->print('<br />['.$lt{'mail'}.': '. |
} else { |
$userenv{'permanentemail'}.']'); |
$r->print(' ('.$lt{'mail'}.': '. |
|
$userenv{'permanentemail'}.')</h4>'); |
|
} |
|
if ($putresult eq 'ok') { |
|
if ($oldportfolioquota != $newportfolioquota) { |
|
$r->print('<h4>'.$lt{'disk'}.': '.$newportfolioquota.' Mb '. |
|
$defquotatext.'</h4>'); |
|
&Apache::lonnet::appenv('environment.portfolioquota' => $changeHash{'portfolioquota'}); |
|
} |
|
} |
} |
|
$r->print('<br />['.$lt{'disk'}.': '.$oldportfolioquota.' Mb '. |
|
$olddefquotatext.']</h4>'); |
} |
} |
} |
} |
## |
## |
Line 2035 END
|
Line 2016 END
|
$r->print(&Apache::loncommon::end_page()); |
$r->print(&Apache::loncommon::end_page()); |
} |
} |
|
|
|
sub get_defaultquota_text { |
|
my ($settingstatus) = @_; |
|
my $defquotatext; |
|
if ($settingstatus eq '') { |
|
$defquotatext = &mt('(default)'); |
|
} else { |
|
my ($usertypes,$order) = |
|
&Apache::lonnet::retrieve_inst_usertypes($env{'form.ccdomain'}); |
|
if ($usertypes->{$settingstatus} eq '') { |
|
$defquotatext = &mt('(default)'); |
|
} else { |
|
$defquotatext = &mt('(default for [_1])',$usertypes->{$settingstatus}); |
|
} |
|
} |
|
return $defquotatext; |
|
} |
|
|
sub update_result_form { |
sub update_result_form { |
my ($uhome) = @_; |
my ($uhome) = @_; |
my $outcome = |
my $outcome = |