Completed
Pull Request — master (#3813)
by Maxence
55:24
created
apps/files/lib/Activity/Settings/FileRestored.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -27,72 +27,72 @@
 block discarded – undo
27 27
 
28 28
 class FileRestored 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_restored';
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_restored';
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>restored</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>restored</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 4;
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 4;
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
 
Please login to merge, or discard this patch.
apps/files/lib/Activity/Settings/FileCreated.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -27,72 +27,72 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
apps/files/lib/Activity/Settings/FavoriteAction.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -27,72 +27,72 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
apps/files/lib/Activity/Settings/FileFavorite.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -27,72 +27,72 @@
 block discarded – undo
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
 
Please login to merge, or discard this patch.
apps/files/lib/Service/TagService.php 1 patch
Indentation   +86 added lines, -86 removed lines patch added patch discarded remove patch
@@ -38,99 +38,99 @@
 block discarded – undo
38 38
  */
39 39
 class TagService {
40 40
 
41
-	/** @var IUserSession */
42
-	private $userSession;
43
-	/** @var IManager */
44
-	private $activityManager;
45
-	/** @var ITags */
46
-	private $tagger;
47
-	/** @var Folder */
48
-	private $homeFolder;
41
+    /** @var IUserSession */
42
+    private $userSession;
43
+    /** @var IManager */
44
+    private $activityManager;
45
+    /** @var ITags */
46
+    private $tagger;
47
+    /** @var Folder */
48
+    private $homeFolder;
49 49
 
50
-	/**
51
-	 * @param IUserSession $userSession
52
-	 * @param IManager $activityManager
53
-	 * @param ITags $tagger
54
-	 * @param Folder $homeFolder
55
-	 */
56
-	public function __construct(
57
-		IUserSession $userSession,
58
-		IManager $activityManager,
59
-		ITags $tagger,
60
-		Folder $homeFolder
61
-	) {
62
-		$this->userSession = $userSession;
63
-		$this->activityManager = $activityManager;
64
-		$this->tagger = $tagger;
65
-		$this->homeFolder = $homeFolder;
66
-	}
50
+    /**
51
+     * @param IUserSession $userSession
52
+     * @param IManager $activityManager
53
+     * @param ITags $tagger
54
+     * @param Folder $homeFolder
55
+     */
56
+    public function __construct(
57
+        IUserSession $userSession,
58
+        IManager $activityManager,
59
+        ITags $tagger,
60
+        Folder $homeFolder
61
+    ) {
62
+        $this->userSession = $userSession;
63
+        $this->activityManager = $activityManager;
64
+        $this->tagger = $tagger;
65
+        $this->homeFolder = $homeFolder;
66
+    }
67 67
 
68
-	/**
69
-	 * Updates the tags of the specified file path.
70
-	 * The passed tags are absolute, which means they will
71
-	 * replace the actual tag selection.
72
-	 *
73
-	 * @param string $path path
74
-	 * @param array  $tags array of tags
75
-	 * @return array list of tags
76
-	 * @throws \OCP\Files\NotFoundException if the file does not exist
77
-	 */
78
-	public function updateFileTags($path, $tags) {
79
-		$fileId = $this->homeFolder->get($path)->getId();
68
+    /**
69
+     * Updates the tags of the specified file path.
70
+     * The passed tags are absolute, which means they will
71
+     * replace the actual tag selection.
72
+     *
73
+     * @param string $path path
74
+     * @param array  $tags array of tags
75
+     * @return array list of tags
76
+     * @throws \OCP\Files\NotFoundException if the file does not exist
77
+     */
78
+    public function updateFileTags($path, $tags) {
79
+        $fileId = $this->homeFolder->get($path)->getId();
80 80
 
81
-		$currentTags = $this->tagger->getTagsForObjects(array($fileId));
81
+        $currentTags = $this->tagger->getTagsForObjects(array($fileId));
82 82
 
83
-		if (!empty($currentTags)) {
84
-			$currentTags = current($currentTags);
85
-		}
83
+        if (!empty($currentTags)) {
84
+            $currentTags = current($currentTags);
85
+        }
86 86
 
87
-		$newTags = array_diff($tags, $currentTags);
88
-		foreach ($newTags as $tag) {
89
-			if ($tag === Tags::TAG_FAVORITE) {
90
-				$this->addActivity(true, $fileId, $path);
91
-			}
92
-			$this->tagger->tagAs($fileId, $tag);
93
-		}
94
-		$deletedTags = array_diff($currentTags, $tags);
95
-		foreach ($deletedTags as $tag) {
96
-			if ($tag === Tags::TAG_FAVORITE) {
97
-				$this->addActivity(false, $fileId, $path);
98
-			}
99
-			$this->tagger->unTag($fileId, $tag);
100
-		}
87
+        $newTags = array_diff($tags, $currentTags);
88
+        foreach ($newTags as $tag) {
89
+            if ($tag === Tags::TAG_FAVORITE) {
90
+                $this->addActivity(true, $fileId, $path);
91
+            }
92
+            $this->tagger->tagAs($fileId, $tag);
93
+        }
94
+        $deletedTags = array_diff($currentTags, $tags);
95
+        foreach ($deletedTags as $tag) {
96
+            if ($tag === Tags::TAG_FAVORITE) {
97
+                $this->addActivity(false, $fileId, $path);
98
+            }
99
+            $this->tagger->unTag($fileId, $tag);
100
+        }
101 101
 
102
-		// TODO: re-read from tagger to make sure the
103
-		// list is up to date, in case of concurrent changes ?
104
-		return $tags;
105
-	}
102
+        // TODO: re-read from tagger to make sure the
103
+        // list is up to date, in case of concurrent changes ?
104
+        return $tags;
105
+    }
106 106
 
107
-	/**
108
-	 * @param bool $addToFavorite
109
-	 * @param int $fileId
110
-	 * @param string $path
111
-	 */
112
-	protected function addActivity($addToFavorite, $fileId, $path) {
113
-		$user = $this->userSession->getUser();
114
-		if (!$user instanceof IUser) {
115
-			return;
116
-		}
107
+    /**
108
+     * @param bool $addToFavorite
109
+     * @param int $fileId
110
+     * @param string $path
111
+     */
112
+    protected function addActivity($addToFavorite, $fileId, $path) {
113
+        $user = $this->userSession->getUser();
114
+        if (!$user instanceof IUser) {
115
+            return;
116
+        }
117 117
 
118
-		$event = $this->activityManager->generateEvent();
119
-		try {
120
-			$event->setApp('files')
121
-				->setObject('files', $fileId, $path)
122
-				->setType('favorite')
123
-				->setAuthor($user->getUID())
124
-				->setAffectedUser($user->getUID())
125
-				->setTimestamp(time())
126
-				->setSubject(
127
-					$addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED,
128
-					['id' => $fileId, 'path' => $path]
129
-				);
130
-			$this->activityManager->publish($event);
131
-		} catch (\InvalidArgumentException $e) {
132
-		} catch (\BadMethodCallException $e) {
133
-		}
134
-	}
118
+        $event = $this->activityManager->generateEvent();
119
+        try {
120
+            $event->setApp('files')
121
+                ->setObject('files', $fileId, $path)
122
+                ->setType('favorite')
123
+                ->setAuthor($user->getUID())
124
+                ->setAffectedUser($user->getUID())
125
+                ->setTimestamp(time())
126
+                ->setSubject(
127
+                    $addToFavorite ? FavoriteProvider::SUBJECT_ADDED : FavoriteProvider::SUBJECT_REMOVED,
128
+                    ['id' => $fileId, 'path' => $path]
129
+                );
130
+            $this->activityManager->publish($event);
131
+        } catch (\InvalidArgumentException $e) {
132
+        } catch (\BadMethodCallException $e) {
133
+        }
134
+    }
135 135
 }
136 136
 
Please login to merge, or discard this patch.
apps/files/lib/App.php 1 patch
Indentation   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -27,22 +27,22 @@
 block discarded – undo
27 27
 namespace OCA\Files;
28 28
 
29 29
 class App {
30
-	/**
31
-	 * @var \OCP\INavigationManager
32
-	 */
33
-	private static $navigationManager;
30
+    /**
31
+     * @var \OCP\INavigationManager
32
+     */
33
+    private static $navigationManager;
34 34
 
35
-	/**
36
-	 * Returns the app's navigation manager
37
-	 *
38
-	 * @return \OCP\INavigationManager
39
-	 */
40
-	public static function getNavigationManager() {
41
-		// TODO: move this into a service in the Application class
42
-		if (self::$navigationManager === null) {
43
-			self::$navigationManager = new \OC\NavigationManager();
44
-		}
45
-		return self::$navigationManager;
46
-	}
35
+    /**
36
+     * Returns the app's navigation manager
37
+     *
38
+     * @return \OCP\INavigationManager
39
+     */
40
+    public static function getNavigationManager() {
41
+        // TODO: move this into a service in the Application class
42
+        if (self::$navigationManager === null) {
43
+            self::$navigationManager = new \OC\NavigationManager();
44
+        }
45
+        return self::$navigationManager;
46
+    }
47 47
 
48 48
 }
Please login to merge, or discard this patch.
apps/files/lib/Controller/SettingsController.php 1 patch
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -29,23 +29,23 @@
 block discarded – undo
29 29
 use OCP\Util;
30 30
 
31 31
 class SettingsController extends Controller {
32
-	public function __construct($appName, IRequest $request) {
33
-		parent::__construct($appName, $request);
34
-	}
32
+    public function __construct($appName, IRequest $request) {
33
+        parent::__construct($appName, $request);
34
+    }
35 35
 
36
-	/**
37
-	 * @param string $maxUploadSize
38
-	 * @return JSONResponse
39
-	 */
40
-	public function setMaxUploadSize($maxUploadSize) {
41
-		$setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize));
36
+    /**
37
+     * @param string $maxUploadSize
38
+     * @return JSONResponse
39
+     */
40
+    public function setMaxUploadSize($maxUploadSize) {
41
+        $setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($maxUploadSize));
42 42
 
43
-		if ($setMaxSize === false) {
44
-			return new JSONResponse([], Http::STATUS_BAD_REQUEST);
45
-		} else {
46
-			return new JSONResponse([
47
-				'maxUploadSize' => Util::humanFileSize($setMaxSize)
48
-			]);
49
-		}
50
-	}
43
+        if ($setMaxSize === false) {
44
+            return new JSONResponse([], Http::STATUS_BAD_REQUEST);
45
+        } else {
46
+            return new JSONResponse([
47
+                'maxUploadSize' => Util::humanFileSize($setMaxSize)
48
+            ]);
49
+        }
50
+    }
51 51
 }
