--- loncom/interface/loncreateuser.pm	2009/02/05 17:15:04	1.278
+++ loncom/interface/loncreateuser.pm	2009/08/14 14:21:00	1.295.2.4
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.278 2009/02/05 17:15:04 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.295.2.4 2009/08/14 14:21:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -143,6 +143,7 @@ sub portfolio_quota {
     $custom_off = ' checked="checked" ';
     my $quota_javascript = <<"END_SCRIPT";
 <script type="text/javascript">
+// <![CDATA[
 function quota_changes(caller) {
     if (caller == "custom") {
         if (document.cu.customquota[0].checked) {
@@ -153,6 +154,7 @@ function quota_changes(caller) {
         document.cu.customquota[1].checked = true;
     }
 }
+// ]]>
 </script>
 END_SCRIPT
     if ($quotatype eq 'custom') {
@@ -227,9 +229,9 @@ sub build_tools_display {
                    'official'   => 'Can request creation of official courses',
                    'unofficial' => 'Can request creation of unofficial courses',  
     );
-    if ($context eq 'requestcourse') {
+    if ($context eq 'requestcourses') {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
-                      'requestcourse.official','requestcourse.unofficial');
+                      'requestcourses.official','requestcourses.unofficial');
         @usertools = ('official','unofficial');
     } else {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
@@ -282,6 +284,94 @@ sub build_tools_display {
     return $output;
 }
 
+sub coursereq_externaluser {
+    my ($ccuname,$ccdomain,$cdom) = @_;
+    my (@usertools,@options,%validations,%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');
+    @options = ('approve','validate','autolimit');
+    %validations = &Apache::lonnet::auto_courserequest_checks($cdom);
+    my $optregex = join('|',@options);
+    my %reqtitles = &courserequest_titles();
+    foreach my $item (@usertools) {
+        my ($curroption,$currlimit,$tooloff);
+        if ($userenv{'reqcrsotherdom.'.$item} ne '') {
+            my @curr = split(',',$userenv{'reqcrsotherdom.'.$item});
+            if (grep(/^\Q$cdom\E:($optregex)=?(\d*)$/,@curr)) {
+                $curroption = $1;
+                $currlimit = $2;
+                if (!$curroption) {
+                    $curroption = 'norequest';
+                }
+            }
+        } else {
+            $curroption = 'norequest';
+            $tooloff = ' checked="checked"';
+        }
+        $output.= &Apache::loncommon::start_data_table_row()."\n".
+                  '  <td><span class="LC_nobreak">'.$lt{$item}.': '.
+                  '<label><input type="radio" name="reqcrsotherdom_'.$item.
+                  '" value="0"'.$tooloff.' />'.$reqtitles{'norequest'}.
+                  '</label>&nbsp;';
+        foreach my $option (@options) {
+            if ($option eq 'validate') {
+                my $canvalidate = 0;
+                if (ref($validations{$item}) eq 'HASH') {
+                    if ($validations{$item}{'_external_'}) {
+                        $canvalidate = 1;
+                    }
+                }
+                next if (!$canvalidate);
+            }
+            my $checked = '';
+            if ($option eq $curroption) {
+                $checked = ' checked="checked"';
+            }
+            $output .= '<span class="LC_nobreak"><label>'.
+                       '<input type="radio" name="reqcrsotherdom_'.$item.
+                       '" value="'.$option.'"'.$checked.' />'.
+                       $reqtitles{$option}.'</label>&nbsp;';
+            if ($option eq 'autolimit') {
+                $output .= '<input type="text" name="reqcrsotherdom_'.
+                           $item.'_limit" size="1" '.
+                           'value="'.$currlimit.'" />';
+            }
+            $output .= '&nbsp;'
+        }
+        $output .= '</span></td>'."\n".
+                   &Apache::loncommon::end_data_table_row()."\n";
+    }
+    return $output;
+}
+
+sub courserequest_titles {
+    my %titles = &Apache::lonlocal::texthash (
+                                   official   => 'Official',                                   unofficial => 'Unofficial',
+                                   community  => 'Communities',                                   norequest  => 'Not allowed',
+                                   approve    => 'Approval by Dom. Coord.',
+                                   validate   => 'With validation',
+                                   autolimit  => 'Numerical limit',
+                 );
+    return %titles;   
+}                     
+    
+sub courserequest_display {
+    my %titles = &Apache::lonlocal::texthash (
+                                   approve    => 'Yes, need approval',
+                                   validate   => 'Yes, with validation',
+                                   norequest  => 'No',
+   );   
+   return %titles;
+}
+
 # =================================================================== Phase one
 
 sub print_username_entry_form {
@@ -299,7 +389,9 @@ sub print_username_entry_form {
 
     my $jscript = &Apache::loncommon::studentbrowser_javascript()."\n".
         '<script type="text/javascript">'."\n".
-        &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset}).
+        '// <![CDATA['."\n".
+        &Apache::lonhtmlcommon::set_form_elements($elements->{$formtoset})."\n".
+        '// ]]>'."\n".
         '</script>'."\n";
 
     my %loaditems = (
@@ -337,7 +429,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 +439,7 @@ sub print_username_entry_form {
 <input type="hidden" name="action" value="$env{'form.action'}" />
 <input type="hidden" name="phase" value="selected_custom_edit" />
 <h3>$lt{'ecrp'}</h3>
-$lt{'nr'}: $choice <input type="text" size="15" name="newrolename" /><br />
+$choice $lt{'nr'}: <input type="text" size="15" name="newrolename" /><br />
 <input name="customeditor" type="submit" value="$lt{'cre'}" />
 </form>
 ENDCUSTOM
@@ -466,6 +558,7 @@ sub user_modification_js {
     
     return <<END;
 <script type="text/javascript" language="Javascript">
+// <![CDATA[
 
     function pclose() {
         parmwin=window.open("/adm/rat/empty.html","LONCAPAparms",
@@ -483,7 +576,7 @@ sub user_modification_js {
     }
 
     $nondc_setsection_code
-
+// ]]>
 </script>
 END
 }
@@ -502,6 +595,7 @@ sub print_user_selection_page {
 
     my $jscript = (<<ENDSCRIPT);
 <script type="text/javascript">
+// <![CDATA[
 function pickuser(uname,udom) {
     document.usersrchform.seluname.value=uname;
     document.usersrchform.seludom.value=udom;
@@ -510,6 +604,7 @@ function pickuser(uname,udom) {
 }
 
 $jsback
+// ]]>
 </script>
 ENDSCRIPT
 
@@ -631,7 +726,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 +736,12 @@ sub print_user_modification_page {
                 $response =  '<span class="LC_warning">'.&mt('No match was found for the username ([_1]) in LON-CAPA domain: [_2]',$ccuname,$ccdomain).
                             '</span><br />';
             }
-            $response .= '<span class="LC_warning">'.&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.").' '.&mt('Contact the <a[_1]>helpdesk</a> for assistance.',$helplink).'</span><br /><br />';
+            $response .= '<p class="LC_warning">'
+                        .&mt("You are not authorized to create new $usertypetext{$usertype} users in this domain.")
+                        .' '
+                        .&mt('Please contact the [_1]helpdesk[_2] for assistance.'
+                            ,'<a href="'.$helplink.'">','</a>')
+                        .'</p><br />';
             $env{'form.phase'} = '';
             &print_username_entry_form($r,$context,$response);
             return;
@@ -753,7 +853,9 @@ $crumbs
 $response
 $forminfo
 <script type="text/javascript" language="Javascript">
+// <![CDATA[
 $loginscript
+// ]]>
 </script>
 <input type='hidden' name='makeuser' value='1' />
 <h2>$lt{'cnu'} "$ccuname" $lt{'ind'} $ccdomain
@@ -810,7 +912,7 @@ KERB
                             } else {
                                 if ($authtype eq 'int') {
                                     $varauth = '<br />'.
-&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" name="intarg" value="" />')."<label><input type=\"checkbox\" name=\"visible\" onClick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
+&mt('[_1] Internally authenticated (with initial password [_2])','','<input type="password" size="10" name="intarg" value="" />')."<label><input type=\"checkbox\" name=\"visible\" onclick='if (this.checked) { this.form.intarg.type=\"text\" } else { this.form.intarg.type=\"password\" }' />".&mt('Visible input').'</label>';
                                 } elsif ($authtype eq 'loc') {
                                     $varauth = '<br />'.
 &mt('[_1] Local Authentication with argument [_2]','','<input type="text" name="'.$authtype.'arg" value="" />')."\n";
@@ -869,9 +971,14 @@ ENDCHANGEUSER
         }
         if (&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) {
             $r->print('<h3>'.&mt('User Can Request Creation of Courses?').'</h3>'.
-                      &Apache::loncommon::start_data_table().
-                      &build_tools_display($ccuname,$ccdomain,'requestcourse').
-                      &Apache::loncommon::end_data_table());
+                      &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('</div>');
         my $user_auth_text =  &user_authentication($ccuname,$ccdomain,$formname);
@@ -901,7 +1008,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 = <<ENDNOTOOLSPRIV;
@@ -947,7 +1054,7 @@ ENDNOTOOLSPRIV
     } ## End of new user/old user logic
 
     if ($env{'form.action'} eq 'singlestudent') {
-        $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onClick="setSections(this.form)" />'."\n");
+        $r->print('<br /><input type="button" value="'.&mt('Enroll Student').'" onclick="setSections(this.form)" />'."\n");
     } else {
         $r->print('<h3>'.&mt('Add Roles').'</h3>');
         my $addrolesdisplay = 0;
@@ -960,14 +1067,14 @@ ENDNOTOOLSPRIV
                 $addrolesdisplay = $add_domainroles;
             }
             $r->print(&course_level_dc($env{'request.role.domain'},'Course'));
-            $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setCourse()" />'."\n");
+            $r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setCourse()" />'."\n");
         } elsif ($context eq 'author') {
             if ($addrolesdisplay) {
                 $r->print('<br /><input type="button" value="'.&mt('Save').'"');
                 if ($newuser) {
-                    $r->print(' onClick="auth_check()" \>'."\n");
+                    $r->print(' onclick="auth_check()" \>'."\n");
                 } else {
-                    $r->print('onClick="this.form.submit()" \>'."\n");
+                    $r->print('onclick="this.form.submit()" \>'."\n");
                 }
             } else {
                 $r->print('<br /><a href="javascript:backPage(document.cu)">'.
@@ -975,7 +1082,7 @@ ENDNOTOOLSPRIV
             }
         } else {
             $r->print(&course_level_table(%inccourses));
-            $r->print('<br /><input type="button" value="'.&mt('Save').'" onClick="setSections(this.form)" />'."\n");
+            $r->print('<br /><input type="button" value="'.&mt('Save').'" onclick="setSections(this.form)" />'."\n");
         }
     }
     $r->print(&Apache::lonhtmlcommon::echo_form_input(['phase','userrole','ccdomain','prevphase','currstate','ccuname','ccdomain']));
@@ -1043,7 +1150,11 @@ sub validation_javascript {
                                    $nondc_setsection_code,$groupslist);
     my ($jsback,$elements) = &crumb_utilities();
     $js .= "\n".
-           '<script type="text/javascript">'."\n".$jsback."\n".'</script>';
+           '<script type="text/javascript">'."\n".
+           '// <![CDATA['."\n".
+           $jsback."\n".
+           '// ]]>'."\n".
+           '</script>'."\n";
     return $js;
 }
 
@@ -1230,8 +1341,17 @@ sub display_existing_roles {
             }
         }
         if ($rolesdisplay == 1) {
+            my $contextrole='';
+            if ($env{'request.course.id'}) {
+                $contextrole = 'Existing Roles in this Course';
+            } elsif ($env{'request.role'} =~ /^au\./) {
+                $contextrole = 'Existing Co-Author Roles in your Construction Space';
+            } else {
+                $contextrole = 'Existing Roles in this Domain';
+            }
             $r->print('
 <h3>'.$lt{'rer'}.'</h3>'.
+'<div>'.&mt($contextrole).'</div>'.
 &Apache::loncommon::start_data_table("LC_createuser").
 &Apache::loncommon::start_data_table_header_row().
 '<th>'.$lt{'rev'}.'</th><th>'.$lt{'ren'}.'</th><th>'.$lt{'del'}.
@@ -1283,7 +1403,7 @@ sub new_coauthor_roles {
                   &Apache::loncommon::end_data_table_header_row()."\n".
                   &Apache::loncommon::start_data_table_row().'
            <td>
-            <input type=checkbox name="act_'.$cudom.'_'.$cuname.'_ca" />
+            <input type="checkbox" name="act_'.$cudom.'_'.$cuname.'_ca" />
            </td>
            <td>'.$lt{'cau'}.'</td>
            <td>'.$cudom.'_'.$cuname.'</td>
@@ -1295,7 +1415,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'}.'</a></td>'."\n".
               &Apache::loncommon::end_data_table_row()."\n".
               &Apache::loncommon::start_data_table_row()."\n".
-'<td><input type=checkbox name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
+'<td><input type="checkbox" name="act_'.$cudom.'_'.$cuname.'_aa" /></td>
 <td>'.$lt{'caa'}.'</td>
 <td>'.$cudom.'_'.$cuname.'</td>
 <td><input type="hidden" name="start_'.$cudom.'_'.$cuname.'_aa" value="" />
@@ -1346,7 +1466,7 @@ sub new_domain_roles {
                $num_domain_level ++;
                $domaintext .=
 &Apache::loncommon::start_data_table_row().
-'<td><input type=checkbox name="act_'.$thisdomain.'_'.$role.'" /></td>
+'<td><input type="checkbox" name="act_'.$thisdomain.'_'.$role.'" /></td>
 <td>'.$plrole.'</td>
 <td>'.$thisdomain.'</td>
 <td><input type="hidden" name="start_'.$thisdomain.'_'.$role.'" value="" />
@@ -1387,7 +1507,9 @@ sub user_authentication {
             my $choices = &Apache::lonuserutils::set_login($ccdomain,$authformkrb,$authformint,$authformloc);
             $outcome = <<ENDBADAUTH;
 <script type="text/javascript" language="Javascript">
+// <![CDATA[
 $loginscript
+// ]]>
 </script>
 <span class="LC_error">$lt{'err'}:
 $lt{'uuas'} ($currentauth). $lt{'sldb'}.</span>
@@ -1416,7 +1538,9 @@ ENDBADAUTH
                                                );
             $outcome =
                        '<script type="text/javascript" language="Javascript">'."\n".
+                       '// <![CDATA['."\n".
                        $loginscript."\n".
+                       '// ]]>'."\n".
                        '</script>'."\n".
                        '<h3>'.$lt{'ld'}.'</h3>'.
                        &Apache::loncommon::start_data_table().
@@ -1524,16 +1648,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 +1676,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 +1715,15 @@ sub personal_data_display {
                 }
             } else {
                 if ($context eq 'selfcreate') {
-                    if ($canmodify{$item}) {
-                        $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
-                        $editable ++;
+                    if (($item eq 'permanentemail') && ($newuser eq 'email')) {
+                        $row .= $ccuname;
                     } else {
-                        $hiderow = 1;
+                        if ($canmodify{$item}) {
+                            $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
+                            $editable ++;
+                        } else {
+                            $hiderow = 1;
+                        }
                     }
                 } else {
                     $row .= '<input type="text" name="c'.$item.'" size="'.$textboxsize{$item}.'" value="" />';
@@ -1613,6 +1745,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 +1781,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 = '<table>';
+        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 .= '</tr>';
+                        }
+                        $output .= '<tr>';
+                    }
+                } 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 .= '<td class="LC_left_item"'.$lastcolspan.'>'.
+                           '<span class="LC_nobreak"><label>'.
+                           '<input type="checkbox" name="inststatus" '.
+                           'value="'.$types->[$i].'"'.$check.'/>'.
+                           $usertypes->{$types->[$i]}.'</label></span></td>';
+            }
+        }
+        $output .= '</tr></table>';
+    }
+    return $output;
+}
+
 sub selfcreate_canmodify {
     my ($context,$dom,$userinfo,$inst_results,$rolesarray) = @_;
     if (ref($inst_results) eq 'HASH') {
@@ -1673,7 +1871,10 @@ sub update_user_data {
     my $newuser = 0;
     my ($jsback,$elements) = &crumb_utilities();
     my $jscript = '<script type="text/javascript">'."\n".
-                  $jsback."\n".'</script>'."\n";
+                  '// <![CDATA['."\n".
+                  $jsback."\n".
+                  '// ]]>'."\n".
+                  '</script>'."\n";
     my %breadcrumb_text = &singleuser_breadcrumb();
     my $args;
     if ($env{'form.popup'}) {
@@ -1713,8 +1914,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 +1925,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;
     }
@@ -1774,6 +1975,8 @@ sub update_user_data {
     my (%alerts,%rulematch,%inst_results,%curr_rules);
     my @usertools = ('aboutme','blog','portfolio');
     my @requestcourses = ('official','unofficial');
+    my ($othertitle,$usertypes,$types) = 
+        &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
     if ($env{'form.makeuser'}) {
 	$r->print('<h3>'.&mt('Creating new account.').'</h3>');
         # Check for the authentication mode and password
@@ -1851,11 +2054,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 +2110,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 +2215,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.')
                                    .'<br />'
                                    .&mt("Change is not permitted without checking the 'Force ID change' checkbox on the previous page.")
                                    .'<br />'."\n";
@@ -2026,12 +2236,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 +2251,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 +2310,7 @@ sub update_user_data {
             } else {
                 $changed{'quota'} = &quota_admin('',\%changeHash);
                 $newportfolioquota = $defquota;
-                $newisdefault = 1; 
+                $newisdefault = 1;
             }
         } else {
             $oldisdefault = 1;
@@ -2084,8 +2336,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'}   ||
@@ -2112,16 +2370,26 @@ sub update_user_data {
                         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};
-
+                                $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 +2418,22 @@ 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',
+                             'inststatus' => "Affiliation",
+                             'prvs'       => 'Previous Value:',
+                             'chto'       => 'Changed To:'
 						   );
                 $r->print('<h4>'.$lt{'uic'}.'</h4>'.
                           &Apache::loncommon::start_data_table().
@@ -2178,11 +2447,20 @@ sub update_user_data {
     <th>$lt{'id'}</th>
     <th>$lt{'mail'}</th>
 END
+                if ($showinststatus) {
+                    $r->print("
+    <th>$lt{'inststatus'}</th>\n");
+                }
                 if ($showrequestcourses) {
                     foreach my $item (@requestcourses) {
                         $r->print("
     <th>$lt{$item}</th>\n");
                     }
+                } elsif ($showreqotherdom) {
+                    foreach my $item (@requestcourses) {
+                        $r->print("
+    <th>$lt{$item}</th>\n");
+                    }
                 }
                 if ($showquota) {
                     $r->print("
@@ -2205,11 +2483,20 @@ END
     <td>$userenv{'id'}</td>
     <td>$userenv{'permanentemail'} </td>
 END
+                if ($showinststatus) {
+                    $r->print("
+    <td>$oldinststatuses</td>\n");
+                }  
                 if ($showrequestcourses) {
                     foreach my $item (@requestcourses) {
                         $r->print("
     <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n");
                     }
+                } elsif ($showreqotherdom) {
+                    foreach my $item (@requestcourses) {
+                        $r->print("
+    <td>$oldaccess{$item} $oldaccesstext{$item}</td>\n");
+                    }
                 }
                 if ($showquota) {
                     $r->print("
@@ -2232,11 +2519,20 @@ END
     <td>$env{'form.cid'} </td>
     <td>$env{'form.cpermanentemail'} </td>
 END
+                if ($showinststatus) {
+                    $r->print("
+    <td>$newinststatuses</td>\n");
+                }
                 if ($showrequestcourses) {
                     foreach my $item (@requestcourses) {
                         $r->print("
     <td>$newaccess{$item} $newaccesstext{$item} </td>\n");
                     }
+                } elsif ($showreqotherdom) {
+                    foreach my $item (@requestcourses) {
+                        $r->print("
+    <td>$newaccess{$item} $newaccesstext{$item} </td>\n");
+                    }
                 }
                 if ($showquota) {
                     $r->print("
@@ -2281,13 +2577,14 @@ 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",
+                           'inststatus' => "Affiliation",
 					       );
             $r->print(<<"END");
 <h4>$userenv{'firstname'} $userenv{'middlename'} $userenv{'lastname'} $userenv{'generation'}
@@ -2296,11 +2593,19 @@ END
                 $r->print('<br />['.$lt{'mail'}.': '.
                           $userenv{'permanentemail'}.']');
             }
+            if ($showinststatus) {
+                $r->print('<br />['.$lt{'inststatus'}.': '.$oldinststatuses.']');
+            }
             if ($showrequestcourses) {
                 foreach my $item (@requestcourses) {
                     $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
                               $newaccesstext{$item}.']'."\n");
                 }
+            } elsif ($showreqotherdom) {
+                foreach my $item (@requestcourses) {
+                    $r->print('<br />['.$lt{$item}.': '.$newaccess{$item}.' '.
+                              $newaccesstext{$item}.']'."\n");
+                }
             }
             if ($showtools) {
                 foreach my $item (@usertools) {
@@ -2337,8 +2642,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('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'.
-                      &mt('Contact your <a href="[_1]">helpdesk</a> for more information.',"javascript:helpMenu('display')").'<br />');
+            my $helplink = 'javascript:helpMenu('."'display'".')';
+            $r->print('<span class="LC_cusr_emph">'.$rolestr.'</span><br />'
+                     .&mt('Please contact your [_1]helpdesk[_2] for more information.'
+                         ,'<a href="'.$helplink.'">','</a>')
+                      .'<br />');
         }
         $r->print('<span class="LC_warning">'
                   .$no_forceid_alert
@@ -2389,6 +2697,84 @@ sub tool_changes {
           (ref($newaccess) eq 'HASH') && (ref($newaccesstext) eq 'HASH'))) {
         return;
     }
+    if ($context eq 'reqcrsotherdom') {
+        my @options = ('approve','validate','autolimit');
+        my $optregex = join('|',@options);
+        my %reqdisplay = &courserequest_display();
+        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;
+                my $newop = $env{'form.'.$context.'_'.$tool};
+                if ($newop eq 'autolimit') {
+                    $newop .= '=';
+                    unless ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/
+) {
+                        $newop .= $env{'form.'.$context.'_'.$tool.'_limit'};
+                    }
+                }
+                if (grep(/^\Q$cdom:($optregex\=?\d*)\E$/,@curr)) {
+                    $oldaccesstext->{$tool} = &mt('yes');
+                    my $oldop = $1;
+                    if ($oldop ne $newop) {
+                        $changedoms = 1;
+                        foreach my $dom (@curr) {
+                            unless ($dom eq $cdom) {
+                                push(@new,$dom);
+                            }
+                        }
+                        if ($newop) {
+                            push(@new,$cdom.':'.$newop);
+                        }
+                        @new = sort(@new);
+                    }
+                } elsif ($env{'form.'.$context.'_'.$tool}) {
+                    $changedoms = 1;
+                    $changedoms = 1;
+                    @new = sort(@curr,$cdom.':'.$newop);
+                }
+                $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}) {
+                            if ($env{'form.'.$context.'_'.$tool} eq 'autolimit') {
+                                if ($env{'form.'.$context.'_'.$tool.'_limit'} =~ /\D/) {
+                                    $newaccesstext->{$tool} = &mt('Yes, processed automatically');
+                                } else {
+                                    $newaccesstext->{$tool} = &mt('Yes, up to limit of [quant,_1,request] per user).',$env{'form.'.$context.'_'.$tool.'_limit'});
+                                }
+                            } else {
+                                $newaccesstext->{$tool} = $reqdisplay{$env{'form.'.$context.'_'.$tool}};
+                            }
+                        } else {
+                            $newaccesstext->{$tool} = &mt('No');
+                        }
+                    }
+                }
+            }
+        }
+        return;
+    }
     foreach my $tool (@{$usertools}) {
         if ($userenv->{$context.'.'.$tool} ne '') {
             $oldaccess->{$tool} = &mt('custom');
@@ -2397,9 +2783,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}) {
@@ -2524,8 +2910,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).': <b>'.
+                $r->print(&mt('Deleting custom role [_1] by [_2] in [_3]',
+                      $rolename,$rnam.':'.$rdom,$url).': <b>'.
                       &Apache::lonnet::assigncustomrole($env{'form.ccdomain'},
                          $env{'form.ccuname'},$url,$rdom,$rnam,$rolename,$now,
                          0,1,$context).'</b><br />');
@@ -2576,8 +2962,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,'<b>'.$result.'</b>').'<br />');
+                $r->print(&mt('Re-enabling custom role [_1] by [_2] in [_3]: [_4]',
+                          $rolename,$rnam.':'.$rdom,$url,'<b>'.$result.'</b>').'<br />');
                 if (!grep(/^cr$/,@rolechanges)) {
                     push(@rolechanges,'cr');
                 }
@@ -2823,10 +3209,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;
@@ -2946,13 +3336,16 @@ sub custom_role_editor {
     my ($jsback,$elements) = &crumb_utilities();
     my $button_code = "\n";
     my $head_script = "\n";
-    $head_script .= '<script type="text/javascript">'."\n";
+    $head_script .= '<script type="text/javascript">'."\n".
+                    '// <![CDATA['."\n";
     my @template_roles = ("cc","in","ta","ep","st");
     foreach my $role (@template_roles) {
         $head_script .= &make_script_template($role);
         $button_code .= &make_button_code($role).' ';
     }
-    $head_script .= "\n".$jsback."\n".'</script>'."\n";
+    $head_script .= "\n".$jsback."\n".
+                    '// ]]>'."\n".
+                    '</script>'."\n";
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',$head_script));
    &Apache::lonhtmlcommon::add_breadcrumb
      ({href=>"javascript:backPage(document.form1,'pickrole','')",
@@ -2993,14 +3386,14 @@ ENDCCF
         my $privtext = &Apache::lonnet::plaintext($priv);
         $r->print(&Apache::loncommon::start_data_table_row().
 	          '<td>'.$privtext.'</td><td>'.
-    ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c" '.
-    ($courselevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
+    ($courselevel{$priv}?'<input type="checkbox" name="'.$priv.'_c"'.
+    ($courselevelcurrent{$priv}?' checked="checked"':'').' />':'&nbsp;').
     '</td><td>'.
-    ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d" '.
-    ($domainlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
+    ($domainlevel{$priv}?'<input type="checkbox" name="'.$priv.'_d"'.
+    ($domainlevelcurrent{$priv}?' checked="checked"':'').' />':'&nbsp;').
     '</td><td>'.
-    ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s" '.
-    ($systemlevelcurrent{$priv}?'checked="1"':'').' />':'&nbsp;').
+    ($systemlevel{$priv}?'<input type="checkbox" name="'.$priv.'_s"'.
+    ($systemlevelcurrent{$priv}?' checked="checked"':'').' />':'&nbsp;').
     '</td>'.
              &Apache::loncommon::end_data_table_row());
     }
@@ -3009,7 +3402,7 @@ ENDCCF
    '<input type="hidden" name="startrolename" value="'.$env{'form.rolename'}.
    '" />'."\n".'<input type="hidden" name="currstate" value="" />'."\n".   
    '<input type="reset" value="'.&mt("Reset").'" />'."\n".
-   '<input type="submit" value="'.&mt('Define Role').'" /></form>'.
+   '<input type="submit" value="'.&mt('Save').'" /></form>'.
 	      &Apache::loncommon::end_page());
 }
 # --------------------------------------------------------
@@ -3082,7 +3475,7 @@ sub make_script_template {
 sub make_button_code {
     my ($role) = @_;
     my $label = &Apache::lonnet::plaintext($role);
-    my $button_code = '<input type="button" onClick="set_'.$role.'()" value="'.$label.'" />';
+    my $button_code = '<input type="button" onclick="set_'.$role.'()" value="'.$label.'" />';
     return ($button_code);
 }
 # ---------------------------------------------------------- Call to definerole
@@ -3095,7 +3488,11 @@ sub set_custom_role {
         return;
     }
     my ($jsback,$elements) = &crumb_utilities();
-    my $jscript = '<script type="text/javascript">'.$jsback."\n".'</script>';
+    my $jscript = '<script type="text/javascript">'.
+                  '// <![CDATA['."\n".
+                  $jsback."\n".
+                  '// ]]>'."\n".
+                  '</script>';
 
     $r->print(&Apache::loncommon::start_page('Save Custom Role'),$jscript);
     &Apache::lonhtmlcommon::add_breadcrumb
@@ -3192,8 +3589,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) {
@@ -3464,7 +3864,11 @@ sub header {
 
 sub add_script {
     my ($js) = @_;
-    return '<script type="text/javascript">'."\n".$js."\n".'</script>';
+    return '<script type="text/javascript">'."\n".
+           '// <![CDATA['."\n".
+           "\n".$js."\n".
+           '// ]]>'."\n"
+           '</script>'."\n";
 }
 
 sub verify_user_display {
@@ -3498,137 +3902,110 @@ sub print_main_menu {
                                    listusers => 'Display Co-authors and Manage Multiple Users',
                                  },
                        course => {
-                                   upload => 'File of Course Users',
-                                   singleuser => 'Single Course User',
-                                   listusers => 'Course User Lists',
+                                   upload => 'Upload a File of Course Users',
+                                   singleuser => 'Add/Modify a Single Course User',
+                                   listusers => 'Display Class Lists and Manage Multiple Users',
                                  },
-                     );
-  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 =>
-	     [
-	     ]},
-	   );
-			
-    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.',
-		});
-		
-    }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 @menu =
+        (
+          { text => $links{$context}{'upload'},
+            help => 'Course_Create_Class_List',
+            action => 'upload',
+            permission => $permission->{'cusr'},
+            },
+          { text => $links{$context}{'singleuser'},
+            help => 'Course_Change_Privileges',
+            action => 'singleuser',
+            permission => $permission->{'cusr'},
+            },
+          { text => $links{$context}{'listusers'},
+            help => 'Course_View_Class_List',
+            action => 'listusers',
+            permission => ($permission->{'view'} || $permission->{'cusr'}),
+          },
+        );
+    if ($context eq 'domain' || $context eq 'course') {
+        my $customlink =  { text => 'Edit Custom Roles',
+                            help => 'Course_Editing_Custom_Roles',
+                            action => 'custom',
+                            permission => $permission->{'custom'},
+                          };
+        push(@menu,$customlink);
+    }
+    if ($context eq 'course') {
+        my ($cnum,$cdom) = &Apache::lonuserutils::get_course_identity();
+        my @courselinks =
+            (
+              { text => 'Enroll a Single Student',
+                 help => 'Course_Add_Student',
+                 action => 'singlestudent',
+                 permission => $permission->{'cusr'},
+                 },
+              { text => 'Drop Students',
+                help => 'Course_Drop_Student',
+                action => 'drop',
+                permission => $permission->{'cusr'},
+              });
+        if (!exists($permission->{'cusr_section'})) {
+            push(@courselinks,
+               { text => 'Automated Enrollment Manager',
+                 help => 'Course_Automated_Enrollment',
+                 permission => (&Apache::lonnet::auto_run($cnum,$cdom)
+                                && $permission->{'cusr'}),
+                 url  => '/adm/populate',
+                 },
+               { text => 'Configure User Self-enrollment',
+                 help => 'Course_Self_Enrollment',
+                 action => 'selfenroll',
+                 permission => $permission->{'cusr'},
+               });
+        }
         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',
+            push(@courselinks,
+                    {   text => 'Enrollment Requests',
+                        help => 'Course_Approve_Selfenroll',
+                        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.',
-        });
-    };
-return Apache::lonhtmlcommon::generate_menu(@menu);
+        push(@courselinks,
+               { text => 'Manage Course Groups',
+                 help => 'Course_Manage_Group',
+                 permission => $permission->{'grp_manage'},
+                 url => '/adm/coursegroups?refpage=cusr',
+               },
+               { text => 'View Change Logs',
+                 help => 'Course_User_Logs',
+                 action => 'changelogs',
+                 permission => $permission->{'cusr'},
+               },);
 #               { text => 'View Log-in History',
 #                 help => 'Course_User_Logins',
 #                 action => 'logins',
 #                 permission => $permission->{'cusr'},
 #               });
+        push(@menu,@courselinks);
+    }
+    my $menu_html = '';
+    foreach my $menu_item (@menu) {
+        next if (! $menu_item->{'permission'});
+        $menu_html.='<p>';
+        if (exists($menu_item->{'help'})) {
+            $menu_html.=
+                &Apache::loncommon::help_open_topic($menu_item->{'help'});
+        }
+        $menu_html.='<font size="+1">';
+        if (exists($menu_item->{'url'})) {
+            $menu_html.=qq{<a href="$menu_item->{'url'}">};
+        } else {
+            $menu_html.=
+                qq{<a href="/adm/createuser?action=$menu_item->{'action'}">};      }
+        $menu_html.= &mt($menu_item->{'text'}).'</a></font>';
+        $menu_html.='</p>';
+    }
+    return $menu_html;
 }
 
 sub restore_prev_selections {
@@ -3825,15 +4202,18 @@ ENDSCRIPT
     my $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
 
     my $output = '<script type="text/javascript">'."\n".
+                 '// <![CDATA['."\n".
                  $setsec_js."\n".$selfenroll_js."\n".
+                 '// ]]>'."\n".
                  '</script>'."\n".
                  '<h3>'.$lt->{'selfenroll'}.'</h3>'."\n";
     my ($visible,$cansetvis,$vismsgs,$visactions) = &visible_in_cat($cdom,$cnum);
     if (ref($visactions) eq 'HASH') {
         if ($visible) {
-            $output .= '<p>'.$visactions->{'vis'}.'</p>';
+            $output .= '<p class="LC_info">'.$visactions->{'vis'}.'</p>';
         } else {
-            $output .= $visactions->{'miss'}.'<br />'.$visactions->{'yous'}.
+            $output .= '<p class="LC_warning">'.$visactions->{'miss'}.'</p>'
+                      .$visactions->{'yous'}.
                        '<p>'.$visactions->{'gen'}.'<br />'.$visactions->{'coca'};
             if (ref($vismsgs) eq 'ARRAY') {
                 $output .= '<br />'.$visactions->{'make'}.'<ul>';
@@ -4081,7 +4461,7 @@ ENDSCRIPT
     }
     $output .= &Apache::lonhtmlcommon::end_pick_box().
                '<br /><input type="button" name="selfenrollconf" value="'
-               .&mt('Save changes').'" onclick="validate_types(this.form);" />'
+               .&mt('Save').'" onclick="validate_types(this.form);" />'
                .'<input type="hidden" name="action" value="selfenroll" /></form>';
     $r->print($output);
     return;
@@ -4164,7 +4544,8 @@ sub update_selfenroll_queue {
     my $hostname = &Apache::lonnet::hostname($chome);
     my $protocol = $Apache::lonnet::protocol{$chome};
     $protocol = 'http' if ($protocol ne 'https');
-    my (@existing,@missingreq,@invalidusers,@limitexceeded,@enrolled,@enrollerrors,);
+    my (@existing,@missingreq,@invalidusers,@limitexceeded,@enrolled,
+        @enrollerrors,@warn_approves,@warn_rejects);
     my $now = time;
     my $sender = $env{'user.name'}.':'.$env{'user.domain'};
     my $approvedmsg = [{
@@ -4217,6 +4598,19 @@ sub update_selfenroll_queue {
                     $stucounts->{'selfenrolled'} ++;
                     &Apache::selfenroll::send_notification($uname.':'.$udom,$approvedmsg,$cid,
                                                $coursedesc,$now,'enroller',$sender);
+                    my %userrequest = (
+                        $cdom.'_'.$cnum => {
+                           timestamp   => $now,
+                           section     => $usec,
+                           adjudicator => $env{'user.name'}.':'.$env{'user.domain'},
+                           status      => 'approved',
+                       }
+                    );
+                    my $userresult = 
+                        &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
+                    if ($userresult ne 'ok') {
+                        push(@warn_approves,$uname.':'.$udom);
+                    }
                 } else {
                     push(@enrollerrors,$uname.':'.$udom);
                 }
@@ -4230,6 +4624,19 @@ sub update_selfenroll_queue {
         foreach my $user (@rejections) {
             &Apache::selfenroll::send_notification($user,$rejectedmsg,$cid,
                                                    $coursedesc,$now,'enroller',$sender);
+            my ($uname,$udom) = split(/:/,$user);
+            my %userrequest = (
+                $cdom.'_'.$cnum => {
+                    timestamp   => $now,
+                    adjudicator => $env{'user.name'}.':'.$env{'user.domain'}, 
+                    status      => 'rejected',
+                }
+            );
+            my $userresult = 
+                &Apache::lonnet::put($namespace,\%userrequest,$udom,$uname);
+            if ($userresult ne 'ok') {
+                push(@warn_rejects,$user);
+            }
         }
     }
     if (@changes) {
@@ -4239,7 +4646,7 @@ sub update_selfenroll_queue {
                 &Apache::loncommon::plainname($env{'user.name'},$env{'user.domain'}).' ('.$env{'user.name'}.':'.$env{'user.domain'}.')';
             my $chgmsg = "'Action was taken on the following enrollment requests by [_1].',$namelink";
             my ($approvedlist,$rejectedlist);
-            if (@enrolled) { 
+            if (@enrolled) {
                 $approvedlist = join("\n",@enrolled);
                 $r->print('<p>'.&mt('The following were enrolled in the course:').'<ul>');
                 foreach my $user (@enrolled) {
@@ -4298,6 +4705,20 @@ sub update_selfenroll_queue {
         }
         $r->print('</ul></p>');
     }
+    if (@warn_approves) {
+        $r->print('<p>'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'<ul>');
+        foreach my $user (@warn_approves) {
+            $r->print('<li>'.$user.'</li>');
+        }
+        $r->print('</ul></p>');
+    }
+    if (@warn_rejects) {
+        $r->print('<p>'.&mt("For the following users, an error occurred when updating the user's own self-enroll requests record:").'<ul>');
+        foreach my $user (@warn_rejects) {
+            $r->print('<li>'.$user.'</li>');
+        }
+        $r->print('</ul></p>');
+    }
     return;
 }
 
@@ -4329,7 +4750,7 @@ sub visible_in_cat {
                    miss => 'Your course does not currently appear in the Course Catalog for this domain.',
                    yous => 'You should remedy this if you plan to allow self-enrollment, otherwise students will have difficulty finding your course.',
                    coca => 'Courses can be absent from the Catalog, because they do not have an institutional code, have no assigned category, or have been specifically excluded.',
-                   make => 'Make any changes to self-enrollment settings below, click "Save changes", then take action to include the course in the Catalog:',
+                   make => 'Make any changes to self-enrollment settings below, click "Save", then take action to include the course in the Catalog:',
                    take => 'Take the following action to ensure the course appears in the Catalog:',
                    dc_unhide  => 'Ask a domain coordinator to change the "Exclude from course catalog" setting.',
                    dc_addinst => 'Ask a domain coordinator to enable display the catalog of "Official courses (with institutional codes)".',
@@ -4675,6 +5096,7 @@ sub print_userchangelogs_display {
             $r->print('</tr></table>');
             $r->print(<<"ENDSCRIPT");
 <script type="text/javascript">
+// <![CDATA[
 function chgPage(caller) {
     if (caller == 'previous') {
         document.$formname.page.value --;
@@ -4685,11 +5107,14 @@ function chgPage(caller) {
     document.$formname.submit(); 
     return;
 }
+// ]]>
 </script>
 ENDSCRIPT
         }
     } else {
-        $r->print(&mt('There are no records to display'));
+        $r->print('<p class="LC_info">'.
+                  &mt('There are no records to display').
+                  '</p>');
     }
     $r->print('<input type="hidden" name="page" value="'.$curr{'page'}.'" />'.
               '<input type="hidden" name="action" value="changelogs" /></form>');
@@ -4701,7 +5126,7 @@ sub role_display_filter {
     my $context = 'course';
     my $nolink = 1;
     my $output = '<table><tr><td valign="top">'.
-                 '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b><br />'.
+                 '<span class="LC_nobreak"><b>'.&mt('Changes/page:').'</b></span><br />'.
                  &Apache::lonmeta::selectbox('show',$curr->{'show'},undef,
                                               (&mt('all'),5,10,20,50,100,1000,10000)).
                  '</td><td>&nbsp;&nbsp;</td>';
@@ -4742,7 +5167,7 @@ sub role_display_filter {
     foreach my $chgtype ('any','auto','updatenow','createcourse','course','domain','selfenroll') {
         my $selstr = '';
         if ($curr->{'chgcontext'} eq $chgtype) {
-            $output .= $selstr = ' selected="selected"';
+            $selstr = ' selected="selected"';
         }
         if (($chgtype eq 'auto') || ($chgtype eq 'updatenow')) {
             next if (!&Apache::lonnet::auto_run($cnum,$cdom));
@@ -4755,7 +5180,7 @@ sub role_display_filter {
                &mt('[_1]Note:[_2] Only changes made from servers running LON-CAPA 2.6.99.0 or later are displayed.');
     if ($version) {
         $output .= ' '.&mt('This server is version [_3].','<b>','</b>',$version);    }
-    $output .= '</span><hr noshade><br />';
+    $output .= '</span><hr /><br />';
     return $output;
 }
 
@@ -5168,7 +5593,7 @@ sub build_search_response {
                                 .&mt("You are not authorized to create new users in your current role's domain - [_1]."
                                     ,'<span class="LC_cusr_emph">'.$env{'request.role.domain'}.'</span>')
                                 .'<br />'
-                                .&mt('Contact the [_1]helpdesk[_2] if you need to create a new user.'
+                                .&mt('Please contact the [_1]helpdesk[_2] if you need to create a new user.'
                                     ,' <a'.$helplink.'>'
                                     ,'</a>')
                                 .'<br /><br />';
@@ -5384,7 +5809,7 @@ sub course_level_dc {
                  '<th>'.$courseform.'</th><th>'.$lt{'rol'}.'</th><th>'.$lt{'grs'}.'</th><th>'.$lt{'sta'}.'</th><th>'.$lt{'end'}.'</th>'.
                  &Apache::loncommon::end_data_table_header_row();
     my $otheritems = &Apache::loncommon::start_data_table_row()."\n".
-                     '<td><input type="text" name="coursedesc" value="" onFocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
+                     '<td><input type="text" name="coursedesc" value="" onfocus="this.blur();opencrsbrowser('."'cu','dccourse','dcdomain','coursedesc',''".')" /></td>'."\n".
                      '<td><select name="role">'."\n";
     foreach my $role (@roles) {
         my $plrole=&Apache::lonnet::plaintext($role);
@@ -5563,7 +5988,7 @@ sub update_selfenroll_config {
                         }
                     } else {
                         my @differences =  
-                            &compare_arrays(\@currnotified,\@newnotified);
+                            &Apache::loncommon::compare_arrays(\@currnotified,\@newnotified);
                         if (@differences > 0) {
                             if (@newnotified > 0) {
                                 $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
@@ -5573,7 +5998,7 @@ sub update_selfenroll_config {
                         }
                     }
                 } else {
-                    my @differences = &compare_arrays(\@currnotified,\@newnotified);
+                    my @differences = &Apache::loncommon::compare_arrays(\@currnotified,\@newnotified);
                     if (@differences > 0) {
                         if (@newnotified > 0) {
                             $changes{'internal.selfenroll_notifylist'} = join(',',@newnotified);
@@ -5763,22 +6188,6 @@ sub update_selfenroll_config {
     return;
 }
 
-sub compare_arrays {
-    my ($arrayref1,$arrayref2) = @_;
-    my (@difference,%count);
-    @difference = ();
-    %count = ();
-    if ((ref($arrayref1) eq 'ARRAY') && (ref($arrayref2) eq 'ARRAY')) { 
-        foreach my $element (@{$arrayref1}, @{$arrayref2}) { $count{$element}++; }
-        foreach my $element (keys(%count)) {
-            if ($count{$element} == 1) {
-                push(@difference,$element);
-            }
-        }
-    }
-    return @difference;
-}
-
 sub get_selfenroll_titles {
     my @row = ('types','registered','enroll_dates','access_dates','section',
                'approval','limit');