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, 21 insertions, 0 deletions

diff --git a/src/management/general.hpp b/src/management/general.hpp
new file mode 100644
index 0000000..ed1a789
--- /dev/null
+++ b/src/management/general.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <unordered_map>
+#include <string>
+#include <list>
+
+namespace smtp::manage
+{
+    using SettingsFileDataType = std::unordered_map<std::string, std::string>;
+    using MailsSet = std::list<std::string>;
+
+    struct SettingsFields
+    {
+        bool is_need_auth;
+        bool is_need_ssl;
+        std::string username;
+        std::string password;
+        std::string host;
+        std::string port;
+    };
+}