SendSS: Reworking settings (#1144)

CloudFile: fix upload service
Db_autobackups: fix build

14 files changed, 94 insertions, 62 deletions

diff --git a/plugins/SendScreenshotPlus/src/CSend.h b/plugins/SendScreenshotPlus/src/CSend.h
index c3f34054bc..534a96e7cc 100644
--- a/plugins/SendScreenshotPlus/src/CSend.h
+++ b/plugins/SendScreenshotPlus/src/CSend.h
@@ -55,7 +55,7 @@ class CSend {
 		CSend(HWND Owner, MCONTACT hContact, bool bAsync, bool bSilent=false); // oder (TfrmMain & Owner)
 		virtual ~CSend();
 
-		virtual int Send() = NULL; // returns 1 if sent (you must delete class) and 0 when still sending (class deletes itself)
+		virtual int Send() = 0; // returns 1 if sent (you must delete class) and 0 when still sending (class deletes itself)
 		int SendSilent() {m_bAsync=m_bSilent=true; return Send();};
 		
 		void SetFile(const wchar_t* file) { replaceStrW(m_pszFile, file); }
diff --git a/plugins/SendScreenshotPlus/src/CSendDropbox.h b/plugins/SendScreenshotPlus/src/CSendCloduFile.h
index cdf2c281f2..d638823789 100644
--- a/plugins/SendScreenshotPlus/src/CSendDropbox.h
+++ b/plugins/SendScreenshotPlus/src/CSendCloduFile.h
@@ -31,16 +31,18 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #include "Utils.h"
 
-class CSendDropbox : public CSend
+class CSendCloudFile : public CSend
 {
 
 public:
-	CSendDropbox(HWND Owner, MCONTACT hContact, bool bAsync);
-	~CSendDropbox();
+	CSendCloudFile(HWND Owner, MCONTACT hContact, bool bAsync, const char *service);
+	~CSendCloudFile();
 
-	int Send();
+	int Send() override;
 
 protected:
+	const char *m_service;
+
 	void SendThread();
 	static void SendThreadWrapper(void *Obj);
 	static int OnDropAck(void*, WPARAM, LPARAM);
diff --git a/plugins/SendScreenshotPlus/src/CSendDropbox.cpp b/plugins/SendScreenshotPlus/src/CSendCloudFile.cpp
index e22e12d326..bb061e3c2c 100644
--- a/plugins/SendScreenshotPlus/src/CSendDropbox.cpp
+++ b/plugins/SendScreenshotPlus/src/CSendCloudFile.cpp
@@ -30,47 +30,56 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-CSendDropbox::CSendDropbox(HWND Owner, MCONTACT hContact, bool bAsync)
-	: CSend(Owner, hContact, bAsync)
+CSendCloudFile::CSendCloudFile(HWND Owner, MCONTACT hContact, bool bAsync, const char *service)
+	: CSend(Owner, hContact, bAsync), m_service(service)
 {
 	/// @todo : re-enable SS_DLG_DELETEAFTERSSEND with full implemention of Dropbox upload with progress, msg and sounds
 	m_EnableItem = SS_DLG_DESCRIPTION | SS_DLG_AUTOSEND | SS_DLG_DELETEAFTERSSEND;
-	m_pszSendTyp = TranslateT("Dropbox transfer");
+	m_pszSendTyp = TranslateT("CloudFile transfer");
 }
 
-CSendDropbox::~CSendDropbox()
+CSendCloudFile::~CSendCloudFile()
 {
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-int CSendDropbox::Send()
+int CSendCloudFile::Send()
 {
-	mir_forkthread(&CSendDropbox::SendThreadWrapper, this);
+	mir_forkthread(&CSendCloudFile::SendThreadWrapper, this);
 	return 0;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-void CSendDropbox::SendThread()
+void CSendCloudFile::SendThread()
 {
 	/// @todo : SS_DLG_DESCRIPTION and SS_DLG_DELETEAFTERSSEND are of no use as of now since we don't track upload progress
 
-	DropboxUploadInfo ui = { m_pszFile, L"SendSS" };
+	CFUPLOADDATA ud = { m_service, m_pszFile, L"SendSS" };
+	CFUPLOADRESULT ur = { };
 
-	if (CallService(MS_DROPBOX_UPLOAD, (WPARAM)&m_URL, (LPARAM)&ui))
+	if (CallService(MS_CLOUDFILE_UPLOAD, (WPARAM)&ud, (LPARAM)&ur))
 	{
-		Error(LPGENW("%s (%i):\nCould not add a share to the Dropbox plugin."), TranslateW(m_pszSendTyp), 0);
+		Error(LPGENW("%s (%i):\nCould not add a share to the CloudFile plugin."), TranslateW(m_pszSendTyp), 0);
 		Exit(ACKRESULT_FAILED); return;
 	}
 
+	CMStringA message;
+	for (size_t i = 0; i < ur.linkCount; i++)
+		message.AppendFormat("%s\r\n", ur.links[i]);
+	message.Delete(message.GetLength() - 2, 2);
+
+	m_URL = mir_strdup(message.GetString());
 	if (m_URL)
 		svcSendMsgExit(m_URL);
 	else
 		Exit(ACKRESULT_FAILED);
+
+	cfur_free(&ur);
 }
 
-void CSendDropbox::SendThreadWrapper(void * Obj)
+void CSendCloudFile::SendThreadWrapper(void * Obj)
 {
-	reinterpret_cast<CSendDropbox*>(Obj)->SendThread();
+	reinterpret_cast<CSendCloudFile*>(Obj)->SendThread();
 }
diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.h b/plugins/SendScreenshotPlus/src/CSendEmail.h
index 072f51c7ed..cb0740fe4f 100644
--- a/plugins/SendScreenshotPlus/src/CSendEmail.h
+++ b/plugins/SendScreenshotPlus/src/CSendEmail.h
@@ -37,7 +37,7 @@ public:
 	CSendEmail(HWND Owner, MCONTACT hContact, bool bAsync);
 	~CSendEmail();
 
-	int Send();
+	int Send() override;
 
 protected:
 	char* m_pszFileA;
diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.h b/plugins/SendScreenshotPlus/src/CSendFTPFile.h
index 8700114ee5..7de5c77999 100644
--- a/plugins/SendScreenshotPlus/src/CSendFTPFile.h
+++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.h
@@ -37,7 +37,7 @@ public:
 	CSendFTPFile(HWND Owner, MCONTACT hContact, bool bAsync);
 	~CSendFTPFile();
 
-	int Send();
+	int Send() override;
 
 protected:
 	char*					m_pszFileName;
diff --git a/plugins/SendScreenshotPlus/src/CSendFile.h b/plugins/SendScreenshotPlus/src/CSendFile.h
index ef8f56fef8..39f3565279 100644
--- a/plugins/SendScreenshotPlus/src/CSendFile.h
+++ b/plugins/SendScreenshotPlus/src/CSendFile.h
@@ -37,7 +37,7 @@ public:
 	CSendFile(HWND Owner, MCONTACT hContact, bool bAsync);
 	~CSendFile();
 
-	int Send();
+	int Send() override;
 };
 
 #endif
diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.h b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h
index af22f31048..7bb88ff279 100644
--- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.h
+++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h
@@ -36,7 +36,7 @@ public:
 	CSendHTTPServer(HWND Owner, MCONTACT hContact, bool bAsync);
 	~CSendHTTPServer();
 
-	int Send();
+	int Send() override;
 
 protected:
 	char*  m_pszFileName;
diff --git a/plugins/SendScreenshotPlus/src/CSendHost_ImageShack.h b/plugins/SendScreenshotPlus/src/CSendHost_ImageShack.h
index dfe30d2b9d..b5480d9e22 100644
--- a/plugins/SendScreenshotPlus/src/CSendHost_ImageShack.h
+++ b/plugins/SendScreenshotPlus/src/CSendHost_ImageShack.h
@@ -37,7 +37,7 @@ public:
 	CSendHost_ImageShack(HWND Owner, MCONTACT hContact, bool bAsync);
 	~CSendHost_ImageShack();
 
-	int Send();
+	int Send() override;
 
 protected:
 	NETLIBHTTPREQUEST		m_nlhr;
diff --git a/plugins/SendScreenshotPlus/src/CSendHost_imgur.h b/plugins/SendScreenshotPlus/src/CSendHost_imgur.h
index bb712c4da7..e8e790b785 100644
--- a/plugins/SendScreenshotPlus/src/CSendHost_imgur.h
+++ b/plugins/SendScreenshotPlus/src/CSendHost_imgur.h
@@ -20,7 +20,9 @@ class CSendHost_Imgur : public CSend {
 	public:
 		CSendHost_Imgur(HWND Owner, MCONTACT hContact, bool bAsync);
 		~CSendHost_Imgur();
-		int Send();
+
+		int Send() override;
+
 	protected:
 		NETLIBHTTPREQUEST m_nlhr;
 		static void SendThread(void* obj);
diff --git a/plugins/SendScreenshotPlus/src/CSendHost_uploadpie.h b/plugins/SendScreenshotPlus/src/CSendHost_uploadpie.h
index 39cd0dfb86..81107d9471 100644
--- a/plugins/SendScreenshotPlus/src/CSendHost_uploadpie.h
+++ b/plugins/SendScreenshotPlus/src/CSendHost_uploadpie.h
@@ -19,7 +19,9 @@ class CSendHost_UploadPie : public CSend {
 	public:
 		CSendHost_UploadPie(HWND Owner, MCONTACT hContact, bool bAsync, int expire);
 		~CSendHost_UploadPie();
-		int Send();
+
+		int Send() override;
+
 	protected:
 		int m_expire;
 		NETLIBHTTPREQUEST m_nlhr;
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index eab1fa0850..16c40d1d1b 100644
--- a/plugins/SendScreenshotPlus/src/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
@@ -237,7 +237,7 @@ int hook_ModulesLoaded(WPARAM, LPARAM)
 	g_myGlobals.PopupActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS);
 	g_myGlobals.PluginHTTPExist = ServiceExists(MS_HTTP_ACCEPT_CONNECTIONS);
 	g_myGlobals.PluginFTPExist = ServiceExists(MS_FTPFILE_UPLOAD);
-	g_myGlobals.PluginDropboxExist = ServiceExists(MS_DROPBOX_UPLOAD);
+	g_myGlobals.PluginCloudFileExist = ServiceExists(MS_CLOUDFILE_UPLOAD);
 	// Netlib register
 	NETLIBUSER nlu = {};
 	nlu.szSettingsModule = __PLUGIN_NAME;
diff --git a/plugins/SendScreenshotPlus/src/UMainForm.cpp b/plugins/SendScreenshotPlus/src/UMainForm.cpp
index fed9c0a4c1..0c6512f63c 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.cpp
+++ b/plugins/SendScreenshotPlus/src/UMainForm.cpp
@@ -171,6 +171,13 @@ INT_PTR CALLBACK TfrmMain::DlgTfrmMain(HWND hWnd, UINT msg, WPARAM wParam, LPARA
 /////////////////////////////////////////////////////////////////////////////////////////
 // WM_INITDIALOG:
 
+int EnumCloudFileServices(const CFSERVICEINFO *serviceInfo, void *param)
+{
+	HWND hCtrl = (HWND)param;
+	ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, serviceInfo->userName), new UPLOAD_INFO(SS_CLOUDFILE, (void*)serviceInfo->accountName));
+	return 0;
+}
+
 void TfrmMain::wmInitdialog(WPARAM, LPARAM)
 {
 	HWND hCtrl;
@@ -291,18 +298,18 @@ void TfrmMain::wmInitdialog(WPARAM, LPARAM)
 	{
 		hCtrl = GetDlgItem(m_hWnd, ID_cboxSendBy);
 		ComboBox_ResetContent(hCtrl);
-		ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("<Only save>")), SS_JUSTSAVE);
+		ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("<Only save>")), new UPLOAD_INFO(SS_JUSTSAVE));
 		if (m_hContact) {
-			ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("File Transfer")), SS_FILESEND);
-			ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("E-mail")), SS_EMAIL);
+			ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("File Transfer")), new UPLOAD_INFO(SS_FILESEND));
+			ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("E-mail")), new UPLOAD_INFO(SS_EMAIL));
 			if (g_myGlobals.PluginHTTPExist) {
-				ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, L"HTTP Server"), SS_HTTPSERVER);
+				ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, L"HTTP Server"), new UPLOAD_INFO(SS_HTTPSERVER));
 			}
 			else if (m_opt_cboxSendBy == SS_HTTPSERVER) {
 				m_opt_cboxSendBy = SS_IMAGESHACK;
 			}
 			if (g_myGlobals.PluginFTPExist) {
-				ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("FTP File")), SS_FTPFILE);
+				ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("FTP File")), new UPLOAD_INFO(SS_FTPFILE));
 			}
 			else if (m_opt_cboxSendBy == SS_FTPFILE) {
 				m_opt_cboxSendBy = SS_IMAGESHACK;
@@ -311,17 +318,17 @@ void TfrmMain::wmInitdialog(WPARAM, LPARAM)
 		else if (m_opt_cboxSendBy == SS_FILESEND || m_opt_cboxSendBy == SS_EMAIL || m_opt_cboxSendBy == SS_HTTPSERVER || m_opt_cboxSendBy == SS_FTPFILE) {
 			m_opt_cboxSendBy = SS_IMAGESHACK;
 		}
-		if (g_myGlobals.PluginDropboxExist) {
-			ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, L"Dropbox"), SS_DROPBOX);
+		if (g_myGlobals.PluginCloudFileExist) {
+			CallService(MS_CLOUDFILE_ENUMSERVICES, (WPARAM)EnumCloudFileServices, (LPARAM)hCtrl);
 		}
-		else if (m_opt_cboxSendBy == SS_DROPBOX) {
+		else if (m_opt_cboxSendBy == SS_CLOUDFILE) {
 			m_opt_cboxSendBy = SS_IMAGESHACK;
 		}
-		ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, L"ImageShack"), SS_IMAGESHACK);
-		ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("Upload Pie (30m)")), SS_UPLOADPIE_30M);
-		ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("Upload Pie (1d)")), SS_UPLOADPIE_1D);
-		ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("Upload Pie (1w)")), SS_UPLOADPIE_1W);
-		ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, L"imgur"), SS_IMGUR);
+		ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, L"ImageShack"), new UPLOAD_INFO(SS_IMAGESHACK));
+		ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("Upload Pie (30m)")), new UPLOAD_INFO(SS_UPLOADPIE, (void*)1));
+		ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("Upload Pie (1d)")), new UPLOAD_INFO(SS_UPLOADPIE, (void*)4));
+		ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("Upload Pie (1w)")), new UPLOAD_INFO(SS_UPLOADPIE, (void*)5));
+		ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, L"imgur"), new UPLOAD_INFO(SS_IMGUR));
 		ComboBox_SelectItemData(hCtrl, m_opt_cboxSendBy);	//use Workaround for MS bug ComboBox_SelectItemData
 	}
 	/// init footer options
