Cleanup

src/plugin/PluginClass.cpp

 #include "PluginStdAfx.h"
 
 #include "PluginClass.h"
 #include "PluginSettings.h"
 #include "PluginSystem.h"
 #ifdef SUPPORT_FILTER
 #include "PluginFilter.h"
 #endif
 #include "PluginMimeFilterClient.h"
 #include "PluginClient.h"
 #include "PluginClientFactory.h"
-#include "PluginHttpRequest.h"
 #include "PluginMutex.h"
-#include "DownloadSource.h"
 #include "sddl.h"
 #include "PluginUtil.h"
 #include "PluginUserSettings.h"
 
 #include "../shared/Dictionary.h"
 
 #ifdef DEBUG_HIDE_EL
 DWORD profileTime = 0;
 #endif
 
@@ skipping 55 matching lines @@
   std::wstring locale((LPCWSTR)system->GetBrowserLanguage());
   Dictionary::Create(locale);
 
   bool isMainTab = settings->IncrementTabCount();
 
   if (isMainTab)
   {
     // Prepare settings
     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 (dictionary version = 1)
-    if (settings->GetString(SETTING_DICTIONARY_VERSION, L"1").Compare(L"1") == 0)
-    {
-      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->SetFirstRunUpdate();
-    }
-
-    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();
-    }
-#endif // ENABLE_DEBUG_INFO
-
-    settings->Write(false);
   }
 }
 
 CPluginClass::~CPluginClass()
 {
   delete m_tab;
 
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
   settings->DecrementTabCount();
@@ skipping 412 matching lines @@
 
   CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
   if (browser)
   {
     HRESULT hr = S_OK;
     hr = browser->get_StatusBar(&isVisible);
     if (SUCCEEDED(hr))
     {
       if (!isVisible)
       {
-        if (!settings->GetBool("statusbarasked", false))
+        if (!settings->GetStatusBarAsked())

[Oleksandr, 2013/07/05 03:33:55]

This is the only case where we might have still needed the settings.ini. We need
some sort of flag to indicate that we have already asked the user if he wants to
enable the status bar. I suggest storing that flag in the registry instead.

[Wladimir Palant, 2013/07/05 09:26:45]

I suggest storing it in prefs.json instead - via the engine. Then we have all
settings in one place.

         {
           SHANDLE_PTR pBrowserHWnd;
           browser->get_HWND((SHANDLE_PTR*)&pBrowserHWnd);
           Dictionary* dictionary = Dictionary::GetInstance();
-          settings->SetBool("statusbarasked", true);
-          settings->Write();
+          settings->SetStatusBarAsked(true);
 
           HKEY pHkey;
           HKEY pHkeySub;
           LSTATUS regRes = 0;
           regRes = RegOpenCurrentUser(KEY_WRITE, &pHkey);
 
           // Do we have enough rights to enable a status bar?
           if (regRes != 0)
           {
             // We use the tab window here and in the next few calls, since the browser window may still not be available
@@ skipping 817 matching lines @@
         else
         {
           s_mimeFilter = NULL;
 
           CPluginClientFactory::ReleaseMimeFilterClientInstance();
         }
       }
       s_criticalSectionLocal.Unlock();
     }
     break;
-#ifndef ENTERPRISE
-  case ID_SETTINGS:
-    {
-      url = CString(UserSettingsFileUrl().c_str());
-    }
-    break;
-#endif
-  case ID_INVITEFRIENDS:
-    {
-      url = CPluginHttpRequest::GetStandardUrl(USERS_SCRIPT_INVITATION);
-      navigationErrorId = PLUGIN_ERROR_NAVIGATION_INVITATION;
-    }
-    break;
-
-  case ID_FAQ:
-    {
-      url = CPluginHttpRequest::GetStandardUrl(USERS_SCRIPT_FAQ);
-      navigationErrorId = PLUGIN_ERROR_NAVIGATION_FAQ;
-    }
-    break;
-
-  case ID_FEEDBACK:
-    {
-      CPluginHttpRequest httpRequest(USERS_SCRIPT_FEEDBACK);
-
-      httpRequest.AddPluginId();
-      httpRequest.Add("reason", 0);
-      httpRequest.Add(L"url", m_tab->GetDocumentUrl(), false);
-
-      url = httpRequest.GetUrl();
-      navigationErrorId = PLUGIN_ERROR_NAVIGATION_FEEDBACK;
-    }
-    break;
-
-  case ID_ABOUT:
-    {
-      url = CPluginHttpRequest::GetStandardUrl(USERS_SCRIPT_ABOUT);
-      navigationErrorId = PLUGIN_ERROR_NAVIGATION_ABOUT;
-    }
-    break;
-
   default:
-
     break;
   }
 
   // Invalidate and redraw the control
   UpdateStatusBar();
 
   CComQIPtr<IWebBrowser2> browser = GetBrowser();
   if (!url.IsEmpty() && browser)
   {
     VARIANT vFlags;
@@ skipping 42 matching lines @@
   MENUITEMINFOW miiSep;
   memset(&miiSep, 0, sizeof(MENUITEMINFO));
   miiSep.cbSize = sizeof(MENUITEMINFO);
   miiSep.fMask = MIIM_TYPE | MIIM_FTYPE;
   miiSep.fType = MFT_SEPARATOR;
 
   CPluginClient* client = CPluginClient::GetInstance();
 
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
-  settings->RefreshTab();
-
-  // Update settings
-  m_tab->OnUpdateSettings(false);
-
 #ifdef SUPPORT_WHITELIST
   {
     // White list domain
     ctext = dictionary->Lookup("menu", "disable-on-site");
     fmii.fMask = MIIM_STRING | MIIM_STATE;
     fmii.fState = MFS_DISABLED;
     fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
     fmii.cch = ctext.size();
 
     UINT index = WM_WHITELIST_DOMAIN;
 
     ::SetMenuItemInfoW(hMenu, ID_WHITELISTDOMAIN, FALSE, &fmii);
   }
 #else
   {
     ::DeleteMenu(hMenu, ID_WHITELISTDOMAIN, FALSE);
   }
 #endif // SUPPORT_WHITELIST
 
-  // Invite friends
-  ctext = dictionary->Lookup("menu", "invite");
-  fmii.fMask  = MIIM_STATE | MIIM_STRING;
-  fmii.fState = MFS_ENABLED;
-  fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
-  fmii.cch = ctext.size();
-  ::SetMenuItemInfoW(hMenu, ID_INVITEFRIENDS, FALSE, &fmii);
-
-  // FAQ
-  ctext = dictionary->Lookup("menu", "faq");
-  fmii.fMask  = MIIM_STATE | MIIM_STRING;
-  fmii.fState = MFS_ENABLED;
-  fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
-  fmii.cch = ctext.size();
-  ::SetMenuItemInfoW(hMenu, ID_FAQ, FALSE, &fmii);
-
-  // About
-  ctext = dictionary->Lookup("menu", "about");
-  fmii.fMask = MIIM_STATE | MIIM_STRING;
-  fmii.fState = MFS_ENABLED;
-  fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
-  fmii.cch = ctext.size();
-  ::SetMenuItemInfoW(hMenu, ID_ABOUT, FALSE, &fmii);
-
-  // Feedback
-  ctext = dictionary->Lookup("menu", "feedback");
-  fmii.fMask = MIIM_STATE | MIIM_STRING;
-  fmii.fState = MFS_ENABLED;
-  fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
-  fmii.cch = ctext.size();
-  ::SetMenuItemInfoW(hMenu, ID_FEEDBACK, FALSE, &fmii);
-
   // Plugin enable
   if (settings->GetPluginEnabled())
   {
     ctext = dictionary->Lookup("menu", "disable");
   }
   else
   {
     ctext = dictionary->Lookup("menu", "enable");
   }
   fmii.fMask  = MIIM_STATE | MIIM_STRING;
   fmii.fState = client ? MFS_ENABLED : MFS_DISABLED;
   fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
   fmii.cch = ctext.size();
   ::SetMenuItemInfoW(hMenu, ID_PLUGIN_ENABLE, FALSE, &fmii);
 
   // Settings
-#ifndef ENTERPRISE
   ctext = dictionary->Lookup("menu", "settings");
   fmii.fMask  = MIIM_STATE | MIIM_STRING;
   fmii.fState = MFS_ENABLED;
   fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
   fmii.cch = ctext.size();
   ::SetMenuItemInfoW(hMenu, ID_SETTINGS, FALSE, &fmii);
-#else
-  RemoveMenu(hMenu, ID_SETTINGS, MF_BYCOMMAND);
-  RemoveMenu(hMenu, 5, MF_BYPOSITION);
-#endif
 
   return true;
 }
 
 
 STDMETHODIMP CPluginClass::Exec(const GUID*, DWORD nCmdID, DWORD, VARIANTARG*, VARIANTARG*)
 {
   HWND hBrowserWnd = GetBrowserHWND();
   if (!hBrowserWnd)
   {
@@ skipping 344 matching lines @@
           if (FAILED(hr))
           {
             DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_SETTINGS, "Navigation::Failed")
           }
         }
       }
 #endif
     }
     break;
 
-#ifndef ENTERPRISE
 
-  case WM_LAUNCH_INFO:
+    // First run page 
+    case WM_LAUNCH_INFO:
     {
       // Set the status bar visible, if it isn't
       // Otherwise the user won't see the icon the first time
 
       if (wParam == 1)
       {
         // Redirect to welcome page
         VARIANT_BOOL isVisible;
         CComQIPtr<IWebBrowser2> browser = GetAsyncBrowser();
         if (browser)
@@ skipping 21 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.Add("errors", settings->GetErrorList());
-
-
-          hr = browser->Navigate(CComBSTR(httpRequest.GetUrl() + "&src=" + DOWNLOAD_SOURCE), NULL, NULL, NULL, NULL);
+          //TODO: Navigate to first run page here
+/*        hr = browser->Navigate(CComBSTR("FIRST_RUN_PAGE_URL"), 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.Add("info", wParam);
-
           VARIANT vFlags;
           vFlags.vt = VT_I4;
           vFlags.intVal = navOpenInNewTab;
 
-          HRESULT hr = browser->Navigate(CComBSTR(httpRequest.GetUrl()), &vFlags, NULL, NULL, NULL);
+          // TODO: Navigate to info page here or remove this clause
+/*          HRESULT hr = browser->Navigate(CComBSTR(INFO_PAGE_URL), &vFlags, NULL, NULL, NULL);
           if (FAILED(hr))
           {
             vFlags.intVal = navOpenInNewWindow;
 
             hr = browser->Navigate(CComBSTR(httpRequest.GetUrl()), &vFlags, NULL, NULL, NULL);
             if (FAILED(hr))
             {
               DEBUG_ERROR_LOG(hr, PLUGIN_ERROR_NAVIGATION, PLUGIN_ERROR_NAVIGATION_INFO, "Navigation::Info page failed")
             }
           }
+          */
         }
       }
     }
     break;
-#endif
 
   case WM_DESTROY:
     break;
   case SC_CLOSE:
     break;
 
   case WM_UPDATEUISTATE:
     {
       CPluginTab* tab = GetTab(::GetCurrentThreadId());
       if (tab)
@@ skipping 138 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }