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