@@ -372,7 +379,7 @@ void TfrmMain::wmInitdialog(WPARAM, LPARAM)
 		SetWindowText(hCtrl, TranslateT("&Capture"));
 		SendMessage(hCtrl, BUTTONSETDEFAULT, 1, NULL);
 	}
-	cboxSendByChange();		//enable disable controls
+	cboxSendByChange(nullptr);		//enable disable controls
 
 	TranslateDialogDefault(m_hWnd);
 }
@@ -445,9 +452,12 @@ void TfrmMain::wmCommand(WPARAM wParam, LPARAM lParam)
 			m_opt_cboxFormat = (BYTE)ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam));
 			break;
 		case ID_cboxSendBy:
-			m_opt_cboxSendBy = (BYTE)ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam));
-			cboxSendByChange();
+		{
+			UPLOAD_INFO *upload = (UPLOAD_INFO*)ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam));
+			m_opt_cboxSendBy = upload->sendBy;
+			cboxSendByChange(upload->param);
 			break;
+		}
 		case ID_edtCaption:			//cboxDesktopChange
 			m_opt_cboxDesktop = (BYTE)ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam));
 			m_hTargetWindow = nullptr;
@@ -483,6 +493,12 @@ void TfrmMain::wmCommand(WPARAM wParam, LPARAM lParam)
 //WM_CLOSE:
 void TfrmMain::wmClose(WPARAM, LPARAM)
 {
+	HWND hCtrl = GetDlgItem(m_hWnd, ID_cboxSendBy);
+	size_t count = ComboBox_GetCount(hCtrl);
+	for (size_t i = 0; i < count; i++) {
+		UPLOAD_INFO *ui = (UPLOAD_INFO*)ComboBox_GetItemData(hCtrl, i);
+		delete ui;
+	}
 	DestroyWindow(m_hWnd);
 	return;
 }
