| @@ -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 | } | 
| @@ -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 | |
| @@ -24,26 +24,26 @@ | ||
| 24 | 24 | |
| 25 | 25 |  interface IUserLDAP { | 
| 26 | 26 | |
| 27 | - //Functions used by LDAPProvider | |
| 27 | + //Functions used by LDAPProvider | |
| 28 | 28 | |
| 29 | - /** | |
| 30 | - * Return access for LDAP interaction. | |
| 31 | - * @param string $uid | |
| 32 | - * @return Access instance of Access for LDAP interaction | |
| 33 | - */ | |
| 34 | - public function getLDAPAccess($uid); | |
| 29 | + /** | |
| 30 | + * Return access for LDAP interaction. | |
| 31 | + * @param string $uid | |
| 32 | + * @return Access instance of Access for LDAP interaction | |
| 33 | + */ | |
| 34 | + public function getLDAPAccess($uid); | |
| 35 | 35 | |
| 36 | - /** | |
| 37 | - * Return a new LDAP connection for the specified user. | |
| 38 | - * @param string $uid | |
| 39 | - * @return resource of the LDAP connection | |
| 40 | - */ | |
| 41 | - public function getNewLDAPConnection($uid); | |
| 36 | + /** | |
| 37 | + * Return a new LDAP connection for the specified user. | |
| 38 | + * @param string $uid | |
| 39 | + * @return resource of the LDAP connection | |
| 40 | + */ | |
| 41 | + public function getNewLDAPConnection($uid); | |
| 42 | 42 | |
| 43 | - /** | |
| 44 | - * Return the username for the given LDAP DN, if available. | |
| 45 | - * @param string $dn | |
| 46 | - * @return string|false with the username | |
| 47 | - */ | |
| 48 | - public function dn2UserName($dn); | |
| 43 | + /** | |
| 44 | + * Return the username for the given LDAP DN, if available. | |
| 45 | + * @param string $dn | |
| 46 | + * @return string|false with the username | |
| 47 | + */ | |
| 48 | + public function dn2UserName($dn); | |
| 49 | 49 | } | 
| @@ -26,13 +26,13 @@ | ||
| 26 | 26 | namespace OCA\User_LDAP; | 
| 27 | 27 | |
| 28 | 28 |  abstract class LDAPUtility { | 
| 29 | - protected $ldap; | |
| 29 | + protected $ldap; | |
| 30 | 30 | |
| 31 | - /** | |
| 32 | - * constructor, make sure the subclasses call this one! | |
| 33 | - * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper | |
| 34 | - */ | |
| 35 | -	public function __construct(ILDAPWrapper $ldapWrapper) { | |
| 36 | - $this->ldap = $ldapWrapper; | |
| 37 | - } | |
| 31 | + /** | |
| 32 | + * constructor, make sure the subclasses call this one! | |
| 33 | + * @param ILDAPWrapper $ldapWrapper an instance of an ILDAPWrapper | |
| 34 | + */ | |
| 35 | +    public function __construct(ILDAPWrapper $ldapWrapper) { | |
| 36 | + $this->ldap = $ldapWrapper; | |
| 37 | + } | |
| 38 | 38 | } | 
| @@ -28,55 +28,55 @@ | ||
| 28 | 28 | use OCP\Settings\IIconSection; | 
| 29 | 29 | |
| 30 | 30 |  class Section implements IIconSection { | 
| 31 | - /** @var IL10N */ | |
| 32 | - private $l; | |
| 33 | - /** @var IURLGenerator */ | |
| 34 | - private $url; | |
| 31 | + /** @var IL10N */ | |
| 32 | + private $l; | |
| 33 | + /** @var IURLGenerator */ | |
| 34 | + private $url; | |
| 35 | 35 | |
| 36 | - /** | |
| 37 | - * @param IURLGenerator $url | |
| 38 | - * @param IL10N $l | |
| 39 | - */ | |
| 40 | -	public function __construct(IURLGenerator $url, IL10N $l) { | |
| 41 | - $this->url = $url; | |
| 42 | - $this->l = $l; | |
| 43 | - } | |
| 36 | + /** | |
| 37 | + * @param IURLGenerator $url | |
| 38 | + * @param IL10N $l | |
| 39 | + */ | |
| 40 | +    public function __construct(IURLGenerator $url, IL10N $l) { | |
| 41 | + $this->url = $url; | |
| 42 | + $this->l = $l; | |
| 43 | + } | |
| 44 | 44 | |
| 45 | - /** | |
| 46 | - * returns the ID of the section. It is supposed to be a lower case string, | |
| 47 | - * e.g. 'ldap' | |
| 48 | - * | |
| 49 | - * @returns string | |
| 50 | - */ | |
| 51 | -	public function getID() { | |
| 52 | - return 'ldap'; | |
| 53 | - } | |
| 45 | + /** | |
| 46 | + * returns the ID of the section. It is supposed to be a lower case string, | |
| 47 | + * e.g. 'ldap' | |
| 48 | + * | |
| 49 | + * @returns string | |
| 50 | + */ | |
| 51 | +    public function getID() { | |
| 52 | + return 'ldap'; | |
| 53 | + } | |
| 54 | 54 | |
| 55 | - /** | |
| 56 | - * returns the translated name as it should be displayed, e.g. 'LDAP / AD | |
| 57 | - * integration'. Use the L10N service to translate it. | |
| 58 | - * | |
| 59 | - * @return string | |
| 60 | - */ | |
| 61 | -	public function getName() { | |
| 62 | -		return $this->l->t('LDAP / AD integration'); | |
| 63 | - } | |
| 55 | + /** | |
| 56 | + * returns the translated name as it should be displayed, e.g. 'LDAP / AD | |
| 57 | + * integration'. Use the L10N service to translate it. | |
| 58 | + * | |
| 59 | + * @return string | |
| 60 | + */ | |
| 61 | +    public function getName() { | |
| 62 | +        return $this->l->t('LDAP / AD integration'); | |
| 63 | + } | |
| 64 | 64 | |
| 65 | - /** | |
| 66 | - * @return int whether the form should be rather on the top or bottom of | |
| 67 | - * the settings navigation. The sections are arranged in ascending order of | |
| 68 | - * the priority values. It is required to return a value between 0 and 99. | |
| 69 | - * | |
| 70 | - * E.g.: 70 | |
| 71 | - */ | |
| 72 | -	public function getPriority() { | |
| 73 | - return 25; | |
| 74 | - } | |
| 65 | + /** | |
| 66 | + * @return int whether the form should be rather on the top or bottom of | |
| 67 | + * the settings navigation. The sections are arranged in ascending order of | |
| 68 | + * the priority values. It is required to return a value between 0 and 99. | |
| 69 | + * | |
| 70 | + * E.g.: 70 | |
| 71 | + */ | |
| 72 | +    public function getPriority() { | |
| 73 | + return 25; | |
| 74 | + } | |
| 75 | 75 | |
| 76 | - /** | |
| 77 | -	 * {@inheritdoc} | |
| 78 | - */ | |
| 79 | -	public function getIcon() { | |
| 80 | -		return $this->url->imagePath('user_ldap', 'app-dark.svg'); | |
| 81 | - } | |
| 76 | + /** | |
| 77 | +     * {@inheritdoc} | |
| 78 | + */ | |
| 79 | +    public function getIcon() { | |
| 80 | +        return $this->url->imagePath('user_ldap', 'app-dark.svg'); | |
| 81 | + } | |
| 82 | 82 | } | 
| @@ -24,25 +24,25 @@ | ||
| 24 | 24 | namespace OCA\Files_External\Service; | 
| 25 | 25 | |
| 26 | 26 |  class ImportLegacyStoragesService extends LegacyStoragesService { | 
| 27 | - private $data; | |
| 27 | + private $data; | |
| 28 | 28 | |
| 29 | - /** | |
| 30 | - * @param BackendService $backendService | |
| 31 | - */ | |
| 32 | -	public function __construct(BackendService $backendService) { | |
| 33 | - $this->backendService = $backendService; | |
| 34 | - } | |
| 29 | + /** | |
| 30 | + * @param BackendService $backendService | |
| 31 | + */ | |
| 32 | +    public function __construct(BackendService $backendService) { | |
| 33 | + $this->backendService = $backendService; | |
| 34 | + } | |
| 35 | 35 | |
| 36 | -	public function setData($data) { | |
| 37 | - $this->data = $data; | |
| 38 | - } | |
| 36 | +    public function setData($data) { | |
| 37 | + $this->data = $data; | |
| 38 | + } | |
| 39 | 39 | |
| 40 | - /** | |
| 41 | - * Read legacy config data | |
| 42 | - * | |
| 43 | - * @return array list of mount configs | |
| 44 | - */ | |
| 45 | -	protected function readLegacyConfig() { | |
| 46 | - return $this->data; | |
| 47 | - } | |
| 40 | + /** | |
| 41 | + * Read legacy config data | |
| 42 | + * | |
| 43 | + * @return array list of mount configs | |
| 44 | + */ | |
| 45 | +    protected function readLegacyConfig() { | |
| 46 | + return $this->data; | |
| 47 | + } | |
| 48 | 48 | } |