Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: Shared/PluginConfiguration.cpp

Issue 8949229: Removal of all user tracking and shareware parts (Closed)
Patch Set: Created Dec. 6, 2012, 4:38 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 2
3 #include "PluginConfiguration.h" 3 #include "PluginConfiguration.h"
4 #include "PluginClient.h" 4 #include "PluginClient.h"
5 #include "PluginIniFile.h" 5 #include "PluginIniFile.h"
6 #include "PluginSettings.h" 6 #include "PluginSettings.h"
7 #include "PluginSystem.h" 7 #include "PluginSystem.h"
8 #include "PluginHttpRequest.h" 8 #include "PluginHttpRequest.h"
9 9
10 10
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 56
57 httpRequest.AddPluginId(); 57 httpRequest.AddPluginId();
58 58
59 httpRequest.Add("enabled", settings->GetPluginEnabled() ? "true":"false"); 59 httpRequest.Add("enabled", settings->GetPluginEnabled() ? "true":"false");
60 httpRequest.Add("lang", settings->GetString(SETTING_LANGUAGE, "err")); 60 httpRequest.Add("lang", settings->GetString(SETTING_LANGUAGE, "err"));
61 httpRequest.Add("ie", system->GetBrowserVersion()); 61 httpRequest.Add("ie", system->GetBrowserVersion());
62 httpRequest.Add("ielang", system->GetBrowserLanguage()); 62 httpRequest.Add("ielang", system->GetBrowserLanguage());
63 63
64 httpRequest.AddOsInfo(); 64 httpRequest.AddOsInfo();
65 65
66 httpRequest.Add("pc", system->GetComputerName(), false);
67 httpRequest.Add("username", system->GetUserName(), false);
68
69 CString newPluginId = system->GetPluginId();
70 if (newPluginId != settings->GetString(SETTING_PLUGIN_ID))
71 {
72 httpRequest.Add("newplugin", newPluginId);
73 }
74
75 httpRequest.Add("errors", settings->GetErrorList()); 66 httpRequest.Add("errors", settings->GetErrorList());
76 67
77 #ifdef SUPPORT_WHITELIST 68 #ifdef SUPPORT_WHITELIST
78 69
79 // White list info 70 // White list info
80 CString whiteListCount; 71 CString whiteListCount;
81 whiteListCount.Format(L"%d", settings->GetWhiteListedDomainCount()); 72 whiteListCount.Format(L"%d", settings->GetWhiteListedDomainCount());
82 73
83 httpRequest.Add("wcount", whiteListCount); 74 httpRequest.Add("wcount", whiteListCount);
84 75
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 DEBUG_SETTINGS("Settings::Configuration dictionary url:" + it->second); 180 DEBUG_SETTINGS("Settings::Configuration dictionary url:" + it->second);
190 } 181 }
191 182
192 it = settingsData.find("dictionaryv"); 183 it = settingsData.find("dictionaryv");
193 if (it != settingsData.end()) 184 if (it != settingsData.end())
194 { 185 {
195 m_dictionaryVersion = atoi(it->second); 186 m_dictionaryVersion = atoi(it->second);
196 DEBUG_SETTINGS("Settings::Configuration dictionary version:" + it->secon d); 187 DEBUG_SETTINGS("Settings::Configuration dictionary version:" + it->secon d);
197 } 188 }
198 189
199
200 it = settingsData.find("pluginexpired");
201 if (it != settingsData.end())
202 {
203 m_isPluginExpired = it->second == "true";
204 m_isValidPluginExpired = true;
205 DEBUG_SETTINGS("Settings::Configuration plugin expired:" + it->second);
206 }
207
208 m_isValidPluginUpdate = 190 m_isValidPluginUpdate =
209 settingsData.find("pluginupdate") != settingsData.end() && 191 settingsData.find("pluginupdate") != settingsData.end() &&
210 settingsData.find("pluginupdatev") != settingsData.end(); 192 settingsData.find("pluginupdatev") != settingsData.end();
211 193
212 m_isValidUserId = 194 m_isValidUserId =
213 settingsData.find("userid") != settingsData.end(); 195 settingsData.find("userid") != settingsData.end();
214 196
215 m_isValidDictionary = 197 m_isValidDictionary =
216 settingsData.find("dictionary") != settingsData.end() && 198 settingsData.find("dictionary") != settingsData.end() &&
217 settingsData.find("dictionaryv") != settingsData.end(); 199 settingsData.find("dictionaryv") != settingsData.end();
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
522 504
523 #endif // SUPPORT_CONFIG 505 #endif // SUPPORT_CONFIG
524 506
525 507
526 #ifdef PRODUCT_AIDOINLINE 508 #ifdef PRODUCT_AIDOINLINE
527 CString CPluginConfiguration::GetCollectedStatus() const 509 CString CPluginConfiguration::GetCollectedStatus() const
528 { 510 {
529 return m_collectedStatus; 511 return m_collectedStatus;
530 } 512 }
531 #endif 513 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld