--- loncom/interface/loncommon.pm	2007/07/03 00:30:47	1.544
+++ loncom/interface/loncommon.pm	2007/08/11 14:22:14	1.560
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.544 2007/07/03 00:30:47 albertel Exp $
+# $Id: loncommon.pm,v 1.560 2007/08/11 14:22:14 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -334,10 +334,12 @@ sub studentbrowser_javascript {
    return (<<'ENDSTDBRW');
 <script type="text/javascript" language="Javascript" >
     var stdeditbrowser;
-    function openstdbrowser(formname,uname,udom,roleflag) {
+    function openstdbrowser(formname,uname,udom,roleflag,ignorefilter) {
         var url = '/adm/pickstudent?';
         var filter;
-        eval('filter=document.'+formname+'.'+uname+'.value;');
+	if (!ignorefilter) {
+	    eval('filter=document.'+formname+'.'+uname+'.value;');
+	}
         if (filter != null) {
            if (filter != '') {
                url += 'filter='+filter+'&';
@@ -365,7 +367,7 @@ sub selectstudent_link {
 	   return '';
        }
        return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
-        '","'.$udomele.'");'."'>".&mt('Select User')."</a>";
+        '","'.$udomele.'","","1");'."'>".&mt('Select User')."</a>";
    }
    if ($env{'request.role'}=~/^(au|dc|su)/) {
        return "<a href='".'javascript:openstdbrowser("'.$form.'","'.$unameele.
@@ -709,8 +711,7 @@ sub help_open_topic {
     my ($topic, $text, $stayOnPage, $width, $height) = @_;
     $text = "" if (not defined $text);
     $stayOnPage = 0 if (not defined $stayOnPage);
-    if ($env{'browser.interface'} eq 'textual' ||
-	$env{'environment.remote'} eq 'off' ) {
+    if ($env{'browser.interface'} eq 'textual') {
 	$stayOnPage=1;
     }
     $width = 350 if (not defined $width);
@@ -802,12 +803,17 @@ ENDOUTPUT
 # now just updates the help link and generates a blue icon
 sub help_open_menu {
     my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) 
-	= @_;
-    
+	= @_;    
     $stayOnPage = 0 if (not defined $stayOnPage);
-    if ($env{'browser.interface'} eq 'textual' ||
-	$env{'environment.remote'} eq 'off' ) {
-	$stayOnPage=1;
+    # formerly only used pop-up help (stayOnPage = 0)
+    # if environment.remote is on (using remote control UI)
+    # if ($env{'browser.interface'} eq 'textual' ||
+    #	$env{'environment.remote'} eq 'off' ) {
+    #   $stayOnPage=1;
+    #}
+    # Now making pop-up help the default even with remote control
+    if ($env{'browser.interface'} eq 'textual') {
+        $stayOnPage=1;
     }
     my $output;
     if ($component_help) {
@@ -1263,8 +1269,10 @@ sub domain_select {
     } &Apache::lonnet::all_domains();
     if ($multiple) {
 	$domains{''}=&mt('Any domain');
+	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
 	return &multiple_select_form($name,$value,4,\%domains);
     } else {
+	$domains{'select_form_order'} = [sort {lc($a) cmp lc($b) } (keys(%domains))];
 	return &select_form($name,$value,%domains);
     }
 }
@@ -1430,7 +1438,7 @@ selected");
 #-------------------------------------------
 sub select_dom_form {
     my ($defdom,$name,$includeempty) = @_;
-    my @domains = sort(&Apache::lonnet::all_domains());
+    my @domains = sort {lc($a) cmp lc($b)} (&Apache::lonnet::all_domains());
     if ($includeempty) { @domains=('',@domains); }
     my $selectdomain = "<select name=\"$name\" size=\"1\">\n";
     foreach my $dom (@domains) {
@@ -2154,6 +2162,15 @@ sub getemails {
     }
 }
 
+sub flush_email_cache {
+    my ($uname,$udom)=@_;
+    if (!$udom)  { $udom =$env{'user.domain'}; }
+    if (!$uname) { $uname=$env{'user.name'};   }
+    return if ($udom eq 'public' && $uname eq 'public');
+    my $id=$uname.':'.$udom;
+    &Apache::lonnet::devalidate_cache_new('emailscache',$id);
+}
+
 # ------------------------------------------------------------------ Screenname
 
 =pod
@@ -2227,7 +2244,8 @@ sub track_student_link {
         $target = '';
     }
     if ($start) { $link.='&amp;start='.$start; }
-    
+    $title = &mt($title);
+    $linktext = &mt($linktext);
     return qq{<a href="$link" title="$title" $target>$linktext</a>}.
 	&help_open_topic('View_recent_activity');
 }
@@ -3338,7 +3356,7 @@ sub designparm {
 
 =back
 
-=head1 HTTP Helpers
+=head1 HTML Helpers
 
 =over 4
 
@@ -3632,20 +3650,12 @@ sub make_attr_string {
 
 =pod
 
-=back
-
-=head1 HTML Helpers
-
-=over 4
-
 =item * &endbodytag()
 
 Returns a uniform footer for LON-CAPA web pages.
 
 Inputs: none
 
-=back
-
 =cut
 
 sub endbodytag {
@@ -3662,8 +3672,6 @@ sub endbodytag {
 
 =pod
 
-=over 4
-
 =item * &standard_css()
 
 Returns a style sheet
@@ -3674,8 +3682,6 @@ Inputs: (all optional)
             function       -> force usage of a specific rolish color scheme
             bgcolor        -> override the default page bgcolor
 
-=back
-
 =cut
 
 sub standard_css {
@@ -4435,28 +4441,71 @@ span.LC_nobreak {
   white-space: nowrap;
 }
 
-.LC_docs_course_commands div{
-   float: left;
-   border: 4px solid #AAAAAA;
-   padding: 4px;
-   background: #DDDDCC;
+table.LC_docs_documents {
+  background: #BBBBBB;
+  border-width: 0px;
+  border-collapse: collapse;
+}
+
+table.LC_docs_documents td.LC_docs_document {
+  border: 2px solid black;
+  padding: 4px;
+}
+
+.LC_docs_course_commands div {
+  float: left;
+  border: 4px solid #AAAAAA;
+  padding: 4px;
+  background: #DDDDCC;
+}
+
+.LC_docs_entry_move {
+  border: 0px;
+  border-collapse: collapse;
+}
+
+.LC_docs_entry_move td {
+  border: 2px solid #BBBBBB;
+  background: #DDDDDD;
 }
 
+.LC_docs_editor td.LC_docs_entry_commands {
+  background: #DDDDDD;
+  font-size: x-small;
+}
 .LC_docs_copy {
-   color: #000099;
-   font-size: x-small;
+  color: #000099;
 }
 .LC_docs_cut {
-   color: #550044;
-   font-size: x-small;
+  color: #550044;
 }
 .LC_docs_rename {
-   color: #009900;
-   font-size: x-small;
+  color: #009900;
 }
 .LC_docs_remove {
-   color: #990000;
-   font-size: x-small;
+  color: #990000;
+}
+
+.LC_docs_reinit_warn,
+.LC_docs_ext_edit {
+  font-size: x-small;
+}
+
+.LC_docs_editor td.LC_docs_entry_title,
+.LC_docs_editor td.LC_docs_entry_icon {
+  background: #FFFFBB;
+}
+.LC_docs_editor td.LC_docs_entry_parameter {
+  background: #BBBBFF;
+  font-size: x-small;
+  white-space: nowrap;
+}
+
+table.LC_docs_adddocs td,
+table.LC_docs_adddocs th {
+  border: 1px solid #BBBBBB;
+  padding: 4px;
+  background: #DDDDDD;
 }
 
 END
@@ -4464,8 +4513,6 @@ END
 
 =pod
 
-=over 4
-
 =item * &headtag()
 
 Returns a uniform footer for LON-CAPA web pages.
@@ -4489,8 +4536,6 @@ Inputs: $title - optional title for the
             no_auto_mt_title
                            -> prevent &mt()ing the title arg
 
-=back
-
 =cut
 
 sub headtag {
@@ -4546,16 +4591,12 @@ ADDMETA
 
 =pod
 
-=over 4
-
 =item * &font_settings()
 
 Returns neccessary <meta> to set the proper encoding
 
 Inputs: none
 
-=back
-
 =cut
 
 sub font_settings {
@@ -4572,16 +4613,12 @@ sub font_settings {
 
 =pod
 
-=over 4
-
 =item * &xml_begin()
 
 Returns the needed doctype and <html>
 
 Inputs: none
 
-=back
-
 =cut
 
 sub xml_begin {
@@ -4606,16 +4643,12 @@ sub xml_begin {
 
 =pod
 
-=over 4
-
 =item * &endheadtag()
 
 Returns a uniform </head> for LON-CAPA web pages.
 
 Inputs: none
 
-=back
-
 =cut
 
 sub endheadtag {
@@ -4624,8 +4657,6 @@ sub endheadtag {
 
 =pod
 
-=over 4
-
 =item * &head()
 
 Returns a uniform complete <head>..</head> section for LON-CAPA web pages.
@@ -4633,8 +4664,6 @@ Returns a uniform complete <head>..</hea
 Inputs: $title - optional title for the page
         $head_extra - optional extra HTML to put inside the <head>
 
-=back
-
 =cut
 
 sub head {
@@ -4644,8 +4673,6 @@ sub head {
 
 =pod
 
-=over 4
-
 =item * &start_page()
 
 Returns a complete <html> .. <body> section for LON-CAPA web pages.
@@ -4684,8 +4711,6 @@ Inputs: $title - optional title for the
 
                   no_auto_mt_title -> prevent &mt()ing the title arg
 
-=back
-
 =cut
 
 sub start_page {
@@ -4737,8 +4762,6 @@ sub start_page {
 
 =pod
 
-=over 4
-
 =item * &head()
 
 Returns a complete </body></html> section for LON-CAPA web pages.
@@ -4896,10 +4919,61 @@ sub simple_error_page {
     }
 }
 
+=pod
+
+=item * &inhibit_menu_check($arg)
+
+Checks for a inhibitmenu state and generates output to preserve it
+
+Inputs:         $arg - can be any of
+                     - undef - in which case the return value is a string 
+                               to add  into arguments list of a uri
+                     - 'input' - in which case the return value is a HTML
+                                 <form> <input> field of type hidden to
+                                 preserve the value
+                     - a url - in which case the return value is the url with
+                               the neccesary cgi args added to preserve the
+                               inhibitmenu state
+                     - a ref to a url - no return value, but the string is
+                                        updated to include the neccessary cgi
+                                        args to preserve the inhibitmenu state
+
+=cut
+
+sub inhibit_menu_check {
+    my ($arg) = @_;
+    &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
+    if ($arg eq 'input') {
+	if ($env{'form.inhibitmenu'}) {
+	    return '<input type="hidden" name="inhibitmenu" value="'.$env{'form.inhibitmenu'}.'" />';
+	} else {
+	    return
+	}
+    }
+    if ($env{'form.inhibitmenu'}) {
+	if (ref($arg)) {
+	    $$arg .= '?inhibitmenu='.$env{'form.inhibitmenu'};
+	} elsif ($arg eq '') {
+	    $arg .= 'inhibitmenu='.$env{'form.inhibitmenu'};
+	} else {
+	    $arg .= '?inhibitmenu='.$env{'form.inhibitmenu'};
+	}
+    }
+    if (!ref($arg)) {
+	return $arg;
+    }
+}
+
 ###############################################
 
 =pod
 
+=back
+
+=head1 User Information Routines
+
+=over 4
+
 =item * &get_users_function()
 
 Used by &bodytag to determine the current users primary role.
@@ -5460,8 +5534,217 @@ sub get_secgrprole_info {
     return (\@sections,\@groups,$allroles,$rolehash,$accesshash);
 }
 
+sub user_picker {
+    my ($dom,$srch,$forcenewuser) = @_;
+    my $currdom = $dom;
+    my %curr_selected = (
+                        srchin => 'dom',
+                        srchby => 'uname',
+                      );
+    my $srchterm;
+    if (ref($srch) eq 'HASH') {
+        if ($srch->{'srchby'} ne '') {
+            $curr_selected{'srchby'} = $srch->{'srchby'};
+        }
+        if ($srch->{'srchin'} ne '') {
+            $curr_selected{'srchin'} = $srch->{'srchin'};
+        }
+        if ($srch->{'srchtype'} ne '') {
+            $curr_selected{'srchtype'} = $srch->{'srchtype'};
+        }
+        if ($srch->{'srchdomain'} ne '') {
+            $currdom = $srch->{'srchdomain'};
+        }
+        $srchterm = $srch->{'srchterm'};
+    }
+    my %lt=&Apache::lonlocal::texthash(
+                    'usr'       => 'Search for',
+                    'or'        => 'or',
+                    'doma'      => 'domain',
+                    'uname'     => 'username',
+                    'lastname'  => 'last name',
+                    'lastfirst' => 'last name, first name',
+                    'crs'       => 'in this course',
+                    'dom'       => 'in this domain', 
+                    'alc'       => 'all LON-CAPA',
+                    'instd'     => 'in institutional directory',
+                    'exact'     => 'is',
+                    'contains'  => 'contains',
+                                       );
+    my $domform = &select_dom_form($currdom,'srchdomain',1);
+
+    my $srchin;
+
+    my @srchins = ('crs','dom','alc','instd');
+
+    foreach my $option (@srchins) {
+        # FIXME 'alc' option unavailable until 
+        #       loncreateuser::print_user_query_page()
+        #       has been completed.
+        next if ($option eq 'alc');
+        next if ($option eq 'crs' && !$env{'request.course.id'});
+        my $checked =($curr_selected{'srchin'} eq $option) ?'checked="checked"'
+	                                                   :'';
+	my $extra = ($option eq 'dom') ? $domform
+	                               : '';
+	$srchin.=<<ROW
+ <tr>
+   <td>
+     <label><input type="radio" name="srchin" value="$option" $checked /> $lt{$option}</label> $extra
+   </td>
+</tr>
+ROW
+    }
+
+    my $srchbysel =  ' <select name="srchby">';
+    foreach my $option ('uname','lastname','lastfirst') {
+        if ($curr_selected{'srchby'} eq $option) {
+            $srchbysel .= '
+   <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+        } else {
+            $srchbysel .= '
+   <option value="'.$option.'">'.$lt{$option}.'</option>';
+         }
+    }
+    $srchbysel .= "\n  </select>\n";
+
+    my $srchtypesel = ' <select name="srchtype">';
+    foreach my $option ('exact','contains') {
+        if ($curr_selected{'srchtype'} eq $option) {
+            $srchtypesel .= '
+   <option value="'.$option.'" selected="selected">'.$lt{$option}.'</option>';
+        } else {
+            $srchtypesel .= '
+   <option value="'.$option.'">'.$lt{$option}.'</option>';
+        }
+    }
+    $srchtypesel .= "\n  </select>\n";
+
+    my ($newuserscript,$new_user_create);
+
+    if ($forcenewuser) {
+	$new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\');" /> </p>';
+        $newuserscript = <<"ENDSCRIPT";
+
+function setSearch(createnew) {
+    if (createnew == 1) {
+        for (var i=0; i<document.crtuser.srchby.length; i++) {
+            if (document.crtuser.srchby.options[i].value == 'uname') {
+                document.crtuser.srchby.selectedIndex = i;
+            }
+        }
+        for (var i=0; i<document.crtuser.srchin.length; i++) {
+            if ( document.crtuser.srchin[i].value == 'dom') {
+		document.crtuser.srchin[i].checked = 1;
+            }
+        }
+        for (var i=0; i<document.crtuser.srchtype.length; i++) {
+            if (document.crtuser.srchtype.options[i].value == 'exact') {
+                document.crtuser.srchtype.selectedIndex = i;
+            }
+        }
+        for (var i=0; i<document.crtuser.srchdomain.length; i++) {
+            if (document.crtuser.srchdomain.options[i].value == '$env{'request.role.domain'}') {
+                document.crtuser.srchdomain.selectedIndex = i;
+            }
+        }
+    }
+}
+ENDSCRIPT
+
+    }
+
+    my $output = <<"END_BLOCK";
+<script type="text/javascript">
+function validateEntry() {
+
+    var checkok = 1;
+    var srchin;
+    for (var i=0; i<document.crtuser.srchin.length; i++) {
+	if ( document.crtuser.srchin[i].checked ) {
+	    srchin = document.crtuser.srchin[i].value;
+	}
+    }
+
+    var srchtype = document.crtuser.srchtype.options[document.crtuser.srchtype.selectedIndex].value;
+    var srchby = document.crtuser.srchby.options[document.crtuser.srchby.selectedIndex].value;
+    var srchdomain = document.crtuser.srchdomain.options[document.crtuser.srchdomain.selectedIndex].value;
+    var srchterm =  document.crtuser.srchterm.value;
+    var msg = "";
+
+    if (srchterm == "") {
+        checkok = 0;
+        msg += "You must include some text to search for.\\n";
+    }
+
+    if (srchtype== 'contains') {
+        if (srchterm.length < 3) {
+            checkok = 0;
+            msg += "The text you are searching for must contain at least three characters when using a 'contained in' type search.\\n";
+        }
+    }
+    if (srchin == 'instd') {
+        if (srchdomain == '') {
+            checkok = 0;
+            msg += "You must choose a domain when using an institutional directory search.\\n";
+        }
+    }
+    if (srchin == 'dom') {
+        if (srchdomain == '') {
+            checkok = 0;
+            msg += "You must choose a domain when using a domain search.\\n";
+        }
+    }
+    if (srchby == 'lastfirst') {
+        if (srchterm.indexOf(",") == -1) {
+            checkok = 0;
+            msg += "When using searching by last,first you must include a comma as separator between last name and first name.\\n";
+        }
+        if (srchterm.indexOf(",") == srchterm.length -1) {
+            checkok = 0;
+            msg += "When searching by last,first you must include at least one character in the first name.\\n";
+        }
+    }
+    if (checkok == 0) {
+        alert("The following need to be corrected before the search can be run:\\n"+msg);
+        return;
+    }
+    if (checkok == 1) {
+        document.crtuser.submit();
+    }
+}
+
+$newuserscript
+
+</script>
+
+$new_user_create
+
+<table>
+ <tr>
+  <td> $srchbysel
+       $srchtypesel 
+       <input type="text" size="15" name="srchterm" value="$srchterm" />
+  </td>
+ </tr>
+$srchin
+</table>
+<br />
+END_BLOCK
+
+    return $output;
+}
+
+
+
 =pod
 
+=back
+
+=head1 HTTP Helpers
+
+=over 4
+
 =item * get_unprocessed_cgi($query,$possible_names)
 
 Modify the %env hash to contain unprocessed CGI form parameters held in
@@ -5713,9 +5996,9 @@ sub record_sep {
     } else {
         my @allfields;
         if ($env{'form.upfiletype'} eq 'semisv') {
-            @allfields=split(/;/,$record,-1);
+            @allfields=split(/\s*;\s*/,$record,-1);
         } else {
-            @allfields=split(/\,/,$record,-1);
+            @allfields=split(/\s*\,\s*/,$record,-1);
         }
         my $i=0;
         my $j;