--- loncom/auth/lonauth.pm	2010/08/12 21:31:10	1.101.8.2
+++ loncom/auth/lonauth.pm	2010/03/22 20:11:08	1.104
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.101.8.2 2010/08/12 21:31:10 raeburn Exp $
+# $Id: lonauth.pm,v 1.104 2010/03/22 20:11:08 droeschl Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -111,23 +111,16 @@ sub success {
         }
     }
 
-    my $windowinfo=&Apache::lonmenu::open($env{'browser.os'});
-    my $startupremote=&Apache::lonmenu::startupremote($destination);
-    my $remoteinfo=&Apache::lonmenu::load_remote_msg($lowerurl);
-    my $setflags=&Apache::lonmenu::setflags();
-    my $maincall=&Apache::lonmenu::maincall();
+    my $windowinfo = Apache::lonhtmlcommon::scripttag('self.name="loncapaclient";');
+    my $header = '<meta HTTP-EQUIV="Refresh" CONTENT="0; url='.$destination.'" />';
     my $brcrum = [{'href' => '',
                    'text' => 'Successful Login'},];
     my $start_page=&Apache::loncommon::start_page('Successful Login',
-                                                  $startupremote,
-                                                  {'no_inline_link' => 1,
-                                                   'bread_crumbs' => $brcrum,});
+                                                  $header,
+                                                  {'bread_crumbs' => $brcrum,});
     my $end_page  =&Apache::loncommon::end_page();
 
-    my $continuelink;
-    if ($env{'environment.remote'} eq 'off') {
-	$continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
-    }
+	my $continuelink='<a href="'.$destination.'">'.&mt('Continue').'</a>';
 # ------------------------------------------------- Output for successful login
 
     &Apache::loncommon::content_type($r,'text/html');
@@ -142,13 +135,10 @@ sub success {
 				       );
     $r->print(<<ENDSUCCESS);
 $start_page
-$setflags
 $windowinfo
 <h1>$lt{'wel'}</h1>
 $lt{'mes'}<p>
 <a href="/adm/$lt{'log'}">$lt{'pro'}</a></p>
-$remoteinfo
-$maincall
 $continuelink
 $end_page
 ENDSUCCESS
