Changes for page Sandbox
Last modified by Jip-jan Alunkel on May 29, 22:55
From version 20.1
edited by Jip-jan Alunkel
on May 08, 18:23
on May 08, 18:23
Change comment:
There is no comment for this version
To version 21.7
edited by Jip-jan Alunkel
on May 11, 13:13
on May 11, 13:13
Change comment:
There is no comment for this version
Summary
-
Page properties (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Content
-
... ... @@ -1,24 +1,57 @@ 1 1 2 2 {{velocity}} 3 +{{html}} 4 + 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 +#set($token = "$!{request.getParameter('form_token')}") 10 +requested: $request.getParameter("$!{services.csrf.getToken()}")<br /> 11 +#set($requested = "$!(request.getParameter('${token}'))") 3 3 #if($xcontext.user != 'XWiki.XWikiGuest') 4 - #if($request.xredirect) 5 - $response.sendRedirect($request.xredirect) 13 +#* 14 +* De gebruiker is ingelogd. 15 +* 16 +* --> Een logout link plaatsen 17 +*# 18 +## #if($request.xredirect) 19 + #if($requested == "xlogin") 20 + #* 21 + * De pagina is geladen t.g.v. submit van het login formulier. Aangezien de 22 + * loginpagina in de header besloten ligt en daarmee dus beschikbaar is op 23 + * iedere pagina is er geen noodzaak meer voor een redirect. 24 + * 25 + * --> Een bevestiging van login wordt gedaan. 26 + *# 27 +## $response.sendRedirect($request.xredirect) 6 6 #else 29 + #* 30 + * 31 + *# 7 7 ## $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)) 34 +###elseif($doc.fullName != 'XWiki.XWikiLogin') 35 +## #set($qs = "$!{request.queryString}") 36 +## #if(!$request.getParameter('xredirect')) 37 +## #set($qs = "xredirect=$escapetool.url($doc.getURL('view'))&${qs}") 38 +## #end 39 +## $response.sendRedirect($xwiki.getURL('XWiki.XWikiLogin', 'login', $qs)) 15 15 #else 16 - 17 17 ## Login page 18 18 ##template("startpage.vm") 19 19 ##<div class="main layoutsubsection"> 20 20 ##<div id="mainContentArea"> 45 +#* 46 +* De gebruiker is niet ingelogd. 47 +* 48 +* --> Een login link plaatsen met het login formulier 49 +*# 21 21 <form id="loginForm" action="$doc.getURL('loginsubmit')" method="post" class="xform"> 51 + <input type="hidden" name="$!{services.csrf.getToken()}" value="xlogin" /> 52 + #if($xcontext.user != 'XWiki.XWikiGuest') 53 + <input type="hidden" name="logged_in" value="true" /> 54 + #end 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)"/> ... ... @@ -72,8 +72,10 @@ 72 72 document.forms.loginForm.j_username.focus(); 73 73 //]]> 74 74 </script> 75 - #template("endpage.vm") 108 +## #template("endpage.vm") 76 76 #end 110 + 111 +{{/html}} 77 77 {{/velocity}} 78 78 79 79