| mailer.h | mailer.h | |||
|---|---|---|---|---|
| skipping to change at line 92 | skipping to change at line 92 | |||
| // remove an attachment from the list of attachments. | // remove an attachment from the list of attachments. | |||
| // returns false if !filename.length() or | // returns false if !filename.length() or | |||
| // the file is not attached or there are no attachments. | // the file is not attached or there are no attachments. | |||
| bool removeattachment(const std::string& filename); | bool removeattachment(const std::string& filename); | |||
| // Set a new message (replacing the old) | // Set a new message (replacing the old) | |||
| // will return false and not change the message if newmessage is emp ty. | // will return false and not change the message if newmessage is emp ty. | |||
| bool setmessage(const std::string& newmessage); | bool setmessage(const std::string& newmessage); | |||
| bool setmessage(const std::vector<char>& newmessage); | bool setmessage(const std::vector<char>& newmessage); | |||
| // Set a new HTML message (replacing the old) | ||||
| // will return false and not change the message if newmessage is emp | ||||
| ty. | ||||
| bool setmessageHTML(const std::string& newmessage); | ||||
| bool setmessageHTML(const std::vector<char>& newmessage); | ||||
| // use a file for the data | ||||
| bool setmessageHTMLfile(const std::string& filename); | ||||
| // Set a new Subject for the mail (replacing the old) | // Set a new Subject for the mail (replacing the old) | |||
| // will return false if newSubject is empty. | // will return false if newSubject is empty. | |||
| bool setsubject(const std::string& newSubject); | bool setsubject(const std::string& newSubject); | |||
| // sets the nameserver or smtp server to connect to | // sets the nameserver or smtp server to connect to | |||
| // dependant on the constructor call, i.e. whether | // dependant on the constructor call, i.e. whether | |||
| // 'lookupMXRecord' was set to false or true. | // 'lookupMXRecord' was set to false or true. | |||
| // (see constructor comment for details) | // (see constructor comment for details) | |||
| bool setserver(const std::string& nameserver_or_smtpserver); | bool setserver(const std::string& nameserver_or_smtpserver); | |||
| skipping to change at line 214 | skipping to change at line 221 | |||
| Address parseaddress(const std::string& addresstoparse); | Address parseaddress(const std::string& addresstoparse); | |||
| // The addresses to send the mail to | // The addresses to send the mail to | |||
| std::vector<std::pair<Address, short> > recipients; | std::vector<std::pair<Address, short> > recipients; | |||
| // The address the mail is from. | // The address the mail is from. | |||
| Address fromAddress; | Address fromAddress; | |||
| // Subject of the mail | // Subject of the mail | |||
| std::string subject; | std::string subject; | |||
| // The contents of the mail message | // The contents of the mail message | |||
| std::vector<char> message; | std::vector<char> message; | |||
| // The contents of the mail message in html format. | ||||
| std::vector<char> messageHTML; | ||||
| // attachments: the file as a stream of char's and the name of the f ile. | // attachments: the file as a stream of char's and the name of the f ile. | |||
| std::vector<std::pair<std::vector<char>, std::string> > attachments; | std::vector<std::pair<std::vector<char>, std::string> > attachments; | |||
| // This will be filled in from the toAddress by getserveraddress | // This will be filled in from the toAddress by getserveraddress | |||
| std::string server; | std::string server; | |||
| // Name of a nameserver to query | // Name of a nameserver to query | |||
| std::string nameserver; | std::string nameserver; | |||
| // The port to mail to on the smtp server. | // The port to mail to on the smtp server. | |||
| const unsigned short port; | const unsigned short port; | |||
| // use dns to query for MX records | // use dns to query for MX records | |||
| const bool lookupMXRecord; | const bool lookupMXRecord; | |||
| End of changes. 2 change blocks. | ||||
| 0 lines changed or deleted | 10 lines changed or added | |||