From 53fe3e46177d17b4941610de19f5cc6210700cb4 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 12 Nov 2018 21:44:56 +0300 Subject: db_* functions replaced with g_plugin calls --- plugins/StopSpamMod/src/init.cpp | 54 +++++++++++++-------------- plugins/StopSpamMod/src/options.cpp | 70 +++++++++++++++++------------------ plugins/StopSpamMod/src/utilities.cpp | 8 ++-- 3 files changed, 66 insertions(+), 66 deletions(-) (limited to 'plugins/StopSpamMod/src') diff --git a/plugins/StopSpamMod/src/init.cpp b/plugins/StopSpamMod/src/init.cpp index 71d7e9e2dc..f5bdfe4fc1 100755 --- a/plugins/StopSpamMod/src/init.cpp +++ b/plugins/StopSpamMod/src/init.cpp @@ -83,33 +83,33 @@ extern wstring DBGetContactSettingStringPAN(MCONTACT hContact, char const * szMo void InitVars() { - gbSpammersGroup = DBGetContactSettingStringPAN(NULL, MODULENAME, "SpammersGroup", L"Spammers"); - gbAnswer = DBGetContactSettingStringPAN(NULL, MODULENAME, "answer", L"nospam"); - gbInfTalkProtection = db_get_b(NULL, MODULENAME, "infTalkProtection", 0); - gbAddPermanent = db_get_b(NULL, MODULENAME, "addPermanent", 0); - gbMaxQuestCount = db_get_dw(NULL, MODULENAME, "maxQuestCount", 5); - gbHandleAuthReq = db_get_b(NULL, MODULENAME, "handleAuthReq", 1); - gbQuestion = DBGetContactSettingStringPAN(NULL, MODULENAME, "question", TranslateW(defQuestion)); - gbAnswer = DBGetContactSettingStringPAN(NULL, MODULENAME, "answer", L"nospam"); - gbCongratulation = DBGetContactSettingStringPAN(NULL, MODULENAME, "congratulation", TranslateW(defCongrats)); - gbAuthRepl = DBGetContactSettingStringPAN(NULL, MODULENAME, "authrepl", TranslateW(defAuthReply)); - gbSpecialGroup = db_get_b(NULL, MODULENAME, "SpecialGroup", 0); - gbHideContacts = db_get_b(NULL, MODULENAME, "HideContacts", 0); - gbIgnoreContacts = db_get_b(NULL, MODULENAME, "IgnoreContacts", 0); - gbExclude = db_get_b(NULL, MODULENAME, "ExcludeContacts", 1); - gbDelExcluded = db_get_b(NULL, MODULENAME, "DelExcluded", 0); - gbDelAllTempory = db_get_b(NULL, MODULENAME, "DelAllTempory", 0); - gbCaseInsensitive = db_get_b(NULL, MODULENAME, "CaseInsensitive", 0); - gbRegexMatch = db_get_b(NULL, MODULENAME, "RegexMatch", 0); - gbInvisDisable = db_get_b(NULL, MODULENAME, "DisableInInvis", 0); - gbIgnoreURL = db_get_b(NULL, MODULENAME, "IgnoreURL", 0); - gbAutoAuthGroup = DBGetContactSettingStringPAN(NULL, MODULENAME, "AutoAuthGroup", L"Not Spammers"); - gbAutoAuth = db_get_b(NULL, MODULENAME, "AutoAuth", 0); - gbAutoAddToServerList = db_get_b(NULL, MODULENAME, "AutoAddToServerList", 0); - gbAutoReqAuth = db_get_b(NULL, MODULENAME, "AutoReqAuth", 0); - gbLogToFile = db_get_b(NULL, MODULENAME, "LogSpamToFile", 0); - gbHistoryLog = db_get_b(NULL, MODULENAME, "HistoryLog", 0); - gbMathExpression = db_get_b(NULL, MODULENAME, "MathExpression", 0); + gbSpammersGroup = DBGetContactSettingStringPAN(0, MODULENAME, "SpammersGroup", L"Spammers"); + gbAnswer = DBGetContactSettingStringPAN(0, MODULENAME, "answer", L"nospam"); + gbInfTalkProtection = g_plugin.getByte("infTalkProtection", 0); + gbAddPermanent = g_plugin.getByte("addPermanent", 0); + gbMaxQuestCount = g_plugin.getDword("maxQuestCount", 5); + gbHandleAuthReq = g_plugin.getByte("handleAuthReq", 1); + gbQuestion = DBGetContactSettingStringPAN(0, MODULENAME, "question", TranslateW(defQuestion)); + gbAnswer = DBGetContactSettingStringPAN(0, MODULENAME, "answer", L"nospam"); + gbCongratulation = DBGetContactSettingStringPAN(0, MODULENAME, "congratulation", TranslateW(defCongrats)); + gbAuthRepl = DBGetContactSettingStringPAN(0, MODULENAME, "authrepl", TranslateW(defAuthReply)); + gbSpecialGroup = g_plugin.getByte("SpecialGroup", 0); + gbHideContacts = g_plugin.getByte("HideContacts", 0); + gbIgnoreContacts = g_plugin.getByte("IgnoreContacts", 0); + gbExclude = g_plugin.getByte("ExcludeContacts", 1); + gbDelExcluded = g_plugin.getByte("DelExcluded", 0); + gbDelAllTempory = g_plugin.getByte("DelAllTempory", 0); + gbCaseInsensitive = g_plugin.getByte("CaseInsensitive", 0); + gbRegexMatch = g_plugin.getByte("RegexMatch", 0); + gbInvisDisable = g_plugin.getByte("DisableInInvis", 0); + gbIgnoreURL = g_plugin.getByte("IgnoreURL", 0); + gbAutoAuthGroup = DBGetContactSettingStringPAN(0, MODULENAME, "AutoAuthGroup", L"Not Spammers"); + gbAutoAuth = g_plugin.getByte("AutoAuth", 0); + gbAutoAddToServerList = g_plugin.getByte("AutoAddToServerList", 0); + gbAutoReqAuth = g_plugin.getByte("AutoReqAuth", 0); + gbLogToFile = g_plugin.getByte("LogSpamToFile", 0); + gbHistoryLog = g_plugin.getByte("HistoryLog", 0); + gbMathExpression = g_plugin.getByte("MathExpression", 0); } static int OnSystemModulesLoaded(WPARAM, LPARAM) diff --git a/plugins/StopSpamMod/src/options.cpp b/plugins/StopSpamMod/src/options.cpp index 9bfcf9a0d2..b7f8fc1274 100755 --- a/plugins/StopSpamMod/src/options.cpp +++ b/plugins/StopSpamMod/src/options.cpp @@ -48,13 +48,13 @@ public: bool OnApply() override { - db_set_dw(NULL, MODULENAME, "maxQuestCount", gbMaxQuestCount = edit_MAXQUESTCOUNT.GetInt()); - db_set_b(NULL, MODULENAME, "infTalkProtection", gbInfTalkProtection = chk_INFTALKPROT.GetState()); - db_set_b(NULL, MODULENAME, "addPermanent", gbAddPermanent = chk_ADDPERMANENT.GetState()); - db_set_b(NULL, MODULENAME, "handleAuthReq", gbHandleAuthReq = chk_HANDLEAUTHREQ.GetState()); - db_set_b(NULL, MODULENAME, "HideContacts", gbHideContacts = chk_HIDECONTACTS.GetState()); - db_set_b(NULL, MODULENAME, "IgnoreContacts", gbIgnoreContacts = chk_IGNORESPAMMERS.GetState()); - db_set_b(NULL, MODULENAME, "LogSpamToFile", gbLogToFile = chk_LOGSPAMTOFILE.GetState()); + g_plugin.setDword("maxQuestCount", gbMaxQuestCount = edit_MAXQUESTCOUNT.GetInt()); + g_plugin.setByte("infTalkProtection", gbInfTalkProtection = chk_INFTALKPROT.GetState()); + g_plugin.setByte("addPermanent", gbAddPermanent = chk_ADDPERMANENT.GetState()); + g_plugin.setByte("handleAuthReq", gbHandleAuthReq = chk_HANDLEAUTHREQ.GetState()); + g_plugin.setByte("HideContacts", gbHideContacts = chk_HIDECONTACTS.GetState()); + g_plugin.setByte("IgnoreContacts", gbIgnoreContacts = chk_IGNORESPAMMERS.GetState()); + g_plugin.setByte("LogSpamToFile", gbLogToFile = chk_LOGSPAMTOFILE.GetState()); return true; } @@ -91,14 +91,14 @@ public: bool OnApply() override { - db_set_ws(NULL, MODULENAME, "question", edit_QUESTION.GetText()); - gbQuestion = DBGetContactSettingStringPAN(NULL, MODULENAME, "question", TranslateW(defQuestion)); - db_set_ws(NULL, MODULENAME, "answer", edit_ANSWER.GetText()); - gbAnswer = DBGetContactSettingStringPAN(NULL, MODULENAME, "answer", L"nospam"); - db_set_ws(NULL, MODULENAME, "authrepl", edit_AUTHREPL.GetText()); - gbAuthRepl = DBGetContactSettingStringPAN(NULL, MODULENAME, "authrepl", TranslateW(defAuthReply)); - db_set_ws(NULL, MODULENAME, "congratulation", edit_CONGRATULATION.GetText()); - gbCongratulation = DBGetContactSettingStringPAN(NULL, MODULENAME, "congratulation", TranslateW(defCongrats)); + g_plugin.setWString("question", edit_QUESTION.GetText()); + gbQuestion = DBGetContactSettingStringPAN(0, MODULENAME, "question", TranslateW(defQuestion)); + g_plugin.setWString("answer", edit_ANSWER.GetText()); + gbAnswer = DBGetContactSettingStringPAN(0, MODULENAME, "answer", L"nospam"); + g_plugin.setWString("authrepl", edit_AUTHREPL.GetText()); + gbAuthRepl = DBGetContactSettingStringPAN(0, MODULENAME, "authrepl", TranslateW(defAuthReply)); + g_plugin.setWString("congratulation", edit_CONGRATULATION.GetText()); + gbCongratulation = DBGetContactSettingStringPAN(0, MODULENAME, "congratulation", TranslateW(defCongrats)); return true; } @@ -152,7 +152,7 @@ public: out << str << "\r\n"; mir_free(str); } - db_set_s(NULL, MODULENAME, "protoList", out.str().c_str()); + g_plugin.setString("protoList", out.str().c_str()); return true; } @@ -230,38 +230,38 @@ public: bool OnApply() override { - db_set_b(NULL, MODULENAME, "CaseInsensitive", gbCaseInsensitive = chk_CASE_INSENSITIVE.GetState()); - db_set_b(NULL, MODULENAME, "DisableInInvis", gbInvisDisable = chk_INVIS_DISABLE.GetState()); + g_plugin.setByte("CaseInsensitive", gbCaseInsensitive = chk_CASE_INSENSITIVE.GetState()); + g_plugin.setByte("DisableInInvis", gbInvisDisable = chk_INVIS_DISABLE.GetState()); { static wstring NewGroupName = edit_SPECIALGROUPNAME.GetText(), CurrentGroupName; - CurrentGroupName = gbSpammersGroup = DBGetContactSettingStringPAN(NULL, MODULENAME, "SpammersGroup", L"0"); + CurrentGroupName = gbSpammersGroup = DBGetContactSettingStringPAN(0, MODULENAME, "SpammersGroup", L"0"); if (mir_wstrcmp(CurrentGroupName.c_str(), NewGroupName.c_str()) != 0) { bool GroupExist = Clist_GroupExists(NewGroupName.c_str()) != NULL; - db_set_ws(NULL, MODULENAME, "SpammersGroup", NewGroupName.c_str()); - gbSpammersGroup = DBGetContactSettingStringPAN(NULL, MODULENAME, "SpammersGroup", L"Spammers"); + g_plugin.setWString("SpammersGroup", NewGroupName.c_str()); + gbSpammersGroup = DBGetContactSettingStringPAN(0, MODULENAME, "SpammersGroup", L"Spammers"); if (!GroupExist && gbSpecialGroup) Clist_GroupCreate(0, gbSpammersGroup.c_str()); } } - db_set_b(NULL, MODULENAME, "SpecialGroup", gbSpecialGroup = chk_SPECIALGROUP.GetState()); - db_set_b(NULL, MODULENAME, "ExcludeContacts", gbExclude = chk_EXCLUDE.GetState()); - db_set_b(NULL, MODULENAME, "DelExcluded", gbDelExcluded = chk_REMOVE_TMP.GetState()); - db_set_b(NULL, MODULENAME, "DelAllTempory", gbDelAllTempory = chk_REMOVE_TMP_ALL.GetState()); - db_set_b(NULL, MODULENAME, "IgnoreURL", gbIgnoreURL = chk_IGNOREURL.GetState()); + g_plugin.setByte("SpecialGroup", gbSpecialGroup = chk_SPECIALGROUP.GetState()); + g_plugin.setByte("ExcludeContacts", gbExclude = chk_EXCLUDE.GetState()); + g_plugin.setByte("DelExcluded", gbDelExcluded = chk_REMOVE_TMP.GetState()); + g_plugin.setByte("DelAllTempory", gbDelAllTempory = chk_REMOVE_TMP_ALL.GetState()); + g_plugin.setByte("IgnoreURL", gbIgnoreURL = chk_IGNOREURL.GetState()); - db_set_b(NULL, MODULENAME, "AutoAuth", gbAutoAuth = chk_AUTOAUTH.GetState()); - db_set_b(NULL, MODULENAME, "AutoAddToServerList", gbAutoAddToServerList = chk_ADDTOSRVLST.GetState()); - db_set_b(NULL, MODULENAME, "AutoReqAuth", gbAutoReqAuth = chk_REQAUTH.GetState()); - db_set_b(NULL, MODULENAME, "RegexMatch", gbRegexMatch = chk_REGEX.GetState()); - db_set_b(NULL, MODULENAME, "HistoryLog", gbHistoryLog = chk_HISTORY_LOG.GetState()); - db_set_b(NULL, MODULENAME, "MathExpression", gbMathExpression = chk_MATH_QUESTION.GetState()); + g_plugin.setByte("AutoAuth", gbAutoAuth = chk_AUTOAUTH.GetState()); + g_plugin.setByte("AutoAddToServerList", gbAutoAddToServerList = chk_ADDTOSRVLST.GetState()); + g_plugin.setByte("AutoReqAuth", gbAutoReqAuth = chk_REQAUTH.GetState()); + g_plugin.setByte("RegexMatch", gbRegexMatch = chk_REGEX.GetState()); + g_plugin.setByte("HistoryLog", gbHistoryLog = chk_HISTORY_LOG.GetState()); + g_plugin.setByte("MathExpression", gbMathExpression = chk_MATH_QUESTION.GetState()); { static wstring NewAGroupName = edit_AUTOADDGROUP.GetText(), CurrentAGroupName; - CurrentAGroupName = gbAutoAuthGroup = DBGetContactSettingStringPAN(NULL, MODULENAME, "AutoAuthGroup", L"0"); + CurrentAGroupName = gbAutoAuthGroup = DBGetContactSettingStringPAN(0, MODULENAME, "AutoAuthGroup", L"0"); if (mir_wstrcmp(CurrentAGroupName.c_str(), NewAGroupName.c_str()) != 0) { bool GroupExist = Clist_GroupExists(NewAGroupName.c_str()) != NULL; - db_set_ws(NULL, MODULENAME, "AutoAuthGroup", NewAGroupName.c_str()); - gbAutoAuthGroup = DBGetContactSettingStringPAN(NULL, MODULENAME, "AutoAuthGroup", L"Not Spammers"); + g_plugin.setWString("AutoAuthGroup", NewAGroupName.c_str()); + gbAutoAuthGroup = DBGetContactSettingStringPAN(0, MODULENAME, "AutoAuthGroup", L"Not Spammers"); if (!GroupExist && gbAutoAddToServerList) Clist_GroupCreate(0, gbAutoAuthGroup.c_str()); } diff --git a/plugins/StopSpamMod/src/utilities.cpp b/plugins/StopSpamMod/src/utilities.cpp index 370def4c18..b38c2e26c4 100755 --- a/plugins/StopSpamMod/src/utilities.cpp +++ b/plugins/StopSpamMod/src/utilities.cpp @@ -54,7 +54,7 @@ wstring& GetDlgItemString(HWND hwnd, int id) std::string &GetProtoList() { static std::string s; - return s = DBGetContactSettingStringPAN_A(NULL, MODULENAME, "protoList", "ICQ\r\n"); + return s = DBGetContactSettingStringPAN_A(0, MODULENAME, "protoList", "ICQ\r\n"); } bool ProtoInList(const char *szProto) @@ -67,9 +67,9 @@ bool ProtoInList(const char *szProto) void DeleteCListGroupsByName(wchar_t* szGroupName) { - BYTE ConfirmDelete = db_get_b(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT); + BYTE ConfirmDelete = db_get_b(0, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT); if (ConfirmDelete) - db_set_b(NULL, "CList", "ConfirmDelete", 0); + db_set_b(0, "CList", "ConfirmDelete", 0); wchar_t *szGroup; for (int i = 1; (szGroup = Clist_GroupGetName(i, nullptr)) != nullptr; i++) @@ -77,7 +77,7 @@ void DeleteCListGroupsByName(wchar_t* szGroupName) Clist_GroupDelete(i); if (ConfirmDelete) - db_set_b(NULL, "CList", "ConfirmDelete", ConfirmDelete); + db_set_b(0, "CList", "ConfirmDelete", ConfirmDelete); } int RemoveTmp(WPARAM, LPARAM) -- cgit v1.2.3