Respect signature placement when forwarding a msg
parent
940f85fde2
commit
b26e767a10
5
NEWS
5
NEWS
|
@ -12,10 +12,11 @@ New features
|
|||
Enhancements
|
||||
- we now automatically convert <img src=data...> into file attachments
|
||||
using CIDs. This prevents Outlook issues.
|
||||
- updated Finnish translation
|
||||
- updated French and Finnish translations
|
||||
- XMLHttpRequest.js is now loaded conditionaly (< IE9)
|
||||
- format time in attendees invitation window according to the user's locale
|
||||
- improved IE11 support
|
||||
- respect signature placement when forwarding a message
|
||||
|
||||
Bug fixes
|
||||
- don't load 'background' attribute (#2437)
|
||||
|
@ -27,7 +28,7 @@ Enhancements
|
|||
- updated CKEditor to version 4.3.0 and added tab module
|
||||
|
||||
Bug fixes
|
||||
- HTML formatting is now retained when forwarding/replying to a mail using the HTML editor.
|
||||
- HTML formatting is now retained when forwarding/replying to a mail using the HTML editor
|
||||
- put the text part before the HTML part when composing mail to fix a display issue with Thunderbird (#2512)
|
||||
|
||||
2.1.1a (2013-11-22)
|
||||
|
|
|
@ -889,7 +889,6 @@ static NSString *userAgent = nil;
|
|||
NSDictionary *info, *attachment;
|
||||
NSString *signature, *nl;
|
||||
SOGoUserDefaults *ud;
|
||||
BOOL asInline;
|
||||
|
||||
[sourceMail fetchCoreInfos];
|
||||
|
||||
|
@ -907,10 +906,9 @@ static NSString *userAgent = nil;
|
|||
|
||||
/* attach message */
|
||||
ud = [[context activeUser] userDefaults];
|
||||
asInline = [[ud mailMessageForwarding] isEqualToString: @"inline"];
|
||||
if (asInline)
|
||||
if ([[ud mailMessageForwarding] isEqualToString: @"inline"])
|
||||
{
|
||||
[self setText: [sourceMail contentForReply]];
|
||||
[self setText: [sourceMail contentForInlineForward]];
|
||||
[self _fetchAttachmentsFromMail: sourceMail];
|
||||
}
|
||||
else
|
||||
|
@ -921,7 +919,7 @@ static NSString *userAgent = nil;
|
|||
if ([signature length])
|
||||
{
|
||||
nl = (isHTML ? @"<br/>" : @"\n");
|
||||
[self setText: [NSString stringWithFormat: @"%@-- %@%@", nl, nl, signature]];
|
||||
[self setText: [NSString stringWithFormat: @"%@%@-- %@%@", nl, nl, nl, signature]];
|
||||
}
|
||||
attachment = [NSDictionary dictionaryWithObjectsAndKeys:
|
||||
[sourceMail filenameForForward], @"filename",
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- الرسالة الاصلية --------<#newLine/>
|
||||
الموضوع: <#subject/><#newLine/>
|
||||
التاريخ: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@
|
|||
<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>مجموعات الأخبار: <#newsgroups/></#hasNewsGroups><#hasReferences>المراجع: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,10 +1,16 @@
|
|||
-------- Original Message --------
|
||||
Assunto: <#subject/>
|
||||
Data: <#date/>
|
||||
De: <#from/>
|
||||
<#hasReplyTo>Responder-Para: <#replyTo/></#hasReplyTo><#hasOrganization>Organização: <#organization/></#hasOrganization>Para: <#to/>
|
||||
<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>Referências: <#references/></#hasReferences>
|
||||
|
||||
<#messageBody/>
|
||||
|
||||
<#signature/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Original Message --------<#newLine/>
|
||||
Assunto: <#subject/><#newLine/>
|
||||
Data: <#date/><#newLine/>
|
||||
De: <#from/><#newLine/>
|
||||
<#hasReplyTo>Responder-Para: <#replyTo/></#hasReplyTo><#hasOrganization>Organização: <#organization/></#hasOrganization>Para: <#to/><#newLine/>
|
||||
<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>Referências: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
|
|
|
@ -72,3 +72,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Original Message --------<#newLine/>
|
||||
Subject: <#subject/><#newLine/>
|
||||
Date: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ From: <#from/><#newLine/>
|
|||
<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,10 +1,16 @@
|
|||
-------- Původní zpráva --------
|
||||
Předmět: <#subject/>
|
||||
Datum: <#date/>
|
||||
Od: <#from/>
|
||||
<#hasReplyTo>Odpověď na: <#replyTo/></#hasReplyTo><#hasOrganization>Organizace: <#organization/></#hasOrganization>Komu: <#to/>
|
||||
<#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Diskuzní skupiny: <#newsgroups/></#hasNewsGroups><#hasReferences>Odkazy: <#references/></#hasReferences>
|
||||
|
||||
<#messageBody/>
|
||||
|
||||
<#signature/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Původní zpráva --------<#newLine/>
|
||||
Předmět: <#subject/><#newLine/>
|
||||
Datum: <#date/><#newLine/>
|
||||
Od: <#from/><#newLine/>
|
||||
<#hasReplyTo>Odpověď na: <#replyTo/></#hasReplyTo><#hasOrganization>Organizace: <#organization/></#hasOrganization>Komu: <#to/><#newLine/>
|
||||
<#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Diskuzní skupiny: <#newsgroups/></#hasNewsGroups><#hasReferences>Odkazy: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Original Message --------<#newLine/>
|
||||
Subject: <#subject/><#newLine/>
|
||||
Date: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ From: <#from/><#newLine/>
|
|||
<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Original Message --------<#newLine/>
|
||||
Subject: <#subject/><#newLine/>
|
||||
Date: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ From: <#from/><#newLine/>
|
|||
<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Original Message --------<#newLine/>
|
||||
Subject: <#subject/><#newLine/>
|
||||
Date: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ From: <#from/><#newLine/>
|
|||
<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,21 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Alkuperäinen viesti --------<#newLine/>
|
||||
Aihe: <#subject/><#newLine/>
|
||||
Pvm: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ Keneltä: <#from/><#newLine/>
|
|||
<#hasCc>Kopio: <#cc/></#hasCc><#hasNewsGroups>Uutisryhmät: <#newsgroups/></#hasNewsGroups><#hasReferences>Viitteet: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -31,9 +31,12 @@
|
|||
NSString *field;
|
||||
NSString *currentValue;
|
||||
BOOL htmlComposition;
|
||||
NSString *signaturePlacement;
|
||||
}
|
||||
|
||||
- (void) setSourceMail: (SOGoMailObject *) newSourceMail;
|
||||
- (void) setSignaturePlacement: (NSString *) newPlacement;
|
||||
- (BOOL) signaturePlacementOnTop;
|
||||
|
||||
@end
|
||||
|
||||
|
|
|
@ -56,6 +56,16 @@
|
|||
[super dealloc];
|
||||
}
|
||||
|
||||
- (void) setSignaturePlacement: (NSString *) newPlacement
|
||||
{
|
||||
signaturePlacement = newPlacement;
|
||||
}
|
||||
|
||||
- (BOOL) signaturePlacementOnTop
|
||||
{
|
||||
return [signaturePlacement isEqual: @"above"];
|
||||
}
|
||||
|
||||
- (void) setSourceMail: (SOGoMailObject *) newSourceMail
|
||||
{
|
||||
ASSIGN (sourceMail, newSourceMail);
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Message original --------<#newLine/>
|
||||
Sujet: <#subject/><#newLine/>
|
||||
Date: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ De: <#from/><#newLine/>
|
|||
<#hasCc>Copie: <#cc/></#hasCc><#hasNewsGroups>Forums de discussion: <#newsgroups/></#hasNewsGroups><#hasReferences>Références: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Original-Nachricht --------<#newLine/>
|
||||
Betreff: <#subject/><#newLine/>
|
||||
Datum: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ Von: <#from/><#newLine/>
|
|||
<#hasCc>Kopie: <#cc/></#hasCc><#hasNewsGroups>Newsgroup: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenzen: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Eredeti üzenet --------<#newLine/>
|
||||
Tárgy: <#subject/><#newLine/>
|
||||
Dátum: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ Feladó: <#from/><#newLine/>
|
|||
<#hasCc>Másolat: <#cc/></#hasCc><#hasNewsGroups>Hírcsoportok: <#newsgroups/></#hasNewsGroups><#hasReferences>Hivatkozások: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Upprunalegt bréf --------<#newLine/>
|
||||
Efni: <#subject/><#newLine/>
|
||||
Dags: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ Frá: <#from/><#newLine/>
|
|||
<#hasCc>Afrit: <#cc/></#hasCc><#hasNewsGroups>Fréttahópar: <#newsgroups/></#hasNewsGroups><#hasReferences>Tilvísanir: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Messaggio originale --------<#newLine/>
|
||||
Oggetto: <#subject/><#newLine/>
|
||||
Data: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ Da: <#from/><#newLine/>
|
|||
<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>Riferimento: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Originalpost --------<#newLine/>
|
||||
Emne: <#subject/><#newLine/>
|
||||
Dato: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ Fra: <#from/><#newLine/>
|
|||
<#hasCc>Kopi: <#cc/></#hasCc><#hasNewsGroups>Nyhetsgrupper: <#newsgroups/></#hasNewsGroups><#hasReferences>Referanser: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Originalpost --------<#newLine/>
|
||||
Emne: <#subject/><#newLine/>
|
||||
Dato: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ Fra: <#from/><#newLine/>
|
|||
<#hasCc>Kopi: <#cc/></#hasCc><#hasNewsGroups>Nyhetsgrupper: <#newsgroups/></#hasNewsGroups><#hasReferences>Referanser: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -256,16 +256,17 @@
|
|||
//
|
||||
- (NSString *) contentForInlineForward
|
||||
{
|
||||
SOGoUserDefaults *ud;
|
||||
SOGoUserDefaults *userDefaults;
|
||||
NSString *pageName;
|
||||
SOGoMailForward *page;
|
||||
|
||||
ud = [[context activeUser] userDefaults];
|
||||
userDefaults = [[context activeUser] userDefaults];
|
||||
pageName = [NSString stringWithFormat: @"SOGoMail%@Forward",
|
||||
[ud language]];
|
||||
[userDefaults language]];
|
||||
page = [[WOApplication application] pageWithName: pageName
|
||||
inContext: context];
|
||||
[page setSourceMail: self];
|
||||
[page setSignaturePlacement: [userDefaults mailSignaturePlacement]];
|
||||
|
||||
return [[page generateResponse] contentAsString];
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Oryginalna wiadomość --------<#newLine/>
|
||||
Temat: <#subject/><#newLine/>
|
||||
Data: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ Od: <#from/><#newLine/>
|
|||
<#hasCc>DW: <#cc/></#hasCc><#hasNewsGroups>Grupy dyskusyjne: <#newsgroups/></#hasNewsGroups><#hasReferences>Odniesienia: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -29,15 +29,12 @@
|
|||
{
|
||||
BOOL outlookMode;
|
||||
NSString *replyPlacement;
|
||||
NSString *signaturePlacement;
|
||||
}
|
||||
|
||||
- (void) setOutlookMode: (BOOL) newOutlookMode;
|
||||
- (BOOL) outlookMode;
|
||||
- (void) setReplyPlacement: (NSString *) newPlacement;
|
||||
- (BOOL) replyPlacementOnTop;
|
||||
- (void) setSignaturePlacement: (NSString *) newPlacement;
|
||||
- (BOOL) signaturePlacementOnTop;
|
||||
- (NSString *) messageBody;
|
||||
|
||||
@end
|
||||
|
|
|
@ -60,16 +60,6 @@
|
|||
return [replyPlacement isEqual: @"above"];
|
||||
}
|
||||
|
||||
- (void) setSignaturePlacement: (NSString *) newPlacement
|
||||
{
|
||||
signaturePlacement = newPlacement;
|
||||
}
|
||||
|
||||
- (BOOL) signaturePlacementOnTop
|
||||
{
|
||||
return [signaturePlacement isEqual: @"above"];
|
||||
}
|
||||
|
||||
- (NSString *) messageBody
|
||||
{
|
||||
NSString *s, *msgid;
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Original Message --------<#newLine/>
|
||||
Subject: <#subject/><#newLine/>
|
||||
Date: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ From: <#from/><#newLine/>
|
|||
<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Newsgroups: <#newsgroups/></#hasNewsGroups><#hasReferences>References: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,10 +1,16 @@
|
|||
-------- Pôvodná správa --------
|
||||
Predmet: <#subject/>
|
||||
Dátum: <#date/>
|
||||
Od: <#from/>
|
||||
<#hasReplyTo>Odpoveď na: <#replyTo/></#hasReplyTo><#hasOrganization>Organizácia: <#organization/></#hasOrganization>Komu: <#to/>
|
||||
<#hasCc>Kópia: <#cc/></#hasCc><#hasNewsGroups>Diskusné skupiny: <#newsgroups/></#hasNewsGroups><#hasReferences>Odkazy: <#references/></#hasReferences>
|
||||
|
||||
<#messageBody/>
|
||||
|
||||
<#signature/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Pôvodná správa --------<#newLine/>
|
||||
Predmet: <#subject/><#newLine/>
|
||||
Dátum: <#date/><#newLine/>
|
||||
Od: <#from/><#newLine/>
|
||||
<#hasReplyTo>Odpoveď na: <#replyTo/></#hasReplyTo><#hasOrganization>Organizácia: <#organization/></#hasOrganization>Komu: <#to/><#newLine/>
|
||||
<#hasCc>Kópia: <#cc/></#hasCc><#hasNewsGroups>Diskusné skupiny: <#newsgroups/></#hasNewsGroups><#hasReferences>Odkazy: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Mensaje Original --------<#newLine/>
|
||||
Asunto: <#subject/><#newLine/>
|
||||
Fecha: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ De: <#from/><#newLine/>
|
|||
<#hasCc>Cc: <#cc/></#hasCc><#hasNewsGroups>Grupo Noticias: <#newsgroups/></#hasNewsGroups><#hasReferences>Referencias: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Mensaje Original --------<#newLine/>
|
||||
Asunto: <#subject/><#newLine/>
|
||||
Fecha: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ De: <#from/><#newLine/>
|
|||
<#hasCc>Cc: <#cc/></#hasCc><#hasNewsGroups>Grupo Noticias: <#newsgroups/></#hasNewsGroups><#hasReferences>Referencias: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Originalmeddelande --------<#newLine/>
|
||||
Ämne: <#subject/><#newLine/>
|
||||
Datum: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ Från: <#from/><#newLine/>
|
|||
<#hasCc>Kopia: <#cc/></#hasCc><#hasNewsGroups>Nyhetsgrupper: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenser: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Початкове повідомлення --------<#newLine/>
|
||||
Тема: <#subject/><#newLine/>
|
||||
Дата: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@
|
|||
<#hasCc>Копія: <#cc/></#hasCc><#hasNewsGroups>Групи новин: <#newsgroups/></#hasNewsGroups><#hasReferences>Посилання: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#newLine/>
|
||||
<#signaturePlacementOnTop><#newLine/>
|
||||
<#signature/><#newLine/></#signaturePlacementOnTop>
|
||||
-------- Original Message --------<#newLine/>
|
||||
Testun: <#subject/><#newLine/>
|
||||
Dyddiad: <#date/><#newLine/>
|
||||
|
@ -9,5 +10,7 @@ Oddi wrth: <#from/><#newLine/>
|
|||
<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/></#hasNewsGroups><#hasReferences>Cyfeirnodau: <#references/></#hasReferences><#newLine/>
|
||||
<#newLine/>
|
||||
<#messageBody/><#newLine/>
|
||||
<#signaturePlacementOnBottom><#newLine/>
|
||||
<#newLine/>
|
||||
<#signature/></#signaturePlacementOnBottom>
|
||||
<#newLine/>
|
||||
<#signature/><#newLine/>
|
||||
|
|
|
@ -77,3 +77,12 @@ signature: WOString {
|
|||
value = signature;
|
||||
escapeHTML = NO;
|
||||
}
|
||||
|
||||
signaturePlacementOnTop: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
}
|
||||
|
||||
signaturePlacementOnBottom: WOConditional {
|
||||
condition = signaturePlacementOnTop;
|
||||
negate = YES;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue