From 2c0155832bfb197fd3895d378edfed89f93f9b16 Mon Sep 17 00:00:00 2001 From: Claudio Valerio Date: Mon, 26 Sep 2011 10:08:10 +0200 Subject: [PATCH] removed getuniboard.com access --- src/adaptors/UBThumbnailAdaptor.cpp | 4 + src/adaptors/adaptors.pri | 113 +++++++------ .../publishing/UBAbstractPublisher.cpp | 148 ------------------ src/adaptors/publishing/UBAbstractPublisher.h | 51 ------ .../publishing/UBDocumentPublisher.cpp | 4 +- src/adaptors/publishing/UBDocumentPublisher.h | 3 +- src/core/UBSettings.cpp | 24 --- src/core/UBSettings.h | 15 -- src/web/UBWebController.cpp | 48 ------ src/web/UBWebController.h | 5 - 10 files changed, 63 insertions(+), 352 deletions(-) delete mode 100644 src/adaptors/publishing/UBAbstractPublisher.cpp delete mode 100644 src/adaptors/publishing/UBAbstractPublisher.h diff --git a/src/adaptors/UBThumbnailAdaptor.cpp b/src/adaptors/UBThumbnailAdaptor.cpp index d0d89454..22c251d7 100644 --- a/src/adaptors/UBThumbnailAdaptor.cpp +++ b/src/adaptors/UBThumbnailAdaptor.cpp @@ -101,7 +101,11 @@ QList UBThumbnailAdaptor::load(UBDocumentProxy* proxy) if (file.exists()) { QPixmap pix; //Warning. Works only with modified Qt +#ifdef Q_WS_X11 + pix.load(fileName, 0, Qt::AutoColor); +#else pix.load(fileName, 0, Qt::AutoColor, false); +#endif thumbnails.append(pix); } else { moreToProcess = false; diff --git a/src/adaptors/adaptors.pri b/src/adaptors/adaptors.pri index 7f20116b..1e79c60b 100644 --- a/src/adaptors/adaptors.pri +++ b/src/adaptors/adaptors.pri @@ -1,57 +1,56 @@ - -HEADERS += src/adaptors/UBExportAdaptor.h\ - src/adaptors/UBExportPDF.h \ - src/adaptors/UBExportFullPDF.h \ - src/adaptors/UBExportDocument.h \ - src/adaptors/UBSvgSubsetAdaptor.h \ - src/adaptors/UBMetadataDcSubsetAdaptor.h \ - src/adaptors/UBImportAdaptor.h \ - src/adaptors/UBImportDocument.h \ - src/adaptors/UBThumbnailAdaptor.h \ - src/adaptors/UBImportPDF.h \ - src/adaptors/UBImportImage.h \ - src/adaptors/UBIniFileParser.h \ - src/adaptors/UBExportWeb.h \ - src/adaptors/UBWebPublisher.h \ - src/adaptors/UBImportCFF.h \ - src/adaptors/UBCFFSubsetAdaptor.h - -HEADERS += src/adaptors/publishing/UBDocumentPublisher.h \ - src/adaptors/publishing/UBAbstractPublisher.h \ - src/adaptors/publishing/UBSvgSubsetRasterizer.h - -HEADERS += src/adaptors/voting/UBAbstractVotingSystem.h - - -SOURCES += src/adaptors/UBExportAdaptor.cpp\ - src/adaptors/UBExportPDF.cpp \ - src/adaptors/UBExportFullPDF.cpp \ - src/adaptors/UBExportDocument.cpp \ - src/adaptors/UBSvgSubsetAdaptor.cpp \ - src/adaptors/UBMetadataDcSubsetAdaptor.cpp \ - src/adaptors/UBImportAdaptor.cpp \ - src/adaptors/UBImportDocument.cpp \ - src/adaptors/UBThumbnailAdaptor.cpp \ - src/adaptors/UBImportPDF.cpp \ - src/adaptors/UBImportImage.cpp \ - src/adaptors/UBIniFileParser.cpp \ - src/adaptors/UBExportWeb.cpp \ - src/adaptors/UBWebPublisher.cpp \ - src/adaptors/UBImportCFF.cpp \ - src/adaptors/UBCFFSubsetAdaptor.cpp - -SOURCES += src/adaptors/publishing/UBDocumentPublisher.cpp \ - src/adaptors/publishing/UBAbstractPublisher.cpp \ - src/adaptors/publishing/UBSvgSubsetRasterizer.cpp - -SOURCES += src/adaptors/voting/UBAbstractVotingSystem.cpp - - -win32 { - - SOURCES += src/adaptors/voting/UBReply2005VotingSystem.cpp \ - src/adaptors/voting/UBReplyWRS970VotingSystem.cpp - - HEADERS += src/adaptors/voting/UBReply2005VotingSystem.h \ - src/adaptors/voting/UBReplyWRS970VotingSystem.h -} + +HEADERS += src/adaptors/UBExportAdaptor.h\ + src/adaptors/UBExportPDF.h \ + src/adaptors/UBExportFullPDF.h \ + src/adaptors/UBExportDocument.h \ + src/adaptors/UBSvgSubsetAdaptor.h \ + src/adaptors/UBMetadataDcSubsetAdaptor.h \ + src/adaptors/UBImportAdaptor.h \ + src/adaptors/UBImportDocument.h \ + src/adaptors/UBThumbnailAdaptor.h \ + src/adaptors/UBImportPDF.h \ + src/adaptors/UBImportImage.h \ + src/adaptors/UBIniFileParser.h \ + src/adaptors/UBExportWeb.h \ + src/adaptors/UBWebPublisher.h \ + src/adaptors/UBImportCFF.h \ + src/adaptors/UBCFFSubsetAdaptor.h + +HEADERS += src/adaptors/publishing/UBDocumentPublisher.h \ + src/adaptors/publishing/UBSvgSubsetRasterizer.h + +HEADERS += src/adaptors/voting/UBAbstractVotingSystem.h + + +SOURCES += src/adaptors/UBExportAdaptor.cpp\ + src/adaptors/UBExportPDF.cpp \ + src/adaptors/UBExportFullPDF.cpp \ + src/adaptors/UBExportDocument.cpp \ + src/adaptors/UBSvgSubsetAdaptor.cpp \ + src/adaptors/UBMetadataDcSubsetAdaptor.cpp \ + src/adaptors/UBImportAdaptor.cpp \ + src/adaptors/UBImportDocument.cpp \ + src/adaptors/UBThumbnailAdaptor.cpp \ + src/adaptors/UBImportPDF.cpp \ + src/adaptors/UBImportImage.cpp \ + src/adaptors/UBIniFileParser.cpp \ + src/adaptors/UBExportWeb.cpp \ + src/adaptors/UBWebPublisher.cpp \ + src/adaptors/UBImportCFF.cpp \ + src/adaptors/UBCFFSubsetAdaptor.cpp \ + src/adaptors/publishing/UBDocumentPublisher.cpp + +SOURCES += \ + src/adaptors/publishing/UBSvgSubsetRasterizer.cpp + +SOURCES += src/adaptors/voting/UBAbstractVotingSystem.cpp + + +win32 { + + SOURCES += src/adaptors/voting/UBReply2005VotingSystem.cpp \ + src/adaptors/voting/UBReplyWRS970VotingSystem.cpp + + HEADERS += src/adaptors/voting/UBReply2005VotingSystem.h \ + src/adaptors/voting/UBReplyWRS970VotingSystem.h +} diff --git a/src/adaptors/publishing/UBAbstractPublisher.cpp b/src/adaptors/publishing/UBAbstractPublisher.cpp deleted file mode 100644 index 657c6f87..00000000 --- a/src/adaptors/publishing/UBAbstractPublisher.cpp +++ /dev/null @@ -1,148 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#include "UBAbstractPublisher.h" - -#include - -#include -#include - -#include "core/UBSettings.h" -#include "core/UBApplication.h" - -#include "network/UBNetworkAccessManager.h" -#include "network/UBServerXMLHttpRequest.h" - -#include "core/memcheck.h" - -UBAbstractPublisher::UBAbstractPublisher(QObject *parent) - : QObject(parent) - , mTokenRequest(0) -{ - // NOOP -} - - -void UBAbstractPublisher::authenticate() -{ - sendAuthenticationTokenRequest(); -} - - -void UBAbstractPublisher::sendAuthenticationTokenRequest() -{ - QUrl publishingEndpoint = QUrl(UBSettings::settings()->publishingAuthenticationUrl); - - mTokenRequest = new UBServerXMLHttpRequest(UBNetworkAccessManager::defaultAccessManager()); - - mTokenRequest->setVerbose(true); - - UBApplication::showMessage(tr("Contacting %1").arg(UBSettings::settings()->uniboardWebUrl->get().toString()), true); - - connect(mTokenRequest, SIGNAL(finished(bool, const QByteArray&)), this, SLOT(processAuthenticationTokenResponse(bool, const QByteArray&))); - - mTokenRequest->get(publishingEndpoint); -} - - -void UBAbstractPublisher::processAuthenticationTokenResponse(bool success, const QByteArray& payload) -{ - if (mTokenRequest) - mTokenRequest->deleteLater(); - - if (success) - { - /* - - ... - iFzZIXhPxHTLhJeHWFF9BDVblMDWU546rpzoEEfxMSLrftMq444w4BuoisnNtRAjm6ht3hKUIHmMKA3xGN2Hlaof8tbYNLHmzf2R1dO439vnXFiHMPLBi7nFpSEPtBNJ - 26fea4c0-1319-012d-d0fc-001f5b3d920c - ... - - */ - - QDomDocument doc("publishing-token"); - doc.setContent(payload, false); - - QDomElement root = doc.documentElement(); - - const QString token = root.firstChildElement("token").text(); - const QString uuid = root.firstChildElement("uuid").text(); - - if (token.length() > 0 && uuid.length() > 0) - { - const QByteArray encrypted = encrypt(token); - QString encryptedBase64 = QString::fromAscii(encrypted.toBase64()); - - UBApplication::showMessage(tr("Found %1").arg(UBSettings::settings()->uniboardWebUrl->get().toString()), false); - - emit authenticated(QUuid(uuid), encryptedBase64); - } - else - { - qWarning() << "Authentication failed" << QString::fromUtf8(payload); - - emit authenticationFailure(); - - UBApplication::showMessage(tr("Cannot Authenticate with %1").arg(UBSettings::settings()->uniboardWebUrl->get().toString())); - } - } - else - { - qWarning() << "Authentication failed" << QString::fromUtf8(payload); - - emit authenticationFailure(); - - UBApplication::showMessage(tr("Cannot Authenticate with %1").arg(UBSettings::settings()->uniboardWebUrl->get().toString())); - } -} - -QByteArray UBAbstractPublisher::encrypt(const QString& clear) -{ - static const char *key = "9ecHaspud9uD9ste5erAchehefrup3ec"; - - EVP_CIPHER_CTX aesEncryptContext; - - EVP_CIPHER_CTX_init(&aesEncryptContext); - - EVP_EncryptInit_ex(&aesEncryptContext, EVP_aes_256_ecb(), NULL, (const unsigned char*)key, NULL); - - QByteArray clearData = clear.toUtf8(); - - int cipheredLength = clearData.length() + AES_BLOCK_SIZE; - int paddingLength = 0; - - unsigned char *cipherText = (unsigned char *)malloc(cipheredLength); - - if(!EVP_EncryptInit_ex(&aesEncryptContext, NULL, NULL, NULL, NULL)) - return QByteArray(); - - if(!EVP_EncryptUpdate(&aesEncryptContext, cipherText, &cipheredLength, (unsigned char *)clearData.data(), clearData.length())) - return QByteArray(); - - /* update ciphertext with the final remaining bytes */ - if(!EVP_EncryptFinal_ex(&aesEncryptContext, cipherText + cipheredLength, &paddingLength)) - return QByteArray(); - - QByteArray cipheredData((const char *)cipherText, cipheredLength + paddingLength); - - free(cipherText); - EVP_CIPHER_CTX_cleanup(&aesEncryptContext); - - return cipheredData; - -} - - diff --git a/src/adaptors/publishing/UBAbstractPublisher.h b/src/adaptors/publishing/UBAbstractPublisher.h deleted file mode 100644 index 44d92898..00000000 --- a/src/adaptors/publishing/UBAbstractPublisher.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -#ifndef UBABSTRACTPUBLISHER_H -#define UBABSTRACTPUBLISHER_H - -#include - -class UBServerXMLHttpRequest; - - -class UBAbstractPublisher : public QObject -{ - Q_OBJECT - public: - explicit UBAbstractPublisher(QObject *parent = 0); - virtual ~UBAbstractPublisher(){} - - void authenticate(); - - signals: - - void authenticated(const QUuid&, const QString&); - void authenticationFailure(); - - private: - - void sendAuthenticationTokenRequest(); - - QByteArray encrypt(const QString& token); - - UBServerXMLHttpRequest* mTokenRequest; - - private slots: - - void processAuthenticationTokenResponse(bool, const QByteArray&); - -}; - -#endif // UBABSTRACTPUBLISHER_H diff --git a/src/adaptors/publishing/UBDocumentPublisher.cpp b/src/adaptors/publishing/UBDocumentPublisher.cpp index ed6e73f5..97d1645e 100644 --- a/src/adaptors/publishing/UBDocumentPublisher.cpp +++ b/src/adaptors/publishing/UBDocumentPublisher.cpp @@ -48,14 +48,14 @@ UBDocumentPublisher::UBDocumentPublisher(UBDocumentProxy* pDocument, QObject *parent) - : UBAbstractPublisher(parent) + : QObject(parent) , mSourceDocument(pDocument) , mPublishingDocument(0) , mUsername("") , mPassword("") , bLoginCookieSet(false) { - init(); + //NOOP } diff --git a/src/adaptors/publishing/UBDocumentPublisher.h b/src/adaptors/publishing/UBDocumentPublisher.h index e0375c4c..cd746313 100644 --- a/src/adaptors/publishing/UBDocumentPublisher.h +++ b/src/adaptors/publishing/UBDocumentPublisher.h @@ -19,7 +19,6 @@ #include #include "ui_webPublishing.h" -#include "UBAbstractPublisher.h" #define DOCPUBLICATION_URL "http://planete.sankore.org/xwiki/bin/view/CreateResources/UniboardUpload?xpage=plain&outputSyntax=plain" @@ -79,7 +78,7 @@ private: }; -class UBDocumentPublisher : public UBAbstractPublisher +class UBDocumentPublisher : public QObject { Q_OBJECT; diff --git a/src/core/UBSettings.cpp b/src/core/UBSettings.cpp index 373b22b9..68fa5c88 100644 --- a/src/core/UBSettings.cpp +++ b/src/core/UBSettings.cpp @@ -170,33 +170,10 @@ void UBSettings::ValidateKeyboardPaletteKeyBtnSize() void UBSettings::init() { - uniboardWebUrl = new UBSetting(this, "App", "UniboardWebAddress", "http://web.getuniboard.com"); productWebUrl = new UBSetting(this, "App", "ProductWebAddress", "http://www.sankore.org"); - softwareUpdatesUrl = uniboardWebUrl->get().toString() + "/software/installer/"; - softwareLibrariesUrl = uniboardWebUrl->get().toString() + "/software/library/"; softwareHomeUrl = productWebUrl->get().toString(); - softwarePurchaseUrl = uniboardWebUrl->get().toString() + "/software/purchase/"; - - oEmbedJsLibraryUrl = uniboardWebUrl->get().toString() + "/widgets/videopicker/scripts/jquery.oembed.js"; - - documentsPublishingUrl = uniboardWebUrl->get().toString() + "/documents/publish"; - capturesPublishingUrl = uniboardWebUrl->get().toString() + "/captures/publish"; - publishingAuthenticationUrl = uniboardWebUrl->get().toString() + "/publish/token"; - - documentPlayerScriptUrl = uniboardWebUrl->get().toString() + "/uniboard-player/scripts/ubplayer.js"; - documentPlayerPageScriptUrl = uniboardWebUrl->get().toString() + "/uniboard-player/scripts/ubplayer.page.js"; - documentPlayerCssUrl = uniboardWebUrl->get().toString() + QLatin1String("/uniboard-player/stylesheets/viewer.css"); - -#ifdef Q_WS_MAC - appRssUrl = softwareUpdatesUrl + "appcast-mac.xml"; -#elif defined(Q_WS_WIN) - appRssUrl = softwareUpdatesUrl + "appcast-win.xml"; -#else - appRssUrl = ""; // TODO Linux -#endif - appToolBarPositionedAtTop = new UBSetting(this, "App", "ToolBarPositionedAtTop", true); appToolBarDisplayText = new UBSetting(this, "App", "ToolBarDisplayText", true); appEnableAutomaticSoftwareUpdates = new UBSetting(this, "App", "EnableAutomaticSoftwareUpdates", true); @@ -223,7 +200,6 @@ void UBSettings::init() boardUseHighResTabletEvent = new UBSetting(this, "Board", "UseHighResTabletEvent", true); -// boardKeyboardPaletteAutoMinimize = new UBSetting(this, "Board", "KeyboardPaletteAutoMinimize", true); boardKeyboardPaletteKeyBtnSize = new UBSetting(this, "Board", "KeyboardPaletteKeyBtnSize", "16x16"); ValidateKeyboardPaletteKeyBtnSize(); diff --git a/src/core/UBSettings.h b/src/core/UBSettings.h index 6b7a8961..8c1d2d60 100644 --- a/src/core/UBSettings.h +++ b/src/core/UBSettings.h @@ -192,21 +192,9 @@ class UBSettings : public QObject static QString defaultDocumentGroupName; static QString documentTrashGroupName; - UBSetting* uniboardWebUrl; UBSetting* productWebUrl; - QString softwareUpdatesUrl; - QString appRssUrl; - QString softwareLibrariesUrl; QString softwareHomeUrl; - QString oEmbedJsLibraryUrl; - QString softwarePurchaseUrl; - QString documentsPublishingUrl; - QString capturesPublishingUrl; - QString publishingAuthenticationUrl; - QString documentPlayerScriptUrl; - QString documentPlayerPageScriptUrl; - QString documentPlayerCssUrl; UBSetting* appToolBarPositionedAtTop; UBSetting* appToolBarDisplayText; @@ -233,7 +221,6 @@ class UBSettings : public QObject UBSetting* boardUseHighResTabletEvent; -// UBSetting* boardKeyboardPaletteAutoMinimize; UBSetting* boardKeyboardPaletteKeyBtnSize; UBColorListSetting* boardPenLightBackgroundColors; @@ -308,8 +295,6 @@ class UBSettings : public QObject UBSetting* favoritesNativeToolUris; - //UBSetting* shouldShowBundleMessage; - UBSetting* replyWWSerialPort; UBSetting* replyPlusConnectionURL; UBSetting* replyPlusAddressingMode; diff --git a/src/web/UBWebController.cpp b/src/web/UBWebController.cpp index 3dbd6aed..69a37230 100644 --- a/src/web/UBWebController.cpp +++ b/src/web/UBWebController.cpp @@ -602,54 +602,6 @@ void UBWebController::captureEduMedia() } } - -void UBWebController::getOEmbedProviderList() -{ - QUrl url(UBSettings::settings()->oEmbedJsLibraryUrl); - - mGetOEmbedProviderListRequest = new UBServerXMLHttpRequest(UBNetworkAccessManager::defaultAccessManager()); // destroyed in getOEmbedProviderListResponse - - connect(mGetOEmbedProviderListRequest, SIGNAL(finished(bool, const QByteArray&)), this, SLOT(getOEmbedProviderListResponse(bool, const QByteArray&))); - - mGetOEmbedProviderListRequest->get(url); -} - - -void UBWebController::getOEmbedProviderListResponse(bool success, const QByteArray& payload) -{ - - if (success) - { - QString js(payload); - QStringList lines = js.split("\n"); - - foreach(QString line, lines) - { - if (line.contains("new OEmbedProvider(")) - { - int start = line.indexOf("("); - int end = line.indexOf(")", start); - - QString provider = line.mid(start, end - start); - provider = provider.replace(" ", ""); - provider = provider.replace("\"", ""); - - QStringList providerInfo = provider.split(","); - - if (providerInfo.length() >= 2) - { - mOEmbedProviders << providerInfo.at(1); - } - } - } - - qDebug() << "oEmbed provider list" << mOEmbedProviders; - } - - mGetOEmbedProviderListRequest->deleteLater(); -} - - bool UBWebController::isOEmbedable(const QUrl& pUrl) { QString urlAsString = pUrl.toString(); diff --git a/src/web/UBWebController.h b/src/web/UBWebController.h index a7e6651e..62ddb51c 100644 --- a/src/web/UBWebController.h +++ b/src/web/UBWebController.h @@ -119,8 +119,6 @@ class UBWebController : public QObject private slots: - void getOEmbedProviderList(); - void activePageChanged(); void trapFlash(); @@ -128,9 +126,6 @@ class UBWebController : public QObject void showKeyboard(bool checked); - - void getOEmbedProviderListResponse(bool success, const QByteArray& payload); - signals: /** * This signal is emitted once the screenshot has been performed. This signal is also emitted when user