version 1.36, 2007/12/26 14:38:13
|
version 1.37, 2008/01/01 17:24:59
|
Line 76 sub modifystudent {
|
Line 76 sub modifystudent {
|
} |
} |
} |
} |
if ($result eq '') { |
if ($result eq '') { |
$result = 'Unable to find section for this student'; |
$result = &mt('Unable to find section for this student'); |
} else { |
} else { |
$result =~ s/(ok:)+/ok/g; |
$result =~ s/(ok:)+/ok/g; |
} |
} |
Line 333 sub print_upload_manager_header {
|
Line 333 sub print_upload_manager_header {
|
sub javascript_validations { |
sub javascript_validations { |
my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain, |
my ($mode,$krbdefdom,$curr_authtype,$curr_authfield,$domain, |
$context,$groupslist)=@_; |
$context,$groupslist)=@_; |
|
|
my %param = ( |
my %param = ( |
kerb_def_dom => $krbdefdom, |
kerb_def_dom => $krbdefdom, |
curr_authtype => $curr_authtype, |
curr_authtype => $curr_authtype, |
); |
); |
if ($mode eq 'createuser') { |
if ($mode eq 'upload') { |
$param{'formname'} = 'cu'; |
|
} elsif ($mode eq 'upload') { |
|
$param{'formname'} = 'studentform'; |
$param{'formname'} = 'studentform'; |
} elsif ($mode eq 'singlestudent') { |
|
$param{'formname'} = 'cu'; |
|
} elsif ($mode eq 'createcourse') { |
} elsif ($mode eq 'createcourse') { |
$param{'formname'} = 'ccrs'; |
$param{'formname'} = 'ccrs'; |
} elsif ($mode eq 'modifycourse') { |
} elsif ($mode eq 'modifycourse') { |
Line 367 sub javascript_validations {
|
Line 362 sub javascript_validations {
|
} |
} |
} elsif ($context eq 'domain') { |
} elsif ($context eq 'domain') { |
$setsection_call = 'setCourse()'; |
$setsection_call = 'setCourse()'; |
$setsections_js = &dc_setcourse_js($param{'formname'},$mode); |
$setsections_js = &dc_setcourse_js($param{'formname'},$mode,$context); |
} |
} |
$finish = " var checkSec = $setsection_call\n". |
$finish = " var checkSec = $setsection_call\n". |
" if (checkSec == 'ok') {\n". |
" if (checkSec == 'ok') {\n". |
Line 389 sub javascript_validations {
|
Line 384 sub javascript_validations {
|
role => 'The optional role field was not specified.', |
role => 'The optional role field was not specified.', |
continue => 'Continue adding users?', |
continue => 'Continue adding users?', |
); |
); |
|
my $function_name = <<"END"; |
my $function_name =(<<END); |
|
$setsections_js |
$setsections_js |
|
|
function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) { |
function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) { |
Line 521 END
|
Line 515 END
|
} |
} |
END |
END |
} |
} |
my $result = $function_name; |
my $result = $function_name.$auth_checks.$optional_checks."\n". |
if ( ($mode eq 'upload') || ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) { |
$section_checks.$authheader; |
$result .= $auth_checks; |
|
} |
|
$result .= $optional_checks."\n".$section_checks; |
|
if ( ($mode eq 'upload') || ($mode eq 'createcourse') || ($mode eq 'modifycourse') ) { |
|
$result .= $authheader; |
|
} |
|
return $result; |
return $result; |
} |
} |
############################################################### |
############################################################### |
Line 4168 sub get_groupslist {
|
Line 4156 sub get_groupslist {
|
} |
} |
|
|
sub setsections_javascript { |
sub setsections_javascript { |
my ($formname,$groupslist,$mode) = @_; |
my ($formname,$groupslist,$mode,$checkauth) = @_; |
my ($checkincluded,$finish,$rolecode,$setsection_js); |
my ($checkincluded,$finish,$rolecode,$setsection_js); |
if ($mode eq 'upload') { |
if ($mode eq 'upload') { |
$checkincluded = 'formname.name == "'.$formname.'"'; |
$checkincluded = 'formname.name == "'.$formname.'"'; |
Line 4176 sub setsections_javascript {
|
Line 4164 sub setsections_javascript {
|
$rolecode = "var role = formname.defaultrole.options[formname.defaultrole.selectedIndex].value;\n"; |
$rolecode = "var role = formname.defaultrole.options[formname.defaultrole.selectedIndex].value;\n"; |
} elsif ($formname eq 'cu') { |
} elsif ($formname eq 'cu') { |
$checkincluded = 'formname.elements[i-1].checked == true'; |
$checkincluded = 'formname.elements[i-1].checked == true'; |
$finish = 'formname.submit()'; |
if ($checkauth) { |
|
$finish = "var authcheck = auth_check();\n". |
|
" if (authcheck == 'ok') {\n". |
|
" formname.submit();\n". |
|
" }\n"; |
|
} else { |
|
$finish = 'formname.submit()'; |
|
} |
$rolecode = "var match = str.split('_'); |
$rolecode = "var match = str.split('_'); |
var role = match[3];\n"; |
var role = match[3];\n"; |
} elsif ($formname eq 'enrollstudent') { |
} elsif ($formname eq 'enrollstudent') { |
$checkincluded = 'formname.name == "'.$formname.'"'; |
$checkincluded = 'formname.name == "'.$formname.'"'; |
$finish = 'formname.submit()'; |
if ($checkauth) { |
|
$finish = "var authcheck = auth_check();\n". |
|
" if (authcheck == 'ok') {\n". |
|
" formname.submit();\n". |
|
" }\n"; |
|
} else { |
|
$finish = 'formname.submit()'; |
|
} |
$rolecode = "var match = str.split('_'); |
$rolecode = "var match = str.split('_'); |
var role = match[1];\n"; |
var role = match[1];\n"; |
} else { |
} else { |
Line 4518 sub get_course_identity {
|
Line 4520 sub get_course_identity {
|
} |
} |
|
|
sub dc_setcourse_js { |
sub dc_setcourse_js { |
my ($formname,$mode) = @_; |
my ($formname,$mode,$context) = @_; |
my $dc_setcourse_code; |
my ($dc_setcourse_code,$authen_check); |
my $cctext = &Apache::lonnet::plaintext('cc'); |
my $cctext = &Apache::lonnet::plaintext('cc'); |
my %alerts = §ioncheck_alerts(); |
my %alerts = §ioncheck_alerts(); |
my $role = 'role'; |
my $role = 'role'; |
if ($mode eq 'upload') { |
if ($mode eq 'upload') { |
$role = 'courserole'; |
$role = 'courserole'; |
|
} else { |
|
$authen_check = &verify_authen($formname,$context); |
} |
} |
$dc_setcourse_code = (<<"SCRIPTTOP"); |
$dc_setcourse_code = (<<"SCRIPTTOP"); |
|
$authen_check |
|
|
function setCourse() { |
function setCourse() { |
var course = document.$formname.dccourse.value; |
var course = document.$formname.dccourse.value; |
if (course != "") { |
if (course != "") { |
Line 4611 SCRIPTTOP
|
Line 4617 SCRIPTTOP
|
} |
} |
} |
} |
} |
} |
document.$formname.submit(); |
var authcheck = auth_check(); |
|
if (authcheck == 'ok') { |
|
document.$formname.submit(); |
|
} |
} |
} |
|
|
ENDSCRIPT |
ENDSCRIPT |
} else { |
} else { |
$dc_setcourse_code .= " |
$dc_setcourse_code .= " |
Line 4634 ENDSCRIPT
|
Line 4642 ENDSCRIPT
|
return -1; |
return -1; |
} |
} |
ENDSCRIPT |
ENDSCRIPT |
|
return $dc_setcourse_code; |
|
} |
|
|
|
sub verify_authen { |
|
my ($formname,$context) = @_; |
|
my %alerts = &authcheck_alerts(); |
|
my $finish = "return 'ok';"; |
|
if ($context eq 'author') { |
|
$finish = "document.$formname.submit();"; |
|
} |
|
my $outcome = <<"ENDSCRIPT"; |
|
|
|
function auth_check() { |
|
var logintype; |
|
if (document.$formname.login.length) { |
|
if (document.$formname.login.length > 0) { |
|
var loginpicked = 0; |
|
for (var i=0; i<document.$formname.login.length; i++) { |
|
if (document.$formname.login[i].checked == true) { |
|
loginpicked = 1; |
|
logintype = document.$formname.login[i].value; |
|
} |
|
} |
|
if (loginpicked == 0) { |
|
alert("$alerts{'authen'}"); |
|
return; |
|
} |
|
} |
|
} else { |
|
logintype = document.$formname.login.value; |
|
} |
|
if (logintype == 'nochange') { |
|
return 'ok'; |
|
} |
|
var argpicked = document.$formname.elements[logintype+'arg'].value; |
|
if ((argpicked == null) || (argpicked == '') || (typeof argpicked == 'undefined')) { |
|
var alertmsg = ''; |
|
switch (logintype) { |
|
case 'krb': |
|
alertmsg = '$alerts{'krb'}'; |
|
break; |
|
case 'int': |
|
alertmsg = '$alerts{'ipass'}'; |
|
case 'fsys': |
|
alertmsg = '$alerts{'ipass'}'; |
|
break; |
|
case 'loc': |
|
alertmsg = ''; |
|
break; |
|
default: |
|
alertmsg = ''; |
|
} |
|
if (alertmsg != '') { |
|
alert(alertmsg); |
|
return; |
|
} |
|
} |
|
$finish |
|
} |
|
ENDSCRIPT |
} |
} |
|
|
sub sectioncheck_alerts { |
sub sectioncheck_alerts { |
Line 4655 sub sectioncheck_alerts {
|
Line 4723 sub sectioncheck_alerts {
|
return %alerts; |
return %alerts; |
} |
} |
|
|
|
sub authcheck_alerts { |
|
my %alerts = |
|
&Apache::lonlocal::texthash( |
|
authen => 'You must choose an authentication type.', |
|
krb => 'You need to specify the Kerberos domain.', |
|
ipass => 'You need to specify the initial password.', |
|
); |
|
return %alerts; |
|
} |
|
|
1; |
1; |
|
|