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

Summary

Details

Page properties
Content
... ... @@ -1,10 +1,21 @@
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 +#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 +## $response.sendRedirect($request.xredirect)
6 6   #else
7 - $response.sendRedirect($xwiki.getURL($services.model.resolveDocument('', 'default', $doc.documentReference.extractReference('WIKI'))))
18 +## $response.sendRedirect($xwiki.getURL($services.model.resolveDocument('', 'default', $doc.documentReference.extractReference('WIKI'))))
8 8   #end
9 9  #elseif($doc.fullName != 'XWiki.XWikiLogin')
10 10   #set($qs = "$!{request.queryString}")
... ... @@ -11,7 +11,7 @@
11 11   #if(!$request.getParameter('xredirect'))
12 12   #set($qs = "xredirect=$escapetool.url($doc.getURL('view'))&${qs}")
13 13   #end
14 - $response.sendRedirect($xwiki.getURL('XWiki.XWikiLogin', 'login', $qs))
25 +## $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">
33 + <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)"/>