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 88 matching lines @@
       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_FILTER
-  httpRequest.Add("filterv", settings->GetValue(SETTING_FILTER_VERSION, 0));
-#endif
 #ifdef SUPPORT_CONFIG
   httpRequest.Add("configv", settings->GetValue(SETTING_CONFIG_VERSION, 0));
 #endif
 
   if (!isOk)
   {
     return false;
   }
 
   if (!httpRequest.Send(false))
@@ skipping 96 matching lines @@
 
     DEBUG_SETTINGS("Settings::Configuration file version:" + it->second);
   }
   else
   {
     m_isValidConfig = false;
   }
 
 #endif // SUPPORT_CONFIG
 
-#ifdef SUPPORT_FILTER
-
-  // Unpack filter URL's
-  m_isValidFilter = iniFile->HasSection("Filters");
-  if (m_isValidFilter)
-  {
-    it = settingsData.find(SETTING_FILTER_VERSION);
-    if (it != settingsData.end())
-    {
-      m_filterVersion = atoi(it->second);
-    }
-
-    CPluginIniFile::TSectionData filters = iniFile->GetSectionData("Filters");
-
-    int filterCount = 0;
-    bool bContinue = true;
-
-    m_filterUrlList.clear();
-
-    do
-    {
-      CStringA filterCountStr;
-      filterCountStr.Format("%d", ++filterCount);
-
-      CPluginIniFile::TSectionData::iterator filterIt = filters.find("filter" + filterCountStr);
-      CPluginIniFile::TSectionData::iterator versionIt = filters.find("filter" + filterCountStr + "v");
-      CPluginIniFile::TSectionData::iterator fileNameIt = filters.find("filter" + filterCountStr + "filename");
-
-      if (bContinue = (filterIt != filters.end() && versionIt != filters.end()))
-      {
-        m_filterUrlList[CString(filterIt->second)] = atoi(versionIt->second);
-        if (fileNameIt != filters.end())
-        {
-          m_filterFileNameList[CString(filterIt->second)] = fileNameIt->second;
-        }
-      }
-
-    } while (bContinue);
-  }
-
-#endif // SUPPORT_FILTER
-
 #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;
@@ skipping 211 matching lines @@
 
 #endif // SUPPORT_CONFIG
 
 
 #ifdef PRODUCT_AIDOINLINE
 CString CPluginConfiguration::GetCollectedStatus() const
 {
   return m_collectedStatus;
 }
 #endif