--- loncom/interface/loncreateuser.pm	2019/08/27 14:45:04	1.406.2.17
+++ loncom/interface/loncreateuser.pm	2017/04/01 14:00:23	1.439
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Create a user
 #
-# $Id: loncreateuser.pm,v 1.406.2.17 2019/08/27 14:45:04 raeburn Exp $
+# $Id: loncreateuser.pm,v 1.439 2017/04/01 14:00:23 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',
@@ -1486,7 +1492,7 @@ ENDAUTH
              ($env{'request.role.domain'} eq $ccdomain)) {
             $user_text{'requestauthor'} = &domainrole_req($ccuname,$ccdomain);
         }
-        $user_text{'auth'} =  &user_authentication($ccuname,$ccdomain,$formname,$crstype,$permission);
+        $user_text{'auth'} =  &user_authentication($ccuname,$ccdomain,$formname);
         if ((&Apache::lonnet::allowed('mpq',$ccdomain)) ||
             (&Apache::lonnet::allowed('mut',$ccdomain)) ||
             (&Apache::lonnet::allowed('udp',$ccdomain))) {
@@ -2164,7 +2170,7 @@ sub new_domain_roles {
 }
 
 sub user_authentication {
-    my ($ccuname,$ccdomain,$formname,$crstype,$permission) = @_;
+    my ($ccuname,$ccdomain,$formname) = @_;
     my $currentauth=&Apache::lonnet::queryauthenticate($ccuname,$ccdomain);
     my $outcome;
     my %lt=&Apache::lonlocal::texthash(
@@ -2202,6 +2208,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);
@@ -2236,43 +2243,6 @@ ENDBADAUTH
             }
             $outcome .= &Apache::loncommon::end_data_table();
         } else {
-            if (($currentauth =~ /^internal:/) &&
-                (&Apache::lonuserutils::can_change_internalpass($ccuname,$ccdomain,$crstype,$permission))) {
-                $outcome = <<"ENDJS";
-<script type="text/javascript">
-// <![CDATA[
-function togglePwd(form) {
-    if (form.newintpwd.length) {
-        if (document.getElementById('LC_ownersetpwd')) {
-            for (var i=0; i<form.newintpwd.length; i++) {
-                if (form.newintpwd[i].checked) {
-                    if (form.newintpwd[i].value == 1) {
-                        document.getElementById('LC_ownersetpwd').style.display = 'inline-block';
-                    } else {
-                        document.getElementById('LC_ownersetpwd').style.display = 'none';
-                    }
-                }
-            }
-        }
-    }
-}
-// ]]>
-</script>
-ENDJS
-
-                $outcome .= '<h3>'.$lt{'ld'}.'</h3>'.
-                            &Apache::loncommon::start_data_table().
-                            &Apache::loncommon::start_data_table_row().
-                            '<td>'.&mt('Internally authenticated').'<br />'.&mt("Change user's password?").
-                            '<label><input type="radio" name="newintpwd" value="0" checked="checked" onclick="togglePwd(this.form);" />'.
-                            &mt('No').'</label>'.('&nbsp;'x2).
-                            '<label><input type="radio" name="newintpwd" value="1" onclick="togglePwd(this.form);" />'.&mt('Yes').'</label>'.
-                            '<div id="LC_ownersetpwd" style="display:none">'.
-                            '&nbsp;&nbsp;'.&mt('Password').' <input type="password" size="15" 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></div></td>'.
-                            &Apache::loncommon::end_data_table_row().
-                            &Apache::loncommon::end_data_table();
-            }
             if (&Apache::lonnet::allowed('udp',$ccdomain)) {
                 # Current user has rights to view domain preferences for user's domain
                 my $result;
@@ -2382,7 +2352,7 @@ sub modify_login_block {
 
 sub personal_data_display {
     my ($ccuname,$ccdomain,$newuser,$context,$inst_results,$rolesarray,
-        $now,$captchaform,$emailusername,$usertype,$usernameset,$condition,$excluded) = @_;
+        $now,$captchaform,$emailusername,$usertype) = @_;
     my ($output,%userenv,%canmodify,%canmodify_status);
     my @userinfo = ('firstname','middlename','lastname','generation',
                     'permanentemail','id');
@@ -2409,7 +2379,6 @@ sub personal_data_display {
                 'inststatus'     => "Affiliation",
                 'email'          => 'E-mail address',
                 'valid'          => 'Validation',
-                'username'       => 'Username',
     );
 
     %canmodify_status =
@@ -2428,7 +2397,7 @@ sub personal_data_display {
             if (ref($emailusername) eq 'HASH') {
                 if (ref($emailusername->{$usertype}) eq 'HASH') {
                     my ($infofields,$infotitles) = &Apache::loncommon::emailusername_info();
-                    @userinfo = ();
+                    @userinfo = ();          
                     if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
                         foreach my $field (@{$infofields}) { 
                             if ($emailusername->{$usertype}->{$field}) {
@@ -2458,38 +2427,9 @@ sub personal_data_display {
     $output = '<h3>'.$lt{'pd'}.'</h3>'.
               &Apache::lonhtmlcommon::start_pick_box();
     if (($context eq 'selfcreate') && ($newuser eq 'email')) {
-        my $size = 25;
-        if ($condition) {
-            if ($condition =~ /^\@[^\@]+$/) {
-                $size = 10;
-            } else {
-                undef($condition);
-            }
-        }
-        if ($excluded) {
-            unless ($excluded =~ /^\@[^\@]+$/) {
-                undef($condition);
-            }
-        }
         $output .= &Apache::lonhtmlcommon::row_title($lt{'email'}.'<b>*</b>',undef,
                                                      'LC_oddrow_value')."\n".
-                   '<input type="text" name="uname" size="'.$size.'" value="" autocomplete="off" />';
-        if ($condition) {
-            $output .= $condition;
-        } elsif ($excluded) {
-            $output .= '<br /><span style="font-size: smaller">'.&mt('You must use an e-mail address that does not end with [_1]',
-                                                                     $excluded).'</span>';
-        }
-        if ($usernameset eq 'first') {
-            $output .= '<br /><span style="font-size: smaller">';
-            if ($condition) {
-                $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before [_1]',
-                                      $condition);
-            } else {
-                $output .= &mt('Your username in LON-CAPA will be the part of your e-mail address before the @');
-            }
-            $output .= '</span>';
-        }
+                   '<input type="text" name="uname" size="25" value="" autocomplete="off" />';
         $rowcount ++;
         $output .= &Apache::lonhtmlcommon::row_closure(1);
         my $upassone = '<input type="password" name="upass'.$now.'" size="20" autocomplete="off" />';
@@ -2504,19 +2444,6 @@ sub personal_data_display {
                                                      'LC_oddrow_value')."\n".
                    $upasstwo.
                    &Apache::lonhtmlcommon::row_closure()."\n";
-        if ($usernameset eq 'free') {
-            my $onclick = "toggleUsernameDisp(this,'selfcreateusername');";
-            $output .= &Apache::lonhtmlcommon::row_title($lt{'username'},undef,'LC_oddrow_value')."\n".
-                       &mt('Use e-mail address: ').
-                       '<label><input type="radio" name="emailused" value="1" checked="checked" onclick="'.$onclick.'" />'.&mt('Yes').'</label>'."\n".
-                       ('&nbsp;'x2).
-                       '<label><input type="radio" name="emailused" value="0" onclick="'.$onclick.'" />'.&mt('No').'</label>'."\n".
-                       '<div id="selfcreateusername" style="display: none; font-size: smaller">'.
-                       '<br /><span class="LC_nobreak">'.&mt('Preferred username').
-                       '&nbsp;<input type="text" name="username" value="" size="20" autocomplete="off"/>'.
-                       '</span></div>'."\n".&Apache::lonhtmlcommon::row_closure(1);
-            $rowcount ++;
-        }
     }
     foreach my $item (@userinfo) {
         my $rowtitle = $lt{$item};
@@ -2707,7 +2634,7 @@ sub get_inststatuses {
 
 # ================================================================= Phase Three
 sub update_user_data {
-    my ($r,$context,$crstype,$brcrum,$showcredits,$permission) = @_; 
+    my ($r,$context,$crstype,$brcrum,$showcredits) = @_; 
     my $uhome=&Apache::lonnet::homeserver($env{'form.ccuname'},
                                           $env{'form.ccdomain'});
     # Error messages
@@ -2844,7 +2771,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'});
@@ -2992,15 +2919,8 @@ sub update_user_data {
 		  ($env{'form.ccuname'},$env{'form.ccdomain'}));
 	} else {
 	    # Okay, this is a non-fatal error.
-	    $r->print($error.&mt('You do not have privileges to modify the authentication configuration for this user.').$end);    
+	    $r->print($error.&mt('You do not have the authority to modify this users authentication information.').$end);    
 	}
-    } elsif (($env{'form.intarg'} ne '') &&
-             (&Apache::lonnet::queryauthenticate($env{'form.ccuname'},$env{'form.ccdomain'}) =~ /^internal:/) &&
-             (&Apache::lonuserutils::can_change_internalpass($env{'form.ccuname'},$env{'form.ccdomain'},$crstype,$permission))) {
-        $r->print('Modifying authentication: '.
-                  &Apache::lonnet::modifyuserauth(
-                  $env{'form.ccdomain'},$env{'form.ccuname'},
-                  'internal',$env{'form.intarg'}));
     }
     $r->rflush(); # Finish display of header before time consuming actions start
     &Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state);
@@ -3024,7 +2944,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) { 
@@ -3315,8 +3235,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}) {
@@ -3382,7 +3303,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 = 
@@ -3525,6 +3446,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:',
@@ -4714,6 +4636,10 @@ sub handler {
                     help=>$allhelpitems}
                   ];
     }
+    #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,$crstype);
     if (!$allowed) {
         if ($context eq 'course') {
             $r->internal_redirect('/adm/viewclasslist');
@@ -4766,41 +4692,16 @@ sub handler {
         if (! exists($env{'form.state'})) {
             &Apache::lonuserutils::print_first_users_upload_form($r,$context);
         } elsif ($env{'form.state'} eq 'got_file') {
-            my $result =
-                &Apache::lonuserutils::print_upload_manager_form($r,$context,
-                                                                 $permission,
-                                                                 $crstype,$showcredits);
-            if ($result eq 'missingdata') {
-                delete($env{'form.state'});
-                &Apache::lonuserutils::print_first_users_upload_form($r,$context);
-            }
+            &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
+                                                             $crstype,$showcredits);
         } elsif ($env{'form.state'} eq 'enrolling') {
             if ($env{'form.datatoken'}) {
-                my $result = &Apache::lonuserutils::upfile_drop_add($r,$context,
-                                                                    $permission,
-                                                                    $showcredits);
-                if ($result eq 'missingdata') {
-                    delete($env{'form.state'});
-                    &Apache::lonuserutils::print_first_users_upload_form($r,$context);
-                } elsif ($result eq 'invalidhome') {
-                    $env{'form.state'} = 'got_file';
-                    delete($env{'form.lcserver'});
-                    my $result =
-                        &Apache::lonuserutils::print_upload_manager_form($r,$context,$permission,
-                                                                         $crstype,$showcredits);
-                    if ($result eq 'missingdata') {
-                        delete($env{'form.state'});
-                        &Apache::lonuserutils::print_first_users_upload_form($r,$context);
-                    }
-                }
-            } else {
-                delete($env{'form.state'});
-                &Apache::lonuserutils::print_first_users_upload_form($r,$context);
+                &Apache::lonuserutils::upfile_drop_add($r,$context,$permission,
+                                                       $showcredits);
             }
         } else {
             &Apache::lonuserutils::print_first_users_upload_form($r,$context);
         }
-        $r->print('</form>');
     } elsif (((($env{'form.action'} eq 'singleuser') || ($env{'form.action'}
               eq 'singlestudent')) && ($permission->{'cusr'})) ||
              (($env{'form.action'} eq 'singleuser') && ($permission->{'view'})) ||
@@ -4906,7 +4807,7 @@ sub handler {
                 &print_useraccesslogs_display($r,$ccuname,$ccdomain,$permission,$brcrum);
             }
         } elsif ($env{'form.phase'} eq 'update_user_data') {
-            &update_user_data($r,$context,$crstype,$brcrum,$showcredits,$permission);
+            &update_user_data($r,$context,$crstype,$brcrum,$showcredits);
         } else {
             &print_username_entry_form($r,$context,undef,$srch,undef,$crstype,
                                        $brcrum,$permission);
@@ -5022,77 +4923,47 @@ sub handler {
                             unless ($usertype) {
                                 $usertype = 'default';
                             }
-                            my ($showstatus,$showemail,$pickstart);
-                            my $numextras = 0;
-                            my ($othertitle,$usertypes,$types) = &Apache::loncommon::sorted_inst_types($dom);
-                            if ((ref($types) eq 'ARRAY') && (@{$types} > 0)) {
-                                if (ref($usertypes) eq 'HASH') {
-                                    if ($usertypes->{$usertype}) {
-                                        $showstatus = $usertypes->{$usertype};
-                                    } else {
-                                        $showstatus = $othertitle;
-                                    }
-                                    if ($showstatus) {
-                                        $numextras ++;
-                                    }
-                                }
-                            }
-                            if (($info{$uname}{'email'} ne '') && ($info{$uname}{'email'} ne $uname)) {
-                                $showemail = $info{$uname}{'email'};
-                                $numextras ++;
-                            }
                             if (ref($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}) eq 'HASH') {
                                 if ((ref($infofields) eq 'ARRAY') && (ref($infotitles) eq 'HASH')) {
-                                    $pickstart = 1;
                                     $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());
-                                    my ($num,$count);
+                                    my ($num,$count,$showstatus);
                                     $count = scalar(keys(%{$domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}}));
-                                    $count += $numextras;
+                                    unless ($usertype eq 'default') {
+                                        my ($othertitle,$usertypes,$types) = 
+                                            &Apache::loncommon::sorted_inst_types($dom);
+                                        if (ref($usertypes) eq 'HASH') {
+                                            if ($usertypes->{$usertype}) {
+                                                $showstatus = $usertypes->{$usertype};
+                                                $count ++;
+                                            }
+                                        }
+                                    }
                                     foreach my $field (@{$infofields}) {
                                         next unless ($domconfig{'usercreation'}{'cancreate'}{'emailusername'}{$usertype}{$field});
                                         next unless ($infotitles->{$field});
                                         $r->print(&Apache::lonhtmlcommon::row_title($infotitles->{$field}).
                                                   $info{$uname}{$field});
                                         $num ++;
-                                        unless ($count == $num) {
+                                        if ($count == $num) {
+                                            $r->print(&Apache::lonhtmlcommon::row_closure(1));
+                                        } else {
                                             $r->print(&Apache::lonhtmlcommon::row_closure());
                                         }
                                     }
-                                }
-                            }
-                            if ($numextras) {
-                                unless ($pickstart) {
-                                    $r->print('<div>'.&Apache::lonhtmlcommon::start_pick_box());
-                                    $pickstart = 1;
-                                }
-                                if ($showemail) {
-                                    my $closure = '';
-                                    unless ($showstatus) {
-                                        $closure = 1;
+                                    if ($showstatus) {
+                                        $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type (self-reported)')).
+                                                  $showstatus.
+                                                  &Apache::lonhtmlcommon::row_closure(1));
                                     }
-                                    $r->print(&Apache::lonhtmlcommon::row_title(&mt('E-mail address')).
-                                              $showemail.
-                                              &Apache::lonhtmlcommon::row_closure($closure));
-                                }
-                                if ($showstatus) {
-                                    $r->print(&Apache::lonhtmlcommon::row_title(&mt('Status type[_1](self-reported)','<br />')).
-                                              $showstatus.
-                                              &Apache::lonhtmlcommon::row_closure(1));
+                                    $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
                                 }
                             }
-                            if ($pickstart) {
-                                $r->print(&Apache::lonhtmlcommon::end_pick_box().'</div>');
-                            } else {
-                                $r->print('<div>'.&mt('No information to display for this account request.').'</div>');
-                            }
-                        } else {
-                            $r->print('<div>'.&mt('No information available for this account request.').'</div>');
                         }
                     }
                 }
             }
+            $r->print(&close_popup_form());
         }
-        $r->print(&close_popup_form());
     } elsif (($env{'form.action'} eq 'listusers') && 
              ($permission->{'view'} || $permission->{'cusr'})) {
         my $helpitem = 'Course_View_Class_List';
@@ -5670,6 +5541,7 @@ sub print_main_menu {
                                           groups => 'Community Groups',
                                         },
                        );
