From 802874a1bdf3519c9e02bb0117776816cc6988ba Mon Sep 17 00:00:00 2001
From: David Mulder <dmulder@novell.com>
Date: Mon, 21 Mar 2011 11:57:20 -0600
Subject: [PATCH] Fixed redirects.

---
 RankPage/RankPage/Default.aspx      | 18 ++----------------
 RankPage/RankPage/MasterPage.master | 26 +++++++++++++++++++++++---
 RankPage/RankPage/RankingPage.aspx  | 14 +-------------
 3 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/RankPage/RankPage/Default.aspx b/RankPage/RankPage/Default.aspx
index 2bd0143..b1abf1f 100644
--- a/RankPage/RankPage/Default.aspx
+++ b/RankPage/RankPage/Default.aspx
@@ -1,28 +1,14 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="Default2" %>
 
 <asp:Content ID="Head" ContentPlaceHolderID="Head" Runat="Server">
-    <script type="text/javascript">
-    	function GetEmail()
-    	{
-    	    FB.api('/me', function(response) {
-    	        document.getElementById('email').value = response.email;
-    	        document.getElementById('name').value = response.name;
-    	        if (response.email != null) {
-    	            document.forms["userform"].submit();
-    	        }
 
-    	    });
-    	}
-
-		window.onload=GetEmail;
-    </script> 
 </asp:Content>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="Body" Runat="Server">
-    <form id="userform" method="post" action="RankingPage.aspx">
+    <!-- <form id="userform" method="post" action="RankingPage.aspx">
         <input type="hidden" id="email" />
         <input type="hidden" id="name" />
-    </form>
+    </form> -->
 <!-- Everything we want to see in the page needs to go here -->
 <p>Somebody did something that we see here.</p>   
 </asp:Content>
diff --git a/RankPage/RankPage/MasterPage.master b/RankPage/RankPage/MasterPage.master
index 43499a7..2dab0b3 100644
--- a/RankPage/RankPage/MasterPage.master
+++ b/RankPage/RankPage/MasterPage.master
@@ -30,6 +30,21 @@
         _uacct = "UA-76510-1";
         urchinTracker();
     </script> 
+    <script type="text/javascript">
+    	function GetEmail()
+    	{
+    	    FB.api('/me', function(response) {
+    	        document.getElementById('email').value = response.email;
+    	        document.getElementById('name').value = response.name;
+    	        //if (response.email != null) {
+    	        //    document.forms["userform"].submit();
+    	        //}
+
+    	    });
+    	}
+
+		//window.onload=GetEmail;
+    </script> 
   </head> 
     
     
@@ -79,11 +94,12 @@
 	  window.fbAsyncInit = function() {
 	    FB.init({appId: '200500963301473', status: true, cookie: true,
 	             xfbml: true});
-		FB.Event.subscribe('auth.login', function(response) {        
-        	   document.forms["default"].submit(); 
+		FB.Event.subscribe('auth.login', function(response) {     
+				GetEmail();
+        	   	document.forms["rank"].submit(); 
     	});
 		FB.Event.subscribe('auth.logout', function(response) {        
-        	   document.forms["default"].submit(); 
+        	   	document.forms["default"].submit(); 
     	});
 	  };
 	  (function() {
@@ -96,6 +112,10 @@
 	</script>
 	
 	<form id="default" method="post" action="Default.aspx"></form>
+    <form id="rank" method="post" action="RankingPage.aspx">
+        <input type="hidden" id="email" />
+        <input type="hidden" id="name" />
+    </form>
 
     <div id="content-header"><h2><!--BEGIN PAGE TITLE-->The Voices of the Mono Project<!--END PAGE TITLE--></h2></div> 
     <div id="wrapper" class="wide"> 
diff --git a/RankPage/RankPage/RankingPage.aspx b/RankPage/RankPage/RankingPage.aspx
index 33c4cb3..e295282 100644
--- a/RankPage/RankPage/RankingPage.aspx
+++ b/RankPage/RankPage/RankingPage.aspx
@@ -1,23 +1,11 @@
 <%@ Page Title="" Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="RankingPage.aspx.cs" Inherits="RankingPage" %>
 
 <asp:Content ID="Content1" ContentPlaceHolderID="Head" Runat="Server">
-    <script type="text/javascript">
-    	function LoggedOut()
-    	{
-    	    FB.api('/me', function(response) {
-    	        if (response.email == null) {
-    	            document.forms["loggedout"].submit();
-    	        }
-    	    });
-    	}
 
-		window.onload=LoggedOut;
-    </script>
 </asp:Content>
 <asp:Content ID="Content2" ContentPlaceHolderID="Body" Runat="Server">
 
-<form id="loggedout" method="post" action="Default.aspx">
-</form>
+
 
 <div id="leftcolumn">
     <table>