--- loncom/interface/loncreateuser.pm 2009/02/05 12:19:50 1.277 +++ loncom/interface/loncreateuser.pm 2009/07/27 14:09:14 1.300 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Create a user # -# $Id: loncreateuser.pm,v 1.277 2009/02/05 12:19:50 raeburn Exp $ +# $Id: loncreateuser.pm,v 1.300 2009/07/27 14:09:14 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -225,12 +225,14 @@ sub build_tools_display { 'usde' => "Use default", 'uscu' => "Use custom", 'official' => 'Can request creation of official courses', - 'unofficial' => 'Can request creation of unofficial courses', + 'unofficial' => 'Can request creation of unofficial courses', + 'community' => 'Can request creation of communities', ); - if ($context eq 'requestcourse') { + if ($context eq 'requestcourses') { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, - 'requestcourse.official','requestcourse.unofficial'); - @usertools = ('official','unofficial'); + 'requestcourses.official','requestcourses.unofficial', + 'requestcourses.community'); + @usertools = ('official','unofficial','community'); } else { %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, 'tools.aboutme','tools.portfolio','tools.blog'); @@ -282,6 +284,40 @@ sub build_tools_display { return $output; } +sub coursereq_externaluser { + my ($ccuname,$ccdomain,$cdom) = @_; + my (@usertools,%userenv,$output); + my %lt = &Apache::lonlocal::texthash ( + 'official' => 'Can request creation of official courses', + 'unofficial' => 'Can request creation of unofficial courses', + 'community' => 'Can request creation of communities', + ); + + %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname, + 'reqcrsotherdom.official','reqcrsotherdom.unofficial', + 'reqcrsotherdom.community'); + @usertools = ('official','unofficial','community'); + foreach my $item (@usertools) { + my ($tool_on,$tool_off); + $tool_off = 'checked="checked" '; + if ($userenv{'reqcrsotherdom.'.$item} ne '') { + my @curr = split(',',$userenv{'reqcrsotherdom.'.$item}); + if (grep(/^\Q$cdom\E$/,@curr)) { + $tool_on = 'checked="checked" '; + $tool_off = ''; + } + } + $output .= &Apache::loncommon::start_data_table_row()."\n". + ' '.$lt{$item}.':  '."\n". + &Apache::loncommon::end_data_table_row()."\n"; + } + return $output; +} + # =================================================================== Phase one sub print_username_entry_form { @@ -337,7 +373,7 @@ sub print_username_entry_form { 'dom' => "Domain", 'ecrp' => "Edit Custom Role Privileges", 'nr' => "Name of Role", - 'cre' => "Custom Role Editor", + 'cre' => "Next", ); $r->print($start_page."\n".$crumbs); if ($env{'form.action'} eq 'custom') { @@ -347,7 +383,7 @@ sub print_username_entry_form {

$lt{'ecrp'}