@@ -158,8 +148,7 @@ ENDSUCCESS
 
 sub failed {
     my ($r,$message,$form) = @_;
-    my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef,
-						    {'no_inline_link' => 1,});
+    my $start_page = &Apache::loncommon::start_page('Unsuccessful Login',undef);
     my $retry = '/adm/login?username='.$form->{'uname'}.
                 '&domain='.$form->{'udom'};
     if (exists($form->{role})) {
@@ -216,21 +205,17 @@ sub handler {
         } else {
 # Indeed, a valid token is found
             &Apache::lonnet::transfer_profile_to_env($lonidsdir,$handle);
-            &Apache::loncommon::content_type($r,'text/html');
-            $r->send_http_header;
-            my $start_page =
-                &Apache::loncommon::start_page('Already logged in');
-            my $end_page =
-                &Apache::loncommon::end_page();
-            my $dest = '/adm/roles';
-            if ($env{'form.firsturl'} ne '') {
-                $dest = $env{'form.firsturl'};
-            }
+	    &Apache::loncommon::content_type($r,'text/html');
+	    $r->send_http_header;
+	    my $start_page = 
+	        &Apache::loncommon::start_page('Already logged in');
+	    my $end_page = 
+	        &Apache::loncommon::end_page();
             $r->print(
                $start_page
               .'<h1>'.&mt('You are already logged in!').'</h1>'
               .'<p>'.&mt('Please either [_1]continue the current session[_2] or [_3]log out[_4].'
-                    ,'<a href="'.$dest.'">','</a>','<a href="/adm/logout">','</a>')
+                    ,'<a href="/adm/roles">','</a>','<a href="/adm/logout">','</a>')
               .'</p>'
               .$end_page
             );
@@ -346,10 +331,8 @@ sub handler {
     if (grep(/^login$/,@cancreate)) {
         $defaultauth = 1;
     }
-    my $clientcancheckhost = 1;
     my $authhost=Apache::lonnet::authenticate($form{'uname'},$upass,
-                                              $form{'udom'},$defaultauth,
-                                              $clientcancheckhost);
+                                              $form{'udom'},$defaultauth);
     
 # --------------------------------------------------------------------- Failed?
 
@@ -361,11 +344,9 @@ sub handler {
         my %domconfig = 
             &Apache::lonnet::get_dom('configuration',['usercreation'],$form{'udom'});
         if (grep(/^login$/,@cancreate)) {
-            my $domdesc = &Apache::lonnet::domain($form{'udom'},'description');
-            &check_can_host($r,\%form,'no_account_on_host',$domdesc);
             my $start_page = 
-                &Apache::loncommon::start_page('Create a user account in LON-CAPA',
-                                               '',{'no_inline_link'   => 1,});
+                &Apache::loncommon::start_page('Create a user account in LON-CAPA');
+            my $domdesc = &Apache::lonnet::domain($form{'udom'},'description');
             my $lonhost = $r->dir_config('lonHostID');
             my $origmail = $Apache::lonnet::perlvar{'lonSupportEMail'};
             my $contacts = 
@@ -415,13 +396,10 @@ sub handler {
 	}
     }
 
-    &check_can_host($r,\%form,$authhost);
-
     if ($r->dir_config("lonBalancer") eq 'yes') {
 	&success($r,$form{'uname'},$form{'udom'},$authhost,'noredirect',undef,
 		 \%form);
-        my ($otherserver) = &Apache::lonnet::choose_server($form{'udom'});
-	$r->internal_redirect('/adm/switchserver?otherserver='.$otherserver);
+	$r->internal_redirect('/adm/switchserver');
     } else {
 	&success($r,$form{'uname'},$form{'udom'},$authhost,$firsturl,undef,
 		 \%form);
@@ -429,64 +407,6 @@ sub handler {
     return OK;
 }
 
-sub check_can_host {
-    my ($r,$form,$authhost,$domdesc) = @_;
-    return unless (ref($form) eq 'HASH');
-    my $canhost = 1;
-    my $lonhost = $r->dir_config('lonHostID');
-    my $udom = $form->{'udom'};
-    my @intdoms = &Apache::lonnet::get_internet_names($lonhost);
-    my $uprimary_id = &Apache::lonnet::domain($udom,'primary');
-    my $uint_dom = &Apache::lonnet::internet_dom($uprimary_id);
-    unless ($uint_dom ne '' && grep(/^\Q$uint_dom\E$/,@intdoms)) {
-        my $machine_dom = &Apache::lonnet::host_domain($lonhost);
-        my $hostname = &Apache::lonnet::hostname($lonhost);
-        my $serverhomeID = &Apache::lonnet::get_server_homeID($hostname);
-        my $serverhomedom = &Apache::lonnet::host_domain($serverhomeID);
-        my %defdomdefaults = &Apache::lonnet::get_domain_defaults($serverhomedom);
-        my %udomdefaults = &Apache::lonnet::get_domain_defaults($udom);
-        my $loncaparev;
-        if ($authhost eq 'no_account_on_host') {
-            $loncaparev = &Apache::lonnet::get_server_loncaparev($machine_dom);
-        } else {
-            $loncaparev = &Apache::lonnet::get_server_loncaparev($machine_dom,$lonhost);
-        }
-        $canhost = &Apache::lonnet::can_host_session($udom,$lonhost,$loncaparev,
-                                                     $udomdefaults{'remotesessions'},
-                                                     $defdomdefaults{'hostedsessions'});
-    }
-    unless ($canhost) {
-        if ($authhost eq 'no_account_on_host') {
-            my ($login_host,$hostname) = &Apache::lonnet::choose_server($udom);
-            &Apache::loncommon::content_type($r,'text/html');
-            $r->send_http_header;
-            if ($login_host ne '') {
-                my $protocol = $Apache::lonnet::protocol{$login_host};
-                $protocol = 'http' if ($protocol ne 'https');
-                my $newurl = $protocol.'://'.$hostname.'/adm/createaccount';
-                $r->print(&Apache::loncommon::start_page('Create a user account in LON-CAPA').
-                          '<h3>'.&mt('Account creation').'</h3>'.
-                          &mt('You do not currently have a LON-CAPA account at this institution.').'<br />'.
-                          '<p>'.&mt('You will be able to create one by logging into a LON-CAPA server within the [_1] domain.',$domdesc).'</p>'.
-                          '<p>'.&mt('[_1]Log in[_2]','<a href="'.$newurl.'">','</a>').
-                          &Apache::loncommon::end_page());
-            } else {
-                $r->print(&Apache::loncommon::start_page('Access to LON-CAPA unavailable').
-                          '<h3>'.&mt('Account creation unavailable').'</h3>'.
-                          &mt('You do not currently have a LON-CAPA account at this institution.').'<br />'.
-                          '<p>'.&mt('Currently a LON-CAPA server is not available within the [_1] domain for you to log-in to, to create an account.',$domdesc).'</p>'.
-                          &Apache::loncommon::end_page());
-            }
-            return OK;
-        } else {
-            &success($r,$form->{'uname'},$udom,$authhost,'noredirect',undef,
-                     $form);
-            my ($otherserver) = &Apache::lonnet::choose_server($udom);
-            $r->internal_redirect('/adm/switchserver?otherserver='.$otherserver);
-        }
-    }
-}
-
 1;
 __END__