Changes for page Sandbox

Last modified by Jip-jan Alunkel on May 29, 22:55
From version 21.2
edited by Jip-jan Alunkel
on May 11, 12:00
Change comment: There is no comment for this version
To version 19.1
edited by Jip-jan Alunkel
on May 08, 18:21
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,30 +1,17 @@
1 1  
2 2  {{velocity}}
3 -$doc.documentReference.extractReference('WIKI')
4 -$xwiki.getURL($services.model.resolveDocument('', 'default', $doc.documentReference.extractReference('WIKI')))
5 -
6 -#if($xcontext.user != 'XWiki.XWikiGuest')
7 - #if($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)
3 +#if ($xcontext.user != 'XWiki.XWikiGuest')
4 + #if ($request.xredirect)
5 + $response.sendRedirect($request.xredirect)
19 19   #else
20 -## $response.sendRedirect($xwiki.getURL($services.model.resolveDocument('', 'default', $doc.documentReference.extractReference('WIKI'))))
7 + $response.sendRedirect($xwiki.getURL($services.model.resolveDocument('', 'default', $doc.documentReference.extractReference('WIKI'))))
21 21   #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
27 -## $response.sendRedirect($xwiki.getURL('XWiki.XWikiLogin', 'login', $qs))
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))
28 28  #else
29 29  
30 30  ## Login page
... ... @@ -32,7 +32,6 @@
32 32  ##<div class="main layoutsubsection">
33 33  ##<div id="mainContentArea">
34 34  <form id="loginForm" action="$doc.getURL('loginsubmit')" method="post" class="xform">
35 - <input type="hidden" name="xlogin" value="$!{escapetool.xml($request.xredirect)}"/>
36 36   <input type="hidden" name="xredirect" value="$!{escapetool.xml($request.xredirect)}"/>
37 37   #if("$!request.srid" != '')
38 38   <input type="hidden" name="srid" value="$!escapetool.xml($request.srid)"/>