-$lt{'nr'}: $choice
+$choice $lt{'nr'}:
ENDCUSTOM @@ -631,7 +667,7 @@ sub print_user_modification_page { &Apache::lonuserutils::can_create_user($ccdomain,$context, $usertype); if (!$cancreate) { - my $helplink = ' href="javascript:helpMenu('."'display'".')"'; + my $helplink = 'javascript:helpMenu('."'display'".')'; my %usertypetext = ( official => 'institutional', unofficial => 'non-institutional', @@ -641,7 +677,12 @@ sub print_user_modification_page { $response = ''.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain). '
'; } - $response .= ''.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the helpdesk for assistance.',$helplink).'

'; + $response .= '

' + .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.") + .' ' + .&mt('Please contact the [_1]helpdesk[_2] for assistance.' + ,'','') + .'


'; $env{'form.phase'} = ''; &print_username_entry_form($r,$context,$response); return; @@ -868,10 +909,15 @@ ENDCHANGEUSER $r->print(&Apache::lonuserutils::forceid_change($context)); } if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { - $r->print('

'.&mt('User Can Request Creation of Courses?').'

'. - &Apache::loncommon::start_data_table(). - &build_tools_display($ccuname,$ccdomain,'requestcourse'). - &Apache::loncommon::end_data_table()); + $r->print('

'.&mt('User Can Request Creation of Courses in this Domain?').'

'. + &Apache::loncommon::start_data_table()); + if ($env{'request.role.domain'} eq $ccdomain) { + $r->print(&build_tools_display($ccuname,$ccdomain,'requestcourses')); + } else { + $r->print(&coursereq_externaluser($ccuname,$ccdomain, + $env{'request.role.domain'})); + } + $r->print(&Apache::loncommon::end_data_table()); } $r->print(''); my $user_auth_text = &user_authentication($ccuname,$ccdomain,$formname); @@ -901,7 +947,7 @@ ENDNOPORTPRIV if (&Apache::lonnet::allowed('mut',$env{'request.role.domain'})) { my %lt=&Apache::lonlocal::texthash( 'utav' => "User Tools Availability", - 'yodo' => "You do not have privileges to modify Portfolio, Blog or Home Page settings for this user.", + 'yodo' => "You do not have privileges to modify Portfolio, Blog or Personal Information Page settings for this user.", 'ifch' => "If a change is required, contact a domain coordinator for the domain", ); $user_tools_text = <print('

'.$lt{'rer'}.'

'. +'
'.&mt($contextrole).'
'. &Apache::loncommon::start_data_table("LC_createuser"). &Apache::loncommon::start_data_table_header_row(). ''.$lt{'rev'}.''.$lt{'ren'}.''.$lt{'del'}. @@ -1283,7 +1338,7 @@ sub new_coauthor_roles { &Apache::loncommon::end_data_table_header_row()."\n". &Apache::loncommon::start_data_table_row().' - + '.$lt{'cau'}.' '.$cudom.'_'.$cuname.' @@ -1295,7 +1350,7 @@ sub new_coauthor_roles { "javascript:pjump('."'date_end','End Date Co-Author',document.cu.end_$cudom\_$cuname\_ca.value,'end_$cudom\_$cuname\_ca','cu.pres','dateset'".')">'.$lt{'sed'}.''."\n". &Apache::loncommon::end_data_table_row()."\n". &Apache::loncommon::start_data_table_row()."\n". -' +' '.$lt{'caa'}.' '.$cudom.'_'.$cuname.' @@ -1346,7 +1401,7 @@ sub new_domain_roles { $num_domain_level ++; $domaintext .= &Apache::loncommon::start_data_table_row(). -' +' '.$plrole.' '.$thisdomain.' @@ -1524,16 +1579,19 @@ sub modify_login_block { sub personal_data_display { my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray) = @_; - my ($output,$showforceid,%userenv,%canmodify); + my ($output,$showforceid,%userenv,%canmodify,%canmodify_status); my @userinfo = ('firstname','middlename','lastname','generation', 'permanentemail','id'); my $rowcount = 0; my $editable = 0; + %canmodify_status = + &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain, + ['inststatus'],$rolesarray); if (!$newuser) { # Get the users information %userenv = &Apache::lonnet::get('environment', ['firstname','middlename','lastname','generation', - 'permanentemail','id'],$ccdomain,$ccuname); + 'permanentemail','id','inststatus'],$ccdomain,$ccuname); %canmodify = &Apache::lonuserutils::can_modify_userinfo($context,$ccdomain, \@userinfo,$rolesarray); @@ -1549,7 +1607,8 @@ sub personal_data_display { 'generation' => "Generation", 'permanentemail' => "Permanent e-mail address", 'id' => "Student/Employee ID", - 'lg' => "Login Data" + 'lg' => "Login Data", + 'inststatus' => "Affiliation", ); my %textboxsize = ( firstname => '15', @@ -1587,11 +1646,15 @@ sub personal_data_display { } } else { if ($context eq 'selfcreate') { - if ($canmodify{$item}) { - $row .= ''; - $editable ++; + if (($item eq 'permanentemail') && ($newuser eq 'email')) { + $row .= $ccuname; } else { - $hiderow = 1; + if ($canmodify{$item}) { + $row .= ''; + $editable ++; + } else { + $hiderow = 1; + } } } else { $row .= ''; @@ -1613,6 +1676,30 @@ sub personal_data_display { $rowcount ++; } } + if (($canmodify_status{'inststatus'}) || ($context ne 'selfcreate')) { + my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($ccdomain); + if (ref($types) eq 'ARRAY') { + if (@{$types} > 0) { + my ($hiderow,$shown); + if ($canmodify_status{'inststatus'}) { + $shown = &pick_inst_statuses($userenv{'inststatus'},$usertypes,$types); + } else { + $shown .= $userenv{'inststatus'}; + if ($userenv{'inststatus'} eq '') { + $hiderow = 1; + } + } + if (!$hiderow) { + my $row = &Apache::lonhtmlcommon::row_title(&mt('Affliations'),undef,'LC_oddrow_value')."\n". + $shown.&Apache::lonhtmlcommon::row_closure(1); + if ($context eq 'selfcreate') { + $rowcount ++; + } + $output .= $row; + } + } + } + } $output .= &Apache::lonhtmlcommon::end_pick_box(); if (wantarray) { if ($context eq 'selfcreate') { @@ -1625,6 +1712,48 @@ sub personal_data_display { } } +sub pick_inst_statuses { + my ($curr,$usertypes,$types) = @_; + my ($output,$rem,@currtypes); + if ($curr ne '') { + @currtypes = map { &unescape($_); } split(/:/,$curr); + } + my $numinrow = 2; + if (ref($types) eq 'ARRAY') { + $output = ''; + my $lastcolspan; + for (my $i=0; $i<@{$types}; $i++) { + if (defined($usertypes->{$types->[$i]})) { + my $rem = $i%($numinrow); + if ($rem == 0) { + if ($i<@{$types}-1) { + if ($i > 0) { + $output .= ''; + } + $output .= ''; + } + } elsif ($i==@{$types}-1) { + my $colsleft = $numinrow - $rem; + if ($colsleft > 1) { + $lastcolspan = ' colspan="'.$colsleft.'"'; + } + } + my $check = ' '; + if (grep(/^\Q$types->[$i]\E$/,@currtypes)) { + $check = ' checked="checked" '; + } + $output .= ''; + } + } + $output .= '
'. + '
'; + } + return $output; +} + sub selfcreate_canmodify { my ($context,$dom,$userinfo,$inst_results,$rolesarray) = @_; if (ref($inst_results) eq 'HASH') { @@ -1713,8 +1842,8 @@ sub update_user_data { } if ( $env{'form.ccuname'} ne &LONCAPA::clean_username($env{'form.ccuname'}) ) { - $r->print($error.&mt('Invalid login name').'. '. - &mt('Only letters, numbers, periods, dashes, @, and underscores are valid').'.'. + $r->print($error.&mt('Invalid login name.').' '. + &mt('Only letters, numbers, periods, dashes, @, and underscores are valid.'). $end.$rtnlink); return; } @@ -1724,8 +1853,8 @@ sub update_user_data { } if ( $env{'form.ccdomain'} ne &LONCAPA::clean_domain($env{'form.ccdomain'}) ) { - $r->print($error.&mt ('Invalid domain name').'. '. - &mt('Only letters, numbers, periods, dashes, and underscores are valid').'.'. + $r->print($error.&mt('Invalid domain name.').' '. + &mt('Only letters, numbers, periods, dashes, and underscores are valid.'). $end.$rtnlink); return; } @@ -1773,7 +1902,9 @@ sub update_user_data { $env{'form.ccuname'}, $env{'form.ccdomain'}).''); my (%alerts,%rulematch,%inst_results,%curr_rules); my @usertools = ('aboutme','blog','portfolio'); - my @requestcourses = ('official','unofficial'); + my @requestcourses = ('official','unofficial','community'); + my ($othertitle,$usertypes,$types) = + &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'}); if ($env{'form.makeuser'}) { $r->print('

'.&mt('Creating new account.').'

'); # Check for the authentication mode and password @@ -1851,11 +1982,16 @@ sub update_user_data { \%changeHash,'tools'); } } - if (&Apache::lonnet::allowed('ccc',$env{'request.domain'})) { - foreach my $item (@requestcourses) { - $newcustom{$item} = $env{'form.requestcourse_'.$item}; - $changed{$item} = &tool_admin($item,$newcustom{$item}, - \%changeHash,'requestcourse'); + foreach my $item (@requestcourses) { + $newcustom{$item} = $env{'form.requestcourses_'.$item}; + $changed{$item} = &tool_admin($item,$newcustom{$item}, + \%changeHash,'requestcourses'); + } + if (exists($env{'form.inststatus'})) { + my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); + if (@inststatuses > 0) { + $changeHash{'inststatus'} = join(',',@inststatuses); + $changed{'inststatus'} = $changeHash{'inststatus'}; } } if (keys(%changed)) { @@ -1902,8 +2038,10 @@ sub update_user_data { my %userenv = &Apache::lonnet::get ('environment',['firstname','middlename','lastname','generation', 'id','permanentemail','portfolioquota','inststatus','tools.aboutme', - 'tools.blog','tools.portfolio','requestcourse.official', - 'requestcourse.unofficial'], + 'tools.blog','tools.portfolio','requestcourses.official', + 'requestcourses.unofficial','requestcourses.community', + 'reqcrsotherdom.official','reqcrsotherdom.unofficial', + 'reqcrsotherdom.community'], $env{'form.ccdomain'},$env{'form.ccuname'}); my ($tmp) = keys(%userenv); if ($tmp =~ /^(con_lost|error)/i) { @@ -2005,7 +2143,7 @@ sub update_user_data { (!$forceid)) { if ($env{'form.cid'} ne $uidhash{$env{'form.ccuname'}}) { $env{'form.cid'} = $userenv{'id'}; - $no_forceid_alert = &mt('New Student/Employee ID does not match existing ID for this user.') + $no_forceid_alert = &mt('New student/employee ID does not match existing ID for this user.') .'
' .&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.") .'
'."\n"; @@ -2026,12 +2164,13 @@ sub update_user_data { } } } - my ($quotachanged,$oldportfolioquota,$newportfolioquota, - $inststatus,$oldisdefault,$newisdefault,$olddefquotatext, - $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext); + my ($quotachanged,$oldportfolioquota,$newportfolioquota,$oldinststatus, + $inststatus,$newinststatus,$oldisdefault,$newisdefault,$olddefquotatext, + $newdefquotatext,%oldaccess,%oldaccesstext,%newaccess,%newaccesstext, + $oldinststatuses,$newinststatuses); my ($defquota,$settingstatus) = &Apache::loncommon::default_quota($env{'form.ccdomain'},$inststatus); - my ($showquota,$showtools,$showrequestcourses); + my ($showquota,$showtools,$showrequestcourses,$showinststatus,$showreqotherdom); if (&Apache::lonnet::allowed('mpq',$env{'form.ccdomain'})) { $showquota = 1; } @@ -2040,8 +2179,49 @@ sub update_user_data { } if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) { $showrequestcourses = 1; + } elsif (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { + $showreqotherdom = 1; + } + if (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'})) { + $showinststatus = 1; } my (%changeHash,%changed); + $oldinststatus = $userenv{'inststatus'}; + if ($oldinststatus eq '') { + $oldinststatuses = $othertitle; + } else { + if (ref($usertypes) eq 'HASH') { + $oldinststatuses = join(', ',map{ $usertypes->{ &unescape($_) }; } (split(/:/,$userenv{'inststatus'}))); + } else { + $oldinststatuses = join(', ',map{ &unescape($_); } (split(/:/,$userenv{'inststatus'}))); + } + } + $changeHash{'inststatus'} = $userenv{'inststatus'}; + my %canmodify_inststatus = &Apache::lonuserutils::can_modify_userinfo($context,$env{'form.ccdomain'},['inststatus'],\@userroles); + if ($canmodify_inststatus{'inststatus'}) { + if (exists($env{'form.inststatus'})) { + my @inststatuses = &Apache::loncommon::get_env_multiple('form.inststatus'); + if (@inststatuses > 0) { + $newinststatus = join(':',map { &escape($_); } @inststatuses); + $changeHash{'inststatus'} = $newinststatus; + if ($newinststatus ne $oldinststatus) { + $changed{'inststatus'} = $newinststatus; + } + if (ref($usertypes) eq 'HASH') { + $newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); + } else { + $newinststatuses = join(', ',map{ $usertypes->{$_}; } (@inststatuses)); + } + } else { + $newinststatus = ''; + $changeHash{'inststatus'} = $newinststatus; + $newinststatuses = $othertitle; + if ($newinststatus ne $oldinststatus) { + $changed{'inststatus'} = $changeHash{'inststatus'}; + } + } + } + } $changeHash{'portfolioquota'} = $userenv{'portfolioquota'}; if ($userenv{'portfolioquota'} ne '') { $oldportfolioquota = $userenv{'portfolioquota'}; @@ -2058,7 +2238,7 @@ sub update_user_data { } else { $changed{'quota'} = "a_admin('',\%changeHash); $newportfolioquota = $defquota; - $newisdefault = 1; + $newisdefault = 1; } } else { $oldisdefault = 1; @@ -2084,8 +2264,14 @@ sub update_user_data { } &tool_changes('tools',\@usertools,\%oldaccess,\%oldaccesstext,\%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext); - &tool_changes('requestcourse',\@requestcourses,\%oldaccess,\%oldaccesstext, - \%userenv, \%changeHash,\%changed,\%newaccess,\%newaccesstext); + if ($env{'form.ccdomain'} eq $env{'request.role.domain'}) { + &tool_changes('requestcourses',\@requestcourses,\%oldaccess,\%oldaccesstext, + \%userenv,\%changeHash,\%changed,\%newaccess,\%newaccesstext); + } else { + &tool_changes('reqcrsotherdom',\@requestcourses,\%oldaccess,\%oldaccesstext, + \%userenv, + \%changeHash,\%changed,\%newaccess,\%newaccesstext); + } if ($env{'form.cfirstname'} ne $userenv{'firstname'} || $env{'form.cmiddlename'} ne $userenv{'middlename'} || $env{'form.clastname'} ne $userenv{'lastname'} || @@ -2111,17 +2297,28 @@ sub update_user_data { ($env{'user.domain'} eq $env{'form.ccdomain'})) { my %newenvhash; foreach my $key (keys(%changed)) { - if (($key eq 'official') || ($key eq 'unofficial')) { - $newenvhash{'environment.canrequest.'.$key} = - $changeHash{'requestcourse.'.$key}; - $newenvhash{'environment.canrequest.'.$key} = - $changeHash{'requestcourse.'.$key}; - + if (($key eq 'official') || ($key eq 'unofficial') + || ($key eq 'community')) { + $newenvhash{'environment.requestcourses.'.$key} = + $changeHash{'requestcourses.'.$key}; + if ($changeHash{'requestcourses.'.$key} ne '') { + $newenvhash{'environment.canrequest.'.$key} = + $changeHash{'requestcourses.'.$key}; + } else { + $newenvhash{'environment.canrequest.'.$key} = + &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, + $key,'reload','requestcourses'); + } } elsif ($key ne 'quota') { $newenvhash{'environment.tools.'.$key} = $changeHash{'tools.'.$key}; - $newenvhash{'environment.availabletools.'.$key} = - $changeHash{'tools.'.$key}; + if ($changeHash{'tools.'.$key} ne '') { + $newenvhash{'environment.availabletools.'.$key} = + $changeHash{'tools.'.$key}; + } else { + $newenvhash{'environment.availabletools.'.$key} = + &Apache::lonnet::usertools_access($env{'user.name'},$env{'user.domain'}, $key,'reload','tools'); + } } } if (keys(%newenvhash)) { @@ -2150,21 +2347,23 @@ sub update_user_data { ((keys(%changed) > 0) && $chgresult eq 'ok')) { # Tell the user we changed the name my %lt=&Apache::lonlocal::texthash( - 'uic' => "User Information Changed", - 'frst' => "First", - 'mddl' => "Middle", - 'lst' => "Last", - 'gen' => "Generation", - 'id' => "Student/Employee ID", - 'mail' => "Permanent E-mail", - 'disk' => "Disk space allocated to portfolio files", - 'blog' => "Blog Availability", - 'aboutme' => "Home Page Availability", - 'portfolio' => "Portfolio Availability", - 'official' => "Can Request Official Courses", - 'unofficial' => "Can Request Unofficial Courses", - 'prvs' => "Previous", - 'chto' => "Changed To" + 'uic' => 'User Information Changed', + 'frst' => 'First Name', + 'mddl' => 'Middle Name', + 'lst' => 'Last Name', + 'gen' => 'Generation', + 'id' => 'Student/Employee ID', + 'mail' => 'Permanent e-mail address', + 'disk' => 'Disk space allocated to portfolio files', + 'blog' => 'Blog Availability', + 'aboutme' => 'Personal Information Page Availability', + 'portfolio' => 'Portfolio Availability', + 'official' => 'Can Request Official Courses', + 'unofficial' => 'Can Request Unofficial Courses', + 'community' => 'Can Request Communities', + 'inststatus' => "Affiliation", + 'prvs' => 'Previous Value:', + 'chto' => 'Changed To:' ); $r->print('

'.$lt{'uic'}.'

'. &Apache::loncommon::start_data_table(). @@ -2178,11 +2377,20 @@ sub update_user_data { $lt{'id'} $lt{'mail'} END + if ($showinststatus) { + $r->print(" + $lt{'inststatus'}\n"); + } if ($showrequestcourses) { foreach my $item (@requestcourses) { $r->print(" $lt{$item}\n"); } + } elsif ($showreqotherdom) { + foreach my $item (@requestcourses) { + $r->print(" + $lt{$item}\n"); + } } if ($showquota) { $r->print(" @@ -2205,11 +2413,20 @@ END $userenv{'id'} $userenv{'permanentemail'} END + if ($showinststatus) { + $r->print(" + $oldinststatuses\n"); + } if ($showrequestcourses) { foreach my $item (@requestcourses) { $r->print(" $oldaccess{$item} $oldaccesstext{$item}\n"); } + } elsif ($showreqotherdom) { + foreach my $item (@requestcourses) { + $r->print(" + $oldaccess{$item} $oldaccesstext{$item}\n"); + } } if ($showquota) { $r->print(" @@ -2232,11 +2449,20 @@ END $env{'form.cid'} $env{'form.cpermanentemail'} END + if ($showinststatus) { + $r->print(" + $newinststatuses\n"); + } if ($showrequestcourses) { foreach my $item (@requestcourses) { $r->print(" $newaccess{$item} $newaccesstext{$item} \n"); } + } elsif ($showreqotherdom) { + foreach my $item (@requestcourses) { + $r->print(" + $newaccess{$item} $newaccesstext{$item} \n"); + } } if ($showquota) { $r->print(" @@ -2281,13 +2507,15 @@ END # but we can still tell them what the name and quota and availabilities are my %lt=&Apache::lonlocal::texthash( 'id' => "Student/Employee ID", - 'mail' => "Permanent e-mail", + 'mail' => "Permanent e-mail address", 'disk' => "Disk space allocated to user's portfolio files", 'blog' => "Blog Availability", - 'aboutme' => "Home Page Availability", + 'aboutme' => "Personal Information Page Availability", 'portfolio' => "Portfolio Availability", 'official' => "Can Request Official Courses", - 'unofficial' => "Can Request Unofficial Course", + 'unofficial' => "Can Request Unofficial Courses", + 'community' => "Can Request Communities", + 'inststatus' => "Affiliation", ); $r->print(<<"END");

$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'} @@ -2296,11 +2524,19 @@ END $r->print('
['.$lt{'mail'}.': '. $userenv{'permanentemail'}.']'); } + if ($showinststatus) { + $r->print('
['.$lt{'inststatus'}.': '.$oldinststatuses.']'); + } if ($showrequestcourses) { foreach my $item (@requestcourses) { $r->print('
['.$lt{$item}.': '.$newaccess{$item}.' '. $newaccesstext{$item}.']'."\n"); } + } elsif ($showreqotherdom) { + foreach my $item (@requestcourses) { + $r->print('
['.$lt{$item}.': '.$newaccess{$item}.' '. + $newaccesstext{$item}.']'."\n"); + } } if ($showtools) { foreach my $item (@usertools) { @@ -2337,8 +2573,11 @@ END } else { $r->print(&mt("You do not have the authority to change these fields given the user's current set of active/future [_1] roles:",$contextname)); } - $r->print(''.$rolestr.'
'. - &mt('Contact your helpdesk for more information.',"javascript:helpMenu('display')").'
'); + my $helplink = 'javascript:helpMenu('."'display'".')'; + $r->print(''.$rolestr.'
' + .&mt('Please contact your [_1]helpdesk[_2] for more information.' + ,'','') + .'
'); } $r->print('' .$no_forceid_alert @@ -2389,6 +2628,59 @@ sub tool_changes { (ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) { return; } + if ($context eq 'reqcrsotherdom') { + my $cdom = $env{'request.role.domain'}; + foreach my $tool (@{$usertools}) { + $oldaccesstext->{$tool} = &mt('no'); + $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool}; + if ($userenv->{$context.'.'.$tool} eq '') { + if ($env{'form.'.$context.'_'.$tool}) { + $changed->{$tool}=&tool_admin($tool,$cdom, + $changeHash,$context); + if ($changed->{$tool}) { + $newaccesstext->{$tool} = &mt('yes'); + } else { + $newaccesstext->{$tool} = $oldaccesstext->{$tool}; + } + } + } else { + my @curr = split(',',$userenv->{$context.'.'.$tool}); + my @new; + my $changedoms; + if (grep(/^\Q$cdom\E$/,@curr)) { + $oldaccesstext->{$tool} = &mt('yes'); + unless ($env{'form.'.$context.'_'.$tool}) { + $changedoms = 1; + foreach my $dom (@curr) { + unless ($dom eq $cdom) { + push(@new,$dom); + } + } + } + } elsif ($env{'form.'.$context.'_'.$tool}) { + $changedoms = 1; + @new = sort(@curr,$cdom); + } + $newaccesstext->{$tool} = $oldaccesstext->{$tool}; + if ($changedoms) { + my $newdomstr; + if (@new) { + $newdomstr = join(',',@new); + } + $changed->{$tool}=&tool_admin($tool,$newdomstr,$changeHash, + $context); + if ($changed->{$tool}) { + if ($env{'form.'.$context.'_'.$tool}) { + $newaccesstext->{$tool} = &mt('yes'); + } else { + $newaccesstext->{$tool} = &mt('no'); + } + } + } + } + } + return; + } foreach my $tool (@{$usertools}) { if ($userenv->{$context.'.'.$tool} ne '') { $oldaccess->{$tool} = &mt('custom'); @@ -2397,9 +2689,9 @@ sub tool_changes { } else { $oldaccesstext->{$tool} = &mt("availability set to 'off'"); } - $changeHash->{$context.'.'.$tool} = $userenv->{'tools.'.$tool}; + $changeHash->{$context.'.'.$tool} = $userenv->{$context.'.'.$tool}; if ($env{'form.custom'.$tool} == 1) { - if ($env{'form.'.$context.'_'.$tool} ne $userenv->{'tools.'.$tool}) { + if ($env{'form.'.$context.'_'.$tool} ne $userenv->{$context.'.'.$tool}) { $changed->{$tool} = &tool_admin($tool,$env{'form.'.$context.'_'.$tool}, $changeHash,$context); if ($changed->{$tool}) { @@ -2428,9 +2720,9 @@ sub tool_changes { } else { $newaccess->{$tool} = $oldaccess->{$tool}; if ($userenv->{$context.'.'.$tool}) { - $newaccesstext->{$tool} = &mt("availability set to 'on'"); + $newaccesstext->{$tool} = &mt("availability set to 'on'"); } else { - $newaccesstext->{$tool} = &mt("availability set to 'off'"); + $newaccesstext->{$tool} = &mt("availability set to 'off'"); } } } @@ -2524,8 +2816,8 @@ sub update_roles { if ($key=~m{^form\.del\:([^_]+)_cr\.cr/($match_domain)/($match_username)/(\w+)$}) { my ($url,$rdom,$rnam,$rolename) = ($1,$2,$3,$4); # Delete custom role - $r->print(&mt('Deleting custom role [_1] by [_2]:[_3] in [_4]', - $rolename,$rnam,$rdom,$url).': '. + $r->print(&mt('Deleting custom role [_1] by [_2] in [_3]', + $rolename,$rnam.':'.$rdom,$url).': '. &Apache::lonnet::assigncustomrole($env{'form.ccdomain'}, $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now, 0,1,$context).'
'); @@ -2576,8 +2868,8 @@ sub update_roles { my $result = &Apache::lonnet::assigncustomrole( $env{'form.ccdomain'}, $env{'form.ccuname'}, $url,$rdom,$rnam,$rolename,0,$now,undef,$context); - $r->print(&mt('Re-enabling custom role [_1] by [_2]:[_3] in [_4] : [_5]', - $rolename,$rnam,$rdom,$url,''.$result.'').'
'); + $r->print(&mt('Re-enabling custom role [_1] by [_2] in [_3]: [_4]', + $rolename,$rnam.':'.$rdom,$url,''.$result.'').'
'); if (!grep(/^cr$/,@rolechanges)) { push(@rolechanges,'cr'); } @@ -2823,10 +3115,14 @@ sub quota_admin { sub tool_admin { my ($tool,$settool,$changeHash,$context) = @_; my $canchange = 0; - if ($context eq 'requestcourse') { + if ($context eq 'requestcourses') { if (&Apache::lonnet::allowed('ccc',$env{'form.ccdomain'})) { $canchange = 1; } + } elsif ($context eq 'reqcrsotherdom') { + if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) { + $canchange = 1; + } } elsif (&Apache::lonnet::allowed('mut',$env{'form.ccdomain'})) { # Current user has quota modification privileges $canchange = 1; @@ -2993,14 +3289,14 @@ ENDCCF my $privtext = &Apache::lonnet::plaintext($priv); $r->print(&Apache::loncommon::start_data_table_row(). ''.$privtext.''. - ($courselevel{$priv}?'':' '). + ($courselevel{$priv}?'':' '). ''. - ($domainlevel{$priv}?'':' '). + ($domainlevel{$priv}?'':' '). ''. - ($systemlevel{$priv}?'':' '). + ($systemlevel{$priv}?'':' '). ''. &Apache::loncommon::end_data_table_row()); } @@ -3009,7 +3305,7 @@ ENDCCF ''."\n".''."\n". ''."\n". - ''. + ''. &Apache::loncommon::end_page()); } # -------------------------------------------------------- @@ -3192,8 +3488,11 @@ sub handler { if ($env{'form.action'} ne 'dateselect') { &Apache::lonhtmlcommon::add_breadcrumb ({href=>"/adm/createuser", - text=>"User Management"}); + text=>"User Management", + help=>'Course_Create_Class_List,Course_Change_Privileges,Course_View_Class_List,Course_Editing_Custom_Roles,Course_Add_Student,Course_Drop_Student,Course_Automated_Enrollment,Course_Self_Enrollment,Course_Manage_Group'}); } + #SD Following files not added to help, because the corresponding .tex-files seem to + #be missing: Course_Approve_Selfenroll,Course_User_Logs, my ($permission,$allowed) = &Apache::lonuserutils::get_permission($context); if (!$allowed) { @@ -3487,141 +3786,160 @@ END sub print_main_menu { my ($permission,$context) = @_; my %links = ( - domain => { - upload => 'Upload a File of Users', - singleuser => 'Add/Modify a Single User', - listusers => 'Manage Multiple Users', - }, - author => { - upload => 'Upload a File of Co-authors', - singleuser => 'Add/Modify a Single Co-author', - listusers => 'Display Co-authors and Manage Multiple Users', - }, - course => { - upload => 'File of Course Users', - singleuser => 'Single Course User', - listusers => 'Course User Lists', - }, - ); - my @menu = ( {categorytitle => 'Add Users', - items => - [{ - linktext => $links{$context}{'upload'}, - icon => 'sctr.png', - #help => 'Course_Create_Class_List', - url => '/adm/createuser?action=upload', - permission => $permission->{'cusr'}, - linktitle => 'Upload a CSV or a text file containing users.', - }, - { - linktext => $links{$context}{'singleuser'}, - icon => 'edit-redo.png', - #help => 'Course_Change_Privileges', - url => '/adm/createuser?action=singleuser', - permission => $permission->{'cusr'}, - linktitle => 'Add a user with a certain role to this course.', - }]}, - {categorytitle => 'Administration', - items => - [{ - linktext => $links{$context}{'listusers'}, - icon => 'edit-find.png', - #help => 'Course_View_Class_List', - url => '/adm/createuser?action=listusers', - permission => ($permission->{'view'} || $permission->{'cusr'}), - linktitle => 'Show and manage users of this course.', - }]}, - {categorytitle => 'Configuration', - items => - [ - ]}, - ); - + domain => { + upload => 'Upload a File of Users', + singleuser => 'Add/Modify a User', + listusers => 'Manage Users', + }, + author => { + upload => 'Upload a File of Co-authors', + singleuser => 'Add/Modify a Co-author', + listusers => 'Manage Co-authors', + }, + course => { + upload => 'Upload a File of Course Users', + singleuser => 'Add/Modify a Course User', + listusers => 'Manage Course Users', + }, + ); + my @menu = ( {categorytitle => 'Single Users', + items => + [ + { + linktext => $links{$context}{'singleuser'}, + icon => 'edit-redo.png', + #help => 'Course_Change_Privileges', + url => '/adm/createuser?action=singleuser', + permission => $permission->{'cusr'}, + linktitle => 'Add a user with a certain role to this course.', + }, + ]}, + + {categorytitle => 'Multiple Users', + items => + [ + { + linktext => $links{$context}{'upload'}, + icon => 'sctr.png', + #help => 'Course_Create_Class_List', + url => '/adm/createuser?action=upload', + permission => $permission->{'cusr'}, + linktitle => 'Upload a CSV or a text file containing users.', + }, + { + linktext => $links{$context}{'listusers'}, + icon => 'edit-find.png', + #help => 'Course_View_Class_List', + url => '/adm/createuser?action=listusers', + permission => ($permission->{'view'} || $permission->{'cusr'}), + linktitle => 'Show and manage users of this course.', + }, + + ]}, + + {categorytitle => 'Administration', + items => [ ]}, + ); + if ($context eq 'domain'){ - - push(@{ $menu[1]->{items} }, - { linktext => 'Custom Roles', - icon => 'emblem-photos.png', - #help => 'Course_Editing_Custom_Roles', - url => '/adm/createuser?action=custom', - permission => $permission->{'custom'}, - linktitle => 'Configure a custom role.', - }); - + + push(@{ $menu[2]->{items} }, #Category: Administration + { + linktext => 'Custom Roles', + icon => 'emblem-photos.png', + #help => 'Course_Editing_Custom_Roles', + url => '/adm/createuser?action=custom', + permission => $permission->{'custom'}, + linktitle => 'Configure a custom role.', + }, + ); + }elsif ($context eq 'course'){ - my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); - - push(@{ $menu[0]->{items} }, - { linktext => 'Single Student', - #help => 'Course_Add_Student', - icon => 'list-add.png', - url => '/adm/createuser?action=singlestudent', - permission => $permission->{'cusr'}, - linktitle => 'Add a user with the role student to this course.', - }); - - push(@{ $menu[1]->{items} }, - { linktext => 'Drop Students', - icon => 'edit-undo.png', - #help => 'Course_Drop_Student', - url => '/adm/createuser?action=drop', - permission => $permission->{'cusr'}, - linktitle =>'Remove a student from this course.', - }, - { linktext => 'Custom Roles', - icon => 'emblem-photos.png', - #help => 'Course_Editing_Custom_Roles', - url => '/adm/createuser?action=custom', - permission => $permission->{'custom'}, - linktitle => 'Configure a custom role.', - }); + my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity(); + + push(@{ $menu[0]->{items} }, #Category: Single Users + { + linktext => 'Add/Modify a Student', + #help => 'Course_Add_Student', + icon => 'list-add.png', + url => '/adm/createuser?action=singlestudent', + permission => $permission->{'cusr'}, + linktitle => 'Add a user with the role student to this course.', + }, + ); + + push(@{ $menu[1]->{items} }, #Category: Multiple Users + { + linktext => 'Drop Students', + icon => 'edit-undo.png', + #help => 'Course_Drop_Student', + url => '/adm/createuser?action=drop', + permission => $permission->{'cusr'}, + linktitle =>'Remove a student from this course.', + }, + ); + push(@{ $menu[2]->{items} }, #Category: Administration + { + linktext => 'Custom Roles', + icon => 'emblem-photos.png', + #help => 'Course_Editing_Custom_Roles', + url => '/adm/createuser?action=custom', + permission => $permission->{'custom'}, + linktitle => 'Configure a custom role.', + }, + { + linktext => 'Course Groups', + icon => 'conf.png', + #help => 'Course_Manage_Group', + url => '/adm/coursegroups?refpage=cusr', + permission => $permission->{'grp_manage'}, + linktitle => 'Manage course groups.', + }, + { + linktext => 'Change Logs', + icon => 'document-properties.png', + #help => 'Course_User_Logs', + url => '/adm/createuser?action=changelogs', + permission => $permission->{'cusr'}, + linktitle => 'View change log.', + }, + ); if ($env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_approval'}) { - push(@{ $menu[1]->{items} }, - { linktext => 'Enrollment Requests', - icon => 'selfenrl-queue.png', - #help => 'Course_Approve_Selfenroll', - url => '/adm/createuser?action=selfenrollqueue', - permission => $permission->{'cusr'}, - linktitle =>'Approve or reject enrollment requests.', - }); + push(@{ $menu[2]->{items} }, + { + linktext => 'Enrollment Requests', + icon => 'selfenrl-queue.png', + #help => 'Course_Approve_Selfenroll', + url => '/adm/createuser?action=selfenrollqueue', + permission => $permission->{'cusr'}, + linktitle =>'Approve or reject enrollment requests.', + }, + ); } - + if (!exists($permission->{'cusr_section'})){ - - push(@{ $menu[2]->{items} }, - { linktext => 'Automated Enrollment', - icon => 'roles.png', - #help => 'Course_Automated_Enrollment', - permission => (&Apache::lonnet::auto_run($cnum,$cdom) - && $permission->{'cusr'}), - url => '/adm/populate', - linktitle => 'Automated enrollment manager.', - }, - { linktext => 'User Self-Enrollment', - icon => 'cstr.png', - #help => 'Course_Self_Enrollment', - url => '/adm/createuser?action=selfenroll', - permission => $permission->{'cusr'}, - linktitle => 'Configure user self enrollment.', - }); - - } - - push(@{ $menu[2]->{items} }, - { linktext => 'Course Groups', - icon => 'conf.png', - #help => 'Course_Manage_Group', - url => '/adm/coursegroups?refpage=cusr', - permission => $permission->{'grp_manage'}, - linktitle => 'Manage course groups.', - }, - { linktext => 'Change Logs', - icon => 'document-properties.png', - #help => 'Course_User_Logs', - url => '/adm/createuser?action=changelogs', - permission => $permission->{'cusr'}, - linktitle => 'View change log.', - }); + + push(@{ $menu[2]->{items} }, + { + linktext => 'Automated Enrollment', + icon => 'roles.png', + #help => 'Course_Automated_Enrollment', + permission => (&Apache::lonnet::auto_run($cnum,$cdom) + && $permission->{'cusr'}), + url => '/adm/populate', + linktitle => 'Automated enrollment manager.', + }, + { + linktext => 'User Self-Enrollment', + icon => 'cstr.png', + #help => 'Course_Self_Enrollment', + url => '/adm/createuser?action=selfenroll', + permission => $permission->{'cusr'}, + linktitle => 'Configure user self enrollment.', + }, + ); + + } }; return Apache::lonhtmlcommon::generate_menu(@menu); # { text => 'View Log-in History', @@ -3831,9 +4149,10 @@ ENDSCRIPT my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum); if (ref($visactions) eq 'HASH') { if ($visible) { - $output .= '

'.$visactions->{'vis'}.'

'; + $output .= '

'.$visactions->{'vis'}.'

'; } else { - $output .= $visactions->{'miss'}.'
'.$visactions->{'yous'}. + $output .= '

'.$visactions->{'miss'}.'

' + .$visactions->{'yous'}. '

'.$visactions->{'gen'}.'
'.$visactions->{'coca'}; if (ref($vismsgs) eq 'ARRAY') { $output .= '
'.$visactions->{'make'}.'

    '; @@ -3853,9 +4172,7 @@ ENDSCRIPT if (ref($lt) eq 'HASH') { $title = $lt->{$item}; } - $output .= - &Apache::lonhtmlcommon::row_title($title, - 'LC_selfenroll_pick_box_title','LC_oddrow_value')."\n"; + $output .= &Apache::lonhtmlcommon::row_title($title); if ($item eq 'types') { my $curr_types = $env{'course.'.$env{'request.course.id'}.'.internal.selfenroll_types'}; my $showdomdesc = 1; @@ -4065,7 +4382,7 @@ ENDSCRIPT $selflimit = ' '; } $output .= '