Several changes:

 - Changes to WFileDropWidget
 - Fix issue #5378
 - Fix issue #5331: allow WTimer to be a child of WApplication
 - Fix issue #5459
 - Fix issue #5458
 - Fix issue #5352
 - Fix issue #5261
 - Applied patch of bug 5391 to fix WTextEdit (TinyMCE 4) in layout gets excessive height under certain conditions
 - GraphicsMagick: properly deallocate ExceptionInfo
 - Fix for issue #5382,  "confirm email first" dialog is not displayed anymore when user has a verified email address"
 - MetaDbo destructor shouldn't throw
 - Fixed missing round_js_str in some places
 - Fix non-threaded version of Wt with boost 1.61
 - Fixed heap buffer overflow in Wt::narrow()
 - Issue #5428: Added headers() function for http connections to retrieve all headers
 - WDropEvent: mouseEvent() and touchEvent() return pointers (breaks backwards compatibility)
 - WObject should not be copy assignable
 - Feature #4656: fixes for multi item selection

Author: RockinRoel

doc/main

@@ -568,9 +568,13 @@ appRoot=C:\Program Files\MyApplications\AppRoot
     <dt><strong>tracking</strong></dt>
 
     <dd>How session tracking is implemented: automatically (using
-      cookies when available, otherwise using URL rewriting) or
+      cookies when available, otherwise using URL rewriting),
       strictly using URL rewriting (which allows multiple concurrent
-      sessions from one user).  </dd>
+      sessions from one user), or a combined tracking strategy that uses
+	  URL rewriting in combination with a shared cookie between
+	  sessions in the same browser for extra session hijacking protection.
+	  The combined strategy does not fall back to only URL rewriting when
+	  cookies are not available: it will simply refuse access.</dd>
 
     <dt><strong>reload-is-new-session</strong></dt>
 

examples/filedrop/FileDropApplication.C

@@ -7,73 +7,130 @@
 #include "FileDropApplication.h"
 
 #include <Wt/WContainerWidget>
+#include <Wt/WPushButton>
 #include <Wt/WText>
 #include <Wt/WFileDropWidget>
-#include <Wt/WFileUpload>
+#include "Wt/Utils"
 
 #include <iostream>
 #include <fstream>
 
 using namespace Wt;
 
 static const std::string UPLOAD_FOLDER = "./uploaded/";
+static const int MAX_FILES = 36;
+
 
 FileDropApplication::FileDropApplication(const WEnvironment& env)
-  : WApplication(env)
+  : WApplication(env),
+    nbUploads_(0)
 {
   setTitle("File Drop Example");
+  useStyleSheet("style.css");
 
   new WText("<h1>Try dropping a file in the widget below</h1>", root());
-  
-  drop_ = new WFileDropWidget();
-  root()->addWidget(drop_);
 
-  connectFileUpload();
+  drop_ = new WFileDropWidget(root());
+
+  drop_->drop().connect(this, &FileDropApplication::handleDrop);
+  drop_->newUpload().connect(this,&FileDropApplication::updateProgressListener);
+  drop_->uploaded().connect(this, &FileDropApplication::saveFile);
+  drop_->uploadFailed().connect(this, &FileDropApplication::failed);
+  drop_->tooLarge().connect(this, &FileDropApplication::tooLarge);
 
   log_ = new WText(root());
-}
+  log_->setInline(false);
+  log_->setTextFormat(XHTMLText);
 
-void FileDropApplication::connectFileUpload()
-{
-  drop_->fileUpload()->setMultiple(true);
-  drop_->fileUpload()->uploaded().connect(this, &FileDropApplication::saveFile);
-  drop_->fileUpload()->fileTooLarge().connect(this,
-					      &FileDropApplication::fileTooBig);
+  WPushButton *abort = new WPushButton("Abort current upload", root());
+  abort->clicked().connect(this, &FileDropApplication::cancelUpload);
 }
 
-void FileDropApplication::saveFile()
+void FileDropApplication::handleDrop(std::vector<WFileDropWidget::File *> files)
 {
-  std::vector<Http::UploadedFile> files = drop_->fileUpload()->uploadedFiles();
-  for (int i =0; i < files.size(); i++) {
-    std::string spool = files[i].spoolFileName();
-    
-    std::ifstream src(spool.c_str(), std::ios::binary);
-    std::ofstream dest((UPLOAD_FOLDER + files[i].clientFileName()).c_str(),
-		       std::ios::binary);
-    if (dest.fail()) {
-      std::cerr << "**** ERROR: The output file could not be opened"
-		<< std::endl;
-      break;
+  for (unsigned i=0; i < files.size(); i++) {
+    if (nbUploads_ >= MAX_FILES) {
+      drop_->cancelUpload(files[i]);
+      continue;
     }
-    
-    dest << src.rdbuf();
 
-    // Add a little block to the container-widget
     WContainerWidget *block = new WContainerWidget(drop_);
-    block->setWidth(20);
-    block->setHeight(20);
-    block->setMargin(10);
-    block->decorationStyle().setBackgroundColor(WColor("black"));
+    block->setToolTip(files[i]->clientFileName() + " [" + files[i]->mimeType()
+		      + "]");
+    block->addStyleClass("upload-block");
+
+    icons_[files[i]] = block;
+    nbUploads_++;
+  }
+  
+  if (nbUploads_ >= MAX_FILES) {
+    log_->setText("That's enough ...");
+    drop_->setAcceptDrops(false);
   }
+}
+
+void FileDropApplication::cancelUpload()
+{
+  if (drop_->uploads().size() == drop_->currentIndex())
+    return;
+  
+  WFileDropWidget::File *currentFile = drop_->uploads()[drop_->currentIndex()];
+  drop_->cancelUpload(currentFile);
+  icons_[currentFile]->addStyleClass("cancelled");
+}
+
+void FileDropApplication::tooLarge(WFileDropWidget::File *file)
+{
+  icons_[file]->addStyleClass("invalid");
+  
+  log_->setText("File too large: " + file->clientFileName());
+}
 
+void FileDropApplication::failed(WFileDropWidget::File *file)
+{
+  icons_[file]->addStyleClass("invalid");
 
-  log_->setText("Thanks for the file(s)");
+  log_->setText("Upload failed: " + file->clientFileName());
+}
+
+void FileDropApplication::saveFile(WFileDropWidget::File *file)
+{
+  // std::string spool = file->uploadedFile().spoolFileName();
+  // std::ifstream src(spool.c_str(), std::ios::binary);
+
+  // std::ofstream dest((UPLOAD_FOLDER + file->clientFileName()).c_str(),
+  // 		       std::ios::binary);
+  // if (dest.fail()) {
+  //   std::cerr << "**** ERROR: The output file could not be opened"
+  // 	      << std::endl;
+  //   return;;
+  // }
 
-  drop_->resetUpload();
-  connectFileUpload();
+  // dest << src.rdbuf();
+
+  if (icons_.find(file) != icons_.end()) {
+    icons_[file]->addStyleClass("ready");
+    drop_->remove(file);
+  }
+}
+
+void FileDropApplication::updateProgressListener()
+{
+  // if there is a next file listen for progress
+  if (drop_->currentIndex() < drop_->uploads().size()) {
+    WFileDropWidget::File *file = drop_->uploads()[drop_->currentIndex()];
+    file->dataReceived().connect(this, &FileDropApplication::showProgress);
+    std::string fileName = Utils::htmlEncode(file->clientFileName());
+    log_->setText("uploading file &quot;" + fileName + "&quot;");
+  }
 }
 
-void FileDropApplication::fileTooBig()
+void FileDropApplication::showProgress(::uint64_t current, ::uint64_t total)
 {
-  log_->setText("The file is too big ...");
+  WFileDropWidget::File *file = drop_->uploads()[drop_->currentIndex()];
+  std::string c = boost::lexical_cast<std::string>(current/1024);
+  std::string t = boost::lexical_cast<std::string>(total/1024);
+  std::string fileName = Utils::htmlEncode(file->clientFileName());
+  log_->setText("uploading file <i>&quot;" + fileName + "&quot;</i>"
+		+ " (" + c + "kB" + " out of " + t + "kB)");
 }

examples/filedrop/FileDropApplication.h

@@ -9,11 +9,11 @@
 #define FILEDROPAPPLICATION_H_
 
 #include <Wt/WApplication>
+#include <Wt/WFileDropWidget>
 
 using namespace Wt;
-
 namespace Wt {
-  class WFileDropWidget;
+  class WContainerWidget;
 }
 
 class FileDropApplication : public WApplication
@@ -24,10 +24,18 @@ class FileDropApplication : public WApplication
 private:
   WText *log_;
   WFileDropWidget *drop_;
-
-  void saveFile();
-  void fileTooBig();
-  void connectFileUpload();
+  int nbUploads_;
+
+  std::map<WFileDropWidget::File*, Wt::WContainerWidget*> icons_;
+
+  void handleDrop(std::vector<WFileDropWidget::File *> files);
+  void tooLarge(WFileDropWidget::File *file);
+  void failed(WFileDropWidget::File *file);
+  void saveFile(WFileDropWidget::File *file);
+  void cancelUpload();
+  void updateProgressListener();
+  
+  void showProgress(::uint64_t current, ::uint64_t total);
 };
 
 

examples/filedrop/style.css

@@ -0,0 +1,20 @@
+
+.upload-block {
+    width: 10px;
+    height: 10px;
+    margin: 10px;
+    border: 1px solid black;
+    display: inline-block;
+}
+
+.upload-block.cancelled {
+    background-color: grey;
+}
+
+.upload-block.ready {
+    background-color: green;
+}
+
+.upload-block.invalid {
+    background-color: red;
+}

examples/widgetgallery/FormWidgets.C

@@ -236,11 +236,13 @@ Wt::WWidget *FormWidgets::progressBar()
 
 
 #include "examples/FileUpload.cpp"
+#include "examples/FileDrop.cpp"
 
 Wt::WWidget *FormWidgets::fileUpload()
 {
   Wt::WTemplate *result = new TopicTemplate("forms-fileUpload");
   result->bindWidget("FileUpload", FileUpload());
+  result->bindWidget("FileDrop", FileDrop());
 
   return result;
 }