i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Major coding style cleanup.

Browse Source
This commit is contained in:
Axel Dörfler
2015-01-06 15:23:33 +01:00
parent 81ec973846
commit 4a8448ce34
2 changed files with 322 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/mail/MailMessage.h
+103 -72
View File
@@ -1,20 +1,27 @@
#ifndef ZOIDBERG_MAIL_MESSAGE_H /*
#define ZOIDBERG_MAIL_MESSAGE_H * Copyright 2007-2012, Haiku Inc. All Rights Reserved.
/* Message - the main general purpose mail message class * Copyright 2001, Dr. Zoidberg Enterprises. All rights reserved.
** *
** Copyright 2001 Dr. Zoidberg Enterprises. All rights reserved. * Distributed under the terms of the MIT License.
*/ */
#ifndef _MAIL_MESSAGE_H_
#define _MAIL_MESSAGE_H_
//! The main general purpose mail message class
#include <MailContainer.h> #include <MailContainer.h>
// add our additional attributes // add our additional attributes
#define B_MAIL_ATTR_ACCOUNT "MAIL:account" #define B_MAIL_ATTR_ACCOUNT "MAIL:account"
#define B_MAIL_ATTR_THREAD "MAIL:thread" #define B_MAIL_ATTR_THREAD "MAIL:thread"
class BDirectory; class BDirectory;
class BEntry;
enum mail_reply_to_mode { enum mail_reply_to_mode {
B_MAIL_REPLY_TO = 0, B_MAIL_REPLY_TO = 0,
@@ -22,91 +29,115 @@ enum mail_reply_to_mode {
B_MAIL_REPLY_TO_SENDER B_MAIL_REPLY_TO_SENDER
}; };
class BEmailMessage : public BMailContainer { class BEmailMessage : public BMailContainer {
public: public:
BEmailMessage(BPositionIO *mail_file = NULL, bool own = false, uint32 defaultCharSet = B_MAIL_NULL_CONVERSION); BEmailMessage(BPositionIO* stream = NULL,
BEmailMessage(const entry_ref *ref, bool ownStream = false,
uint32 defaultCharSet = B_MAIL_NULL_CONVERSION); uint32 defaultCharSet
virtual ~BEmailMessage(); = B_MAIL_NULL_CONVERSION);
BEmailMessage(const entry_ref* ref,
uint32 defaultCharSet
= B_MAIL_NULL_CONVERSION);
virtual ~BEmailMessage();
status_t InitCheck() const; status_t InitCheck() const;
BPositionIO *Data() const { return fData; } BPositionIO* Data() const { return fData; }
// is only set if the message owns the data // is only set if the message owns the data
BEmailMessage *ReplyMessage(mail_reply_to_mode replyTo, bool accountFromMail, const char *quote_style = "> "); BEmailMessage* ReplyMessage(mail_reply_to_mode replyTo,
BEmailMessage *ForwardMessage(bool accountFromMail, bool includeAttachments = false); bool accountFromMail,
// These return messages with the body quoted and const char* quoteStyle = "> ");
// ready to send via the appropriate channel. ReplyMessage() BEmailMessage* ForwardMessage(bool accountFromMail,
// addresses the message appropriately, but ForwardMessage() bool includeAttachments = false);
// leaves it unaddressed. // These return messages with the body quoted and
// ready to send via the appropriate channel. ReplyMessage()
// addresses the message appropriately, but ForwardMessage()
// leaves it unaddressed.
const char *To(); const char* To();
const char *From(); const char* From();
const char *ReplyTo(); const char* ReplyTo();
const char *CC(); const char* CC();
const char *Subject(); const char* Subject();
const char *Date(); const char* Date();
int Priority(); int Priority();
void SetSubject(const char *to, uint32 charset = B_MAIL_NULL_CONVERSION, mail_encoding encoding = null_encoding); void SetSubject(const char* to,
void SetReplyTo(const char *to, uint32 charset = B_MAIL_NULL_CONVERSION, mail_encoding encoding = null_encoding); uint32 charset = B_MAIL_NULL_CONVERSION,
void SetFrom(const char *to, uint32 charset = B_MAIL_NULL_CONVERSION, mail_encoding encoding = null_encoding); mail_encoding encoding = null_encoding);
void SetTo(const char *to, uint32 charset = B_MAIL_NULL_CONVERSION, mail_encoding encoding = null_encoding); void SetReplyTo(const char* to,
void SetCC(const char *to, uint32 charset = B_MAIL_NULL_CONVERSION, mail_encoding encoding = null_encoding); uint32 charset = B_MAIL_NULL_CONVERSION,
void SetBCC(const char *to); mail_encoding encoding = null_encoding);
void SetPriority(int to); void SetFrom(const char* to,
uint32 charset = B_MAIL_NULL_CONVERSION,
mail_encoding encoding = null_encoding);
void SetTo(const char* to,
uint32 charset = B_MAIL_NULL_CONVERSION,
mail_encoding encoding = null_encoding);
void SetCC(const char* to,
uint32 charset = B_MAIL_NULL_CONVERSION,
mail_encoding encoding = null_encoding);
void SetBCC(const char* to);
void SetPriority(int to);
status_t GetName(char *name,int32 maxLength) const; status_t GetName(char* name, int32 maxLength) const;
status_t GetName(BString *name) const; status_t GetName(BString* name) const;
void SendViaAccountFrom(BEmailMessage *message); void SendViaAccountFrom(BEmailMessage* message);
void SendViaAccount(const char *account_name); void SendViaAccount(const char* accountName);
void SendViaAccount(int32 account); void SendViaAccount(int32 account);
int32 Account() const; int32 Account() const;
status_t GetAccountName(BString& accountName) const; status_t GetAccountName(BString& accountName) const;
virtual status_t AddComponent(BMailComponent *component); virtual status_t AddComponent(BMailComponent *component);
virtual status_t RemoveComponent(BMailComponent *component); virtual status_t RemoveComponent(BMailComponent *component);
virtual status_t RemoveComponent(int32 index); virtual status_t RemoveComponent(int32 index);
virtual BMailComponent *GetComponent(int32 index, bool parse_now = false); virtual BMailComponent* GetComponent(int32 index,
virtual int32 CountComponents() const; bool parseNow = false);
virtual int32 CountComponents() const;
void Attach(entry_ref *ref, bool include_attributes = true); void Attach(entry_ref* ref,
bool IsComponentAttachment(int32 index); bool includeAttributes = true);
bool IsComponentAttachment(int32 index);
void SetBodyTextTo(const char *text); void SetBodyTextTo(const char* text);
const char *BodyText(); const char* BodyText();
status_t SetBody(BTextMailComponent *body); status_t SetBody(BTextMailComponent* body);
BTextMailComponent *Body(); BTextMailComponent* Body();
virtual status_t SetToRFC822(BPositionIO *data, size_t length, bool parse_now = false); virtual status_t SetToRFC822(BPositionIO* data, size_t length,
virtual status_t RenderToRFC822(BPositionIO *render_to); bool parseNow = false);
virtual status_t RenderToRFC822(BPositionIO* renderTo);
status_t RenderTo(BDirectory *dir, BEntry *message = NULL); status_t RenderTo(BDirectory* dir,
//---message will be set to the message file if not equal to NULL BEntry* message = NULL);
// Message will be set to the message file if not equal to NULL
status_t Send(bool send_now); status_t Send(bool sendNow);
private: private:
BTextMailComponent *RetrieveTextBody(BMailComponent *); BTextMailComponent* _RetrieveTextBody(BMailComponent* component);
virtual void _ReservedMessage1(); virtual void _ReservedMessage1();
virtual void _ReservedMessage2(); virtual void _ReservedMessage2();
virtual void _ReservedMessage3(); virtual void _ReservedMessage3();
BPositionIO *fData; private:
BPositionIO* fData;
status_t _status; status_t fStatus;
int32 _account_id; int32 fAccountID;
char *_bcc; char* fBCC;
int32 _num_components; int32 fComponentCount;
BMailComponent *_body; BMailComponent* fBody;
BTextMailComponent *_text_body; BTextMailComponent* fTextBody;
uint32 _reserved[5]; uint32 _reserved[5];
}; };
#endif /* ZOIDBERG_MAIL_MESSAGE_H */
#endif // _MAIL_MESSAGE_H_
src/kits/mail/MailMessage.cpp
+219 -219
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2007-2012, Haiku Inc. All Rights Reserved. * Copyright 2007-2015, Haiku Inc. All Rights Reserved.
* Copyright 2001-2004 Dr. Zoidberg Enterprises. All rights reserved. * Copyright 2001-2004 Dr. Zoidberg Enterprises. All rights reserved.
* *
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
@@ -9,33 +9,37 @@
//! The main general purpose mail message class //! The main general purpose mail message class
#include <List.h> #include <MailMessage.h>
#include <String.h>
#include <Directory.h>
#include <File.h>
#include <E-mail.h>
#include <Entry.h>
#include <FindDirectory.h>
#include <netdb.h>
#include <NodeInfo.h>
#include <Messenger.h>
#include <Path.h>
#include <ctype.h> #include <ctype.h>
#include <parsedate.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <strings.h> #include <string.h>
#include <sys/utsname.h> #include <sys/utsname.h>
#include <MailMessage.h> #include <parsedate.h>
#include <Directory.h>
#include <E-mail.h>
#include <Entry.h>
#include <File.h>
#include <FindDirectory.h>
#include <List.h>
#include <MailAttachment.h> #include <MailAttachment.h>
#include <MailSettings.h>
#include <MailDaemon.h> #include <MailDaemon.h>
#include <mail_util.h> #include <MailSettings.h>
#include <Messenger.h>
#include <netdb.h>
#include <NodeInfo.h>
#include <Path.h>
#include <String.h>
#include <StringList.h> #include <StringList.h>
#include <MailPrivate.h> #include <MailPrivate.h>
#include <mail_util.h>
using namespace BPrivate;
//-------Change the following!---------------------- //-------Change the following!----------------------
@@ -43,51 +47,51 @@
#define mime_warning "This is a multipart message in MIME format." #define mime_warning "This is a multipart message in MIME format."
BEmailMessage::BEmailMessage(BPositionIO *file, bool own, uint32 defaultCharSet) BEmailMessage::BEmailMessage(BPositionIO* file, bool own, uint32 defaultCharSet)
: :
BMailContainer (defaultCharSet), BMailContainer(defaultCharSet),
fData(NULL), fData(NULL),
_status(B_NO_ERROR), fStatus(B_NO_ERROR),
_bcc(NULL), fBCC(NULL),
_num_components(0), fComponentCount(0),
_body(NULL), fBody(NULL),
_text_body(NULL) fTextBody(NULL)
{ {
BMailSettings settings; BMailSettings settings;
_account_id = settings.DefaultOutboundAccount(); fAccountID = settings.DefaultOutboundAccount();
if (own) if (own)
fData = file; fData = file;
if (file != NULL) if (file != NULL)
SetToRFC822(file,-1); SetToRFC822(file, ~0L);
} }
BEmailMessage::BEmailMessage(const entry_ref *ref, uint32 defaultCharSet) BEmailMessage::BEmailMessage(const entry_ref* ref, uint32 defaultCharSet)
: :
BMailContainer(defaultCharSet), BMailContainer(defaultCharSet),
_bcc(NULL), fBCC(NULL),
_num_components(0), fComponentCount(0),
_body(NULL), fBody(NULL),
_text_body(NULL) fTextBody(NULL)
{ {
BMailSettings settings; BMailSettings settings;
_account_id = settings.DefaultOutboundAccount(); fAccountID = settings.DefaultOutboundAccount();
fData = new BFile(); fData = new BFile();
_status = static_cast<BFile *>(fData)->SetTo(ref,B_READ_ONLY); fStatus = static_cast<BFile*>(fData)->SetTo(ref, B_READ_ONLY);
if (_status == B_OK) if (fStatus == B_OK)
SetToRFC822(fData,-1); SetToRFC822(fData, ~0L);
} }
BEmailMessage::~BEmailMessage() BEmailMessage::~BEmailMessage()
{ {
free(_bcc); free(fBCC);
delete _body; delete fBody;
delete fData; delete fData;
} }
@@ -95,15 +99,15 @@ BEmailMessage::~BEmailMessage()
status_t status_t
BEmailMessage::InitCheck() const BEmailMessage::InitCheck() const
{ {
return _status; return fStatus;
} }
BEmailMessage * BEmailMessage*
BEmailMessage::ReplyMessage(mail_reply_to_mode replyTo, bool accountFromMail, BEmailMessage::ReplyMessage(mail_reply_to_mode replyTo, bool accountFromMail,
const char *quoteStyle) const char* quoteStyle)
{ {
BEmailMessage *reply = new BEmailMessage; BEmailMessage* reply = new BEmailMessage;
// Set ReplyTo: // Set ReplyTo:
@@ -118,16 +122,17 @@ BEmailMessage::ReplyMessage(mail_reply_to_mode replyTo, bool accountFromMail,
BMailAccounts accounts; BMailAccounts accounts;
BMailAccountSettings* account = accounts.AccountByID(Account()); BMailAccountSettings* account = accounts.AccountByID(Account());
BString sender; BString sender;
if (account) if (account != NULL)
sender = account->ReturnAddress(); sender = account->ReturnAddress();
extract_address(sender); extract_address(sender);
BString cc; BString cc;
for (int32 i = list.CountItems(); i-- > 0;) { for (int32 i = list.CountItems(); i-- > 0;) {
char *address = (char *)list.RemoveItem((int32)0); char* address = (char*)list.RemoveItem((int32)0);
// add everything which is not the sender and not already in the list // Add everything which is not the sender and not already in the
// list
if (sender.ICompare(address) && cc.FindFirst(address) < 0) { if (sender.ICompare(address) && cc.FindFirst(address) < 0) {
if (cc.Length() > 0) if (cc.Length() > 0)
cc << ", "; cc << ", ";
@@ -146,7 +151,7 @@ BEmailMessage::ReplyMessage(mail_reply_to_mode replyTo, bool accountFromMail,
reply->SetTo(ReplyTo()); reply->SetTo(ReplyTo());
// Set special "In-Reply-To:" header (used for threading) // Set special "In-Reply-To:" header (used for threading)
const char *messageID = _body ? _body->HeaderField("Message-Id") : NULL; const char* messageID = fBody ? fBody->HeaderField("Message-Id") : NULL;
if (messageID != NULL) if (messageID != NULL)
reply->SetHeaderField("In-Reply-To", messageID); reply->SetHeaderField("In-Reply-To", messageID);
@@ -169,7 +174,7 @@ BEmailMessage::ReplyMessage(mail_reply_to_mode replyTo, bool accountFromMail,
} }
BEmailMessage * BEmailMessage*
BEmailMessage::ForwardMessage(bool accountFromMail, bool includeAttachments) BEmailMessage::ForwardMessage(bool accountFromMail, bool includeAttachments)
{ {
BString header = "------ Forwarded Message: ------\n"; BString header = "------ Forwarded Message: ------\n";
@@ -181,8 +186,8 @@ BEmailMessage::ForwardMessage(bool accountFromMail, bool includeAttachments)
} }
header << "Subject: " << Subject() << '\n'; header << "Subject: " << Subject() << '\n';
header << "Date: " << Date() << "\n\n"; header << "Date: " << Date() << "\n\n";
if (_text_body != NULL) if (fTextBody != NULL)
header << _text_body->Text() << '\n'; header << fTextBody->Text() << '\n';
BEmailMessage *message = new BEmailMessage(); BEmailMessage *message = new BEmailMessage();
message->SetBodyTextTo(header.String()); message->SetBodyTextTo(header.String());
@@ -196,8 +201,8 @@ BEmailMessage::ForwardMessage(bool accountFromMail, bool includeAttachments)
if (includeAttachments) { if (includeAttachments) {
for (int32 i = 0; i < CountComponents(); i++) { for (int32 i = 0; i < CountComponents(); i++) {
BMailComponent *cmpt = GetComponent(i); BMailComponent* component = GetComponent(i);
if (cmpt == _text_body || cmpt == NULL) if (component == fTextBody || component == NULL)
continue; continue;
//---I am ashamed to have the written the code between here and the next comment //---I am ashamed to have the written the code between here and the next comment
@@ -206,8 +211,8 @@ BEmailMessage::ForwardMessage(bool accountFromMail, bool includeAttachments)
// or something like that // or something like that
BMallocIO io; BMallocIO io;
cmpt->RenderToRFC822(&io); component->RenderToRFC822(&io);
BMailComponent *clone = cmpt->WhatIsThis(); BMailComponent* clone = component->WhatIsThis();
io.Seek(0, SEEK_SET); io.Seek(0, SEEK_SET);
clone->SetToRFC822(&io, io.BufferLength(), true); clone->SetToRFC822(&io, io.BufferLength(), true);
message->AddComponent(clone); message->AddComponent(clone);
@@ -220,28 +225,28 @@ BEmailMessage::ForwardMessage(bool accountFromMail, bool includeAttachments)
} }
const char * const char*
BEmailMessage::To() BEmailMessage::To()
{ {
return HeaderField("To"); return HeaderField("To");
} }
const char * const char*
BEmailMessage::From() BEmailMessage::From()
{ {
return HeaderField("From"); return HeaderField("From");
} }
const char * const char*
BEmailMessage::ReplyTo() BEmailMessage::ReplyTo()
{ {
return HeaderField("Reply-To"); return HeaderField("Reply-To");
} }
const char * const char*
BEmailMessage::CC() BEmailMessage::CC()
{ {
return HeaderField("Cc"); return HeaderField("Cc");
@@ -249,14 +254,14 @@ BEmailMessage::CC()
} }
const char * const char*
BEmailMessage::Subject() BEmailMessage::Subject()
{ {
return HeaderField("Subject"); return HeaderField("Subject");
} }
const char * const char*
BEmailMessage::Date() BEmailMessage::Date()
{ {
return HeaderField("Date"); return HeaderField("Date");
@@ -267,7 +272,7 @@ int
BEmailMessage::Priority() BEmailMessage::Priority()
{ {
int priorityNumber; int priorityNumber;
const char *priorityString; const char* priorityString;
/* The usual values are a number from 1 to 5, or one of three words: /* The usual values are a number from 1 to 5, or one of three words:
X-Priority: 1 and/or X-MSMail-Priority: High X-Priority: 1 and/or X-MSMail-Priority: High
@@ -301,7 +306,7 @@ BEmailMessage::Priority()
void void
BEmailMessage::SetSubject(const char *subject, uint32 charset, BEmailMessage::SetSubject(const char* subject, uint32 charset,
mail_encoding encoding) mail_encoding encoding)
{ {
SetHeaderField("Subject", subject, charset, encoding); SetHeaderField("Subject", subject, charset, encoding);
@@ -309,29 +314,29 @@ BEmailMessage::SetSubject(const char *subject, uint32 charset,
void void
BEmailMessage::SetReplyTo(const char *reply_to, uint32 charset, BEmailMessage::SetReplyTo(const char* replyTo, uint32 charset,
mail_encoding encoding) mail_encoding encoding)
{ {
SetHeaderField("Reply-To", reply_to, charset, encoding); SetHeaderField("Reply-To", replyTo, charset, encoding);
} }
void void
BEmailMessage::SetFrom(const char *from, uint32 charset, mail_encoding encoding) BEmailMessage::SetFrom(const char* from, uint32 charset, mail_encoding encoding)
{ {
SetHeaderField("From", from, charset, encoding); SetHeaderField("From", from, charset, encoding);
} }
void void
BEmailMessage::SetTo(const char *to, uint32 charset, mail_encoding encoding) BEmailMessage::SetTo(const char* to, uint32 charset, mail_encoding encoding)
{ {
SetHeaderField("To", to, charset, encoding); SetHeaderField("To", to, charset, encoding);
} }
void void
BEmailMessage::SetCC(const char *cc, uint32 charset, mail_encoding encoding) BEmailMessage::SetCC(const char* cc, uint32 charset, mail_encoding encoding)
{ {
// For consistency with our header names, use Cc as the name. // For consistency with our header names, use Cc as the name.
SetHeaderField("Cc", cc, charset, encoding); SetHeaderField("Cc", cc, charset, encoding);
@@ -339,17 +344,17 @@ BEmailMessage::SetCC(const char *cc, uint32 charset, mail_encoding encoding)
void void
BEmailMessage::SetBCC(const char *bcc) BEmailMessage::SetBCC(const char* bcc)
{ {
free(_bcc); free(fBCC);
_bcc = strdup(bcc); fBCC = strdup(bcc);
} }
void void
BEmailMessage::SetPriority(int to) BEmailMessage::SetPriority(int to)
{ {
char tempString [20]; char tempString[20];
if (to < 1) if (to < 1)
to = 1; to = 1;
@@ -371,12 +376,12 @@ BEmailMessage::SetPriority(int to)
status_t status_t
BEmailMessage::GetName(char *name, int32 maxLength) const BEmailMessage::GetName(char* name, int32 maxLength) const
{ {
if (name == NULL || maxLength <= 0) if (name == NULL || maxLength <= 0)
return B_BAD_VALUE; return B_BAD_VALUE;
if (BFile *file = dynamic_cast<BFile *>(fData)) { if (BFile* file = dynamic_cast<BFile*>(fData)) {
status_t status = file->ReadAttr(B_MAIL_ATTR_NAME, B_STRING_TYPE, 0, status_t status = file->ReadAttr(B_MAIL_ATTR_NAME, B_STRING_TYPE, 0,
name, maxLength); name, maxLength);
name[maxLength - 1] = '\0'; name[maxLength - 1] = '\0';
@@ -390,10 +395,10 @@ BEmailMessage::GetName(char *name, int32 maxLength) const
status_t status_t
BEmailMessage::GetName(BString *name) const BEmailMessage::GetName(BString* name) const
{ {
char *buffer = name->LockBuffer(B_FILE_NAME_LENGTH); char* buffer = name->LockBuffer(B_FILE_NAME_LENGTH);
status_t status = GetName(buffer,B_FILE_NAME_LENGTH); status_t status = GetName(buffer, B_FILE_NAME_LENGTH);
name->UnlockBuffer(); name->UnlockBuffer();
return status; return status;
@@ -401,7 +406,7 @@ BEmailMessage::GetName(BString *name) const
void void
BEmailMessage::SendViaAccountFrom(BEmailMessage *message) BEmailMessage::SendViaAccountFrom(BEmailMessage* message)
{ {
BString name; BString name;
if (message->GetAccountName(name) < B_OK) { if (message->GetAccountName(name) < B_OK) {
@@ -414,23 +419,22 @@ BEmailMessage::SendViaAccountFrom(BEmailMessage *message)
void void
BEmailMessage::SendViaAccount(const char *account_name) BEmailMessage::SendViaAccount(const char* accountName)
{ {
BMailAccounts accounts; BMailAccounts accounts;
BMailAccountSettings* account = accounts.AccountByName(account_name); BMailAccountSettings* account = accounts.AccountByName(accountName);
if (!account) if (account != NULL)
return; SendViaAccount(account->AccountID());
SendViaAccount(account->AccountID());
} }
void void
BEmailMessage::SendViaAccount(int32 account) BEmailMessage::SendViaAccount(int32 account)
{ {
_account_id = account; fAccountID = account;
BMailAccounts accounts; BMailAccounts accounts;
BMailAccountSettings* accountSettings = accounts.AccountByID(_account_id); BMailAccountSettings* accountSettings = accounts.AccountByID(fAccountID);
BString from; BString from;
if (accountSettings) { if (accountSettings) {
@@ -444,26 +448,26 @@ BEmailMessage::SendViaAccount(int32 account)
int32 int32
BEmailMessage::Account() const BEmailMessage::Account() const
{ {
return _account_id; return fAccountID;
} }
status_t status_t
BEmailMessage::GetAccountName(BString& accountName) const BEmailMessage::GetAccountName(BString& accountName) const
{ {
BFile *file = dynamic_cast<BFile *>(fData); BFile* file = dynamic_cast<BFile*>(fData);
if (file == NULL) if (file == NULL)
return B_ERROR; return B_ERROR;
int32 accountId; int32 accountID;
size_t read = file->ReadAttr(B_MAIL_ATTR_ACCOUNT, B_INT32_TYPE, 0, size_t read = file->ReadAttr(B_MAIL_ATTR_ACCOUNT, B_INT32_TYPE, 0,
&accountId, sizeof(int32)); &accountID, sizeof(int32));
if (read < sizeof(int32)) if (read < sizeof(int32))
return B_ERROR; return B_ERROR;
BMailAccounts accounts; BMailAccounts accounts;
BMailAccountSettings* account = accounts.AccountByID(accountId); BMailAccountSettings* account = accounts.AccountByID(accountID);
if (account) if (account != NULL)
accountName = account->Name(); accountName = account->Name();
else else
accountName = ""; accountName = "";
@@ -473,23 +477,23 @@ BEmailMessage::GetAccountName(BString& accountName) const
status_t status_t
BEmailMessage::AddComponent(BMailComponent *component) BEmailMessage::AddComponent(BMailComponent* component)
{ {
status_t status = B_OK; status_t status = B_OK;
if (_num_components == 0) if (fComponentCount == 0)
_body = component; fBody = component;
else if (_num_components == 1) { else if (fComponentCount == 1) {
BMIMEMultipartMailContainer *container BMIMEMultipartMailContainer *container
= new BMIMEMultipartMailContainer( = new BMIMEMultipartMailContainer(
mime_boundary, mime_warning, _charSetForTextDecoding); mime_boundary, mime_warning, _charSetForTextDecoding);
status = container->AddComponent(_body); status = container->AddComponent(fBody);
if (status == B_OK) if (status == B_OK)
status = container->AddComponent(component); status = container->AddComponent(component);
_body = container; fBody = container;
} else { } else {
BMIMEMultipartMailContainer *container BMIMEMultipartMailContainer* container
= dynamic_cast<BMIMEMultipartMailContainer *>(_body); = dynamic_cast<BMIMEMultipartMailContainer*>(fBody);
if (container == NULL) if (container == NULL)
return B_MISMATCHED_VALUES; return B_MISMATCHED_VALUES;
@@ -497,13 +501,13 @@ BEmailMessage::AddComponent(BMailComponent *component)
} }
if (status == B_OK) if (status == B_OK)
_num_components++; fComponentCount++;
return status; return status;
} }
status_t status_t
BEmailMessage::RemoveComponent(BMailComponent */*component*/) BEmailMessage::RemoveComponent(BMailComponent* /*component*/)
{ {
// not yet implemented // not yet implemented
// BeMail/Enclosures.cpp:169: contains a warning about this fact // BeMail/Enclosures.cpp:169: contains a warning about this fact
@@ -519,15 +523,15 @@ BEmailMessage::RemoveComponent(int32 /*index*/)
} }
BMailComponent * BMailComponent*
BEmailMessage::GetComponent(int32 i, bool parseNow) BEmailMessage::GetComponent(int32 i, bool parseNow)
{ {
if (BMIMEMultipartMailContainer *container if (BMIMEMultipartMailContainer* container
= dynamic_cast<BMIMEMultipartMailContainer *>(_body)) = dynamic_cast<BMIMEMultipartMailContainer*>(fBody))
return container->GetComponent(i, parseNow); return container->GetComponent(i, parseNow);
if (i < _num_components) if (i < fComponentCount)
return _body; return fBody;
return NULL; return NULL;
} }
@@ -536,98 +540,97 @@ BEmailMessage::GetComponent(int32 i, bool parseNow)
int32 int32
BEmailMessage::CountComponents() const BEmailMessage::CountComponents() const
{ {
return _num_components; return fComponentCount;
} }
void void
BEmailMessage::Attach(entry_ref *ref, bool includeAttributes) BEmailMessage::Attach(entry_ref* ref, bool includeAttributes)
{ {
if (includeAttributes) AddComponent(includeAttributes
AddComponent(new BAttributedMailAttachment(ref)); ? new BAttributedMailAttachment(ref) : new BSimpleMailAttachment(ref));
else
AddComponent(new BSimpleMailAttachment(ref));
} }
bool bool
BEmailMessage::IsComponentAttachment(int32 i) BEmailMessage::IsComponentAttachment(int32 i)
{ {
if ((i >= _num_components) || (_num_components == 0)) if ((i >= fComponentCount) || (fComponentCount == 0))
return false; return false;
if (_num_components == 1) if (fComponentCount == 1)
return _body->IsAttachment(); return fBody->IsAttachment();
BMIMEMultipartMailContainer *container BMIMEMultipartMailContainer* container
= dynamic_cast<BMIMEMultipartMailContainer *>(_body); = dynamic_cast<BMIMEMultipartMailContainer*>(fBody);
if (container == NULL) if (container == NULL)
return false; return false;
BMailComponent *component = container->GetComponent(i); BMailComponent* component = container->GetComponent(i);
if (component == NULL) if (component == NULL)
return false; return false;
return component->IsAttachment(); return component->IsAttachment();
} }
void void
BEmailMessage::SetBodyTextTo(const char *text) BEmailMessage::SetBodyTextTo(const char* text)
{ {
if (_text_body == NULL) { if (fTextBody == NULL) {
_text_body = new BTextMailComponent; fTextBody = new BTextMailComponent;
AddComponent(_text_body); AddComponent(fTextBody);
} }
_text_body->SetText(text); fTextBody->SetText(text);
} }
BTextMailComponent * BTextMailComponent*
BEmailMessage::Body() BEmailMessage::Body()
{ {
if (_text_body == NULL) if (fTextBody == NULL)
_text_body = RetrieveTextBody(_body); fTextBody = _RetrieveTextBody(fBody);
return _text_body; return fTextBody;
} }
const char * const char*
BEmailMessage::BodyText() BEmailMessage::BodyText()
{ {
if (Body() == NULL) if (Body() == NULL)
return NULL; return NULL;
return _text_body->Text(); return fTextBody->Text();
} }
status_t status_t
BEmailMessage::SetBody(BTextMailComponent *body) BEmailMessage::SetBody(BTextMailComponent* body)
{ {
if (_text_body != NULL) { if (fTextBody != NULL) {
return B_ERROR; return B_ERROR;
// removing doesn't exist for now // removing doesn't exist for now
// RemoveComponent(_text_body); // RemoveComponent(fTextBody);
// delete _text_body; // delete fTextBody;
} }
_text_body = body; fTextBody = body;
AddComponent(_text_body); AddComponent(fTextBody);
return B_OK; return B_OK;
} }
BTextMailComponent * BTextMailComponent*
BEmailMessage::RetrieveTextBody(BMailComponent *component) BEmailMessage::_RetrieveTextBody(BMailComponent* component)
{ {
BTextMailComponent *body = dynamic_cast<BTextMailComponent *>(component); BTextMailComponent* body = dynamic_cast<BTextMailComponent*>(component);
if (body != NULL) if (body != NULL)
return body; return body;
BMIMEMultipartMailContainer *container BMIMEMultipartMailContainer* container
= dynamic_cast<BMIMEMultipartMailContainer *>(component); = dynamic_cast<BMIMEMultipartMailContainer*>(component);
if (container != NULL) { if (container != NULL) {
for (int32 i = 0; i < container->CountComponents(); i++) { for (int32 i = 0; i < container->CountComponents(); i++) {
if ((component = container->GetComponent(i)) == NULL) if ((component = container->GetComponent(i)) == NULL)
@@ -637,14 +640,14 @@ BEmailMessage::RetrieveTextBody(BMailComponent *component)
case B_MAIL_PLAIN_TEXT_BODY: case B_MAIL_PLAIN_TEXT_BODY:
// AttributedAttachment returns the MIME type of its // AttributedAttachment returns the MIME type of its
// contents, so we have to use dynamic_cast here // contents, so we have to use dynamic_cast here
body = dynamic_cast<BTextMailComponent *>( body = dynamic_cast<BTextMailComponent*>(
container->GetComponent(i)); container->GetComponent(i));
if (body != NULL) if (body != NULL)
return body; return body;
break; break;
case B_MAIL_MULTIPART_CONTAINER: case B_MAIL_MULTIPART_CONTAINER:
body = RetrieveTextBody(container->GetComponent(i)); body = _RetrieveTextBody(container->GetComponent(i));
if (body != NULL) if (body != NULL)
return body; return body;
break; break;
@@ -656,81 +659,81 @@ BEmailMessage::RetrieveTextBody(BMailComponent *component)
status_t status_t
BEmailMessage::SetToRFC822(BPositionIO *mail_file, size_t length, BEmailMessage::SetToRFC822(BPositionIO* mailFile, size_t length,
bool parse_now) bool parseNow)
{ {
if (BFile *file = dynamic_cast<BFile *>(mail_file)) { if (BFile* file = dynamic_cast<BFile*>(mailFile)) {
file->ReadAttr(B_MAIL_ATTR_ACCOUNT_ID, B_INT32_TYPE, 0, &_account_id, file->ReadAttr(B_MAIL_ATTR_ACCOUNT_ID, B_INT32_TYPE, 0, &fAccountID,
sizeof(_account_id)); sizeof(fAccountID));
} }
mail_file->Seek(0,SEEK_END); mailFile->Seek(0, SEEK_END);
length = mail_file->Position(); length = mailFile->Position();
mail_file->Seek(0,SEEK_SET); mailFile->Seek(0, SEEK_SET);
_status = BMailComponent::SetToRFC822(mail_file,length,parse_now); fStatus = BMailComponent::SetToRFC822(mailFile, length, parseNow);
if (_status < B_OK) if (fStatus < B_OK)
return _status; return fStatus;
_body = WhatIsThis(); fBody = WhatIsThis();
mail_file->Seek(0,SEEK_SET); mailFile->Seek(0, SEEK_SET);
_status = _body->SetToRFC822(mail_file,length,parse_now); fStatus = fBody->SetToRFC822(mailFile, length, parseNow);
if (_status < B_OK) if (fStatus < B_OK)
return _status; return fStatus;
//------------Move headers that we use to us, everything else to _body // Move headers that we use to us, everything else to fBody
const char *name; const char* name;
for (int32 i = 0; (name = _body->HeaderAt(i)) != NULL; i++) { for (int32 i = 0; (name = fBody->HeaderAt(i)) != NULL; i++) {
if (strcasecmp(name,"Subject") != 0 if (strcasecmp(name, "Subject") != 0
&& strcasecmp(name,"To") != 0 && strcasecmp(name, "To") != 0
&& strcasecmp(name,"From") != 0 && strcasecmp(name, "From") != 0
&& strcasecmp(name,"Reply-To") != 0 && strcasecmp(name, "Reply-To") != 0
&& strcasecmp(name,"Cc") != 0 && strcasecmp(name, "Cc") != 0
&& strcasecmp(name,"Priority") != 0 && strcasecmp(name, "Priority") != 0
&& strcasecmp(name,"X-Priority") != 0 && strcasecmp(name, "X-Priority") != 0
&& strcasecmp(name,"X-Msmail-Priority") != 0 && strcasecmp(name, "X-Msmail-Priority") != 0
&& strcasecmp(name,"Date") != 0) { && strcasecmp(name, "Date") != 0) {
RemoveHeader(name); RemoveHeader(name);
} }
} }
_body->RemoveHeader("Subject"); fBody->RemoveHeader("Subject");
_body->RemoveHeader("To"); fBody->RemoveHeader("To");
_body->RemoveHeader("From"); fBody->RemoveHeader("From");
_body->RemoveHeader("Reply-To"); fBody->RemoveHeader("Reply-To");
_body->RemoveHeader("Cc"); fBody->RemoveHeader("Cc");
_body->RemoveHeader("Priority"); fBody->RemoveHeader("Priority");
_body->RemoveHeader("X-Priority"); fBody->RemoveHeader("X-Priority");
_body->RemoveHeader("X-Msmail-Priority"); fBody->RemoveHeader("X-Msmail-Priority");
_body->RemoveHeader("Date"); fBody->RemoveHeader("Date");
_num_components = 1; fComponentCount = 1;
if (BMIMEMultipartMailContainer *container if (BMIMEMultipartMailContainer* container
= dynamic_cast<BMIMEMultipartMailContainer *>(_body)) = dynamic_cast<BMIMEMultipartMailContainer*>(fBody))
_num_components = container->CountComponents(); fComponentCount = container->CountComponents();
return B_OK; return B_OK;
} }
status_t status_t
BEmailMessage::RenderToRFC822(BPositionIO *file) BEmailMessage::RenderToRFC822(BPositionIO* file)
{ {
if (_body == NULL) if (fBody == NULL)
return B_MAIL_INVALID_MAIL; return B_MAIL_INVALID_MAIL;
// Do real rendering // Do real rendering
if (From() == NULL) { if (From() == NULL) {
// set the "From:" string // set the "From:" string
SendViaAccount(_account_id); SendViaAccount(fAccountID);
} }
BList recipientList; BList recipientList;
get_address_list(recipientList, To(), extract_address); get_address_list(recipientList, To(), extract_address);
get_address_list(recipientList, CC(), extract_address); get_address_list(recipientList, CC(), extract_address);
get_address_list(recipientList, _bcc, extract_address); get_address_list(recipientList, fBCC, extract_address);
BString recipients; BString recipients;
for (int32 i = recipientList.CountItems(); i-- > 0;) { for (int32 i = recipientList.CountItems(); i-- > 0;) {
@@ -785,7 +788,7 @@ BEmailMessage::RenderToRFC822(BPositionIO *file)
file->Seek(-2, SEEK_CUR); file->Seek(-2, SEEK_CUR);
// Remove division between headers // Remove division between headers
err = _body->RenderToRFC822(file); err = fBody->RenderToRFC822(file);
if (err < B_OK) if (err < B_OK)
return err; return err;
@@ -794,7 +797,7 @@ BEmailMessage::RenderToRFC822(BPositionIO *file)
// (since the daemon may send it when it sees the status attribute getting // (since the daemon may send it when it sees the status attribute getting
// set to "Pending"). // set to "Pending").
if (BFile *attributed = dynamic_cast <BFile *>(file)) { if (BFile* attributed = dynamic_cast <BFile*>(file)) {
BNodeInfo(attributed).SetType(B_MAIL_TYPE); BNodeInfo(attributed).SetType(B_MAIL_TYPE);
attributed->WriteAttrString(B_MAIL_ATTR_RECIPIENTS,&recipients); attributed->WriteAttrString(B_MAIL_ATTR_RECIPIENTS,&recipients);
@@ -802,19 +805,19 @@ BEmailMessage::RenderToRFC822(BPositionIO *file)
BString attr; BString attr;
attr = To(); attr = To();
attributed->WriteAttrString(B_MAIL_ATTR_TO,&attr); attributed->WriteAttrString(B_MAIL_ATTR_TO, &attr);
attr = CC(); attr = CC();
attributed->WriteAttrString(B_MAIL_ATTR_CC,&attr); attributed->WriteAttrString(B_MAIL_ATTR_CC, &attr);
attr = Subject(); attr = Subject();
attributed->WriteAttrString(B_MAIL_ATTR_SUBJECT,&attr); attributed->WriteAttrString(B_MAIL_ATTR_SUBJECT, &attr);
attr = ReplyTo(); attr = ReplyTo();
attributed->WriteAttrString(B_MAIL_ATTR_REPLY,&attr); attributed->WriteAttrString(B_MAIL_ATTR_REPLY, &attr);
attr = From(); attr = From();
attributed->WriteAttrString(B_MAIL_ATTR_FROM,&attr); attributed->WriteAttrString(B_MAIL_ATTR_FROM, &attr);
if (Priority() != 3 /* Normal is 3 */) { if (Priority() != 3 /* Normal is 3 */) {
sprintf (attr.LockBuffer (40), "%d", Priority()); sprintf(attr.LockBuffer(40), "%d", Priority());
attr.UnlockBuffer(-1); attr.UnlockBuffer(-1);
attributed->WriteAttrString(B_MAIL_ATTR_PRIORITY,&attr); attributed->WriteAttrString(B_MAIL_ATTR_PRIORITY, &attr);
} }
attr = "Pending"; attr = "Pending";
attributed->WriteAttrString(B_MAIL_ATTR_STATUS, &attr); attributed->WriteAttrString(B_MAIL_ATTR_STATUS, &attr);
@@ -822,7 +825,7 @@ BEmailMessage::RenderToRFC822(BPositionIO *file)
attributed->WriteAttrString(B_MAIL_ATTR_MIME, &attr); attributed->WriteAttrString(B_MAIL_ATTR_MIME, &attr);
attributed->WriteAttr(B_MAIL_ATTR_ACCOUNT, B_INT32_TYPE, 0, attributed->WriteAttr(B_MAIL_ATTR_ACCOUNT, B_INT32_TYPE, 0,
&_account_id, sizeof(int32)); &fAccountID, sizeof(int32));
attributed->WriteAttr(B_MAIL_ATTR_WHEN, B_TIME_TYPE, 0, &creationTime, attributed->WriteAttr(B_MAIL_ATTR_WHEN, B_TIME_TYPE, 0, &creationTime,
sizeof(int32)); sizeof(int32));
@@ -831,7 +834,7 @@ BEmailMessage::RenderToRFC822(BPositionIO *file)
sizeof(int32)); sizeof(int32));
attributed->WriteAttr(B_MAIL_ATTR_ACCOUNT_ID, B_INT32_TYPE, 0, attributed->WriteAttr(B_MAIL_ATTR_ACCOUNT_ID, B_INT32_TYPE, 0,
&_account_id, sizeof(int32)); &fAccountID, sizeof(int32));
} }
return B_OK; return B_OK;
@@ -839,10 +842,10 @@ BEmailMessage::RenderToRFC822(BPositionIO *file)
status_t status_t
BEmailMessage::RenderTo(BDirectory *dir, BEntry *msg) BEmailMessage::RenderTo(BDirectory* dir, BEntry* msg)
{ {
time_t currentTime; time_t currentTime;
char numericDateString [40]; char numericDateString[40];
struct tm timeFields; struct tm timeFields;
BString worker; BString worker;
@@ -851,11 +854,14 @@ BEmailMessage::RenderTo(BDirectory *dir, BEntry *msg)
// incoming messages. // incoming messages.
BString name = Subject(); BString name = Subject();
SubjectToThread (name); // Extract the core subject words. SubjectToThread(name);
// Extract the core subject words.
if (name.Length() <= 0) if (name.Length() <= 0)
name = "No Subject"; name = "No Subject";
if (name[0] == '.') if (name[0] == '.') {
name.Prepend ("_"); // Avoid hidden files, starting with a dot. // Avoid hidden files, starting with a dot.
name.Prepend("_");
}
// Convert the date into a year-month-day fixed digit width format, so that // Convert the date into a year-month-day fixed digit width format, so that
// sorting by file name will give all the messages with the same subject in // sorting by file name will give all the messages with the same subject in
@@ -863,12 +869,8 @@ BEmailMessage::RenderTo(BDirectory *dir, BEntry *msg)
time (&currentTime); time (&currentTime);
localtime_r (&currentTime, &timeFields); localtime_r (&currentTime, &timeFields);
sprintf (numericDateString, "%04d%02d%02d%02d%02d%02d", sprintf (numericDateString, "%04d%02d%02d%02d%02d%02d",
timeFields.tm_year + 1900, timeFields.tm_year + 1900, timeFields.tm_mon + 1, timeFields.tm_mday,
timeFields.tm_mon + 1, timeFields.tm_hour, timeFields.tm_min, timeFields.tm_sec);
timeFields.tm_mday,
timeFields.tm_hour,
timeFields.tm_min,
timeFields.tm_sec);
name << " " << numericDateString; name << " " << numericDateString;
worker = From(); worker = From();
@@ -884,8 +886,10 @@ BEmailMessage::RenderTo(BDirectory *dir, BEntry *msg)
name.ReplaceAll('!','_'); name.ReplaceAll('!','_');
name.ReplaceAll('<','_'); name.ReplaceAll('<','_');
name.ReplaceAll('>','_'); name.ReplaceAll('>','_');
while (name.FindFirst(" ") >= 0) // Remove multiple spaces.
name.Replace(" " /* Old */, " " /* New */, 1024 /* Count */); // Remove multiple spaces.
while (name.FindFirst(" ") >= 0)
name.Replace(" ", " ", 1024);
int32 uniquer = time(NULL); int32 uniquer = time(NULL);
worker = name; worker = name;
@@ -905,7 +909,7 @@ BEmailMessage::RenderTo(BDirectory *dir, BEntry *msg)
BFile file; BFile file;
status_t status = dir->CreateFile(worker.String(), &file); status_t status = dir->CreateFile(worker.String(), &file);
if (status < B_OK) if (status != B_OK)
return status; return status;
if (msg != NULL) if (msg != NULL)
@@ -919,8 +923,8 @@ status_t
BEmailMessage::Send(bool sendNow) BEmailMessage::Send(bool sendNow)
{ {
BMailAccounts accounts; BMailAccounts accounts;
BMailAccountSettings* account = accounts.AccountByID(_account_id); BMailAccountSettings* account = accounts.AccountByID(fAccountID);
if (!account || !account->HasOutbound()) { if (account == NULL || !account->HasOutbound()) {
account = accounts.AccountByID( account = accounts.AccountByID(
BMailSettings().DefaultOutboundAccount()); BMailSettings().DefaultOutboundAccount());
if (!account) if (!account)
@@ -945,20 +949,16 @@ BEmailMessage::Send(bool sendNow)
status_t status = RenderTo(&directory, &message); status_t status = RenderTo(&directory, &message);
if (status >= B_OK && sendNow) { if (status >= B_OK && sendNow) {
BMailSettings settings_file; // TODO: check whether or not the internet connection is available
if (settings_file.SendOnlyIfPPPUp()) {
// TODO!
}
BMessenger daemon(B_MAIL_DAEMON_SIGNATURE); BMessenger daemon(B_MAIL_DAEMON_SIGNATURE);
if (!daemon.IsValid()) if (!daemon.IsValid())
return B_MAIL_NO_DAEMON; return B_MAIL_NO_DAEMON;
BMessage msg('msnd'); BMessage msg(kMsgSendMessages);
msg.AddInt32("account",_account_id); msg.AddInt32("account", fAccountID);
BPath path; BPath path;
message.GetPath(&path); message.GetPath(&path);
msg.AddString("message_path",path.Path()); msg.AddString("message_path", path.Path());
daemon.SendMessage(&msg); daemon.SendMessage(&msg);
} }