From 056715f5ecf44358d9a565a440a1af5a77bb802f Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Sat, 19 Jan 2013 09:56:30 +0000 Subject: - Stopspam mod and plus fixes for previous commit git-svn-id: http://svn.miranda-ng.org/main/trunk@3161 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/StopSpamMod/src/options.cpp | 23 +++----- plugins/StopSpamMod/src/utilities.cpp | 22 ++++---- plugins/StopSpamMod/stopspam_11.vcxproj.filters | 65 ---------------------- .../StopSpamMod/stopspam_mod_11.vcxproj.filters | 65 ++++++++++++++++++++++ plugins/StopSpamPlus/src/options.cpp | 8 +-- 5 files changed, 85 insertions(+), 98 deletions(-) delete mode 100644 plugins/StopSpamMod/stopspam_11.vcxproj.filters create mode 100644 plugins/StopSpamMod/stopspam_mod_11.vcxproj.filters diff --git a/plugins/StopSpamMod/src/options.cpp b/plugins/StopSpamMod/src/options.cpp index 7f03d86ed5..e1dba9dc57 100755 --- a/plugins/StopSpamMod/src/options.cpp +++ b/plugins/StopSpamMod/src/options.cpp @@ -19,15 +19,8 @@ #define MIRANDA_VER 0x0800 #include "headers.h" -char * pluginDescription = LPGEN("No more spam! Robots can't go! Only human beings invited!\r\n\r\n" -"This plugin works pretty simple:\r\n" -"While messages from users on your contact list go as there is no any anti-spam software, " -"messages from unknown users are not delivered to you. " -"But also they are not ignored, this plugin replies with a simple question, " -"and if user gives the right answer plugin adds him to your contact list " -"so that he can contact you."); -TCHAR const * defQuestion = TranslateT("Spammers made me to install small anti-spam system you are now speaking with.\r\n" -"Please reply \"nospam\" without quotes and spaces if you want to contact me."); +char * pluginDescription = LPGEN("No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer plugin adds him to your contact list so that he can contact you."); +TCHAR const * defQuestion = TranslateT("Spammers made me to install small anti-spam system you are now speaking with.\r\nPlease reply \"nospam\" without quotes and spaces if you want to contact me."); INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) @@ -394,29 +387,29 @@ MIRANDA_HOOK_EVENT(ME_OPT_INITIALISE, w, l) { OPTIONSDIALOGPAGE odp = {0}; odp.cbSize = sizeof(odp); - odp.pszGroup = LPGEN("Message Sessions"); - odp.pszTitle = LPGEN("StopSpam"); + odp.ptszGroup = LPGENT("Message Sessions"); + odp.ptszTitle = LPGENT("StopSpam"); odp.position = -1; odp.hInstance = hInst; odp.flags = ODPF_TCHAR; - odp.pszTab = LPGEN("Main"); + odp.ptszTab = LPGENT("Main"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_MAIN); odp.pfnDlgProc = MainDlgProc; Options_AddPage(w, &odp); - odp.pszTab = LPGEN("Messages"); + odp.ptszTab = LPGENT("Messages"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_MESSAGES); odp.pfnDlgProc = MessagesDlgProc; Options_AddPage(w, &odp); - odp.pszTab = LPGEN("Protocols"); + odp.ptszTab = LPGENT("Protocols"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_PROTO); odp.pfnDlgProc = ProtoDlgProc; Options_AddPage(w, &odp); - odp.pszTab = LPGEN("Advanced"); + odp.ptszTab = LPGENT("Advanced"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_ADVANCED); odp.pfnDlgProc = AdvancedDlgProc; Options_AddPage(w, &odp); diff --git a/plugins/StopSpamMod/src/utilities.cpp b/plugins/StopSpamMod/src/utilities.cpp index 84eeaf79f0..4b596456bf 100755 --- a/plugins/StopSpamMod/src/utilities.cpp +++ b/plugins/StopSpamMod/src/utilities.cpp @@ -276,17 +276,17 @@ BOOL IsUrlContains(TCHAR * Str) const int CountUrl=11; const TCHAR URL[CountUrl][5]= { - _T("http"), - _T("www"), - _T(".ru"), - _T(".com"), - _T(".de"), - _T(".cz"), - _T(".org"), - _T(".net"), - _T(".su"), - _T(".ua"), - _T(".tv") + L"http", + L"www", + L".ru", + L".com", + L".de", + L".cz", + L".org", + L".net", + L".su", + L".ua", + L".tv" }; if(Str && _tcslen(Str)>0) { diff --git a/plugins/StopSpamMod/stopspam_11.vcxproj.filters b/plugins/StopSpamMod/stopspam_11.vcxproj.filters deleted file mode 100644 index ae17f570aa..0000000000 --- a/plugins/StopSpamMod/stopspam_11.vcxproj.filters +++ /dev/null @@ -1,65 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/plugins/StopSpamMod/stopspam_mod_11.vcxproj.filters b/plugins/StopSpamMod/stopspam_mod_11.vcxproj.filters new file mode 100644 index 0000000000..ae17f570aa --- /dev/null +++ b/plugins/StopSpamMod/stopspam_mod_11.vcxproj.filters @@ -0,0 +1,65 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + + + Resource Files + + + \ No newline at end of file diff --git a/plugins/StopSpamPlus/src/options.cpp b/plugins/StopSpamPlus/src/options.cpp index 71becfa3fa..7045c9fb28 100644 --- a/plugins/StopSpamPlus/src/options.cpp +++ b/plugins/StopSpamPlus/src/options.cpp @@ -1,12 +1,6 @@ #include "headers.h" -TCHAR * pluginDescription = TranslateT("No more spam! Robots can't go! Only human beings invited!\r\n\r\n" -"This plugin works pretty simple:\r\n" -"While messages from users on your contact list go as there is no any anti-spam software, " -"messages from unknown users are not delivered to you. " -"But also they are not ignored, this plugin replies with a simple question, " -"and if user gives the right answer plugin adds him to your contact list " -"so that he can contact you."); +TCHAR * pluginDescription = TranslateT("No more spam! Robots can't go! Only human beings invited!\r\n\r\nThis plugin works pretty simple:\r\nWhile messages from users on your contact list go as there is no any anti-spam software, messages from unknown users are not delivered to you. But also they are not ignored, this plugin replies with a simple question, and if user gives the right answer plugin adds him to your contact list so that he can contact you."); TCHAR const * infTalkProtPrefix = TranslateT("StopSpam automatic message:\r\n"); char const * answeredSetting = "Answered"; char const * questCountSetting = "QuestionCount"; -- cgit v1.2.3