Initial libadblockplus integration

Shared/PluginSettings.h

 /**
 * This class contains all client functionality of the IE plugin
 *
 * Exception errors are tested by calls to ExceptionsTest from: Main ...
 */
 
 #ifndef _PLUGIN_SETTINGS_H_
 #define _PLUGIN_SETTINGS_H_
 
 
 #include "PluginTypedef.h"
-
+#include "AdblockPlus.h"
 
 // Main settings
 
 #define SETTING_PLUGIN_INFO_PANEL           L"plugininfopanel"
 #define SETTING_PLUGIN_VERSION          L"pluginversion"
 #define SETTING_PLUGIN_UPDATE_URL       L"pluginupdateurl"
 #define SETTING_PLUGIN_UPDATE_VERSION   L"pluginupdateversion"
 #define SETTING_PLUGIN_UPDATE_TIME      L"pluginupdatetime"
 #define SETTING_PLUGIN_SELFTEST         L"pluginselftest"
 #define SETTING_LANGUAGE                L"language"
 
-#ifdef SUPPORT_FILTER
-#define SETTING_FILTER_VERSION          L"filterversion"
-#endif
 #ifdef SUPPORT_CONFIG
 #define SETTING_CONFIG_VERSION          L"configversion"
 #endif
 #define SETTING_LAST_UPDATE_TIME        L"lastupdatetime"
 #define SETTING_DICTIONARY_VERSION      L"dictionaryversion"
 
 // Tab settings
 
 #define SETTING_TAB_PLUGIN_ENABLED          L"pluginenabled"
 #define SETTING_TAB_COUNT                   L"tabcount"
 #define SETTING_TAB_START_TIME              L"tabstart"
 #define SETTING_TAB_UPDATE_ON_START         L"updateonstart"
 #define SETTING_TAB_UPDATE_ON_START_REMOVE  L"updateonstartremove"
 #define SETTING_TAB_DICTIONARY_VERSION      L"dictionaryversion"
 #define SETTING_TAB_SETTINGS_VERSION        L"settingsversion"
 #ifdef SUPPORT_FILTER
 #define SETTING_TAB_FILTER_VERSION          L"filterversion"
 #endif
+
 #ifdef SUPPORT_WHITELIST
 #define SETTING_TAB_WHITELIST_VERSION       L"whitelistversion"
 #endif
 #ifdef SUPPORT_CONFIG
 #define SETTING_TAB_CONFIG_VERSION          L"configversion"
 #endif
 
 
 class CPluginIniFileW;
 
@@ skipping 19 matching lines @@
 
 #ifdef SUPPORT_WHITELIST
   TDomainList m_domainList;
   TDomainHistory m_domainHistory;
 #endif
 
   CPluginSettings::TProperties m_properties;
 
   bool m_isDirty;
 
-#ifdef SUPPORT_FILTER
-  CPluginSettings::TFilterUrlList m_filterUrlList;
-  std::map<CString, CString> m_filterFileNameList;
-  std::map<CString, CString> m_filterLanguagesList;
-  std::map<CString, CString> m_filterLanguageTitleList; // Key - language, Value - language title
-  std::map<CString, time_t> m_filterDownloadTimesList;
-#endif
-
   CString m_settingsVersion;
   std::auto_ptr<CPluginIniFileW> m_settingsFile;
 
   static WCHAR* s_dataPath;
   static WCHAR* s_dataPathParent;
 
 
   static CComAutoCriticalSection s_criticalSectionLocal;
-#ifdef SUPPORT_FILTER
-  static CComAutoCriticalSection s_criticalSectionFilters;
-#endif
 #ifdef SUPPORT_WHITELIST
   static CComAutoCriticalSection s_criticalSectionDomainHistory;
 #endif
 
   bool m_isPluginSelftestEnabled;
 
   void Clear();
 
   // Private constructor used by the singleton pattern
   CPluginSettings();    
@@ skipping 35 matching lines @@
 
   bool IsPluginEnabled() const;
   bool IsPluginUpdateAvailable() const;
 
   bool IsPluginSelftestEnabled();
 
   bool FilterlistExpired(CString filterlist) const;
   bool FilterShouldLoad(CString filterlist) const;
   bool SetFilterRefreshDate(CString filterlist, time_t refreshtime);
 
-#ifdef SUPPORT_FILTER
-
-  void SetFilterUrlList(const TFilterUrlList& filters);
-  void SetFilterFileNamesList(const std::map<CString, CString>& filters);
-  TFilterUrlList GetFilterUrlList() const;
-  std::map<CString, CString> GetFilterFileNamesList() const;
   std::map<CString, CString> GetFilterLanguageTitleList() const;
 
-  void AddFilterUrl(const CString& url, int version);
-  void AddFilterFileName(const CString& url, const CString& fileName);
-#endif // SUPPORT_FILTER
-
 #ifdef SUPPORT_WHITELIST
 
   void AddDomainToHistory(const CString& domain);
   TDomainHistory GetDomainHistory() const;
 
 #endif // SUPPORT_WHITELIST
 
   void SetMainProcessId();
   void SetMainProcessId(DWORD id);
   bool IsMainProcess(DWORD dwProcessId=0) const;
@@ skipping 82 matching lines @@
 
 public:
 
   void AddWhiteListedDomain(const CString& domain, int reason=1, bool isToGo=false);
   void RemoveWhiteListedDomainsToGo(const TDomainList& domains);
   void ReplaceWhiteListedDomains(const TDomainList& domains);
   bool IsWhiteListedDomain(const CString& domain) const;
   int GetWhiteListedDomainCount() const;
   TDomainList GetWhiteListedDomainList(bool isToGo=false) const;
 
-  bool CheckFilterAndDownload();
   bool MakeRequestForUpdate();
   bool RefreshWhitelist();
   DWORD GetWindowsBuildNumber();
 
+  void SetSubscription(BSTR language);
+  void SetSubscription(std::string language);
+  CString GetSubscription();
+  void RefreshFilterlist();
 #endif //SUPPORT_WHITELIST
 
+  std::vector<AdblockPlus::SubscriptionPtr> m_subscriptions;
 };
 
 
 #endif // _PLUGIN_SETTINGS_H_