diff options
author | claiff <claiff@mail.ru> | 2022-09-21 16:05:06 +0300 |
---|---|---|
committer | claiff <claiff@mail.ru> | 2022-09-21 16:05:06 +0300 |
commit | ee8c175e9eae4faccdf913578fb30d09c200204f (patch) | |
tree | c2244021130919d5360d130fd3b38954a096687b /src/message | |
parent | a282ae6418c85db1aae5a2823dd37d56e56e5249 (diff) | |
parent | 641c95dcf8c6585caaa6e79d4bec9b53fd666369 (diff) | |
download | obmc-sila-smtp-ee8c175e9eae4faccdf913578fb30d09c200204f.tar.xz |
Merge branch 'master' into feature/logger
# Conflicts:
# CMakeLists.txt
# src/file/mail.cpp
# src/file/settings.cpp
# src/management/logger.cpp
# src/management/logger.hpp
# src/message/sender.cpp
# src/message/sender.hpp
Diffstat (limited to 'src/message')
-rw-r--r-- | src/message/builder/cc.hpp | 2 | ||||
-rw-r--r-- | src/message/builder/mail_to.hpp | 2 | ||||
-rw-r--r-- | src/message/sender.hpp | 51 |
3 files changed, 27 insertions, 28 deletions
diff --git a/src/message/builder/cc.hpp b/src/message/builder/cc.hpp index dbca4b7..9eee0a7 100644 --- a/src/message/builder/cc.hpp +++ b/src/message/builder/cc.hpp @@ -2,7 +2,7 @@ #include "types/idecorator.hpp" #include "types/imessage_builder.hpp" -#include "managment/general.hpp" +#include "management/general.hpp" namespace smtp::message::builder { diff --git a/src/message/builder/mail_to.hpp b/src/message/builder/mail_to.hpp index 1c21684..626f210 100644 --- a/src/message/builder/mail_to.hpp +++ b/src/message/builder/mail_to.hpp @@ -2,7 +2,7 @@ #include "types/idecorator.hpp" #include "types/imessage_builder.hpp" -#include "managment/general.hpp" +#include "management/general.hpp" namespace smtp::message::builder { diff --git a/src/message/sender.hpp b/src/message/sender.hpp index d19e209..ba5953e 100644 --- a/src/message/sender.hpp +++ b/src/message/sender.hpp @@ -5,34 +5,33 @@ #include <curl/curl.h> -#include "managment/settings.hpp" -#include "managment/mail.hpp" - +#include "management/settings.hpp" +#include "management/mail.hpp" namespace smtp::message { - struct WriteThis - { - int counter; - }; - - class Sender - { - public: - Sender( manage::Settings& settings_storage, manage::Mail const& mail_to ); - ~Sender() = default; - - bool Send( std::string const& mail_from, std::string const& subject, std::string const& text ); - private: - void UpdateMailText( std::string const& mail_from, std::string const& subject, std::string const& textt ) const; - void FillRecipients( CURL* curl, curl_slist* recipients ); - std::string GetHostPortData() const; - static size_t ReadCallBack( void* ptr, size_t size, size_t nmemb, void* userp ); - - manage::Settings& mSettingsStorage; - manage::Mail const& mMailTo; - - bool InitCurl( CURL* curl, WriteThis const& upload_ctx, std::string const& mail_from ); - }; + struct WriteThis + { + int counter; + }; + + class Sender + { + public: + Sender( manage::Settings& settings_storage, manage::Mail const& mail_to ); + ~Sender() = default; + + bool Send( std::string const& mail_from, std::string const& subject, std::string const& text ); + private: + void UpdateMailText( std::string const& mail_from, std::string const& subject, std::string const& textt ) const; + void FillRecipients(CURL* curl, curl_slist* recipients ); + std::string GetHostPortData() const; + static size_t ReadCallBack( void *ptr, size_t size, size_t nmemb, void *userp ); + + manage::Settings& mSettingsStorage; + manage::Mail const& mMailTo; + + bool InitCurl( CURL* curl, WriteThis const& upload_ctx, std::string const& mail_from ); + }; } |