Changes for page Sandbox
Last modified by Jip-jan Alunkel on May 29, 22:55
From version 20.4
edited by Jip-jan Alunkel
on May 08, 18:28
on May 08, 18:28
Change comment:
There is no comment for this version
To version 21.2
edited by Jip-jan Alunkel
on May 11, 12:00
on May 11, 12:00
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -5,15 +5,25 @@ 5 5 6 6 #if($xcontext.user != 'XWiki.XWikiGuest') 7 7 #if($request.xredirect) 8 - $response.sendRedirect($request.xredirect) 8 + #* 9 + * De pagina is geladen t.g.v. submit van het loginformulier, credentials zijn in 10 + * orde en gebruiker is nu ingelogd (en daarom geen [XWikiGuest] meer is). 11 + * Aangezien de loginpagina in de header besloten ligt en daarmee dus beschikbaar 12 + * is op iedere pagina is er geen noodzaak meer voor een redirect. 13 + * 14 + * Een bevestiging van login wordt gedaan. 15 + *# 16 + current: $!{services.csrf.getToken()} 17 + requested: $request.getParameter('form_token') 18 +## $response.sendRedirect($request.xredirect) 9 9 #else 10 10 ## $response.sendRedirect($xwiki.getURL($services.model.resolveDocument('', 'default', $doc.documentReference.extractReference('WIKI')))) 11 11 #end 12 -#elseif($doc.fullName != 'XWiki.XWikiLogin') 13 - #set($qs = "$!{request.queryString}") 14 - #if(!$request.getParameter('xredirect')) 15 - #set($qs = "xredirect=$escapetool.url($doc.getURL('view'))&${qs}") 16 - #end 22 +###elseif($doc.fullName != 'XWiki.XWikiLogin') 23 +## #set($qs = "$!{request.queryString}") 24 +## #if(!$request.getParameter('xredirect')) 25 +## #set($qs = "xredirect=$escapetool.url($doc.getURL('view'))&${qs}") 26 +## #end 17 17 ## $response.sendRedirect($xwiki.getURL('XWiki.XWikiLogin', 'login', $qs)) 18 18 #else 19 19 ... ... @@ -22,6 +22,7 @@ 22 22 ##<div class="main layoutsubsection"> 23 23 ##<div id="mainContentArea"> 24 24 <form id="loginForm" action="$doc.getURL('loginsubmit')" method="post" class="xform"> 35 + <input type="hidden" name="xlogin" value="$!{escapetool.xml($request.xredirect)}"/> 25 25 <input type="hidden" name="xredirect" value="$!{escapetool.xml($request.xredirect)}"/> 26 26 #if("$!request.srid" != '') 27 27 <input type="hidden" name="srid" value="$!escapetool.xml($request.srid)"/>