diff options
| -rwxr-xr-x | boot.php | 5 | ||||
| -rw-r--r-- | include/RedDAV/RedBrowser.php | 2 | ||||
| -rw-r--r-- | include/RedDAV/RedDirectory.php | 1 | ||||
| -rw-r--r-- | include/attach.php | 2 | ||||
| -rw-r--r-- | version.inc | 2 |
5 files changed, 8 insertions, 4 deletions
@@ -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 |