Merge branch 'develop' of http://github.com/pydio/pydio-core into develop

ghecquet · ghecquet · commit 167eb329b4e8 · 2016-10-14T17:42:16.000+02:00
* 'develop' of http://github.com/pydio/pydio-core: remove config file phan static analyzer config PHP7
diff --git a/core/src/plugins/access.sftp_psl/SftpPSLAccessDriver.php b/core/src/plugins/access.sftp_psl/SftpPSLAccessDriver.php
@@ -24,6 +24,7 @@
 
 use DOMNode;
 use PclZip;
+use Pydio\Access\Core\Model\AJXP_Node;
 use Pydio\Access\Core\Model\UserSelection;
 use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;
 use Pydio\Core\Model\ContextInterface;
@@ -173,8 +174,12 @@ public function recursiveRmdir($path)
         return false;
     }
 
-    public function isWriteable($dir, $type="dir")
+    /**
+     * @param AJXP_Node $node
+     * @return bool
+     */
+    public function isWriteable(AJXP_Node $node)
     {
-        return is_writable($dir);
+        return is_writable($node->getUrl());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`	`use DOMNode;`
`26`	`26`	`use PclZip;`
	`27`	`+use Pydio\Access\Core\Model\AJXP_Node;`
`27`	`28`	`use Pydio\Access\Core\Model\UserSelection;`
`28`	`29`	`use Pydio\Access\Driver\StreamProvider\FS\FsAccessDriver;`
`29`	`30`	`use Pydio\Core\Model\ContextInterface;`
`@@ -173,8 +174,12 @@ public function recursiveRmdir($path)`
`173`	`174`	`return false;`
`174`	`175`	`}`
`175`	`176`
`176`		`- public function isWriteable($dir, $type="dir")`
	`177`	`+ /**`
	`178`	`+ * @param AJXP_Node $node`
	`179`	`+ * @return bool`
	`180`	`+ */`
	`181`	`+ public function isWriteable(AJXP_Node $node)`
`177`	`182`	`{`
`178`		`- return is_writable($dir);`
	`183`	`+ return is_writable($node->getUrl());`
`179`	`184`	`}`
`180`	`185`	`}`