Rely on libadblockplus for domain extraction

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"
@@ skipping 1315 matching lines @@
         }
       }
       break;
     }
   case ID_MENU_DISABLE_ON_SITE:
     {
       CPluginSettings* settings = CPluginSettings::GetInstance();
       CString urlString = GetTab()->GetDocumentUrl();
       if (client->IsWhitelistedUrl(std::wstring(urlString)))
       {
-        settings->RemoveWhiteListedDomain(ExtractDomain(urlString));
+        settings->RemoveWhiteListedDomain(client->GetHostFromUrl(urlString.GetString()).c_str());
       }
       else
       {
-        settings->AddWhiteListedDomain(ExtractDomain(urlString));
+        settings->AddWhiteListedDomain(client->GetHostFromUrl(urlString.GetString()).c_str());
       }
       GetBrowser()->Refresh();
     }
   case ID_MENU_ACCEPTABLE_ADS:
     {
       if (client->AcceptableAdsStatus())
       {
         client->RemoveSubscription(client->GetPref(L"subscriptions_exceptionsurl", L""));
       }
       else
@@ skipping 38 matching lines @@
   miiSep.fType = MFT_SEPARATOR;
 
   CPluginClient* client = CPluginClient::GetInstance();
 
   CPluginSettings* settings = CPluginSettings::GetInstance();
 
 #ifdef SUPPORT_WHITELIST
   {
     ctext = dictionary->Lookup("menu", "menu-disable-on-site");
     // Is domain in white list?
-    ReplaceString(ctext, L"?1?", ExtractDomain(url).GetString());
+    ReplaceString(ctext, L"?1?", client->GetHostFromUrl(url.GetString()));
     if (client->IsWhitelistedUrl(std::wstring(GetTab()->GetDocumentUrl())))
     {
       fmii.fState = MFS_CHECKED | MFS_ENABLED;
     }
     else
     {
       fmii.fState = MFS_UNCHECKED | MFS_ENABLED;
     }
     fmii.fMask = MIIM_STRING | MIIM_STATE;
     fmii.dwTypeData = const_cast<LPWSTR>(ctext.c_str());
@@ skipping 587 matching lines @@
         }
       }
     }
 
     hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
   }
 
   return hTabWnd;
 
 }