--- loncom/interface/lonpickuser.pm	2009/08/19 19:57:53	1.3
+++ loncom/interface/lonpickuser.pm	2011/01/05 18:39:38	1.5
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Search for a user
 #
-# $Id: lonpickuser.pm,v 1.3 2009/08/19 19:57:53 raeburn Exp $
+# $Id: lonpickuser.pm,v 1.5 2011/01/05 18:39:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -71,7 +71,7 @@ sub handler {
     # Get parameters from query string
     &Apache::loncommon::get_unprocessed_cgi
         ($ENV{'QUERY_STRING'},['srchdom','form','udomelement','unameelement','ulastelement',
-                               'ufirstelement','uemailelement','hideudomelement','coursedom']);
+                               'ufirstelement','uemailelement','hideudomelement','coursedom','caller']);
     my $js;
 
     if (($env{'form.phase'} eq 'get_user_info') || 
@@ -89,6 +89,77 @@ function setphase(caller) {
 // ]]>
 </script>
 ENDSP
+    } elsif ($env{'form.caller'} eq 'checkusername') {
+        $js = <<"ENDCHK";
+<script type="text/javascript">
+// <![CDATA[
+function checkUser() {
+    var uname = opener.document.$env{'form.form'}.$env{'form.unameelement'}.value;
+    var udom;
+    var slct=opener.document.$env{'form.form'}.$env{'form.udomelement'};
+    if (slct.options == undefined) {
+        udom = opener.document.$env{'form.form'}.$env{'form.udomelement'}.value;
+    } else {
+        udom = slct.options[slct.selectedIndex].value;
+    }
+    if (uname != '') {
+        document.userpicker.srchterm.value = uname;
+        document.userpicker.srchdomain.value = udom;
+    }
+    document.userpicker.submit();
+}
+// ]]>
+</script>
+ENDCHK
+    } elsif ($env{'form.phase'} eq '') {
+        $js = <<"ENDSET";
+<script type="text/javascript">
+// <![CDATA[
+function setUserSearch() {
+    var uname = opener.document.$env{'form.form'}.$env{'form.unameelement'}.value;
+    var udom;
+    var slct=opener.document.$env{'form.form'}.$env{'form.udomelement'};
+    if (slct.options == undefined) {
+        udom = opener.document.$env{'form.form'}.$env{'form.udomelement'}.value;
+    } else {
+        udom = slct.options[slct.selectedIndex].value;
+    }
+    if (uname != '') {
+        document.userpicker.srchterm.value = uname;
+        var seldom = document.userpicker.srchdomain;
+        if (seldom.options != undefined) {
+            var i;
+            for (i=0;i<seldom.length;i++) {
+                if (seldom.options[i].value==udom) { seldom.selectedIndex=i; }
+            }
+        }
+        var selby = document.userpicker.srchby;
+        if (selby.options != undefined) {
+            var i;
+            for (i=0;i<selby.length;i++) {
+                if (selby.options[i].value=="uname") { selby.selectedIndex=i; }
+            }
+        }
+        var seltype = document.userpicker.srchtype;
+        if (seltype.options != undefined) {
+            var i;
+            for (i=0;i<seltype.length;i++) {
+                if (seltype.options[i].value=="exact") { seltype.selectedIndex=i; }
+            }
+        }
+        var selin = document.userpicker.srchin;
+        if (selin.options != undefined) {
+            var i;
+            for (i=0;i<selin.length;i++) {
+                if (selin.options[i].value=="dom") { selin.selectedIndex=i; }
+            }
+        }
+    }
+    return;
+}
+// ]]>
+</script>
+ENDSET
     }
     my $startargs = {'no_nav_bar'  => 1, };
     if ($env{'form.phase'} eq 'store_newuser') {
@@ -98,9 +169,18 @@ ENDSP
         my $newlast = $env{'form.newlast'};
         my $newemail = $env{'form.newemail'};
         $startargs->{'add_entries'} = { onload => 'javascript:gochoose('."'$uname','$udom','$newfirst','$newlast','$newemail'".');' };
+    } elsif ($env{'form.caller'} eq 'checkusername') {
+        $startargs->{'add_entries'} = { onload => 'javascript:checkUser();' };
+    } elsif ($env{'form.phase'} eq '') {
+        $startargs->{'add_entries'} = { onload => 'javascript:setUserSearch();' };
     }
     $r->print(&Apache::loncommon::start_page('Selecting course personnel',
                                              $js,$startargs));
+    if ($env{'form.caller'} eq 'checkusername') {
+        $r->print(&check_user_form().
+                  &Apache::loncommon::end_page());
+        return OK;
+    }
     my %toset = (
                   uname   => 'unameelement',
                   udom    => 'udomelement',
@@ -123,10 +203,12 @@ ENDSP
         ($srch{'srchtype'} eq 'exact') &&
         ($srch{'srchdomain'} ne '') &&
         ($srch{'srchterm'} ne '')) {
+        my (%curr_rules,%got_rules);
         my ($rules,$ruleorder) =
             &Apache::lonnet::inst_userrules($srch{'srchdomain'},'username');
         $usertype = &Apache::lonuserutils::check_usertype($srch{'srchdomain'},
-                                                          $srch{'srchterm'},$rules);
+                                                          $srch{'srchterm'},$rules,
+                                                          \%curr_rules,\%got_rules);
     }
 
     my $dom = $env{'form.coursedom'};
@@ -135,19 +217,16 @@ ENDSP
         &Apache::lonuserutils::can_create_user($dom,$context,$usertype);
     my $userpicker =
        &Apache::loncommon::user_picker($dom,\%srch,$forcenewuser,
-                                       'document.userpicker',$cancreate,$usertype);
+                                       'document.userpicker',$cancreate,
+                                       $usertype,$context);
     my $srchbutton = &mt('Search');
 
     my $headertext = &mt('Search for a user to add to course personnel');  
     my $opener_elems = '<input type="hidden" name="form" value="'.
                        $env{'form.form'}.'" />'."\n".
                        '<input type="hidden" name="coursedom" value="'.
-                       $env{'form.coursedom'}.'" />'."\n";
-    foreach my $item (keys(%toset)) {
-        if (exists($env{'form.'.$toset{$item}})) {
-            $opener_elems .= '<input type="hidden" name="'.$toset{$item}.'" value="'.$env{'form.'.$toset{$item}}.'" />'."\n";
-        }
-    }
+                       $env{'form.coursedom'}.'" />'."\n".
+                       &set_opener_elems();
     unless ($env{'form.phase'} eq 'define_newuser') { 
         $r->print(<<"ENDBLOCK");
 <h3>$headertext</h3>
@@ -159,7 +238,7 @@ $userpicker
 </form>
 ENDBLOCK
     }
-    if ($env{'form.phase'} eq 'get_user_info') {
+    if (($env{'form.phase'} eq 'get_user_info') && ($env{'form.srchterm'} ne '')) {
         $r->print('<hr /><div>'.&mt('Searching ...').'</div>');
         $r->rflush();
         my ($currstate,$response,$forcenewuser,$results) = 
@@ -266,4 +345,37 @@ function gochoose(uname,udom,ufirst,ulas
 ENDGC
 }
 
+sub check_user_form {
+    return '
+<form action="/adm/pickuser" method="post" name="userpicker">
+<input type="hidden" name="form" value="'.$env{'form.form'}.'" />
+<input type="hidden" name="coursedom" value="'.$env{'form.coursedom'}.'" />'."\n".
+                 &set_opener_elems().'
+<input type="hidden" name="srchby" value="uname" />
+<input type="hidden" name="srchin" value="dom" />
+<input type="hidden" name="srchterm" value="" />
+<input type="hidden" name="srchdomain" value="" />
+<input type="hidden" name="srchtype" value="exact" />
+<input type="hidden" name="phase" value="get_user_info" />
+</form>'."\n";
+}
+
+sub set_opener_elems {
+    my %toset = (
+                  uname   => 'unameelement',
+                  udom    => 'udomelement',
+                  first   => 'ufirstelement',
+                  lastn   => 'ulastelement',
+                  email   => 'uemailelement',
+                  hidedom => 'hideudomelement',
+                );
+    my $output;
+    foreach my $item (keys(%toset)) {
+        if (exists($env{'form.'.$toset{$item}})) {
+            $output .= '<input type="hidden" name="'.$toset{$item}.'" value="'.$env{'form.'.$toset{$item}}.'" />'."\n";
+        }
+    }
+    return $output;
+}
+
 1;