--- loncom/interface/lonuserutils.pm 2008/05/19 17:10:19 1.55 +++ loncom/interface/lonuserutils.pm 2008/05/30 17:18:21 1.57 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Utility functions for managing LON-CAPA user accounts # -# $Id: lonuserutils.pm,v 1.55 2008/05/19 17:10:19 raeburn Exp $ +# $Id: lonuserutils.pm,v 1.57 2008/05/30 17:18:21 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -383,12 +383,13 @@ sub javascript_validations { section => 'The optional section field was not specified.', email => 'The optional email address field was not specified.', role => 'The optional role field was not specified.', + domain => 'The optional domain field was not specified.', continue => 'Continue adding users?', ); my $function_name = <<"END"; $setsections_js -function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail) { +function verify_message (vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddomain) { END my ($authnum,%can_assign) = &Apache::loncommon::get_assignable_auth($domain); my $auth_checks; @@ -503,6 +504,18 @@ END } message+='$alert{'email'}'; } + if (foundrole==0) { + if (message!='') { + message+='\\n'; + } + message+='$alert{'role'}'; + } + if (founddomain==0) { + if (message!='') { + message+='\\n'; + } + message+='$alert{'domain'}'; + } if (message!='') { message+= '\\n$alert{'continue'}'; if (confirm(message)) { @@ -532,6 +545,7 @@ function verify(vf,sec_caller) { var foundsec=0; var foundemail=0; var foundrole=0; + var founddomain=0; var tw; for (i=0;i<=vf.nfields.value;i++) { tw=eval('vf.f'+i+'.selectedIndex'); @@ -542,8 +556,9 @@ function verify(vf,sec_caller) { if (tw==9) { foundpwd=1; } if (tw==10) { foundemail=1; } if (tw==11) { foundrole=1; } + if (tw==12) { founddomain=1; } } - verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole); + verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundemail,foundrole,founddom); } // @@ -564,6 +579,7 @@ function verify(vf,sec_caller) { // 9 = ipwd (password) // 10 = email address // 11 = role +// 12 = domain function flip(vf,tf) { var nw=eval('vf.f'+tf+'.selectedIndex'); @@ -627,6 +643,7 @@ function verify(vf,sec_caller) { var foundid=0; var foundsec=0; var foundrole=0; + var founddomain=0; var tw; for (i=0;i<=vf.nfields.value;i++) { tw=eval('vf.f'+i+'.selectedIndex'); @@ -636,8 +653,9 @@ function verify(vf,sec_caller) { if (i==7 && tw!=0) { foundsec=1; } if (i==8 && tw!=0) { foundpwd=1; } if (i==9 && tw!=0) { foundrole=1; } + if (i==10 && tw!=0) { founddomain=1; } } - verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundrole); + verify_message(vf,founduname,foundpwd,foundname,foundid,foundsec,foundrole,founddomain); } function flip(vf,tf) { @@ -700,7 +718,7 @@ sub print_upload_manager_footer { $Str .= &hidden_input('keyfields',$keyfields); $Str .= "
'.&mt('Change authentication for existing users to these settings?').'
'; + $Str .= ''.&mt('Change authentication for existing users in domain "[_1]" to these settings?',$defdom).'
'; } else { $Str .= "\n". &mt('Note: this will not take effect if the user already exists'). @@ -718,6 +736,8 @@ sub print_upload_manager_footer { } else { $Str .= $home_server_pick; } + $Str .= '
\n".$date_table."
\n"; @@ -818,6 +838,7 @@ sub print_upload_manager_form { 'ipwd_choice' => 'scalar', 'email_choice' => 'scalar', 'role_choice' => 'scalar', + 'domain_choice' => 'scalar', }; my $defdom = $env{'request.role.domain'}; if ($context eq 'course') { @@ -848,7 +869,8 @@ sub print_upload_manager_form { ['sec', &mt('Section'), $env{'form.sec_choice'}], ['ipwd', &mt('Initial Password'),$env{'form.ipwd_choice'}], ['email',&mt('E-mail Address'), $env{'form.email_choice'}], - ['role',&mt('Role'), $env{'form.role_choice'}]); + ['role',&mt('Role'), $env{'form.role_choice'}], + ['domain',&mt('Domain'), $env{'form.domain_choice'}]); if ($env{'form.upfile_associate'} eq 'reverse') { &Apache::loncommon::csv_print_samples($r,\@records); $i=&Apache::loncommon::csv_print_select_table($r,\@records, @@ -1926,94 +1948,14 @@ END } if ($mode ne 'autoenroll' && $mode ne 'pickauthor') { my $check_uncheck_js = &Apache::loncommon::check_uncheck_jscript(); - my $alert = &mt("You must select at least one user by checking a user's 'Select' checkbox"); - my $singconfirm = &mt(' for a single user?'); - my $multconfirm = &mt(' for multiple users?'); my $date_sec_selector = &date_section_javascript($context,$setting,$statusmode); - my %lt = &Apache::lonlocal::texthash( - acwi => 'Access will be set to start immediately', - asyo => 'as you did not select an end date in the pop-up window', - accw => 'Access will be set to continue indefinitely', - asyd => 'as you did not select an end date in the pop-up window', - sewi => "Sections will be switched to 'No section'", - ayes => "as you either selected the 'No section' option", - oryo => 'or you did not select a section in the pop-up window', - arol => 'A role with no section will be added', - swbs => 'Sections will be switched to:', - rwba => 'Roles will be added for section(s):', - ); + my $verify_action_js = &bulkaction_javascript($formname); $r->print(<';
- my @linkdests = ('aboutme');
- if ($permission->{'cusr'}) {
- unshift (@linkdests,'modify');
- }
- $output .= ''.$lt{'link'}.': ';
- my $usernamelink = $env{'form.usernamelink'};
- if ($usernamelink eq '') {
- $usernamelink = 'aboutme';
- }
- foreach my $item (@linkdests) {
- my $checkedstr = '';
- if ($item eq $usernamelink) {
- $checkedstr = ' checked="checked" ';
- }
- $output .= ' ';
- }
- my $checkwin;
- if ($env{'form.userwin'}) {
- $checkwin = 'checked = "checked"';
- }
- $output .= ' '.$lt{'owin'}.'
';
if ($actionselect) {
$output .= <<"END";
-$lt{'ac'}: $actionselect
-
+
\n". + $output .= "\n".'
'."\n". &Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(); if ($mode eq 'autoenroll') { @@ -2607,6 +2550,125 @@ END } } +sub bulkaction_javascript { + my ($formname,$caller) = @_; + my $docstart = 'document'; + if ($caller eq 'popup') { + $docstart = 'opener.document'; + } + my %lt = &Apache::lonlocal::texthash( + acwi => 'Access will be set to start immediately', + asyo => 'as you did not select an end date in the pop-up window', + accw => 'Access will be set to continue indefinitely', + asyd => 'as you did not select an end date in the pop-up window', + sewi => "Sections will be switched to 'No section'", + ayes => "as you either selected the 'No section' option", + oryo => 'or you did not select a section in the pop-up window', + arol => 'A role with no section will be added', + swbs => 'Sections will be switched to:', + rwba => 'Roles will be added for section(s):', + ); + my $alert = &mt("You must select at least one user by checking a user's 'Select' checkbox"); + my $noaction = &mt("You need to select an action to take for the user(s) you have selected"); + my $singconfirm = &mt(' for a single user?'); + my $multconfirm = &mt(' for multiple users?'); + my $output = <<"ENDJS"; +function verify_action (field) { + var numchecked = 0; + var singconf = '$singconfirm'; + var multconf = '$multconfirm'; + if ($docstart.$formname.elements[field].length > 0) { + for (i=0; i<$docstart.$formname.elements[field].length; i++) { + if ($docstart.$formname.elements[field][i].checked == true) { + numchecked ++; + } + } + } else { + if ($docstart.$formname.elements[field].checked == true) { + numchecked ++; + } + } + if (numchecked == 0) { + alert("$alert"); + return; + } else { + var message = $docstart.$formname.bulkaction[$docstart.$formname.bulkaction.selectedIndex].text; + var choice = $docstart.$formname.bulkaction[$docstart.$formname.bulkaction.selectedIndex].value; + if (choice == '') { + alert("$noaction"); + return; + } else { + if (numchecked == 1) { + message += singconf; + } else { + message += multconf; + } +ENDJS + if ($caller ne 'popup') { + $output .= <<"NEWWIN"; + if (choice == 'chgdates' || choice == 'reenable' || choice == 'activate' || choice == 'chgsec') { + opendatebrowser(document.$formname,'$formname','go'); + return; + + } else { + if (confirm(message)) { + document.$formname.phase.value = 'bulkchange'; + document.$formname.submit(); + return; + } + } +NEWWIN + } else { + $output .= <<"POPUP"; + if (choice == 'chgdates' || choice == 'reenable' || choice == 'activate') { + var datemsg = ''; + if (($docstart.$formname.startdate_month.value == '') && + ($docstart.$formname.startdate_day.value == '') && + ($docstart.$formname.startdate_year.value == '')) { + datemsg = "\\n$lt{'acwi'},\\n$lt{'asyo'}.\\n"; + } + if (($docstart.$formname.enddate_month.value == '') && + ($docstart.$formname.enddate_day.value == '') && + ($docstart.$formname.enddate_year.value == '')) { + datemsg += "\\n$lt{'accw'},\\n$lt{'asyd'}.\\n"; + } + if (datemsg != '') { + message += "\\n"+datemsg; + } + } + if (choice == 'chgsec') { + var rolefilter = $docstart.$formname.showrole.options[$docstart.$formname.showrole.selectedIndex].value; + var retained = $docstart.$formname.retainsec.value; + var secshow = $docstart.$formname.newsecs.value; + if (secshow == '') { + if (rolefilter == 'st' || retained == 0 || retained == "") { + message += "\\n\\n$lt{'sewi'},\\n$lt{'ayes'},\\n$lt{'oryo'}.\\n"; + } else { + message += "\\n\\n$lt{'arol'}\\n$lt{'ayes'},\\n$lt{'oryo'}.\\n"; + } + } else { + if (rolefilter == 'st' || retained == 0 || retained == "") { + message += "\\n\\n$lt{'swbs'} "+secshow+".\\n"; + } else { + message += "\\n\\n$lt{'rwba'} "+secshow+".\\n"; + } + } + } + if (confirm(message)) { + $docstart.$formname.phase.value = 'bulkchange'; + $docstart.$formname.submit(); + window.close(); + } +POPUP + } + $output .= ' + } + } +} +'; + return $output; +} + sub print_username_link { my ($mode,$in) = @_; my $output; @@ -2691,7 +2753,7 @@ sub select_actions { } } if ($options) { - $output = ''."\n". + $output = ''; if ($choices{'dates'}) { @@ -2707,7 +2769,8 @@ sub select_actions { ''."\n". ''."\n". ''."\n". - ''."\n"; + ''."\n". + ''."\n"; if ($context eq 'course') { $output .= ''."\n"; } @@ -2733,20 +2796,6 @@ sub date_section_javascript { $output .= <<"ENDONE"; function opendatebrowser(callingform,formname,calledby) { var bulkaction = callingform.bulkaction.options[callingform.bulkaction.selectedIndex].value; - if (bulkaction == 'revoke' || bulkaction == 'delete' || bulkaction == '') { - if (calledby == 'go') { - if (bulkaction == 'revoke') { - alert("$nopopup{'revoke'}"); - } - if (bulkaction == 'delete') { - alert("$nopopup{'delete'}"); - } - if (bulkaction == '') { - alert("$nopopup{'none'}"); - } - } - return; - } var url = '/adm/createuser?'; var type = ''; var showrole = callingform.showrole.options[callingform.showrole.selectedIndex].value; @@ -2800,9 +2849,7 @@ END setSections(formname); if (seccheck == 'ok') { opener.document.$callingform.newsecs.value = formname.sections.value; - window.close(); } - return; END } else { if ($context eq 'course') { @@ -2836,13 +2883,22 @@ END opener.document.$callingform.enddate_hour.value = formname.enddate_hour.options[formname.enddate_hour.selectedIndex].value; opener.document.$callingform.enddate_minute.value = formname.enddate_minute.value; opener.document.$callingform.enddate_second.value = formname.enddate_second.value; - window.close(); + if (formname.no_end_date.checked) { + opener.document.$callingform.no_end_date.value = '1'; + } else { + opener.document.$callingform.no_end_date.value = '0'; + } END } - $output .= ' + my $verify_action_js = &bulkaction_javascript($callingform,'popup'); + $output .= <<"ENDJS"; + verify_action('actionlist'); } + +$verify_action_js + -'; +ENDJS my %lt = &Apache::lonlocal::texthash ( chac => 'Access dates to apply for selected users', chse => 'Changes in section affiliation to apply to selected users', @@ -2899,8 +2955,7 @@ END $output .= $info.$secbox; } $output .= ''.
-&mt('Use "Save" to update the main window with your selections.').'
'.
-'