@@ -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 | }  | 
                                                        
@@ -138,7 +138,7 @@ discard block  | 
                                                    ||
| 138 | 138 | }  | 
                                                        
| 139 | 139 |  		foreach ($favorites['folders'] as $favorite) { | 
                                                        
| 140 | 140 |  			$limitations[] = $query->expr()->like('file', $query->createNamedParameter( | 
                                                        
| 141 | - $this->db->escapeLikeParameter($favorite . '/') . '%'  | 
                                                        |
| 141 | + $this->db->escapeLikeParameter($favorite.'/').'%'  | 
                                                        |
| 142 | 142 | ));  | 
                                                        
| 143 | 143 | }  | 
                                                        
| 144 | 144 | |
@@ -148,9 +148,9 @@ discard block  | 
                                                    ||
| 148 | 148 | |
| 149 | 149 |  		$function = $query->createFunction(' | 
                                                        
| 150 | 150 | CASE  | 
                                                        
| 151 | -				WHEN ' . $query->getColumnName('app') . ' <> ' . $query->createNamedParameter('files') . ' THEN 1 | 
                                                        |
| 152 | -				WHEN ' . $query->getColumnName('app') . ' = ' . $query->createNamedParameter('files') . ' | 
                                                        |
| 153 | -					AND (' . implode(' OR ', $limitations) . ') | 
                                                        |
| 151 | +				WHEN ' . $query->getColumnName('app').' <> '.$query->createNamedParameter('files').' THEN 1 | 
                                                        |
| 152 | +				WHEN ' . $query->getColumnName('app').' = '.$query->createNamedParameter('files').' | 
                                                        |
| 153 | +					AND (' . implode(' OR ', $limitations).') | 
                                                        |
| 154 | 154 | THEN 1  | 
                                                        
| 155 | 155 | END = 1'  | 
                                                        
| 156 | 156 | );  | 
                                                        
@@ -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 | }  | 
                                                        
@@ -64,7 +64,7 @@  | 
                                                    ||