@@ -850,7 +866,7 @@ void TfrmMain::chkTimedClick()
 
 /////////////////////////////////////////////////////////////////////////////////////////
 
-void TfrmMain::cboxSendByChange()
+void TfrmMain::cboxSendByChange(void *param)
 {
 	BOOL bState;
 	HICON hIcon;
@@ -870,20 +886,14 @@ void TfrmMain::cboxSendByChange()
 	case SS_FTPFILE:		//"FTP File"
 		m_cSend = new CSendFTPFile(m_hWnd, m_hContact, true);
 		break;
-	case SS_DROPBOX:		//"Dropbox"
-		m_cSend = new CSendDropbox(m_hWnd, m_hContact, false);
+	case SS_CLOUDFILE:		//"CloudFile"
+		m_cSend = new CSendCloudFile(m_hWnd, m_hContact, false, (char*)param);
 		break;
 	case SS_IMAGESHACK:		//"ImageShack"
 		m_cSend = new CSendHost_ImageShack(m_hWnd, m_hContact, true);
 		break;
-	case SS_UPLOADPIE_30M:		//"Upload Pie (30 minutes)"
-		m_cSend = new CSendHost_UploadPie(m_hWnd, m_hContact, true, 1);
-		break;
-	case SS_UPLOADPIE_1D:		//"Upload Pie (1 day)"
-		m_cSend = new CSendHost_UploadPie(m_hWnd, m_hContact, true, 4);
-		break;
-	case SS_UPLOADPIE_1W:		//"Upload Pie (1 week)"
-		m_cSend = new CSendHost_UploadPie(m_hWnd, m_hContact, true, 5);
+	case SS_UPLOADPIE:		//"Upload Pie"
+		m_cSend = new CSendHost_UploadPie(m_hWnd, m_hContact, true, (int)param);
 		break;
 	case SS_IMGUR:
 		m_cSend = new CSendHost_Imgur(m_hWnd, m_hContact, true);
@@ -1145,7 +1155,7 @@ void TfrmMain::FormClose()
 	if (send && m_cSend && m_pszFile) {
 		if (!m_cSend->Send()) // not sent now, class deletes itself later
 			m_cSend = nullptr; 
-		cboxSendByChange();
+		cboxSendByChange(nullptr);
 	}
 	else if (!send && bCanDelete)
 		DeleteFile(m_pszFile);
diff --git a/plugins/SendScreenshotPlus/src/UMainForm.h b/plugins/SendScreenshotPlus/src/UMainForm.h
index cc43ed7da5..3a0a7435bd 100644
--- a/plugins/SendScreenshotPlus/src/UMainForm.h
+++ b/plugins/SendScreenshotPlus/src/UMainForm.h
@@ -34,12 +34,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #define SS_EMAIL			2
 #define SS_HTTPSERVER		3
 #define SS_FTPFILE			4
-#define SS_DROPBOX			5
+#define SS_CLOUDFILE		5
 #define SS_IMAGESHACK		6
-#define SS_UPLOADPIE_30M	7
-#define SS_UPLOADPIE_1D		8
-#define SS_UPLOADPIE_1W		9
-#define SS_IMGUR			10
+#define SS_UPLOADPIE		7
+#define SS_IMGUR			8
+
+struct UPLOAD_INFO
+{
+	BYTE sendBy;		//SS_*
+	void *param;
+
+	UPLOAD_INFO(BYTE sb) : sendBy(sb), param(nullptr) { }
+	UPLOAD_INFO(BYTE sb, void *p) : sendBy(sb), param(p) { }
+};
 
 // Used for our own cheap TrackMouseEvent
 #define BUTTON_POLLDELAY    50
@@ -82,7 +89,7 @@ public:
 	void		Hide(){ ShowWindow(m_hWnd, SW_HIDE); }
 	void		SetTargetWindow(HWND hwnd = NULL);
 	void		btnCaptureClick();
-	void		cboxSendByChange();
+	void		cboxSendByChange(void *param);
 
 private:
 	HWND		m_hWnd;
diff --git a/plugins/SendScreenshotPlus/src/stdafx.h b/plugins/SendScreenshotPlus/src/stdafx.h
index 7293726ffe..7a899f61b8 100644
--- a/plugins/SendScreenshotPlus/src/stdafx.h
+++ b/plugins/SendScreenshotPlus/src/stdafx.h
@@ -72,7 +72,7 @@ using namespace std;
 #include <m_ftpfile.h>
 #include <m_sendss.h>
 #include <m_userinfoex.h>
-#include <m_dropbox.h>
+#include <m_cloudfile.h>
 
 #include "mir_string.h"
 #include "ctrl_button.h"
@@ -84,7 +84,7 @@ using namespace std;
 #include "CSendFile.h"
 #include "CSendFTPFile.h"
 #include "CSendHTTPServer.h"
-#include "CSendDropbox.h"
+#include "CSendCloduFile.h"
 #include "CSendHost_ImageShack.h"
 #include "CSendHost_uploadpie.h"
 #include "CSendHost_imgur.h"
@@ -106,7 +106,7 @@ typedef struct _MGLOBAL {
 	BOOLEAN		PopupActionsExist	: 1;		// Popup++ or MS_POPUP_REGISTERACTIONS exist
 	BOOLEAN		PluginHTTPExist		: 1;		// HTTPServer or MS_HTTP_ACCEPT_CONNECTIONS exist
 	BOOLEAN		PluginFTPExist		: 1;		// FTPFile or MS_FTPFILE_UPLOAD exist
-	BOOLEAN		PluginDropboxExist	: 1;		// Dropbox or MS_DROPBOX_SEND_FILE exists
+	BOOLEAN		PluginCloudFileExist: 1;		// CloudFile or MS_CLOUDFILE_UPLOAD exists
 
 } MGLOBAL, *LPMGLOBAL;