Please login to merge, or discard this patch.
apps/files/lib/Controller/ViewController.php 1 patch
Indentation   +215 added lines, -215 removed lines patch added patch discarded remove patch
@@ -49,241 +49,241 @@
 block discarded – undo
49 49
  * @package OCA\Files\Controller
50 50
  */
51 51
 class ViewController extends Controller {
52
-	/** @var string */
53
-	protected $appName;
54
-	/** @var IRequest */
55
-	protected $request;
56
-	/** @var IURLGenerator */
57
-	protected $urlGenerator;
58
-	/** @var IL10N */
59
-	protected $l10n;
60
-	/** @var IConfig */
61
-	protected $config;
62
-	/** @var EventDispatcherInterface */
63
-	protected $eventDispatcher;
64
-	/** @var IUserSession */
65
-	protected $userSession;
66
-	/** @var IAppManager */
67
-	protected $appManager;
68
-	/** @var IRootFolder */
69
-	protected $rootFolder;
52
+    /** @var string */
53
+    protected $appName;
54
+    /** @var IRequest */
55
+    protected $request;
56
+    /** @var IURLGenerator */
57
+    protected $urlGenerator;
58
+    /** @var IL10N */
59
+    protected $l10n;
60
+    /** @var IConfig */
61
+    protected $config;
62
+    /** @var EventDispatcherInterface */
63
+    protected $eventDispatcher;
64
+    /** @var IUserSession */
65
+    protected $userSession;
66
+    /** @var IAppManager */
67
+    protected $appManager;
68
+    /** @var IRootFolder */
69
+    protected $rootFolder;
70 70
 
71
-	/**
72
-	 * @param string $appName
73
-	 * @param IRequest $request
74
-	 * @param IURLGenerator $urlGenerator
75
-	 * @param IL10N $l10n
76
-	 * @param IConfig $config
77
-	 * @param EventDispatcherInterface $eventDispatcherInterface
78
-	 * @param IUserSession $userSession
79
-	 * @param IAppManager $appManager
80
-	 * @param IRootFolder $rootFolder
81
-	 */
82
-	public function __construct($appName,
83
-								IRequest $request,
84
-								IURLGenerator $urlGenerator,
85
-								IL10N $l10n,
86
-								IConfig $config,
87
-								EventDispatcherInterface $eventDispatcherInterface,
88
-								IUserSession $userSession,
89
-								IAppManager $appManager,
90
-								IRootFolder $rootFolder
91
-	) {
92
-		parent::__construct($appName, $request);
93
-		$this->appName = $appName;
94
-		$this->request = $request;
95
-		$this->urlGenerator = $urlGenerator;
96
-		$this->l10n = $l10n;
97
-		$this->config = $config;
98
-		$this->eventDispatcher = $eventDispatcherInterface;
99
-		$this->userSession = $userSession;
100
-		$this->appManager = $appManager;
101
-		$this->rootFolder = $rootFolder;
102
-	}
71
+    /**
72
+     * @param string $appName
73
+     * @param IRequest $request
74
+     * @param IURLGenerator $urlGenerator
75
+     * @param IL10N $l10n
76
+     * @param IConfig $config
77
+     * @param EventDispatcherInterface $eventDispatcherInterface
78
+     * @param IUserSession $userSession
79
+     * @param IAppManager $appManager
80
+     * @param IRootFolder $rootFolder
81
+     */
82
+    public function __construct($appName,
83
+                                IRequest $request,
84
+                                IURLGenerator $urlGenerator,
85
+                                IL10N $l10n,
86
+                                IConfig $config,
87
+                                EventDispatcherInterface $eventDispatcherInterface,
88
+                                IUserSession $userSession,
89
+                                IAppManager $appManager,
90
+                                IRootFolder $rootFolder
91
+    ) {
92
+        parent::__construct($appName, $request);
93
+        $this->appName = $appName;
94
+        $this->request = $request;
95
+        $this->urlGenerator = $urlGenerator;
96
+        $this->l10n = $l10n;
97
+        $this->config = $config;
98
+        $this->eventDispatcher = $eventDispatcherInterface;
99
+        $this->userSession = $userSession;
100
+        $this->appManager = $appManager;
101
+        $this->rootFolder = $rootFolder;
102
+    }
103 103
 
104
-	/**
105
-	 * @param string $appName
106
-	 * @param string $scriptName
107
-	 * @return string
108
-	 */
109
-	protected function renderScript($appName, $scriptName) {
110
-		$content = '';
111
-		$appPath = \OC_App::getAppPath($appName);
112
-		$scriptPath = $appPath . '/' . $scriptName;
113
-		if (file_exists($scriptPath)) {
114
-			// TODO: sanitize path / script name ?
115
-			ob_start();
116
-			include $scriptPath;
117
-			$content = ob_get_contents();
118
-			@ob_end_clean();
119
-		}
120
-		return $content;
121
-	}
104
+    /**
105
+     * @param string $appName
106
+     * @param string $scriptName
107
+     * @return string
108
+     */
109
+    protected function renderScript($appName, $scriptName) {
110
+        $content = '';
111
+        $appPath = \OC_App::getAppPath($appName);
112
+        $scriptPath = $appPath . '/' . $scriptName;
113
+        if (file_exists($scriptPath)) {
114
+            // TODO: sanitize path / script name ?
115
+            ob_start();
116
+            include $scriptPath;
117
+            $content = ob_get_contents();
118
+            @ob_end_clean();
119
+        }
120
+        return $content;
121
+    }
122 122
 
123
-	/**
124
-	 * FIXME: Replace with non static code
125
-	 *
126
-	 * @return array
127
-	 * @throws \OCP\Files\NotFoundException
128
-	 */
129
-	protected function getStorageInfo() {
130
-		$dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
131
-		return \OC_Helper::getStorageInfo('/', $dirInfo);
132
-	}
123
+    /**
124
+     * FIXME: Replace with non static code
125
+     *
126
+     * @return array
127
+     * @throws \OCP\Files\NotFoundException
128
+     */
129
+    protected function getStorageInfo() {
130
+        $dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
131
+        return \OC_Helper::getStorageInfo('/', $dirInfo);
132
+    }
133 133
 
134
-	/**
135
-	 * @NoCSRFRequired
136
-	 * @NoAdminRequired
137
-	 *
138
-	 * @param string $dir
139
-	 * @param string $view
140
-	 * @param string $fileid
141
-	 * @return TemplateResponse|RedirectResponse
142
-	 */
143
-	public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
144
-		if ($fileid !== null) {
145
-			try {
146
-				return $this->showFile($fileid);
147
-			} catch (NotFoundException $e) {
148
-				return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
149
-			}
150
-		}
134
+    /**
135
+     * @NoCSRFRequired
136
+     * @NoAdminRequired
137
+     *
138
+     * @param string $dir
139
+     * @param string $view
140
+     * @param string $fileid
141
+     * @return TemplateResponse|RedirectResponse
142
+     */
143
+    public function index($dir = '', $view = '', $fileid = null, $fileNotFound = false) {
144
+        if ($fileid !== null) {
145
+            try {
146
+                return $this->showFile($fileid);
147
+            } catch (NotFoundException $e) {
148
+                return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', ['fileNotFound' => true]));
149
+            }
150
+        }
151 151
 
152
-		$nav = new \OCP\Template('files', 'appnavigation', '');
152
+        $nav = new \OCP\Template('files', 'appnavigation', '');
153 153
 
154
-		// Load the files we need
155
-		\OCP\Util::addStyle('files', 'files');
156
-		\OCP\Util::addStyle('files', 'upload');
157
-		\OCP\Util::addStyle('files', 'mobile');
158
-		\OCP\Util::addScript('files', 'app');
159
-		\OCP\Util::addScript('files', 'file-upload');
160
-		\OCP\Util::addScript('files', 'newfilemenu');
161
-		\OCP\Util::addScript('files', 'jquery.fileupload');
162
-		\OCP\Util::addScript('files', 'jquery-visibility');
163
-		\OCP\Util::addScript('files', 'fileinfomodel');
164
-		\OCP\Util::addScript('files', 'filesummary');
165
-		\OCP\Util::addScript('files', 'breadcrumb');
166
-		\OCP\Util::addScript('files', 'filelist');
167
-		\OCP\Util::addScript('files', 'search');
154
+        // Load the files we need
155
+        \OCP\Util::addStyle('files', 'files');
156
+        \OCP\Util::addStyle('files', 'upload');
157
+        \OCP\Util::addStyle('files', 'mobile');
158
+        \OCP\Util::addScript('files', 'app');
159
+        \OCP\Util::addScript('files', 'file-upload');
160
+        \OCP\Util::addScript('files', 'newfilemenu');
161
+        \OCP\Util::addScript('files', 'jquery.fileupload');
162
+        \OCP\Util::addScript('files', 'jquery-visibility');
163
+        \OCP\Util::addScript('files', 'fileinfomodel');
164
+        \OCP\Util::addScript('files', 'filesummary');
165
+        \OCP\Util::addScript('files', 'breadcrumb');
166
+        \OCP\Util::addScript('files', 'filelist');
167
+        \OCP\Util::addScript('files', 'search');
168 168
 
169
-		\OCP\Util::addScript('files', 'favoritesfilelist');
170
-		\OCP\Util::addScript('files', 'recentfilelist');
171
-		\OCP\Util::addScript('files', 'tagsplugin');
172
-		\OCP\Util::addScript('files', 'gotoplugin');
173
-		\OCP\Util::addScript('files', 'favoritesplugin');
174
-		\OCP\Util::addScript('files', 'recentplugin');
169
+        \OCP\Util::addScript('files', 'favoritesfilelist');
170
+        \OCP\Util::addScript('files', 'recentfilelist');
171
+        \OCP\Util::addScript('files', 'tagsplugin');
172
+        \OCP\Util::addScript('files', 'gotoplugin');
173
+        \OCP\Util::addScript('files', 'favoritesplugin');
174
+        \OCP\Util::addScript('files', 'recentplugin');
175 175
 
176
-		\OCP\Util::addScript('files', 'detailfileinfoview');
177
-		\OCP\Util::addScript('files', 'sidebarpreviewmanager');
178
-		\OCP\Util::addScript('files', 'sidebarpreviewtext');
179
-		\OCP\Util::addScript('files', 'detailtabview');
180
-		\OCP\Util::addScript('files', 'mainfileinfodetailview');
181
-		\OCP\Util::addScript('files', 'detailsview');
182
-		\OCP\Util::addStyle('files', 'detailsView');
176
+        \OCP\Util::addScript('files', 'detailfileinfoview');
177
+        \OCP\Util::addScript('files', 'sidebarpreviewmanager');
178
+        \OCP\Util::addScript('files', 'sidebarpreviewtext');
179
+        \OCP\Util::addScript('files', 'detailtabview');
180
+        \OCP\Util::addScript('files', 'mainfileinfodetailview');
181
+        \OCP\Util::addScript('files', 'detailsview');
182
+        \OCP\Util::addStyle('files', 'detailsView');
183 183
 
184
-		\OC_Util::addVendorScript('core', 'handlebars/handlebars');
184
+        \OC_Util::addVendorScript('core', 'handlebars/handlebars');
185 185
 
186
-		\OCP\Util::addScript('files', 'fileactions');
187
-		\OCP\Util::addScript('files', 'fileactionsmenu');
188
-		\OCP\Util::addScript('files', 'files');
189
-		\OCP\Util::addScript('files', 'keyboardshortcuts');
190
-		\OCP\Util::addScript('files', 'navigation');
186
+        \OCP\Util::addScript('files', 'fileactions');
187
+        \OCP\Util::addScript('files', 'fileactionsmenu');
188
+        \OCP\Util::addScript('files', 'files');
189
+        \OCP\Util::addScript('files', 'keyboardshortcuts');
190
+        \OCP\Util::addScript('files', 'navigation');
191 191
 
192
-		// mostly for the home storage's free space
193
-		// FIXME: Make non static
194
-		$storageInfo = $this->getStorageInfo();
192
+        // mostly for the home storage's free space
193
+        // FIXME: Make non static
194
+        $storageInfo = $this->getStorageInfo();
195 195
 
196
-		\OCA\Files\App::getNavigationManager()->add(
197
-			[
198
-				'id' => 'favorites',
199
-				'appname' => 'files',
200
-				'script' => 'simplelist.php',
201
-				'order' => 5,
202
-				'name' => $this->l10n->t('Favorites')
203
-			]
204
-		);
196
+        \OCA\Files\App::getNavigationManager()->add(
197
+            [
198
+                'id' => 'favorites',
199
+                'appname' => 'files',
200
+                'script' => 'simplelist.php',
201
+                'order' => 5,
202
+                'name' => $this->l10n->t('Favorites')
203
+            ]
204
+        );
205 205
 
206
-		$navItems = \OCA\Files\App::getNavigationManager()->getAll();
207
-		usort($navItems, function($item1, $item2) {
208
-			return $item1['order'] - $item2['order'];
209
-		});
210
-		$nav->assign('navigationItems', $navItems);
206
+        $navItems = \OCA\Files\App::getNavigationManager()->getAll();
207
+        usort($navItems, function($item1, $item2) {
208
+            return $item1['order'] - $item2['order'];
209
+        });
210
+        $nav->assign('navigationItems', $navItems);
211 211
 
212
-		$contentItems = [];
212
+        $contentItems = [];
213 213
 
214
-		// render the container content for every navigation item
215
-		foreach ($navItems as $item) {
216
-			$content = '';
217
-			if (isset($item['script'])) {
218
-				$content = $this->renderScript($item['appname'], $item['script']);
219
-			}
220
-			$contentItem = [];
221
-			$contentItem['id'] = $item['id'];
222
-			$contentItem['content'] = $content;
223
-			$contentItems[] = $contentItem;
224
-		}
214
+        // render the container content for every navigation item
215
+        foreach ($navItems as $item) {
216
+            $content = '';
217
+            if (isset($item['script'])) {
218
+                $content = $this->renderScript($item['appname'], $item['script']);
219
+            }
220
+            $contentItem = [];
221
+            $contentItem['id'] = $item['id'];
222
+            $contentItem['content'] = $content;
223
+            $contentItems[] = $contentItem;
224
+        }
225 225
 
226
-		$this->eventDispatcher->dispatch('OCA\Files::loadAdditionalScripts');
226
+        $this->eventDispatcher->dispatch('OCA\Files::loadAdditionalScripts');
227 227
 
228
-		$params = [];
229
-		$params['usedSpacePercent'] = (int)$storageInfo['relative'];
230
-		$params['owner'] = $storageInfo['owner'];
231
-		$params['ownerDisplayName'] = $storageInfo['ownerDisplayName'];
232
-		$params['isPublic'] = false;
233
-		$params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
234
-		$user = $this->userSession->getUser()->getUID();
235
-		$params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
236
-		$params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
237
-		$showHidden = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
238
-		$params['showHiddenFiles'] = $showHidden ? 1 : 0;
239
-		$params['fileNotFound'] = $fileNotFound ? 1 : 0;
240
-		$params['appNavigation'] = $nav;
241
-		$params['appContents'] = $contentItems;
228
+        $params = [];
229
+        $params['usedSpacePercent'] = (int)$storageInfo['relative'];
230
+        $params['owner'] = $storageInfo['owner'];
231
+        $params['ownerDisplayName'] = $storageInfo['ownerDisplayName'];
232
+        $params['isPublic'] = false;
233
+        $params['allowShareWithLink'] = $this->config->getAppValue('core', 'shareapi_allow_links', 'yes');
234
+        $user = $this->userSession->getUser()->getUID();
235
+        $params['defaultFileSorting'] = $this->config->getUserValue($user, 'files', 'file_sorting', 'name');
236
+        $params['defaultFileSortingDirection'] = $this->config->getUserValue($user, 'files', 'file_sorting_direction', 'asc');
237
+        $showHidden = (bool) $this->config->getUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', false);
238
+        $params['showHiddenFiles'] = $showHidden ? 1 : 0;
239
+        $params['fileNotFound'] = $fileNotFound ? 1 : 0;
240
+        $params['appNavigation'] = $nav;
241
+        $params['appContents'] = $contentItems;
242 242
 
243
-		$response = new TemplateResponse(
244
-			$this->appName,
245
-			'index',
246
-			$params
247
-		);
248
-		$policy = new ContentSecurityPolicy();
249
-		$policy->addAllowedFrameDomain('\'self\'');
250
-		$response->setContentSecurityPolicy($policy);
243
+        $response = new TemplateResponse(
244
+            $this->appName,
245
+            'index',
246
+            $params
247
+        );
248
+        $policy = new ContentSecurityPolicy();
249
+        $policy->addAllowedFrameDomain('\'self\'');
250
+        $response->setContentSecurityPolicy($policy);
251 251
 
252
-		return $response;
253
-	}
252
+        return $response;
253
+    }
254 254
 
