diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2012-09-28 21:41:21 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2012-09-28 21:41:21 +0200 |
| commit | c9317b5a68baac268e8b24a462065a5e9e3164e7 (patch) | |
| tree | d695547b8901cc2070368982a12a0e6579cf255c /lib/search | |
| parent | bf1057143cdff8ec289d9d766ab100d64d7ea45d (diff) | |
| parent | fed34aecfa5b36c031ed754ed245549aa4a4194b (diff) | |
| download | nextcloud-server-c9317b5a68baac268e8b24a462065a5e9e3164e7.tar.gz nextcloud-server-c9317b5a68baac268e8b24a462065a5e9e3164e7.zip | |
Merge branch 'master' into routing
Diffstat (limited to 'lib/search')
| -rw-r--r-- | lib/search/provider/file.php | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php index 135e40667b1..21fae0c1ce5 100644 --- a/lib/search/provider/file.php +++ b/lib/search/provider/file.php @@ -5,29 +5,36 @@ class OC_Search_Provider_File extends OC_Search_Provider{ $files=OC_FileCache::search($query,true); $results=array(); foreach($files as $fileData) { - $file=$fileData['path']; - $mime=$fileData['mimetype']; + $path = $fileData['path']; + $mime = $fileData['mimetype']; + + $name = basename($path); + $text = ''; + $path = urlencode($path); if($mime=='httpd/unix-directory') { - $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'index.php', array('dir' => $file)),'Files'); + $link = OC_Helper::linkTo( 'files', 'index.php', array('dir' => $path)); + $type = 'Files'; }else{ - $mimeBase=$fileData['mimepart']; + $link = OC_Helper::linkTo( 'files', 'download.php', array('file' => $path)); + $mimeBase = $fileData['mimepart']; switch($mimeBase) { case 'audio': break; case 'text': - $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('file' => $file) ),'Text'); + $type = 'Text'; break; case 'image': - $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('file' => $file) ),'Images'); + $type = 'Images'; break; default: if($mime=='application/xml') { - $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('file' => $file) ),'Text'); + $type = 'Text'; }else{ - $results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('file' => $file) ),'Files'); + $type = 'Files'; } } } + $results[] = new OC_Search_Result($name, $text, $link, $type); } return $results; } |