Changes for page Sandbox

Last modified by Jip-jan Alunkel on May 29, 22:55
From version 20.3
edited by Jip-jan Alunkel
on May 08, 18:27
Change comment: There is no comment for this version
To version 21.7
edited by Jip-jan Alunkel
on May 11, 13:13
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,26 +1,57 @@
1 1  
2 2  {{velocity}}
3 -$xwiki.getURL($services.model.resolveDocument('', 'default', $doc.documentReference.extractReference('WIKI')))
3 +{{html}}
4 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}'))")
5 5  #if($xcontext.user != 'XWiki.XWikiGuest')
6 - #if($request.xredirect)
7 - $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)
8 8   #else
29 + #*
30 + *
31 + *#
9 9  ## $response.sendRedirect($xwiki.getURL($services.model.resolveDocument('', 'default', $doc.documentReference.extractReference('WIKI'))))
10 10   #end
11 -#elseif($doc.fullName != 'XWiki.XWikiLogin')
12 - #set($qs = "$!{request.queryString}")
13 - #if(!$request.getParameter('xredirect'))
14 - #set($qs = "xredirect=$escapetool.url($doc.getURL('view'))&${qs}")
15 - #end
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
16 16  ## $response.sendRedirect($xwiki.getURL('XWiki.XWikiLogin', 'login', $qs))
17 17  #else
18 -
19 19  ## Login page
20 20  ##template("startpage.vm")
21 21  ##<div class="main layoutsubsection">
22 22  ##<div id="mainContentArea">
45 +#*
46 +* De gebruiker is niet ingelogd.
47 +*
48 +* --> Een login link plaatsen met het login formulier
49 +*#
23 23  <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
24 24   <input type="hidden" name="xredirect" value="$!{escapetool.xml($request.xredirect)}"/>
25 25   #if("$!request.srid" != '')
26 26   <input type="hidden" name="srid" value="$!escapetool.xml($request.srid)"/>
... ... @@ -74,8 +74,10 @@
74 74   document.forms.loginForm.j_username.focus();
75 75  //]]>
76 76  </script>
77 - #template("endpage.vm")
108 +## #template("endpage.vm")
78 78  #end
110 +
111 +{{/html}}
79 79  {{/velocity}}
80 80  
81 81