Zum Inhalt springen

Änderungen von Dokument InvitationCommon

Zuletzt geändert von base4it Admin am 2025/11/04 19:31
Von 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]
Auf 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]

Zusammenfassung

Details

Seiteneigenschaften
Syntax
... ... @@ -1,1 +1,1 @@
1 -XWiki 2.1
1 +XWiki 2.0
Inhalt
... ... @@ -19,9 +19,7 @@
19 19   {{info}}testLoadInvitationConfig{{/info}}
20 20   #testLoadInvitationConfig()
21 21  #elseif($doc.documentReference.name == 'InvitationCommon')
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}}
22 + {{info}}$services.localization.render('xe.invitation.internalDocument', ["${doc.getSpace()}.WebHome"]){{/info}}
25 25  #end
26 26  ##
27 27  #*
... ... @@ -44,7 +44,7 @@
44 44  
45 45   {{html wiki=false clean=false}}
46 46   <div id="invitation-displaymessage" class="invitation">
47 - <strong>$escapetool.xml($services.localization.render('xe.invitation.previewLabel'))</strong>
45 + <strong>$services.localization.render('xe.invitation.previewLabel')</strong>
48 48   <div class="invitation invitation-preview">
49 49   #set($recips = [])
50 50   #set($invalid = [])
... ... @@ -63,7 +63,7 @@
63 63   #end
64 64   ## Print the email addresses to be sent to.
65 65   ## To:
66 - <strong>$escapetool.xml($services.localization.render('xe.invitation.toLabel'))</strong>
64 + <strong>$services.localization.render('xe.invitation.toLabel')</strong>
67 67   <div id="preview-to-field" class="invitation-preview field">
68 68   #foreach($recip in $recips)
69 69   #if($invalid.contains($recip))
... ... @@ -81,29 +81,27 @@
81 81   ## Tell the user that some of the email addresses are invalid.
82 82   #if($invalidAddresses && $invalidAddresses.size() > 0)
83 83   <p class="invalid-address-message">
84 - {{/html}}
85 - {{error}}
82 + <span class="errormessage">
86 86   #if($recips.size() == 1)
87 87   ## The email address given is invalid and will not be sent to.
88 - $services.rendering.escape($services.localization.render('xe.invitation.displayMessage.theAddressIsInvalid'), 'xwiki/2.1')
85 + $services.localization.render('xe.invitation.displayMessage.theAddressIsInvalid')
89 89   #else
90 90   #if($invalid.size() > 1)
91 - $services.rendering.escape($services.localization.render('xe.invitation.displayMessage.someAddressesAreInvalid', [$invalidAddresses.size()]), 'xwiki/2.1')
88 + $services.localization.render('xe.invitation.displayMessage.someAddressesAreInvalid', [$invalidAddresses.size()])
92 92   #else
93 - $services.rendering.escape($services.localization.render('xe.invitation.displayMessage.anAddressesIsInvalid'), 'xwiki/2.1')
90 + $services.localization.render('xe.invitation.displayMessage.anAddressesIsInvalid')
94 94   #end
95 95   #end
96 - {{/error}}
97 - {{html wiki=false clean=false}}
93 + </span>
98 98   </p>
99 99   #end
100 100   ## Subject:
101 - <strong>$escapetool.xml($services.localization.render('xe.invitation.subjectLabel'))</strong>
97 + <strong>$services.localization.render('xe.invitation.subjectLabel')</strong>
102 102   <div id="preview-subjectline-field" class="invitation-preview field">
103 103   $escapetool.xml($mail.getProperty('subjectLine').getValue())
104 104   </div>
105 105   ## Message:
106 - <strong>$escapetool.xml($services.localization.render('xe.invitation.contentLabel'))</strong>
102 + <strong>$services.localization.render('xe.invitation.contentLabel')</strong>
107 107   <div id="preview-messagebody-field" class="invitation-preview field">
108 108   $mail.getProperty('messageBody').getValue()
109 109   </div>
... ... @@ -152,10 +152,8 @@
152 152   $config.put($element.getName(), $defaultConfigObj.getProperty($element.getName()).getValue())
153 153   #end
154 154   ##
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}}')
151 + #set($configDocContent = '{{velo' + 'city}}{{info}}$services.localization.render(''xe.invitation.internalDocument'', ["'
152 + + "$!config.get('mainPage')" + '"]){{/info}}{{/velo' + 'city}}')
159 159   $configDoc.setContent($configDocContent)
160 160   $configDoc.setParent($configClassNameInternal)
161 161   #set($configObj = $configDoc.newObject($configClassNameInternal))
... ... @@ -200,8 +200,7 @@
200 200   #end
201 201   #set($configClass = $xwiki.getDocumentAsAuthor("${doc.getSpace()}.WebHome"))
202 202   #if($configClass.isNew())
203 - #set ($classDocumentLink = $services.rendering.escape("${doc.getSpace()}.WebHome", 'xwiki/2.1'))
204 - {{error}}Class document [[$classDocumentLink]] not found. can't run test.{{/error}}
197 + {{error}}Class document [[${doc.getSpace()}.WebHome]] not found. can't run test.{{/error}}
205 205   #else
206 206   #set($config = {})
207 207   #loadInvitationConfig($config, 'HopefullyNonexistantSpace')
... ... @@ -243,10 +243,8 @@
243 243  #macro(loadInvitationMail, $config, $emailContainer, $mail)
244 244   ## If this doesn't already exist, it's created.
245 245   #if($emailContainer.isNew())
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}}')
239 + #set($emailContainerContent = '{{velo' + 'city}}{{info}}$services.localization.render(''xe.invitation.internalDocument'', ["'
240 + + "$config.get('emailContainer')" + '"]){{/info}}{{/velo' + 'city}}')
250 250   #set($discard = $emailContainer.setContent($emailContainerContent))
251 251   #set($discard = $emailContainer.setHidden(true))
252 252   #set($discard = $emailContainer.saveAsAuthor())
... ... @@ -325,7 +325,7 @@
325 325   ##
326 326   <dl>
327 327   <dt><label for="memo">$memoLabel</label></dt>
328 - <dd><input id='memo' type="text" size="54" name="memo" /></dd>
319 + <dd><input type="text" size="54" name="memo" /></dd>
329 329   </dl>
330 330   <div class="bottombuttons">
331 331   <div class="buttons">
Invitation.WebHome[0]
allowUsersOfOtherWikis
... ... @@ -1,1 +1,0 @@
1 -Nein
commonPage
... ... @@ -1,1 +1,0 @@
1 -Invitation.InvitationCommon
emailClass
... ... @@ -1,1 +1,0 @@
1 -Invitation.InvitationMailClass
emailContainer
... ... @@ -1,1 +1,0 @@
1 -Invitation.InvitationMessages
emailRegex
... ... @@ -1,1 +1,0 @@
1 -/^([^@\s]+)@((?:[-a-zA-Z0-9]+\.)+[a-zA-Z]{2,})$/
from_address
... ... @@ -1,1 +1,0 @@
1 -no-reply@localhost.localdomain
guestsActionsPage
... ... @@ -1,1 +1,0 @@
1 -Invitation.InvitationGuestActions
mainPage
... ... @@ -1,1 +1,0 @@
1 -Invitation.WebHome
membersActionsPage
... ... @@ -1,1 +1,0 @@
1 -Invitation.InvitationMemberActions
membersCommonPage
... ... @@ -1,1 +1,0 @@
1 -Invitation.InvitationMembersCommon
messageBodyTemplate
... ... @@ -1,33 +1,0 @@
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}}
messageBodyTemplatePlain
... ... @@ -1,2 +1,0 @@
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,1 +1,0 @@
1 -25
smtp_server
... ... @@ -1,1 +1,0 @@
1 -localhost
subjectLineTemplate
... ... @@ -1,1 +1,0 @@
1 -{{velocity wiki='false'}}$services.localization.render('xe.invitation.emailContent.subjectLine', [$xcontext.getUser().replaceAll("^[^\.]*.", ""), $xwiki.getRequestURL().replaceAll("https?://([^/:]*).*$", "$1"), $!subjectLine]){{/velocity}}
usersMayPersonalizeMessage
... ... @@ -1,1 +1,0 @@
1 -Ja
usersMaySendToMultiple
... ... @@ -1,1 +1,0 @@
1 -Nein