aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-03-29 16:05:08 -0700
committerfriendica <info@friendica.com>2015-03-29 16:05:08 -0700
commit505e5e90b26fa398e08b6fcad266b7f0ac759bd2 (patch)
tree199ce1352c34d1d915e2a00b9eb8879fa2e0e7a0
parent76a6739b93c1c8f08dd95a45235dd89fb4c507af (diff)
downloadvolse-hubzilla-505e5e90b26fa398e08b6fcad266b7f0ac759bd2.tar.gz
volse-hubzilla-505e5e90b26fa398e08b6fcad266b7f0ac759bd2.tar.bz2
volse-hubzilla-505e5e90b26fa398e08b6fcad266b7f0ac759bd2.zip
fix os_mkdir
-rwxr-xr-xboot.php5
-rw-r--r--include/RedDAV/RedBrowser.php2
-rw-r--r--include/RedDAV/RedDirectory.php1
-rw-r--r--include/attach.php2
-rw-r--r--version.inc2
5 files changed, 8 insertions, 4 deletions
diff --git a/boot.php b/boot.php
index aac8eff12..25738192d 100755
--- a/boot.php
+++ b/boot.php
@@ -1239,8 +1239,9 @@ function absurl($path) {
function os_mkdir($path, $mode = 0777, $recursive = false) {
$oldumask = @umask(0);
- @mkdir($path, $mode, $recursive);
- @umask($oldumask);
+ $result = @mkdir($path, $mode, $recursive);
+ @umask($oldumask);
+ return $result;
}
/**
diff --git a/include/RedDAV/RedBrowser.php b/include/RedDAV/RedBrowser.php
index e651562ec..56d18ded6 100644
--- a/include/RedDAV/RedBrowser.php
+++ b/include/RedDAV/RedBrowser.php
@@ -95,6 +95,7 @@ class RedBrowser extends DAV\Browser\Plugin {
'{DAV:}getlastmodified',
), 1);
+
$parent = $this->server->tree->getNodeForPath($path);
$parentpath = array();
@@ -167,6 +168,7 @@ class RedBrowser extends DAV\Browser\Plugin {
$fullPath = DAV\URLUtil::encodePath('/' . trim($this->server->getBaseUri() . ($path ? $path . '/' : '') . $name, '/'));
+
$displayName = isset($file[200]['{DAV:}displayname']) ? $file[200]['{DAV:}displayname'] : $name;
$displayName = $this->escapeHTML($displayName);
diff --git a/include/RedDAV/RedDirectory.php b/include/RedDAV/RedDirectory.php
index 68186d21b..922be378d 100644
--- a/include/RedDAV/RedDirectory.php
+++ b/include/RedDAV/RedDirectory.php
@@ -49,6 +49,7 @@ class RedDirectory extends DAV\Node implements DAV\ICollection, DAV\IQuota {
* @param RedBasicAuth &$auth_plugin
*/
public function __construct($ext_path, &$auth_plugin) {
+// $ext_path = urldecode($ext_path);
//logger('directory ' . $ext_path, LOGGER_DATA);
$this->ext_path = $ext_path;
// remove "/cloud" from the beginning of the path
diff --git a/include/attach.php b/include/attach.php
index 2ca302949..f9206851e 100644
--- a/include/attach.php
+++ b/include/attach.php
@@ -706,7 +706,7 @@ function attach_mkdir($channel, $observer_hash, $arr = null) {
);
}
else {
- logger('attach_mkdir: ' . mkdir . ' ' . $path . 'failed.');
+ logger('attach_mkdir: ' . mkdir . ' ' . $path . ' failed.');
$ret['message'] = t('mkdir failed.');
}
}
diff --git a/version.inc b/version.inc
index 1c94d491b..6637fb5ee 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-03-28.985
+2015-03-29.986