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"
@@ skipping 381 matching lines @@
     m_properties[SETTING_LANGUAGE] = "en";
   }
   s_criticalSectionLocal.Unlock();
 
   // Default filters
 #ifdef SUPPORT_FILTER
 
   s_criticalSectionFilters.Lock();
   {
     m_filterUrlList.clear();
-    /*          m_filterUrlList[CString(FILTERS_PROTOCOL) + CString(FILTERS_HOST) + "/easylist.txt"] = 1;
-
-    m_filterFileNameList.clear();
-    m_filterFileNameList[CString(FILTERS_PROTOCOL) + CString(FILTERS_HOST) + "/easylist.txt"] = "filter1.txt";
-
-    m_filterLanguagesList.clear();
-    m_filterLanguagesList[CString(FILTERS_PROTOCOL) + CString(FILTERS_HOST) + "/easylist.txt"] = "en";
-
-    m_filterDownloadTimesList.clear();
-    m_filterDownloadTimesList[CString(FILTERS_PROTOCOL) + CString(FILTERS_HOST) + "/easylist.txt"] = time(NULL);
-    */
   }
   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 59 matching lines @@
 
     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);
+//        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);
+//        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();
@@ skipping 1771 matching lines @@
     osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
     bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*) &osvi);
 
     m_WindowsBuildNumber = osvi.dwBuildNumber;
   }
 
   return m_WindowsBuildNumber;
 }
 
 #endif // SUPPORT_WHITELIST