diff --git a/Sankore_3.1.pro b/Sankore_3.1.pro
index 772f2e4c..73d4360b 100644
--- a/Sankore_3.1.pro
+++ b/Sankore_3.1.pro
@@ -75,7 +75,6 @@ FORMS += resources/forms/mainWindow.ui \
resources/forms/blackoutWidget.ui \
resources/forms/trapFlash.ui \
resources/forms/youTubePublishingDialog.ui \
- resources/forms/webPublishing.ui \
resources/forms/capturePublishing.ui \
resources/forms/intranetPodcastPublishingDialog.ui
diff --git a/resources/forms/webPublishing.ui b/resources/forms/webPublishing.ui
deleted file mode 100644
index d71282e5..00000000
--- a/resources/forms/webPublishing.ui
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
- documentPublishingDialog
-
-
- Qt::WindowModal
-
-
-
- 0
- 0
- 607
- 405
-
-
-
- Dialog
-
-
- -
-
-
- QFormLayout::AllNonFixedFieldsGrow
-
-
-
-
-
- Title
-
-
-
- -
-
-
- 60
-
-
-
- -
-
-
- E-mail
-
-
-
- -
-
-
- -
-
-
- Author
-
-
-
- -
-
-
- -
-
-
- Description
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 0
- 168
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 10
-
-
-
-
- -
-
-
- Attach Downloadable PDF Version
-
-
-
- -
-
-
- Attach Downloadable Uniboard File (UBZ)
-
-
-
- -
-
-
- Warning: This documents contains video, which will not be displayed properly on the Web
-
-
- true
-
-
-
- -
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
-
-
-
diff --git a/src/adaptors/UBWebPublisher.cpp b/src/adaptors/UBWebPublisher.cpp
deleted file mode 100644
index a979515a..00000000
--- a/src/adaptors/UBWebPublisher.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
- *
- * This file is part of Open-Sankoré.
- *
- * Open-Sankoré 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, version 3 of the License,
- * with a specific linking exception for the OpenSSL project's
- * "OpenSSL" library (or with modified versions of it that use the
- * same license as the "OpenSSL" library).
- *
- * Open-Sankoré 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 Open-Sankoré. If not, see .
- */
-
-
-
-#include "UBWebPublisher.h"
-
-#include "document/UBDocumentProxy.h"
-
-#include "adaptors/publishing/UBDocumentPublisher.h"
-
-#include "core/memcheck.h"
-
-UBWebPublisher::UBWebPublisher(QObject *parent)
- : UBExportAdaptor(parent)
-{
- // NOOP
-}
-
-
-UBWebPublisher::~UBWebPublisher()
-{
- // NOOP
-}
-
-
-QString UBWebPublisher::exportName()
-{
- return tr("Publish Document on Sankore Web");
-}
-
-
-void UBWebPublisher::persist(UBDocumentProxy* pDocumentProxy)
-{
- if (!pDocumentProxy)
- return;
-
- UBDocumentPublisher* publisher = new UBDocumentPublisher(pDocumentProxy, this); // the publisher will self delete when publication finishes
- publisher->publish();
-
-}
-
-
diff --git a/src/adaptors/UBWebPublisher.h b/src/adaptors/UBWebPublisher.h
deleted file mode 100644
index 99409373..00000000
--- a/src/adaptors/UBWebPublisher.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2010-2013 Groupement d'Intérêt Public pour l'Education Numérique en Afrique (GIP ENA)
- *
- * This file is part of Open-Sankoré.
- *
- * Open-Sankoré 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, version 3 of the License,
- * with a specific linking exception for the OpenSSL project's
- * "OpenSSL" library (or with modified versions of it that use the
- * same license as the "OpenSSL" library).
- *
- * Open-Sankoré 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 Open-Sankoré. If not, see .
- */
-
-
-
-#ifndef UBWEBPUBLISHER_H_
-#define UBWEBPUBLISHER_H_
-
-#include
-
-#include "UBExportAdaptor.h"
-
-#include "frameworks/UBFileSystemUtils.h"
-#include "ui_webPublishing.h"
-
-class UBDocumentProxy;
-class UBServerXMLHttpRequest;
-
-class UBWebPublisher : public UBExportAdaptor
-{
- Q_OBJECT;
-
- public:
- UBWebPublisher(QObject *parent = 0);
- virtual ~UBWebPublisher();
-
- virtual QString exportName();
-
- virtual void persist(UBDocumentProxy* pDocument);
-};
-
-
-#endif /* UBWEBPUBLISHER_H_ */
diff --git a/src/adaptors/adaptors.pri b/src/adaptors/adaptors.pri
index 4fc92ce9..33e7ba16 100644
--- a/src/adaptors/adaptors.pri
+++ b/src/adaptors/adaptors.pri
@@ -12,7 +12,6 @@ HEADERS += src/adaptors/UBExportAdaptor.h\
src/adaptors/UBImportImage.h \
src/adaptors/UBIniFileParser.h \
src/adaptors/UBExportWeb.h \
- src/adaptors/UBWebPublisher.h \
src/adaptors/UBImportCFF.h \
src/adaptors/UBExportCFF.h \
src/adaptors/UBCFFSubsetAdaptor.h
@@ -35,7 +34,6 @@ SOURCES += src/adaptors/UBExportAdaptor.cpp\
src/adaptors/UBImportImage.cpp \
src/adaptors/UBIniFileParser.cpp \
src/adaptors/UBExportWeb.cpp \
- src/adaptors/UBWebPublisher.cpp \
src/adaptors/UBImportCFF.cpp \
src/adaptors/UBExportCFF.cpp \
src/adaptors/UBCFFSubsetAdaptor.cpp \
diff --git a/src/adaptors/publishing/UBDocumentPublisher.cpp b/src/adaptors/publishing/UBDocumentPublisher.cpp
index 4edeffdf..19c34b5e 100644
--- a/src/adaptors/publishing/UBDocumentPublisher.cpp
+++ b/src/adaptors/publishing/UBDocumentPublisher.cpp
@@ -21,645 +21,9 @@
-#include
-
#include "UBDocumentPublisher.h"
-#include "frameworks/UBPlatformUtils.h"
-#include "frameworks/UBFileSystemUtils.h"
-#include "frameworks/UBStringUtils.h"
-
-#include "network/UBNetworkAccessManager.h"
-#include "network/UBServerXMLHttpRequest.h"
-
-#include "core/UBDocumentManager.h"
-#include "core/UBApplication.h"
-#include "core/UBPersistenceManager.h"
-#include "core/UBApplicationController.h"
-
-#include "board/UBBoardController.h"
-
-#include "gui/UBMainWindow.h"
-
-#include "document/UBDocumentProxy.h"
-#include "document/UBDocumentContainer.h"
-
-#include "domain/UBGraphicsWidgetItem.h"
-
-#include "globals/UBGlobals.h"
-
-THIRD_PARTY_WARNINGS_DISABLE
-#include "quazip.h"
-#include "quazipfile.h"
-THIRD_PARTY_WARNINGS_ENABLE
-
-#include "adaptors/UBExportFullPDF.h"
-#include "adaptors/UBExportDocument.h"
-#include "adaptors/UBSvgSubsetAdaptor.h"
-
-#include "UBSvgSubsetRasterizer.h"
-
-#include "../../core/UBApplication.h"
-
-#include "core/memcheck.h"
-
-
-UBDocumentPublisher::UBDocumentPublisher(UBDocumentProxy* pDocument, QObject *parent)
- : QObject(parent)
- , mSourceDocument(pDocument)
- , mUsername("")
- , mPassword("")
- , bLoginCookieSet(false)
-{
- init();
-}
-
-
-UBDocumentPublisher::~UBDocumentPublisher()
-{
-}
-
-
-void UBDocumentPublisher::publish()
-{
- //check that the username and password are stored on preferences
- UBSettings* settings = UBSettings::settings();
-
- if(settings->communityUsername().isEmpty() || settings->communityPassword().isEmpty()){
- UBApplication::showMessage(tr("Credentials has to not been filled out yet."));
- qDebug() << "trying to connect to community without the required credentials";
- return;
- }
-
- mUsername = settings->communityUsername();
- mPassword = settings->communityPassword();
-
- UBPublicationDlg dlg;
- if(QDialog::Accepted == dlg.exec())
- {
- mDocInfos.title = dlg.title();
- mDocInfos.description = dlg.description();
-
- buildUbwFile();
-
- UBApplication::showMessage(tr("Uploading Sankore File on Web."));
-
- sendUbw(mUsername, mPassword);
- }
-}
-
-void UBDocumentPublisher::buildUbwFile()
-{
- QDir d;
- d.mkpath(UBFileSystemUtils::defaultTempDirPath());
-
- QString tmpDir = UBFileSystemUtils::createTempDir();
-
- if (UBFileSystemUtils::copyDir(mSourceDocument->persistencePath(), tmpDir))
- {
- QString documentName = mSourceDocument->name();
-
- mPublishingPath = tmpDir;
- mPublishingSize = mSourceDocument->pageCount();
-
- rasterizeScenes();
-
- upgradeDocumentForPublishing();
-
- UBExportFullPDF pdfExporter;
- pdfExporter.setVerbode(false);
- pdfExporter.persistsDocument(mSourceDocument, mPublishingPath + "/" + documentName + ".pdf");
-
- UBExportDocument ubzExporter;
- ubzExporter.setVerbode(false);
- ubzExporter.persistsDocument(mSourceDocument, mPublishingPath + "/" + documentName + ".ubz");
-
- // remove all useless files
-
- for (int pageIndex = 0; pageIndex < mPublishingSize; pageIndex++) {
- QString filename = mPublishingPath + UBFileSystemUtils::digitFileFormat("/page%1.svg",pageIndex);
-
- QFile::remove(filename);
- }
-
- UBFileSystemUtils::deleteDir(mPublishingPath + "/" + UBPersistenceManager::imageDirectory);
- UBFileSystemUtils::deleteDir(mPublishingPath + "/" + UBPersistenceManager::objectDirectory);
- UBFileSystemUtils::deleteDir(mPublishingPath + "/" + UBPersistenceManager::videoDirectory);
- UBFileSystemUtils::deleteDir(mPublishingPath + "/" + UBPersistenceManager::audioDirectory);
-
- mTmpZipFile = UBFileSystemUtils::defaultTempDirPath() + "/" + UBStringUtils::toCanonicalUuid(QUuid::createUuid()) + ".ubw~";
-
- QuaZip zip(mTmpZipFile);
- zip.setFileNameCodec("UTF-8");
- if (!zip.open(QuaZip::mdCreate))
- {
- qWarning() << "Export failed. Cause: zip.open(): " << zip.getZipError() << "," << mTmpZipFile;
- QApplication::restoreOverrideCursor();
- return;
- }
-
- QuaZipFile outFile(&zip);
-
- if (!UBFileSystemUtils::compressDirInZip(mPublishingPath, "", &outFile, true))
- {
- qWarning("Export failed. compressDirInZip failed ...");
- zip.close();
- UBApplication::showMessage(tr("Export failed."));
- QApplication::restoreOverrideCursor();
- return;
- }
-
- if (zip.getZipError() != 0)
- {
- qWarning("Export failed. Cause: zip.close(): %d", zip.getZipError());
- zip.close();
- UBApplication::showMessage(tr("Export failed."));
- QApplication::restoreOverrideCursor();
- return;
- }
-
- zip.close();
-
- }
- else
- {
- UBApplication::showMessage(tr("Export canceled ..."));
- QApplication::restoreOverrideCursor();
- }
-}
-
-void UBDocumentPublisher::rasterizeScenes()
-{
-
- for (int pageIndex = 0; pageIndex < mPublishingSize; pageIndex++)
- {
- UBApplication::showMessage(tr("Converting page %1/%2 ...").arg(UBDocumentContainer::pageFromSceneIndex(pageIndex)).arg(mPublishingSize), true);
-
- UBDocumentProxy publishingDocument(mPublishingPath);
- UBSvgSubsetRasterizer rasterizer(&publishingDocument, pageIndex);
-
- QString filename = mPublishingPath + UBFileSystemUtils::digitFileFormat("/page%1.jpg",pageIndex);
-
- rasterizer.rasterizeToFile(filename);
-
- }
-}
-
-
-void UBDocumentPublisher::updateGoogleMapApiKey()
-{
- QDir widgestDir(mPublishingPath + "/" + UBPersistenceManager::widgetDirectory);
-
- QString uniboardWebGoogleMapApiKey = UBSettings::settings()->uniboardWebGoogleMapApiKey->get().toString();
-
- foreach(QFileInfo dirInfo, widgestDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot))
- {
- QString config = UBFileSystemUtils::readTextFile(dirInfo.absoluteFilePath() + "/config.xml").toLower();
-
- if (config.contains("google") && config.contains("map"))
- {
- QDir widgetDir(dirInfo.absoluteFilePath());
-
- foreach(QFileInfo fileInfo, widgetDir.entryInfoList(QDir::Files | QDir::NoDotAndDotDot))
- {
- QFile file(fileInfo.absoluteFilePath());
-
- if (file.open(QIODevice::ReadWrite))
- {
- QTextStream stream(&file);
- QString content = stream.readAll();
-
- if (content.contains("ABQIAAAA6vtVqAUu8kZ_eTz7c8kwSBT9UCAhw_xm0LNFHsWmQxTJAdp5lxSY_5r-lZriY_7sACaMnl80JcX6Og"))
- {
- content.replace("ABQIAAAA6vtVqAUu8kZ_eTz7c8kwSBT9UCAhw_xm0LNFHsWmQxTJAdp5lxSY_5r-lZriY_7sACaMnl80JcX6Og",
- uniboardWebGoogleMapApiKey);
-
- file.resize(0);
- file.write(content.toUtf8());
- }
- file.close();
- }
- }
- }
- }
-}
-
-
-void UBDocumentPublisher::upgradeDocumentForPublishing()
-{
- for (int pageIndex = 0; pageIndex < mPublishingSize; pageIndex++)
- {
- UBDocumentProxy publishingDocument(mPublishingPath);
- UBGraphicsScene *scene = UBSvgSubsetAdaptor::loadScene(&publishingDocument, pageIndex);
-
- QList widgets;
-
- foreach(QGraphicsItem* item, scene->items()){
- UBGraphicsW3CWidgetItem *widgetItem = dynamic_cast(item);
-
- if(widgetItem){
- generateWidgetPropertyScript(widgetItem, UBDocumentContainer::pageFromSceneIndex(pageIndex));
- widgets << widgetItem;
- }
- }
-
- QString filename = mPublishingPath + UBFileSystemUtils::digitFileFormat("/page%1.json",pageIndex);
-
- QFile jsonFile(filename);
- if (jsonFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
- {
- jsonFile.write("{\n");
- jsonFile.write(QString(" \"scene\": {\n").toUtf8());
- jsonFile.write(QString(" \"x\": %1,\n").arg(scene->normalizedSceneRect().x()).toUtf8());
- jsonFile.write(QString(" \"y\": %1,\n").arg(scene->normalizedSceneRect().y()).toUtf8());
- jsonFile.write(QString(" \"width\": %1,\n").arg(scene->normalizedSceneRect().width()).toUtf8());
- jsonFile.write(QString(" \"height\": %1\n").arg(scene->normalizedSceneRect().height()).toUtf8());
- jsonFile.write(QString(" },\n").toUtf8());
-
- jsonFile.write(QString(" \"widgets\": [\n").toUtf8());
-
- bool first = true;
-
- foreach(UBGraphicsW3CWidgetItem* widget, widgets)
- {
- if (!first)
- jsonFile.write(QString(" ,\n").toUtf8());
- jsonFile.write(QString(" {\n").toUtf8());
- jsonFile.write(QString(" \"uuid\": \"%1\",\n").arg(UBStringUtils::toCanonicalUuid(widget->uuid())).toUtf8());
- jsonFile.write(QString(" \"id\": \"%1\",\n").arg(widget->metadatas().id).toUtf8());
-
- jsonFile.write(QString(" \"name\": \"%1\",\n").arg(widget->metadatas().name).toUtf8());
- jsonFile.write(QString(" \"description\": \"%1\",\n").arg(widget->metadatas().description).toUtf8());
- jsonFile.write(QString(" \"author\": \"%1\",\n").arg(widget->metadatas().author).toUtf8());
- jsonFile.write(QString(" \"authorEmail\": \"%1\",\n").arg(widget->metadatas().authorEmail).toUtf8());
- jsonFile.write(QString(" \"authorHref\": \"%1\",\n").arg(widget->metadatas().authorHref).toUtf8());
- jsonFile.write(QString(" \"version\": \"%1\",\n").arg(widget->metadatas().authorHref).toUtf8());
-
- jsonFile.write(QString(" \"x\": %1,\n").arg(widget->sceneBoundingRect().x()).toUtf8());
- jsonFile.write(QString(" \"y\": %1,\n").arg(widget->sceneBoundingRect().y()).toUtf8());
- jsonFile.write(QString(" \"width\": %1,\n").arg(widget->sceneBoundingRect().width()).toUtf8());
- jsonFile.write(QString(" \"height\": %1,\n").arg(widget->sceneBoundingRect().height()).toUtf8());
-
- jsonFile.write(QString(" \"nominalWidth\": %1,\n").arg(widget->boundingRect().width()).toUtf8());
- jsonFile.write(QString(" \"nominalHeight\": %1,\n").arg(widget->boundingRect().height()).toUtf8());
-
- QString url = UBPersistenceManager::widgetDirectory + "/" + widget->uuid().toString() + ".wgt";
- jsonFile.write(QString(" \"src\": \"%1\",\n").arg(url).toUtf8());
- QString startFile = widget->mainHtmlFileName();
- jsonFile.write(QString(" \"startFile\": \"%1\",\n").arg(startFile).toUtf8());
-
- QMap preferences = widget->UBGraphicsWidgetItem::preferences();
-
- jsonFile.write(QString(" \"preferences\": {\n").toUtf8());
-
- foreach(QString key, preferences.keys())
- {
- QString sep = ",";
- if (key == preferences.keys().last())
- sep = "";
-
- jsonFile.write(QString(" \"%1\": \"%2\"%3\n")
- .arg(key)
- .arg(preferences.value(key))
- .arg(sep)
- .toUtf8());
- }
- jsonFile.write(QString(" },\n").toUtf8());
-
- jsonFile.write(QString(" \"datastore\": {\n").toUtf8());
-
- QMap datastoreEntries = widget->datastoreEntries();
-
- foreach(QString entry, datastoreEntries.keys())
- {
- QString sep = ",";
- if (entry == datastoreEntries.keys().last())
- sep = "";
-
- jsonFile.write(QString(" \"%1\": \"%2\"%3\n")
- .arg(entry)
- .arg(datastoreEntries.value(entry))
- .arg(sep)
- .toUtf8());
- }
- jsonFile.write(QString(" }\n").toUtf8());
-
- jsonFile.write(QString(" }\n").toUtf8());
-
- first = false;
- }
-
- jsonFile.write(" ]\n");
- jsonFile.write("}\n");
- }
- else
- {
- qWarning() << "Cannot open file" << filename << "for saving page state";
- }
-
- delete scene;
- }
-
- updateGoogleMapApiKey();
-}
-
-
-void UBDocumentPublisher::generateWidgetPropertyScript(UBGraphicsW3CWidgetItem *widgetItem, int pageNumber)
-{
-
- QMap preferences = widgetItem->UBGraphicsWidgetItem::preferences();
- QMap datastoreEntries = widgetItem->datastoreEntries();
-
- QString startFileName = widgetItem->mainHtmlFileName();
-
- if (!startFileName.startsWith("http://"))
- {
- QString startFilePath = mPublishingPath + "/" + UBPersistenceManager::widgetDirectory + "/" + widgetItem->uuid().toString() + ".wgt/" + startFileName;
-
- QFile startFile(startFilePath);
-
- if (startFile.exists())
- {
- if (startFile.open(QIODevice::ReadWrite))
- {
- QTextStream stream(&startFile);
- QStringList lines;
-
- bool addedJs = false;
-
- QString line;
- do
- {
- line = stream.readLine();
- if (!line.isNull())
- {
- lines << line;
-
- if (!addedJs && line.contains("") ) // TODO UB 4.6, this is naive ... the HEAD tag may be on several lines
- {
- lines << "";
- lines << " ";
- lines << "";
-
- addedJs = true;
- }
- }
- }
- while (!line.isNull());
-
- startFile.resize(0);
- startFile.write(lines.join("\n").toUtf8()); // TODO UB 4.x detect real html encoding
-
- startFile.close();
- }
- }
- }
- else{
- qWarning() << "Remote Widget start file, cannot inject widget preferences and datastore entries";
- }
-}
-
-void UBDocumentPublisher::init()
-{
- mCrlf=0x0d;
- mCrlf+=0x0a;
- mDocInfos.title = "";
- mDocInfos.description = "";
-
- mpCookieJar = new QNetworkCookieJar();
- mpNetworkMgr = new QNetworkAccessManager(this);
-
- connect(mpNetworkMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(onFinished(QNetworkReply*)));
-}
-
-void UBDocumentPublisher::onFinished(QNetworkReply *reply)
-{
- QVariant cookieHeader = reply->rawHeader("Set-Cookie");
- // First we concatenate all the Set-Cookie values (the packet can contains many of them)
- QStringList qslCookie = cookieHeader.toString().split("\n");
- QString qsCookieValue = qslCookie.at(0);
- for (int i = 1; i < qslCookie.size(); i++) {
- qsCookieValue += "; " +qslCookie.at(i);
- }
-
- // Now we isolate every cookie value
- QStringList qslCookieVals = qsCookieValue.split("; ");
-
- bool bTransferOk = false;
-
- for(int j = 0; j < qslCookieVals.size(); j++)
- {
- qDebug() << j;
- if(qslCookieVals.at(j).startsWith("assetStatus"))
- {
- QStringList qslAsset = qslCookieVals.at(j).split("=");
- if(qslAsset.at(1) == "UPLOADED")
- {
- bTransferOk = true;
- break;
- }
- }
- }
-
- if(bTransferOk)
- {
- UBApplication::showMessage(tr("Document uploaded correctly on the web."));
- }
- else
- {
- UBApplication::showMessage(tr("Failed to upload document on the web."));
- }
-
- reply->deleteLater();
-}
-
-void UBDocumentPublisher::sendUbw(QString username, QString password)
-{
- if (QFile::exists(mTmpZipFile))
- {
- QFile f(mTmpZipFile);
- if (f.open(QIODevice::ReadOnly))
- {
- QFileInfo fi(f);
- QByteArray ba = f.readAll();
- QString boundary,data, multipartHeader;
- QByteArray datatoSend;
-
- boundary = "---WebKitFormBoundaryDKBTgA53MiyWrzLY";
- multipartHeader = "multipart/form-data; boundary="+boundary;
-
- data="--"+boundary+mCrlf;
- data+="Content-Disposition: form-data; name=\"title\"" + mCrlf + mCrlf + mDocInfos.title + mCrlf;
- data+="--"+boundary+mCrlf;
- data+="Content-Disposition: form-data; name=\"description\"" + mCrlf + mCrlf + mDocInfos.description.remove("\n") + mCrlf;
- data+="--"+boundary+mCrlf;
- data+="Content-Disposition: form-data; name=\"file\"; filename=\""+ fi.fileName() +"\""+mCrlf;
- data+="Content-Type: application/octet-stream"+mCrlf+mCrlf;
- datatoSend=data.toAscii(); // convert data string to byte array for request
- datatoSend += ba;
- datatoSend += mCrlf;
- datatoSend += QString("--%0--%1").arg(boundary).arg(mCrlf);
-
- QNetworkRequest request(QUrl(QString(DOCPUBLICATION_URL).toAscii().constData()));
-
- request.setHeader(QNetworkRequest::ContentTypeHeader, multipartHeader);
- request.setHeader(QNetworkRequest::ContentLengthHeader,datatoSend.size());
- QString b64Auth = getBase64Of(QString("%0:%1").arg(username).arg(password));
- request.setRawHeader("Authorization", QString("Basic %0").arg(b64Auth).toAscii().constData());
- request.setRawHeader("Host", "planete.sankore.org");
- request.setRawHeader("Accept", "*/*");
- request.setRawHeader("Accept-Language", "en-US,*");
-
- mpCookieJar->setCookiesFromUrl(mCookies, QUrl(DOCPUBLICATION_URL));
- mpNetworkMgr->setCookieJar(mpCookieJar);
-
- // Send the file
- mpNetworkMgr->post(request,datatoSend);
- }
- }
-}
-
-QString UBDocumentPublisher::getBase64Of(QString stringToEncode)
-{
- return stringToEncode.toAscii().toBase64();
-}
-
-// ---------------------------------------------------------
UBProxyLoginDlg::UBProxyLoginDlg(QWidget *parent, const char *name):QDialog(parent)
, mpLayout(NULL)
, mpUserLayout(NULL)
diff --git a/src/adaptors/publishing/UBDocumentPublisher.h b/src/adaptors/publishing/UBDocumentPublisher.h
index 5e8768bf..ed6c7bec 100644
--- a/src/adaptors/publishing/UBDocumentPublisher.h
+++ b/src/adaptors/publishing/UBDocumentPublisher.h
@@ -27,9 +27,7 @@
#include
#include
-#include "ui_webPublishing.h"
-
-#define DOCPUBLICATION_URL "http://planete.sankore.org/xwiki/bin/view/CreateResources/UniboardUpload?xpage=plain&outputSyntax=plain"
+//#define DOCPUBLICATION_URL "http://planete.sankore.org/xwiki/bin/view/CreateResources/UniboardUpload?xpage=plain&outputSyntax=plain"
typedef struct
{
@@ -85,58 +83,4 @@ private:
QTextEdit* mpDescription;
QDialogButtonBox* mpButtons;
};
-
-
-class UBDocumentPublisher : public QObject
-{
- Q_OBJECT;
-
-public:
- explicit UBDocumentPublisher(UBDocumentProxy* sourceDocument, QObject *parent = 0);
- virtual ~UBDocumentPublisher();
-
- void publish();
-
-signals:
-
- void loginDone();
-
-protected:
-
- virtual void updateGoogleMapApiKey();
- virtual void rasterizeScenes();
- virtual void upgradeDocumentForPublishing();
- virtual void generateWidgetPropertyScript(UBGraphicsW3CWidgetItem *widgetItem, int pageNumber);
-
-private slots:
-
- void onFinished(QNetworkReply* reply);
-
-private:
-
- UBDocumentProxy *mSourceDocument;
-
- //UBDocumentProxy *mPublishingDocument;
- QString mPublishingPath;
- int mPublishingSize;
-
-
- void init();
- void sendUbw(QString username, QString password);
- QString getBase64Of(QString stringToEncode);
-
- QHBoxLayout* mpLayout;
- QNetworkAccessManager* mpNetworkMgr;
- QNetworkCookieJar* mpCookieJar;
- QString mUsername;
- QString mPassword;
- QString mCrlf;
- bool bLoginCookieSet;
-
- void buildUbwFile();
- QString mTmpZipFile;
- QList mCookies;
- sDocumentInfos mDocInfos;
-
-};
#endif // UBDOCUMENTPUBLISHER_H
diff --git a/src/core/UBDocumentManager.cpp b/src/core/UBDocumentManager.cpp
index bfaa2368..17c2c9f5 100644
--- a/src/core/UBDocumentManager.cpp
+++ b/src/core/UBDocumentManager.cpp
@@ -29,7 +29,6 @@
#include "adaptors/UBExportDocument.h"
#include "adaptors/UBExportWeb.h"
#include "adaptors/UBExportCFF.h"
-#include "adaptors/UBWebPublisher.h"
#include "adaptors/UBImportDocument.h"
#include "adaptors/UBImportPDF.h"
#include "adaptors/UBImportImage.h"
@@ -47,8 +46,6 @@
#include "UBSettings.h"
#include "UBPersistenceManager.h"
-#include "../adaptors/UBExportWeb.h"
-
#include "core/memcheck.h"
UBDocumentManager* UBDocumentManager::sDocumentManager = 0;
@@ -75,13 +72,9 @@ UBDocumentManager::UBDocumentManager(QObject *parent)
UBExportCFF* cffExporter = new UBExportCFF(this);
UBExportFullPDF* exportFullPdf = new UBExportFullPDF(this);
UBExportDocument* exportDocument = new UBExportDocument(this);
- UBWebPublisher* webPublished = new UBWebPublisher(this);
mExportAdaptors.append(exportDocument);
- mExportAdaptors.append(webPublished);
mExportAdaptors.append(exportFullPdf);
mExportAdaptors.append(cffExporter);
-// UBExportWeb* exportWeb = new UBExportWeb(this);
-// mExportAdaptors.append(exportWeb);
UBImportDocument* documentImport = new UBImportDocument(this);
mImportAdaptors.append(documentImport);
@@ -149,7 +142,7 @@ UBDocumentProxy* UBDocumentManager::importFile(const QFile& pFile, const QString
UBDocumentBasedImportAdaptor* importAdaptor = (UBDocumentBasedImportAdaptor*)adaptor;
document = importAdaptor->importFile(pFile, pGroup);
-
+
}
else
{