Removal of all user tracking and shareware parts

Shared/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginDictionary.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
@@ skipping 79 matching lines @@
         settings->SetMainProcessId();
         settings->SetMainUiThreadId();
 
         // Ensure plugin version
         if (!settings->Has(SETTING_PLUGIN_VERSION))
         {
             settings->SetString(SETTING_PLUGIN_VERSION, IEPLUGIN_VERSION);
                     settings->SetFirstRunUpdate();
         }
 
-        // First run or deleted settings file)
-        if (!settings->Has(SETTING_PLUGIN_ID))
+        // First run or deleted settings file (dictionary version = 1)
+                if (settings->GetString(SETTING_DICTIONARY_VERSION, L"1").Compare(L"1") == 0)
         {
-            settings->SetString(SETTING_PLUGIN_ID, system->GetPluginId());
             settings->SetFirstRun();
         }
                 
         // Update?
         CString oldVersion = settings->GetString(SETTING_PLUGIN_VERSION);
             if (settings->IsFirstRunUpdate() || settings->GetString(SETTING_PLUGIN_UPDATE_VERSION) == IEPLUGIN_VERSION || oldVersion != IEPLUGIN_VERSION)
         {
             settings->SetString(SETTING_PLUGIN_VERSION, IEPLUGIN_VERSION);
 
-            settings->Remove(SETTING_REG_DATE);
-            settings->Remove(SETTING_PLUGIN_UPDATE_TIME);
+                        settings->Remove(SETTING_PLUGIN_UPDATE_TIME);
             settings->Remove(SETTING_PLUGIN_UPDATE_VERSION);
             settings->Remove(SETTING_PLUGIN_UPDATE_URL);
 
                     settings->SetFirstRunUpdate();
             }
 
-        // Ensure max REGISTRATION_MAX_ATTEMPTS registration attempts today
-        CString regDate = settings->GetString(SETTING_REG_DATE);
-
-        SYSTEMTIME systemTime;
-        ::GetSystemTime(&systemTime);
-
-        CString today;
-        today.Format(L"%d-%d-%d", systemTime.wYear, systemTime.wMonth, systemTime.wDay);
-        
-        if (regDate != today)
-        {
-                        if (regDate == "") 
-                        {
-                                settings->SetString(SETTING_REG_DATE, today);
-                                settings->SetValue(SETTING_REG_ATTEMPTS, 0);
-                                settings->Remove(SETTING_REG_SUCCEEDED);
-                        }
-                        else
-                        {
-                                COleDateTime regDateDateTime;
-                                if (regDateDateTime.ParseDateTime(regDate))
-                                {
-                                        COleDateTime todayDateTime;
-                                        todayDateTime.ParseDateTime(today);
-                                        COleDateTimeSpan weekDateTime;
-                                        weekDateTime.SetDateTimeSpan(2, 0, 0, 0);
-                                        if (((todayDateTime - regDateDateTime) >= weekDateTime) || (todayDateTime < regDateDateTime))
-                                        {
-                                                settings->SetString(SETTING_REG_DATE, today);
-                                                settings->SetValue(SETTING_REG_ATTEMPTS, 0);
-                                                settings->Remove(SETTING_REG_SUCCEEDED);
-                                        }
-                                }
-                        }
-        }
-        // Only allow one trial, if settings or whitelist changes
-        else if (settings->GetForceConfigurationUpdateOnStart())
-        {
-            settings->SetValue(SETTING_REG_ATTEMPTS, REGISTRATION_MAX_ATTEMPTS - 1);
-            settings->Remove(SETTING_REG_SUCCEEDED);
-
-            settings->RemoveForceConfigurationUpdateOnStart();
-        }
-
         int info = settings->GetValue(SETTING_PLUGIN_INFO_PANEL, 0);
 
 #ifdef ENABLE_DEBUG_RESULT
         CPluginDebug::DebugResultClear();
 #endif
 
 #ifdef ENABLE_DEBUG_INFO
         if (info == 0 || info > 2)
         {
             CPluginDebug::DebugClear();
@@ skipping 450 matching lines @@
                                 }
                         }
                 }
                 else 
                 {
                         DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_GET_STATUSBAR, "Class::Get statusbar state");
                 }
         }
 }
 
