Changes for page Sandbox
Last modified by Jip-jan Alunkel on May 29, 22:55
From version 20.5
edited by Jip-jan Alunkel
on May 11, 11:56
on May 11, 11:56
Change comment:
There is no comment for this version
To 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
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,21 +1,10 @@ 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 -## $response.sendRedirect($request.xredirect) 3 +#if ($xcontext.user != 'XWiki.XWikiGuest') 4 + #if ($request.xredirect) 5 + $response.sendRedirect($request.xredirect) 17 17 #else 18 - ##$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')))) 19 19 #end 20 20 #elseif($doc.fullName != 'XWiki.XWikiLogin') 21 21 #set($qs = "$!{request.queryString}") ... ... @@ -22,7 +22,7 @@ 22 22 #if(!$request.getParameter('xredirect')) 23 23 #set($qs = "xredirect=$escapetool.url($doc.getURL('view'))&${qs}") 24 24 #end 25 - ##$response.sendRedirect($xwiki.getURL('XWiki.XWikiLogin', 'login', $qs))14 + $response.sendRedirect($xwiki.getURL('XWiki.XWikiLogin', 'login', $qs)) 26 26 #else 27 27 28 28 ## Login page ... ... @@ -30,7 +30,6 @@ 30 30 ##<div class="main layoutsubsection"> 31 31 ##<div id="mainContentArea"> 32 32 <form id="loginForm" action="$doc.getURL('loginsubmit')" method="post" class="xform"> 33 - <input type="hidden" name="xlogin" value="$!{escapetool.xml($request.xredirect)}"/> 34 34 <input type="hidden" name="xredirect" value="$!{escapetool.xml($request.xredirect)}"/> 35 35 #if("$!request.srid" != '') 36 36 <input type="hidden" name="srid" value="$!escapetool.xml($request.srid)"/>