- PHP Framework upgrade 3.5.0 -> 3.5.1 (fixes some issues with CREST cURL caching, and SESSION management)

- #138 added "cookie logout" to "logout" menu entry
This commit is contained in:
Exodus4D
2016-05-06 18:09:28 +02:00
parent eb1e365020
commit dfd1e8501d
28 changed files with 575 additions and 388 deletions

View File

@@ -15,7 +15,7 @@ define(['jquery'], function($) {
sendInviteKey: 'api/user/sendInvite', // ajax URL - send registration key
getCookieCharacterData: 'api/user/getCookieCharacter', // ajax URL - get character data from cookie
logIn: 'api/user/logIn', // ajax URL - login
logOut: 'api/user/logOut', // ajax URL - logout
logout: 'api/user/logout', // ajax URL - logout
deleteLog: 'api/user/deleteLog', // ajax URL - delete character log
saveUserConfig: 'api/user/saveAccount', // ajax URL - saves/update user account
deleteAccount: 'api/user/deleteAccount', // ajax URL - delete Account data

View File

@@ -230,7 +230,7 @@ define([
class: 'fa fa-sign-in fa-fw'
})
).on('click', function(){
$(document).triggerMenuEvent('Logout');
$(document).triggerMenuEvent('Logout', {clearCookies: 1});
})
)
);
@@ -590,10 +590,19 @@ define([
});
$(document).on('pf:menuLogout', function(e, data){
var clearCookies = false;
if( typeof data === 'object' ){
if( data.hasOwnProperty('clearCookies') ){
clearCookies = data.clearCookies;
}
}
// logout
Util.logout({
ajaxData: {
reroute: 1
reroute: 1,
clearCookies: clearCookies
}
});
return false;

View File

@@ -1778,7 +1778,7 @@ define([
$.ajax({
type: 'POST',
url: Init.path.logOut,
url: Init.path.logout,
data: data,
dataType: 'json'
}).done(function(data){