Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-09-17 17:00:27 +02:00
Code Issues Projects Releases Wiki Activity

2020-11-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Implemented support for multi-byte UTF-8 characters for the
	display-name component of e-mail addresses in 'RDSendMail()'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2020-11-19 11:37:22 -05:00
parent 365a302c96
commit aba286e097
9 changed files with 128 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -20603,3 +20603,6 @@
* Incremented the package version to 3.4.1int6.
2020-11-18 Fred Gleason <fredg@paravelsystems.com>
* Added an 'RDSendMail()' function in 'lib/rdsendmail.[cpp|h]'.
2020-11-18 Fred Gleason <fredg@paravelsystems.com>
* Implemented support for multi-byte UTF-8 characters for the
display-name component of e-mail addresses in 'RDSendMail()'.

16
lib/librd_cs.ts
View File

@ -849,14 +849,6 @@
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You must supply a &quot;from&quot; address</source>
<translation type="unfinished"></translation>
@ -877,6 +869,14 @@
<source>ok</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

16
lib/librd_de.ts
View File

@ -845,14 +845,6 @@
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You must supply a &quot;from&quot; address</source>
<translation type="unfinished"></translation>
@ -873,6 +865,14 @@
<source>ok</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

16
lib/librd_es.ts
View File

@ -845,14 +845,6 @@
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You must supply a &quot;from&quot; address</source>
<translation type="unfinished"></translation>
@ -873,6 +865,14 @@
<source>ok</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

16
lib/librd_fr.ts
View File

@ -815,14 +815,6 @@
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You must supply a &quot;from&quot; address</source>
<translation type="unfinished"></translation>
@ -843,6 +835,14 @@
<source>ok</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

16
lib/librd_nb.ts
View File

@ -845,14 +845,6 @@
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You must supply a &quot;from&quot; address</source>
<translation type="unfinished"></translation>
@ -873,6 +865,14 @@
<source>ok</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

16
lib/librd_nn.ts
View File

@ -845,14 +845,6 @@
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You must supply a &quot;from&quot; address</source>
<translation type="unfinished"></translation>
@ -873,6 +865,14 @@
<source>ok</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

16
lib/librd_pt_BR.ts
View File

@ -845,14 +845,6 @@
<source>[none]</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>You must supply a &quot;from&quot; address</source>
<translation type="unfinished"></translation>
@ -873,6 +865,14 @@
<source>ok</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>address</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>is invalid</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>RDAddCart</name>

85
lib/rdsendmail.cpp
View File