255
-	/**
256
-	 * Redirects to the file list and highlight the given file id
257
-	 *
258
-	 * @param string $fileId file id to show
259
-	 * @return RedirectResponse redirect response or not found response
260
-	 * @throws \OCP\Files\NotFoundException
261
-	 */
262
-	private function showFile($fileId) {
263
-		$uid = $this->userSession->getUser()->getUID();
264
-		$baseFolder = $this->rootFolder->getUserFolder($uid);
265
-		$files = $baseFolder->getById($fileId);
266
-		$params = [];
255
+    /**
256
+     * Redirects to the file list and highlight the given file id
257
+     *
258
+     * @param string $fileId file id to show
259
+     * @return RedirectResponse redirect response or not found response
260
+     * @throws \OCP\Files\NotFoundException
261
+     */
262
+    private function showFile($fileId) {
263
+        $uid = $this->userSession->getUser()->getUID();
264
+        $baseFolder = $this->rootFolder->getUserFolder($uid);
265
+        $files = $baseFolder->getById($fileId);
266
+        $params = [];
267 267
 
268
-		if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
269
-			$baseFolder = $this->rootFolder->get($uid . '/files_trashbin/files/');
270
-			$files = $baseFolder->getById($fileId);
271
-			$params['view'] = 'trashbin';
272
-		}
268
+        if (empty($files) && $this->appManager->isEnabledForUser('files_trashbin')) {
269
+            $baseFolder = $this->rootFolder->get($uid . '/files_trashbin/files/');
270
+            $files = $baseFolder->getById($fileId);
271
+            $params['view'] = 'trashbin';
272
+        }
273 273
 
274
-		if (!empty($files)) {
275
-			$file = current($files);
276
-			if ($file instanceof Folder) {
277
-				// set the full path to enter the folder
278
-				$params['dir'] = $baseFolder->getRelativePath($file->getPath());
279
-			} else {
280
-				// set parent path as dir
281
-				$params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath());
282
-				// and scroll to the entry
283
-				$params['scrollto'] = $file->getName();
284
-			}
285
-			return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
286
-		}
287
-		throw new \OCP\Files\NotFoundException();
288
-	}
274
+        if (!empty($files)) {
275
+            $file = current($files);
276
+            if ($file instanceof Folder) {
277
+                // set the full path to enter the folder
278
+                $params['dir'] = $baseFolder->getRelativePath($file->getPath());
279
+            } else {
280
+                // set parent path as dir
281
+                $params['dir'] = $baseFolder->getRelativePath($file->getParent()->getPath());
282
+                // and scroll to the entry
283
+                $params['scrollto'] = $file->getName();
284
+            }
285
+            return new RedirectResponse($this->urlGenerator->linkToRoute('files.view.index', $params));
286
+        }
287
+        throw new \OCP\Files\NotFoundException();
288
+    }
289 289
 }
