diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-01-14 20:30:39 +0100 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-01-16 18:09:16 +0100 |
| commit | 5bfe4adbaa9c402db5bd0d0f74fd9ad7bb037129 (patch) | |
| tree | c0a4b2c32975ec45c5d7ec371f1a4dfcb7caab0b /lib/public/share.php | |
| parent | a8f963d9cf5b243cae497450af78c20cbc367b4b (diff) | |
| download | nextcloud-server-5bfe4adbaa9c402db5bd0d0f74fd9ad7bb037129.tar.gz nextcloud-server-5bfe4adbaa9c402db5bd0d0f74fd9ad7bb037129.zip | |
Whitespace cleanup
Diffstat (limited to 'lib/public/share.php')
| -rw-r--r-- | lib/public/share.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/public/share.php b/lib/public/share.php index 7ed1c42490d..cda583aa073 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -351,14 +351,14 @@ class Share { //delete the old share self::delete($checkExists['id']); } - + // Generate hash of password - same method as user passwords if (isset($shareWith)) { $forcePortable = (CRYPT_BLOWFISH != 1); $hasher = new \PasswordHash(8, $forcePortable); $shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', '')); } - + // Generate token if (isset($oldToken)) { $token = $oldToken; @@ -415,7 +415,7 @@ class Share { if ($parentFolder && $files = \OC_Files::getDirectoryContent($itemSource)) { for ($i = 0; $i < count($files); $i++) { $name = substr($files[$i]['name'], strpos($files[$i]['name'], $itemSource) - strlen($itemSource)); - if ($files[$i]['mimetype'] == 'httpd/unix-directory' + if ($files[$i]['mimetype'] == 'httpd/unix-directory' && $children = \OC_Files::getDirectoryContent($name, '/') ) { // Continue scanning into child folders @@ -864,7 +864,7 @@ class Share { } } else { if ($fileDependent) { - if (($itemType == 'file' || $itemType == 'folder') + if (($itemType == 'file' || $itemType == 'folder') && $format == \OC_Share_Backend_File::FORMAT_FILE_APP || $format == \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT ) { |