Use libadblockplus update checker

src/plugin/PluginConfiguration.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginConfiguration.h"
 #include "PluginClient.h"
 #include "PluginIniFile.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #include "PluginHttpRequest.h"
 
 
 CPluginConfiguration::CPluginConfiguration() : m_pluginInfoPanel(0)
 {
   Invalidate();
 }
 
 
 void CPluginConfiguration::Invalidate()
 {
   m_isValid = false;
   m_isValidUserId = false;
   m_isValidPluginActivated = false;
   m_isValidPluginActivateEnabled = false;
   m_isValidPluginExpired = false;
-  m_isValidPluginUpdate = false;
   m_isValidPluginInfoPanel = false;
   m_isValidDictionary = false;
 #ifdef SUPPORT_FILTER
   m_isValidFilter = false;
 #endif
 #ifdef SUPPORT_WHITELIST
   m_isValidWhiteList = false;
 #endif
 #ifdef SUPPORT_CONFIG
   m_isValidConfig = false;
@@ skipping 56 matching lines @@
     DEBUG_ERROR("Configuration::Download\n\n" + httpRequest.GetResponseText() + "\n");
     return false;
   }
 
   const std::auto_ptr<CPluginIniFile>& iniFile = httpRequest.GetResponseFile();
 
   // 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);
-  }
-
-  it = settingsData.find("pluginupdatev");
-  if (it != settingsData.end())
-  {
-    m_pluginUpdateVersion = it->second;
-    DEBUG_SETTINGS("Settings::Configuration plugin update version:" + it->second);
-  }
   it = settingsData.find("userid");
   if (it != settingsData.end())
   {
     m_userId = it->second;
     DEBUG_SETTINGS("Settings::Configuration user id:" + it->second);
   }
 
   it = settingsData.find("dictionary");
   if (it != settingsData.end())
   {
     m_dictionaryUrl = it->second;
     DEBUG_SETTINGS("Settings::Configuration dictionary url:" + it->second);
   }
 
   it = settingsData.find("dictionaryv");
   if (it != settingsData.end())
   {
     m_dictionaryVersion = atoi(it->second);
     DEBUG_SETTINGS("Settings::Configuration dictionary version:" + it->second);
   }
 
-  m_isValidPluginUpdate = 
-    settingsData.find("pluginupdate") != settingsData.end() && 
-    settingsData.find("pluginupdatev") != settingsData.end();
-
   m_isValidUserId =
     settingsData.find("userid") != settingsData.end();
 
   m_isValidDictionary =
-    settingsData.find("dictionary") != settingsData.end() && 
-    settingsData.find("dictionaryv") != settingsData.end(); 
+    settingsData.find("dictionary") != settingsData.end() &&
+    settingsData.find("dictionaryv") != settingsData.end();
 
   it = settingsData.find("plugininfopanel");
   if (it != settingsData.end())
   {
     m_isValidPluginInfoPanel = true;
     m_pluginInfoPanel = atoi(it->second);
     DEBUG_SETTINGS("Settings::Configuration plugin info panel:" + it->second);
   }
 
 #ifdef SUPPORT_CONFIG
@@ skipping 56 matching lines @@
 }
 
 
 
 bool CPluginConfiguration::IsValidPluginExpired() const
 {
   return m_isValidPluginExpired;
 }
 
 
-bool CPluginConfiguration::IsValidPluginUpdate() const
-{
-  return m_isValidPluginUpdate;
-}
-
-
-bool CPluginConfiguration::IsValidDictionary() const
-{
-  return m_isValidDictionary;
-}
-
-
 bool CPluginConfiguration::IsPluginActivated() const
 {
   return m_isPluginActivated;
 }
 
-bool CPluginConfiguration::IsPluginRegistered() const 
+bool CPluginConfiguration::IsPluginRegistered() const
 {
   return m_isPluginRegistered;
 }
 
-int CPluginConfiguration::GetAdBlockLimit() const 
+int CPluginConfiguration::GetAdBlockLimit() const
 {
   return m_adBlockLimit;
 }
 
 
 bool CPluginConfiguration::IsPluginActivateEnabled() const
 {
   return m_isPluginActivateEnabled;
 }
 
@@ skipping 43 matching lines @@
   return m_userId;
 }
 
 
 int CPluginConfiguration::GetPluginInfoPanel() const
 {
   return m_pluginInfoPanel;
 }
 
 
-CString CPluginConfiguration::GetPluginUpdateUrl() const
-{
-  return PLUGIN_UPDATE_URL;
-}
-
-
-CString CPluginConfiguration::GetPluginUpdateVersion() const
-{
-  return m_pluginUpdateVersion;
-}
-
-
 int CPluginConfiguration::GetDictionaryVersion() const
 {
   return m_dictionaryVersion;
 }
 
 
 CString CPluginConfiguration::GetDictionaryUrl() const
 {
   return m_dictionaryUrl;
 }
@@ skipping 18 matching lines @@
 
 #endif // SUPPORT_CONFIG
 
 
 #ifdef PRODUCT_AIDOINLINE
 CString CPluginConfiguration::GetCollectedStatus() const
 {
   return m_collectedStatus;
 }
 #endif