@ -65,6 +65,51 @@ QByteArray __RDSendMail_EncodeHeader(const QString &str)
return QByteArray("=?utf-8?B?")+str.toUtf8().toBase64()+"?=";
}
QByteArray __RDSendMail_EncodeAddress(const QString &str,bool *ok)
{
//
// See RFC5322 Section 3.4 for these formats
//
int start=0;
int end=0;
QString addr;
QString name;
addr=str;
if(str.contains("<")&&str.contains(">")) {
start=str.indexOf("<");
end=str.indexOf(">");
if(start<end) {
addr=str.mid(start+1,end-start-1).trimmed();
name=str.left(start).trimmed();
}
}
if(str.contains("(")&&str.contains(")")) {
start=str.indexOf("(");
end=str.indexOf(")");
if(start<end) {
name=str.mid(start+1,end-start-1).trimmed();
addr=str;
addr=addr.remove("("+name+")").trimmed();
}
}
if(!RDUser::emailIsValid(addr)) {
*ok=false;
return QByteArray();
}
*ok=true;
//
// Output in "display-name <local@domain>" format
//
if(name.isEmpty()) {
return addr.toAscii();
}
return __RDSendMail_EncodeHeader(name)+" <"+addr.toAscii()+">";
}
//
// This implements a basic email sending capability using the system's
// sendmail(1) interface.
@ -76,6 +121,11 @@ bool RDSendMail(QString *err_msg,const QString &subject,const QString &body,
QStringList args;
QProcess *proc=NULL;
QString msg="";
QByteArray from_addr_enc;
QList<QByteArray> to_addrs_enc;
QList<QByteArray> cc_addrs_enc;
QList<QByteArray> bcc_addrs_enc;
bool ok=false;
*err_msg="";
@ -86,29 +136,34 @@ bool RDSendMail(QString *err_msg,const QString &subject,const QString &body,
*err_msg+=QObject::tr("You must supply a \"from\" address")+"\n";
}
else {
if(!RDUser::emailIsValid(from_addr)) {
from_addr_enc=__RDSendMail_EncodeAddress(from_addr,&ok);
if(!ok) {
*err_msg+=QObject::tr("address")+" \""+from_addr+"\" "+
QObject::tr("is invalid")+"\n";
}
}
for(int i=0;i<to_addrs.size();i++) {
if(!RDUser::emailIsValid(to_addrs.at(i))) {
to_addrs_enc.push_back(__RDSendMail_EncodeAddress(to_addrs.at(i),&ok));
if(!ok) {
*err_msg+=QObject::tr("address")+" \""+to_addrs.at(i)+"\" "+
QObject::tr("is invalid")+"\n";
}
}
for(int i=0;i<cc_addrs.size();i++) {
if(!RDUser::emailIsValid(cc_addrs.at(i))) {
cc_addrs_enc.push_back(__RDSendMail_EncodeAddress(cc_addrs.at(i),&ok));
if(!ok) {
*err_msg+=QObject::tr("address")+" \""+cc_addrs.at(i)+"\" "+
QObject::tr("is invalid")+"\n";
}
}
for(int i=0;i<bcc_addrs.size();i++) {
if(!RDUser::emailIsValid(bcc_addrs.at(i))) {
bcc_addrs_enc.push_back(__RDSendMail_EncodeAddress(bcc_addrs.at(i),&ok));
if(!ok) {
*err_msg+=QObject::tr("address")+" \""+bcc_addrs.at(i)+"\" "+
QObject::tr("is invalid")+"\n";
}
}
if(!err_msg->isEmpty()) {
return false;
}
@ -120,33 +175,31 @@ bool RDSendMail(QString *err_msg,const QString &subject,const QString &body,
QString encoding;
QByteArray raw=__RDSendMail_EncodeBody(&charset,&encoding,body);
msg+="From: "+from_addr+"\r\n";
msg+="From: "+from_addr_enc+"\r\n";
// msg+="Content-Type: text/plain;charset=utf-8\r\n";
// msg+="Content-Transfer-Encoding: base64\r\n";
msg+="Content-Type: text/plain"+charset+"\r\n";
msg+=encoding;
if(to_addrs.size()>0) {
if(to_addrs_enc.size()>0) {
msg+="To: ";
for(int i=0;i<to_addrs.size();i++) {
msg+=to_addrs.at(i)+", ";
for(int i=0;i<to_addrs_enc.size();i++) {
msg+=to_addrs_enc.at(i)+", ";
}
msg=msg.left(msg.length()-2);
msg+="\r\n";
}
if(cc_addrs.size()>0) {
if(cc_addrs_enc.size()>0) {
msg+="Cc: ";
for(int i=0;i<cc_addrs.size();i++) {
msg+=cc_addrs.at(i)+", ";
for(int i=0;i<cc_addrs_enc.size();i++) {
msg+=cc_addrs_enc.at(i)+", ";
}
msg=msg.left(msg.length()-2);
msg+="\r\n";
}
if(bcc_addrs.size()>0) {
if(bcc_addrs_enc.size()>0) {
msg+="Bcc: ";
for(int i=0;i<bcc_addrs.size();i++) {
msg+=bcc_addrs.at(i)+", ";
for(int i=0;i<bcc_addrs_enc.size();i++) {
msg+=bcc_addrs_enc.at(i)+", ";
}
msg=msg.left(msg.length()-2);
msg+="\r\n";