From c833aca4225db7ce7890f480086d8a7ddd7626a9 Mon Sep 17 00:00:00 2001
From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Tue, 5 Jul 2005 21:53:46 +0000
Subject: [PATCH] changed logout to redirect to the front page

git-svn-id: svn://svn.open-ils.org/ILS/trunk@1055 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/src/javascript/opac/GlobalInit.js | 22 ++++++++++++++--------
 Open-ILS/src/javascript/opac/LogoutPage.js |  2 ++
 Open-ILS/src/javascript/opac/Page.js       |  5 ++++-
 Open-ILS/src/javascript/util/ils_utils.js  |  4 ++--
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/Open-ILS/src/javascript/opac/GlobalInit.js b/Open-ILS/src/javascript/opac/GlobalInit.js
index aca1dfd120..af0d2d7d22 100644
--- a/Open-ILS/src/javascript/opac/GlobalInit.js
+++ b/Open-ILS/src/javascript/opac/GlobalInit.js
@@ -161,7 +161,6 @@ function GlobalInitLoad() {
 
 	debug("Global Init is doing its primary load");
 	globalOrgTreeWidget = new LocationTree(globalOrgTree);
-	globalUser = UserSession.instance();
 
 	var ses = null;
 	var org = null;
@@ -171,14 +170,21 @@ function GlobalInitLoad() {
 		org = G['user_ou']; /* the desired location of the user */
 	}
 
-	if(globalUser.verifySession(ses)) {
-		globalUser.grabOrgUnit(org);
+	if(paramObj.__logout) {
+		doLogout();
 
-	} else  {
-		globalUser = null;
-		globalLocation = globalOrgTree;
-		if(globalSearchDepth == null)
-			globalSearchDepth = findOrgDepth(globalOrgTree.ou_type());
+	} else {
+
+		globalUser = UserSession.instance();
+		if(globalUser.verifySession(ses)) {
+			globalUser.grabOrgUnit(org);
+	
+		} else  {
+			globalUser = null;
+			globalLocation = globalOrgTree;
+			if(globalSearchDepth == null)
+				globalSearchDepth = findOrgDepth(globalOrgTree.ou_type());
+		}
 	}
 
 	grabCopyStatus();
diff --git a/Open-ILS/src/javascript/opac/LogoutPage.js b/Open-ILS/src/javascript/opac/LogoutPage.js
index 97e9957a77..bfe9001780 100644
--- a/Open-ILS/src/javascript/opac/LogoutPage.js
+++ b/Open-ILS/src/javascript/opac/LogoutPage.js
@@ -38,6 +38,8 @@ LogoutPage.prototype.doLogout = function() {
 	message.innerHTML = this.logout_success_msg;
 	this.searchBar.reset();
 
+	return true;
+
 }
 
 
diff --git a/Open-ILS/src/javascript/opac/Page.js b/Open-ILS/src/javascript/opac/Page.js
index d76b4a7848..125749e5c8 100644
--- a/Open-ILS/src/javascript/opac/Page.js
+++ b/Open-ILS/src/javascript/opac/Page.js
@@ -214,7 +214,10 @@ Page.prototype.buildNavBox = function(full) {
 	if(loc) arr.push(this.buildDeepLink());
 
 	if(UserSession.instance().verifySession()) {
-		arr.push(elem("a", {href: prefix + "?target=logout"}, null, "Logout"));
+		//arr.push(elem("a", {href: prefix + "?target=logout"}, null, "Logout"));
+		var a = elem("a", {href:globalRootPath}, null, "Logout");
+		a.onclick = doLogout;
+		arr.push(a);
 	} 
 
 
diff --git a/Open-ILS/src/javascript/util/ils_utils.js b/Open-ILS/src/javascript/util/ils_utils.js
index ff4caef3fe..98f54bf379 100644
--- a/Open-ILS/src/javascript/util/ils_utils.js
+++ b/Open-ILS/src/javascript/util/ils_utils.js
@@ -297,10 +297,10 @@ function mkResourceImage(resource) {
 
 function doLogout() {
 
-	/* remove cookie so browse know's we're logged out */
+	/* remove cookie so browser know's we're logged out */
 	deleteCookie("ils_ses");
 
-	var user = UserSession.instanece();
+	var user = UserSession.instance();
 	if( user.session_id ) {
 		var request = new RemoteRequest( "open-ils.auth",
 			"open-ils.auth.session.delete", user.session_id );
-- 
2.11.0