CMPlugin to receive a reference to PLUGININFOEX

7 files changed, 34 insertions, 32 deletions

diff --git a/plugins/StopSpamPlus/src/events.cpp b/plugins/StopSpamPlus/src/events.cpp
index e8a7f4a7e1..2c2a077b65 100644
--- a/plugins/StopSpamPlus/src/events.cpp
+++ b/plugins/StopSpamPlus/src/events.cpp
@@ -26,7 +26,7 @@ int OnDbEventAdded(WPARAM, LPARAM lParam)
 

 		// if request is from unknown or not marked Answered contact

 		//and if I don't sent message to this contact

-		if (db_get_b(hcntct, "CList", "NotOnList", 0) && !db_get_b(hcntct, pluginName, answeredSetting, 0) && !IsExistMyMessage(hcntct)) {

+		if (db_get_b(hcntct, "CList", "NotOnList", 0) && !db_get_b(hcntct, MODULENAME, answeredSetting, 0) && !IsExistMyMessage(hcntct)) {

 			if (!g_sets.HandleAuthReq) {

 				char *buf = mir_utf8encodeW(variables_parse(g_sets.AuthRepl, hcntct).c_str());

 				ProtoChainSend(hcntct, PSS_MESSAGE, 0, (LPARAM)buf);

@@ -66,7 +66,7 @@ int OnDbEventFilterAdd(WPARAM w, LPARAM l)
 		return 0;

 

 	// if message is from known or marked Answered contact

-	if (db_get_b(hContact, pluginName, answeredSetting, 0))

+	if (db_get_b(hContact, MODULENAME, answeredSetting, 0))

 		// ...let the event go its way

 		return 0;

 

@@ -113,7 +113,7 @@ int OnDbEventFilterAdd(WPARAM w, LPARAM l)
 				db_unset(hContact, "CList", "Hidden");

 

 				// mark contact as Answered

-				db_set_b(hContact, pluginName, answeredSetting, 1);

+				db_set_b(hContact, MODULENAME, answeredSetting, 1);

 

 				//add contact permanently

 				if (g_sets.AddPermanent)

@@ -135,7 +135,7 @@ int OnDbEventFilterAdd(WPARAM w, LPARAM l)
 	// if message message does not contain infintite talk protection prefix

 	// and question count for this contact is less then maximum

 	const wchar_t *pwszPrefix = TranslateT("StopSpam automatic message:\r\n");

-	if ((!g_sets.InfTalkProtection || tstring::npos == message.find(pwszPrefix)) && (!g_sets.MaxQuestCount || db_get_dw(hContact, pluginName, questCountSetting, 0) < g_sets.MaxQuestCount)) {

+	if ((!g_sets.InfTalkProtection || tstring::npos == message.find(pwszPrefix)) && (!g_sets.MaxQuestCount || db_get_dw(hContact, MODULENAME, questCountSetting, 0) < g_sets.MaxQuestCount)) {

 		// send question

 		tstring q = pwszPrefix + variables_parse(g_sets.Question, hContact);

 

@@ -146,8 +146,8 @@ int OnDbEventFilterAdd(WPARAM w, LPARAM l)
 

 

 		// increment question count

-		DWORD questCount = db_get_dw(hContact, pluginName, questCountSetting, 0);

-		db_set_dw(hContact, pluginName, questCountSetting, questCount + 1);

+		DWORD questCount = db_get_dw(hContact, MODULENAME, questCountSetting, 0);

+		db_set_dw(hContact, MODULENAME, questCountSetting, questCount + 1);

 	}

 

 	// hide contact from contact list

@@ -173,8 +173,8 @@ int OnDbContactSettingchanged(WPARAM hContact, LPARAM l)
 		return 0;

 

 	if (!cws->value.type) {

-		db_unset(hContact, pluginName, answeredSetting);

-		db_unset(hContact, pluginName, questCountSetting);

+		db_unset(hContact, MODULENAME, answeredSetting);

+		db_unset(hContact, MODULENAME, questCountSetting);

 	}

 

 	return 0;

diff --git a/plugins/StopSpamPlus/src/options.cpp b/plugins/StopSpamPlus/src/options.cpp
index d540a290d5..43f33b1030 100644
--- a/plugins/StopSpamPlus/src/options.cpp
+++ b/plugins/StopSpamPlus/src/options.cpp
@@ -9,7 +9,7 @@ class COptMainDlg : public CPluginDlgBase
 

 public:

 	COptMainDlg() :

-		CPluginDlgBase(g_plugin, IDD_MAIN, pluginName),

+		CPluginDlgBase(g_plugin, IDD_MAIN, MODULENAME),

 		edtCount(this, ID_MAXQUESTCOUNT),

 		edtDescr(this, ID_DESCRIPTION),

 		chk1(this, ID_INFTALKPROT),

@@ -44,7 +44,7 @@ class COptMessageDlg : public CPluginDlgBase
 

 public:

 	COptMessageDlg() :

-		CPluginDlgBase(g_plugin, IDD_MESSAGES, pluginName),

+		CPluginDlgBase(g_plugin, IDD_MESSAGES, MODULENAME),

 		btnHelp(this, IDC_VARS),

 		btnRestore(this, ID_RESTOREDEFAULTS),

 		edtQuestion(this, ID_QUESTION),

@@ -94,7 +94,7 @@ class COptAccountDlg : public CPluginDlgBase
 

 public:

 	COptAccountDlg() :

-		CPluginDlgBase(g_plugin, IDD_PROTO, pluginName),

+		CPluginDlgBase(g_plugin, IDD_PROTO, MODULENAME),

 		m_accounts(this, IDC_PROTO)

 	{

 		m_accounts.OnItemChanged = Callback(this, &COptAccountDlg::list_OnItemChanged);

@@ -159,7 +159,7 @@ int OnOptInit(WPARAM w, LPARAM)
 {

 	OPTIONSDIALOGPAGE odp = { 0 };

 	odp.szGroup.a = LPGEN("Message sessions");

-	odp.szTitle.a = pluginName;

+	odp.szTitle.a = MODULENAME;

 

 	odp.szTab.a = LPGEN("General");

 	odp.pDialog = new COptMainDlg();

diff --git a/plugins/StopSpamPlus/src/services.cpp b/plugins/StopSpamPlus/src/services.cpp
index 3692a4a411..9cb028e983 100644
--- a/plugins/StopSpamPlus/src/services.cpp
+++ b/plugins/StopSpamPlus/src/services.cpp
@@ -9,7 +9,7 @@ INT_PTR IsContactPassed(WPARAM hContact, LPARAM /*lParam*/)
 	if (!g_sets.ProtoDisabled(szProto))

 		return CS_PASSED;

 

-	if (db_get_b(hContact, pluginName, answeredSetting, 0))

+	if (db_get_b(hContact, MODULENAME, answeredSetting, 0))

 		return CS_PASSED;

 

 	if (!db_get_b(hContact, "CList", "NotOnList", 0) && db_get_w(hContact, szProto, "SrvGroupId", -1) != 1)

@@ -63,7 +63,7 @@ INT_PTR RemoveTempContacts(WPARAM, LPARAM lParam)
 		hGroup++;

 	} while (group_name);

 	if (!lParam)

-		MessageBox(nullptr, TranslateT("Complete"), TranslateT(pluginName), MB_ICONINFORMATION);

+		MessageBox(nullptr, TranslateT("Complete"), TranslateT(MODULENAME), MB_ICONINFORMATION);

 

 	return 0;

 }

diff --git a/plugins/StopSpamPlus/src/settings.cpp b/plugins/StopSpamPlus/src/settings.cpp
index 98c7b85139..0e133956d4 100644
--- a/plugins/StopSpamPlus/src/settings.cpp
+++ b/plugins/StopSpamPlus/src/settings.cpp
@@ -5,18 +5,18 @@ Settings g_sets;
 /////////////////////////////////////////////////////////////////////////////////////////

 

 Settings::Settings() :

-	Question(pluginName, "Question", TranslateW(L"Spammers made me to install small anti-spam system you are now speaking with. Please reply \"nospam\" without quotes and spaces if you want to contact me.")),

-	AuthRepl(pluginName, "AuthReply", TranslateW(L"StopSpam: send a message and reply to an anti-spam bot question.")),

-	Answer(pluginName, "Answer", L"nospam"),

-	Congratulation(pluginName, "Congratulation", TranslateW(L"Congratulations! You just passed human/robot test. Now you can write me a message.")),

-	DisabledProtoList(pluginName, "DisabledProtoList", "MetaContacts RSSNews"),

-	InfTalkProtection(pluginName, "InfTalkProtection", 1),

-	AddPermanent(pluginName, "AddPermanent", 0),

-	HandleAuthReq(pluginName, "HandleAuthReq", 0),

-	MaxQuestCount(pluginName, "MaxQuestCount", 2),

-	AnswNotCaseSens(pluginName, "AnswNotCaseSens", 1),

-	AnswSplitString(pluginName, "AnswSplitString", L"|"),

-	RemTmpAll(pluginName, "RemTmpAll", 1),

-	HistLog(pluginName, "HistLog", 0)

+	Question(MODULENAME, "Question", TranslateW(L"Spammers made me to install small anti-spam system you are now speaking with. Please reply \"nospam\" without quotes and spaces if you want to contact me.")),

+	AuthRepl(MODULENAME, "AuthReply", TranslateW(L"StopSpam: send a message and reply to an anti-spam bot question.")),

+	Answer(MODULENAME, "Answer", L"nospam"),

+	Congratulation(MODULENAME, "Congratulation", TranslateW(L"Congratulations! You just passed human/robot test. Now you can write me a message.")),

+	DisabledProtoList(MODULENAME, "DisabledProtoList", "MetaContacts RSSNews"),

+	InfTalkProtection(MODULENAME, "InfTalkProtection", 1),

+	AddPermanent(MODULENAME, "AddPermanent", 0),

+	HandleAuthReq(MODULENAME, "HandleAuthReq", 0),

+	MaxQuestCount(MODULENAME, "MaxQuestCount", 2),

+	AnswNotCaseSens(MODULENAME, "AnswNotCaseSens", 1),

+	AnswSplitString(MODULENAME, "AnswSplitString", L"|"),

+	RemTmpAll(MODULENAME, "RemTmpAll", 1),

+	HistLog(MODULENAME, "HistLog", 0)

 {

 }

diff --git a/plugins/StopSpamPlus/src/stdafx.h b/plugins/StopSpamPlus/src/stdafx.h
index c92038517c..7222611019 100644
--- a/plugins/StopSpamPlus/src/stdafx.h
+++ b/plugins/StopSpamPlus/src/stdafx.h
@@ -29,13 +29,11 @@ typedef std::wstring tstring;
 #include "resource.h"

 #include "settings.h"

 

-#define pluginName LPGEN("StopSpam")

+#define MODULENAME LPGEN("StopSpam")

 

 struct CMPlugin : public PLUGIN<CMPlugin>

 {

-	CMPlugin() :

-		PLUGIN<CMPlugin>(pluginName)

-	{}

+	CMPlugin();

 };

 

 extern char const *answeredSetting;

diff --git a/plugins/StopSpamPlus/src/stopspam.cpp b/plugins/StopSpamPlus/src/stopspam.cpp
index 8a64463236..38af9acb47 100644
--- a/plugins/StopSpamPlus/src/stopspam.cpp
+++ b/plugins/StopSpamPlus/src/stopspam.cpp
@@ -20,6 +20,10 @@ PLUGININFOEX pluginInfoEx = {
 	{ 0x553811ee, 0xdeb6, 0x48b8, { 0x89, 0x2, 0xa8, 0xa0, 0xc, 0x1f, 0xd6, 0x79 } }

 };

 

+CMPlugin::CMPlugin() :

+	PLUGIN<CMPlugin>(MODULENAME, pluginInfoEx)

+{}

+

 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)

 {

 	return &pluginInfoEx;

diff --git a/plugins/StopSpamPlus/src/utils.cpp b/plugins/StopSpamPlus/src/utils.cpp
index 897c403178..a71e829d24 100644
--- a/plugins/StopSpamPlus/src/utils.cpp
+++ b/plugins/StopSpamPlus/src/utils.cpp
@@ -22,7 +22,7 @@ bool IsExistMyMessage(MCONTACT hContact)
 

 		if (dbei.flags & DBEF_SENT){

 			// mark contact as Answered

-			db_set_b(hContact, pluginName, answeredSetting, 1);

+			db_set_b(hContact, MODULENAME, answeredSetting, 1);

 			// ...let the event go its way

 			return true;

 		}