summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKirill Volinsky <mataes2007@gmail.com>2012-09-24 06:25:38 +0000
committerKirill Volinsky <mataes2007@gmail.com>2012-09-24 06:25:38 +0000
commitb21fe100e4735c7bd98f290593f30277aa05f6d9 (patch)
treeae0b0e02459386ee0ad3661a19cc46976275f910
parente36071cebf95c1ae5b806c17b259619da32f0e72 (diff)
StopSpamPlus
fixed removing spammers from groups containing "Not In List" git-svn-id: http://svn.miranda-ng.org/main/trunk@1638 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/StopSpamPlus/src/services.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/StopSpamPlus/src/services.cpp b/plugins/StopSpamPlus/src/services.cpp
index 7fe08a9600..1d56bb1c15 100644
--- a/plugins/StopSpamPlus/src/services.cpp
+++ b/plugins/StopSpamPlus/src/services.cpp
@@ -30,7 +30,7 @@ INT_PTR RemoveTempContacts(WPARAM wParam,LPARAM lParam)
if ( DBGetContactSettingTString( hContact, "CList", "Group", &dbv ))
dbv.ptszVal = NULL;
- if ( DBGetContactSettingByte(hContact, "CList", "NotOnList", 0) || !lstrcmp(dbv.ptszVal, _T("Not In List")) || !lstrcmp(dbv.ptszVal, TranslateT("Not In List")) || DBGetContactSettingByte(hContact, "CList", "Hidden", 0 )) {
+ if ( DBGetContactSettingByte(hContact, "CList", "NotOnList", 0) || _tcsstr(dbv.ptszVal, _T("Not In List")) || _tcsstr(dbv.ptszVal, TranslateT("Not In List")) || DBGetContactSettingByte(hContact, "CList", "Hidden", 0 )) {
char *szProto = (char *) CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);
if ( szProto != NULL ) {
// Check if protocol uses server side lists
@@ -55,7 +55,7 @@ INT_PTR RemoveTempContacts(WPARAM wParam,LPARAM lParam)
char *group_name;
do {
group_name = (char *)CallService(MS_CLIST_GROUPGETNAME, (WPARAM)hGroup, 0);
- if ( group_name && lstrcmpA(group_name, "Not In List") == 0 ) {
+ if ( group_name && (strstr(group_name, "Not In List") || strstr(group_name, Translate("Not In List"))) ) {
BYTE ConfirmDelete = DBGetContactSettingByte(NULL, "CList", "ConfirmDelete", SETTING_CONFIRMDELETE_DEFAULT);
if ( ConfirmDelete )
DBWriteContactSettingByte( NULL, "CList", "ConfirmDelete", 0 );