[BACK]Return to loncreateuser.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncreateuser.pm between versions 1.406.2.2 and 1.406.2.3

version 1.406.2.2, 2016/08/12 18:33:17 version 1.406.2.3, 2016/09/18 18:10:54
Line 813  sub entry_form { Line 813  sub entry_form {
     }      }
     my $cancreate =      my $cancreate =
         &Apache::lonuserutils::can_create_user($dom,$context,$usertype);          &Apache::lonuserutils::can_create_user($dom,$context,$usertype);
     my $userpicker =       my ($userpicker,$cansearch) = 
        &Apache::loncommon::user_picker($dom,$srch,$forcenewuser,         &Apache::loncommon::user_picker($dom,$srch,$forcenewuser,
                                        'document.crtuser',$cancreate,$usertype);                                         'document.crtuser',$cancreate,$usertype);
     my $srchbutton = &mt('Search');      my $srchbutton = &mt('Search');
Line 822  sub entry_form { Line 822  sub entry_form {
     } elsif ($cancreate && $responsemsg ne '' && $inexact) {      } elsif ($cancreate && $responsemsg ne '' && $inexact) {
         $srchbutton = &mt('Search or Add New User');          $srchbutton = &mt('Search or Add New User');
     }      }
     my $output = <<"ENDBLOCK";      my $output;
       if ($cansearch) {
           $output = <<"ENDBLOCK";
 <form action="/adm/createuser" method="post" name="crtuser">  <form action="/adm/createuser" method="post" name="crtuser">
 <input type="hidden" name="action" value="$env{'form.action'}" />  <input type="hidden" name="action" value="$env{'form.action'}" />
 <input type="hidden" name="phase" value="get_user_info" />  <input type="hidden" name="phase" value="get_user_info" />
Line 830  $userpicker Line 832  $userpicker
 <input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.crtuser)" />  <input name="userrole" type="button" value="$srchbutton" onclick="javascript:validateEntry(document.crtuser)" />
 </form>  </form>
 ENDBLOCK  ENDBLOCK
       } else {
           $output = '<p>'.$userpicker.'</p>';
       }
     if ($env{'form.phase'} eq '') {      if ($env{'form.phase'} eq '') {
         my $defdom=$env{'request.role.domain'};          my $defdom=$env{'request.role.domain'};
         my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');          my $domform = &Apache::loncommon::select_dom_form($defdom,'srchdomain');
Line 6826  sub user_search_result { Line 6831  sub user_search_result {
         $response = '<span class="LC_warning">'.$response.'</span>';          $response = '<span class="LC_warning">'.$response.'</span>';
     }      }
     if ($srch->{'srchin'} eq 'instd') {      if ($srch->{'srchin'} eq 'instd') {
         my $instd_chk = &directorysrch_check($srch);          my $instd_chk = &instdirectorysrch_check($srch);
         if ($instd_chk ne 'ok') {          if ($instd_chk ne 'ok') {
             $response = '<span class="LC_warning">'.$instd_chk.'</span>'.              my $domd_chk = &domdirectorysrch_check($srch);
                         '<br />'.&mt('You may want to search in the LON-CAPA domain instead of the institutional directory.').'<br /><br />';              $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 .= '<br /><br />';
           }
       } else {
           unless (($context eq 'requestcrs') && ($srch->{'srchtype'} eq 'exact')) {
               my $domd_chk = &domdirectorysrch_check($srch);
               if ($domd_chk ne 'ok') {
                   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 .= '<br /><br />';
               }
         }          }
     }      }
     if ($response ne '') {      if ($response ne '') {
Line 7004  sub user_search_result { Line 7025  sub user_search_result {
     return ($currstate,$response,$forcenewuser,\%srch_results);      return ($currstate,$response,$forcenewuser,\%srch_results);
 }  }
   
 sub directorysrch_check {  sub domdirectorysrch_check {
       my ($srch) = @_;
       my $response;
       my %dom_inst_srch = &Apache::lonnet::get_dom('configuration',
                                                ['directorysrch'],$srch->{'srchdomain'});
       my $showdom = &display_domain_info($srch->{'srchdomain'});
       if (ref($dom_inst_srch{'directorysrch'}) eq 'HASH') {
           if ($dom_inst_srch{'directorysrch'}{'lcavailable'} eq '0') {
               return &mt('LON-CAPA directory search is not available in domain: [_1]',$showdom);
           }
           if ($dom_inst_srch{'directorysrch'}{'lclocalonly'}) {
               if ($env{'request.role.domain'} ne $srch->{'srchdomain'}) {
                   return &mt('LON-CAPA directory search in domain: [_1] is only allowed for users with a current role in the domain.',$showdom);
               }
           }
       }
       return 'ok';
   }
   
   sub instdirectorysrch_check {
     my ($srch) = @_;      my ($srch) = @_;
     my $can_search = 0;      my $can_search = 0;
     my $response;      my $response;
Removed from v.1.406.2.2  
changed lines
  Added in v.1.406.2.3

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>