diff --git a/lib/private/helper.php b/lib/private/helper.php index 807fa84963733140f3cfccbec81d2578825045bd..98a86388d2088d71d6b691f9d5b8434c7dda3155 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -343,35 +343,6 @@ class OC_Helper { return $bytes; } - /** - * @brief Recursive editing of file permissions - * @param string $path path to file or folder - * @param int $filemode unix style file permissions - * @return bool - */ - static function chmodr($path, $filemode) { - if (!is_dir($path)) - return chmod($path, $filemode); - $dh = opendir($path); - if(is_resource($dh)) { - while (($file = readdir($dh)) !== false) { - if ($file != '.' && $file != '..') { - $fullpath = $path . '/' . $file; - if (is_link($fullpath)) - return false; - elseif (!is_dir($fullpath) && !@chmod($fullpath, $filemode)) - return false; elseif (!self::chmodr($fullpath, $filemode)) - return false; - } - } - closedir($dh); - } - if (@chmod($path, $filemode)) - return true; - else - return false; - } - /** * @brief Recursive copying of folders * @param string $src source folder diff --git a/lib/private/util.php b/lib/private/util.php index 920161949ae417752a013ed20a157cc910e47704..fc78566e45652615091210b7f159d6f7c7e3dcfa 100755 --- a/lib/private/util.php +++ b/lib/private/util.php @@ -526,7 +526,7 @@ class OC_Util { .' cannot be listed by other users.'; $perms = substr(decoct(@fileperms($dataDirectory)), -3); if (substr($perms, -1) != '0') { - OC_Helper::chmodr($dataDirectory, 0770); + chmod($dataDirectory, 0770); clearstatcache(); $perms = substr(decoct(@fileperms($dataDirectory)), -3); if (substr($perms, 2, 1) != '0') {