# HG changeset patch
# User Dan
# Date 1245557781 14400
# Node ID f0431eb8161eb02168a116648d652b5f260988f3
# Parent  30956e5092ff0fb20f53f3eedb2bb9ed2deab22f
AJAX login: fixed improper run of login_submit_early; fixed failure to redirect if main_page_members == current page

diff -r 30956e5092ff -r f0431eb8161e includes/clientside/static/login.js
--- a/includes/clientside/static/login.js	Sun Jun 21 00:14:45 2009 -0400
+++ b/includes/clientside/static/login.js	Sun Jun 21 00:16:21 2009 -0400
@@ -19,7 +19,7 @@
     return true;
   ajaxLoginInit(function(k)
     {
-      if ( on_main_page )
+      if ( on_main_page && main_page_members != physical_title )
       {
         window.location = makeUrl(main_page_members);
       }
@@ -438,13 +438,22 @@
       ajaxLoginSetStatus(AJAX_STATUS_DESTROY);
       document.getElementById('messageBox').style.backgroundColor = '#C0C0C0';
       var mb_parent = document.getElementById('messageBox').parentNode;
-      $(mb_parent).effect("shake", {}, 200);
-      setTimeout(function()
-        {
-          document.getElementById('messageBox').style.backgroundColor = '#FFF';
-          ajaxLoginBuildForm(response.respawn_info);
-          ajaxLoginShowFriendlyError(response);
-        }, 2500);
+      var do_respawn = ( typeof(response.respawn) == 'boolean' && response.respawn == true ) || typeof(response.respawn) != 'boolean';
+      if ( do_respawn )
+      {
+        $(mb_parent).effect("shake", {}, 200);
+        setTimeout(function()
+          {
+            document.getElementById('messageBox').style.backgroundColor = '#FFF';
+            
+            ajaxLoginBuildForm(response.respawn_info);
+            ajaxLoginShowFriendlyError(response);
+          }, 2500);
+      }
+      else
+      {
+        ajaxLoginShowFriendlyError(response);
+      }
       break;
     case 'login_success_reset':
       var conf = confirm($lang.get('user_login_ajax_msg_used_temp_pass'));
@@ -773,8 +782,6 @@
     login_cache.mb_object.destroy();
     return false;
   }
-  // Early submit hook
-  eval(setHook('login_submit_early'));
   // Hide the error message and captcha
   if ( document.getElementById('ajax_login_error_box') )
   {
@@ -844,6 +851,12 @@
     var captcha = document.getElementById('ajax_login_field_captcha').value;
   }
   
+  // Only run early submit hook once
+  if ( !window.logindata.early_submit_run )
+    eval(setHook('login_submit_early'));
+  
+  window.logindata.early_submit_run = true;
+  
   try
   {
   
@@ -941,6 +954,8 @@
     console.debug(e);
     return false;
   }
+  // reset this...
+  window.logindata.early_submit_run = false;
   ajaxLoginPerformRequest(json_packet);
 }
 
diff -r 30956e5092ff -r f0431eb8161e includes/sessions.php
--- a/includes/sessions.php	Sun Jun 21 00:14:45 2009 -0400
+++ b/includes/sessions.php	Sun Jun 21 00:16:21 2009 -0400
@@ -4057,8 +4057,8 @@
           return array(
               'mode' => 'login_success',
               'key' => ( $this->sid_super ) ? $this->sid_super : false,
-                'user_id' => $this->user_id,
-                'user_level' => $this->user_level
+              'user_id' => $this->user_id,
+              'user_level' => $this->user_level
             );
         }
         else