--- loncom/interface/loncreateuser.pm	2017/01/21 23:30:18	1.406.2.9
+++ loncom/interface/loncreateuser.pm	2017/01/01 14:08:34	1.427
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.406.2.9 2017/01/21 23:30:18 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.427 2017/01/01 14:08:34 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -252,13 +252,15 @@ sub build_tools_display {
                    'unofficial' => 'Can request creation of unofficial courses',
                    'community'  => 'Can request creation of communities',
                    'textbook'   => 'Can request creation of textbook courses',
+                   'placement'  => 'Can request creation of placement tests',
                    'requestauthor'  => 'Can request author space',
     );
     if ($context eq 'requestcourses') {
         %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                       'requestcourses.official','requestcourses.unofficial',
-                      'requestcourses.community','requestcourses.textbook');
-        @usertools = ('official','unofficial','community','textbook');
+                      'requestcourses.community','requestcourses.textbook',
+                      'requestcourses.placement');
+        @usertools = ('official','unofficial','community','textbook','placement');
         @options =('norequest','approval','autolimit','validate');
         %validations = &Apache::lonnet::auto_courserequest_checks($ccdomain);
         %reqtitles = &courserequest_titles();
@@ -333,6 +335,7 @@ sub build_tools_display {
                    '   <td'.$colspan.'>'.$lt{$item}.'</td>'."\n".
                    '  </tr>'."\n".
                    &Apache::loncommon::start_data_table_row()."\n";
+  
         if (($context eq 'requestcourses') || ($context eq 'requestauthor')) {
             my ($curroption,$currlimit);
             my $envkey = $context.'.'.$item;
@@ -451,12 +454,14 @@ sub coursereq_externaluser {
                    'unofficial' => 'Can request creation of unofficial courses',
                    'community'  => 'Can request creation of communities',
                    'textbook'   => 'Can request creation of textbook courses',
+                   'placement'  => 'Can request creation of placement tests',
     );
 
     %userenv = &Apache::lonnet::userenvironment($ccdomain,$ccuname,
                       'reqcrsotherdom.official','reqcrsotherdom.unofficial',
-                      'reqcrsotherdom.community','reqcrsotherdom.textbook');
-    @usertools = ('official','unofficial','community','textbook');
+                      'reqcrsotherdom.community','reqcrsotherdom.textbook',
+                      'reqcrsotherdom.placement');
+    @usertools = ('official','unofficial','community','textbook','placement');
     @options = ('approval','validate','autolimit');
     %validations = &Apache::lonnet::auto_courserequest_checks($cdom);
     my $optregex = join('|',@options);
@@ -537,6 +542,7 @@ sub courserequest_titles {
                                    unofficial => 'Unofficial',
                                    community  => 'Communities',
                                    textbook   => 'Textbook',
+                                   placement  => 'Placement Tests',
                                    norequest  => 'Not allowed',
                                    approval   => 'Approval by Dom. Coord.',
                                    validate   => 'With validation',
@@ -854,7 +860,7 @@ ENDBLOCK
         $output = '<p>'.$userpicker.'</p>';
     }
     if (($env{'form.phase'} eq '') && ($env{'form.action'} ne 'accesslogs') &&
-        (!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') &&
+        (!(($env{'form.action'} eq 'singleuser') && ($context eq 'domain') && 
         (!&Apache::lonnet::allowed('mau',$env{'request.role.domain'}))))) {
         my $defdom=$env{'request.role.domain'};
         my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
@@ -1429,7 +1435,7 @@ ENDAUTH
         $r->print('<div class="LC_left_float">');
         $r->print(&personal_data_display($ccuname,$ccdomain,$newuser,$context,
                                          $inst_results{$ccuname.':'.$ccdomain}));
-        if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) ||
+        if ((&Apache::lonnet::allowed('ccc',$env{'request.role.domain'})) || 
             (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) {
             $r->print('<br /><h3>'.&mt('User Can Request Creation of Courses/Communities in this Domain?').'</h3>'.
                       &Apache::loncommon::start_data_table());
@@ -1449,7 +1455,7 @@ ENDAUTH
         if ((!$isauthor) && 
             ((&Apache::lonnet::allowed('cau',$env{'request.role.domain'})) ||
              (&Apache::lonnet::allowed('udp',$env{'request.role.domain'}))) &&
-             ($env{'request.role.domain'} eq $ccdomain)) {
+            ($env{'request.role.domain'} eq $ccdomain)) {
             $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
         }
         $user_text{'auth'} =  &user_authentication($ccuname,$ccdomain,$formname);
@@ -1520,7 +1526,7 @@ ENDNOTOOLSPRIV
         } elsif (($context eq 'course') && ((&Apache::lonnet::allowed('vcl',$env{'request.course.id'})) ||
                  ($env{'request.course.sec'} &&
                   &Apache::lonnet::allowed('vcl',$env{'request.course.id'}.'/'.$env{'request.course.sec'})))) {
-            $statuses = ['active'];
+            $statuses = ['active'];   
         }
         if ($env{'form.action'} ne 'singlestudent') {
             &display_existing_roles($r,$ccuname,$ccdomain,\%inccourses,$context,
@@ -1754,7 +1760,7 @@ sub display_existing_roles {
         if ($active) {
             next unless($showall || $showactive);
         } else {
-            next unless($showall || $showexpired);
+            next unless($showall || $showexpired); 
         }
 # Is this a custom role? Get role owner and title.
         my ($croleudom,$croleuname,$croletitle)=
@@ -1899,7 +1905,7 @@ sub display_existing_roles {
             } else {
                 $row.='&nbsp;';
             }
-            $row.= '</td>';
+            $row.= '</td>'; 
         }
         my $plaintext='';
         if (!$croletitle) {
@@ -2168,6 +2174,7 @@ $lt{'uuas'} ($currentauth). $lt{'adcs'}.
 ENDBADAUTH
         }
     } else { # Authentication type is valid
+        
         &initialize_authen_forms($ccdomain,$formname,$currentauth,'modifyuser');
         my ($authformcurrent,$can_modify,@authform_others) =
             &modify_login_block($ccdomain,$currentauth);
@@ -2726,7 +2733,7 @@ sub update_user_data {
     my (%alerts,%rulematch,%inst_results,%curr_rules);
     my @userinfo = ('firstname','middlename','lastname','generation','permanentemail','id');
     my @usertools = ('aboutme','blog','webdav','portfolio');
-    my @requestcourses = ('official','unofficial','community','textbook');
+    my @requestcourses = ('official','unofficial','community','textbook','placement');
     my @requestauthor = ('requestauthor');
     my ($othertitle,$usertypes,$types) = 
         &Apache::loncommon::sorted_inst_types($env{'form.ccdomain'});
@@ -2899,7 +2906,7 @@ sub update_user_data {
              'requestcourses.community','requestcourses.textbook',
              'reqcrsotherdom.official','reqcrsotherdom.unofficial',
              'reqcrsotherdom.community','reqcrsotherdom.textbook',
-             'requestauthor'],
+             'reqcrsotherdom.placement','requestauthor'],
               $env{'form.ccdomain'},$env{'form.ccuname'});
         my ($tmp) = keys(%userenv);
         if ($tmp =~ /^(con_lost|error)/i) { 
@@ -3190,8 +3197,9 @@ 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')
-                                || ($key eq 'community') || ($key eq 'textbook')) {
+                            if (($key eq 'official') || ($key eq 'unofficial') ||
+                                ($key eq 'community') || ($key eq 'textbook') ||
+                                ($key eq 'placement')) {
                                 $newenvhash{'environment.requestcourses.'.$key} =
                                     $changeHash{'requestcourses.'.$key};
                                 if ($changeHash{'requestcourses.'.$key}) {
@@ -3257,7 +3265,7 @@ sub update_user_data {
                                   \%newsettingstext);
                 if ($env{'form.cid'} ne $userenv{'id'}) {
                     &Apache::lonnet::idput($env{'form.ccdomain'},
-                         {$env{'form.ccuname'} => $env{'form.cid'}});
+                         {$env{'form.ccuname'} => $env{'form.cid'}},$uhome,'ids');
                     if (($recurseid) &&
                         (&Apache::lonnet::allowed('mau',$env{'form.ccdomain'}))) {
                         my $idresult = 
@@ -3400,6 +3408,7 @@ sub display_userinfo {
          'unofficial'     => 'Can Request Unofficial Courses',
          'community'      => 'Can Request Communities',
          'textbook'       => 'Can Request Textbook Courses',
+         'placement'      => 'Can Request Placement Tests',
          'requestauthor'  => 'Can Request Author Role',
          'inststatus'     => "Affiliation",
          'prvs'           => 'Previous Value:',
@@ -4375,7 +4384,7 @@ sub custom_role_editor {
               );
     my $args = { bread_crumbs          => $brcrum,
                  bread_crumbs_component => 'User Management'};
-
+ 
     $r->print(&Apache::loncommon::start_page('Custom Role Editor',
                                              $head_script,$args).
               $body_top);
@@ -5016,13 +5025,12 @@ sub handler {
             } elsif ($env{'form.state'} eq 'done') {
                 $r->print('<h3>'.&mt('Enrollment request processing').'</h3>'."\n");
                 $r->print(&Apache::loncoursequeueadmin::update_request_queue($context,
-                              $cdom,$cnum,$coursedesc));
+                               $cdom,$cnum,$coursedesc));
             }
         } else {
             $r->print(&header(undef,{'no_nav_bar' => 1}).
                      '<span class="LC_error">'.&mt('You do not have permission to manage self-enrollment').'</span>');
         }
-
     } elsif ($env{'form.action'} eq 'changelogs') {
         if ($permission->{cusr} || $permission->{view}) {
             &print_userchangelogs_display($r,$context,$permission,$brcrum);
@@ -5283,9 +5291,9 @@ sub print_main_menu {
                 );
   if ($linkcontext eq 'domain') {
       unless ($permission->{'cusr'}) {
-          $links{'domain'}{'singleuser'} = 'View a User';
+          $links{'domain'}{'singleuser'} = 'View a User'; 
           $linktitles{'domain'}{'singleuser'} = 'View information about a user in the domain';
-
+          
       }
   } elsif ($linkcontext eq 'course') {
       unless ($permission->{'cusr'}) {
@@ -5403,6 +5411,7 @@ sub print_main_menu {
                                           groups => 'Community Groups',
                                         },
                        );
+        $linktext{'Placement'} = $linktext{'Course'};
 
         my %linktitle = (
             'Course' => {
@@ -5417,6 +5426,8 @@ sub print_main_menu {
                            },
         );
 
+        $linktitle{'Placement'} = $linktitle{'Course'};
+
         push(@{ $menu[0]->{items} }, #Category: Single Users
             {   
              linktext => $linktext{$crstype}{'single'},
@@ -6028,7 +6039,7 @@ ENDSCRIPT
             } elsif ($item eq 'approval') {
                 my ($currnotified,$currapproval,%appchecked);
                 my %selfdescs = &Apache::lonuserutils::selfenroll_default_descs();
-                if (ref($currsettings) eq 'HASH') {
+                if (ref($currsettings) eq 'HASH') { 
                     $currnotified = $currsettings->{'selfenroll_notifylist'};
                     $currapproval = $currsettings->{'selfenroll_approval'};
                 }
@@ -6156,8 +6167,8 @@ ENDSCRIPT
                    .&mt('Save').'" onclick="validate_types(this.form);" />';
     }
     $output .= '<input type="hidden" name="action" value="selfenroll" />'
-               .'<input type="hidden" name="state" value="done" />'."\n"
-               .$additional.'</form>';
+              .'<input type="hidden" name="state" value="done" />'."\n"
+              .$additional.'</form>';
     $r->print($output);
     return;
 }
@@ -6562,7 +6573,7 @@ ENDSCRIPT
             }
         }
         if (($context eq 'course') && ($viewablesec ne '')) {
-            next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec);
+            next if ($roleslog{$id}{'logentry'}{'section'} ne $viewablesec); 
         }
         $count ++;
         next if ($count < $minshown);
@@ -7619,6 +7630,7 @@ sub build_search_response {
                                         ,' <a'.$helplink.'>'
                                         ,'</a>')
                                      .'<br />';
+                    
                     }
                 }
             }