Please login to merge, or discard this patch.
apps/files/lib/Controller/ApiController.php 1 patch
Indentation   +201 added lines, -201 removed lines patch added patch discarded remove patch
@@ -51,217 +51,217 @@
 block discarded – undo
51 51
  * @package OCA\Files\Controller
52 52
  */
53 53
 class ApiController extends Controller {
54
-	/** @var TagService */
55
-	private $tagService;
56
-	/** @var IManager **/
57
-	private $shareManager;
58
-	/** @var IPreview */
59
-	private $previewManager;
60
-	/** IUserSession */
61
-	private $userSession;
62
-	/** IConfig */
63
-	private $config;
64
-	/** @var Folder */
65
-	private $userFolder;
54
+    /** @var TagService */
55
+    private $tagService;
56
+    /** @var IManager **/
57
+    private $shareManager;
58
+    /** @var IPreview */
59
+    private $previewManager;
60
+    /** IUserSession */
61
+    private $userSession;
62
+    /** IConfig */
63
+    private $config;
64
+    /** @var Folder */
65
+    private $userFolder;
66 66
 
67
-	/**
68
-	 * @param string $appName
69
-	 * @param IRequest $request
70
-	 * @param IUserSession $userSession
71
-	 * @param TagService $tagService
72
-	 * @param IPreview $previewManager
73
-	 * @param IManager $shareManager
74
-	 * @param IConfig $config
75
-	 * @param Folder $userFolder
76
-	 */
77
-	public function __construct($appName,
78
-								IRequest $request,
79
-								IUserSession $userSession,
80
-								TagService $tagService,
81
-								IPreview $previewManager,
82
-								IManager $shareManager,
83
-								IConfig $config,
84
-								Folder $userFolder) {
85
-		parent::__construct($appName, $request);
86
-		$this->userSession = $userSession;
87
-		$this->tagService = $tagService;
88
-		$this->previewManager = $previewManager;
89
-		$this->shareManager = $shareManager;
90
-		$this->config = $config;
91
-		$this->userFolder = $userFolder;
92
-	}
67
+    /**
68
+     * @param string $appName
69
+     * @param IRequest $request
70
+     * @param IUserSession $userSession
71
+     * @param TagService $tagService
72
+     * @param IPreview $previewManager
73
+     * @param IManager $shareManager
74
+     * @param IConfig $config
75
+     * @param Folder $userFolder
76
+     */
77
+    public function __construct($appName,
78
+                                IRequest $request,
79
+                                IUserSession $userSession,
80
+                                TagService $tagService,
81
+                                IPreview $previewManager,
82
+                                IManager $shareManager,
83
+                                IConfig $config,
84
+                                Folder $userFolder) {
85
+        parent::__construct($appName, $request);
86
+        $this->userSession = $userSession;
87
+        $this->tagService = $tagService;
88
+        $this->previewManager = $previewManager;
89
+        $this->shareManager = $shareManager;
90
+        $this->config = $config;
91
+        $this->userFolder = $userFolder;
92
+    }
93 93
 
94
-	/**
95
-	 * Gets a thumbnail of the specified file
96
-	 *
97
-	 * @since API version 1.0
98
-	 *
99
-	 * @NoAdminRequired
100
-	 * @NoCSRFRequired
101
-	 * @StrictCookieRequired
102
-	 *
103
-	 * @param int $x
104
-	 * @param int $y
105
-	 * @param string $file URL-encoded filename
106
-	 * @return DataResponse|FileDisplayResponse
107
-	 */
108
-	public function getThumbnail($x, $y, $file) {
109
-		if($x < 1 || $y < 1) {
110
-			return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST);
111
-		}
94
+    /**
95
+     * Gets a thumbnail of the specified file
96
+     *
97
+     * @since API version 1.0
98
+     *
99
+     * @NoAdminRequired
100
+     * @NoCSRFRequired
101
+     * @StrictCookieRequired
102
+     *
103
+     * @param int $x
104
+     * @param int $y
105
+     * @param string $file URL-encoded filename
106
+     * @return DataResponse|FileDisplayResponse
107
+     */
108
+    public function getThumbnail($x, $y, $file) {
109
+        if($x < 1 || $y < 1) {
110
+            return new DataResponse(['message' => 'Requested size must be numeric and a positive value.'], Http::STATUS_BAD_REQUEST);
111
+        }
112 112
 
113
-		try {
114
-			$file = $this->userFolder->get($file);
115
-			if ($file instanceof Folder) {
116
-				throw new NotFoundException();
117
-			}
113
+        try {
114
+            $file = $this->userFolder->get($file);
115
+            if ($file instanceof Folder) {
116
+                throw new NotFoundException();
117
+            }
118 118
 
119
-			/** @var File $file */
120
-			$preview = $this->previewManager->getPreview($file, $x, $y, true);
119
+            /** @var File $file */
120
+            $preview = $this->previewManager->getPreview($file, $x, $y, true);
121 121
 
122
-			return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]);
123
-		} catch (NotFoundException $e) {
124
-			return new DataResponse(['message' => 'File not found.'], Http::STATUS_NOT_FOUND);
125
-		} catch (\Exception $e) {
126
-			return new DataResponse([], Http::STATUS_BAD_REQUEST);
127
-		}
128
-	}
122
+            return new FileDisplayResponse($preview, Http::STATUS_OK, ['Content-Type' => $preview->getMimeType()]);
123
+        } catch (NotFoundException $e) {
124
+            return new DataResponse(['message' => 'File not found.'], Http::STATUS_NOT_FOUND);
125
+        } catch (\Exception $e) {
126
+            return new DataResponse([], Http::STATUS_BAD_REQUEST);
127
+        }
128
+    }
129 129
 
