admin/Facilitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#34932 Na inloggen in een expired sessie nooit terugkeren naar POST formulieren

Browse Source 
svn path=/Website/trunk/; revision=29597
This commit is contained in:
Jos Groot Lipman
2016-06-01 09:47:28 +00:00
parent b1f8ef9dfc
commit 2333f09f93
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
APPL/Shared/Common.inc
View File

@@ -254,8 +254,13 @@ if (user_key < 0 && typeof ANONYMOUS_Allowed == "undefined")
if (!url.match(/^http/)) if (!url.match(/^http/))
var url = rooturl + "/" + url; // "appl/shared/login.asp"; var url = rooturl + "/" + url; // "appl/shared/login.asp";
var ret_page = "";
if (String(Request.ServerVariables("REQUEST_METHOD")) == "GET")
{
ret_page = String(Request.ServerVariables("SCRIPT_NAME")); ret_page = String(Request.ServerVariables("SCRIPT_NAME"));
ret_page = ret_page.replace(/\/default.asp$/i, "/"); ret_page = ret_page.replace(/\/default.asp$/i, "/");
}
var qs = String(Request.ServerVariables("QUERY_STRING")); var qs = String(Request.ServerVariables("QUERY_STRING"));
if ((qs && qs != 'fac_id=' + customerId) || (ret_page && ret_page != rooturl + "/")) if ((qs && qs != 'fac_id=' + customerId) || (ret_page && ret_page != rooturl + "/"))
{ {

6
APPL/Shared/login.asp
View File

@@ -29,7 +29,7 @@ if (Request.QueryString.Count > 0)
} }
} }
var ret_page = getQParam("ret_page", rooturl + "/"); var ret_page = getQParam("ret_page", "");
var querystring = getQParam("querystring", ""); var querystring = getQParam("querystring", "");
FCLTHeader.Requires({plugins: ["jQuery"], js:["jQuery-ui.js"]}); FCLTHeader.Requires({plugins: ["jQuery"], js:["jQuery-ui.js"]});
@@ -54,7 +54,11 @@ if (device.test(device.isMobile))
} }
else if (json.success) else if (json.success)
{ {
<% if (ret_page) { %>
window.location.href = "<%=safe.jsstring(ret_page + (querystring?"?" + querystring:""))%>"; window.location.href = "<%=safe.jsstring(ret_page + (querystring?"?" + querystring:""))%>";
<% } else { %>
window.top.location.href = "<%=rooturl + "/"%>";
<% } %>
} }
} }