[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
SF.net SVN: ledger-smb:[5525] branches/1.3

Subject: SF.net SVN: ledger-smb:[5525] branches/1.3
From: ..hidden..
Date: Wed, 09 Jan 2013 10:08:20 +0000
Revision: 5525
          http://ledger-smb.svn.sourceforge.net/ledger-smb/?rev=5525&view=rev
Author:   einhverfr
Date:     2013-01-09 10:08:19 +0000 (Wed, 09 Jan 2013)
Log Message:
-----------
Merging from trunk, fix regarding browser handling on logout

Modified Paths:
--------------
    branches/1.3/Changelog
    branches/1.3/UI/logout.html
    branches/1.3/scripts/login.pl

Removed Paths:
-------------
    branches/1.3/UI/logout/epiphany.js
    branches/1.3/UI/logout/firefox.js
    branches/1.3/UI/logout/iexplore.js
    branches/1.3/UI/logout/konqueror.js
    branches/1.3/UI/logout/opera.js
    branches/1.3/UI/logout/safari.js

Property Changed:
----------------
    branches/1.3/
    branches/1.3/Changelog
    branches/1.3/scripts/login.pl


Property changes on: branches/1.3
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519
   + /trunk:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524

Modified: branches/1.3/Changelog
===================================================================
--- branches/1.3/Changelog	2013-01-09 10:02:29 UTC (rev 5524)
+++ branches/1.3/Changelog	2013-01-09 10:08:19 UTC (rev 5525)
@@ -18,6 +18,7 @@
 * Fixed admin passwd reset ineffective (Chris T, bug 3599803)
 * Fixed stylesheet cannot be set on preferences screen (Chris T, 3599804)
 * Moved Fixes.sql to top of LOADORDER to fix some upgrade issues (Chris T)
+* Fixing handling of unknown browsers in logout (Chris T, 3599930)
 
 Changelog for 1.3.27
 * Detect whether ledgersmb.conf exists during Makefile.PL run and create if


Property changes on: branches/1.3/Changelog
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519
   + /trunk/Changelog:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5513,5515,5519,5524

Deleted: branches/1.3/UI/logout/epiphany.js
===================================================================
--- branches/1.3/UI/logout/epiphany.js	2013-01-09 10:02:29 UTC (rev 5524)
+++ branches/1.3/UI/logout/epiphany.js	2013-01-09 10:08:19 UTC (rev 5525)
@@ -1 +0,0 @@
-// Logout routines for Epiphany go here

Deleted: branches/1.3/UI/logout/firefox.js
===================================================================
--- branches/1.3/UI/logout/firefox.js	2013-01-09 10:02:29 UTC (rev 5524)
+++ branches/1.3/UI/logout/firefox.js	2013-01-09 10:08:19 UTC (rev 5525)
@@ -1,13 +0,0 @@
-try{
-var agt=navigator.userAgent.toLowerCase();
-if (agt.indexOf("firefox") != -1) {
-	var xhre = new XMLHttpRequest() ;
-        xhre.open("GET",window.location,true,"logout","logout");
-        xhre.send("");
-        xhre.abort();
-        //be aware, sometimes get-request reaches server despite abort.
-        // LedgerSMB::Auth::DB::get_credentials can have $auth=logout:logout
-}
-}
-catch (e) {
-}

Deleted: branches/1.3/UI/logout/iexplore.js
===================================================================
--- branches/1.3/UI/logout/iexplore.js	2013-01-09 10:02:29 UTC (rev 5524)
+++ branches/1.3/UI/logout/iexplore.js	2013-01-09 10:08:19 UTC (rev 5525)
@@ -1,9 +0,0 @@
-try{
-var agt=navigator.userAgent.toLowerCase();
-if (agt.indexOf("msie") != -1) {
-// IE clear HTTP Authentication
-    document.execCommand("ClearAuthenticationCache");
-}
-}
-catch (e) {
-}

Deleted: branches/1.3/UI/logout/konqueror.js
===================================================================
--- branches/1.3/UI/logout/konqueror.js	2013-01-09 10:02:29 UTC (rev 5524)
+++ branches/1.3/UI/logout/konqueror.js	2013-01-09 10:08:19 UTC (rev 5525)
@@ -1 +0,0 @@
-// logout routines for Konqueror go here

Deleted: branches/1.3/UI/logout/opera.js
===================================================================
--- branches/1.3/UI/logout/opera.js	2013-01-09 10:02:29 UTC (rev 5524)
+++ branches/1.3/UI/logout/opera.js	2013-01-09 10:08:19 UTC (rev 5525)
@@ -1 +0,0 @@
-// Logout routines for Opera go here

Deleted: branches/1.3/UI/logout/safari.js
===================================================================
--- branches/1.3/UI/logout/safari.js	2013-01-09 10:02:29 UTC (rev 5524)
+++ branches/1.3/UI/logout/safari.js	2013-01-09 10:08:19 UTC (rev 5525)
@@ -1 +0,0 @@
-// logout routines for Safari go here

Modified: branches/1.3/UI/logout.html
===================================================================
--- branches/1.3/UI/logout.html	2013-01-09 10:02:29 UTC (rev 5524)
+++ branches/1.3/UI/logout.html	2013-01-09 10:08:19 UTC (rev 5525)
@@ -1,5 +1,32 @@
-<?lsmb INCLUDE 'ui-header.html' include_script = scripts ?> 
+<?lsmb INCLUDE 'ui-header.html' ?> 
 <?lsmb PROCESS elements.html ?> 
+<!-- 
+  I am inlining the Javascript to clear credentials here.  Normally we try to
+  separate this out into different files, one file per language but in this 
+  case this makes localization of the Opera error message essentially impossible
+  so for this reason going to inline this functionality here. - Chris T -->
+<script>
+try{
+var agt=navigator.userAgent.toLowerCase();
+if (agt.indexOf("msie") != -1) {
+// IE clear HTTP Authentication
+    document.execCommand("ClearAuthenticationCache");
+}
+if (agt.indexOf("opera") != -1){ 
+   alert("<?lsmb text('Opera detected.  To complete this logout, please close your browser window or clear private/authentication information') ?>");
+}
+if (agt.indexOf("msie") == -1) {
+	var xhre = new XMLHttpRequest() ;
+        xhre.open("GET",window.location,true,"logout","logout");
+        xhre.send("");
+        xhre.abort();
+        //be aware, sometimes get-request reaches server despite abort.
+        // LedgerSMB::Auth::DB::get_credentials can have $auth=logout:logout
+}
+}
+catch (e) {
+}
+</script>
 <body>
 <h1 class="info"><?lsmb text('Logout Successful')?></h1>
 <p><a href="login.pl"><?lsmb text('Return to the login screen.') ?></a>

Modified: branches/1.3/scripts/login.pl
===================================================================
--- branches/1.3/scripts/login.pl	2013-01-09 10:02:29 UTC (rev 5524)
+++ branches/1.3/scripts/login.pl	2013-01-09 10:08:19 UTC (rev 5525)
@@ -130,14 +130,6 @@
 
 sub logout {
     my ($request) = @_;    
-    @{$request->{scripts}} = 
-                  qw(UI/logout/iexplore.js 
-                     UI/logout/firefox.js
-                     UI/logout/opera.js
-                     UI/logout/safari.js
-                     UI/logout/konqueror.js
-                     UI/logout/epiphany.js
-                   );
     $request->{callback}   = "";
     $request->{endsession} = 1;
     if($request->{dbh}){LedgerSMB::Auth::session_destroy($request);}#if logout on already logged out session


Property changes on: branches/1.3/scripts/login.pl
___________________________________________________________________
Added: svn:mergeinfo
   + /trunk/LedgerSMB/Scripts/login.pm:5524
/trunk/scripts/login.pl:3711-3712,5424,5446-5448,5451,5457,5459,5461,5466,5473,5475,5482-5483,5485,5487,5489,5495-5496,5515,5519,5524

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Prev by Date: SF.net SVN: ledger-smb:[5524] trunk
Next by Date: SF.net SVN: ledger-smb:[5526] trunk/bin
Previous by thread: SF.net SVN: ledger-smb:[5524] trunk
Next by thread: SF.net SVN: ledger-smb:[5526] trunk/bin
Index(es):
- Date
- Thread