Skip to content

add initial search in shared files #4207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DeepDiver1975 merged 7 commits into from
Sep 27, 2013
Merged

add initial search in shared files #4207

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e8bf576
add initial search in shared files
butonic Jul 26, 2013
27511d9
divide ids into chunks of 1k
butonic Jul 31, 2013
392c6b6
return fixed path, skip shared files outside of 'files'
butonic Aug 7, 2013
466fd8a
fix getAll(), refactor search by mime & search
butonic Aug 28, 2013
3b4020e
add all results, sharing cache also returns entries for shared files …
butonic Aug 28, 2013
6aeb0a9
same for search by mime
butonic Aug 28, 2013
cd2421c
adding PHPDoc comments to getBackend
DeepDiver1975 Sep 24, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
return fixed path, skip shared files outside of 'files'
  • Loading branch information
@butonic @VicDeo
butonic authored and VicDeo committed Sep 19, 2013
commit 392c6b6832edfc37a2956ef3a77fab6020a7a746
9 changes: 6 additions & 3 deletions apps/files_sharing/lib/cache.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,12 @@ public function search($pattern) {
$result = \OC_DB::executeAudited($sql, array_merge(array($pattern), $chunk));

while ($row = $result->fetchRow()) {
$row['mimetype'] = $this->getMimetype($row['mimetype']);
$row['mimepart'] = $this->getMimetype($row['mimepart']);
$files[] = $row;
if (substr($row['path'], 0, 6)==='files/') {
$row['path'] = substr($row['path'],6); // remove 'files/' from path as it's relative to '/Shared'
$row['mimetype'] = $this->getMimetype($row['mimetype']);
$row['mimepart'] = $this->getMimetype($row['mimepart']);
$files[] = $row;
} // else skip results out of the files folder
}
}
return $files;
Expand Down