| 64 | 64 |  			if (!empty($nodes)) { | 
                                                        
| 65 | 65 | /** @var \OCP\Files\Node $node */  | 
                                                        
| 66 | 66 | $node = array_shift($nodes);  | 
                                                        
| 67 | - $path = substr($node->getPath(), strlen($user . '/files/'));  | 
                                                        |
| 67 | + $path = substr($node->getPath(), strlen($user.'/files/'));  | 
                                                        |
| 68 | 68 | |
| 69 | 69 | $items[] = $path;  | 
                                                        
| 70 | 70 |  				if ($node instanceof Folder) { | 
                                                        
@@ -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 | |
@@ -35,51 +35,51 @@  | 
                                                    ||
| 35 | 35 | */  | 
                                                        
| 36 | 36 |  class DeleteOrphanedFiles extends Command { | 
                                                        
| 37 | 37 | |
| 38 | - const CHUNK_SIZE = 200;  | 
                                                        |
| 38 | + const CHUNK_SIZE = 200;  | 
                                                        |
| 39 | 39 | |
| 40 | - /**  | 
                                                        |
| 41 | - * @var IDBConnection  | 
                                                        |
| 42 | - */  | 
                                                        |
| 43 | - protected $connection;  | 
                                                        |
| 40 | + /**  | 
                                                        |
| 41 | + * @var IDBConnection  | 
                                                        |
| 42 | + */  | 
                                                        |
| 43 | + protected $connection;  | 
                                                        |
| 44 | 44 | |
| 45 | -	public function __construct(IDBConnection $connection) { | 
                                                        |
| 46 | - $this->connection = $connection;  | 
                                                        |
| 47 | - parent::__construct();  | 
                                                        |
| 48 | - }  | 
                                                        |
| 45 | +    public function __construct(IDBConnection $connection) { | 
                                                        |
| 46 | + $this->connection = $connection;  | 
                                                        |
| 47 | + parent::__construct();  | 
                                                        |
| 48 | + }  | 
                                                        |
| 49 | 49 | |
| 50 | -	protected function configure() { | 
                                                        |
| 51 | - $this  | 
                                                        |
| 52 | -			->setName('files:cleanup') | 
                                                        |
| 53 | -			->setDescription('cleanup filecache'); | 
                                                        |
| 54 | - }  | 
                                                        |
| 50 | +    protected function configure() { | 
                                                        |
| 51 | + $this  | 
                                                        |
| 52 | +            ->setName('files:cleanup') | 
                                                        |
| 53 | +            ->setDescription('cleanup filecache'); | 
                                                        |
| 54 | + }  | 
                                                        |
| 55 | 55 | |
| 56 | -	public function execute(InputInterface $input, OutputInterface $output) { | 
                                                        |
| 57 | - $deletedEntries = 0;  | 
                                                        |
| 56 | +    public function execute(InputInterface $input, OutputInterface $output) { | 
                                                        |
| 57 | + $deletedEntries = 0;  | 
                                                        |
| 58 | 58 | |
| 59 | - $query = $this->connection->getQueryBuilder();  | 
                                                        |
| 60 | -		$query->select('fc.fileid') | 
                                                        |
| 61 | -			->from('filecache', 'fc') | 
                                                        |
| 62 | -			->where($query->expr()->isNull('s.numeric_id')) | 
                                                        |
| 63 | -			->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id')) | 
                                                        |
| 64 | - ->setMaxResults(self::CHUNK_SIZE);  | 
                                                        |
| 59 | + $query = $this->connection->getQueryBuilder();  | 
                                                        |
| 60 | +        $query->select('fc.fileid') | 
                                                        |
| 61 | +            ->from('filecache', 'fc') | 
                                                        |
| 62 | +            ->where($query->expr()->isNull('s.numeric_id')) | 
                                                        |
| 63 | +            ->leftJoin('fc', 'storages', 's', $query->expr()->eq('fc.storage', 's.numeric_id')) | 
                                                        |
| 64 | + ->setMaxResults(self::CHUNK_SIZE);  | 
                                                        |
| 65 | 65 | |
| 66 | - $deleteQuery = $this->connection->getQueryBuilder();  | 
                                                        |
| 67 | -		$deleteQuery->delete('filecache') | 
                                                        |
| 68 | -			->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid'))); | 
                                                        |
| 66 | + $deleteQuery = $this->connection->getQueryBuilder();  | 
                                                        |
| 67 | +        $deleteQuery->delete('filecache') | 
                                                        |
| 68 | +            ->where($deleteQuery->expr()->eq('fileid', $deleteQuery->createParameter('objectid'))); | 
                                                        |
| 69 | 69 | |
| 70 | - $deletedInLastChunk = self::CHUNK_SIZE;  | 
                                                        |
| 71 | -		while ($deletedInLastChunk === self::CHUNK_SIZE) { | 
                                                        |
| 72 | - $deletedInLastChunk = 0;  | 
                                                        |
| 73 | - $result = $query->execute();  | 
                                                        |
| 74 | -			while ($row = $result->fetch()) { | 
                                                        |
| 75 | - $deletedInLastChunk++;  | 
                                                        |
| 76 | -				$deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid']) | 
                                                        |
| 77 | - ->execute();  | 
                                                        |
| 78 | - }  | 
                                                        |
| 79 | - $result->closeCursor();  | 
                                                        |
| 80 | - }  | 
                                                        |
| 70 | + $deletedInLastChunk = self::CHUNK_SIZE;  | 
                                                        |
| 71 | +        while ($deletedInLastChunk === self::CHUNK_SIZE) { | 
                                                        |
| 72 | + $deletedInLastChunk = 0;  | 
                                                        |
| 73 | + $result = $query->execute();  | 
                                                        |
| 74 | +            while ($row = $result->fetch()) { | 
                                                        |
| 75 | + $deletedInLastChunk++;  | 
                                                        |
| 76 | +                $deletedEntries += $deleteQuery->setParameter('objectid', (int) $row['fileid']) | 
                                                        |
| 77 | + ->execute();  | 
                                                        |
| 78 | + }  | 
                                                        |
| 79 | + $result->closeCursor();  | 
                                                        |
| 80 | + }  | 
                                                        |
| 81 | 81 | |
| 82 | -		$output->writeln("$deletedEntries orphaned file cache entries deleted"); | 
                                                        |
| 83 | - }  | 
                                                        |
| 82 | +        $output->writeln("$deletedEntries orphaned file cache entries deleted"); | 
                                                        |
| 83 | + }  | 
                                                        |
| 84 | 84 | |
| 85 | 85 | }  | 
                                                        
@@ -34,29 +34,29 @@  | 
                                                    ||
| 34 | 34 | * @package OCA\Files  | 
                                                        
| 35 | 35 | */  | 
                                                        
| 36 | 36 |  class Capabilities implements ICapability { | 
                                                        
| 37 | - /** @var IConfig */  | 
                                                        |
| 38 | - protected $config;  | 
                                                        |
| 37 | + /** @var IConfig */  | 
                                                        |
| 38 | + protected $config;  | 
                                                        |
| 39 | 39 | |
| 40 | - /**  | 
                                                        |
| 41 | - * Capabilities constructor.  | 
                                                        |
| 42 | - *  | 
                                                        |
| 43 | - * @param IConfig $config  | 
                                                        |
| 44 | - */  | 
                                                        |
| 45 | -	public function __construct(IConfig $config) { | 
                                                        |
| 46 | - $this->config = $config;  | 
                                                        |
| 47 | - }  | 
                                                        |
| 40 | + /**  | 
                                                        |
| 41 | + * Capabilities constructor.  | 
                                                        |
| 42 | + *  | 
                                                        |
| 43 | + * @param IConfig $config  | 
                                                        |
| 44 | + */  | 
                                                        |
| 45 | +    public function __construct(IConfig $config) { | 
                                                        |
| 46 | + $this->config = $config;  | 
                                                        |
| 47 | + }  | 
                                                        |
| 48 | 48 | |
| 49 | - /**  | 
                                                        |
| 50 | - * Return this classes capabilities  | 
                                                        |
| 51 | - *  | 
                                                        |
| 52 | - * @return array  | 
                                                        |
| 53 | - */  | 
                                                        |
| 54 | -	public function getCapabilities() { | 
                                                        |
| 55 | - return [  | 
                                                        |
| 56 | - 'files' => [  | 
                                                        |
| 57 | - 'bigfilechunking' => true,  | 
                                                        |
| 58 | -				'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']), | 
                                                        |
| 59 | - ],  | 
                                                        |
| 60 | - ];  | 
                                                        |
| 61 | - }  | 
                                                        |
| 49 | + /**  | 
                                                        |
| 50 | + * Return this classes capabilities  | 
                                                        |
| 51 | + *  | 
                                                        |
| 52 | + * @return array  | 
                                                        |
| 53 | + */  | 
                                                        |
| 54 | +    public function getCapabilities() { | 
                                                        |
| 55 | + return [  | 
                                                        |
| 56 | + 'files' => [  | 
                                                        |
| 57 | + 'bigfilechunking' => true,  | 
                                                        |
| 58 | +                'blacklisted_files' => $this->config->getSystemValue('blacklisted_files', ['.htaccess']), | 
                                                        |
| 59 | + ],  | 
                                                        |
| 60 | + ];  | 
                                                        |
| 61 | + }  | 
                                                        |
| 62 | 62 | }  | 
                                                        
