Initial libadblockplus integration

Shared/PluginSettings.cpp

 #include "PluginStdAfx.h"
 
 #include <Wbemidl.h>
 #include <time.h>
 #include "PluginIniFileW.h"
 #include "PluginIniFile.h"
 #include "PluginSettings.h"
 #include "PluginDictionary.h"
 #include "PluginClient.h"
 #include "PluginChecksum.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMutex.h"
 #include "PluginHttpRequest.h"
+#include <memory>
+
 
 // IE functions
 #pragma comment(lib, "iepmapi.lib")
 
 #include <knownfolders.h>
 
 class TSettings
 {
   DWORD processorId;
 
   char sPluginId[44];
 };
+
+static void SubsCallback(std::vector<AdblockPlus::SubscriptionPtr>& subscriptions);
 
 
 class CPluginSettingsLock : public CPluginMutex
 {
 public:
   CPluginSettingsLock() : CPluginMutex("SettingsFile", PLUGIN_ERROR_MUTEX_SETTINGS_FILE) {}
   ~CPluginSettingsLock() {}
 
 };
 
@@ skipping 16 matching lines @@
 
 #endif
 
 WCHAR* CPluginSettings::s_dataPath;
 WCHAR* CPluginSettings::s_dataPathParent;
 
 CPluginSettings* CPluginSettings::s_instance = NULL;
 bool CPluginSettings::s_isLightOnly = false;
 
 CComAutoCriticalSection CPluginSettings::s_criticalSectionLocal;
