Merge remote-tracking branch 'origin/develop' into develop

pydio · Nov 25, 2015 · 6e4c864 · 6e4c864
2 parents 32ecc19 + fa102f4
commit 6e4c864
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ## Pydio Core
 
-[Homepage](https://pyd.io/) |
+[Homepage](https://pydio.com/) |
 [GitHub-Repository](https://github.com/pydio/pydio-core) |
 [Issue-Tracker](https://github.com/pydio/pydio-core/issues) |
  [![Codacy Badge](https://api.codacy.com/project/badge/3b5cafea44e949e789d1928687e04032)](https://www.codacy.com/app/charles_3085/pydio-core)
@@ -15,7 +15,7 @@ This is the main source code repository of Pydio (formerly AjaXplorer), containi
 
 ### Getting support
 
-Please DO NOT send emails to Charles, but use the forum located on http://pyd.io/f/ instead. Once your problem is qualified, if it's a bug, you will be asked to enter it in the GitHub issue tracker.
+Please DO NOT send emails to Charles, but use the forum located on https://pydio.com/forum/ instead. Once your problem is qualified, if it's a bug, you will be asked to enter it in the GitHub issue tracker.
 
 ### How to contribute / Developer Resources
 

diff --git a/core/src/plugins/action.compression/class.PluginCompression.php b/core/src/plugins/action.compression/class.PluginCompression.php
@@ -253,7 +253,12 @@ public function receiveAction($action, $httpVars, $fileVars)
                         continue;
                     }
                     $fileNameInArchive = substr(strstr($fileGetPathName, $fileArchive), strlen($fileArchive) + 1);
-                    $archive->extractTo(AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl . $onlyFileName), $fileNameInArchive, false);
+                    try {
+                        $archive->extractTo(AJXP_MetaStreamWrapper::getRealFSReference($currentDirUrl . $onlyFileName), $fileNameInArchive, false);
+                    } catch (Exception $e) {
+                        file_put_contents($progressExtractFileName, "Error : " . $e->getMessage());
+                        throw new AJXP_Exception($e);
+                    }
                     $newNode = new AJXP_Node($currentDirUrl . $onlyFileName . DIRECTORY_SEPARATOR . $fileNameInArchive);
                     AJXP_Controller::applyHook("node.change", array(null, $newNode, false));
                     $counterExtract++;