--- loncom/interface/loncommon.pm	2007/08/28 15:55:49	1.571
+++ loncom/interface/loncommon.pm	2007/08/31 17:58:47	1.577
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.571 2007/08/28 15:55:49 raeburn Exp $
+# $Id: loncommon.pm,v 1.577 2007/08/31 17:58:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -721,24 +721,20 @@ sub help_open_topic {
 
     my $template = "";
     my $link;
-
+    
     $topic=~s/\W/\_/g;
 
-    if (!$stayOnPage)
-    {
+    if (!$stayOnPage) {
 	$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
-    }
-    else
-    {
+    } else {
 	$link = "/adm/help/${filename}.hlp";
     }
 
     # Add the text
-    if ($text ne "")
-    {
+    if ($text ne "") {
 	$template .= 
-  "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
-  "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
+            "<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>".
+            "<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>";
     }
 
     # Add the graphic
@@ -805,14 +801,10 @@ sub help_open_menu {
     my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) 
 	= @_;    
     $stayOnPage = 0 if (not defined $stayOnPage);
-    # formerly only used pop-up help (stayOnPage = 0)
+    # only use 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') {
+    if ($env{'browser.interface'} eq 'textual' ||
+    	$env{'environment.remote'} eq 'off' ) {
         $stayOnPage=1;
     }
     my $output;
@@ -834,15 +826,13 @@ sub help_open_menu {
 
 sub top_nav_help {
     my ($text) = @_;
-
     $text = &mt($text);
-
-    my $stayOnPage = 
+    my $stay_on_page = 
 	($env{'browser.interface'}  eq 'textual' ||
 	 $env{'environment.remote'} eq 'off' );
-    my $link=  ($stayOnPage) ? "javascript:helpMenu('display')"
+    my $link = ($stay_on_page) ? "javascript:helpMenu('display')"
 	                     : "javascript:helpMenu('open')";
-    my $banner_link = &update_help_link(undef,undef,undef,undef,$stayOnPage);
+    my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page);
 
     my $title = &mt('Get help');
 
@@ -3515,9 +3505,6 @@ sub bodytag {
     if (!$realm) { $realm='&nbsp;'; }
 # Set messages
     my $messages=&domainlogo($domain);
-# Port for miniserver
-    my $lonhttpdPort=$Apache::lonnet::perlvar{'lonhttpdPort'};
-    if (!defined($lonhttpdPort)) { $lonhttpdPort='8080'; }
 
     my $extra_body_attr = &make_attr_string($forcereg,\%design);
 
@@ -3635,7 +3622,7 @@ ENDROLE
 
     my $imgsrc = $img;
     if ($img =~ /^\/adm/) {
-        $imgsrc = 'http://'.$ENV{'HTTP_HOST'}.':'.$lonhttpdPort.$img;
+        $imgsrc = &lonhttpdurl($img);
     }
     my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
 
@@ -4511,6 +4498,10 @@ span.LC_nobreak {
   white-space: nowrap;
 }
 
+span.LC_cusr_emph {
+  font-style: italic;
+}
+
 table.LC_docs_documents {
   background: #BBBBBB;
   border-width: 0px;
@@ -5632,14 +5623,15 @@ sub user_picker {
         $srchterm = $srch->{'srchterm'};
     }
     my %lt=&Apache::lonlocal::texthash(
+                    'usr'       => 'Search criteria',
                     'doma'      => 'Domain/institution to search',
                     'uname'     => 'username',
                     'lastname'  => 'last name',
                     'lastfirst' => 'last name, first name',
                     'crs'       => 'in this course',
-                    'dom'       => 'in this domain', 
+                    'dom'       => 'in selected LON-CAPA domain', 
                     'alc'       => 'all LON-CAPA',
-                    'instd'     => 'in institutional directory',
+                    'instd'     => 'in institutional directory for selected domain',
                     'exact'     => 'is',
                     'contains'  => 'contains',
                     'begins'    => 'begins with',
@@ -5700,7 +5692,12 @@ sub user_picker {
     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\','.$caller.');" /> </p>';
+        if (ref($srch) eq 'HASH') {
+            if ($srch->{'srchby'} eq 'uname' && $srch->{'srchtype'} eq 'exact' && $srch->{'srchin'} eq 'dom' && $srch->{'srchdomain'} eq $env{'request.role.domain'}) {
+	        $new_user_create = '<p> <input type="submit" name="forcenew" value="'.&HTML::Entities::encode(&mt('Make new user "[_1]"',$srchterm),'<>&"').'" onclick="javascript:setSearch(\'1\','.$caller.');" /> </p>';
+            }
+        }
+
         $newuserscript = <<"ENDSCRIPT";
 
 function setSearch(createnew,callingForm) {
@@ -5807,16 +5804,18 @@ $new_user_create
 
 <table>
  <tr>
+  <td>$lt{'doma'}:</td>
+  <td>$domform</td>
+  </td>
+ </tr>
+ <tr>
+  <td>$lt{'usr'}:</td>
   <td>$srchbysel
       $srchtypesel 
       <input type="text" size="15" name="srchterm" value="$srchterm" />
       $srchinsel 
   </td>
  </tr>
- <tr>
-  <td>$lt{'doma'}: $domform</td>
-  </td>
- </tr>
 </table>
 <br />
 END_BLOCK
@@ -5824,8 +5823,6 @@ END_BLOCK
     return $output;
 }
 
-
-
 =pod
 
 =back
@@ -7378,10 +7375,27 @@ sub icon {
     return &lonhttpdurl($iconname);
 } 
 
-sub lonhttpdurl {
-    my ($url)=@_;
+sub lonhttpd_port {
     my $lonhttpd_port=$Apache::lonnet::perlvar{'lonhttpdPort'};
     if (!defined($lonhttpd_port)) { $lonhttpd_port='8080'; }
+    # IE doesn't like a secure page getting images from a non-secure
+    # port (when logging we haven't parsed the browser type so default
+    # back to secure
+    if ((!exists($env{'browser.type'}) || $env{'browser.type'} eq 'explorer')
+	&& $ENV{'SERVER_PORT'} == 443) {
+	return 443;
+    }
+    return $lonhttpd_port;
+
+}
+
+sub lonhttpdurl {
+    my ($url)=@_;
+
+    my $lonhttpd_port = &lonhttpd_port();
+    if ($lonhttpd_port == 443) {
+	return 'https://'.$ENV{'SERVER_NAME'}.$url;
+    }
     return 'http://'.$ENV{'SERVER_NAME'}.':'.$lonhttpd_port.$url;
 }