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

1 files changed, 25 insertions, 26 deletions

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 );
+    };
 }