-void CPluginClass::DisplayActivateMessage()
-{
-        CPluginSettings* settings = CPluginSettings::GetInstance();
-        
-        CString messageString;
-        messageString.Format(L"The daily adblocklimit has been reached and no-more ads are blocked today.\nThe free version of Simple Adblock only blocks %d adrequests a day.\n\nTo enjoy unlimited adblocking please upgrade.", settings->GetValue(SETTING_PLUGIN_ADBLOCKLIMIT, 0));
-
-        settings->SetValue(SETTING_PLUGIN_ADBLOCKCOUNT, settings->GetValue(SETTING_PLUGIN_ADBLOCKLIMIT, 0) + 1);
-        settings->Write();
-
-        LRESULT res = MessageBox(NULL, messageString, L"Upgrade to Simple Adblock Pro", MB_OKCANCEL);
-        if (res == IDOK)
-        {
-                CPluginSettings* settings = CPluginSettings::GetInstance();
-                CPluginHttpRequest httpRequest(USERS_SCRIPT_UPGRADE);
-                CPluginSystem* system = CPluginSystem::GetInstance();
-                httpRequest.Add(L"plugin", system->GetPluginId());
-                httpRequest.Add(L"user", settings->GetString(SETTING_USER_ID));
-                httpRequest.Add(L"version", settings->GetString(SETTING_PLUGIN_VERSION));
-                CString url = httpRequest.GetUrl();
-
-                CPluginTab* tab = CPluginClass::GetTab(::GetCurrentThreadId());                                                 
-                CComQIPtr<IWebBrowser2> browser = tab->m_plugin->GetBrowser();    
-                if (!url.IsEmpty() && browser)
-                {
-                        VARIANT vFlags;
-                        vFlags.vt = VT_I4;
-                        vFlags.intVal = navOpenInNewTab;
-
-                        HRESULT hr = browser->Navigate(CComBSTR(url), &vFlags, NULL, NULL, NULL);
-                        if (FAILED(hr))
-                        {
-                                vFlags.intVal = navOpenInNewWindow;
-
-                                hr = browser->Navigate(CComBSTR(url), &vFlags, NULL, NULL, NULL);
-                        }
-                }
-        }
-}
 void CPluginClass::BeforeNavigate2(DISPPARAMS* pDispParams)
 {
 
         if (pDispParams->cArgs < 7)
         {
         return; 
         }
-        CPluginSettings* settings = CPluginSettings::GetInstance();
-        //Reset adblockcount every day
-        SYSTEMTIME stNow;
-        GetSystemTime(&stNow);
-        WORD limitDay = settings->GetValue(SETTING_PLUGIN_LIMITDAY, 0);
-        if (limitDay != stNow.wDay)
+        //Register a mime filter if it's not registered yet
+        if (s_mimeFilter == NULL)
         {
-                settings->SetValue(SETTING_PLUGIN_ADBLOCKCOUNT, 0);
-                settings->SetValue(SETTING_PLUGIN_LIMITDAY, stNow.wDay);
-                settings->Write();
-                settings->Read();
-
-                //Also register a mime filter if it's not registered yet
-                if (s_mimeFilter == NULL)
-                {
-                        s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance();
-                }
-
-        }
-
-        if (!settings->GetBool(SETTING_PLUGIN_REGISTRATION, false))
-        {
-                if ((settings->GetValue(SETTING_PLUGIN_ADBLOCKCOUNT, 0) == settings->GetValue(SETTING_PLUGIN_ADBLOCKLIMIT, 0)) 
-                        && (settings->GetValue(SETTING_PLUGIN_ADBLOCKLIMIT, 0) > 0))
-                {
-                        DisplayActivateMessage();
-                }
+                s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance();
         }
 
         // Get the IWebBrowser2 interface
         CComQIPtr<IWebBrowser2, &IID_IWebBrowser2> WebBrowser2Ptr;
         VARTYPE vt = pDispParams->rgvarg[6].vt; 
         if (vt == VT_DISPATCH)
     {
             WebBrowser2Ptr = pDispParams->rgvarg[6].pdispVal;
         }
         else 
@@ skipping 693 matching lines @@
         ::DestroyWindow(hMenuWnd);
 
         switch (nCommand)
         {
         case ID_PLUGIN_UPDATE:
         {
             s_isPluginToBeUpdated = true;
                 }
         break;
 
-        case ID_PLUGIN_ACTIVATE:
-                {
-                        url = CPluginHttpRequest::GetStandardUrl(USERS_SCRIPT_ACTIVATE);
-                        navigationErrorId = PLUGIN_ERROR_NAVIGATION_ACTIVATE;
-                }        
-                break;
-
         case ID_PLUGIN_ENABLE:
                 {
                         CPluginSettings* settings = CPluginSettings::GetInstance();
-                        //Display activation menu if enabling expired plugin
-                        if (!settings->GetPluginEnabled())
-                        {
-                                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))
-                                {               
-                                        DisplayActivateMessage();
-                                        return;
-                                }
-                        }
+
                         settings->TogglePluginEnabled();
 
                         // Enable / disable mime filter
                         s_criticalSectionLocal.Lock();
                         {
-                                //Display activation menu if enabling expired plugin
                                 if (settings->GetPluginEnabled())
                                 {
                                         s_mimeFilter = CPluginClientFactory::GetMimeFilterClientInstance();
                                 }
                                 else
                                 {
                                         s_mimeFilter = NULL;
 
                                         CPluginClientFactory::ReleaseMimeFilterClientInstance();
                                 }
                         }
                         s_criticalSectionLocal.Unlock();
 
 #ifdef SUPPORT_WHITELIST
                         client->ClearWhiteListCache();
 #endif
                 }
                 break;
 #ifndef ENTERPRISE
         case ID_SETTINGS:
                 {
                     // Update settings server side on next IE start, as they have possibly changed
                 CPluginSettings* settings = CPluginSettings::GetInstance();
 
                         settings->ForceConfigurationUpdateOnStart();
 
 #ifdef PRODUCT_SIMPLEADBLOCK
 
             CPluginHttpRequest httpRequest(USERS_SCRIPT_USER_SETTINGS);
-            
-            httpRequest.AddPluginId();
-            httpRequest.Add("username", system->GetUserName(), false);
-                        
+                                
                         url = httpRequest.GetUrl();
 
                         navigationErrorId = PLUGIN_ERROR_NAVIGATION_SETTINGS;
 #endif
                 }
                 break;
 #endif
         case ID_INVITEFRIENDS:
                 {
                         url = CPluginHttpRequest::GetStandardUrl(USERS_SCRIPT_INVITATION);
@@ skipping 207 matching lines @@
 
         CPluginClient* client = CPluginClient::GetInstance();
 
     CPluginSettings* settings = CPluginSettings::GetInstance();
     
     settings->RefreshTab();
 
     // Update settings
         m_tab->OnUpdateSettings(false);
 
-#ifndef ENTERPRISE
-    // Plugin activate
-    if (!settings->GetBool(SETTING_PLUGIN_REGISTRATION, false))
-    {
-        ctext = dictionary->Lookup("MENU_ACTIVATE");
-            fmii.fMask  = MIIM_STATE | MIIM_STRING;
-            fmii.fState = MFS_ENABLED;
-        fmii.dwTypeData = ctext.GetBuffer();
-        fmii.cch = ctext.GetLength();
-        ::SetMenuItemInfo(hMenu, ID_PLUGIN_ACTIVATE, FALSE, &fmii);
-    }
-    else
-    {
-        ::DeleteMenu(hMenu, ID_PLUGIN_ACTIVATE, FALSE);
-    }
-#else
-        ::DeleteMenu(hMenu, ID_PLUGIN_ACTIVATE, FALSE);
-#endif
-#ifndef ENTERPRISE
     // Plugin update
     if (settings->IsPluginUpdateAvailable())
     {
         ctext = dictionary->Lookup("MENU_UPDATE");
             fmii.fMask  = MIIM_STATE | MIIM_STRING;
             fmii.fState = MFS_ENABLED;
         fmii.dwTypeData = ctext.GetBuffer();
         fmii.cch = ctext.GetLength();
         ::SetMenuItemInfo(hMenu, ID_PLUGIN_UPDATE, FALSE, &fmii);
     }
     else
     {
         ::DeleteMenu(hMenu, ID_PLUGIN_UPDATE, FALSE);
     }
-#else 
-        ::DeleteMenu(hMenu, ID_PLUGIN_UPDATE, FALSE);
-#endif
     #ifdef SUPPORT_WHITELIST
     {
             // White list domain
             ctext = dictionary->Lookup("MENU_DISABLE_ON");
         fmii.fMask = MIIM_STRING | MIIM_STATE;
         fmii.fState = MFS_DISABLED;
             fmii.dwTypeData = ctext.GetBuffer();
             fmii.cch = ctext.GetLength();
 
             UINT index = WM_WHITELIST_DOMAIN;
@@ skipping 612 matching lines @@
                                         }
                                         else
                                         {
                                                 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_UI, PLUGIN_ERROR_UI_GET_STATUSBAR, "Class::Get statusbar state");
                                         }
 
                     CPluginSettings* settings = CPluginSettings::GetInstance();
 
                     CPluginHttpRequest httpRequest(USERS_SCRIPT_WELCOME);
 
-                    httpRequest.AddPluginId();
-                    httpRequest.Add("username", system->GetUserName(), false);
-                    httpRequest.Add("errors", settings->GetErrorList());
+                                        httpRequest.Add("errors", settings->GetErrorList());
 
 
                                 hr = browser->Navigate(CComBSTR(httpRequest.GetUrl() + "&src=" + DOWNLOAD_SOURCE), NULL, NULL, NULL, NULL);
                                         if (FAILED(hr))
                                         {
                                                 DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_WELCOME, "Navigation::Welcome page failed")
                                         }
 
                             // Update settings server side on next IE start, as they have possibly changed
                                 settings->ForceConfigurationUpdateOnStart();
                         }
                     }
                 else
                 {
                 // Redirect to info page
                 CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
                 if (browser)
                 {
                     CPluginHttpRequest httpRequest(USERS_SCRIPT_INFO);
-                    
-                    httpRequest.AddPluginId();
-                            httpRequest.Add("info", wParam);
+
+                                        httpRequest.Add("info", wParam);
 
                     VARIANT vFlags;
                     vFlags.vt = VT_I4;
                     vFlags.intVal = navOpenInNewTab;
                     
                                 HRESULT hr = browser->Navigate(CComBSTR(httpRequest.GetUrl()), &vFlags, NULL, NULL, NULL);
                                         if (FAILED(hr))
                                         {
                                             vFlags.intVal = navOpenInNewWindow;
 
@@ skipping 156 matching lines @@
                                 }
                         }
                 }
 
                 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
         }
 
         return hTabWnd;
 
 }