diff options
Diffstat (limited to 'lib/public')
| -rw-r--r-- | lib/public/files.php | 10 | ||||
| -rw-r--r-- | lib/public/share.php | 3 | ||||
| -rw-r--r-- | lib/public/util.php | 1 |
3 files changed, 13 insertions, 1 deletions
diff --git a/lib/public/files.php b/lib/public/files.php index 700bf574537..4975bbb7dfa 100644 --- a/lib/public/files.php +++ b/lib/public/files.php @@ -56,6 +56,16 @@ class Files { } /** + * search for files by mimetype + * + * @param string $query + * @return array + */ + public function searchByMime($mimetype) { + return(\OC\Files\Filesystem::searchByMime( $mimetype )); + } + + /** * copy the contents of one stream to another * @param resource source * @param resource target diff --git a/lib/public/share.php b/lib/public/share.php index 8b8a41d47c0..4b337530be8 100644 --- a/lib/public/share.php +++ b/lib/public/share.php @@ -661,6 +661,7 @@ class Share { } } $backend = self::getBackend($itemType); + $collectionTypes = false; // Get filesystem root to add it to the file target and remove from the // file source, match file_source with the file cache if ($itemType == 'file' || $itemType == 'folder') { @@ -1145,7 +1146,7 @@ class Share { 'itemTarget' => $groupItemTarget, 'parent' => $parent, 'shareType' => $shareType, - 'shareWith' => $uid, + 'shareWith' => $shareWith['group'], 'uidOwner' => $uidOwner, 'permissions' => $permissions, 'fileSource' => $fileSource, diff --git a/lib/public/util.php b/lib/public/util.php index db07cbcfff3..6744c2d37bd 100644 --- a/lib/public/util.php +++ b/lib/public/util.php @@ -217,6 +217,7 @@ class Util { */ public static function getDefaultEmailAddress($user_part) { $host_name = self::getServerHostName(); + $host_name = \OC_Config::getValue('mail_domain', $host_name); $defaultEmailAddress = $user_part.'@'.$host_name; if (\OC_Mail::ValidateAddress($defaultEmailAddress)) { |