130
-	/**
131
-	 * Updates the info of the specified file path
132
-	 * The passed tags are absolute, which means they will
133
-	 * replace the actual tag selection.
134
-	 *
135
-	 * @NoAdminRequired
136
-	 *
137
-	 * @param string $path path
138
-	 * @param array|string $tags array of tags
139
-	 * @return DataResponse
140
-	 */
141
-	public function updateFileTags($path, $tags = null) {
142
-		$result = [];
143
-		// if tags specified or empty array, update tags
144
-		if (!is_null($tags)) {
145
-			try {
146
-				$this->tagService->updateFileTags($path, $tags);
147
-			} catch (\OCP\Files\NotFoundException $e) {
148
-				return new DataResponse([
149
-					'message' => $e->getMessage()
150
-				], Http::STATUS_NOT_FOUND);
151
-			} catch (\OCP\Files\StorageNotAvailableException $e) {
152
-				return new DataResponse([
153
-					'message' => $e->getMessage()
154
-				], Http::STATUS_SERVICE_UNAVAILABLE);
155
-			} catch (\Exception $e) {
156
-				return new DataResponse([
157
-					'message' => $e->getMessage()
158
-				], Http::STATUS_NOT_FOUND);
159
-			}
160
-			$result['tags'] = $tags;
161
-		}
162
-		return new DataResponse($result);
163
-	}
130
+    /**
131
+     * Updates the info of the specified file path
132
+     * The passed tags are absolute, which means they will
133
+     * replace the actual tag selection.
134
+     *
135
+     * @NoAdminRequired
136
+     *
137
+     * @param string $path path
138
+     * @param array|string $tags array of tags
139
+     * @return DataResponse
140
+     */
141
+    public function updateFileTags($path, $tags = null) {
142
+        $result = [];
143
+        // if tags specified or empty array, update tags
144
+        if (!is_null($tags)) {
145
+            try {
146
+                $this->tagService->updateFileTags($path, $tags);
147
+            } catch (\OCP\Files\NotFoundException $e) {
148
+                return new DataResponse([
149
+                    'message' => $e->getMessage()
150
+                ], Http::STATUS_NOT_FOUND);
151
+            } catch (\OCP\Files\StorageNotAvailableException $e) {
152
+                return new DataResponse([
153
+                    'message' => $e->getMessage()
154
+                ], Http::STATUS_SERVICE_UNAVAILABLE);
155
+            } catch (\Exception $e) {
156
+                return new DataResponse([
157
+                    'message' => $e->getMessage()
158
+                ], Http::STATUS_NOT_FOUND);
159
+            }
160
+            $result['tags'] = $tags;
161
+        }
162
+        return new DataResponse($result);
163
+    }
164 164
 