-#ifdef SUPPORT_FILTER
-CComAutoCriticalSection CPluginSettings::s_criticalSectionFilters;
-#endif
 #ifdef SUPPORT_WHITELIST
 CComAutoCriticalSection CPluginSettings::s_criticalSectionDomainHistory;
 #endif
 
 
 CPluginSettings::CPluginSettings() : 
   m_settingsVersion("1"), m_isDirty(false), m_isFirstRun(false), m_isFirstRunUpdate(false), m_dwMainProcessId(0), m_dwMainThreadId(0), m_dwWorkingThreadId(0), 
   m_isDirtyTab(false), m_isPluginEnabledTab(true), m_tabNumber("1")
 {
 
@@ skipping 141 matching lines @@
 
 CPluginSettings* CPluginSettings::GetInstance() 
 {
   CPluginSettings* instance = NULL;
 
   s_criticalSectionLocal.Lock();
   {
     if ((!s_instance) || (s_isLightOnly))
     {
       s_instance = new CPluginSettings();
+      CPluginClient::GetInstance()->GetFilterEngine()->FetchAvailableSubscriptions((AdblockPlus::SubscriptionsCallback)&SubsCallback);
       s_isLightOnly = false;
     }
 
     instance = s_instance;
   }
   s_criticalSectionLocal.Unlock();
 
   return instance;
 }
 
@@ skipping 44 matching lines @@
 
     CPluginSettingsLock lock;
     if (lock.IsLocked())
     {
       isRead = m_settingsFile->Read();        
       if (isRead)
       {
         if (m_settingsFile->IsValidChecksum())
         {
           m_properties = m_settingsFile->GetSectionData("Settings");
-
-#ifdef SUPPORT_FILTER                       
-          // Unpack filter URLs
-          CPluginIniFileW::TSectionData filters = m_settingsFile->GetSectionData("Filters");
-          int filterCount = 0;
-          bool bContinue = true;
-
-          s_criticalSectionFilters.Lock();
-          {
-            m_filterUrlList.clear();
-
-            do
-            {
-              CString filterCountStr;
-              filterCountStr.Format(L"%d", ++filterCount);
-
-              CPluginIniFileW::TSectionData::iterator filterIt = filters.find(L"filter" + filterCountStr);
-              CPluginIniFileW::TSectionData::iterator versionIt = filters.find(L"filter" + filterCountStr + "v");
-              CPluginIniFileW::TSectionData::iterator fileNameIt = filters.find(L"filter" + filterCountStr + "fileName");
-              CPluginIniFileW::TSectionData::iterator languageIt = filters.find(L"filter" + filterCountStr + "language");
-              CPluginIniFileW::TSectionData::iterator languageTitleIt = filters.find(L"filter" + filterCountStr + "languageTitle");
-              CPluginIniFileW::TSectionData::iterator dltIt = filters.find(L"filter" + filterCountStr + "refreshin");
-
-              if (bContinue = (filterIt != filters.end() && versionIt != filters.end()))
-              {
-                m_filterUrlList[filterIt->second] = _wtoi(versionIt->second);
-              }
-
-              if (filterIt != filters.end() && fileNameIt != filters.end())
-              {
-                m_filterFileNameList[filterIt->second] = fileNameIt->second;
-              }
-
-              if (filterIt != filters.end() && languageIt != filters.end())
-              {
-                m_filterLanguagesList[filterIt->second] = languageIt->second;
-              }
-
-              if (filterIt != filters.end()  &&  languageIt != filters.end()  &&  languageTitleIt != filters.end())
-              {
-                m_filterLanguageTitleList[languageIt->second] = languageTitleIt->second;
-              }
-
-              if (filterIt != filters.end() && dltIt != filters.end())
-              {
-                m_filterDownloadTimesList[filterIt->second] = (time_t)_wtoi(dltIt->second.GetString());
-              }
-
-            } while (bContinue);
-          }
-          s_criticalSectionFilters.Unlock();
-
-#endif // SUPPORT_FILTER
         }
         else
         {
           DEBUG_SETTINGS("Settings:Invalid checksum - Deleting file")
 
-            Clear();
+          Clear();
 
           DEBUG_ERROR_LOG(m_settingsFile->GetLastError(), PLUGIN_ERROR_SETTINGS, PLUGIN_ERROR_SETTINGS_FILE_READ_CHECKSUM, "Settings::Read - Checksum")
-            isRead = false;
+          isRead = false;
           m_isDirty = true;
         }
       }
       else if (m_settingsFile->GetLastError() == ERROR_FILE_NOT_FOUND)
       {
         DEBUG_ERROR_LOG(m_settingsFile->GetLastError(), PLUGIN_ERROR_SETTINGS, PLUGIN_ERROR_SETTINGS_FILE_READ, "Settings::Read")
           m_isDirty = true;
       }
       else
       {
@@ skipping 20 matching lines @@
 {
   // Default settings
   s_criticalSectionLocal.Lock();
   {
     m_properties.clear();
 
     m_properties[SETTING_PLUGIN_VERSION] = IEPLUGIN_VERSION;
     m_properties[SETTING_LANGUAGE] = "en";
   }
   s_criticalSectionLocal.Unlock();
-
-  // Default filters
-#ifdef SUPPORT_FILTER
-
-  s_criticalSectionFilters.Lock();
-  {
-    m_filterUrlList.clear();
-  }
-  s_criticalSectionFilters.Unlock();
-
-#endif // SUPPORT_FILTER
 }
 
 bool CPluginSettings::MakeRequestForUpdate()

[Felix Dahlke, 2013/04/03 05:35:27]

Shouldn't this call UpdateSubscription()?

 {
   time_t updateTime = this->GetValue(SETTING_LAST_UPDATE_TIME);
 
   if (time(NULL) <= updateTime)
     return false;
 
   CPluginHttpRequest httpRequest(PLUGIN_UPDATE_URL);
 
   CPluginSystem* system = CPluginSystem::GetInstance();
 
@@ skipping 25 matching lines @@
     it = settingsData.find("pluginupdatev");
     if (it != settingsData.end())
     {
       CString ver(it->second);
       SetString(SETTING_PLUGIN_UPDATE_VERSION, ver);
       m_isDirty = true;
       DEBUG_SETTINGS("Settings::Configuration plugin update version:" + it->second);
     }
   }
 
-  return true;
-}
-bool CPluginSettings::CheckFilterAndDownload()
-{
-  s_criticalSectionLocal.Lock();
-  TFilterUrlList currentFilterUrlList = this->GetFilterUrlList();
-  std::map<CString, CString> fileNamesList = this->GetFilterFileNamesList();
-
-  bool filterAvailable = false;
-  for (TFilterUrlList::iterator it = currentFilterUrlList.begin(); it != currentFilterUrlList.end(); ++it) 
-  {
-    CString downloadFilterName = it->first;
-
-    std::map<CString, CString>::const_iterator fni = fileNamesList.find(downloadFilterName);            
-    CString filename = "";
-    if (fni != fileNamesList.end())
-    {
-      filename = fni->second;
-    }
-    else
-    {
-      filename = downloadFilterName.Trim().Right(downloadFilterName.GetLength() - downloadFilterName.ReverseFind('/') - 1).Trim();
-    }
-    int version = it->second;
-
-    DEBUG_GENERAL("*** before FilterShouldLoad: " + downloadFilterName);
-
-    if ((this->FilterShouldLoad(downloadFilterName)))
-    {
-      filterAvailable = true;
-      DEBUG_GENERAL("*** before FilterlistExpired: " + downloadFilterName);
-      if (this->FilterlistExpired(downloadFilterName))
-      {
-        DEBUG_GENERAL("*** before DownloadFilterFile: " + downloadFilterName);
-//        CPluginFilter::DownloadFilterFile(downloadFilterName, filename);

[Felix Dahlke, 2013/04/03 05:35:27]

Might as well remove this line, likewise below.

-        this->SetFilterRefreshDate(downloadFilterName, time(NULL) + (5 * 24 * 60 * 60) * ((rand() % 100) / 100 * 0.4 + 0.8));
-      }
-    }
-    else
-    {
-      //Cleanup, since we don't need the filter definition
-      DeleteFile(CPluginSettings::GetDataPath(filename));
-      this->SetFilterRefreshDate(downloadFilterName, 0);
-    }
-  }
-
-  if (!filterAvailable)
-  {
-    //If no filter list found, default to "en"
-
-    this->SetString(SETTING_LANGUAGE, (BSTR)L"en");
-
-    CPluginDictionary* dict = CPluginDictionary::GetInstance();
-    dict->SetLanguage(L"en");
-
-    for (std::map<CString, CString>::iterator it = m_filterLanguagesList.begin(); it != m_filterLanguagesList.end(); ++it) 
-    {
-      if (it->second == L"en")
-      {
-//        CPluginFilter::DownloadFilterFile(it->first, m_filterFileNameList.find(it->first)->second);
-        this->SetFilterRefreshDate(it->first, time(NULL) + (5 * 24 * 60 * 60) * ((rand() % 100) / 100 * 0.4 + 0.8));
-      }
-    }
-  }
-
-  this->Write();
-
-  this->IncrementTabVersion(SETTING_TAB_FILTER_VERSION);
-
-  s_criticalSectionLocal.Unlock();
   return true;
 }
 
 CString CPluginSettings::GetDataPathParent()
 {
   if (s_dataPathParent == NULL) 
   {
     WCHAR* lpData = new WCHAR[MAX_PATH];
 
     OSVERSIONINFO osVersionInfo;
@@ skipping 331 matching lines @@
 {
   SetString(key, value ? "true":"false");
 }
 
 
 bool CPluginSettings::IsPluginEnabled() const
 {
   return m_isPluginEnabledTab;
 }
 
-
-#ifdef SUPPORT_FILTER
-
-void CPluginSettings::SetFilterUrlList(const TFilterUrlList& filters) 
-{
-  DEBUG_SETTINGS(L"Settings::SetFilterUrlList")
-
-    s_criticalSectionFilters.Lock();
-  {
-    if (m_filterUrlList != filters)
-    {
-      m_filterUrlList = filters;
-      m_isDirty = true;
-    }
-  }
-  s_criticalSectionFilters.Unlock();
-}
-
-void CPluginSettings::SetFilterFileNamesList(const std::map<CString, CString>& filters) 
-{
-  DEBUG_SETTINGS(L"Settings::SetFilterUrlList")
-
-    s_criticalSectionFilters.Lock();
-  {
-    if (m_filterFileNameList != filters)
-    {
-      m_filterFileNameList = filters;
-      m_isDirty = true;
-    }
-  }
-  s_criticalSectionFilters.Unlock();
-}
-
-TFilterUrlList CPluginSettings::GetFilterUrlList() const
-{
-  TFilterUrlList filterUrlList;
-
-  s_criticalSectionFilters.Lock();
-  {
-    filterUrlList = m_filterUrlList;
-  }
-  s_criticalSectionFilters.Unlock();
-
-  return filterUrlList;
-}
-
-
-std::map<CString, CString> CPluginSettings::GetFilterFileNamesList() const
-{
-  std::map<CString, CString> filterFileNamesList;
-
-  s_criticalSectionFilters.Lock();
-  {
-    filterFileNamesList = m_filterFileNameList;
-  }
-  s_criticalSectionFilters.Unlock();
-
-  return filterFileNamesList;
+static void SubsCallback(std::vector<AdblockPlus::SubscriptionPtr>& subscriptions)
+{
+  CPluginSettings::GetInstance()->m_subscriptions = subscriptions;
+  return;
 }
 
 
 std::map<CString, CString> CPluginSettings::GetFilterLanguageTitleList() const
 {
   std::map<CString, CString> filterList;
-
-  s_criticalSectionFilters.Lock();
-  {
-    filterList = m_filterLanguageTitleList;
-  }
-  s_criticalSectionFilters.Unlock();
-
+  for (int i = 0; i < m_subscriptions.size(); i ++)
+  {  
+    AdblockPlus::SubscriptionPtr it = m_subscriptions[i];
+    std::string title = "";
+    std::string url = "";
+
+    //TODO: Property for language name?
+    title = it.get()->GetProperty("title", title);
+    url = it.get()->GetProperty("url", url);
+
+    filterList.insert(std::make_pair(CString(CA2T(url.c_str(), CP_UTF8)), CString(CA2T(title.c_str(), CP_UTF8))));
+  }
   return filterList;
 }
 
-
-bool CPluginSettings::FilterlistExpired(CString filterlist) const
-{
-  std::map<CString, time_t>::const_iterator it = m_filterDownloadTimesList.find(filterlist);
-  if (it == m_filterDownloadTimesList.end())
-    return false;
-  if (time(NULL) >= it->second)
-    return true;
-  return false;
-}
-
-bool CPluginSettings::FilterShouldLoad(CString filterlist) const
-{
-  std::map<CString, CString>::const_iterator it = m_filterLanguagesList.find(filterlist);
-  if (it == m_filterLanguagesList.end())
-    return false;
-  CPluginSettings* pluginSettings = CPluginSettings::GetInstance();
-  if (it->second == pluginSettings->GetString(SETTING_LANGUAGE))
-    return true;
-  return false;
-}
-
-
-bool CPluginSettings::SetFilterRefreshDate(CString filterlist, time_t refreshtime)
-{
-  m_filterDownloadTimesList[filterlist] = refreshtime;
-  m_isDirty = true;
-  return true;
-}
-void CPluginSettings::AddFilterUrl(const CString& url, int version) 
-{
-  s_criticalSectionFilters.Lock();
-  {
-    TFilterUrlList::iterator it = m_filterUrlList.find(url);
-    if (it == m_filterUrlList.end() || it->second != version)
-    {
-      m_filterUrlList[url] = version;
-      m_isDirty = true;
-    }
-  }
-  s_criticalSectionFilters.Unlock();
-}
-
-void CPluginSettings::AddFilterFileName(const CString& url, const CString& fileName) 
-{
-  s_criticalSectionFilters.Lock();
-  {
-    std::map<CString, CString>::iterator it = m_filterFileNameList.find(url);
-    if (it == m_filterFileNameList.end() || it->second != fileName)
-    {
-      m_filterFileNameList[url] = fileName;
-      m_isDirty = true;
-    }
-  }
-  s_criticalSectionFilters.Unlock();
-}
-#endif // SUPPORT_FILTER
 
 bool CPluginSettings::Write(bool isDebug)
 {
   bool isWritten = true;
 
   if (!m_isDirty)
   {
     return isWritten;
   }
 
@@ skipping 13 matching lines @@
     s_criticalSectionLocal.Lock();
     {
       for (TProperties::iterator it = m_properties.begin(); it != m_properties.end(); ++it)
       {
         settings[it->first] = it->second;
       }
     }
     s_criticalSectionLocal.Unlock();
 
     m_settingsFile->UpdateSection("Settings", settings);
-
-    // Filter URL's
-#ifdef SUPPORT_FILTER
-
-    int filterCount = 0;
-    CPluginIniFileW::TSectionData filters;        
-
-    s_criticalSectionFilters.Lock();
-    {
-      for (TFilterUrlList::iterator it = m_filterUrlList.begin(); it != m_filterUrlList.end(); ++it)
-      {
-        CString filterCountStr;
-        filterCountStr.Format(L"%d", ++filterCount);
-
-        CString filterVersion;
-        filterVersion.Format(L"%d", it->second);
-
-        filters[L"filter" + filterCountStr] = it->first;
-        filters[L"filter" + filterCountStr + L"v"] = filterVersion;
-        if (m_filterFileNameList.size() > 0)
-        {
-          std::map<CString, CString>::iterator fni = m_filterFileNameList.find(it->first);
-          if (fni != m_filterFileNameList.end())
-          {
-            CString fileName = fni->second;
-            filters[L"filter" + filterCountStr + "fileName"] = fileName;
-          }
-        }
-        if (m_filterLanguagesList.size() > 0)
-        {
-          std::map<CString, CString>::iterator fli = m_filterLanguagesList.find(it->first);
-          if (fli != m_filterLanguagesList.end())
-          {
-            CString language = fli->second;
-            filters[L"filter" + filterCountStr + "language"] = language;
-
-            if (m_filterLanguageTitleList.size() > 0)
-            {
-              std::map<CString, CString>::iterator fli = m_filterLanguageTitleList.find(language);
-              if (fli != m_filterLanguageTitleList.end())
-              {
-                CString language = fli->second;
-                filters[L"filter" + filterCountStr + "languageTitle"] = language;
-              }
-            }
-
-          }
-        }
-        if (m_filterDownloadTimesList.size() > 0)
-        {
-          std::map<CString, time_t>::iterator fdti = m_filterDownloadTimesList.find(it->first);
-          if (fdti != m_filterDownloadTimesList.end())
-          {
-            CString timeString;
-            timeString.Format(L"%d", (int)fdti->second);
-            filters[L"filter" + filterCountStr + "refreshin"] = timeString;
-          }
-        }
-
-      }
-    }
-    s_criticalSectionFilters.Unlock();
-
-    m_settingsFile->UpdateSection("Filters", filters);
-
-#endif // SUPPORT_FILTER
 
     // Write file
     isWritten = m_settingsFile->Write();
     if (!isWritten)
     {
       DEBUG_ERROR_LOG(m_settingsFile->GetLastError(), PLUGIN_ERROR_SETTINGS, PLUGIN_ERROR_SETTINGS_FILE_WRITE, "Settings::Write")
     }
 
     m_isDirty = false;
 
     IncrementTabVersion(SETTING_TAB_SETTINGS_VERSION);
   }
   else
   {
     isWritten = false;
   }
 
   return isWritten;
 }
-
-#ifdef SUPPORT_WHITELIST
-
-void CPluginSettings::AddDomainToHistory(const CString& domain)
-{
-  if (!CPluginClient::IsValidDomain(domain))
-  {
-    return;
-  }
-
-  // Delete domain
-  s_criticalSectionDomainHistory.Lock();
-  {
-    for (TDomainHistory::iterator it = m_domainHistory.begin(); it != m_domainHistory.end(); ++it)
-    {
-      if (it->first == domain)
-      {
-        m_domainHistory.erase(it);
-        break;
-      }
-    }
-
-    // Get whitelist reason
-    int reason = 0;
-
-    s_criticalSectionLocal.Lock();
-    {
-      TDomainList::iterator it = m_whitelist.find(domain);
-      if (it != m_whitelist.end())
-      {
-        reason = it->second;
-      }
-      else
-      {
-        reason = 3;
-      }
-    }
-    s_criticalSectionLocal.Unlock();
-
-    // Delete domain, if history is too long
-    if (m_domainHistory.size() >= DOMAIN_HISTORY_MAX_COUNT)
-    {
-      m_domainHistory.erase(m_domainHistory.begin());
-    }
-
-    m_domainHistory.push_back(std::make_pair(domain, reason));
-  }
-  s_criticalSectionDomainHistory.Unlock();
-}
-
-
-TDomainHistory CPluginSettings::GetDomainHistory() const
-{
-  TDomainHistory domainHistory;
-
-  s_criticalSectionDomainHistory.Lock();
-  {
-    domainHistory = m_domainHistory;
-  }
-  s_criticalSectionDomainHistory.Unlock();
-
-  return domainHistory;
-}
-
-#endif // SUPPORT_WHITELIST
 
 
 bool CPluginSettings::IsPluginUpdateAvailable() const
 {
   bool isAvailable = Has(SETTING_PLUGIN_UPDATE_VERSION);
   if (isAvailable)
   {
     CString newVersion = GetString(SETTING_PLUGIN_UPDATE_VERSION);
     CString curVersion = IEPLUGIN_VERSION;
 
@@ skipping 668 matching lines @@
 // ============================================================================
 // Whitelist settings
 // ============================================================================
 
 #ifdef SUPPORT_WHITELIST
 
 void CPluginSettings::ClearWhitelist()
 {
   s_criticalSectionLocal.Lock();
   {
-    m_whitelist.clear();
-    m_whitelistToGo.clear();
+    m_whitelistedDomains.clear();
   }
   s_criticalSectionLocal.Unlock();
 }
 
 
 bool CPluginSettings::ReadWhitelist(bool isDebug)
 {
   bool isRead = true;
 
   DEBUG_SETTINGS("SettingsWhitelist::Read")
 
     if (isDebug)
     {
-      DEBUG_GENERAL("*** Loading whitelist settings:" + m_settingsFileWhitelist->GetFilePath());
+      DEBUG_GENERAL("*** Loading whitelist settings");
     }
 
     CPluginSettingsWhitelistLock lock;
     if (lock.IsLocked())
     {
-      isRead = m_settingsFileWhitelist->Read();        
-      if (isRead)
-      {
-        if (m_settingsFileWhitelist->IsValidChecksum())
+      ClearWhitelist();
+
+      s_criticalSectionLocal.Lock();
+      std::vector<AdblockPlus::FilterPtr> filters = CPluginClient::GetInstance()->GetFilterEngine()->GetListedFilters();
+      for (int i = 0; i < filters.size(); i ++)
+      {
+        if (filters[i]->GetProperty("type", AdblockPlus::Filter::Type::TYPE_INVALID) == AdblockPlus::Filter::Type::TYPE_EXCEPTION)
         {
-          ClearWhitelist();
-
-          s_criticalSectionLocal.Lock();
+          std::string text = filters[i]->GetProperty("text", "");
+          //@@||example.com^$document
+          size_t endPos = text.rfind("^$document");
+          if (endPos != std::string::npos)
           {
-            // Unpack white list
-            CPluginIniFileW::TSectionData whitelist = m_settingsFileWhitelist->GetSectionData("Whitelist");
-            int domainCount = 0;
-            bool bContinue = true;
-
-            do
+            size_t startPos = text.find("@@||") + 4;
+            if (startPos != std::string::npos)
             {
-              CString domainCountStr;
-              domainCountStr.Format(L"%d", ++domainCount);
-
-              CPluginIniFileW::TSectionData::iterator domainIt = whitelist.find(L"domain" + domainCountStr);
-              CPluginIniFileW::TSectionData::iterator reasonIt = whitelist.find(L"domain" + domainCountStr + L"r");
-
-              if (bContinue = (domainIt != whitelist.end() && reasonIt != whitelist.end()))
-              {
-                m_whitelist[domainIt->second] = _wtoi(reasonIt->second);
-              }
-
-            } while (bContinue);
-
-            // Unpack white list
-            whitelist = m_settingsFileWhitelist->GetSectionData("Whitelist togo");
-            domainCount = 0;
-            bContinue = true;
-
-            do
-            {
-              CString domainCountStr;
-              domainCountStr.Format(L"%d", ++domainCount);
-
-              CPluginIniFileW::TSectionData::iterator domainIt = whitelist.find(L"domain" + domainCountStr);
-              CPluginIniFileW::TSectionData::iterator reasonIt = whitelist.find(L"domain" + domainCountStr + L"r");
-
-              if (bContinue = (domainIt != whitelist.end() && reasonIt != whitelist.end()))
-              {
-                m_whitelistToGo[domainIt->second] = _wtoi(reasonIt->second);
-              }
-
-            } while (bContinue);
+              m_whitelistedDomains.push_back(text.substr(startPos, endPos - startPos));
+            }
           }
-          s_criticalSectionLocal.Unlock();
         }
-        else
-        {
-          DEBUG_SETTINGS("SettingsWhitelist:Invalid checksum - Deleting file")
-
-            DEBUG_ERROR_LOG(m_settingsFileWhitelist->GetLastError(), PLUGIN_ERROR_SETTINGS_WHITELIST, PLUGIN_ERROR_SETTINGS_FILE_READ_CHECKSUM, "SettingsWhitelist::Read - Checksum")
-            isRead = false;
-          m_isDirtyWhitelist = true;
-        }
-      }
-      else if (m_settingsFileWhitelist->GetLastError() == ERROR_FILE_NOT_FOUND)
-      {
-        m_isDirtyWhitelist = true;
-      }
-      else
-      {
-        DEBUG_ERROR_LOG(m_settingsFileWhitelist->GetLastError(), PLUGIN_ERROR_SETTINGS_WHITELIST, PLUGIN_ERROR_SETTINGS_FILE_READ, "SettingsWhitelist::Read")
-      }
+      }
+      s_criticalSectionLocal.Unlock();
     }
     else
     {
       isRead = false;
     }
 
-    // Write file in case it is dirty
-    WriteWhitelist(isDebug);
-
     return isRead;
 }
 
 
-bool CPluginSettings::WriteWhitelist(bool isDebug)
-{
-  bool isWritten = true;
-
-  if (!m_isDirtyWhitelist)
-  {
-    return isWritten;
-  }
-
-  if (isDebug)
-  {
-    DEBUG_GENERAL("*** Writing changed whitelist settings")
-  }
+void CPluginSettings::AddWhiteListedDomain(const CString& domain)
+{
+  DEBUG_SETTINGS("SettingsWhitelist::AddWhiteListedDomain domain:" + domain)
+
+  bool isNewVersion = false;
+  bool isForcingUpdateOnStart = false;
 
   CPluginSettingsWhitelistLock lock;
   if (lock.IsLocked())
   {
-    m_settingsFileWhitelist->Clear();
-
+    ReadWhitelist(false);
+
+    std::string newDomain = CW2A(domain, CP_UTF8);
+
+    //Domain already present?
+    if (std::find(m_whitelistedDomains.begin(), m_whitelistedDomains.end(), newDomain) != m_whitelistedDomains.end())
+    {
+      return;
+    }
     s_criticalSectionLocal.Lock();
     {
-      // White list
-      int whitelistCount = 0;
-      CPluginIniFileW::TSectionData whitelist;
-
-      for (TDomainList::iterator it = m_whitelist.begin(); it != m_whitelist.end(); ++it)
-      {
-        CString whitelistCountStr;
-        whitelistCountStr.Format(L"%d", ++whitelistCount);
-
-        CString reason;
-        reason.Format(L"%d", it->second);
-
-        whitelist[L"domain" + whitelistCountStr] = it->first;
-        whitelist[L"domain" + whitelistCountStr + L"r"] = reason;
-      }
-
-      m_settingsFileWhitelist->UpdateSection("Whitelist", whitelist);
-
-      // White list (not yet committed)
-      whitelistCount = 0;
-      whitelist.clear();
-
-      for (TDomainList::iterator it = m_whitelistToGo.begin(); it != m_whitelistToGo.end(); ++it)
-      {
-        CString whitelistCountStr;
-        whitelistCountStr.Format(L"%d", ++whitelistCount);
-
-        CString reason;
-        reason.Format(L"%d", it->second);
-
-        whitelist[L"domain" + whitelistCountStr] = it->first;
-        whitelist[L"domain" + whitelistCountStr + L"r"] = reason;
-      }
-
-      m_settingsFileWhitelist->UpdateSection("Whitelist togo", whitelist);
+      AdblockPlus::FilterPtr whitelistFilter = CPluginClient::GetInstance()->GetFilterEngine()->GetFilter(std::string("@@||").append(CW2A(domain)).append("^$document"));
+      whitelistFilter->AddToList();
     }
     s_criticalSectionLocal.Unlock();
 
-    // Write file
-    isWritten = m_settingsFileWhitelist->Write();
-    if (!isWritten)
-    {
-      DEBUG_ERROR_LOG(m_settingsFileWhitelist->GetLastError(), PLUGIN_ERROR_SETTINGS_WHITELIST, PLUGIN_ERROR_SETTINGS_FILE_WRITE, "SettingsWhitelist::Write")
-    }
-
-    m_isDirty = false;
-  }
-  else
-  {
-    isWritten = false;
-  }
-
-  if (isWritten)
-  {
-    DEBUG_WHITELIST("Whitelist::Icrement version")
-
-      IncrementTabVersion(SETTING_TAB_WHITELIST_VERSION);
-  }
-
-  return isWritten;
-}
-
-
-void CPluginSettings::AddWhiteListedDomain(const CString& domain, int reason, bool isToGo)
-{
-  DEBUG_SETTINGS("SettingsWhitelist::AddWhiteListedDomain domain:" + domain)
-
-    bool isNewVersion = false;
-  bool isForcingUpdateOnStart = false;
-
-  CPluginSettingsWhitelistLock lock;
-  if (lock.IsLocked())
-  {
-    ReadWhitelist(false);
-
-    s_criticalSectionLocal.Lock();
-    {
-      bool isToGoMatcingReason = false;
-      bool isToGoMatcingDomain = false;
-
-      TDomainList::iterator itToGo = m_whitelistToGo.find(domain);
-      TDomainList::iterator it = m_whitelist.find(domain);
-      if (isToGo)
-      {
-        if (itToGo != m_whitelistToGo.end())  
-        {
-          isToGoMatcingDomain = true;
-          isToGoMatcingReason = itToGo->second == reason;
-
-          if (reason == 3)
-          {
-            m_whitelistToGo.erase(itToGo);
-            m_isDirtyWhitelist = true;                        
-          }
-          else if (!isToGoMatcingReason)
-          {
-            itToGo->second = reason;
-            m_isDirtyWhitelist = true;
-          }
-        }
-        else 
-        {
-          m_whitelistToGo[domain] = reason;
-          m_isDirtyWhitelist = true;
-
-          // Delete new togo item from saved white list
-          if (it != m_whitelist.end())
-          {
-            m_whitelist.erase(it);
-          }
-        }
-      }
-      else
-      {
-        if (isToGoMatcingDomain)
-        {
-          m_whitelistToGo.erase(itToGo);
-          m_isDirtyWhitelist = true;
-        }
-
-        if (it != m_whitelist.end())  
-        {
-          if (it->second != reason)
-          {
-            it->second = reason;
-            m_isDirtyWhitelist = true;
-          }
-        }
-        else 
-        {
-          m_whitelist[domain] = reason; 
-          m_isDirtyWhitelist = true;
-        }
-      }
-
-      isForcingUpdateOnStart = m_whitelistToGo.size() > 0;
-    }
-    s_criticalSectionLocal.Unlock();
-
-    WriteWhitelist(false);
   }
 
   if (isForcingUpdateOnStart)
   {
     ForceConfigurationUpdateOnStart();
   }
 }
 
 
 bool CPluginSettings::IsWhiteListedDomain(const CString& domain) const
 {
   bool bIsWhiteListed;
 
   s_criticalSectionLocal.Lock();
   {
-    bIsWhiteListed = m_whitelist.find(domain) != m_whitelist.end();
-    if (!bIsWhiteListed)
-    {
-      TDomainList::const_iterator it = m_whitelistToGo.find(domain);
-      bIsWhiteListed = it != m_whitelistToGo.end() && it->second != 3;
-    }
+    bIsWhiteListed = std::find(m_whitelistedDomains.begin(), m_whitelistedDomains.end(), std::string(CW2A(domain, CP_UTF8))) != m_whitelistedDomains.end();
   }
   s_criticalSectionLocal.Unlock();
 
   return bIsWhiteListed;
 }
 
 int CPluginSettings::GetWhiteListedDomainCount() const
 {
   int count = 0;
 
   s_criticalSectionLocal.Lock();
   {
-    count = (int)m_whitelist.size();
+    count = (int)m_whitelistedDomains.size();
   }
   s_criticalSectionLocal.Unlock();
 
   return count;
 }
 
 
-TDomainList CPluginSettings::GetWhiteListedDomainList(bool isToGo) const
-{
-  TDomainList domainList;
-
-  s_criticalSectionLocal.Lock();
-  {
-    if (isToGo)
-    {
-      domainList = m_whitelistToGo;
-    }
-    else
-    {
-      domainList = m_whitelist;
-    }
-  }
-  s_criticalSectionLocal.Unlock();
-
-  return domainList;
-}
-
-
-void CPluginSettings::ReplaceWhiteListedDomains(const TDomainList& domains)
-{
-  CPluginSettingsWhitelistLock lock;
-  if (lock.IsLocked())
-  {
-    ReadWhitelist(false);
-
-    s_criticalSectionLocal.Lock();
-    {
-      if (m_whitelist != domains)
-      {
-        m_whitelist = domains;
-        m_isDirtyWhitelist = true;
-      }
-
-      // Delete entries in togo list
-      bool isDeleted = true;
-
-      while (isDeleted)
-      {
-        isDeleted = false;
-
-        for (TDomainList::iterator it = m_whitelistToGo.begin(); it != m_whitelistToGo.end(); ++it)
-        {
-          if (m_whitelist.find(it->first) != m_whitelist.end() || it->second == 3)
-          {
-            m_whitelistToGo.erase(it);
-
-            // Force another round...
-            isDeleted = true;
-            break;
-          }
-        }
-      }
-    }
-    s_criticalSectionLocal.Unlock();
-
-    WriteWhitelist(false);
-  }
-}
-
-
-void CPluginSettings::RemoveWhiteListedDomainsToGo(const TDomainList& domains)
-{
-  CPluginSettingsWhitelistLock lock;
-  if (lock.IsLocked())
-  {
-    ReadWhitelist(false);
-
-    s_criticalSectionLocal.Lock();
-    {
-      for (TDomainList::const_iterator it = domains.begin(); it != domains.end(); ++it)
-      {
-        for (TDomainList::iterator itToGo = m_whitelistToGo.begin(); itToGo != m_whitelistToGo.end(); ++ itToGo)
-        {
-          if (it->first == itToGo->first)
-          {
-            m_whitelistToGo.erase(itToGo);
-            m_isDirtyWhitelist = true;
-            break;
-          }
-        }
-      }
-    }
-    s_criticalSectionLocal.Unlock();
-
-    WriteWhitelist(false);
-  }
+std::vector<std::string> CPluginSettings::GetWhiteListedDomainList(bool isToGo)
+{
+  bool r = ReadWhitelist(false);
+  return m_whitelistedDomains;
 }
 
 
 bool CPluginSettings::RefreshWhitelist()
 {
   CPluginSettingsWhitelistLock lock;
   if (lock.IsLocked())
   {
     ReadWhitelist(true);
   }
@@ skipping 14 matching lines @@
 
     osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
     bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*) &osvi);
 
     m_WindowsBuildNumber = osvi.dwBuildNumber;
   }
 
   return m_WindowsBuildNumber;
 }
 
+void CPluginSettings::SetSubscription(BSTR url)
+{
+  std::string urlConverted = CT2A(url);
+  SetSubscription(urlConverted);
+}
+
+void CPluginSettings::SetSubscription(std::string url)
+{
+  FilterEngine* filterEngine= CPluginClient::GetInstance()->GetFilterEngine();
+  AdblockPlus::SubscriptionPtr subscription = filterEngine->GetSubscription(url);
+  subscription->AddToList();
+}
+
+CString CPluginSettings::GetSubscription()
+{
+  FilterEngine* filterEngine= CPluginClient::GetInstance()->GetFilterEngine();
+  std::vector<AdblockPlus::SubscriptionPtr> subscriptions = filterEngine->GetListedSubscriptions();
+  for (int i = 0; i < subscriptions.size(); i ++)
+  {
+    if (subscriptions[i]->IsListed())
+    {
+      return CString(CA2T(subscriptions[i]->GetProperty("url", std::string()).c_str()));
+    }
+  }
+  return CString(L"");
+}
+
+
+void CPluginSettings::RefreshFilterlist()
+{
+  FilterEngine* filterEngine= CPluginClient::GetInstance()->GetFilterEngine();
+  std::vector<AdblockPlus::SubscriptionPtr> subscriptions = filterEngine->GetListedSubscriptions();
+  for (int i = 0; i < subscriptions.size(); i ++)
+  {
+    if (subscriptions[i]->IsListed())
+    {
+      subscriptions[i]->UpdateFilters();
+    }
+  }
+}
+
 #endif // SUPPORT_WHITELIST