--- loncom/interface/loncommon.pm	2002/08/21 17:18:08	1.55
+++ loncom/interface/loncommon.pm	2002/08/26 12:47:28	1.59
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.55 2002/08/21 17:18:08 www Exp $
+# $Id: loncommon.pm,v 1.59 2002/08/26 12:47:28 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -480,7 +480,7 @@ sub help_open_topic {
 
     # Add the graphic
     $template .= <<"ENDTEMPLATE";
-<a href="$link"><image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Help: $topic)"></a>
+<a href="$link"><image src="/adm/help/gif/smallHelp.gif" border="0" alt="(Help: $topic)" /></a>
 ENDTEMPLATE
 
     return $template;
@@ -735,7 +735,7 @@ sub authform_nochange{
     my $result='';
     $result.=<<"END";
 <input type="radio" name="login" value="nochange" checked="checked"
-       onclick="javascript:changed_radio('nochange',$in{'formname'});">
+       onclick="javascript:changed_radio('nochange',$in{'formname'});" />
 Do not change login data
 END
     return $result;
@@ -751,10 +751,12 @@ sub authform_kerberos{
     $result.=<<"END";
 <input type="radio" name="login" value="krb" 
        onclick="javascript:changed_radio('krb',$in{'formname'});"
-       onchange="javascript:changed_radio('krb',$in{'formname'});">
+       onchange="javascript:changed_radio('krb',$in{'formname'});" />
 Kerberos authenticated with domain
 <input type="text" size="10" name="krbarg" value=""
-       onchange="javascript:changed_text('krb',$in{'formname'});">
+       onchange="javascript:changed_text('krb',$in{'formname'});" />
+<input type="radio" name="krbver" value="4" checked="on" />Version 4
+<input type="radio" name="krbver" value="5" />Version 5
 END
     return $result;
 }
@@ -769,10 +771,10 @@ sub authform_internal{
     $result.=<<"END";
 <input type="radio" name="login" value="int"
        onchange="javascript:changed_radio('int',$args{'formname'});"
-       onclick="javascript:changed_radio('int',$args{'formname'});">
+       onclick="javascript:changed_radio('int',$args{'formname'});" />
 Internally authenticated (with initial password 
 <input type="text" size="10" name="intarg" value=""
-       onchange="javascript:changed_text('int',$args{'formname'});">
+       onchange="javascript:changed_text('int',$args{'formname'});" />
 END
     return $result;
 }
@@ -787,10 +789,10 @@ sub authform_local{
     $result.=<<"END";
 <input type="radio" name="login" value="loc"
        onchange="javascript:changed_radio('loc',$in{'formname'});"
-       onclick="javascript:changed_radio('loc',$in{'formname'});"> 
+       onclick="javascript:changed_radio('loc',$in{'formname'});" />
 Local Authentication with argument
 <input type="text" size="10" name="locarg" value=""
-       onchange="javascript:changed_text('loc',$in{'formname'});">
+       onchange="javascript:changed_text('loc',$in{'formname'});" />
 END
     return $result;
 }
@@ -805,7 +807,7 @@ sub authform_filesystem{
     $result.=<<"END";
 <input type="radio" name="login" value="fsys" 
        onchange="javascript:changed_radio('fsys',$in{'formname'});"
-       onclick="javascript:changed_radio('fsys',$in{'formname'});"> 
+       onclick="javascript:changed_radio('fsys',$in{'formname'});" />
 Filesystem authenticated (with initial password 
 <input type="text" size="10" name="fsysarg" value=""
        onchange="javascript:changed_text('fsys',$in{'formname'});">
@@ -885,52 +887,6 @@ sub keyword {
     return exists($Keywords{$word});
 }
 
-###################################################
-#         Old code, to be removed soon            #
-###################################################
-# -------------------------------------------------------- Return related words
-#sub related {
-#    my $newword=shift;
-#    $newword=~s/\W//g;
-#    $newword=~tr/A-Z/a-z/;
-#    my $tindex=$theindex{$newword};
-#    if ($tindex) {
-#        my %found=();
-#        foreach (split(/\,/,$therelated[$tindex])) {
-## - Related word found
-#            my ($ridx,$rcount)=split(/\:/,$_);
-## - Direct relation index
-#            my $directrel=$rcount/$thecount[$tindex];
-#            if ($directrel>$thethreshold) {
-#               foreach (split(/\,/,$therelated[$ridx])) {
-#                  my ($rridx,$rrcount)=split(/\:/,$_);
-#                  if ($rridx==$tindex) {
-## - Determine reverse relation index
-#                     my $revrel=$rrcount/$thecount[$ridx];
-## - Calculate full index
-#                     $found{$ridx}=$directrel*$revrel;
-#                     if ($found{$ridx}>$thethreshold) {
-#                        foreach (split(/\,/,$therelated[$ridx])) {
-#                            my ($rrridx,$rrrcount)=split(/\:/,$_);
-#                            unless ($found{$rrridx}) {
-#                               my $revrevrel=$rrrcount/$thecount[$ridx];
-#                               if (
-#                          $directrel*$revrel*$revrevrel>$thethreshold
-#                               ) {
-#                                  $found{$rrridx}=
-#                                       $directrel*$revrel*$revrevrel;
-#                               }
-#                            }
-#                        }
-#                     }
-#                  }
-#               }
-#            }
-#        }
-#    }
-#    return ();
-#}
-
 ###############################################################
 
 =pod 
@@ -947,7 +903,6 @@ Uses global $thesaurus_db_file.
 =cut
 
 ###############################################################
-
 sub get_related_words {
     my $keyword = shift;
     my %thesaurus_db;
@@ -1194,6 +1149,19 @@ sub findallcourses {
 
 ###############################################
 
+sub domainlogo {
+# Determine domain
+    my $domain=$Apache::lonnet::perlvar{'lonDefDomain'};
+    if ($ENV{'user.domain'}) { $domain=$ENV{'user.domain'}; }
+    if ($ENV{'request.role.domain'}) { $domain=$ENV{'request.role.domain'}; }
+# See if there is a logo
+    if (-e '/home/httpd/html/adm/lonDomLogos/'.$domain.'.gif') {
+	return '<img src="/adm/lonDomLogos/'.$domain.'.gif" />';
+    } else {
+        return $Apache::lonnet::domaindescription{$domain};
+    }
+}
+
 sub bodytag {
     my ($title,$function,$addentries)=@_;
     unless ($function) {
@@ -1255,7 +1223,7 @@ sub bodytag {
     }
     unless ($realm) { $realm='&nbsp;'; }
 # Set messages
-    my $messages=localtime();
+    my $messages=&domainlogo();
 # Output
     return(<<ENDBODY);
 <body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
@@ -1370,6 +1338,8 @@ sub upfile_store {
     return $datatoken;
 }
 
+=pod
+
 =item load_tmp_file($r)
 
 Load uploaded file from tmp, $r should be the HTTP Request object,
@@ -1391,6 +1361,8 @@ sub load_tmp_file {
     $ENV{'form.upfile'}=join('',@studentdata);
 }
 
+=pod
+
 =item upfile_record_sep()
 
 Separate uploaded file into records
@@ -1406,6 +1378,8 @@ sub upfile_record_sep {
     }
 }
 
+=pod
+
 =item record_sep($record)
 
 Separate a record into fields $record should be an item from the upfile_record_sep(), needs $ENV{'form.upfiletype'}
@@ -1456,6 +1430,8 @@ sub record_sep {
     return %components;
 }
 
+=pod
+
 =item upfile_select_html()
 
 return HTML code to select file and specify its type
@@ -1464,7 +1440,7 @@ return HTML code to select file and spec
 
 sub upfile_select_html {
     return (<<'ENDUPFORM');
-<input type="file" name="upfile" size="50">
+<input type="file" name="upfile" size="50" />
 <br />Type: <select name="upfiletype">
 <option value="csv">CSV (comma separated values, spreadsheet)</option>
 <option value="space">Space separated</option>
@@ -1474,6 +1450,8 @@ sub upfile_select_html {
 ENDUPFORM
 }
 
+=pod
+
 =item csv_print_samples($r,$records)
 
 Prints a table of sample values from each column uploaded $r is an
@@ -1504,6 +1482,8 @@ sub csv_print_samples {
     $r->print('</tr></table><br />'."\n");
 }
 
+=pod
+
 =item csv_print_select_table($r,$records,$d)
 
 Prints a table to create associations between values and table columns.
@@ -1536,6 +1516,8 @@ sub csv_print_select_table {
     return $i;
 }
 
+=pod
+
 =item csv_samples_select_table($r,$records,$d)
 
 Prints a table of sample values from the upload and can make associate samples to internal names.