loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.78 and 1.81

-version 1.78, 2003/02/12 17:57:27
+version 1.81, 2003/02/13 23:02:42
  Line 518  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') {
+ 	$stayOnPage=1;
+     }
      $width = 350 if (not defined $width);
      $height = 400 if (not defined $height);
      my $filename = $topic;
- Line 711  See loncreateuser.pm for invocation and
+ Line 714  See loncreateuser.pm for invocation and
  sub authform_header{
      my %in = (
          formname => 'cu',
-         kerb_def_dom => 'MSU.EDU',
+         kerb_def_dom => '',
          @_,
      );
      $in{'formname'} = 'document.' . $in{'formname'};
      my $result='';
+ #---------------------------------------------- Code for upper case translation
+     my $Javascript_toUpperCase;
+     unless ($in{kerb_def_dom}) {
+         $Javascript_toUpperCase =<<"END";
+         switch (choice) {
+            case 'krb': currentform.elements[choicearg].value =
+                currentform.elements[choicearg].value.toUpperCase();
+                break;
+            default:
+         }
+ END
+     } else {
+         $Javascript_toUpperCase = "";
+     }
      $result.=<<"END";
  var current = new Object();
  current.radiovalue = 'nochange';
- Line 749  function changed_radio(choice,currentfor
+ Line 768  function changed_radio(choice,currentfor
  function changed_text(choice,currentform) {
      var choicearg = choice + 'arg';
      if (currentform.elements[choicearg].value !='') {
-         switch (choice) {
+         $Javascript_toUpperCase
-             case 'krb': currentform.elements[choicearg].value =
-                 currentform.elements[choicearg].value.toUpperCase();
-                 break;
-             default:
-         }
          // clear old field
          if ((current.argfield != choicearg) && (current.argfield != null)) {
              currentform.elements[current.argfield].value = '';
- Line 810  sub authform_kerberos{
+ Line 824  sub authform_kerberos{
      my %in = (
                formname => 'document.cu',
                kerb_def_dom => 'MSU.EDU',
+               kerb_def_auth => 'krb4',
                @_,
                );
      my $result='';
+     my $check4;
+     my $check5;
+     if ($in{'kerb_def_auth'} eq 'krb5') {
+        $check5 = " checked=\"on\"";
+     } else {
+        $check4 = " checked=\"on\"";
+     }
      $result.=<<"END";
  <input type="radio" name="login" value="krb"
         onclick="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=""
+ <input type="text" size="10" name="krbarg" value="$in{'kerb_def_dom'}"
         onchange="javascript:changed_text('krb',$in{'formname'});" />
- <input type="radio" name="krbver" value="4" checked="on" />Version 4
+ <input type="radio" name="krbver" value="4" $check4 />Version 4
- <input type="radio" name="krbver" value="5" />Version 5
+ <input type="radio" name="krbver" value="5" $check5 />Version 5
  END
      return $result;
  }
- Line 885  END
+ Line 907  END
  ###############################################################
  ###############################################################
+ ##    Get Authentication Defaults for Domain                 ##
+ ###############################################################
+ ##
+ ## Returns default authentication type and an associated argument
+ ## as listed in file domain.tab
+ ##
+ #-------------------------------------------
+ =pod
+ =item get_auth_defaults
+ get_auth_defaults($target_domain) returns the default authentication
+ type and an associated argument (initial password or a kerberos domain).
+ These values are stored in lonTabs/domain.tab
+ ($def_auth, $def_arg) = &get_auth_defaults($target_domain);
+ If target_domain is not found in domain.tab, returns nothing ('').
+ =over 4
+ =item get_auth_defaults
+ =back
+ =cut
+ #-------------------------------------------
+ sub get_auth_defaults {
+     my $domain=shift;
+     return ($Apache::lonnet::domain_auth_def{$domain},$Apache::lonnet::domain_auth_arg_def{$domain});
+ }
+ ###############################################################
+ ##   End Get Authentication Defaults for Domain              ##
+ ###############################################################
+ ###############################################################
+ ##    Get Kerberos Defaults for Domain                 ##
+ ###############################################################
+ ##
+ ## Returns default kerberos version and an associated argument
+ ## as listed in file domain.tab. If not listed, provides
+ ## appropriate default domain and kerberos version.
+ ##
+ #-------------------------------------------
+ =pod
+ =item get_kerberos_defaults
+ get_kerberos_defaults($target_domain) returns the default kerberos
+ version and domain. If not found in domain.tabs, it defaults to
+ version 4 and the domain of the server.
+ ($def_version, $def_krb_domain) = &get_kerberos_defaults($target_domain);
+ =over 4
+ =item get_kerberos_defaults
+ =back
+ =cut
+ #-------------------------------------------
+ sub get_kerberos_defaults {
+     my $domain=shift;
+     my ($krbdef,$krbdefdom) =
+         &Apache::loncommon::get_auth_defaults($domain);
+     unless ($krbdef =~/^krb/ && $krbdefdom) {
+         $ENV{'SERVER_NAME'}=~/(\w+\.\w+)$/;
+         my $krbdefdom=$1;
+         $krbdefdom=~tr/a-z/A-Z/;
+         $krbdef = "krb4";
+     }
+     return ($krbdef,$krbdefdom);
+ }
+ ###############################################################
+ ##   End Get Kerberos Defaults for Domain              ##
+ ###############################################################
+ ###############################################################
  ##                Thesaurus Functions                        ##
  ###############################################################
- Line 998  sub get_related_words {
+ Line 1103  sub get_related_words {
  ###############################################################
  # -------------------------------------------------------------- Plaintext name
+ =pod
+ =item plainname($uname,$udom)
+ Gets a users name and returns it as a string in
+ "first middle last generation"
+ form
+ =cut
+ ###############################################################
  sub plainname {
      my ($uname,$udom)=@_;
      my %names=&Apache::lonnet::get('environment',
- Line 1012  sub plainname {
+ Line 1127  sub plainname {
  }
  # -------------------------------------------------------------------- Nickname
+ =pod
+ =item nickname($uname,$udom)
+ Gets a users name and returns it as a string as
+ "&quot;nickname&quot;"
+ if the user has a nickname or
+ "first middle last generation"
+ if the user does not
+ =cut
  sub nickname {
      my ($uname,$udom)=@_;
- Line 1033  sub nickname {
+ Line 1162  sub nickname {
  # ------------------------------------------------------------------ Screenname
+ =pod
+ =item screenname($uname,$udom)
+ Gets a users screenname and returns it as a string
+ =cut
  sub screenname {
      my ($uname,$udom)=@_;
      my %names=
- Line 1444  $addentries>
+ Line 1581  $addentries>
  END
      if ($bodyonly) {
          return $bodytag;
+     } elsif ($ENV{'browser.interface'} eq 'textual') {
+         return $bodytag.'<h1>LON-CAPA: '.$title.
+          '</h1><a href="/adm/menu">Main Menu</a><hr />';
      } else {
          return(<<ENDBODY);
  $bodytag

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

Removed from v.1.78
changed lines
	Added in v.1.81