165
-	/**
166
-	 * @param \OCP\Files\Node[] $nodes
167
-	 * @return array
168
-	 */
169
-	private function formatNodes(array $nodes) {
170
-		return array_values(array_map(function (Node $node) {
171
-			/** @var \OC\Files\Node\Node $shareTypes */
172
-			$shareTypes = $this->getShareTypes($node);
173
-			$file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo());
174
-			$parts = explode('/', dirname($node->getPath()), 4);
175
-			if (isset($parts[3])) {
176
-				$file['path'] = '/' . $parts[3];
177
-			} else {
178
-				$file['path'] = '/';
179
-			}
180
-			if (!empty($shareTypes)) {
181
-				$file['shareTypes'] = $shareTypes;
182
-			}
183
-			return $file;
184
-		}, $nodes));
185
-	}
165
+    /**
166
+     * @param \OCP\Files\Node[] $nodes
167
+     * @return array
168
+     */
169
+    private function formatNodes(array $nodes) {
170
+        return array_values(array_map(function (Node $node) {
171
+            /** @var \OC\Files\Node\Node $shareTypes */
172
+            $shareTypes = $this->getShareTypes($node);
173
+            $file = \OCA\Files\Helper::formatFileInfo($node->getFileInfo());
174
+            $parts = explode('/', dirname($node->getPath()), 4);
175
+            if (isset($parts[3])) {
176
+                $file['path'] = '/' . $parts[3];
177
+            } else {
178
+                $file['path'] = '/';
179
+            }
180
+            if (!empty($shareTypes)) {
181
+                $file['shareTypes'] = $shareTypes;
182
+            }
183
+            return $file;
184
+        }, $nodes));
185
+    }
186 186
 
