Completed
Pull Request — master (#5231)
by Morris
16:38
created
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/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/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.
apps/files/lib/AppInfo/Application.php 1 patch
Indentation   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -31,67 +31,67 @@
 block discarded – undo
31 31
 use OCA\Files\Controller\ViewController;
32 32
 
33 33
 class Application extends App {
34
-	public function __construct(array $urlParams=array()) {
35
-		parent::__construct('files', $urlParams);
36
-		$container = $this->getContainer();
37
-		$server = $container->getServer();
34
+    public function __construct(array $urlParams=array()) {
35
+        parent::__construct('files', $urlParams);
36
+        $container = $this->getContainer();
37
+        $server = $container->getServer();
38 38
 
39
-		/**
40
-		 * Controllers
41
-		 */
42
-		$container->registerService('APIController', function (IContainer $c) use ($server) {
43
-			return new ApiController(
44
-				$c->query('AppName'),
45
-				$c->query('Request'),
46
-				$server->getUserSession(),
47
-				$c->query('TagService'),
48
-				$server->getPreviewManager(),
49
-				$server->getShareManager(),
50
-				$server->getConfig(),
51
-				$server->getUserFolder()
52
-			);
53
-		});
39
+        /**
40
+         * Controllers
41
+         */
42
+        $container->registerService('APIController', function (IContainer $c) use ($server) {
43
+            return new ApiController(
44
+                $c->query('AppName'),
45
+                $c->query('Request'),
46
+                $server->getUserSession(),
47
+                $c->query('TagService'),
48
+                $server->getPreviewManager(),
49
+                $server->getShareManager(),
50
+                $server->getConfig(),
51
+                $server->getUserFolder()
52
+            );
53
+        });
54 54
 
55
-		$container->registerService('ViewController', function (IContainer $c) use ($server) {
56
-			return new ViewController(
57
-				$c->query('AppName'),
58
-				$c->query('Request'),
59
-				$server->getURLGenerator(),
60
-				$c->query('L10N'),
61
-				$server->getConfig(),
62
-				$server->getEventDispatcher(),
63
-				$server->getUserSession(),
64
-				$server->getAppManager(),
65
-				$server->getRootFolder()
66
-			);
67
-		});
55
+        $container->registerService('ViewController', function (IContainer $c) use ($server) {
56
+            return new ViewController(
57
+                $c->query('AppName'),
58
+                $c->query('Request'),
59
+                $server->getURLGenerator(),
60
+                $c->query('L10N'),
61
+                $server->getConfig(),
62
+                $server->getEventDispatcher(),
63
+                $server->getUserSession(),
64
+                $server->getAppManager(),
65
+                $server->getRootFolder()
66
+            );
67
+        });
68 68
 
69
-		/**
70
-		 * Core
71
-		 */
72
-		$container->registerService('L10N', function(IContainer $c) {
73
-			return $c->query('ServerContainer')->getL10N($c->query('AppName'));
74
-		});
69
+        /**
70
+         * Core
71
+         */
72
+        $container->registerService('L10N', function(IContainer $c) {
73
+            return $c->query('ServerContainer')->getL10N($c->query('AppName'));
74
+        });
75 75
 
76
-		/**
77
-		 * Services
78
-		 */
79
-		$container->registerService('Tagger', function(IContainer $c)  {
80
-			return $c->query('ServerContainer')->getTagManager()->load('files');
81
-		});
82
-		$container->registerService('TagService', function(IContainer $c)  {
83
-			$homeFolder = $c->query('ServerContainer')->getUserFolder();
84
-			return new TagService(
85
-				$c->query('ServerContainer')->getUserSession(),
86
-				$c->query('ServerContainer')->getActivityManager(),
87
-				$c->query('Tagger'),
88
-				$homeFolder
89
-			);
90
-		});
76
+        /**
77
+         * Services
78
+         */
79
+        $container->registerService('Tagger', function(IContainer $c)  {
80
+            return $c->query('ServerContainer')->getTagManager()->load('files');
81
+        });
82
+        $container->registerService('TagService', function(IContainer $c)  {
83
+            $homeFolder = $c->query('ServerContainer')->getUserFolder();
84
+            return new TagService(
85
+                $c->query('ServerContainer')->getUserSession(),
86
+                $c->query('ServerContainer')->getActivityManager(),
87
+                $c->query('Tagger'),
88
+                $homeFolder
89
+            );
90
+        });
91 91
 
92
-		/*
92
+        /*
93 93
 		 * Register capabilities
94 94
 		 */
95
-		$container->registerCapability('OCA\Files\Capabilities');
96
-	}
95
+        $container->registerCapability('OCA\Files\Capabilities');
96
+    }
97 97
 }
Please login to merge, or discard this patch.
apps/files/lib/Command/DeleteOrphanedFiles.php 1 patch
Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -35,51 +35,51 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
apps/files/lib/Capabilities.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -34,29 +34,29 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
apps/files/lib/BackgroundJob/CleanupFileLocks.php 1 patch
Indentation   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -30,29 +30,29 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.