Merge branch 'master' of github.com:Sankore/Sankore-3.1

Conflicts:
	src/adaptors/UBSvgSubsetAdaptor.cpp

src/adaptors/UBExportDocument.cpp

@@ -99,5 +99,5 @@ QString UBExportDocument::exportExtention()
 
 QString UBExportDocument::exportName()
 {
-    return tr("Export to Uniboard Format");
+    return tr("Export to Sankore Format");
 }

src/adaptors/UBImportVirtualPrinter.cpp

@@ -132,7 +132,7 @@ void UBImportVirtualPrinter::cleanUp(const QFile& pFile, const QString& pPdfFile
 
 UBDocumentProxy* UBImportVirtualPrinter::importFile(const QFile& pFile, const QString& pGroup)
 {
-    UBApplication::showMessage(tr("Importing Uniboard printer file ..."));
+    UBApplication::showMessage(tr("Importing Sankore printer file ..."));
     UBDocumentProxy *document = 0;
 
     QString pdfFilename = pdfFileName(pFile);
@@ -159,7 +159,7 @@ UBDocumentProxy* UBImportVirtualPrinter::importFile(const QFile& pFile, const QS
 
     if (!document)
     {
-        UBApplication::showMessage(tr("Error while importing Uniboard printer file."));
+        UBApplication::showMessage(tr("Error while importing Sankore printer file."));
     }
 
     cleanUp(pFile, pdfFilename, emfFileNames(pFile));
@@ -170,7 +170,7 @@ UBDocumentProxy* UBImportVirtualPrinter::importFile(const QFile& pFile, const QS
 
 bool UBImportVirtualPrinter::addFileToDocument(UBDocumentProxy* pDocument, const QFile& pFile)
 {
-    UBApplication::showMessage(tr("Importing Uniboard printer file ..."));
+    UBApplication::showMessage(tr("Importing Sankore printer file ..."));
     bool result = false;
 
     QString pdfFilename = pdfFileName(pFile);
@@ -183,7 +183,7 @@ bool UBImportVirtualPrinter::addFileToDocument(UBDocumentProxy* pDocument, const
 
     if (!result)
     {
-        UBApplication::showMessage(tr("Error while importing Uniboard printer file."));
+        UBApplication::showMessage(tr("Error while importing Sankore printer file."));
     }
 
     cleanUp(pFile, pdfFilename, emfFileNames(pFile));

src/adaptors/UBMetadataDcSubsetAdaptor.cpp

@@ -204,7 +204,7 @@ QMap<QString, QVariant> UBMetadataDcSubsetAdaptor::load(QString pPath)
 
             if (xml.hasError())
             {
-                qWarning() << "error parsing uniboard metadata.rdf file " << xml.errorString();
+                qWarning() << "error parsing sankore metadata.rdf file " << xml.errorString();
             }
         }
 

src/adaptors/UBSvgSubsetAdaptor.cpp

@@ -781,7 +781,7 @@ UBGraphicsScene* UBSvgSubsetAdaptor::UBSvgSubsetReader::loadScene()
 
     if (mXmlReader.hasError())
     {
-        qWarning() << "error parsing uniboard file " << mXmlReader.errorString();
+        qWarning() << "error parsing Sankore file " << mXmlReader.errorString();
     }
 
     if (scene)
@@ -2576,31 +2576,16 @@ UBGraphicsTriangle* UBSvgSubsetAdaptor::UBSvgSubsetReader::triangleFromSvg()
 
     graphicsItemFromSvg(triangle);
 
-    //QStringRef angle = mXmlReader.attributes().value(mNamespaceUri, "angle");
-    //if (!angle.isNull())
-    //{
-    //    protractor->setAngle(angle.toString().toFloat());
-    //}
-
-    //QStringRef markerAngle = mXmlReader.attributes().value(mNamespaceUri, "marker-angle");
-    //if (!markerAngle.isNull())
-    //{
-    //    protractor->setMarkerAngle(markerAngle.toString().toFloat());
-    //}
-
     QStringRef svgX = mXmlReader.attributes().value("x");
     QStringRef svgY = mXmlReader.attributes().value("y");
     QStringRef svgWidth = mXmlReader.attributes().value("width");
     QStringRef svgHeight = mXmlReader.attributes().value("height");
-
+    QStringRef orientationStringRef = mXmlReader.attributes().value("orientation");
-        UBGraphicsTriangle::UBGraphicsTriangleOrientation orientation =
+    UBGraphicsTriangle::UBGraphicsTriangleOrientation orientation = UBGraphicsTriangle::orientationFromStr(orientationStringRef);
-                UBGraphicsTriangle::orientationFromStr((mXmlReader.attributes().value("orientation")));
 
     if (!svgX.isNull() && !svgY.isNull() && !svgWidth.isNull() && !svgHeight.isNull())
     {
-        triangle->setRect(svgX.toString().toFloat(), svgY.toString().toFloat()
+        triangle->setRect(svgX.toString().toFloat(), svgY.toString().toFloat(), svgWidth.toString().toFloat(), svgHeight.toString().toFloat(), orientation);
-                            , svgWidth.toString().toFloat(), svgHeight.toString().toFloat(),
-                                                        orientation);
     }
 
     triangle->setVisible(true);

src/adaptors/UBWebPublisher.cpp

@@ -28,7 +28,7 @@ UBWebPublisher::~UBWebPublisher()
 
 QString UBWebPublisher::exportName()
 {
-    return tr("Publish Document on Uniboard Web");
+    return tr("Publish Document on Sankore Web");
 }
 
 

src/adaptors/publishing/UBDocumentPublisher.cpp

@@ -10,6 +10,7 @@
 #include "core/UBDocumentManager.h"
 #include "core/UBApplication.h"
 #include "core/UBPersistenceManager.h"
+#include "core/UBApplicationController.h"
 
 #include "gui/UBMainWindow.h"
 
@@ -28,63 +29,48 @@
 
 #include "core/memcheck.h"
 
+
 UBDocumentPublisher::UBDocumentPublisher(UBDocumentProxy* pDocument, QObject *parent)
         : UBAbstractPublisher(parent)
         , mSourceDocument(pDocument)
         , mPublishingDocument(0)
+        , mUsername("")
+        , mPassword("")
 {
-    connect(this, SIGNAL(authenticated(const QUuid&, const QString&))
+    mpWebView = new QWebView(0);
-            , this, SLOT(postDocument(const QUuid&, const QString&)));
+    UBApplication::mainWindow->addSankoreWebDocumentWidget(mpWebView);
+    mpWebView->setWindowTitle(tr("Sankore Uploading Page"));
+    mpWebView->setAcceptDrops(false);
+
+    connect(mpWebView, SIGNAL(loadFinished(bool)), this, SLOT(onLoadFinished(bool)));
+    connect(mpWebView, SIGNAL(linkClicked(QUrl)), this, SLOT(onLinkClicked(QUrl)));
+
+
+    init();
 }
 
 
 UBDocumentPublisher::~UBDocumentPublisher()
 {
+    delete mpWebView;
     delete mPublishingDocument;
 }
 
 
 void UBDocumentPublisher::publish()
 {
-    UBAbstractPublisher::authenticate();
+    //check that the username and password are stored on preferences
-}
+    mUsername = "Admin";
-
+    mPassword = "admin";
-
+    buildUbwFile();
-void UBDocumentPublisher::postDocument(const QUuid& tokenUuid, const QString& encryptedBase64Token)
+    UBApplication::showMessage(tr("Uploading Sankore File on Web."));
-{
+    sendUbw();
-    mAuthenticationUuid = tokenUuid;
-    mAuthenticationBase64Token = encryptedBase64Token;
-
-    UBDocumentPublishingDialog dialog(UBApplication::mainWindow);
 
-    dialog.videoWarning->setVisible(UBPersistenceManager::persistenceManager()->mayHaveVideo(mSourceDocument));
+}
-
-    dialog.title->setText(mSourceDocument->name());
-
-    QString defaultEMail = UBSettings::settings()->uniboardWebEMail->get().toString();
-    dialog.email->setText(defaultEMail);
 
-    QString defaultAuthor = UBSettings::settings()->uniboardWebAuthor->get().toString();
-    dialog.author->setText(defaultAuthor);
 
-    if (dialog.exec() == QDialog::Accepted)
+void UBDocumentPublisher::buildUbwFile()
 {
-        QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
-        UBApplication::showMessage(tr("Preparing document for upload..."), true);
-
-        mTitle = dialog.title->text();
-        mDescription = dialog.description->toPlainText();
-        mEMail = dialog.email->text();
-        mAuthor = dialog.author->text();
-
-        bool attachPDF = dialog.attachPDF->isChecked();
-        bool attachUBZ = dialog.attachUBZ->isChecked();
-
-        mPublishingServiceUrl = UBSettings::settings()->documentsPublishingUrl;
-
-        UBSettings::settings()->uniboardWebEMail->set(mEMail);
-        UBSettings::settings()->uniboardWebAuthor->set(mAuthor);
-
     QDir d;
     d.mkpath(UBFileSystemUtils::defaultTempDirPath());
 
@@ -99,34 +85,21 @@ void UBDocumentPublisher::postDocument(const QUuid& tokenUuid, const QString& en
 
         rasterizeScenes();
 
-            //rasterizePDF(); // not needed as we do not publish svg file anymore
-
-            //rasterizeSVGImages(); // not needed as we do not publish svg file anymore
-
         upgradeDocumentForPublishing();
 
-            if (attachPDF)
-            {
         UBExportFullPDF pdfExporter;
         pdfExporter.setVerbode(false);
-                pdfExporter.persistsDocument(mSourceDocument,
+        pdfExporter.persistsDocument(mSourceDocument, mPublishingDocument->persistencePath() + "/" + UBStringUtils::toCanonicalUuid(publishingUuid) + ".pdf");
-                        mPublishingDocument->persistencePath() + "/" + UBStringUtils::toCanonicalUuid(publishingUuid) + ".pdf");
-            }
 
-            if (attachUBZ)
-            {
         UBExportDocument ubzExporter;
         ubzExporter.setVerbode(false);
-                ubzExporter.persistsDocument(mSourceDocument,
+        ubzExporter.persistsDocument(mSourceDocument, mPublishingDocument->persistencePath() + "/" + UBStringUtils::toCanonicalUuid(publishingUuid) + ".ubz");
-                        mPublishingDocument->persistencePath() + "/" + UBStringUtils::toCanonicalUuid(publishingUuid) + ".ubz");
+
-            }
 
         // remove all useless files
 
-            for (int pageIndex = 0; pageIndex < mPublishingDocument->pageCount(); pageIndex++)
+        for (int pageIndex = 0; pageIndex < mPublishingDocument->pageCount(); pageIndex++) {
-            {
+            QString filename = mPublishingDocument->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.svg", pageIndex + 1);
-                QString filename = mPublishingDocument->persistencePath() +
-                        UBFileSystemUtils::digitFileFormat("/page%1.svg", pageIndex + 1);
 
             QFile::remove(filename);
         }
@@ -136,16 +109,13 @@ void UBDocumentPublisher::postDocument(const QUuid& tokenUuid, const QString& en
         UBFileSystemUtils::deleteDir(mPublishingDocument->persistencePath() + "/" + UBPersistenceManager::videoDirectory);
         UBFileSystemUtils::deleteDir(mPublishingDocument->persistencePath() + "/" + UBPersistenceManager::audioDirectory);
 
-            QString tempZipFile = UBFileSystemUtils::defaultTempDirPath()
+        mTmpZipFile = UBFileSystemUtils::defaultTempDirPath() + "/" + UBStringUtils::toCanonicalUuid(QUuid::createUuid()) + ".zip";
-                    + "/" + UBStringUtils::toCanonicalUuid(QUuid::createUuid()) + ".zip";
-
-            //qDebug() << "compressing" << mPublishingDocument->persistencePath() << "in" << tempZipFile;
 
-            QuaZip zip(tempZipFile);
+        QuaZip zip(mTmpZipFile);
         zip.setFileNameCodec("UTF-8");
         if (!zip.open(QuaZip::mdCreate))
         {
-                qWarning() << "Export failed. Cause: zip.open(): " << zip.getZipError() << "," << tempZipFile;
+            qWarning() << "Export failed. Cause: zip.open(): " << zip.getZipError() << "," << mTmpZipFile;
             QApplication::restoreOverrideCursor();
             return;
         }
@@ -156,7 +126,6 @@ void UBDocumentPublisher::postDocument(const QUuid& tokenUuid, const QString& en
         {
             qWarning("Export failed. compressDirInZip failed ...");
             zip.close();
-                //zip.remove();
             UBApplication::showMessage(tr("Export failed."));
             QApplication::restoreOverrideCursor();
             return;
@@ -166,7 +135,6 @@ void UBDocumentPublisher::postDocument(const QUuid& tokenUuid, const QString& en
         {
             qWarning("Export failed. Cause: zip.close(): %d", zip.getZipError());
             zip.close();
-                //zip.remove();
             UBApplication::showMessage(tr("Export failed."));
             QApplication::restoreOverrideCursor();
             return;
@@ -174,16 +142,6 @@ void UBDocumentPublisher::postDocument(const QUuid& tokenUuid, const QString& en
 
         zip.close();
 
-            mPublishingUrl = QUrl(mPublishingServiceUrl + "/documents/publish/"
-                + UBStringUtils::toCanonicalUuid(mSourceDocument->uuid()));
-
-            sendZipToUniboardWeb(tempZipFile, publishingUuid);
-        }
-        else
-        {
-            UBApplication::showMessage(tr("Export failed ..."));
-            QApplication::restoreOverrideCursor();
-        }
     }
     else
     {
@@ -192,53 +150,6 @@ void UBDocumentPublisher::postDocument(const QUuid& tokenUuid, const QString& en
     }
 }
 
-
-/*
- * // not needed as we do not publish svg file anymore
- *
-
-void UBDocumentPublisher::rasterizePDF()
-{
-    if (UBPersistenceManager::persistenceManager()->mayHavePDF(mPublishingDocument))
-    {
-        UBSvgSubsetAdaptor::convertPDFObjectsToImages(mPublishingDocument);
-
-        QDir objectDir(mPublishingDocument->persistencePath() + "/" + UBPersistenceManager::objectDirectory);
-
-        QStringList filters;
-        filters << "*.pdf";
-
-        foreach(QFileInfo fi, objectDir.entryInfoList(filters))
-        {
-            QFile::remove(fi.absoluteFilePath());
-        }
-    }
-}
-*/
-
-/*
- * // not needed as we do not publish svg file anymore
-
-
-void UBDocumentPublisher::rasterizeSVGImages()
-{
-    if (UBPersistenceManager::persistenceManager()->mayHaveSVGImages(mPublishingDocument))
-    {
-        UBSvgSubsetAdaptor::convertSvgImagesToImages(mPublishingDocument);
-
-        QDir objectDir(mPublishingDocument->persistencePath() + "/" + UBPersistenceManager::imageDirectory);
-
-        QStringList filters;
-        filters << "*.svg";
-
-        foreach(QFileInfo fi, objectDir.entryInfoList(filters))
-        {
-            QFile::remove(fi.absoluteFilePath());
-        }
-    }
-}
-*/
-
 void UBDocumentPublisher::rasterizeScenes()
 {
 
@@ -248,8 +159,7 @@ void UBDocumentPublisher::rasterizeScenes()
 
         UBSvgSubsetRasterizer rasterizer(mPublishingDocument, pageIndex);
 
-        QString filename = mPublishingDocument->persistencePath() +
+        QString filename = mPublishingDocument->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.jpg", pageIndex + 1);
-            UBFileSystemUtils::digitFileFormat("/page%1.jpg", pageIndex + 1);
 
         rasterizer.rasterizeToFile(filename);
 
@@ -306,25 +216,17 @@ void UBDocumentPublisher::upgradeDocumentForPublishing()
 
         QList<UBGraphicsW3CWidgetItem*> widgets;
 
-        foreach(QGraphicsItem* item, scene->items())
+        foreach(QGraphicsItem* item, scene->items()){
-        {
             UBGraphicsW3CWidgetItem *widgetItem = dynamic_cast<UBGraphicsW3CWidgetItem*>(item);
 
-            if (widgetItem)
+            if(widgetItem){
-            {
                 generateWidgetPropertyScript(widgetItem, pageIndex + 1);
                 sceneHasWidget = true;
                 widgets << widgetItem;
             }
         }
 
-        //if (sceneHasWidget)
+        QString filename = mPublishingDocument->persistencePath() + UBFileSystemUtils::digitFileFormat("/page%1.json", pageIndex + 1);
-        //{
-        //    updateSVGForWidget(pageIndex); // not needed as we do not publish svg file anymore
-        //}
-
-        QString filename = mPublishingDocument->persistencePath() +
-            UBFileSystemUtils::digitFileFormat("/page%1.json", pageIndex + 1);
 
         QFile jsonFile(filename);
         if (jsonFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
@@ -426,57 +328,6 @@ void UBDocumentPublisher::upgradeDocumentForPublishing()
 }
 
 
-/** // not needed as we do not publish svg file anymore
-void UBDocumentPublisher::updateSVGForWidget(int pageIndex)
-{
-    QString fileName = mPublishingDocument->persistencePath() +
-        UBFileSystemUtils::digitFileFormat("/page%1.svg", pageIndex + 1);
-
-    QFile svgFile(fileName);
-
-    if (svgFile.exists())
-    {
-        if (!svgFile.open(QIODevice::ReadWrite))
-        {
-            qWarning() << "Cannot open file " << fileName << " for widget upgrade ...";
-            return;
-        }
-
-        QTextStream stream(&svgFile);
-        QStringList lines;
-
-        QString line;
-        do
-        {
-            line = stream.readLine();
-            if (!line.isNull())
-            {
-                if (line.contains("<svg") && line.contains(">")) // TODO UB 4.6, this is naive ... the SVG tag may be on several lines
-                {
-                    lines << "<?xml-stylesheet type=\"text/css\" href=\"" + UBSettings::settings()->documentPlayerCssUrl + "\" ?>";
-                    lines << line;
-                    lines << "";
-                    lines << "    <script type=\"text/ecmascript\" xlink:href=\"" + UBSettings::settings()->documentPlayerScriptUrl + "\"/>";
-                    lines << "    <script type=\"text/ecmascript\" xlink:href=\"" + UBSettings::settings()->documentPlayerPageScriptUrl + "\"/>";
-                    lines << "";
-                }
-                else
-                {
-                    lines << line;
-                }
-            }
-        }
-        while (!line.isNull());
-
-        svgFile.resize(0);
-        svgFile.write(lines.join("\n").toUtf8()); // TODO UB 4.x detect real html encoding
-
-        svgFile.close();
-    }
-}
-*/
-
-
 void UBDocumentPublisher::generateWidgetPropertyScript(UBGraphicsW3CWidgetItem *widgetItem, int pageNumber)
 {
 
@@ -487,9 +338,7 @@ void UBDocumentPublisher::generateWidgetPropertyScript(UBGraphicsW3CWidgetItem *
 
     if (!startFileName.startsWith("http://"))
     {
-        QString startFilePath = mPublishingDocument->persistencePath() + "/"
+        QString startFilePath = mPublishingDocument->persistencePath() + "/" + UBPersistenceManager::widgetDirectory + "/" + widgetItem->uuid().toString() + ".wgt/" + startFileName;
-                                + UBPersistenceManager::widgetDirectory + "/"
-                                + widgetItem->uuid().toString() + ".wgt/" + startFileName;
 
         QFile startFile(startFilePath);
 
@@ -663,111 +512,138 @@ void UBDocumentPublisher::generateWidgetPropertyScript(UBGraphicsW3CWidgetItem *
             }
         }
     }
-    else
+    else{
-    {
         qWarning() << "Remote Widget start file, cannot inject widget preferences and datastore entries";
     }
 }
 
 
-void UBDocumentPublisher::sendZipToUniboardWeb(const QString& zipFilePath, const QUuid& publishingUuid)
-{
-    QFile zipFile(zipFilePath);
 
-    if(!zipFile.open(QIODevice::ReadOnly))
-    {
-        qWarning() << "Cannot open file" << zipFilePath << "for upload to Uniboard Web";
-        return;
-    }
-
-    QUrl publishingEndpoint = QUrl(mPublishingServiceUrl);
-
-    mUploadRequest = new UBServerXMLHttpRequest(UBNetworkAccessManager::defaultAccessManager()
-        , "application/octet-stream");
 
-    mUploadRequest->setVerbose(true);
+void UBDocumentPublisher::init()
-
+{
-    connect(mUploadRequest, SIGNAL(progress(qint64, qint64)), this,  SLOT(uploadProgress(qint64, qint64)));
+    mCrlf=0x0d;
-    connect(mUploadRequest, SIGNAL(finished(bool, const QByteArray&)), this, SLOT(postZipUploadResponse(bool, const QByteArray&)));
+    mCrlf+=0x0a;
-
-    mUploadRequest->addHeader("Publishing-UUID", UBStringUtils::toCanonicalUuid(publishingUuid));
-    mUploadRequest->addHeader("Document-UUID", UBStringUtils::toCanonicalUuid(mSourceDocument->uuid()));
-    mUploadRequest->addHeader("Document-PageCount", QString("%1").arg(mSourceDocument->pageCount()));
-    mUploadRequest->addHeader("Document-Title", mTitle);
-    mUploadRequest->addHeader("Document-Author", mAuthor);
-    mUploadRequest->addHeader("Document-AuthorEMail", mEMail);
-    mUploadRequest->addHeader("Document-Description", mDescription);
-    mUploadRequest->addHeader("Deletion-Token", UBStringUtils::toCanonicalUuid(QUuid::createUuid()));
-    mUploadRequest->addHeader("Token-UUID", UBStringUtils::toCanonicalUuid(mAuthenticationUuid));
-    mUploadRequest->addHeader("Token-Encrypted", mAuthenticationBase64Token);
 
-    mUploadRequest->post(publishingEndpoint, zipFile.readAll());
+    mpNetworkMgr = new QNetworkAccessManager(this);
+    mpCookieJar = new QNetworkCookieJar();
 
-    zipFile.remove();
+    connect(mpNetworkMgr, SIGNAL(finished(QNetworkReply*)), this, SLOT(onFinished(QNetworkReply*)));
 }
 
+void UBDocumentPublisher::onFinished(QNetworkReply *reply)
+{
+    QByteArray response = reply->readAll();
 
-void UBDocumentPublisher::uploadProgress(qint64 bytesSent, qint64 bytesTotal)
+    if (!bCookieSet)
     {
-    int percentage = (((qreal)bytesSent / (qreal)bytesTotal ) * 100);
+        QList<QNetworkCookie> cookiesList;
+        QVariant cookieHeader = reply->rawHeader("Set-Cookie");
+        qDebug() << cookieHeader.toString();
+        // 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);
+        }
+        qDebug() << "qsCookieValue " << qsCookieValue;
+        // Now we isolate every cookie value
+        QStringList qslCookieVals = qsCookieValue.split("; ");
 
-    if (bytesSent < bytesTotal)
+        // Finally we create the cookies
-        UBApplication::showMessage(tr("Upload to Uniboard Web in progress %1 %").arg(percentage), true);
+        for (int i = 0; i < qslCookieVals.size(); i++)
+        {
+            QString cookieString = qslCookieVals.at(i);
+            qDebug() << "qslCookieVals.at(i): " << cookieString.replace("\"", "");
+            QStringList qslCrntCookie = cookieString.split("=");
+            QNetworkCookie crntCookie;
+            if (qslCrntCookie.length() == 2)
+                crntCookie = QNetworkCookie(qslCrntCookie.at(0).toAscii().constData(), qslCrntCookie.at(1).toAscii().constData());
             else
-        UBApplication::showMessage(tr("Sending document ..."), true);
+                crntCookie = QNetworkCookie(qslCrntCookie.at(0).toAscii().constData());
+            cookiesList << crntCookie;
+        }
+
+        // Set the cookiejar : it set the cookies that will be sent with every packet.
+        qDebug() << reply->url().toString();
+        mpCookieJar->setCookiesFromUrl(cookiesList, reply->url());
+        mpNetworkMgr->setCookieJar(mpCookieJar);
+        bCookieSet = true;
+    }
 
+    if (response.isEmpty()){
+        emit loginDone();
     }
+    else{
+        // Display the iframe
+        mpWebView->setHtml(response, QUrl("http://sankore.devxwiki.com/xwiki/bin/view/Test/FileUpload"));
+        UBApplication::applicationController->showSankoreWebDocument();
 
+    }
+}
 
-void UBDocumentPublisher::postZipUploadResponse(bool success, const QByteArray& payload)
+void UBDocumentPublisher::sendUbw()
 {
-    if (success)
+    if (QFile::exists(mTmpZipFile))
     {
-        UBApplication::showMessage(tr("The document has been sent to %1").arg(UBSettings::settings()->uniboardWebUrl->get().toString()), false);
+        QFile f(mTmpZipFile);
-    }
+        if (f.open(QIODevice::ReadOnly))
-    else
         {
-        qWarning() << "error uploading document to Uniboard Web" << QString::fromUtf8(payload);
+            QByteArray ba = f.readAll();
+            QString boundary,data, multipartHeader;
+            QByteArray datatoSend;
 
-        QString errorMessage = QString::fromUtf8(payload);
+            boundary = "---WebKitFormBoundaryDKBTgA53MiyWrzLY";
+            multipartHeader = "multipart/form-data; boundary="+boundary;
 
-        if (errorMessage.length() == 0)
+            data="--"+boundary+mCrlf;
-            UBApplication::showMessage(tr("Error while publishing document to %1")
+            data+="Content-Disposition: form-data; name=\"file\"; filename=\""+ f.fileName() +"\""+mCrlf;
-                                       .arg(UBSettings::settings()->uniboardWebUrl->get().toString()), false);
+            data+="Content-Type: application/octet-stream"+mCrlf+mCrlf;
-        else
+            datatoSend=data.toAscii(); // convert data string to byte array for request
-            UBApplication::showMessage(tr("Error while publishing document to %1 : (%2)")
+            datatoSend += ba;
-                                       .arg(UBSettings::settings()->uniboardWebUrl->get().toString())
+            datatoSend += mCrlf.toAscii();
-                                       .arg(errorMessage), false);
+            datatoSend += QString("--%0--%1").arg(boundary).arg(mCrlf).toAscii();
-    }
 
-    QApplication::restoreOverrideCursor();
+            QNetworkRequest request(QUrl("http://sankore.devxwiki.com/xwiki/bin/view/Test/FileUpload"));
+            request.setHeader(QNetworkRequest::ContentTypeHeader, multipartHeader);
+            request.setHeader(QNetworkRequest::ContentLengthHeader,datatoSend.size());
+            request.setRawHeader("Accept", "application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5");
+            request.setRawHeader("Accept-Language", "en-US,*");
+            request.setRawHeader("Referer", "http://sankore.devxwiki.com/xwiki/bin/view/Test/FileUpload");
+            request.setRawHeader("Origin", "http://sankore.devxwiki.com");
 
-    deleteLater();
+            QString b64Auth = getBase64Of(QString("%0:%1").arg(mUsername).arg(mPassword));
-}
+            request.setRawHeader("Authorization", QString("Basic %0").arg(b64Auth).toAscii().constData());
 
+            // Send the file
+            mpNetworkMgr->post(request,datatoSend);
+        }
+    }
+}
 
-UBDocumentPublishingDialog::UBDocumentPublishingDialog(QWidget *parent)
+QString UBDocumentPublisher::getBase64Of(QString stringToEncode)
-    : QDialog(parent)
 {
-    Ui::documentPublishingDialog::setupUi(this);
+    return stringToEncode.toAscii().toBase64();
-
+}
-    connect(dialogButtons, SIGNAL(accepted()), this, SLOT(accept()));
-    connect(dialogButtons, SIGNAL(rejected()), this, SLOT(reject()));
 
-    connect(title, SIGNAL(textChanged(const QString&)), this, SLOT(updateUIState(const QString&)));
+void UBDocumentPublisher::onLinkClicked(const QUrl &url)
-    connect(email, SIGNAL(textChanged(const QString&)), this, SLOT(updateUIState(const QString&)));
+{
+    // [Basic Auth] Here we interpret the link and send the request with the basic auth header.
+    QNetworkRequest request;
+    request.setUrl(url);
+    QString b64Auth = getBase64Of(QString("%0:%1").arg(mUsername).arg(mPassword));
+    request.setRawHeader("Authorization", QString("Basic %0").arg(b64Auth).toAscii().constData());
+    mpNetworkMgr->get(request);
+}
 
-    dialogButtons->button(QDialogButtonBox::Ok)->setEnabled(false);
+void UBDocumentPublisher::onLoadFinished(bool result)
-    dialogButtons->button(QDialogButtonBox::Ok)->setText(tr("Publish"));
+{
+    Q_UNUSED(result);
+    // [Basic Auth] This line says: if the user click on a link, do not interpret it.
+    mpWebView->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
 }
 
 
-void UBDocumentPublishingDialog::updateUIState(const QString& string)
-{
-    Q_UNUSED(string);
 
-    bool ok = title->text().length() > 0
-                    &&  email->text().length() > 0;
 
-    dialogButtons->button(QDialogButtonBox::Ok)->setEnabled(ok);
+
-}

src/adaptors/publishing/UBDocumentPublisher.h

@@ -10,6 +10,7 @@
 class UBDocumentProxy;
 class UBServerXMLHttpRequest;
 class UBGraphicsW3CWidgetItem;
+class QWebView;
 
 class UBDocumentPublisher : public UBAbstractPublisher
 {
@@ -21,63 +22,44 @@ class UBDocumentPublisher : public UBAbstractPublisher
 
     void publish();
 
-    protected:
+signals:
 
-        // not needed as we do not publish svg file anymore
+    void loginDone();
-        //virtual void rasterizePDF();
-        //virtual void rasterizeSVGImages();
-        //virtual void updateSVGForWidget(int sceneIndex);
 
-        virtual void updateGoogleMapApiKey();
+protected:
 
+    virtual void updateGoogleMapApiKey();
     virtual void rasterizeScenes();
-
     virtual void upgradeDocumentForPublishing();
-
     virtual void generateWidgetPropertyScript(UBGraphicsW3CWidgetItem *widgetItem, int pageNumber);
 
-        void sendZipToUniboardWeb(const QString& zipFile, const QUuid& publishingUuid);
-
 private slots:
 
-        void postDocument(const QUuid& tokenUuid, const QString& encryptedBase64Token);
+    void onFinished(QNetworkReply* reply);
-        void uploadProgress(qint64, qint64);
+    void onLinkClicked(const QUrl& url);
-        void postZipUploadResponse(bool, const QByteArray&);
+    void onLoadFinished(bool result);
-
-    private:
-
-        UBDocumentProxy *mSourceDocument;
-        UBDocumentProxy *mPublishingDocument;
-
-        UBServerXMLHttpRequest* mUploadRequest;
-
-        QString mTitle;
-        QString mAuthor;
-        QString mDescription;
-        QString mEMail;
-        bool mAttachPDF;
-        bool mAttachUBZ;
-
-        QUrl mPublishingUrl;
 
-        QString mPublishingServiceUrl;
-        QUuid mAuthenticationUuid;
-        QString mAuthenticationBase64Token;
 
-};
+private:
 
+    void init();
+    void sendUbw();
+    QString getBase64Of(QString stringToEncode);
 
-class UBDocumentPublishingDialog : public QDialog, public Ui::documentPublishingDialog
+    QWebView* mpWebView;
-{
+    QHBoxLayout* mpLayout;
-    Q_OBJECT;
+    QNetworkAccessManager* mpNetworkMgr;
+    QNetworkCookieJar* mpCookieJar;
+    QString mUsername;
+    QString mPassword;
+    QString mCrlf;
+    bool bCookieSet;
 
-    public:
+    void buildUbwFile();
-        UBDocumentPublishingDialog(QWidget *parent = 0);
+    QString mTmpZipFile;
-        ~UBDocumentPublishingDialog(){}
 
-    private slots:
+    UBDocumentProxy *mSourceDocument;
-        void updateUIState(const QString& string);
+    UBDocumentProxy *mPublishingDocument;
 
 };
-
 #endif // UBDOCUMENTPUBLISHER_H

src/board/UBBoardController.cpp

@@ -956,7 +956,7 @@ void UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QString
         }
         else
         {
-            UBApplication::showMessage(tr("Flash is not supported on Uniboard Linux"));
+            UBApplication::showMessage(tr("Flash is not supported on Sankore Linux"));
         }
     }
     else if (mimeType.startsWith("application/pdf"))

src/board/UBBoardPaletteManager.cpp

@@ -152,7 +152,7 @@ void UBBoardPaletteManager::setupPalettes()
     addItemActions << UBApplication::mainWindow->actionAddItemToCurrentPage;
     addItemActions << UBApplication::mainWindow->actionAddItemToNewPage;
     addItemActions << UBApplication::mainWindow->actionAddItemToLibrary;
-    //addItemActions << UBApplication::mainWindow->actionShareItemOnWeb;
+    addItemActions << UBApplication::mainWindow->actionShareItemOnWeb;
 
     mAddItemPalette = new UBActionPalette(addItemActions, Qt::Horizontal, 0);
     mAddItemPalette->setButtonIconSize(QSize(128, 128));
@@ -306,7 +306,7 @@ void UBBoardPaletteManager::connectPalettes()
     connect(UBApplication::mainWindow->actionAddItemToCurrentPage, SIGNAL(triggered()), this, SLOT(addItemToCurrentPage()));
     connect(UBApplication::mainWindow->actionAddItemToNewPage, SIGNAL(triggered()), this, SLOT(addItemToNewPage()));
     connect(UBApplication::mainWindow->actionAddItemToLibrary, SIGNAL(triggered()), this, SLOT(addItemToLibrary()));
-    //connect(UBApplication::mainWindow->actionShareItemOnWeb, SIGNAL(triggered()), this, SLOT(shareItemOnWeb()));
+    connect(UBApplication::mainWindow->actionShareItemOnWeb, SIGNAL(triggered()), this, SLOT(shareItemOnWeb()));
 
     connect(UBApplication::mainWindow->actionEraseItems, SIGNAL(triggered()), mErasePalette, SLOT(close()));
     connect(UBApplication::mainWindow->actionEraseAnnotations, SIGNAL(triggered()), mErasePalette, SLOT(close()));

src/core/UBApplication.cpp

@@ -53,7 +53,6 @@ UBApplicationController* UBApplication::applicationController = 0;
 UBBoardController* UBApplication::boardController = 0;
 UBWebController* UBApplication::webController = 0;
 UBDocumentController* UBApplication::documentController = 0;
-//UBSoftwareUpdateController* UBApplication::softwareUpdateController = 0;
 UniboardSankoreTransition* UBApplication::mUniboardSankoreTransition = 0;
 
 UBMainWindow* UBApplication::mainWindow = 0;
@@ -91,8 +90,7 @@ static OSStatus ub_appleEventProcessor(const AppleEvent *ae, AppleEvent *event,
 #endif
 
 
-UBApplication::UBApplication(const QString &id, int &argc, char **argv)
+UBApplication::UBApplication(const QString &id, int &argc, char **argv) : QtSingleApplication(id, argc, argv),
-    : QtSingleApplication(id, argc, argv),
     mPreferencesController(NULL)
 {
 
@@ -343,6 +341,10 @@ void UBApplication::showDocument()
     applicationController->showDocument();
 }
 
+void UBApplication::showSankoreWebDocument()
+{
+    applicationController->showSankoreWebDocument();
+}
 
 int UBApplication::toolBarHeight()
 {

src/core/UBApplication.h

@@ -88,6 +88,7 @@ class UBApplication : public QtSingleApplication
         void showBoard();
         void showInternet();
         void showDocument();
+        void showSankoreWebDocument();
 
         void toolBarPositionChanged(QVariant topOrBottom);
         void toolBarDisplayTextChanged(QVariant display);

src/core/UBApplicationController.cpp

@@ -87,11 +87,10 @@ UBApplicationController::UBApplicationController(UBBoardView *pControlView, UBBo
             , this, SLOT(addCapturedPixmap(const QPixmap &, bool, const QUrl&)));
 
     networkAccessManager = new QNetworkAccessManager (this);
-    connect (networkAccessManager, SIGNAL (finished (QNetworkReply*)), this, SLOT (downloadJsonFinished (QNetworkReply*)));
     QTimer::singleShot (1000, this, SLOT (checkUpdateAtLaunch()));
 
 #ifdef Q_WS_X11
-//    mMainWindow->setStyleSheet("QToolButton { font-size: 11px}");
+    mMainWindow->setStyleSheet("QToolButton { font-size: 11px}");
 #endif
 
 }
@@ -397,6 +396,32 @@ void UBApplicationController::showDocument()
     emit mainModeChanged(Document);
 }
 
+void UBApplicationController::showSankoreWebDocument()
+{
+    mMainWindow->webToolBar->hide();
+    mMainWindow->boardToolBar->hide();
+    mMainWindow->tutorialToolBar->hide();
+    mMainWindow->documentToolBar->show();
+
+
+    mMainMode = WebDocument;
+
+    adaptToolBar();
+
+    mirroringEnabled(false);
+
+    mMainWindow->switchToSankoreWebDocumentWidget();
+
+    UBApplication::documentController->hide();
+
+    mMainWindow->show();
+
+    mUninoteController->hideWindow();
+
+    emit mainModeChanged(WebDocument);
+}
+
+
 
 void UBApplicationController::showDesktop(bool dontSwitchFrontProcess)
 {

src/core/UBApplicationController.h

@@ -53,6 +53,8 @@ class UBApplicationController : public QObject
 
         void showDocument();
 
+        void showSankoreWebDocument();
+
         void showMessage(const QString& message, bool showSpinningWheel);
 
         void importFile(const QString& pFilePath);
@@ -69,7 +71,7 @@ class UBApplicationController : public QObject
 
         enum MainMode
         {
-            Board = 0, Internet, Document, Tutorial, ParaschoolEditor
+            Board = 0, Internet, Document, Tutorial, ParaschoolEditor, WebDocument
         };
 
         MainMode displayMode()

src/core/UBDocumentManager.cpp

@@ -29,6 +29,7 @@
 #include "UBPersistenceManager.h"
 
 #include "core/memcheck.h"
+#include "../adaptors/UBExportWeb.h"
 
 UBDocumentManager* UBDocumentManager::sDocumentManager = 0;
 
@@ -53,9 +54,12 @@ UBDocumentManager::UBDocumentManager(QObject *parent)
 
     UBExportFullPDF* exportFullPdf = new UBExportFullPDF(this);
     mExportAdaptors.append(exportFullPdf);
-
     UBExportDocument* exportDocument = new UBExportDocument(this);
     mExportAdaptors.append(exportDocument);
+//     UBExportWeb* exportWeb = new UBExportWeb(this);
+//     mExportAdaptors.append(exportWeb);
+    UBWebPublisher* webPublished = new UBWebPublisher(this);
+    mExportAdaptors.append(webPublished);
 
     UBImportDocument* documentImport = new UBImportDocument(this);
     mImportAdaptors.append(documentImport);

src/core/UBPersistenceManager.cpp

@@ -1000,7 +1000,7 @@ void UBPersistenceManager::checkIfDocumentRepositoryExists()
         QMessageBox::question(
             QApplication::activeWindow(),
             tr("Document Repository Loss"),
-            tr("Uniboard has lost access to the document repository '%1'. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well.").arg(humanPath),
+            tr("Sankore has lost access to the document repository '%1'. Unfortunately the application must shut down to avoid data corruption. Latest changes may be lost as well.").arg(humanPath),
             QMessageBox::Yes);
 
         UBApplication::quit();

src/document/UBDocumentController.cpp

@@ -1446,7 +1446,7 @@ bool UBDocumentController::isOKToOpenDocument(UBDocumentProxy* proxy)
     else
     {
         if (QMessageBox::question( 0, tr("Open Document"),
-                tr("The document '%1' has been generated with a newer version of Uniboard (%2). By opening it, you may lose some information. Do you want to proceed?")
+                tr("The document '%1' has been generated with a newer version of Sankore (%2). By opening it, you may lose some information. Do you want to proceed?")
                     .arg(proxy->metaData(UBSettings::documentName).toString())
                     .arg(docVersion),
                 QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes)

src/frameworks/UBPlatformUtils_mac.mm

@@ -46,8 +46,8 @@ void UBPlatformUtils::init()
 
     NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 
-    NSString *currentPath      = [[NSBundle mainBundle] pathForResource:@"Save PDF to Uniboard" ofType:@"workflow"];
+    NSString *currentPath      = [[NSBundle mainBundle] pathForResource:@"Save PDF to Sankore" ofType:@"workflow"];
-    NSString *installedPath    = [[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to Uniboard"] stringByAppendingPathExtension:@"workflow"];
+    NSString *installedPath    = [[[@"~/Library/PDF Services" stringByExpandingTildeInPath] stringByAppendingPathComponent:@"Save PDF to Sankore"] stringByAppendingPathExtension:@"workflow"];
     NSString *currentVersion   = bundleShortVersion([NSBundle bundleWithPath:currentPath]);
     NSString *installedVersion = bundleShortVersion([NSBundle bundleWithPath:installedPath]);
 
@@ -59,7 +59,7 @@ void UBPlatformUtils::init()
         BOOL copyOK = [fileManager copyPath:currentPath toPath:installedPath handler:nil];
         if (!copyOK)
         {
-            qWarning("Could not install the 'Save PDF to Uniboard' workflow");
+            qWarning("Could not install the 'Save PDF to Sankore' workflow");
         }
     }
 

src/gui/UBMainWindow.cpp

@@ -14,6 +14,7 @@ UBMainWindow::UBMainWindow(QWidget *parent, Qt::WindowFlags flags)
     , mBoardWidget(0)
     , mWebWidget(0)
     , mDocumentsWidget(0)
+    , mSankoreWebDocumentWidget(0)
 {
     Ui::MainWindow::setupUi(this);
 
@@ -91,6 +92,19 @@ void UBMainWindow::switchToDocumentsWidget()
     }
 }
 
+void UBMainWindow::addSankoreWebDocumentWidget(QWebView* pWidget)
+{
+    if(!mSankoreWebDocumentWidget){
+        mSankoreWebDocumentWidget = pWidget;
+        mStackedLayout->addWidget(mSankoreWebDocumentWidget);
+    }
+}
+
+void UBMainWindow::switchToSankoreWebDocumentWidget()
+{
+    if(mSankoreWebDocumentWidget)
+        mStackedLayout->setCurrentWidget(mSankoreWebDocumentWidget);
+}
 void UBMainWindow::keyPressEvent(QKeyEvent *event)
 {
     QMainWindow::keyPressEvent(event);

src/gui/UBMainWindow.h

@@ -5,6 +5,7 @@
 
 #include <QMainWindow>
 #include <QWidget>
+#include <QWebView>
 
 class QStackedLayout;
 
@@ -27,6 +28,9 @@ class UBMainWindow : public QMainWindow, public Ui::MainWindow
         void addDocumentsWidget(QWidget *pWidget);
         void switchToDocumentsWidget();
 
+        void addSankoreWebDocumentWidget(QWebView* pWidget);
+        void switchToSankoreWebDocumentWidget();
+
     public slots:
         void onExportDone();
 
@@ -45,6 +49,7 @@ class UBMainWindow : public QMainWindow, public Ui::MainWindow
         QWidget *mBoardWidget;
         QWidget *mWebWidget;
         QWidget *mDocumentsWidget;
+        QWebView* mSankoreWebDocumentWidget;
 
 };
 

src/podcast/UBPodcastController.cpp

@@ -338,7 +338,7 @@ void UBPodcastController::start()
             }
             else
             {
-                videoFileName = mPodcastRecordingPath + "/" + tr("Uniboard Cast") + "." + mVideoEncoder->videoFileExtension();
+                videoFileName = mPodcastRecordingPath + "/" + tr("Sankore Cast") + "." + mVideoEncoder->videoFileExtension();
             }
 
             videoFileName = UBFileSystemUtils::nextAvailableFileName(videoFileName, " ");

src/tools/UBAbstractDrawRuler.h

@@ -18,6 +18,7 @@ class UBAbstractDrawRuler : public QObject
     virtual void StartLine(const QPointF& position, qreal width);
     virtual void DrawLine(const QPointF& position, qreal width);
     virtual void EndLine();
+
 protected:
 
     void paint();

src/tools/UBGraphicsProtractor.cpp

@@ -13,6 +13,7 @@
 #include "board/UBBoardController.h"
 #include "board/UBDrawingController.h"
 
+
 #include "core/memcheck.h"
 
 
@@ -30,6 +31,8 @@ UBGraphicsProtractor::UBGraphicsProtractor()
         , mResizeSvgItem(0)
         , mMarkerSvgItem(0)
 {
+    sFillTransparency = 127;
+    sDrawTransparency = 192;
 
     create(*this);
 
@@ -584,7 +587,9 @@ UBItem* UBGraphicsProtractor::deepCopy() const
 
 
 void UBGraphicsProtractor::rotateAroundTopLeftOrigin(qreal angle)
-{}
+{
+    Q_UNUSED(angle);
+}
 
 QPointF UBGraphicsProtractor::topLeftOrigin() const
 {

src/tools/UBGraphicsProtractor.h

@@ -58,6 +58,7 @@ class UBGraphicsProtractor : public UBAbstractDrawRuler, public QGraphicsEllipse
         virtual void    hoverMoveEvent (QGraphicsSceneHoverEvent *event);
         virtual QPainterPath shape() const;
         QRectF boundingRect() const;
+
     private:
         // Helpers
         void paintGraduations (QPainter *painter);
@@ -94,6 +95,9 @@ class UBGraphicsProtractor : public UBAbstractDrawRuler, public QGraphicsEllipse
 
         virtual void rotateAroundTopLeftOrigin(qreal angle);
         virtual QPointF	topLeftOrigin() const;
+
+        int sFillTransparency;
+        int sDrawTransparency;
 };
 
 #endif /* UBGRAPHICSPROTRACTOR_H_ */

src/web/browser/WBWebView.cpp

@@ -151,7 +151,7 @@ void WBWebPage::handleUnsupportedContent(QNetworkReply *reply)
     if (isPDF)
     {
         QMessageBox messageBox(mainWindow());
-        messageBox.setText(tr("Download PDF Document: would you prefer to download the PDF file or add it to the current Uniboard document?"));
+        messageBox.setText(tr("Download PDF Document: would you prefer to download the PDF file or add it to the current Sankore document?"));
 
         messageBox.addButton(tr("Download"), QMessageBox::AcceptRole);
         QAbstractButton *addButton =