Initial libadblockplus integration

Shared/PluginConfiguration.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginConfiguration.h"
 #include "PluginClient.h"
 #include "PluginIniFile.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginHttpRequest.h"
 
 
@@ skipping 50 matching lines @@
 
   httpRequest.Add("enabled", settings->GetPluginEnabled() ? "true":"false");
   httpRequest.Add("lang", settings->GetString(SETTING_LANGUAGE, "err"));
   httpRequest.Add("ie", system->GetBrowserVersion());
   httpRequest.Add("ielang", system->GetBrowserLanguage());
 
   httpRequest.AddOsInfo();
 
   httpRequest.Add("errors", settings->GetErrorList());
 
-#ifdef SUPPORT_WHITELIST
-
-  // White list info
-  CString whiteListCount;   
-  whiteListCount.Format(L"%d", settings->GetWhiteListedDomainCount());
-
-  httpRequest.Add("wcount", whiteListCount);
-
-  TDomainList whiteListToGo = settings->GetWhiteListedDomainList(true);
-  TDomainList whiteListToGoSent;
-
-  if (!whiteListToGo.empty())
-  {
-    CString whiteList;
-    int count = 0;
-
-    for (TDomainList::const_iterator it = whiteListToGo.begin(); it != whiteListToGo.end() && count < 5; count++, ++it)
-    {            
-      CString whiteListReason;
-      whiteListReason.Format(L",%d", it->second);
-
-      if (!whiteList.IsEmpty())
-      {
-        whiteList += ',';
-      }
-      whiteList += it->first;
-      whiteList += whiteListReason;
-
-      whiteListToGoSent.insert(std::make_pair(it->first, it->second));
-    }
-
-    httpRequest.Add("wlist", whiteList);   
-  }
-
-#endif // SUPPORT_WHITELIST
-
   httpRequest.Add("dicv", settings->GetValue(SETTING_DICTIONARY_VERSION, 0));
 
 #ifdef SUPPORT_CONFIG
   httpRequest.Add("configv", settings->GetValue(SETTING_CONFIG_VERSION, 0));
 #endif
 
   if (!isOk)
   {
     return false;
   }
 
   if (!httpRequest.Send(false))
   {
     DEBUG_ERROR("Configuration::Download - Failed downloading settings");
     return false;
   }
 
   if (!httpRequest.IsValidResponse())
   {
     DEBUG_ERROR("Configuration::Download - Invalid settings response");
     DEBUG_ERROR("Configuration::Download\n\n" + httpRequest.GetResponseText() + "\n");
     return false;
   }
 
   const std::auto_ptr<CPluginIniFile>& iniFile = httpRequest.GetResponseFile();
 
-#ifdef SUPPORT_WHITELIST
-
-  // Update whitelists to go
-  if (!whiteListToGoSent.empty())
-  {
-    settings->RemoveWhiteListedDomainsToGo(whiteListToGoSent);
-  }
-
-#endif // SUPPORT_WHITELIST
-
   // Unpack settings
   CPluginIniFile::TSectionData settingsData = iniFile->GetSectionData("Settings");
   CPluginIniFile::TSectionData::iterator it;
 
   it = settingsData.find("pluginupdate");
   if (it != settingsData.end())
   {
     m_pluginUpdateUrl = it->second;
     DEBUG_SETTINGS("Settings::Configuration plugin update url:" + it->second);
   }
@@ skipping 62 matching lines @@
 
     DEBUG_SETTINGS("Settings::Configuration file version:" + it->second);
   }
   else
   {
     m_isValidConfig = false;
   }
 
 #endif // SUPPORT_CONFIG
 
-#ifdef SUPPORT_WHITELIST
-
-  // Unpack whitelist domains
-  m_isValidWhiteList = iniFile->HasSection("Whitelist");
-  if (m_isValidWhiteList)
-  {
-    CPluginIniFile::TSectionData whitelist = iniFile->GetSectionData("Whitelist");        
-
-    int domainCount = 0;
-    bool bContinue = true;
-
-    m_whiteList.clear();
-
-    do
-    {
-      CStringA domainCountStr;
-      domainCountStr.Format("%d", ++domainCount);
-
-      CPluginIniFile::TSectionData::iterator domainIt = whitelist.find("domain" + domainCountStr);
-      CPluginIniFile::TSectionData::iterator reasonIt = whitelist.find("domain" + domainCountStr + "r");
-
-      if (bContinue = (domainIt != whitelist.end() && reasonIt != whitelist.end()))
-      {
-        m_whiteList[CString(domainIt->second)] = atoi(reasonIt->second);
-      }
-
-    } while (bContinue);
-  }
-
-#endif // #ifdef SUPPORT_WHITELIST
   it = settingsData.find("registration");
   if (it != settingsData.end())
   {
     m_isPluginRegistered = it->second == "true";
     DEBUG_SETTINGS("Settings::Configuration registration detected:" + it->second);
   }
 
   m_adBlockLimit = -1;
   it = settingsData.find("adblocklimit");
   if (it != settingsData.end())
@@ skipping 132 matching lines @@
   return m_dictionaryVersion;
 }
 
 
 CString CPluginConfiguration::GetDictionaryUrl() const
 {
   return m_dictionaryUrl;
 }
 
 
-#ifdef SUPPORT_FILTER
-
-int CPluginConfiguration::GetFilterVersion() const
-{
-  return m_filterVersion;
-}
-
-
-TFilterUrlList CPluginConfiguration::GetFilterUrlList() const
-{
-  return m_filterUrlList;
-}
-
-std::map<CString, CString> CPluginConfiguration::GetFilterFileNamesList() const
-{
-  return m_filterFileNameList;
-}
-#endif // SUPPORT_FILTER
-
 #ifdef SUPPORT_WHITELIST
 
-TDomainList CPluginConfiguration::GetWhiteList() const
-{
-  return m_whiteList;
-}
 
 #endif // SUPPORT_WHITELIST
 
 #ifdef SUPPORT_CONFIG
 
 CString CPluginConfiguration::GetConfigUrl() const
 {
   return m_configUrl;
 }
 
 int CPluginConfiguration::GetConfigVersion() const
 {
   return m_configVersion;
 }
 
 #endif // SUPPORT_CONFIG
 
 
 #ifdef PRODUCT_AIDOINLINE
 CString CPluginConfiguration::GetCollectedStatus() const
 {
   return m_collectedStatus;
 }
 #endif