+        $linktext{'Placement'} = $linktext{'Course'};
 
         my %linktitle = (
             'Course' => {
@@ -5684,6 +5556,8 @@ sub print_main_menu {
                            },
         );
 
+        $linktitle{'Placement'} = $linktitle{'Course'};
+
         push(@{ $menu[0]->{items} }, #Category: Single Users
             {   
              linktext => $linktext{$crstype}{'single'},
@@ -5959,13 +5833,12 @@ function validate_types(form) {
 }
 
 function check_types(num,countfail,needaction) {
-    var boxname = 'selfenroll_types_'+num;
-    var typeidx = getIndexByName(boxname);
+    var typeidx = getIndexByName('selfenroll_types_'+num);
     var count = 0;
     if (typeidx != -1) {
-        if (document.$formname.elements[boxname].length) {
-            for (var k=0; k<document.$formname.elements[boxname].length; k++) {
-                if (document.$formname.elements[boxname][k].checked) {
+        if (document.$formname.elements[typeidx].length) {
+            for (var k=0; k<document.$formname.elements[typeidx].length; k++) {
+                if (document.$formname.elements[typeidx][k].checked) {
                     count ++;
                 }
             }
@@ -8499,7 +8372,7 @@ sub user_search_result {
             my $domd_chk = &domdirectorysrch_check($srch);
             $response .= '<span class="LC_warning">'.$instd_chk.'</span><br />';
             if ($domd_chk eq 'ok') {
-                $response .= &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.');
+                $response .= &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.');
             }
             $response .= '<br />';
         }
@@ -8510,7 +8383,7 @@ sub user_search_result {
                 my $instd_chk = &instdirectorysrch_check($srch);
                 $response .= '<span class="LC_warning">'.$domd_chk.'</span><br />';
                 if ($instd_chk eq 'ok') {
-                    $response .= &mt('You may want to search in the institutional directory instead of the LON-CAPA domain.');
+                    $response .= &mt('You may want to search in the institutional directory instead of in the LON-CAPA domain.');
                 }
                 $response .= '<br />';
             }
@@ -8611,7 +8484,7 @@ sub user_search_result {
                 $response = '<span class="LC_warning">'.
                     &mt('Institutional directory search is not available in domain: [_1]',$showdom).
                     '</span><br />'.
-                    &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+                    &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.').
                     '<br />'; 
             }
         }
@@ -8684,7 +8557,7 @@ sub user_search_result {
                 $response = '<span class="LC_warning">'.
                     &mt('Institutional directory search is not available in domain: [_1]',$showdom).
                     '</span><br />'.
-                    &mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').
+                    &mt('You may want to search in the LON-CAPA domain instead of in the institutional directory.').
                     '<br />';
             }
         }