187
-	/**
188
-	 * Returns a list of recently modifed files.
189
-	 *
190
-	 * @NoAdminRequired
191
-	 *
192
-	 * @return DataResponse
193
-	 */
194
-	public function getRecentFiles() {
195
-		$nodes = $this->userFolder->getRecent(100);
196
-		$files = $this->formatNodes($nodes);
197
-		return new DataResponse(['files' => $files]);
198
-	}
187
+    /**
188
+     * Returns a list of recently modifed files.
189
+     *
190
+     * @NoAdminRequired
191
+     *
192
+     * @return DataResponse
193
+     */
194
+    public function getRecentFiles() {
195
+        $nodes = $this->userFolder->getRecent(100);
196
+        $files = $this->formatNodes($nodes);
197
+        return new DataResponse(['files' => $files]);
198
+    }
199 199
 
200
-	/**
201
-	 * Return a list of share types for outgoing shares
202
-	 *
203
-	 * @param Node $node file node
204
-	 *
205
-	 * @return int[] array of share types
206
-	 */
207
-	private function getShareTypes(Node $node) {
208
-		$userId = $this->userSession->getUser()->getUID();
209
-		$shareTypes = [];
210
-		$requestedShareTypes = [
211
-			\OCP\Share::SHARE_TYPE_USER,
212
-			\OCP\Share::SHARE_TYPE_GROUP,
213
-			\OCP\Share::SHARE_TYPE_LINK,
214
-			\OCP\Share::SHARE_TYPE_REMOTE,
215
-			\OCP\Share::SHARE_TYPE_EMAIL
216
-		];
217
-		foreach ($requestedShareTypes as $requestedShareType) {
218
-			// one of each type is enough to find out about the types
219
-			$shares = $this->shareManager->getSharesBy(
220
-				$userId,
221
-				$requestedShareType,
222
-				$node,
223
-				false,
224
-				1
225
-			);
226
-			if (!empty($shares)) {
227
-				$shareTypes[] = $requestedShareType;
228
-			}
229
-		}
230
-		return $shareTypes;
231
-	}
200
+    /**
201
+     * Return a list of share types for outgoing shares
202
+     *
203
+     * @param Node $node file node
204
+     *
205
+     * @return int[] array of share types
206
+     */
207
+    private function getShareTypes(Node $node) {
208
+        $userId = $this->userSession->getUser()->getUID();
209
+        $shareTypes = [];
210
+        $requestedShareTypes = [
211
+            \OCP\Share::SHARE_TYPE_USER,
212
+            \OCP\Share::SHARE_TYPE_GROUP,
213
+            \OCP\Share::SHARE_TYPE_LINK,
214
+            \OCP\Share::SHARE_TYPE_REMOTE,
215
+            \OCP\Share::SHARE_TYPE_EMAIL
216
+        ];
217
+        foreach ($requestedShareTypes as $requestedShareType) {
218
+            // one of each type is enough to find out about the types
219
+            $shares = $this->shareManager->getSharesBy(
220
+                $userId,
221
+                $requestedShareType,
222
+                $node,
223
+                false,
224
+                1
225
+            );
226
+            if (!empty($shares)) {
227
+                $shareTypes[] = $requestedShareType;
228
+            }
229
+        }
230
+        return $shareTypes;
231
+    }
232 232
 
233
-	/**
234
-	 * Change the default sort mode
235
-	 *
236
-	 * @NoAdminRequired
237
-	 *
238
-	 * @param string $mode
239
-	 * @param string $direction
240
-	 * @return Response
241
-	 */
242
-	public function updateFileSorting($mode, $direction) {
243
-		$allowedMode = ['name', 'size', 'mtime'];
244
-		$allowedDirection = ['asc', 'desc'];
245
-		if (!in_array($mode, $allowedMode) || !in_array($direction, $allowedDirection)) {
246
-			$response = new Response();
247
-			$response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY);
248
-			return $response;
249
-		}
250
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting', $mode);
251
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting_direction', $direction);
252
-		return new Response();
253
-	}
233
+    /**
234
+     * Change the default sort mode
235
+     *
236
+     * @NoAdminRequired
237
+     *
238
+     * @param string $mode
239
+     * @param string $direction
240
+     * @return Response
241
+     */
242
+    public function updateFileSorting($mode, $direction) {
243
+        $allowedMode = ['name', 'size', 'mtime'];
244
+        $allowedDirection = ['asc', 'desc'];
245
+        if (!in_array($mode, $allowedMode) || !in_array($direction, $allowedDirection)) {
246
+            $response = new Response();
247
+            $response->setStatus(Http::STATUS_UNPROCESSABLE_ENTITY);
248
+            return $response;
249
+        }
250
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting', $mode);
251
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'file_sorting_direction', $direction);
252
+        return new Response();
253
+    }
254 254
 
255
-	/**
256
-	 * Toggle default for showing/hiding hidden files
257
-	 *
258
-	 * @NoAdminRequired
259
-	 *
260
-	 * @param bool $show
261
-	 */
262
-	public function showHiddenFiles($show) {
263
-		$this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', (int) $show);
264
-		return new Response();
265
-	}
255
+    /**
256
+     * Toggle default for showing/hiding hidden files
257
+     *
258
+     * @NoAdminRequired
259
+     *
260
+     * @param bool $show
261
+     */
262
+    public function showHiddenFiles($show) {
263
+        $this->config->setUserValue($this->userSession->getUser()->getUID(), 'files', 'show_hidden', (int) $show);
264
+        return new Response();
265
+    }
266 266
 
267 267
 }
Please login to merge, or discard this patch.