version 1.204, 2007/12/07 23:09:30
|
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 { |