@@ -30,29 +30,29 @@  | 
                                                    ||
| 30 | 30 | */  | 
                                                        
| 31 | 31 |  class CleanupFileLocks extends TimedJob { | 
                                                        
| 32 | 32 | |
| 33 | - /**  | 
                                                        |
| 34 | - * Default interval in minutes  | 
                                                        |
| 35 | - *  | 
                                                        |
| 36 | - * @var int $defaultIntervalMin  | 
                                                        |
| 37 | - **/  | 
                                                        |
| 38 | - protected $defaultIntervalMin = 5;  | 
                                                        |
| 33 | + /**  | 
                                                        |
| 34 | + * Default interval in minutes  | 
                                                        |
| 35 | + *  | 
                                                        |
| 36 | + * @var int $defaultIntervalMin  | 
                                                        |
| 37 | + **/  | 
                                                        |
| 38 | + protected $defaultIntervalMin = 5;  | 
                                                        |
| 39 | 39 | |
| 40 | - /**  | 
                                                        |
| 41 | - * sets the correct interval for this timed job  | 
                                                        |
| 42 | - */  | 
                                                        |
| 43 | -	public function __construct() { | 
                                                        |
| 44 | - $this->interval = $this->defaultIntervalMin * 60;  | 
                                                        |
| 45 | - }  | 
                                                        |
| 40 | + /**  | 
                                                        |
| 41 | + * sets the correct interval for this timed job  | 
                                                        |
| 42 | + */  | 
                                                        |
| 43 | +    public function __construct() { | 
                                                        |
| 44 | + $this->interval = $this->defaultIntervalMin * 60;  | 
                                                        |
| 45 | + }  | 
                                                        |
| 46 | 46 | |
| 47 | - /**  | 
                                                        |
| 48 | - * Makes the background job do its work  | 
                                                        |
| 49 | - *  | 
                                                        |
| 50 | - * @param array $argument unused argument  | 
                                                        |
| 51 | - */  | 
                                                        |
| 52 | -	public function run($argument) { | 
                                                        |
| 53 | - $lockingProvider = \OC::$server->getLockingProvider();  | 
                                                        |
| 54 | -		if($lockingProvider instanceof DBLockingProvider) { | 
                                                        |
| 55 | - $lockingProvider->cleanExpiredLocks();  | 
                                                        |
| 56 | - }  | 
                                                        |
| 57 | - }  | 
                                                        |
| 47 | + /**  | 
                                                        |
| 48 | + * Makes the background job do its work  | 
                                                        |
| 49 | + *  | 
                                                        |
| 50 | + * @param array $argument unused argument  | 
                                                        |
| 51 | + */  | 
                                                        |
| 52 | +    public function run($argument) { | 
                                                        |
| 53 | + $lockingProvider = \OC::$server->getLockingProvider();  | 
                                                        |
| 54 | +        if($lockingProvider instanceof DBLockingProvider) { | 
                                                        |
| 55 | + $lockingProvider->cleanExpiredLocks();  | 
                                                        |
| 56 | + }  | 
                                                        |
| 57 | + }  | 
                                                        |
| 58 | 58 | }  | 
                                                        
@@ -51,7 +51,7 @@  | 
                                                    ||
| 51 | 51 | */  | 
                                                        
| 52 | 52 |  	public function run($argument) { | 
                                                        
| 53 | 53 | $lockingProvider = \OC::$server->getLockingProvider();  | 
                                                        
| 54 | -		if($lockingProvider instanceof DBLockingProvider) { | 
                                                        |
| 54 | +		if ($lockingProvider instanceof DBLockingProvider) { | 
                                                        |
| 55 | 55 | $lockingProvider->cleanExpiredLocks();  | 
                                                        
| 56 | 56 | }  | 
                                                        
| 57 | 57 | }  |