From c46b23de3a56f5c4cd5800ff1dd2bff8b894d678 Mon Sep 17 00:00:00 2001 From: Vadim Kurland Date: Wed, 27 May 2009 06:03:41 +0000 Subject: [PATCH] sending guid with update check --- build_num | 2 +- src/gui/FWBSettings.cpp | 11 ++++ src/gui/FWBSettings.h | 2 + src/gui/FWWindow.cpp | 7 ++- src/gui/PrefsDialog.cpp | 8 ++- src/gui/check_update_url.h | 5 +- src/gui/prefsdialog_q.ui | 65 ++++++++++++----------- test/ipt/objects-for-regression-tests.fwb | 29 +++++++--- 8 files changed, 81 insertions(+), 48 deletions(-) diff --git a/build_num b/build_num index 345b92546..e7cc5c471 100644 --- a/build_num +++ b/build_num @@ -1 +1 @@ -#define BUILD_NUM 957 +#define BUILD_NUM 967 diff --git a/src/gui/FWBSettings.cpp b/src/gui/FWBSettings.cpp index a7e71c60f..2a6e20bab 100644 --- a/src/gui/FWBSettings.cpp +++ b/src/gui/FWBSettings.cpp @@ -37,6 +37,7 @@ #include #include #include +#include #include #include @@ -96,6 +97,8 @@ const char* clipComment = SETTINGS_PATH_PREFIX "/UI/ClipComment"; const char* checkUpdates = SETTINGS_PATH_PREFIX "/UI/CheckUpdates"; const char* checkUpdatesProxy = SETTINGS_PATH_PREFIX "/UI/CheckUpdatesProxy"; +const char* appGUID = SETTINGS_PATH_PREFIX "/ApplicationGUID"; + FWBSettings::FWBSettings() : QSettings(QSettings::UserScope, "netcitadel.com", "Firewall Builder") { @@ -114,6 +117,9 @@ void FWBSettings::init() { bool ok=false; + ok = contains(appGUID); + if (!ok) setValue(appGUID, QUuid::createUuid().toString() ); + ok = contains(infoStyleSetpath); if (!ok) setValue(infoStyleSetpath,2); @@ -200,6 +206,11 @@ void FWBSettings::init() #endif } +QString FWBSettings::getAppGUID() +{ + return value(appGUID).toString(); +} + QString FWBSettings::getStr(const QString &attribute) { QString path=SETTINGS_PATH_PREFIX "/"+attribute; diff --git a/src/gui/FWBSettings.h b/src/gui/FWBSettings.h index ba17d2e7c..dd024eae9 100644 --- a/src/gui/FWBSettings.h +++ b/src/gui/FWBSettings.h @@ -149,6 +149,8 @@ class FWBSettings : public QSettings { void getPrinterOptions(QPrinter *printer,int &pageWidth,int &pageHeight); void setPrinterOptions(QPrinter *printer,int pageWidth,int pageHeight); + QString getAppGUID(); + enum IconSize getIconsInRulesSize(); void setIconsInRulesSize(enum IconSize size); diff --git a/src/gui/FWWindow.cpp b/src/gui/FWWindow.cpp index 7373f8226..276c47e51 100644 --- a/src/gui/FWWindow.cpp +++ b/src/gui/FWWindow.cpp @@ -23,10 +23,12 @@ */ - #include "../../config.h" #include "global.h" #include "check_update_url.h" +#include "../../VERSION.h" +#include "../../build_num" + #include "utils.h" #include "utils_no_qt.h" @@ -375,7 +377,8 @@ void FWWindow::startupLoad() if (st->getCheckUpdates()) { // start http query to get latest version from the web site - current_version_http_getter->get(QUrl(CHECK_UPDATE_URL)); + QString url = QString(CHECK_UPDATE_URL).arg(VERSION).arg(st->getAppGUID()); + current_version_http_getter->get(QUrl(url)); } if (activeProject()) diff --git a/src/gui/PrefsDialog.cpp b/src/gui/PrefsDialog.cpp index 2c2690c79..9d707c182 100644 --- a/src/gui/PrefsDialog.cpp +++ b/src/gui/PrefsDialog.cpp @@ -26,8 +26,11 @@ #include "../../config.h" #include "global.h" -#include "utils.h" #include "check_update_url.h" +#include "../../VERSION.h" +#include "../../build_num" + +#include "utils.h" #include "PrefsDialog.h" #include "FWBSettings.h" @@ -390,7 +393,8 @@ void PrefsDialog::checkSwUpdates() connect(¤t_version_http_getter, SIGNAL(done(const QString&)), this, SLOT(checkForUpgrade(const QString&))); - current_version_http_getter.get(QUrl(CHECK_UPDATE_URL)); + QString url = QString(CHECK_UPDATE_URL).arg(VERSION).arg(st->getAppGUID()); + current_version_http_getter.get(QUrl(url)); } void PrefsDialog::checkForUpgrade(const QString& server_response) diff --git a/src/gui/check_update_url.h b/src/gui/check_update_url.h index bb8bb4181..8cde1e8c1 100644 --- a/src/gui/check_update_url.h +++ b/src/gui/check_update_url.h @@ -27,10 +27,7 @@ #ifndef CHECK_UPDATE_URL_HH #define CHECK_UPDATE_URL_HH -#include "../../VERSION.h" -#include "../../build_num" - -#define CHECK_UPDATE_URL "http://update.fwbuilder.org/update_checks/check.cgi?v="VERSION +#define CHECK_UPDATE_URL "http://update.fwbuilder.org/update_checks/check.cgi?v=%1&uuid=%2" #endif diff --git a/src/gui/prefsdialog_q.ui b/src/gui/prefsdialog_q.ui index bbbdfb6e5..44bf3a95d 100644 --- a/src/gui/prefsdialog_q.ui +++ b/src/gui/prefsdialog_q.ui @@ -9,7 +9,7 @@ 0 0 669 - 419 + 422 @@ -29,9 +29,6 @@ General - - 20 - @@ -116,14 +113,21 @@ - + + + + Check Now + + + + Check for updates automatically - + Qt::Horizontal @@ -136,14 +140,7 @@ - - - - Check Now - - - - + Qt::Horizontal @@ -156,35 +153,39 @@ - + Use http proxy while checking for updates (host:port) - + + + + + No identifiable information will be sent to the server during update check + + + + + + + Qt::Vertical + + + + 20 + 7 + + + + - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 86 - 31 - - - - diff --git a/test/ipt/objects-for-regression-tests.fwb b/test/ipt/objects-for-regression-tests.fwb index 02a4257d6..40650ca47 100644 --- a/test/ipt/objects-for-regression-tests.fwb +++ b/test/ipt/objects-for-regression-tests.fwb @@ -806,15 +806,10 @@ - - - - - @@ -823,7 +818,7 @@ - + @@ -24829,7 +24824,7 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT% - + @@ -24886,6 +24881,26 @@ echo '%FWBPROMPT%'; sh /tmp/%FWSCRIPT% + + + + + + + + + + + + + + + + + + + +