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

bLoginow · bLoginow · commit 3014bf48b452 · 2016-10-13T12:56:39.000+02:00
Conflicts:
	core/src/plugins/access.ajxp_home/res/i18n/de.php
diff --git a/core/src/core/doc/api2.json b/core/src/core/doc/api2.json
diff --git a/core/src/core/src/lib/pclzip.lib.php b/core/src/core/src/lib/pclzip.lib.php
diff --git a/core/src/core/src/pydio/Core/Http/Middleware/SapiMiddleware.php b/core/src/core/src/pydio/Core/Http/Middleware/SapiMiddleware.php
@@ -130,8 +130,14 @@ public function emitResponse(ServerRequestInterface $request, ResponseInterface
                 $response = $response->withHeader("Content-type", "text/xml; charset=UTF-8");
             }
         }
+        if($response === false){
+            return;
+        }
 
-        if($response !== false && ($response->getBody()->getSize() || $response instanceof \Zend\Diactoros\Response\EmptyResponse) || $response->getStatusCode() != 200) {
+        if( $response->getBody()->getSize() === null
+            || $response->getBody()->getSize() > 0
+            || $response instanceof \Zend\Diactoros\Response\EmptyResponse
+            || $response->getStatusCode() != 200) {
             $emitter = new SapiEmitter();
             ShutdownScheduler::setCloseHeaders($response);
             $emitter->emit($response);
diff --git a/core/src/core/src/pydio/Core/Http/Response/AsyncResponseStream.php b/core/src/core/src/pydio/Core/Http/Response/AsyncResponseStream.php
@@ -100,7 +100,7 @@ public function detach()
     public function getSize()
     {
         // Return a non-null size if there's a pending callback.
-        return (isSet($this->callback) && !$this->callbackExecuted ? 1 : null);
+        return null;//(isSet($this->callback) && !$this->callbackExecuted ? 1 : null);
     }
 
     /**
diff --git a/core/src/core/src/pydio/Core/Http/Rest/ApiRouter.php b/core/src/core/src/pydio/Core/Http/Rest/ApiRouter.php
@@ -66,7 +66,7 @@ public function __construct($base, $cacheOptions = []){
      */
     public function configureRoutes(\FastRoute\RouteCollector &$r){
         
-        $configObject = json_decode(file_get_contents(AJXP_INSTALL_PATH . "/" . AJXP_DOCS_FOLDER . "/api2.json"), true);
+        $configObject = json_decode(file_get_contents(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER . "/core.ajaxplorer/routes/api2.json"), true);
         foreach ($configObject["paths"] as $path => $methods){
             foreach($methods as $method => $apiData){
                 if(preg_match('/\{path\}/', $path)){
diff --git a/core/src/core/src/pydio/Core/Http/TopLevelRouter.php b/core/src/core/src/pydio/Core/Http/TopLevelRouter.php
@@ -69,7 +69,7 @@ public function __construct($cacheOptions = []){
     public function configureRoutes($base, RouteCollector &$r){
         
         $allMethods = ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'TRACE', 'OPTIONS', 'CONNECT', 'PATCH', 'PROPFIND', 'PROPPATCH', 'MKCOL', 'COPY', 'MOVE', 'LOCK', 'UNLOCK'];
-        $file = AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.ajaxplorer/routes.json";
+        $file = AJXP_INSTALL_PATH."/".AJXP_PLUGINS_FOLDER."/core.ajaxplorer/routes/main.json";
         $textContent = file_get_contents($file);
         $textContent = str_replace("%PUBLIC_BASEURI%", ConfService::getGlobalConf("PUBLIC_BASEURI"), $textContent);
         $textContent = str_replace("%WEBDAV_BASEURI%", ConfService::getGlobalConf("WEBDAV_BASEURI"), $textContent);
diff --git a/core/src/core/src/pydio/Core/Http/Wopi/Router.php b/core/src/core/src/pydio/Core/Http/Wopi/Router.php
@@ -64,7 +64,7 @@ public function __construct($base, $cacheOptions = []){
      */
     public function configureRoutes(RouteCollector &$r){
         
-        $configObject = json_decode(file_get_contents(AJXP_INSTALL_PATH . "/" . AJXP_DOCS_FOLDER . "/wopi.json"), true);
+        $configObject = json_decode(file_get_contents(AJXP_INSTALL_PATH . "/" . AJXP_PLUGINS_FOLDER . "/core.ajaxplorer/routes/wopi.json"), true);
 
         foreach ($configObject["paths"] as $path => $methods){
             foreach($methods as $method => $apiData){
diff --git a/core/src/plugins/access.ajxp_conf/ajxp_confActions.xml b/core/src/plugins/access.ajxp_conf/ajxp_confActions.xml
@@ -629,6 +629,7 @@
                         <div id="enterprise_advertise_block" box_width="70%" box_padding="0" box_height="80%" box_resize="true" style="height:100%;" class="vertical_layout">
                             <iframe style="width: 100%; height: 90%; border: 0px solid #ddd;" class="vertical_fit"></iframe>
                             <div style="padding:20px;">&nbsp;</div>
+                            <style>.form-enterprise_advertise_block .dialogTitle {display:none;}</style>
                         </div>
                     ]]></clientForm>
                 <clientListener name="init"><![CDATA[
diff --git a/core/src/plugins/access.ajxp_conf/src/ConfAccessDriver.php b/core/src/plugins/access.ajxp_conf/src/ConfAccessDriver.php
@@ -430,7 +430,6 @@ public function displayEnterprise(ServerRequestInterface $requestInterface, Resp
                 file_put_contents($touchFile, time());
             }else{
                 $responseInterface = new JsonResponse(["display" => false]);
-                echo json_encode(["display" => false]);
             }
         }else{
             $responseInterface = new JsonResponse(["display" => true]);
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/ca.php b/core/src/plugins/access.ajxp_home/res/i18n/ca.php
@@ -93,4 +93,5 @@
     "75"=> "Search all files...",
     "76" => "Access the %1 through the top-right menu",
     "77" => "admin dashboard",
+    "78" => "Pick a target workspace",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/de.php b/core/src/plugins/access.ajxp_home/res/i18n/de.php
@@ -90,4 +90,5 @@
     "75"=> "Alle Dateien durchsuchen...",
     "76" => "Über das Menü oben rechts können Sie auf die %1 zugreifen",
     "77" => "Einstellungen",
+    "78" => "Wählen Sie eine Ziel-Arbeitsumgebung",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/en.php b/core/src/plugins/access.ajxp_home/res/i18n/en.php
@@ -90,4 +90,5 @@
 "75"=> "Search all files...",
 "76" => "Access the %1 through the top-right menu",
 "77" => "admin dashboard",
+"78" => "Pick a target workspace",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/es.php b/core/src/plugins/access.ajxp_home/res/i18n/es.php
@@ -94,4 +94,5 @@
     "75"=> "Search all files...",
     "76" => "Access the %1 through the top-right menu",
     "77" => "admin dashboard",
+    "78" => "Pick a target workspace",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/fr.php b/core/src/plugins/access.ajxp_home/res/i18n/fr.php
@@ -89,4 +89,5 @@
     "75"=> "Chercher dans tous les fichiers...",
     "76" => "Utilisez le menu en haut à droite pour acceder au %1.",
     "77" => "panneau d'administration",
+    "78" => "Sélectionnez un workspace",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/hu.php b/core/src/plugins/access.ajxp_home/res/i18n/hu.php
@@ -93,4 +93,5 @@
     "75"=> "Search all files...",
     "76" => "Access the %1 through the top-right menu",
     "77" => "admin dashboard",
+    "78" => "Pick a target workspace",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/it.php b/core/src/plugins/access.ajxp_home/res/i18n/it.php
@@ -90,4 +90,5 @@
     "75"=> "Search all files...",
     "76" => "Access the %1 through the top-right menu",
     "77" => "admin dashboard",
+    "78" => "Pick a target workspace",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/nl.php b/core/src/plugins/access.ajxp_home/res/i18n/nl.php
@@ -90,5 +90,6 @@
     "75"=> "Search all files...",
     "76" => "Access the %1 through the top-right menu",
     "77" => "admin dashboard",
+    "78" => "Pick a target workspace",
 );
 
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/pt.php b/core/src/plugins/access.ajxp_home/res/i18n/pt.php
@@ -90,4 +90,5 @@
     "75"=> "Search all files...",
     "76" => "Access the %1 through the top-right menu",
     "77" => "admin dashboard",
+    "78" => "Pick a target workspace",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/ru.php b/core/src/plugins/access.ajxp_home/res/i18n/ru.php
@@ -90,4 +90,5 @@
     "75"=> "Search all files...",
     "76" => "Access the %1 through the top-right menu",
     "77" => "admin dashboard",
+    "78" => "Pick a target workspace",
 );
diff --git a/core/src/plugins/access.ajxp_home/res/i18n/si.php b/core/src/plugins/access.ajxp_home/res/i18n/si.php
@@ -91,4 +91,5 @@
     "75"=> "Search all files...",
     "76" => "Access the %1 through the top-right menu",
     "77" => "admin dashboard",
+    "78" => "Pick a target workspace",
 );
diff --git a/core/src/plugins/access.fs/FsAccessDriver.php b/core/src/plugins/access.fs/FsAccessDriver.php
@@ -654,19 +654,34 @@ public function downloadAction(ServerRequestInterface &$request, ResponseInterfa
                     $zip = true;
                 }
                 if ($zip) {
-                    // Make a temp zip and send it as download
-                    $loggedUser = $ctx->getUser();
-                    $file = ApplicationState::getTemporaryFolder() ."/".($loggedUser?$loggedUser->getId():"shared")."_".time()."tmpDownload.zip";
-                    $zipFile = $this->makeZip($selection, $file, empty($dir)?"/":$dir);
-                    if(!$zipFile) throw new PydioException("Error while compressing");
                     $localName = (empty($base)?"Files":$base).".zip";
                     if(isSet($httpVars["archive_name"])){
                         $localName = InputFilter::decodeSecureMagic($httpVars["archive_name"]);
                     }
-                    $fileReader = new FileReaderResponse($file);
-                    $fileReader->setUnlinkAfterRead();
-                    $fileReader->setLocalName($localName);
-                    $response = $response->withBody($fileReader);
+                    if ($this->getContextualOption($ctx, "ZIP_ON_THE_FLY")) {
+                        // Make a zip on the fly and send stream as download
+                    	$response = HTMLWriter::responseWithAttachmentsHeaders($response, $localName, null, false, false);
+                        $asyncReader = new \Pydio\Core\Http\Response\AsyncResponseStream(function () use ($selection, $dir) {
+                            session_write_close();
+                            restore_error_handler();
+                            restore_exception_handler();
+                            set_exception_handler('Pydio\Access\Driver\StreamProvider\FS\download_exception_handler');
+                            set_error_handler('Pydio\Access\Driver\StreamProvider\FS\download_exception_handler');
+                            $zipFile = $this->makeZip($selection, "php://output", empty($dir)?"/":$dir);
+                            if(!$zipFile) throw new PydioException("Error while compressing");
+                        });
+                        $response = $response->withBody($asyncReader);
+                    } else {
+                        // Make a temp zip and send it as download
+                        $loggedUser = $ctx->getUser();
+                        $file = ApplicationState::getTemporaryFolder() ."/".($loggedUser?$loggedUser->getId():"shared")."_".time()."tmpDownload.zip";
+                        $zipFile = $this->makeZip($selection, $file, empty($dir)?"/":$dir);
+                        if(!$zipFile) throw new PydioException("Error while compressing");
+                        $fileReader = new FileReaderResponse($file);
+                        $fileReader->setUnlinkAfterRead();
+                        $fileReader->setLocalName($localName);
+                        $response = $response->withBody($fileReader);
+                    }
                 } else {
                     $localName = "";
                     Controller::applyHook("dl.localname", [$selection->getUniqueNode(), &$localName]);
diff --git a/core/src/plugins/access.fs/manifest.xml b/core/src/plugins/access.fs/manifest.xml
@@ -14,6 +14,7 @@
         <param name="DATA_TEMPLATE" type="string" label="CONF_MESSAGE[Data template]" description="CONF_MESSAGE[Path to a directory on the filesystem whose content will be copied to the repository the first time it is loaded.]" default=""/>
         <global_param name="PROBE_REAL_SIZE" type="boolean" label="CONF_MESSAGE[Real Size Probing]" description="CONF_MESSAGE[Use system command line to get the filesize instead of php built-in function (fixes the 2Go limitation)]" default="false"/>
         <global_param name="USE_POSIX" type="boolean" label="CONF_MESSAGE[Use POSIX]" description="CONF_MESSAGE[Use php POSIX extension to read files permissions. Only works on *nix systems.]" default="false"/>
+        <global_param name="ZIP_ON_THE_FLY" type="boolean" label="CONF_MESSAGE[Zip downloading files on the fly]" description="CONF_MESSAGE[Directly write the zip file to an output stream which is connected to the user's browser.]" default="false"/>
         <global_param group="MIXIN_MESSAGE[Metadata and indexation]" name="DEFAULT_METASOURCES" type="string" label="MIXIN_MESSAGE[Default Metasources]" description="MIXIN_MESSAGE[Comma separated list of metastore and meta plugins, that will be automatically applied to all repositories created with this driver]" mandatory="false" default="metastore.serial,meta.watch,meta.syncable,meta.filehasher,index.lucene"/>
 	</server_settings>
 	<class_definition filename="plugins/access.fs/FsAccessDriver.php" classname="Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver"/>
diff --git a/core/src/plugins/core.ajaxplorer/routes/api2.json b/core/src/plugins/core.ajaxplorer/routes/api2.json
diff --git a/core/src/plugins/core.ajaxplorer/routes/main.json b/core/src/plugins/core.ajaxplorer/routes/main.json
diff --git a/core/src/plugins/core.ajaxplorer/routes/wopi.json b/core/src/plugins/core.ajaxplorer/routes/wopi.json
diff --git a/core/src/plugins/gui.ajax/manifest.xml b/core/src/plugins/gui.ajax/manifest.xml
@@ -227,7 +227,7 @@
 				</div>
 			]]></template>
 			<component_config className="FilesList">
-				<property name="thumbSize" value="64"/>
+				<property name="thumbSize" value="128"/>
 			</component_config>
 		</client_configs>
 	</registry_contributions>
diff --git a/core/src/plugins/gui.ajax/res/js/vendor/prototype/proto.menu.js b/core/src/plugins/gui.ajax/res/js/vendor/prototype/proto.menu.js
@@ -30,6 +30,7 @@ Proto.Menu = Class.create({
 			anchorSrc:'',
 			anchorTitle:'',
 			anchorPosition:'last',
+            forceCheckHeight:false,
 			beforeShow: e,
 			beforeHide: e,
 			beforeSelect: e,
@@ -383,7 +384,7 @@ Proto.Menu = Class.create({
 
 	checkHeight : function(offsetTop){
         offsetTop = parseInt(offsetTop);
-		if(this.options.anchor == 'mouse') return;
+		if(this.options.anchor == 'mouse' && !this.options.forceCheckHeight) return;
 		var vpHeight = getViewPortHeight()-10;
         if(this.options.menuMaxHeight){
             vpHeight = Math.min(this.options.menuMaxHeight, vpHeight);
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/menus.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/menus.less
@@ -220,6 +220,25 @@ div.menu {
       background-color: darken(@menu_desktop_background_color, 5%);
     }
 
+    &.home_upload{
+      background-color: rgba(255, 255, 255, 0.93);
+      width:300px;
+      li{
+        border-bottom: 1px solid rgba(0, 0, 0, 0.04);
+        a{
+          font-size:15px;
+        }
+        &.menuTitle {
+          display: block;
+          padding: 16px;
+          text-align: left;
+          background-color: #607D8B;
+          color: white;
+          font-weight: 500;
+        }
+      }
+    }
+
   }
 
   &.menuDetails {
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/components/uploaders.less b/core/src/plugins/gui.ajax/res/themes/orbit/css/components/uploaders.less
@@ -62,8 +62,12 @@ div#multiple_download_container{
   background-position: center;
 }
 
-.dropareaHover{
-  background-color: #FAF3ED !important;
+.dropareaHover, .dropareaHover #content_pane{
+  background-color: #FFF8E1 !important;
+}
+
+.webfx-tree-item.dropareaHover{
+  background-color: rgba(255, 253, 231, 0.43) !important;
 }
 
 #content_pane.dropareaHover div.thumbnail_selectable_cell{
@@ -136,7 +140,6 @@ div#total_files_list{
 .dotted_container_item_mixin{
   overflow: hidden;
   padding: 16px 14px;
-  height: 20px;
   position: relative;
   background-image: url('@{imagePath}dl_bg.png');
   /*background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><rect x='0' y='0' width='100%' height='100%' stroke='transparent' fill='@{uploader_dialog_progress_color}' fill-opacity='1'/></svg>");*/
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/pydio.css
@@ -2066,8 +2066,12 @@ div#multiple_download_container a span.mdi-download {
 .uploadFilesList.droparea {
   background-position: center;
 }
-.dropareaHover {
-  background-color: #FAF3ED !important;
+.dropareaHover,
+.dropareaHover #content_pane {
+  background-color: #FFF8E1 !important;
+}
+.webfx-tree-item.dropareaHover {
+  background-color: rgba(255, 253, 231, 0.43) !important;
 }
 #content_pane.dropareaHover div.thumbnail_selectable_cell {
   background-color: transparent !important;
@@ -2132,7 +2136,6 @@ div#total_files_list {
 .dotted_container_item_mixin {
   overflow: hidden;
   padding: 16px 14px;
-  height: 20px;
   position: relative;
   background-image: url('../images/dl_bg.png');
   /*background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><rect x='0' y='0' width='100%' height='100%' stroke='transparent' fill='@{uploader_dialog_progress_color}' fill-opacity='1'/></svg>");*/
@@ -2151,7 +2154,6 @@ div#upload_files_list {
 div#upload_files_list > div {
   overflow: hidden;
   padding: 16px 14px;
-  height: 20px;
   position: relative;
   background-image: url('../images/dl_bg.png');
   /*background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><rect x='0' y='0' width='100%' height='100%' stroke='transparent' fill='@{uploader_dialog_progress_color}' fill-opacity='1'/></svg>");*/
@@ -2265,7 +2267,6 @@ div#upload_files_list span.mdi-close:hover {
 div#multiple_download_container div {
   overflow: hidden;
   padding: 16px 14px;
-  height: 20px;
   position: relative;
   background-image: url('../images/dl_bg.png');
   /*background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><rect x='0' y='0' width='100%' height='100%' stroke='transparent' fill='@{uploader_dialog_progress_color}' fill-opacity='1'/></svg>");*/
@@ -5074,6 +5075,24 @@ div.menu.desktop.panelHeaderMenu li.menuTitle {
   text-align: left;
   background-color: #f2f2f2;
 }
+div.menu.desktop.home_upload {
+  background-color: rgba(255, 255, 255, 0.93);
+  width: 300px;
+}
+div.menu.desktop.home_upload li {
+  border-bottom: 1px solid rgba(0, 0, 0, 0.04);
+}
+div.menu.desktop.home_upload li a {
+  font-size: 15px;
+}
+div.menu.desktop.home_upload li.menuTitle {
+  display: block;
+  padding: 16px;
+  text-align: left;
+  background-color: #607D8B;
+  color: white;
+  font-weight: 500;
+}
 div.menu.menuDetails a {
   line-height: 17px;
   padding: 10px 5px;
diff --git a/core/src/plugins/uploader.flex/manifest.xml b/core/src/plugins/uploader.flex/manifest.xml
@@ -28,7 +28,7 @@
 	</registry_contributions>
 	<dependencies>
 		<!-- Stream Wrapper Access -->
-		<activePlugin pluginName="access.AJXP_STREAM_PROVIDER|action.quicksend"/>
+		<activePlugin pluginName="access.AJXP_STREAM_PROVIDER|access.ajxp_home"/>
 	</dependencies>
 	<processing>
 		<clientForm id="flash_upload_form"><![CDATA[
diff --git a/core/src/plugins/uploader.html/SimpleUpload.php b/core/src/plugins/uploader.html/SimpleUpload.php
diff --git a/core/src/plugins/uploader.html/class.XHRUploader.js b/core/src/plugins/uploader.html/class.XHRUploader.js
diff --git a/core/src/plugins/uploader.html/js/react/UploaderGlobalListener.js b/core/src/plugins/uploader.html/js/react/UploaderGlobalListener.js
diff --git a/core/src/plugins/uploader.html/js/react/UploaderModel.js b/core/src/plugins/uploader.html/js/react/UploaderModel.js
diff --git a/core/src/plugins/uploader.html/js/react/UploaderView.js b/core/src/plugins/uploader.html/js/react/UploaderView.js
diff --git a/core/src/plugins/uploader.html/manifest.xml b/core/src/plugins/uploader.html/manifest.xml

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function detach()`
`100`	`100`	`public function getSize()`
`101`	`101`	`{`
`102`	`102`	`// Return a non-null size if there's a pending callback.`
`103`		`- return (isSet($this->callback) && !$this->callbackExecuted ? 1 : null);`
	`103`	`+ return null;//(isSet($this->callback) && !$this->callbackExecuted ? 1 : null);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -430,7 +430,6 @@ public function displayEnterprise(ServerRequestInterface $requestInterface, Resp`
`430`	`430`	`file_put_contents($touchFile, time());`
`431`	`431`	`}else{`
`432`	`432`	`$responseInterface = new JsonResponse(["display" => false]);`
`433`		`- echo json_encode(["display" => false]);`
`434`	`433`	`}`
`435`	`434`	`}else{`
`436`	`435`	`$responseInterface = new JsonResponse(["display" => true]);`