--- loncom/auth/lonauth.pm	2003/01/16 01:37:26	1.34
+++ loncom/auth/lonauth.pm	2003/01/31 21:46:36	1.35
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # User Authentication Module
 #
-# $Id: lonauth.pm,v 1.34 2003/01/16 01:37:26 www Exp $
+# $Id: lonauth.pm,v 1.35 2003/01/31 21:46:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -165,8 +165,9 @@ sub success {
     $cookie="lonID=$cookie; path=/";
 # -------------------------------------------------------- Menu script and info
     my $windowinfo=&Apache::lonmenu::open($clientos);
-# ------------------------------------------------------------- Info for Remote
-    my $configmenu=&Apache::lonmenu::rawconfig($r);
+    my $startupremote=&Apache::lonmenu::startupremote($lowerurl);
+    my $setflags=&Apache::lonmenu::setflags();
+    my $maincall=&Apache::lonmenu::maincall();
 # ------------------------------------------------- Output for successful login
 
     $r->send_cgi_header(<<ENDHEADER);
@@ -178,52 +179,17 @@ ENDHEADER
 <html>
 <head>
 <title>Successful Login to the LearningOnline Network with CAPA</title>
-<script>
-
-// --------------------------------------------- Checks if server frame defined
-
-function checkdef() {
-   if ((menuloaded==0) && (tim==0)) { setTimeout('checkdef()',100); }
-}
-
-// ---------------------------------------------------------- The wait function
-var canceltim;
-function wait() {
-   if ((menuloaded==1) || (tim==1)) {
-      if (tim==0) {
-         clearTimeout(canceltim);
-         $configmenu
-         window.location='$lowerurl';  
-      } else {
-         alert("Remote Control Timed Out.");
-      }
-   } else {
-      setTimeout('wait();',100);
-   }
-}
-
-function main() {
-   canceltim=setTimeout('tim=1;',80000);
-   checkdef();
-   wait();
-}
-
-</script>
+$startupremote
 </head>
 <body bgcolor="#FFFFFF">
-<script>
-    menuloaded=0;
-    tim=0;
-</script>
+$setflags
 $windowinfo
 <h1>Welcome!</h1>
 Welcome to the Learning<i>Online</i> Network with CAPA.
 Please wait while your session
 is being set up.<p>
 <a href="/adm/loginproblems.html">Problems?</a></p>
-<script>
-    main();
-</script>
+$maincall
 </body>
 </html>
 ENDSUCCESS
