loncom/auth/lonlogin.pm - diff

Return to lonlogin.pm CVS log

Up to [LON-CAPA] / loncom / auth

Diff for /loncom/auth/lonlogin.pm between versions 1.158 and 1.158.2.4

-version 1.158, 2013/11/26 03:17:09
+version 1.158.2.4, 2015/06/06 14:40:28
  Line 113  sub handler {
      my %sessiondata;
      if ($env{'form.iptoken'}) {
          %sessiondata = &Apache::lonnet::tmpget($env{'form.iptoken'});
-         my $delete = &Apache::lonnet::tmpdel($env{'form.token'});
+         unless ($sessiondata{'sessionserver'}) {
+             my $delete = &Apache::lonnet::tmpdel($env{'form.iptoken'});
+             delete($env{'form.iptoken'});
+         }
      }
  # ----------------------------------------------------------- Process Interface
      $env{'form.interface'}=~s/\W//g;
- Line 126  sub handler {
+ Line 129  sub handler {
      my $lonhost = $r->dir_config('lonHostID');
      my $domain = &Apache::lonnet::default_login_domain();
+     my $defdom = $domain;
      if ($lonhost ne '') {
          unless ($sessiondata{'sessionserver'}) {
              my $redirect = &check_loginvia($domain,$lonhost);
- Line 222  sub handler {
+ Line 226  sub handler {
          }
          $tokenextras .= '&symb='.&escape($env{'form.symb'});
      }
+     if ($env{'form.iptoken'}) {
+         if (!$tokenextras) {
+             $tokenextras = '&&';
+         }
+         $tokenextras .= '&iptoken='.&escape($env{'form.iptoken'});
+     }
      my $logtoken=Apache::lonnet::reply(
         'tmpput:'.$ukey.$lkey.'&'.$firsturl.$tokenextras,
         $lonhost);
- Line 378  ENDSCRIPT
+ Line 388  ENDSCRIPT
  	       alink        => "$alink",
                 onload       => 'javascript:enableInput();',);
+     my ($lonhost_in_use,$headextra,$headextra_exempt,@hosts,%defaultdomconf);
+     @hosts = &Apache::lonnet::current_machine_ids();
+     $lonhost_in_use = $lonhost;
+     if (@hosts > 1) {
+         foreach my $hostid (@hosts) {
+             if (&Apache::lonnet::host_domain($hostid) eq $defdom) {
+                 $lonhost_in_use = $hostid;
+                 last;
+             }
+         }
+     }
+     %defaultdomconf = &Apache::loncommon::get_domainconf($defdom);
+     $headextra = $defaultdomconf{$defdom.'.login.headtag_'.$lonhost_in_use};
+     $headextra_exempt = $defaultdomconf{$domain.'.login.headtag_exempt_'.$lonhost_in_use};
+     if ($headextra) {
+         my $omitextra;
+         if ($headextra_exempt ne '') {
+             my @exempt = split(',',$headextra_exempt);
+             my $ip = $ENV{'REMOTE_ADDR'};
+             if (grep(/^\Q$ip\E$/,@exempt)) {
+                 $omitextra = 1;
+             }
+         }
+         unless ($omitextra) {
+             my $confname = $defdom.'-domainconfig';
+             if ($headextra =~ m{^\Q/res/$defdom/$confname/login/headtag/$lonhost_in_use/\E}) {
+                 my $extra = &Apache::lonnet::getfile(&Apache::lonnet::filelocation("",$headextra));
+                 unless ($extra eq '-1') {
+                     $js .= "\n".$extra."\n";
+                 }
+             }
+         }
+     }
      $r->print(&Apache::loncommon::start_page('The LearningOnline Network with CAPA Login',$js,
  			       { 'redirect'       => [$expire,'/adm/roles'],
  				 'add_entries' => \%add_entries,

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

Removed from v.1.158
changed lines
	Added in v.1.158.2.4