fix formatting

This commit is contained in:
Jörn Friedrich Dreyer 2013-08-26 14:12:06 +02:00
parent a6583d3976
commit afd24385a8
10 changed files with 200 additions and 191 deletions

View File

@ -25,7 +25,7 @@
* provides an interface to all search providers * provides an interface to all search providers
* @deprecated see lib/search.php * @deprecated see lib/search.php
*/ */
class OC_Search{ class OC_Search {
static private $providers=array(); static private $providers=array();
static private $registeredProviders=array(); static private $registeredProviders=array();
@ -64,4 +64,5 @@ class OC_Search{
public static function removeProvider($provider) { public static function removeProvider($provider) {
return \OC\Search::removeProvider($provider); return \OC\Search::removeProvider($provider);
} }
} }

View File

@ -17,6 +17,6 @@
* *
*/ */
abstract class OC_Search_Provider extends \OC\Search\Provider{ abstract class OC_Search_Provider extends \OC\Search\Provider {
} }

View File

@ -17,6 +17,6 @@
* *
*/ */
class OC_Search_Provider_File extends \OC\Search\Provider\File{ class OC_Search_Provider_File extends \OC\Search\Provider\File {
} }

View File

@ -17,6 +17,6 @@
* *
*/ */
class OC_Search_Result extends \OC\Search\Result{ class OC_Search_Result extends \OC\Search\Result {
} }

View File

@ -25,7 +25,7 @@ namespace OC;
/** /**
* Provide an interface to all search providers * Provide an interface to all search providers
*/ */
class Search{ class Search {
static private $providers=array(); static private $providers=array();
static private $registeredProviders=array(); static private $registeredProviders=array();
@ -88,4 +88,5 @@ class Search{
self::$providers[]=new $class($options); self::$providers[]=new $class($options);
} }
} }
} }

View File

@ -22,7 +22,7 @@ namespace OC\Search\Provider;
/** /**
* Provide search results from the 'files' app * Provide search results from the 'files' app
*/ */
class File extends \OC\Search\Provider{ class File extends \OC\Search\Provider {
/** /**
* Search for files and folders matching the given query * Search for files and folders matching the given query
@ -39,11 +39,11 @@ class File extends \OC\Search\Provider{
continue; continue;
} }
// skip top-level folder // skip top-level folder
if ($fileData['name'] == 'files' && $fileData['parent'] == -1) { if ($fileData['name'] === 'files' && $fileData['parent'] === -1) {
continue; continue;
} }
// create folder result // create folder result
if($fileData['mimetype'] == 'httpd/unix-directory'){ if($fileData['mimetype'] === 'httpd/unix-directory'){
$result = new \OC\Search\Result\Folder($fileData); $result = new \OC\Search\Result\Folder($fileData);
} }
// or create file result // or create file result
@ -56,4 +56,5 @@ class File extends \OC\Search\Provider{
// return // return
return $results; return $results;
} }
} }

View File

@ -72,7 +72,11 @@ class File extends \OC\Search\Result {
$info = pathinfo($data['path']); $info = pathinfo($data['path']);
$this->id = $data['fileid']; $this->id = $data['fileid'];
$this->name = $info['basename']; $this->name = $info['basename'];
$this->link = \OCP\Util::linkTo('files', 'index.php', array('dir' => $info['dirname'], 'file' => $info['basename'])); $this->link = \OCP\Util::linkTo(
'files',
'index.php',
array('dir' => $info['dirname'], 'file' => $info['basename'])
);
$this->permissions = self::get_permissions($data['path']); $this->permissions = self::get_permissions($data['path']);
$this->path = (strpos($data['path'], 'files') === 0) ? substr($data['path'], 5) : $data['path']; $this->path = (strpos($data['path'], 'files') === 0) ? substr($data['path'], 5) : $data['path'];
$this->size = $data['size']; $this->size = $data['size'];
@ -106,4 +110,5 @@ class File extends \OC\Search\Result {
// return // return
return $permissions; return $permissions;
} }
} }

View File

@ -29,4 +29,5 @@ class Folder extends \OC\Search\Result\File {
* @var string * @var string
*/ */
public $type = 'folder'; public $type = 'folder';
} }