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
Change comment: There is no comment for this version
To version 21.5
edited by Jip-jan Alunkel
on May 11, 12:04
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,19 +1,32 @@
1 1  
2 2  {{velocity}}
3 -$doc.documentReference.extractReference('WIKI')
4 -$xwiki.getURL($services.model.resolveDocument('', 'default', $doc.documentReference.extractReference('WIKI')))
5 5  
4 +{{html}}
5 +$doc.documentReference.extractReference('WIKI')<br />
6 +$xwiki.getURL($services.model.resolveDocument('', 'default', $doc.documentReference.extractReference('WIKI')))<br />
7 +
8 +current: $!{services.csrf.getToken()}<br />
9 +requested: $request.getParameter('form_token')<br />
10 +
6 6  #if($xcontext.user != 'XWiki.XWikiGuest')
7 7   #if($request.xredirect)
8 - $response.sendRedirect($request.xredirect)
13 + #*
14 + * De pagina is geladen t.g.v. submit van het loginformulier, credentials zijn in
15 + * orde en gebruiker is nu ingelogd (en daarom geen [XWikiGuest] meer is).
16 + * Aangezien de loginpagina in de header besloten ligt en daarmee dus beschikbaar
17 + * is op iedere pagina is er geen noodzaak meer voor een redirect.
18 + *
19 + * Een bevestiging van login wordt gedaan.
20 + *#
21 +## $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
25 +###elseif($doc.fullName != 'XWiki.XWikiLogin')
26 +## #set($qs = "$!{request.queryString}")
27 +## #if(!$request.getParameter('xredirect'))
28 +## #set($qs = "xredirect=$escapetool.url($doc.getURL('view'))&${qs}")
29 +## #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">
38 + <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)"/>
... ... @@ -77,6 +77,8 @@
77 77  </script>
78 78   #template("endpage.vm")
79 79  #end
94 +
95 +{{/html}}
80 80  {{/velocity}}
81 81  
82 82