Initial libadblockplus integration

Shared/PluginUserSettings.cpp

 #include "PluginStdAfx.h"
 #include "PluginUserSettings.h"
 #include <algorithm>
 #include "PluginSettings.h"
 #include "PluginClient.h"
 #include "PluginIniFileW.h"
 #include "PluginDictionary.h"
 
 static const CString s_GetMessage = L"GetMessage";
 static const CString s_GetLanguageCount = L"GetLanguageCount";
@@ skipping 234 matching lines @@
     }
   }
   else if (s_SetLanguage == method)
   {
     if (1 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (VT_BSTR != pDispparams->rgvarg[0].vt)
       return DISP_E_TYPEMISMATCH;
 
-    CComBSTR language = pDispparams->rgvarg[0].bstrVal;
-
-    settings->SetString(SETTING_LANGUAGE, (BSTR)language);
-    settings->Write();
-    settings->SetSubscription((BSTR)language);
+    CComBSTR url = pDispparams->rgvarg[0].bstrVal;
+
+    settings->SetSubscription((BSTR)url);
   }
   else if (s_GetLanguage == method)
   {
     if (pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (pVarResult)
     {
-      CString language = settings->GetString(SETTING_LANGUAGE);
-
-      pVarResult->vt = VT_BSTR; 
-      pVarResult->bstrVal = SysAllocString(language);
+      CString url = settings->GetSubscription();
+
+      pVarResult->vt = VT_BSTR; 
+      pVarResult->bstrVal = SysAllocString(url);
     }
   }
   else if (s_GetWhitelistDomains == method)
   {
     if (pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (pVarResult)
     {
-      TDomainList whiteList = settings->GetWhiteListedDomainList(true);
+      std::vector<std::string> whiteList = settings->GetWhiteListedDomainList(true);
       CString sWhiteList;
-      for (TDomainList::const_iterator it = whiteList.begin(); it != whiteList.end(); ++it)
+      for (int i = 0; i < whiteList.size(); i++)
       {            
         if (!sWhiteList.IsEmpty())
         {
           sWhiteList += ',';
         }
-        sWhiteList += it->first;
+        sWhiteList += CString(CA2W(whiteList[i].c_str(), CP_UTF8));
       }
 
       pVarResult->vt = VT_BSTR; 
       pVarResult->bstrVal = SysAllocString(sWhiteList);
     }
   }
   else if (s_AddWhitelistDomain == method)
   {
     if (1 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (VT_BSTR != pDispparams->rgvarg[0].vt)
       return DISP_E_TYPEMISMATCH;
 
     CComBSTR domain = pDispparams->rgvarg[0].bstrVal;
     if (domain.Length())
     {
-      if (!settings->IsWhiteListedDomain((BSTR)domain)) 
-      {
-        settings->AddWhiteListedDomain((BSTR)domain, 1, true);
-      }
+      settings->AddWhiteListedDomain((BSTR)domain);
     }
   }
   else if (s_RemoveWhitelistDomain == method)
   {
     if (1 != pDispparams->cArgs)
       return DISP_E_BADPARAMCOUNT;
 
     if (VT_BSTR != pDispparams->rgvarg[0].vt)
       return DISP_E_TYPEMISMATCH;
 
     CComBSTR domain = pDispparams->rgvarg[0].bstrVal;
     if (settings->IsWhiteListedDomain((BSTR)domain)) 
     {
-      settings->AddWhiteListedDomain((BSTR)domain, 3, true);
+      settings->AddWhiteListedDomain((BSTR)domain);
       CPluginClient::GetInstance()->ClearWhiteListCache();
     }
   }
   else 
     return DISP_E_MEMBERNOTFOUND;
 
   return S_OK;
 }