Removal of all user tracking and shareware parts

Shared/PluginSettings.cpp

 #include "PluginStdAfx.h"
 
 #include <Wbemidl.h>
 
 #include "PluginIniFileW.h"
 #include "PluginSettings.h"
 #include "PluginDictionary.h"
 #include "PluginClient.h"
 #include "PluginChecksum.h"
 #ifdef SUPPORT_FILTER
@@ skipping 215 matching lines @@
         }
 
         CPluginSettingsLock lock;
         if (lock.IsLocked())
         {
             isRead = m_settingsFile->Read();        
             if (isRead)
             {
                 if (m_settingsFile->IsValidChecksum())
                 {
-                        s_criticalSectionLocal.Lock();
-                            {
-                                    m_properties = m_settingsFile->GetSectionData("Settings");
-
-                                    // Delete obsolete properties
-                                    TProperties::iterator it = m_properties.find("pluginupdate");
-                                    if (it != m_properties.end())
-                                    {
-                                            m_properties.erase(it);
-                                            m_isDirty = true;
-                                    }
-
-                                    it = m_properties.find("pluginerrors");
-                                    if (it != m_properties.end())
-                                    {
-                                            m_properties.erase(it);
-                                            m_isDirty = true;
-                                    }
-
-                                    it = m_properties.find("pluginerrorcodes");
-                                    if (it != m_properties.end())
-                                    {
-                                            m_properties.erase(it);
-                                            m_isDirty = true;
-                                    }
-
-                                    it = m_properties.find("pluginenabled");
-                                    if (it != m_properties.end())
-                                    {
-                                            m_properties.erase(it);
-                                            m_isDirty = true;
-                                    }
-
-                                    // Convert property 'pluginid' to 'userid'
-                                    if (m_properties.find(SETTING_USER_ID) == m_properties.end())
-                                    {
-                                            it = m_properties.find("pluginid");
-                                            if (it != m_properties.end())
-                                            {
-                                                    m_properties[SETTING_USER_ID] = it->second;
-
-                                                    m_properties.erase(it);
-                                                    m_isDirty = true;
-                                            }
-                                    }
-                            }
-                            s_criticalSectionLocal.Unlock();
-
 #ifdef SUPPORT_FILTER                       
                     // Unpack filter URLs
                     CPluginIniFileW::TSectionData filters = m_settingsFile->GetSectionData("Filters");
                     int filterCount = 0;
                     bool bContinue = true;
 
                     s_criticalSectionFilters.Lock();
                             {
                                     m_filterUrlList.clear();
 
@@ skipping 59 matching lines @@
 }
 
 
 void CPluginSettings::Clear()
 {
         // Default settings
         s_criticalSectionLocal.Lock();
         {
                 m_properties.clear();
 
-                m_properties[SETTING_PLUGIN_EXPIRED] = "false";
                 m_properties[SETTING_PLUGIN_VERSION] = IEPLUGIN_VERSION;
                 m_properties[SETTING_LANGUAGE] = "en";
                 m_properties[SETTING_DICTIONARY_VERSION] = "1";
-                m_properties[SETTING_PLUGIN_REGISTRATION] = "false";
         }
         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;
@@ skipping 208 matching lines @@
     s_criticalSectionLocal.Unlock();
 }
 
 
 CString CPluginSettings::GetString(const CString& key, const CString& defaultValue) const
 {
         CString val = defaultValue;
 
     s_criticalSectionLocal.Lock();
         {
-
-                if (key == SETTING_PLUGIN_ID)
-                {
-#ifdef CONFIG_IN_REGISTRY
-                        DWORD dwResult = NULL; 
-                        HKEY hKey;
-                        RegOpenKey(HKEY_CURRENT_USER, L"SOFTWARE\\SimpleAdblock", &hKey);
-                        DWORD type = 0;
-                        WCHAR pid[250];
-                        DWORD cbData;
-                        dwResult = ::RegQueryValueEx(hKey, L"PluginId", NULL, &type, (BYTE*)pid, &cbData);
-                        if (dwResult == ERROR_SUCCESS)
-                        {
-                                CString pluginId = pid;
-                                ::RegCloseKey(hKey);
-                                s_criticalSectionLocal.Unlock();
-                                return pluginId;
-                        }
-#endif
-                }
-
-                if (key == SETTING_USER_ID)
-                {
-#ifdef CONFIG_IN_REGISTRY
-                        DWORD dwResult = NULL; 
-                        HKEY hKey;
-                        RegOpenKey(HKEY_CURRENT_USER, L"SOFTWARE\\SimpleAdblock", &hKey);
-                        DWORD type = 0;
-                        WCHAR pid[250];
-                        DWORD cbData;
-                        dwResult = ::RegQueryValueEx(hKey, L"UserId", NULL, &type, (BYTE*)pid, &cbData);
-                        if (dwResult == ERROR_SUCCESS)
-                        {
-                                CString userId = pid;
-                                ::RegCloseKey(hKey);
-                                s_criticalSectionLocal.Unlock();
-                                return userId;
-                        }
-#endif
-                }
-
                 TProperties::const_iterator it = m_properties.find(key);
                 if (it != m_properties.end())
                 {
                         val = it->second;
                 }
         }
     s_criticalSectionLocal.Unlock();
 
     DEBUG_SETTINGS("Settings::GetString key:" + key + " value:" + val)
 
@@ skipping 96 matching lines @@
 
 
 void CPluginSettings::SetBool(const CString& key, bool value)
 {
     SetString(key, value ? "true":"false");
 }
 
 
 bool CPluginSettings::IsPluginEnabled() const
 {
-        return m_isPluginEnabledTab && !GetBool(SETTING_PLUGIN_EXPIRED, false);
+        return m_isPluginEnabledTab;
 }
 
 
 #ifdef SUPPORT_FILTER
 
 void CPluginSettings::SetFilterUrlList(const TFilterUrlList& filters) 
 {
     DEBUG_SETTINGS(L"Settings::SetFilterUrlList")
 
         s_criticalSectionFilters.Lock();
@@ skipping 681 matching lines @@
             m_propertiesTab[SETTING_TAB_PLUGIN_ENABLED] = "true";
             m_isDirtyTab = true;
         }
         s_criticalSectionLocal.Unlock();
         
         WriteTab(false);
     }
 }
 bool CPluginSettings::GetPluginEnabled() const
 {
-        //Display plugin as disabled if limit is passed
-        CPluginSettings* settings = CPluginSettings::GetInstance();
-        if (!settings->GetBool(SETTING_PLUGIN_REGISTRATION, false) && 
-                (settings->GetValue(SETTING_PLUGIN_ADBLOCKCOUNT, 0) >= settings->GetValue(SETTING_PLUGIN_ADBLOCKLIMIT, 0)) && 
-                (settings->GetValue(SETTING_PLUGIN_ADBLOCKLIMIT, 0) > 0))
-        {
-                return false;
-        }
         return m_isPluginEnabledTab;
 }
 
 
 void CPluginSettings::AddError(const CString& error, const CString& errorCode)
 {
     DEBUG_SETTINGS(L"SettingsTab::AddError error:" + error + " code:" + errorCode)
 
     CPluginSettingsTabLock lock;
     if (lock.IsLocked())
@@ skipping 636 matching lines @@
            osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
            bOsVersionInfoEx = GetVersionEx((OSVERSIONINFO*) &osvi);
 
            m_WindowsBuildNumber = osvi.dwBuildNumber;
         }
 
    return m_WindowsBuildNumber;
 }
 
 #endif // SUPPORT_WHITELIST