Zum Inhalt springen

Änderungen von Dokument InvitationCommon

Zuletzt geändert von base4it Admin am 2025/11/04 19:31
Von Version 1.1
bearbeitet von base4it Admin
am 2022/05/29 14:19
Änderungskommentar: Install extension [org.xwiki.platform:xwiki-platform-invitation-ui/14.4]
Auf Version 2.1
bearbeitet von base4it Admin
am 2025/11/04 19:31
Änderungskommentar: Install extension [org.xwiki.platform:xwiki-platform-invitation-ui/17.7.0]

Zusammenfassung

Details

Seiteneigenschaften
Syntax
... ... @@ -1,1 +1,1 @@
1 -XWiki 2.0
1 +XWiki 2.1
Inhalt
... ... @@ -19,7 +19,9 @@
19 19   {{info}}testLoadInvitationConfig{{/info}}
20 20   #testLoadInvitationConfig()
21 21  #elseif($doc.documentReference.name == 'InvitationCommon')
22 - {{info}}$services.localization.render('xe.invitation.internalDocument', ["${doc.getSpace()}.WebHome"]){{/info}}
22 + #set ($linkTarget = "${doc.getSpace()}.WebHome")
23 + #set ($linkTarget = $services.rendering.escape($linkTarget, 'xwiki/2.1'))
24 + {{info}}$services.localization.render('xe.invitation.internalDocument', [$linkTarget]){{/info}}
23 23  #end
24 24  ##
25 25  #*
... ... @@ -42,7 +42,7 @@
42 42  
43 43   {{html wiki=false clean=false}}
44 44   <div id="invitation-displaymessage" class="invitation">
45 - <strong>$services.localization.render('xe.invitation.previewLabel')</strong>
47 + <strong>$escapetool.xml($services.localization.render('xe.invitation.previewLabel'))</strong>
46 46   <div class="invitation invitation-preview">
47 47   #set($recips = [])
48 48   #set($invalid = [])
... ... @@ -61,7 +61,7 @@
61 61   #end
62 62   ## Print the email addresses to be sent to.
63 63   ## To:
64 - <strong>$services.localization.render('xe.invitation.toLabel')</strong>
66 + <strong>$escapetool.xml($services.localization.render('xe.invitation.toLabel'))</strong>
65 65   <div id="preview-to-field" class="invitation-preview field">
66 66   #foreach($recip in $recips)
67 67   #if($invalid.contains($recip))
... ... @@ -79,27 +79,29 @@
79 79   ## Tell the user that some of the email addresses are invalid.
80 80   #if($invalidAddresses && $invalidAddresses.size() > 0)
81 81   <p class="invalid-address-message">
82 - <span class="errormessage">
84 + {{/html}}
85 + {{error}}
83 83   #if($recips.size() == 1)
84 84   ## The email address given is invalid and will not be sent to.
85 - $services.localization.render('xe.invitation.displayMessage.theAddressIsInvalid')
88 + $services.rendering.escape($services.localization.render('xe.invitation.displayMessage.theAddressIsInvalid'), 'xwiki/2.1')
86 86   #else
87 87   #if($invalid.size() > 1)
88 - $services.localization.render('xe.invitation.displayMessage.someAddressesAreInvalid', [$invalidAddresses.size()])
91 + $services.rendering.escape($services.localization.render('xe.invitation.displayMessage.someAddressesAreInvalid', [$invalidAddresses.size()]), 'xwiki/2.1')
89 89   #else
90 - $services.localization.render('xe.invitation.displayMessage.anAddressesIsInvalid')
93 + $services.rendering.escape($services.localization.render('xe.invitation.displayMessage.anAddressesIsInvalid'), 'xwiki/2.1')
91 91   #end
92 92   #end
93 - </span>
96 + {{/error}}
97 + {{html wiki=false clean=false}}
94 94   </p>
95 95   #end
96 96   ## Subject:
97 - <strong>$services.localization.render('xe.invitation.subjectLabel')</strong>
101 + <strong>$escapetool.xml($services.localization.render('xe.invitation.subjectLabel'))</strong>
98 98   <div id="preview-subjectline-field" class="invitation-preview field">
99 99   $escapetool.xml($mail.getProperty('subjectLine').getValue())
100 100   </div>
101 101   ## Message:
102 - <strong>$services.localization.render('xe.invitation.contentLabel')</strong>
106 + <strong>$escapetool.xml($services.localization.render('xe.invitation.contentLabel'))</strong>
103 103   <div id="preview-messagebody-field" class="invitation-preview field">
104 104   $mail.getProperty('messageBody').getValue()
105 105   </div>
... ... @@ -148,8 +148,10 @@
148 148   $config.put($element.getName(), $defaultConfigObj.getProperty($element.getName()).getValue())
149 149   #end
150 150   ##
151 - #set($configDocContent = '{{velo' + 'city}}{{info}}$services.localization.render(''xe.invitation.internalDocument'', ["'
152 - + "$!config.get('mainPage')" + '"]){{/info}}{{/velo' + 'city}}')
155 + #set($configDocContent =
156 + '{{velocity}}{{info}}$services.localization.render(''xe.invitation.internalDocument'','
157 + + '[$services.rendering.escape("' + "$!config.get('mainPage')"
158 + + '", ''xwiki/2.1'')]){{/info}}{{/velocity}}')
153 153   $configDoc.setContent($configDocContent)
154 154   $configDoc.setParent($configClassNameInternal)
155 155   #set($configObj = $configDoc.newObject($configClassNameInternal))
... ... @@ -194,7 +194,8 @@
194 194   #end
195 195   #set($configClass = $xwiki.getDocumentAsAuthor("${doc.getSpace()}.WebHome"))
196 196   #if($configClass.isNew())
197 - {{error}}Class document [[${doc.getSpace()}.WebHome]] not found. can't run test.{{/error}}
203 + #set ($classDocumentLink = $services.rendering.escape("${doc.getSpace()}.WebHome", 'xwiki/2.1'))
204 + {{error}}Class document [[$classDocumentLink]] not found. can't run test.{{/error}}
198 198   #else
199 199   #set($config = {})
200 200   #loadInvitationConfig($config, 'HopefullyNonexistantSpace')
... ... @@ -236,8 +236,10 @@
236 236  #macro(loadInvitationMail, $config, $emailContainer, $mail)
237 237   ## If this doesn't already exist, it's created.
238 238   #if($emailContainer.isNew())
239 - #set($emailContainerContent = '{{velo' + 'city}}{{info}}$services.localization.render(''xe.invitation.internalDocument'', ["'
240 - + "$config.get('emailContainer')" + '"]){{/info}}{{/velo' + 'city}}')
246 + #set($emailContainerContent =
247 + '{{velocity}}{{info}}$services.localization.render(''xe.invitation.internalDocument'','
248 + + '[$services.rendering.escape("' + "$config.get('emailContainer')"
249 + + '", ''xwiki/2.1'')]){{/info}}{{/velocity}}')
241 241   #set($discard = $emailContainer.setContent($emailContainerContent))
242 242   #set($discard = $emailContainer.setHidden(true))
243 243   #set($discard = $emailContainer.saveAsAuthor())
... ... @@ -316,7 +316,7 @@
316 316   ##
317 317   <dl>
318 318   <dt><label for="memo">$memoLabel</label></dt>
319 - <dd><input type="text" size="54" name="memo" /></dd>
328 + <dd><input id='memo' type="text" size="54" name="memo" /></dd>
320 320   </dl>
321 321   <div class="bottombuttons">
322 322   <div class="buttons">
Invitation.WebHome[0]
commonPage
... ... @@ -1,0 +1,1 @@
1 +Invitation.InvitationCommon
membersActionsPage
... ... @@ -1,0 +1,1 @@
1 +Invitation.InvitationMemberActions
guestsActionsPage
... ... @@ -1,0 +1,1 @@
1 +Invitation.InvitationGuestActions
allowUsersOfOtherWikis
... ... @@ -1,0 +1,1 @@
1 +Nein
emailRegex
... ... @@ -1,0 +1,1 @@
1 +/^([^@\s]+)@((?:[-a-zA-Z0-9]+\.)+[a-zA-Z]{2,})$/
usersMayPersonalizeMessage
... ... @@ -1,0 +1,1 @@
1 +Ja
emailContainer
... ... @@ -1,0 +1,1 @@
1 +Invitation.InvitationMessages
messageBodyTemplatePlain
... ... @@ -1,0 +1,2 @@
1 +{{velocity}}
2 +#set($userName = $xwiki.getUserName($xcontext.getUser(), false))#set($wikiName = $xwiki.getRequestURL().replaceAll("https?://([^/:]*).*$", "$1"))#set($guestActionsURL = $xwiki.getDocumentAsAuthor($config.get('guestsActionsPage')).getExternalURL())$services.localization.render('xe.invitation.emailContent.userHasInvitedYouToJoinWiki', [$userName, $wikiName])#if("$!messageBody" != '') $messageBody#end$services.localization.render('xe.invitation.emailContent.joinLink')${guestActionsURL}?doAction_accept=y&messageID=$messageID$services.localization.render('xe.invitation.emailContent.declineLink')${guestActionsURL}?doAction_decline=y&messageID=$messageID$services.localization.render('xe.invitation.emailContent.reportMessage', ['', "$util.getNewline()${guestActionsURL}?doAction_decline=y&messageID=$messageID"]){{/velocity}}
smtp_port
... ... @@ -1,0 +1,1 @@
1 +25
mainPage
... ... @@ -1,0 +1,1 @@
1 +Invitation.WebHome
membersCommonPage
... ... @@ -1,0 +1,1 @@
1 +Invitation.InvitationMembersCommon
smtp_server
... ... @@ -1,0 +1,1 @@
1 +localhost
usersMaySendToMultiple
... ... @@ -1,0 +1,1 @@
1 +Nein
emailClass
... ... @@ -1,0 +1,1 @@
1 +Invitation.InvitationMailClass
messageBodyTemplate
... ... @@ -1,0 +1,33 @@
1 +{{velocity}}
2 +#set($discard = "#template('colorThemeInit.vm')")
3 +#if("$!theme" == "")
4 + #set($theme = {"linkColor":"#4791BC", "notificationErrorColor":"#ca302c"}})
5 +#end
6 +#set($userName = $xwiki.getUserName($xcontext.getUser(), false))
7 +#set($wikiName = $xwiki.getRequestURL().replaceAll("http://([^/:]*).*$", "$1"))
8 +#set($guestActionsURL = $xwiki.getDocumentAsAuthor($config.get("guestsActionsPage")).getExternalURL())
9 +#set($linkStyle = "color:$theme.get('linkColor');text-decoration:none;")
10 +#set($bigText = "font-size:130%;")
11 +#set($joinLink = "float:left;")
12 +#set($dangerColor = $theme.notificationErrorColor)
13 +#set($declineLink = "color:$dangerColor;float:right;text-decoration:none;")
14 +
15 +$services.localization.render('xe.invitation.emailContent.userHasInvitedYouToJoinWiki', [$userName, $wikiName])
16 +
17 +{{html clean=false}}
18 +#if("$!messageBody" != "")
19 + <p style="$bigText">
20 + $!escapetool.xml($!messageBody)
21 + </p>
22 +#end
23 +<p style="margin-top:30px">
24 +<a href="${guestActionsURL}?doAction_accept=y&amp;messageID=$messageID" style="$bigText$joinLink$linkStyle">
25 +$services.localization.render('xe.invitation.emailContent.joinLink')
26 +</a>
27 +<a href="${guestActionsURL}?doAction_decline=y&amp;messageID=$messageID" style="$bigText$declineLink">
28 + $services.localization.render('xe.invitation.emailContent.declineLink')
29 +</a></p>
30 +<hr style="clear:both" />
31 +$services.localization.render('xe.invitation.emailContent.reportMessage', ["<a href=$escapetool.getQ()${guestActionsURL}?doAction_report=y&amp;messageID=$messageID$escapetool.getQ() style=$escapetool.getQ()$linkStyle$escapetool.getQ()>", "</a>"])
32 +{{/html}}
33 +{{/velocity}}
from_address
... ... @@ -1,0 +1,1 @@
1 +no-reply@localhost.localdomain
subjectLineTemplate
... ... @@ -1,0 +1,1 @@
1 +{{velocity wiki='false'}}$services.localization.render('xe.invitation.emailContent.subjectLine', [$xcontext.getUser().replaceAll("^[^\.]*.", ""), $xwiki.getRequestURL().replaceAll("https?://([^/:]*).*$", "$1"), $!subjectLine]){{/velocity}}