From 2856b43d71ffa5d7ff87e924655a1dc60ba4a28a Mon Sep 17 00:00:00 2001
From: Thomas Cresson <thomas.cresson2@gmail.com>
Date: Mon, 1 Jul 2013 14:03:55 +0200
Subject: [PATCH] Fix -> Now the quota is respected with jumploader (if you
 exceed it you will see the error in jumploader GUI and it will erase all the
 already uploaded partitions and it'll stop the upload) Enhancement -> can now
 handle errors like missing partitions or corrupted data (you will see the
 error in jumploader GUI and it will erase all the already uploaded partitions
 and it'll stop the upload)

---
 .../class.JumploaderProcessor.php             | 59 +++++++++++++++----
 1 file changed, 49 insertions(+), 10 deletions(-)

diff --git a/core/src/plugins/uploader.jumploader/class.JumploaderProcessor.php b/core/src/plugins/uploader.jumploader/class.JumploaderProcessor.php
index 0a46a5654d..2b2c39b584 100644
--- a/core/src/plugins/uploader.jumploader/class.JumploaderProcessor.php
+++ b/core/src/plugins/uploader.jumploader/class.JumploaderProcessor.php
@@ -77,24 +77,30 @@ public function postProcess($action, $httpVars, $postProcessData){
 
         if(isset($postProcessData["processor_result"]["ERROR"])){
             if(isset($httpVars["lastPartition"]) && isset($httpVars["partitionCount"])){
-                if($httpVars["partitionCount"] > 1){
-                    /* we get the stream url (where all the partitions have been uploaded so far) */
-                    $repository = ConfService::getRepository();
-                    $dir = AJXP_Utils::decodeSecureMagic($httpVars["dir"]);
-                    $plugin = AJXP_PluginsService::findPlugin("access", $repository->getAccessType());
-                    $streamData = $plugin->detectStreamWrapper(true);
-                    $destStreamURL = $streamData["protocol"]."://".$repository->getId().$dir."/";
+                /* we get the stream url (where all the partitions have been uploaded so far) */
+                $repository = ConfService::getRepository();
+                $dir = AJXP_Utils::decodeSecureMagic($httpVars["dir"]);
+                $plugin = AJXP_PluginsService::findPlugin("access", $repository->getAccessType());
+                $streamData = $plugin->detectStreamWrapper(true);
+                $destStreamURL = $streamData["protocol"]."://".$repository->getId().$dir."/";
 
+                if($httpVars["partitionCount"] > 1){
                     /* we fetch the information that help us to construct the temp files name */
                     $index = intval($httpVars["partitionIndex"]);
                     $fileId = $httpVars["fileId"];
                     $clientId = $httpVars["ajxp_sessid"];
 
                     /* deletion of all the partitions that have been uploaded */
-                    for($i = 0; $i < $index; $i++){
-                        unlink($destStreamURL."$clientId.$fileId.$i");
+                    for($i = 0; $i < $httpVars["partitionCount"]; $i++){
+                        if(file_exists($destStreamURL."$clientId.$fileId.$i")){
+                            unlink($destStreamURL."$clientId.$fileId.$i");
+                        }
                     }
                 }
+                else{
+                    $fileName = $httpVars["fileName"];
+                    unlink($destStreamURL.$fileName);
+                }
             }
             echo "Error: ".$postProcessData["processor_result"]["ERROR"]["MESSAGE"];
             return;
@@ -111,7 +117,6 @@ public function postProcess($action, $httpVars, $postProcessData){
         }
 
         if($httpVars["lastPartition"]){
-
             $plugin = AJXP_PluginsService::findPlugin("access", $repository->getAccessType());
             $streamData = $plugin->detectStreamWrapper(true);
             $dir = AJXP_Utils::decodeSecureMagic($httpVars["dir"]);
@@ -122,6 +127,40 @@ public function postProcess($action, $httpVars, $postProcessData){
             $subs = explode("/", $httpVars["relativePath"]);
             $userfile_name = array_pop($subs);
             $folderForbidden = false;
+            $all_in_place = true;
+            $partitions_length = 0;
+            $fileId = $httpVars["fileId"];
+            $clientId = $httpVars["ajxp_sessid"];
+            $partitionCount = $httpVars["partitionCount"];
+            $partitionIndex = $httpVars["partitionIndex"];
+            $fileLength = $_POST["fileLength"];
+
+            /* check if all the partitions have been uploaded or not */
+            for( $i = 0; $all_in_place && $i < $partitionCount; $i++ ) {
+                $partition_file = $destStreamURL."$clientId.$fileId.$i";
+                if( file_exists( $partition_file ) ) {
+                    $partitions_length += filesize( $partition_file );
+                } else {
+                    $all_in_place = false;
+                }
+            }
+
+            if(!$all_in_place || $partitions_length != intval($fileLength)){
+                echo "Error: Upload validation error!";
+                /* we delete all the uploaded partitions */
+                if($httpVars["partitionCount"] > 1){
+                    for($i = 0; $i < $partitionCount; $i++){
+                        if(file_exists($destStreamURL."$clientId.$fileId.$i")){
+                            unlink($destStreamURL."$clientId.$fileId.$i");
+                        }
+                    }
+                }
+                else{
+                    $fileName = $httpVars["fileName"];
+                    unlink($destStreamURL.$fileName);
+                }
+                return;
+            }
 
             if(count($subs) > 0){
                 $curDir = "";