| @@ -32,129 +32,129 @@ | ||
| 32 | 32 | |
| 33 | 33 |  class Favorites implements IFilter { | 
| 34 | 34 | |
| 35 | - /** @var IL10N */ | |
| 36 | - protected $l; | |
| 37 | - | |
| 38 | - /** @var IURLGenerator */ | |
| 39 | - protected $url; | |
| 40 | - | |
| 41 | - /** @var IManager */ | |
| 42 | - protected $activityManager; | |
| 43 | - | |
| 44 | - /** @var Helper */ | |
| 45 | - protected $helper; | |
| 46 | - | |
| 47 | - /** @var IDBConnection */ | |
| 48 | - protected $db; | |
| 49 | - | |
| 50 | - /** | |
| 51 | - * @param IL10N $l | |
| 52 | - * @param IURLGenerator $url | |
| 53 | - * @param IManager $activityManager | |
| 54 | - * @param Helper $helper | |
| 55 | - * @param IDBConnection $db | |
| 56 | - */ | |
| 57 | -	public function __construct(IL10N $l, IURLGenerator $url, IManager $activityManager, Helper $helper, IDBConnection $db) { | |
| 58 | - $this->l = $l; | |
| 59 | - $this->url = $url; | |
| 60 | - $this->activityManager = $activityManager; | |
| 61 | - $this->helper = $helper; | |
| 62 | - $this->db = $db; | |
| 63 | - } | |
| 64 | - | |
| 65 | - /** | |
| 66 | - * @return string Lowercase a-z only identifier | |
| 67 | - * @since 11.0.0 | |
| 68 | - */ | |
| 69 | -	public function getIdentifier() { | |
| 70 | - return 'files_favorites'; | |
| 71 | - } | |
| 72 | - | |
| 73 | - /** | |
| 74 | - * @return string A translated string | |
| 75 | - * @since 11.0.0 | |
| 76 | - */ | |
| 77 | -	public function getName() { | |
| 78 | -		return $this->l->t('Favorites'); | |
| 79 | - } | |
| 80 | - | |
| 81 | - /** | |
| 82 | - * @return int | |
| 83 | - * @since 11.0.0 | |
| 84 | - */ | |
| 85 | -	public function getPriority() { | |
| 86 | - return 10; | |
| 87 | - } | |
| 88 | - | |
| 89 | - /** | |
| 90 | - * @return string Full URL to an icon, empty string when none is given | |
| 91 | - * @since 11.0.0 | |
| 92 | - */ | |
| 93 | -	public function getIcon() { | |
| 94 | -		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star-dark.svg')); | |
| 95 | - } | |
| 96 | - | |
| 97 | - /** | |
| 98 | - * @param string[] $types | |
| 99 | - * @return string[] An array of allowed apps from which activities should be displayed | |
| 100 | - * @since 11.0.0 | |
| 101 | - */ | |
| 102 | -	public function filterTypes(array $types) { | |
| 103 | - return array_intersect([ | |
| 104 | - 'file_created', | |
| 105 | - 'file_changed', | |
| 106 | - 'file_deleted', | |
| 107 | - 'file_restored', | |
| 108 | - ], $types); | |
| 109 | - } | |
| 110 | - | |
| 111 | - /** | |
| 112 | - * @return string[] An array of allowed apps from which activities should be displayed | |
| 113 | - * @since 11.0.0 | |
| 114 | - */ | |
| 115 | -	public function allowedApps() { | |
| 116 | - return ['files']; | |
| 117 | - } | |
| 118 | - | |
| 119 | - /** | |
| 120 | - * @param IQueryBuilder $query | |
| 121 | - */ | |
| 122 | -	public function filterFavorites(IQueryBuilder $query) { | |
| 123 | -		try { | |
| 124 | - $user = $this->activityManager->getCurrentUserId(); | |
| 125 | -		} catch (\UnexpectedValueException $e) { | |
| 126 | - return; | |
| 127 | - } | |
| 128 | - | |
| 129 | -		try { | |
| 130 | - $favorites = $this->helper->getFavoriteFilePaths($user); | |
| 131 | -		} catch (\RuntimeException $e) { | |
| 132 | - return; | |
| 133 | - } | |
| 134 | - | |
| 135 | - $limitations = []; | |
| 136 | -		if (!empty($favorites['items'])) { | |
| 137 | -			$limitations[] = $query->expr()->in('file', $query->createNamedParameter($favorites['items'], IQueryBuilder::PARAM_STR_ARRAY)); | |
| 138 | - } | |
| 139 | -		foreach ($favorites['folders'] as $favorite) { | |
| 140 | -			$limitations[] = $query->expr()->like('file', $query->createNamedParameter( | |
| 141 | - $this->db->escapeLikeParameter($favorite . '/') . '%' | |
| 142 | - )); | |
| 143 | - } | |
| 144 | - | |
| 145 | -		if (empty($limitations)) { | |
| 146 | - return; | |
| 147 | - } | |
| 148 | - | |
| 149 | -		$function = $query->createFunction(' | |
| 35 | + /** @var IL10N */ | |
| 36 | + protected $l; | |
| 37 | + | |
| 38 | + /** @var IURLGenerator */ | |
| 39 | + protected $url; | |
| 40 | + | |
| 41 | + /** @var IManager */ | |
| 42 | + protected $activityManager; | |
| 43 | + | |
| 44 | + /** @var Helper */ | |
| 45 | + protected $helper; | |
| 46 | + | |
| 47 | + /** @var IDBConnection */ | |
| 48 | + protected $db; | |
| 49 | + | |
| 50 | + /** | |
| 51 | + * @param IL10N $l | |
| 52 | + * @param IURLGenerator $url | |
| 53 | + * @param IManager $activityManager | |
| 54 | + * @param Helper $helper | |
| 55 | + * @param IDBConnection $db | |
| 56 | + */ | |
| 57 | +    public function __construct(IL10N $l, IURLGenerator $url, IManager $activityManager, Helper $helper, IDBConnection $db) { | |
| 58 | + $this->l = $l; | |
| 59 | + $this->url = $url; | |
| 60 | + $this->activityManager = $activityManager; | |
| 61 | + $this->helper = $helper; | |
| 62 | + $this->db = $db; | |
| 63 | + } | |
| 64 | + | |
| 65 | + /** | |
| 66 | + * @return string Lowercase a-z only identifier | |
| 67 | + * @since 11.0.0 | |
| 68 | + */ | |
| 69 | +    public function getIdentifier() { | |
| 70 | + return 'files_favorites'; | |
| 71 | + } | |
| 72 | + | |
| 73 | + /** | |
| 74 | + * @return string A translated string | |
| 75 | + * @since 11.0.0 | |
| 76 | + */ | |
| 77 | +    public function getName() { | |
| 78 | +        return $this->l->t('Favorites'); | |
| 79 | + } | |
| 80 | + | |
| 81 | + /** | |
| 82 | + * @return int | |
| 83 | + * @since 11.0.0 | |
| 84 | + */ | |
| 85 | +    public function getPriority() { | |
| 86 | + return 10; | |
| 87 | + } | |
| 88 | + | |
| 89 | + /** | |
| 90 | + * @return string Full URL to an icon, empty string when none is given | |
| 91 | + * @since 11.0.0 | |
| 92 | + */ | |
| 93 | +    public function getIcon() { | |
| 94 | +        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/star-dark.svg')); | |
| 95 | + } | |
| 96 | + | |
| 97 | + /** | |
| 98 | + * @param string[] $types | |
| 99 | + * @return string[] An array of allowed apps from which activities should be displayed | |
| 100 | + * @since 11.0.0 | |
| 101 | + */ | |
| 102 | +    public function filterTypes(array $types) { | |
| 103 | + return array_intersect([ | |
| 104 | + 'file_created', | |
| 105 | + 'file_changed', | |
| 106 | + 'file_deleted', | |
| 107 | + 'file_restored', | |
| 108 | + ], $types); | |
| 109 | + } | |
| 110 | + | |
| 111 | + /** | |
| 112 | + * @return string[] An array of allowed apps from which activities should be displayed | |
| 113 | + * @since 11.0.0 | |
| 114 | + */ | |
| 115 | +    public function allowedApps() { | |
| 116 | + return ['files']; | |
| 117 | + } | |
| 118 | + | |
| 119 | + /** | |
| 120 | + * @param IQueryBuilder $query | |
| 121 | + */ | |
| 122 | +    public function filterFavorites(IQueryBuilder $query) { | |
| 123 | +        try { | |
| 124 | + $user = $this->activityManager->getCurrentUserId(); | |
| 125 | +        } catch (\UnexpectedValueException $e) { | |
| 126 | + return; | |
| 127 | + } | |
| 128 | + | |
| 129 | +        try { | |
| 130 | + $favorites = $this->helper->getFavoriteFilePaths($user); | |
| 131 | +        } catch (\RuntimeException $e) { | |
| 132 | + return; | |
| 133 | + } | |
| 134 | + | |
| 135 | + $limitations = []; | |
| 136 | +        if (!empty($favorites['items'])) { | |
| 137 | +            $limitations[] = $query->expr()->in('file', $query->createNamedParameter($favorites['items'], IQueryBuilder::PARAM_STR_ARRAY)); | |
| 138 | + } | |
| 139 | +        foreach ($favorites['folders'] as $favorite) { | |
| 140 | +            $limitations[] = $query->expr()->like('file', $query->createNamedParameter( | |
| 141 | + $this->db->escapeLikeParameter($favorite . '/') . '%' | |
| 142 | + )); | |
| 143 | + } | |
| 144 | + | |
| 145 | +        if (empty($limitations)) { | |
| 146 | + return; | |
| 147 | + } | |
| 148 | + | |
| 149 | +        $function = $query->createFunction(' | |
| 150 | 150 | CASE | 
| 151 | 151 |  				WHEN ' . $query->getColumnName('app') . ' <> ' . $query->createNamedParameter('files') . ' THEN 1 | 
| 152 | 152 |  				WHEN ' . $query->getColumnName('app') . ' = ' . $query->createNamedParameter('files') . ' | 
| 153 | 153 |  					AND (' . implode(' OR ', $limitations) . ') | 
| 154 | 154 | THEN 1 | 
| 155 | 155 | END = 1' | 
| 156 | - ); | |
| 156 | + ); | |
| 157 | 157 | |
| 158 | - $query->andWhere($function); | |
| 159 | - } | |
| 158 | + $query->andWhere($function); | |
| 159 | + } | |
| 160 | 160 | } | 
| @@ -28,72 +28,72 @@ | ||
| 28 | 28 | |
| 29 | 29 |  class FileChanges implements IFilter { | 
| 30 | 30 | |
| 31 | - /** @var IL10N */ | |
| 32 | - protected $l; | |
| 31 | + /** @var IL10N */ | |
| 32 | + protected $l; | |
| 33 | 33 | |
| 34 | - /** @var IURLGenerator */ | |
| 35 | - protected $url; | |
| 34 | + /** @var IURLGenerator */ | |
| 35 | + protected $url; | |
| 36 | 36 | |
| 37 | - /** | |
| 38 | - * @param IL10N $l | |
| 39 | - * @param IURLGenerator $url | |
| 40 | - */ | |
| 41 | -	public function __construct(IL10N $l, IURLGenerator $url) { | |
| 42 | - $this->l = $l; | |
| 43 | - $this->url = $url; | |
| 44 | - } | |
| 37 | + /** | |
| 38 | + * @param IL10N $l | |
| 39 | + * @param IURLGenerator $url | |
| 40 | + */ | |
| 41 | +    public function __construct(IL10N $l, IURLGenerator $url) { | |
| 42 | + $this->l = $l; | |
| 43 | + $this->url = $url; | |
| 44 | + } | |
| 45 | 45 | |
| 46 | - /** | |
| 47 | - * @return string Lowercase a-z only identifier | |
| 48 | - * @since 11.0.0 | |
| 49 | - */ | |
| 50 | -	public function getIdentifier() { | |
| 51 | - return 'files'; | |
| 52 | - } | |
| 46 | + /** | |
| 47 | + * @return string Lowercase a-z only identifier | |
| 48 | + * @since 11.0.0 | |
| 49 | + */ | |
| 50 | +    public function getIdentifier() { | |
| 51 | + return 'files'; | |
| 52 | + } | |
| 53 | 53 | |
| 54 | - /** | |
| 55 | - * @return string A translated string | |
| 56 | - * @since 11.0.0 | |
| 57 | - */ | |
| 58 | -	public function getName() { | |
| 59 | -		return $this->l->t('File changes'); | |
| 60 | - } | |
| 54 | + /** | |
| 55 | + * @return string A translated string | |
| 56 | + * @since 11.0.0 | |
| 57 | + */ | |
| 58 | +    public function getName() { | |
| 59 | +        return $this->l->t('File changes'); | |
| 60 | + } | |
| 61 | 61 | |
| 62 | - /** | |
| 63 | - * @return int | |
| 64 | - * @since 11.0.0 | |
| 65 | - */ | |
| 66 | -	public function getPriority() { | |
| 67 | - return 30; | |
| 68 | - } | |
| 62 | + /** | |
| 63 | + * @return int | |
| 64 | + * @since 11.0.0 | |
| 65 | + */ | |
| 66 | +    public function getPriority() { | |
| 67 | + return 30; | |
| 68 | + } | |
| 69 | 69 | |
| 70 | - /** | |
| 71 | - * @return string Full URL to an icon, empty string when none is given | |
| 72 | - * @since 11.0.0 | |
| 73 | - */ | |
| 74 | -	public function getIcon() { | |
| 75 | -		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/files-dark.svg')); | |
| 76 | - } | |
| 70 | + /** | |
| 71 | + * @return string Full URL to an icon, empty string when none is given | |
| 72 | + * @since 11.0.0 | |
| 73 | + */ | |
| 74 | +    public function getIcon() { | |
| 75 | +        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'places/files-dark.svg')); | |
| 76 | + } | |
| 77 | 77 | |
| 78 | - /** | |
| 79 | - * @param string[] $types | |
| 80 | - * @return string[] An array of allowed apps from which activities should be displayed | |
| 81 | - * @since 11.0.0 | |
| 82 | - */ | |
| 83 | -	public function filterTypes(array $types) { | |
| 84 | - return array_intersect([ | |
| 85 | - 'file_created', | |
| 86 | - 'file_changed', | |
| 87 | - 'file_deleted', | |
| 88 | - 'file_restored', | |
| 89 | - ], $types); | |
| 90 | - } | |
| 78 | + /** | |
| 79 | + * @param string[] $types | |
| 80 | + * @return string[] An array of allowed apps from which activities should be displayed | |
| 81 | + * @since 11.0.0 | |
| 82 | + */ | |
| 83 | +    public function filterTypes(array $types) { | |
| 84 | + return array_intersect([ | |
| 85 | + 'file_created', | |
| 86 | + 'file_changed', | |
| 87 | + 'file_deleted', | |
| 88 | + 'file_restored', | |
| 89 | + ], $types); | |
| 90 | + } | |
| 91 | 91 | |
| 92 | - /** | |
| 93 | - * @return string[] An array of allowed apps from which activities should be displayed | |
| 94 | - * @since 11.0.0 | |
| 95 | - */ | |
| 96 | -	public function allowedApps() { | |
| 97 | - return ['files']; | |
| 98 | - } | |
| 92 | + /** | |
| 93 | + * @return string[] An array of allowed apps from which activities should be displayed | |
| 94 | + * @since 11.0.0 | |
| 95 | + */ | |
| 96 | +    public function allowedApps() { | |
| 97 | + return ['files']; | |
| 98 | + } | |
| 99 | 99 | } | 
| @@ -26,60 +26,60 @@ | ||
| 26 | 26 | use OCP\ITagManager; | 
| 27 | 27 | |
| 28 | 28 |  class Helper { | 
| 29 | - /** If a user has a lot of favorites the query might get too slow and long */ | |
| 30 | - const FAVORITE_LIMIT = 50; | |
| 29 | + /** If a user has a lot of favorites the query might get too slow and long */ | |
| 30 | + const FAVORITE_LIMIT = 50; | |
| 31 | 31 | |
| 32 | - /** @var ITagManager */ | |
| 33 | - protected $tagManager; | |
| 32 | + /** @var ITagManager */ | |
| 33 | + protected $tagManager; | |
| 34 | 34 | |
| 35 | - /** | |
| 36 | - * @param ITagManager $tagManager | |
| 37 | - */ | |
| 38 | -	public function __construct(ITagManager $tagManager) { | |
| 39 | - $this->tagManager = $tagManager; | |
| 40 | - } | |
| 35 | + /** | |
| 36 | + * @param ITagManager $tagManager | |
| 37 | + */ | |
| 38 | +    public function __construct(ITagManager $tagManager) { | |
| 39 | + $this->tagManager = $tagManager; | |
| 40 | + } | |
| 41 | 41 | |
| 42 | - /** | |
| 43 | - * Returns an array with the favorites | |
| 44 | - * | |
| 45 | - * @param string $user | |
| 46 | - * @return array | |
| 47 | - * @throws \RuntimeException when too many or no favorites where found | |
| 48 | - */ | |
| 49 | -	public function getFavoriteFilePaths($user) { | |
| 50 | -		$tags = $this->tagManager->load('files', [], false, $user); | |
| 51 | - $favorites = $tags->getFavorites(); | |
| 42 | + /** | |
| 43 | + * Returns an array with the favorites | |
| 44 | + * | |
| 45 | + * @param string $user | |
| 46 | + * @return array | |
| 47 | + * @throws \RuntimeException when too many or no favorites where found | |
| 48 | + */ | |
| 49 | +    public function getFavoriteFilePaths($user) { | |
| 50 | +        $tags = $this->tagManager->load('files', [], false, $user); | |
| 51 | + $favorites = $tags->getFavorites(); | |
| 52 | 52 | |
| 53 | -		if (empty($favorites)) { | |
| 54 | -			throw new \RuntimeException('No favorites', 1); | |
| 55 | -		} else if (isset($favorites[self::FAVORITE_LIMIT])) { | |
| 56 | -			throw new \RuntimeException('Too many favorites', 2); | |
| 57 | - } | |
| 53 | +        if (empty($favorites)) { | |
| 54 | +            throw new \RuntimeException('No favorites', 1); | |
| 55 | +        } else if (isset($favorites[self::FAVORITE_LIMIT])) { | |
| 56 | +            throw new \RuntimeException('Too many favorites', 2); | |
| 57 | + } | |
| 58 | 58 | |
| 59 | - // Can not DI because the user is not known on instantiation | |
| 60 | - $rootFolder = \OC::$server->getUserFolder($user); | |
| 61 | - $folders = $items = []; | |
| 62 | -		foreach ($favorites as $favorite) { | |
| 63 | - $nodes = $rootFolder->getById($favorite); | |
| 64 | -			if (!empty($nodes)) { | |
| 65 | - /** @var \OCP\Files\Node $node */ | |
| 66 | - $node = array_shift($nodes); | |
| 67 | - $path = substr($node->getPath(), strlen($user . '/files/')); | |
| 59 | + // Can not DI because the user is not known on instantiation | |
| 60 | + $rootFolder = \OC::$server->getUserFolder($user); | |
| 61 | + $folders = $items = []; | |
| 62 | +        foreach ($favorites as $favorite) { | |
| 63 | + $nodes = $rootFolder->getById($favorite); | |
| 64 | +            if (!empty($nodes)) { | |
| 65 | + /** @var \OCP\Files\Node $node */ | |
| 66 | + $node = array_shift($nodes); | |
| 67 | + $path = substr($node->getPath(), strlen($user . '/files/')); | |
| 68 | 68 | |
| 69 | - $items[] = $path; | |
| 70 | -				if ($node instanceof Folder) { | |
| 71 | - $folders[] = $path; | |
| 72 | - } | |
| 73 | - } | |
| 74 | - } | |
| 69 | + $items[] = $path; | |
| 70 | +                if ($node instanceof Folder) { | |
| 71 | + $folders[] = $path; | |
| 72 | + } | |
| 73 | + } | |
| 74 | + } | |
| 75 | 75 | |
| 76 | -		if (empty($items)) { | |
| 77 | -			throw new \RuntimeException('No favorites', 1); | |
| 78 | - } | |
| 76 | +        if (empty($items)) { | |
| 77 | +            throw new \RuntimeException('No favorites', 1); | |
| 78 | + } | |
| 79 | 79 | |
| 80 | - return [ | |
| 81 | - 'items' => $items, | |
| 82 | - 'folders' => $folders, | |
| 83 | - ]; | |
| 84 | - } | |
| 80 | + return [ | |
| 81 | + 'items' => $items, | |
| 82 | + 'folders' => $folders, | |
| 83 | + ]; | |
| 84 | + } | |
| 85 | 85 | } | 
| @@ -27,72 +27,72 @@ | ||
| 27 | 27 | |
| 28 | 28 |  class FileChanged implements ISetting { | 
| 29 | 29 | |
| 30 | - /** @var IL10N */ | |
| 31 | - protected $l; | |
| 30 | + /** @var IL10N */ | |
| 31 | + protected $l; | |
| 32 | 32 | |
| 33 | - /** | |
| 34 | - * @param IL10N $l | |
| 35 | - */ | |
| 36 | -	public function __construct(IL10N $l) { | |
| 37 | - $this->l = $l; | |
| 38 | - } | |
| 33 | + /** | |
| 34 | + * @param IL10N $l | |
| 35 | + */ | |
| 36 | +    public function __construct(IL10N $l) { | |
| 37 | + $this->l = $l; | |
| 38 | + } | |
| 39 | 39 | |
| 40 | - /** | |
| 41 | - * @return string Lowercase a-z and underscore only identifier | |
| 42 | - * @since 11.0.0 | |
| 43 | - */ | |
| 44 | -	public function getIdentifier() { | |
| 45 | - return 'file_changed'; | |
| 46 | - } | |
| 40 | + /** | |
| 41 | + * @return string Lowercase a-z and underscore only identifier | |
| 42 | + * @since 11.0.0 | |
| 43 | + */ | |
| 44 | +    public function getIdentifier() { | |
| 45 | + return 'file_changed'; | |
| 46 | + } | |
| 47 | 47 | |
| 48 | - /** | |
| 49 | - * @return string A translated string | |
| 50 | - * @since 11.0.0 | |
| 51 | - */ | |
| 52 | -	public function getName() { | |
| 53 | -		return $this->l->t('A file or folder has been <strong>changed</strong> or <strong>renamed</strong>'); | |
| 54 | - } | |
| 48 | + /** | |
| 49 | + * @return string A translated string | |
| 50 | + * @since 11.0.0 | |
| 51 | + */ | |
| 52 | +    public function getName() { | |
| 53 | +        return $this->l->t('A file or folder has been <strong>changed</strong> or <strong>renamed</strong>'); | |
| 54 | + } | |
| 55 | 55 | |
| 56 | - /** | |
| 57 | - * @return int whether the filter should be rather on the top or bottom of | |
| 58 | - * the admin section. The filters are arranged in ascending order of the | |
| 59 | - * priority values. It is required to return a value between 0 and 100. | |
| 60 | - * @since 11.0.0 | |
| 61 | - */ | |
| 62 | -	public function getPriority() { | |
| 63 | - return 1; | |
| 64 | - } | |
| 56 | + /** | |
| 57 | + * @return int whether the filter should be rather on the top or bottom of | |
| 58 | + * the admin section. The filters are arranged in ascending order of the | |
| 59 | + * priority values. It is required to return a value between 0 and 100. | |
| 60 | + * @since 11.0.0 | |
| 61 | + */ | |
| 62 | +    public function getPriority() { | |
| 63 | + return 1; | |
| 64 | + } | |
| 65 | 65 | |
| 66 | - /** | |
| 67 | - * @return bool True when the option can be changed for the stream | |
| 68 | - * @since 11.0.0 | |
| 69 | - */ | |
| 70 | -	public function canChangeStream() { | |
| 71 | - return true; | |
| 72 | - } | |
| 66 | + /** | |
| 67 | + * @return bool True when the option can be changed for the stream | |
| 68 | + * @since 11.0.0 | |
| 69 | + */ | |
| 70 | +    public function canChangeStream() { | |
| 71 | + return true; | |
| 72 | + } | |
| 73 | 73 | |
| 74 | - /** | |
| 75 | - * @return bool True when the option can be changed for the stream | |
| 76 | - * @since 11.0.0 | |
| 77 | - */ | |
| 78 | -	public function isDefaultEnabledStream() { | |
| 79 | - return true; | |
| 80 | - } | |
| 74 | + /** | |
| 75 | + * @return bool True when the option can be changed for the stream | |
| 76 | + * @since 11.0.0 | |
| 77 | + */ | |
| 78 | +    public function isDefaultEnabledStream() { | |
| 79 | + return true; | |
| 80 | + } | |
| 81 | 81 | |
| 82 | - /** | |
| 83 | - * @return bool True when the option can be changed for the mail | |
| 84 | - * @since 11.0.0 | |
| 85 | - */ | |
| 86 | -	public function canChangeMail() { | |
| 87 | - return true; | |
| 88 | - } | |
| 82 | + /** | |
| 83 | + * @return bool True when the option can be changed for the mail | |
| 84 | + * @since 11.0.0 | |
| 85 | + */ | |
| 86 | +    public function canChangeMail() { | |
| 87 | + return true; | |
| 88 | + } | |
| 89 | 89 | |
| 90 | - /** | |
| 91 | - * @return bool True when the option can be changed for the stream | |
| 92 | - * @since 11.0.0 | |
| 93 | - */ | |
| 94 | -	public function isDefaultEnabledMail() { | |
| 95 | - return false; | |
| 96 | - } | |
| 90 | + /** | |
| 91 | + * @return bool True when the option can be changed for the stream | |
| 92 | + * @since 11.0.0 | |
| 93 | + */ | |
| 94 | +    public function isDefaultEnabledMail() { | |
| 95 | + return false; | |
| 96 | + } | |
| 97 | 97 | } | 
| 98 | 98 | |
| @@ -27,72 +27,72 @@ | ||
| 27 | 27 | |
| 28 | 28 |  class FileCreated implements ISetting { | 
| 29 | 29 | |
| 30 | - /** @var IL10N */ | |
| 31 | - protected $l; | |
| 30 | + /** @var IL10N */ | |
| 31 | + protected $l; | |
| 32 | 32 | |
| 33 | - /** | |
| 34 | - * @param IL10N $l | |
| 35 | - */ | |
| 36 | -	public function __construct(IL10N $l) { | |
| 37 | - $this->l = $l; | |
| 38 | - } | |
| 33 | + /** | |
| 34 | + * @param IL10N $l | |
| 35 | + */ | |
| 36 | +    public function __construct(IL10N $l) { | |
| 37 | + $this->l = $l; | |
| 38 | + } | |
| 39 | 39 | |
| 40 | - /** | |
| 41 | - * @return string Lowercase a-z and underscore only identifier | |
| 42 | - * @since 11.0.0 | |
| 43 | - */ | |
| 44 | -	public function getIdentifier() { | |
| 45 | - return 'file_created'; | |
| 46 | - } | |
| 40 | + /** | |
| 41 | + * @return string Lowercase a-z and underscore only identifier | |
| 42 | + * @since 11.0.0 | |
| 43 | + */ | |
| 44 | +    public function getIdentifier() { | |
| 45 | + return 'file_created'; | |
| 46 | + } | |
| 47 | 47 | |
| 48 | - /** | |
| 49 | - * @return string A translated string | |
| 50 | - * @since 11.0.0 | |
| 51 | - */ | |
| 52 | -	public function getName() { | |
| 53 | -		return $this->l->t('A new file or folder has been <strong>created</strong>'); | |
| 54 | - } | |
| 48 | + /** | |
| 49 | + * @return string A translated string | |
| 50 | + * @since 11.0.0 | |
| 51 | + */ | |
| 52 | +    public function getName() { | |
| 53 | +        return $this->l->t('A new file or folder has been <strong>created</strong>'); | |
| 54 | + } | |
| 55 | 55 | |
| 56 | - /** | |
| 57 | - * @return int whether the filter should be rather on the top or bottom of | |
| 58 | - * the admin section. The filters are arranged in ascending order of the | |
| 59 | - * priority values. It is required to return a value between 0 and 100. | |
| 60 | - * @since 11.0.0 | |
| 61 | - */ | |
| 62 | -	public function getPriority() { | |
| 63 | - return 0; | |
| 64 | - } | |
| 56 | + /** | |
| 57 | + * @return int whether the filter should be rather on the top or bottom of | |
| 58 | + * the admin section. The filters are arranged in ascending order of the | |
| 59 | + * priority values. It is required to return a value between 0 and 100. | |
| 60 | + * @since 11.0.0 | |
| 61 | + */ | |
| 62 | +    public function getPriority() { | |
| 63 | + return 0; | |
| 64 | + } | |
| 65 | 65 | |
| 66 | - /** | |
| 67 | - * @return bool True when the option can be changed for the stream | |
| 68 | - * @since 11.0.0 | |
| 69 | - */ | |
| 70 | -	public function canChangeStream() { | |
| 71 | - return true; | |
| 72 | - } | |
| 66 | + /** | |
| 67 | + * @return bool True when the option can be changed for the stream | |
| 68 | + * @since 11.0.0 | |
| 69 | + */ | |
| 70 | +    public function canChangeStream() { | |
| 71 | + return true; | |
| 72 | + } | |
| 73 | 73 | |
| 74 | - /** | |
| 75 | - * @return bool True when the option can be changed for the stream | |
| 76 | - * @since 11.0.0 | |
| 77 | - */ | |
| 78 | -	public function isDefaultEnabledStream() { | |
| 79 | - return true; | |
| 80 | - } | |
| 74 | + /** | |
| 75 | + * @return bool True when the option can be changed for the stream | |
| 76 | + * @since 11.0.0 | |
| 77 | + */ | |
| 78 | +    public function isDefaultEnabledStream() { | |
| 79 | + return true; | |
| 80 | + } | |
| 81 | 81 | |
| 82 | - /** | |
| 83 | - * @return bool True when the option can be changed for the mail | |
| 84 | - * @since 11.0.0 | |
| 85 | - */ | |
| 86 | -	public function canChangeMail() { | |
| 87 | - return true; | |
| 88 | - } | |
| 82 | + /** | |
| 83 | + * @return bool True when the option can be changed for the mail | |
| 84 | + * @since 11.0.0 | |
| 85 | + */ | |
| 86 | +    public function canChangeMail() { | |
| 87 | + return true; | |
| 88 | + } | |
| 89 | 89 | |
| 90 | - /** | |
| 91 | - * @return bool True when the option can be changed for the stream | |
| 92 | - * @since 11.0.0 | |
| 93 | - */ | |
| 94 | -	public function isDefaultEnabledMail() { | |
| 95 | - return false; | |
| 96 | - } | |
| 90 | + /** | |
| 91 | + * @return bool True when the option can be changed for the stream | |
| 92 | + * @since 11.0.0 | |
| 93 | + */ | |
| 94 | +    public function isDefaultEnabledMail() { | |
| 95 | + return false; | |
| 96 | + } | |
| 97 | 97 | } | 
| 98 | 98 | |
| @@ -27,72 +27,72 @@ | ||
| 27 | 27 | |
| 28 | 28 |  class FavoriteAction implements ISetting { | 
| 29 | 29 | |
| 30 | - /** @var IL10N */ | |
| 31 | - protected $l; | |
| 30 | + /** @var IL10N */ | |
| 31 | + protected $l; | |
| 32 | 32 | |
| 33 | - /** | |
| 34 | - * @param IL10N $l | |
| 35 | - */ | |
| 36 | -	public function __construct(IL10N $l) { | |
| 37 | - $this->l = $l; | |
| 38 | - } | |
| 33 | + /** | |
| 34 | + * @param IL10N $l | |
| 35 | + */ | |
| 36 | +    public function __construct(IL10N $l) { | |
| 37 | + $this->l = $l; | |
| 38 | + } | |
| 39 | 39 | |
| 40 | - /** | |
| 41 | - * @return string Lowercase a-z and underscore only identifier | |
| 42 | - * @since 11.0.0 | |
| 43 | - */ | |
| 44 | -	public function getIdentifier() { | |
| 45 | - return 'favorite'; | |
| 46 | - } | |
| 40 | + /** | |
| 41 | + * @return string Lowercase a-z and underscore only identifier | |
| 42 | + * @since 11.0.0 | |
| 43 | + */ | |
| 44 | +    public function getIdentifier() { | |
| 45 | + return 'favorite'; | |
| 46 | + } | |
| 47 | 47 | |
| 48 | - /** | |
| 49 | - * @return string A translated string | |
| 50 | - * @since 11.0.0 | |
| 51 | - */ | |
| 52 | -	public function getName() { | |
| 53 | -		return $this->l->t('A file has been added to or removed from your <strong>favorites</strong>'); | |
| 54 | - } | |
| 48 | + /** | |
| 49 | + * @return string A translated string | |
| 50 | + * @since 11.0.0 | |
| 51 | + */ | |
| 52 | +    public function getName() { | |
| 53 | +        return $this->l->t('A file has been added to or removed from your <strong>favorites</strong>'); | |
| 54 | + } | |
| 55 | 55 | |
| 56 | - /** | |
| 57 | - * @return int whether the filter should be rather on the top or bottom of | |
| 58 | - * the admin section. The filters are arranged in ascending order of the | |
| 59 | - * priority values. It is required to return a value between 0 and 100. | |
| 60 | - * @since 11.0.0 | |
| 61 | - */ | |
| 62 | -	public function getPriority() { | |
| 63 | - return 5; | |
| 64 | - } | |
| 56 | + /** | |
| 57 | + * @return int whether the filter should be rather on the top or bottom of | |
| 58 | + * the admin section. The filters are arranged in ascending order of the | |
| 59 | + * priority values. It is required to return a value between 0 and 100. | |
| 60 | + * @since 11.0.0 | |
| 61 | + */ | |
| 62 | +    public function getPriority() { | |
| 63 | + return 5; | |
| 64 | + } | |
| 65 | 65 | |
| 66 | - /** | |
| 67 | - * @return bool True when the option can be changed for the stream | |
| 68 | - * @since 11.0.0 | |
| 69 | - */ | |
| 70 | -	public function canChangeStream() { | |
| 71 | - return true; | |
| 72 | - } | |
| 66 | + /** | |
| 67 | + * @return bool True when the option can be changed for the stream | |
| 68 | + * @since 11.0.0 | |
| 69 | + */ | |
| 70 | +    public function canChangeStream() { | |
| 71 | + return true; | |
| 72 | + } | |
| 73 | 73 | |
| 74 | - /** | |
| 75 | - * @return bool True when the option can be changed for the stream | |
| 76 | - * @since 11.0.0 | |
| 77 | - */ | |
| 78 | -	public function isDefaultEnabledStream() { | |
| 79 | - return true; | |
| 80 | - } | |
| 74 | + /** | |
| 75 | + * @return bool True when the option can be changed for the stream | |
| 76 | + * @since 11.0.0 | |
| 77 | + */ | |
| 78 | +    public function isDefaultEnabledStream() { | |
| 79 | + return true; | |
| 80 | + } | |
| 81 | 81 | |
| 82 | - /** | |
| 83 | - * @return bool True when the option can be changed for the mail | |
| 84 | - * @since 11.0.0 | |
| 85 | - */ | |
| 86 | -	public function canChangeMail() { | |
| 87 | - return true; | |
| 88 | - } | |
| 82 | + /** | |
| 83 | + * @return bool True when the option can be changed for the mail | |
| 84 | + * @since 11.0.0 | |
| 85 | + */ | |
| 86 | +    public function canChangeMail() { | |
| 87 | + return true; | |
| 88 | + } | |
| 89 | 89 | |
| 90 | - /** | |
| 91 | - * @return bool True when the option can be changed for the stream | |
| 92 | - * @since 11.0.0 | |
| 93 | - */ | |
| 94 | -	public function isDefaultEnabledMail() { | |
| 95 | - return false; | |
| 96 | - } | |
| 90 | + /** | |
| 91 | + * @return bool True when the option can be changed for the stream | |
| 92 | + * @since 11.0.0 | |
| 93 | + */ | |
| 94 | +    public function isDefaultEnabledMail() { | |
| 95 | + return false; | |
| 96 | + } | |
| 97 | 97 | } | 
| 98 | 98 | |
| @@ -27,72 +27,72 @@ | ||
| 27 | 27 | |
| 28 | 28 |  class FileFavorite implements ISetting { | 
| 29 | 29 | |
| 30 | - /** @var IL10N */ | |
| 31 | - protected $l; | |
| 30 | + /** @var IL10N */ | |
| 31 | + protected $l; | |
| 32 | 32 | |
| 33 | - /** | |
| 34 | - * @param IL10N $l | |
| 35 | - */ | |
| 36 | -	public function __construct(IL10N $l) { | |
| 37 | - $this->l = $l; | |
| 38 | - } | |
| 33 | + /** | |
| 34 | + * @param IL10N $l | |
| 35 | + */ | |
| 36 | +    public function __construct(IL10N $l) { | |
| 37 | + $this->l = $l; | |
| 38 | + } | |
| 39 | 39 | |
| 40 | - /** | |
| 41 | - * @return string Lowercase a-z and underscore only identifier | |
| 42 | - * @since 11.0.0 | |
| 43 | - */ | |
| 44 | -	public function getIdentifier() { | |
| 45 | - return 'file_favorite'; | |
| 46 | - } | |
| 40 | + /** | |
| 41 | + * @return string Lowercase a-z and underscore only identifier | |
| 42 | + * @since 11.0.0 | |
| 43 | + */ | |
| 44 | +    public function getIdentifier() { | |
| 45 | + return 'file_favorite'; | |
| 46 | + } | |
| 47 | 47 | |
| 48 | - /** | |
| 49 | - * @return string A translated string | |
| 50 | - * @since 11.0.0 | |
| 51 | - */ | |
| 52 | -	public function getName() { | |
| 53 | -		return $this->l->t('Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>'); | |
| 54 | - } | |
| 48 | + /** | |
| 49 | + * @return string A translated string | |
| 50 | + * @since 11.0.0 | |
| 51 | + */ | |
| 52 | +    public function getName() { | |
| 53 | +        return $this->l->t('Limit notifications about creation and changes to your <strong>favorite files</strong> <em>(Stream only)</em>'); | |
| 54 | + } | |
| 55 | 55 | |
| 56 | - /** | |
| 57 | - * @return int whether the filter should be rather on the top or bottom of | |
| 58 | - * the admin section. The filters are arranged in ascending order of the | |
| 59 | - * priority values. It is required to return a value between 0 and 100. | |
| 60 | - * @since 11.0.0 | |
| 61 | - */ | |
| 62 | -	public function getPriority() { | |
| 63 | - return 2; | |
| 64 | - } | |
| 56 | + /** | |
| 57 | + * @return int whether the filter should be rather on the top or bottom of | |
| 58 | + * the admin section. The filters are arranged in ascending order of the | |
| 59 | + * priority values. It is required to return a value between 0 and 100. | |
| 60 | + * @since 11.0.0 | |
| 61 | + */ | |
| 62 | +    public function getPriority() { | |
| 63 | + return 2; | |
| 64 | + } | |
| 65 | 65 | |
| 66 | - /** | |
| 67 | - * @return bool True when the option can be changed for the stream | |
| 68 | - * @since 11.0.0 | |
| 69 | - */ | |
| 70 | -	public function canChangeStream() { | |
| 71 | - return true; | |
| 72 | - } | |
| 66 | + /** | |
| 67 | + * @return bool True when the option can be changed for the stream | |
| 68 | + * @since 11.0.0 | |
| 69 | + */ | |
| 70 | +    public function canChangeStream() { | |
| 71 | + return true; | |
| 72 | + } | |
| 73 | 73 | |
| 74 | - /** | |
| 75 | - * @return bool True when the option can be changed for the stream | |
| 76 | - * @since 11.0.0 | |
| 77 | - */ | |
| 78 | -	public function isDefaultEnabledStream() { | |
| 79 | - return false; | |
| 80 | - } | |
| 74 | + /** | |
| 75 | + * @return bool True when the option can be changed for the stream | |
| 76 | + * @since 11.0.0 | |
| 77 | + */ | |
| 78 | +    public function isDefaultEnabledStream() { | |
| 79 | + return false; | |
| 80 | + } | |
| 81 | 81 | |
| 82 | - /** | |
| 83 | - * @return bool True when the option can be changed for the mail | |
| 84 | - * @since 11.0.0 | |
| 85 | - */ | |
| 86 | -	public function canChangeMail() { | |
| 87 | - return false; | |
| 88 | - } | |
| 82 | + /** | |
| 83 | + * @return bool True when the option can be changed for the mail | |
| 84 | + * @since 11.0.0 | |
| 85 | + */ | |
| 86 | +    public function canChangeMail() { | |
| 87 | + return false; | |
| 88 | + } | |
| 89 | 89 | |
| 90 | - /** | |
| 91 | - * @return bool True when the option can be changed for the stream | |
| 92 | - * @since 11.0.0 | |
| 93 | - */ | |
| 94 | -	public function isDefaultEnabledMail() { | |
| 95 | - return false; | |
| 96 | - } | |
| 90 | + /** | |
| 91 | + * @return bool True when the option can be changed for the stream | |
| 92 | + * @since 11.0.0 | |
| 93 | + */ | |
| 94 | +    public function isDefaultEnabledMail() { | |
| 95 | + return false; | |
| 96 | + } | |
| 97 | 97 | } | 
| 98 | 98 | |
| @@ -29,23 +29,23 @@ | ||
| 29 | 29 | use OCP\Util; | 
| 30 | 30 | |
| 31 | 31 |  class SettingsController extends Controller { | 
| 32 | -	public function __construct($appName, IRequest $request) { | |
| 33 | - parent::__construct($appName, $request); | |
| 34 | - } | |
| 32 | +    public function __construct($appName, IRequest $request) { | |
| 33 | + parent::__construct($appName, $request); | |
| 34 | + } | |
| 35 | 35 | |
| 36 | - /** | |
| 37 | - * @param string $maxUploadSize | |
| 38 | - * @return JSONResponse | |
| 39 | - */ | |
| 40 | -	public function setMaxUploadSize($maxUploadSize) { | |
| 41 | - $setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize)); | |
| 36 | + /** | |
| 37 | + * @param string $maxUploadSize | |
| 38 | + * @return JSONResponse | |
| 39 | + */ | |
| 40 | +    public function setMaxUploadSize($maxUploadSize) { | |
| 41 | + $setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize)); | |
| 42 | 42 | |
| 43 | -		if ($setMaxSize === false) { | |
| 44 | - return new JSONResponse([], Http::STATUS_BAD_REQUEST); | |
| 45 | -		} else { | |
| 46 | - return new JSONResponse([ | |
| 47 | - 'maxUploadSize' => Util::humanFileSize($setMaxSize) | |
| 48 | - ]); | |
| 49 | - } | |
| 50 | - } | |
| 43 | +        if ($setMaxSize === false) { | |
| 44 | + return new JSONResponse([], Http::STATUS_BAD_REQUEST); | |
| 45 | +        } else { | |
| 46 | + return new JSONResponse([ | |
| 47 | + 'maxUploadSize' => Util::humanFileSize($setMaxSize) | |
| 48 | + ]); | |
| 49 | + } | |
| 50 | + } | |
| 51 | 51 | } | 
| @@ -51,217 +51,217 @@ | ||
| 51 | 51 | * @package OCA\Files\Controller | 
| 52 | 52 | */ | 
| 53 | 53 |  class ApiController extends Controller { | 
| 54 | - /** @var TagService */ | |
| 55 | - private $tagService; | |
| 56 | - /** @var IManager **/ | |
| 57 | - private $shareManager; | |
| 58 | - /** @var IPreview */ | |
| 59 | - private $previewManager; | |
| 60 | - /** IUserSession */ | |
| 61 | - private $userSession; | |
| 62 | - /** IConfig */ | |
| 63 | - private $config; | |
| 64 | - /** @var Folder */ | |
| 65 | - private $userFolder; | |
| 54 | + /** @var TagService */ | |
| 55 | + private $tagService; | |
| 56 | + /** @var IManager **/ | |
| 57 | + private $shareManager; | |
| 58 | + /** @var IPreview */ | |
| 59 | + private $previewManager; | |
| 60 | + /** IUserSession */ | |
| 61 | + private $userSession; | |
| 62 | + /** IConfig */ | |
| 63 | + private $config; | |
| 64 | + /** @var Folder */ | |
| 65 | + private $userFolder; | |
| 66 | 66 | |
| 67 | - /** | |
| 68 | - * @param string $appName | |
| 69 | - * @param IRequest $request | |
| 70 | - * @param IUserSession $userSession | |
| 71 | - * @param TagService $tagService | |
| 72 | - * @param IPreview $previewManager | |
| 73 | - * @param IManager $shareManager | |
| 74 | - * @param IConfig $config | |
| 75 | - * @param Folder $userFolder | |
| 76 | - */ | |
| 77 | - public function __construct($appName, | |
| 78 | - IRequest $request, | |
| 79 | - IUserSession $userSession, | |
| 80 | - TagService $tagService, | |
| 81 | - IPreview $previewManager, | |
| 82 | - IManager $shareManager, | |
| 83 | - IConfig $config, | |
| 84 | -								Folder $userFolder) { | |
| 85 | - parent::__construct($appName, $request); | |
| 86 | - $this->userSession = $userSession; | |
| 87 | - $this->tagService = $tagService; | |
| 88 | - $this->previewManager = $previewManager; | |
| 89 | - $this->shareManager = $shareManager; | |
| 90 | - $this->config = $config; | |
| 91 | - $this->userFolder = $userFolder; | |
| 92 | - } | |
| 67 | + /** | |
| 68 | + * @param string $appName | |
| 69 | + * @param IRequest $request | |
| 70 | + * @param IUserSession $userSession | |
| 71 | + * @param TagService $tagService | |
| 72 | + * @param IPreview $previewManager | |
| 73 | + * @param IManager $shareManager | |
| 74 | + * @param IConfig $config | |
| 75 | + * @param Folder $userFolder | |
| 76 | + */ | |
| 77 | + public function __construct($appName, | |
| 78 | + IRequest $request, | |
| 79 | + IUserSession $userSession, | |
| 80 | + TagService $tagService, | |
| 81 | + IPreview $previewManager, | |
| 82 | + IManager $shareManager, | |
| 83 | + IConfig $config, | |
| 84 | +                                Folder $userFolder) { | |
| 85 | + parent::__construct($appName, $request); | |
| 86 | + $this->userSession = $userSession; | |
| 87 | + $this->tagService = $tagService; | |
| 88 | + $this->previewManager = $previewManager; | |
| 89 | + $this->shareManager = $shareManager; | |
| 90 | + $this->config = $config; | |
| 91 | + $this->userFolder = $userFolder; | |
| 92 | + } | |
| 93 | 93 | |
| 94 | - /** | |
| 95 | - * Gets a thumbnail of the specified file | |
| 96 | - * | |
| 97 | - * @since API version 1.0 | |
| 98 | - * | |
| 99 | - * @NoAdminRequired | |
| 100 | - * @NoCSRFRequired | |
| 101 | - * @StrictCookieRequired | |
| 102 | - * | |
| 103 | - * @param int $x | |
| 104 | - * @param int $y | |
| 105 | - * @param string $file URL-encoded filename | |
| 106 | - * @return DataResponse|FileDisplayResponse | |
| 107 | - */ | |
| 108 | -	public function getThumbnail($x, $y, $file) { | |
| 109 | -		if($x < 1 || $y < 1) { | |
| 110 | - return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST); | |
| 111 | - } | |
| 94 | + /** | |
| 95 | + * Gets a thumbnail of the specified file | |
| 96 | + * | |
| 97 | + * @since API version 1.0 | |
| 98 | + * | |
| 99 | + * @NoAdminRequired | |
| 100 | + * @NoCSRFRequired | |
| 101 | + * @StrictCookieRequired | |
| 102 | + * | |
| 103 | + * @param int $x | |
| 104 | + * @param int $y | |
| 105 | + * @param string $file URL-encoded filename | |
| 106 | + * @return DataResponse|FileDisplayResponse | |
| 107 | + */ | |
| 108 | +    public function getThumbnail($x, $y, $file) { | |
| 109 | +        if($x < 1 || $y < 1) { | |
| 110 | + return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST); | |
| 111 | + } | |
| 112 | 112 | |
| 113 | -		try { | |
| 114 | - $file = $this->userFolder->get($file); | |
| 115 | -			if ($file instanceof Folder) { | |
| 116 | - throw new NotFoundException(); | |
| 117 | - } | |
| 113 | +        try { | |
| 114 | + $file = $this->userFolder->get($file); | |
| 115 | +            if ($file instanceof Folder) { | |
| 116 | + throw new NotFoundException(); | |
| 117 | + } | |
| 118 | 118 | |
| 119 | - /** @var File $file */ | |
| 120 | - $preview = $this->previewManager->getPreview($file, $x, $y, true); | |
| 119 | + /** @var File $file */ | |
| 120 | + $preview = $this->previewManager->getPreview($file, $x, $y, true); | |
| 121 | 121 | |
| 122 | - return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]); | |
| 123 | -		} catch (NotFoundException $e) { | |
| 124 | - return new DataResponse(['message' => 'File not found.'], Http::STATUS_NOT_FOUND); | |
| 125 | -		} catch (\Exception $e) { | |
| 126 | - return new DataResponse([], Http::STATUS_BAD_REQUEST); | |
| 127 | - } | |
| 128 | - } | |
| 122 | + return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]); | |
| 123 | +        } catch (NotFoundException $e) { | |
| 124 | + return new DataResponse(['message' => 'File not found.'], Http::STATUS_NOT_FOUND); | |
| 125 | +        } catch (\Exception $e) { | |
| 126 | + return new DataResponse([], Http::STATUS_BAD_REQUEST); | |
| 127 | + } | |
| 128 | + } | |
| 129 | 129 | |
| 130 | - /** | |
| 131 | - * Updates the info of the specified file path | |
| 132 | - * The passed tags are absolute, which means they will | |
| 133 | - * replace the actual tag selection. | |
| 134 | - * | |
| 135 | - * @NoAdminRequired | |
| 136 | - * | |
| 137 | - * @param string $path path | |
| 138 | - * @param array|string $tags array of tags | |
| 139 | - * @return DataResponse | |
| 140 | - */ | |
| 141 | -	public function updateFileTags($path, $tags = null) { | |
| 142 | - $result = []; | |
| 143 | - // if tags specified or empty array, update tags | |
| 144 | -		if (!is_null($tags)) { | |
| 145 | -			try { | |
| 146 | - $this->tagService->updateFileTags($path, $tags); | |
| 147 | -			} catch (\OCP\Files\NotFoundException $e) { | |
| 148 | - return new DataResponse([ | |
| 149 | - 'message' => $e->getMessage() | |
| 150 | - ], Http::STATUS_NOT_FOUND); | |
| 151 | -			} catch (\OCP\Files\StorageNotAvailableException $e) { | |
| 152 | - return new DataResponse([ | |
| 153 | - 'message' => $e->getMessage() | |
| 154 | - ], Http::STATUS_SERVICE_UNAVAILABLE); | |
| 155 | -			} catch (\Exception $e) { | |
| 156 | - return new DataResponse([ | |
| 157 | - 'message' => $e->getMessage() | |
| 158 | - ], Http::STATUS_NOT_FOUND); | |
| 159 | - } | |
| 160 | - $result['tags'] = $tags; | |
| 161 | - } | |
| 162 | - return new DataResponse($result); | |
| 163 | - } | |
| 130 | + /** | |
| 131 | + * Updates the info of the specified file path | |
| 132 | + * The passed tags are absolute, which means they will | |
| 133 | + * replace the actual tag selection. | |
| 134 | + * | |
| 135 | + * @NoAdminRequired | |
| 136 | + * | |
| 137 | + * @param string $path path | |
| 138 | + * @param array|string $tags array of tags | |
| 139 | + * @return DataResponse | |
| 140 | + */ | |
| 141 | +    public function updateFileTags($path, $tags = null) { | |
| 142 | + $result = []; | |
| 143 | + // if tags specified or empty array, update tags | |
| 144 | +        if (!is_null($tags)) { | |
| 145 | +            try { | |
| 146 | + $this->tagService->updateFileTags($path, $tags); | |
| 147 | +            } catch (\OCP\Files\NotFoundException $e) { | |
| 148 | + return new DataResponse([ | |
| 149 | + 'message' => $e->getMessage() | |
| 150 | + ], Http::STATUS_NOT_FOUND); | |
| 151 | +            } catch (\OCP\Files\StorageNotAvailableException $e) { | |
| 152 | + return new DataResponse([ | |
| 153 | + 'message' => $e->getMessage() | |
| 154 | + ], Http::STATUS_SERVICE_UNAVAILABLE); | |
| 155 | +            } catch (\Exception $e) { | |
| 156 | + return new DataResponse([ | |
| 157 | + 'message' => $e->getMessage() | |
| 158 | + ], Http::STATUS_NOT_FOUND); | |
| 159 | + } | |
| 160 | + $result['tags'] = $tags; | |
| 161 | + } | |
| 162 | + return new DataResponse($result); | |
| 163 | + } | |
| 164 | 164 | |
| 165 | - /** | |
| 166 | - * @param \OCP\Files\Node[] $nodes | |
| 167 | - * @return array | |
| 168 | - */ | |
| 169 | -	private function formatNodes(array $nodes) { | |
| 170 | -		return array_values(array_map(function (Node $node) { | |
| 171 | - /** @var \OC\Files\Node\Node $shareTypes */ | |
| 172 | - $shareTypes = $this->getShareTypes($node); | |
| 173 | - $file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo()); | |
| 174 | -			$parts = explode('/', dirname($node->getPath()), 4); | |
| 175 | -			if (isset($parts[3])) { | |
| 176 | - $file['path'] = '/' . $parts[3]; | |
| 177 | -			} else { | |
| 178 | - $file['path'] = '/'; | |
| 179 | - } | |
| 180 | -			if (!empty($shareTypes)) { | |
| 181 | - $file['shareTypes'] = $shareTypes; | |
| 182 | - } | |
| 183 | - return $file; | |
| 184 | - }, $nodes)); | |
| 185 | - } | |
| 165 | + /** | |
| 166 | + * @param \OCP\Files\Node[] $nodes | |
| 167 | + * @return array | |
| 168 | + */ | |
| 169 | +    private function formatNodes(array $nodes) { | |
| 170 | +        return array_values(array_map(function (Node $node) { | |
| 171 | + /** @var \OC\Files\Node\Node $shareTypes */ | |
| 172 | + $shareTypes = $this->getShareTypes($node); | |
| 173 | + $file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo()); | |
| 174 | +            $parts = explode('/', dirname($node->getPath()), 4); | |
| 175 | +            if (isset($parts[3])) { | |
| 176 | + $file['path'] = '/' . $parts[3]; | |
| 177 | +            } else { | |
| 178 | + $file['path'] = '/'; | |
| 179 | + } | |
| 180 | +            if (!empty($shareTypes)) { | |
| 181 | + $file['shareTypes'] = $shareTypes; | |
| 182 | + } | |
| 183 | + return $file; | |
| 184 | + }, $nodes)); | |
| 185 | + } | |
| 186 | 186 | |
| 187 | - /** | |
| 188 | - * Returns a list of recently modifed files. | |
| 189 | - * | |
| 190 | - * @NoAdminRequired | |
| 191 | - * | |
| 192 | - * @return DataResponse | |
| 193 | - */ | |
| 194 | -	public function getRecentFiles() { | |
| 195 | - $nodes = $this->userFolder->getRecent(100); | |
| 196 | - $files = $this->formatNodes($nodes); | |
| 197 | - return new DataResponse(['files' => $files]); | |
| 198 | - } | |
| 187 | + /** | |
| 188 | + * Returns a list of recently modifed files. | |
| 189 | + * | |
| 190 | + * @NoAdminRequired | |
| 191 | + * | |
| 192 | + * @return DataResponse | |
| 193 | + */ | |
| 194 | +    public function getRecentFiles() { | |
| 195 | + $nodes = $this->userFolder->getRecent(100); | |
| 196 | + $files = $this->formatNodes($nodes); | |
| 197 | + return new DataResponse(['files' => $files]); | |
| 198 | + } | |
| 199 | 199 | |
| 200 | - /** | |
| 201 | - * Return a list of share types for outgoing shares | |
| 202 | - * | |
| 203 | - * @param Node $node file node | |
| 204 | - * | |
| 205 | - * @return int[] array of share types | |
| 206 | - */ | |
| 207 | -	private function getShareTypes(Node $node) { | |
| 208 | - $userId = $this->userSession->getUser()->getUID(); | |
| 209 | - $shareTypes = []; | |
| 210 | - $requestedShareTypes = [ | |
| 211 | - \OCP\Share::SHARE_TYPE_USER, | |
| 212 | - \OCP\Share::SHARE_TYPE_GROUP, | |
| 213 | - \OCP\Share::SHARE_TYPE_LINK, | |
| 214 | - \OCP\Share::SHARE_TYPE_REMOTE, | |
| 215 | - \OCP\Share::SHARE_TYPE_EMAIL | |
| 216 | - ]; | |
| 217 | -		foreach ($requestedShareTypes as $requestedShareType) { | |
| 218 | - // one of each type is enough to find out about the types | |
| 219 | - $shares = $this->shareManager->getSharesBy( | |
| 220 | - $userId, | |
| 221 | - $requestedShareType, | |
| 222 | - $node, | |
| 223 | - false, | |
| 224 | - 1 | |
| 225 | - ); | |
| 226 | -			if (!empty($shares)) { | |
| 227 | - $shareTypes[] = $requestedShareType; | |
| 228 | - } | |
| 229 | - } | |
| 230 | - return $shareTypes; | |
| 231 | - } | |
| 200 | + /** | |
| 201 | + * Return a list of share types for outgoing shares | |
| 202 | + * | |
| 203 | + * @param Node $node file node | |
| 204 | + * | |
| 205 | + * @return int[] array of share types | |
| 206 | + */ | |
| 207 | +    private function getShareTypes(Node $node) { | |
| 208 | + $userId = $this->userSession->getUser()->getUID(); | |
| 209 | + $shareTypes = []; | |
| 210 | + $requestedShareTypes = [ | |
| 211 | + \OCP\Share::SHARE_TYPE_USER, | |
| 212 | + \OCP\Share::SHARE_TYPE_GROUP, | |
| 213 | + \OCP\Share::SHARE_TYPE_LINK, | |
| 214 | + \OCP\Share::SHARE_TYPE_REMOTE, | |
| 215 | + \OCP\Share::SHARE_TYPE_EMAIL | |
| 216 | + ]; | |
| 217 | +        foreach ($requestedShareTypes as $requestedShareType) { | |
| 218 | + // one of each type is enough to find out about the types | |
| 219 | + $shares = $this->shareManager->getSharesBy( | |
| 220 | + $userId, | |
| 221 | + $requestedShareType, | |
| 222 | + $node, | |
| 223 | + false, | |
| 224 | + 1 | |
| 225 | + ); | |
| 226 | +            if (!empty($shares)) { | |
| 227 | + $shareTypes[] = $requestedShareType; | |
| 228 | + } | |
| 229 | + } | |
| 230 | + return $shareTypes; | |
| 231 | + } | |
| 232 | 232 | |
| 233 | - /** | |
| 234 | - * Change the default sort mode | |
| 235 | - * | |
| 236 | - * @NoAdminRequired | |
| 237 | - * | |
| 238 | - * @param string $mode | |
| 239 | - * @param string $direction | |
| 240 | - * @return Response | |
| 241 | - */ | |
| 242 | -	public function updateFileSorting($mode, $direction) { | |
| 243 | - $allowedMode = ['name', 'size', 'mtime']; | |
| 244 | - $allowedDirection = ['asc', 'desc']; | |
| 245 | -		if (!in_array($mode, $allowedMode) || !in_array($direction, $allowedDirection)) { | |
| 246 | - $response = new Response(); | |
| 247 | - $response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY); | |
| 248 | - return $response; | |
| 249 | - } | |
| 250 | - $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting', $mode); | |
| 251 | - $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting_direction', $direction); | |
| 252 | - return new Response(); | |
| 253 | - } | |
| 233 | + /** | |
| 234 | + * Change the default sort mode | |
| 235 | + * | |
| 236 | + * @NoAdminRequired | |
| 237 | + * | |
| 238 | + * @param string $mode | |
| 239 | + * @param string $direction | |
| 240 | + * @return Response | |
| 241 | + */ | |
| 242 | +    public function updateFileSorting($mode, $direction) { | |
| 243 | + $allowedMode = ['name', 'size', 'mtime']; | |
| 244 | + $allowedDirection = ['asc', 'desc']; | |
| 245 | +        if (!in_array($mode, $allowedMode) || !in_array($direction, $allowedDirection)) { | |
| 246 | + $response = new Response(); | |
| 247 | + $response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY); | |
| 248 | + return $response; | |
| 249 | + } | |
| 250 | + $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting', $mode); | |
| 251 | + $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting_direction', $direction); | |
| 252 | + return new Response(); | |
| 253 | + } | |
| 254 | 254 | |
| 255 | - /** | |
| 256 | - * Toggle default for showing/hiding hidden files | |
| 257 | - * | |
| 258 | - * @NoAdminRequired | |
| 259 | - * | |
| 260 | - * @param bool $show | |
| 261 | - */ | |
| 262 | -	public function showHiddenFiles($show) { | |
| 263 | - $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', (int) $show); | |
| 264 | - return new Response(); | |
| 265 | - } | |
| 255 | + /** | |
| 256 | + * Toggle default for showing/hiding hidden files | |
| 257 | + * | |
| 258 | + * @NoAdminRequired | |
| 259 | + * | |
| 260 | + * @param bool $show | |
| 261 | + */ | |
| 262 | +    public function showHiddenFiles($show) { | |
| 263 | + $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', (int) $show); | |
| 264 | + return new Response(); | |
| 265 | + } | |
| 266 | 266 | |
| 267 | 267 | } |