Passed
Push — master ( d23e96...1bc100 )
by Roeland
11:25 queued 10s
created
apps/systemtags/lib/Settings/Admin.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -28,29 +28,29 @@
 block discarded – undo
28 28
 
29 29
 class Admin implements ISettings {
30 30
 
31
-	/**
32
-	 * @return TemplateResponse
33
-	 */
34
-	public function getForm() {
35
-		return new TemplateResponse('systemtags', 'admin', [], '');
36
-	}
31
+    /**
32
+     * @return TemplateResponse
33
+     */
34
+    public function getForm() {
35
+        return new TemplateResponse('systemtags', 'admin', [], '');
36
+    }
37 37
 
38
-	/**
39
-	 * @return string the section ID, e.g. 'sharing'
40
-	 */
41
-	public function getSection() {
42
-		return 'workflow';
43
-	}
38
+    /**
39
+     * @return string the section ID, e.g. 'sharing'
40
+     */
41
+    public function getSection() {
42
+        return 'workflow';
43
+    }
44 44
 
45
-	/**
46
-	 * @return int whether the form should be rather on the top or bottom of
47
-	 * the admin section. The forms are arranged in ascending order of the
48
-	 * priority values. It is required to return a value between 0 and 100.
49
-	 *
50
-	 * E.g.: 70
51
-	 */
52
-	public function getPriority() {
53
-		return 70;
54
-	}
45
+    /**
46
+     * @return int whether the form should be rather on the top or bottom of
47
+     * the admin section. The forms are arranged in ascending order of the
48
+     * priority values. It is required to return a value between 0 and 100.
49
+     *
50
+     * E.g.: 70
51
+     */
52
+    public function getPriority() {
53
+        return 70;
54
+    }
55 55
 
56 56
 }
Please login to merge, or discard this patch.
apps/systemtags/appinfo/routes.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
  */
23 23
 
24 24
 return [
25
-	'routes' => [
26
-		['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'],
27
-	]
25
+    'routes' => [
26
+        ['name' => 'LastUsed#getLastUsedTagIds', 'url' => '/lastused', 'verb' => 'GET'],
27
+    ]
28 28
 ];
Please login to merge, or discard this patch.
apps/files_sharing/templates/list.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -15,14 +15,14 @@
 block discarded – undo
15 15
 		<tr>
16 16
 			<th id='headerName' class="hidden column-name">
17 17
 				<div id="headerName-container">
18
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
18
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
19 19
 				</div>
20 20
 			</th>
21 21
 			<th id="headerDate" class="hidden column-mtime">
22
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a>
22
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Share time')); ?></span><span class="sort-indicator"></span></a>
23 23
 			</th>
24 24
 			<th class="hidden column-expiration">
25
-				<a class="columntitle"><span><?php p($l->t( 'Expiration date' )); ?></span></a>
25
+				<a class="columntitle"><span><?php p($l->t('Expiration date')); ?></span></a>
26 26
 			</th>
27 27
 		</tr>
28 28
 	</thead>
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Providers/Base.php 2 patches
Indentation   +149 added lines, -149 removed lines patch added patch discarded remove patch
@@ -32,153 +32,153 @@
 block discarded – undo
32 32
 
33 33
 abstract class Base implements IProvider {
34 34
 
35
-	/** @var IFactory */
36
-	protected $languageFactory;
37
-
38
-	/** @var IL10N */
39
-	protected $l;
40
-
41
-	/** @var IURLGenerator */
42
-	protected $url;
43
-
44
-	/** @var IManager */
45
-	protected $activityManager;
46
-
47
-	/** @var IUserManager */
48
-	protected $userManager;
49
-
50
-	/** @var array */
51
-	protected $displayNames = [];
52
-
53
-	/**
54
-	 * @param IFactory $languageFactory
55
-	 * @param IURLGenerator $url
56
-	 * @param IManager $activityManager
57
-	 * @param IUserManager $userManager
58
-	 */
59
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
60
-		$this->languageFactory = $languageFactory;
61
-		$this->url = $url;
62
-		$this->activityManager = $activityManager;
63
-		$this->userManager = $userManager;
64
-	}
65
-
66
-	/**
67
-	 * @param string $language
68
-	 * @param IEvent $event
69
-	 * @param IEvent|null $previousEvent
70
-	 * @return IEvent
71
-	 * @throws \InvalidArgumentException
72
-	 * @since 11.0.0
73
-	 */
74
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
75
-		if ($event->getApp() !== 'files_sharing') {
76
-			throw new \InvalidArgumentException();
77
-		}
78
-
79
-		$this->l = $this->languageFactory->get('files_sharing', $language);
80
-
81
-		if ($this->activityManager->isFormattingFilteredObject()) {
82
-			try {
83
-				return $this->parseShortVersion($event);
84
-			} catch (\InvalidArgumentException $e) {
85
-				// Ignore and simply use the long version...
86
-			}
87
-		}
88
-
89
-		return $this->parseLongVersion($event);
90
-	}
91
-
92
-	/**
93
-	 * @param IEvent $event
94
-	 * @return IEvent
95
-	 * @throws \InvalidArgumentException
96
-	 * @since 11.0.0
97
-	 */
98
-	abstract protected function parseShortVersion(IEvent $event);
99
-
100
-	/**
101
-	 * @param IEvent $event
102
-	 * @return IEvent
103
-	 * @throws \InvalidArgumentException
104
-	 * @since 11.0.0
105
-	 */
106
-	abstract protected function parseLongVersion(IEvent $event);
107
-
108
-	/**
109
-	 * @param IEvent $event
110
-	 * @param string $subject
111
-	 * @param array $parameters
112
-	 * @throws \InvalidArgumentException
113
-	 */
114
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
115
-		$placeholders = $replacements = [];
116
-		foreach ($parameters as $placeholder => $parameter) {
117
-			$placeholders[] = '{' . $placeholder . '}';
118
-			if ($parameter['type'] === 'file') {
119
-				$replacements[] = $parameter['path'];
120
-			} else {
121
-				$replacements[] = $parameter['name'];
122
-			}
123
-		}
124
-
125
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
126
-			->setRichSubject($subject, $parameters);
127
-	}
128
-
129
-	/**
130
-	 * @param array|string $parameter
131
-	 * @param IEvent|null $event
132
-	 * @return array
133
-	 * @throws \InvalidArgumentException
134
-	 */
135
-	protected function getFile($parameter, IEvent $event = null) {
136
-		if (is_array($parameter)) {
137
-			$path = reset($parameter);
138
-			$id = (string) key($parameter);
139
-		} else if ($event !== null) {
140
-			// Legacy from before ownCloud 8.2
141
-			$path = $parameter;
142
-			$id = $event->getObjectId();
143
-		} else {
144
-			throw new \InvalidArgumentException('Could not generate file parameter');
145
-		}
146
-
147
-		return [
148
-			'type' => 'file',
149
-			'id' => $id,
150
-			'name' => basename($path),
151
-			'path' => trim($path, '/'),
152
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
153
-		];
154
-	}
155
-
156
-	/**
157
-	 * @param string $uid
158
-	 * @return array
159
-	 */
160
-	protected function getUser($uid) {
161
-		if (!isset($this->displayNames[$uid])) {
162
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
163
-		}
164
-
165
-		return [
166
-			'type' => 'user',
167
-			'id' => $uid,
168
-			'name' => $this->displayNames[$uid],
169
-		];
170
-	}
171
-
172
-	/**
173
-	 * @param string $uid
174
-	 * @return string
175
-	 */
176
-	protected function getDisplayName($uid) {
177
-		$user = $this->userManager->get($uid);
178
-		if ($user instanceof IUser) {
179
-			return $user->getDisplayName();
180
-		} else {
181
-			return $uid;
182
-		}
183
-	}
35
+    /** @var IFactory */
36
+    protected $languageFactory;
37
+
38
+    /** @var IL10N */
39
+    protected $l;
40
+
41
+    /** @var IURLGenerator */
42
+    protected $url;
43
+
44
+    /** @var IManager */
45
+    protected $activityManager;
46
+
47
+    /** @var IUserManager */
48
+    protected $userManager;
49
+
50
+    /** @var array */
51
+    protected $displayNames = [];
52
+
53
+    /**
54
+     * @param IFactory $languageFactory
55
+     * @param IURLGenerator $url
56
+     * @param IManager $activityManager
57
+     * @param IUserManager $userManager
58
+     */
59
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager) {
60
+        $this->languageFactory = $languageFactory;
61
+        $this->url = $url;
62
+        $this->activityManager = $activityManager;
63
+        $this->userManager = $userManager;
64
+    }
65
+
66
+    /**
67
+     * @param string $language
68
+     * @param IEvent $event
69
+     * @param IEvent|null $previousEvent
70
+     * @return IEvent
71
+     * @throws \InvalidArgumentException
72
+     * @since 11.0.0
73
+     */
74
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
75
+        if ($event->getApp() !== 'files_sharing') {
76
+            throw new \InvalidArgumentException();
77
+        }
78
+
79
+        $this->l = $this->languageFactory->get('files_sharing', $language);
80
+
81
+        if ($this->activityManager->isFormattingFilteredObject()) {
82
+            try {
83
+                return $this->parseShortVersion($event);
84
+            } catch (\InvalidArgumentException $e) {
85
+                // Ignore and simply use the long version...
86
+            }
87
+        }
88
+
89
+        return $this->parseLongVersion($event);
90
+    }
91
+
92
+    /**
93
+     * @param IEvent $event
94
+     * @return IEvent
95
+     * @throws \InvalidArgumentException
96
+     * @since 11.0.0
97
+     */
98
+    abstract protected function parseShortVersion(IEvent $event);
99
+
100
+    /**
101
+     * @param IEvent $event
102
+     * @return IEvent
103
+     * @throws \InvalidArgumentException
104
+     * @since 11.0.0
105
+     */
106
+    abstract protected function parseLongVersion(IEvent $event);
107
+
108
+    /**
109
+     * @param IEvent $event
110
+     * @param string $subject
111
+     * @param array $parameters
112
+     * @throws \InvalidArgumentException
113
+     */
114
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
115
+        $placeholders = $replacements = [];
116
+        foreach ($parameters as $placeholder => $parameter) {
117
+            $placeholders[] = '{' . $placeholder . '}';
118
+            if ($parameter['type'] === 'file') {
119
+                $replacements[] = $parameter['path'];
120
+            } else {
121
+                $replacements[] = $parameter['name'];
122
+            }
123
+        }
124
+
125
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
126
+            ->setRichSubject($subject, $parameters);
127
+    }
128
+
129
+    /**
130
+     * @param array|string $parameter
131
+     * @param IEvent|null $event
132
+     * @return array
133
+     * @throws \InvalidArgumentException
134
+     */
135
+    protected function getFile($parameter, IEvent $event = null) {
136
+        if (is_array($parameter)) {
137
+            $path = reset($parameter);
138
+            $id = (string) key($parameter);
139
+        } else if ($event !== null) {
140
+            // Legacy from before ownCloud 8.2
141
+            $path = $parameter;
142
+            $id = $event->getObjectId();
143
+        } else {
144
+            throw new \InvalidArgumentException('Could not generate file parameter');
145
+        }
146
+
147
+        return [
148
+            'type' => 'file',
149
+            'id' => $id,
150
+            'name' => basename($path),
151
+            'path' => trim($path, '/'),
152
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
153
+        ];
154
+    }
155
+
156
+    /**
157
+     * @param string $uid
158
+     * @return array
159
+     */
160
+    protected function getUser($uid) {
161
+        if (!isset($this->displayNames[$uid])) {
162
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
163
+        }
164
+
165
+        return [
166
+            'type' => 'user',
167
+            'id' => $uid,
168
+            'name' => $this->displayNames[$uid],
169
+        ];
170
+    }
171
+
172
+    /**
173
+     * @param string $uid
174
+     * @return string
175
+     */
176
+    protected function getDisplayName($uid) {
177
+        $user = $this->userManager->get($uid);
178
+        if ($user instanceof IUser) {
179
+            return $user->getDisplayName();
180
+        } else {
181
+            return $uid;
182
+        }
183
+    }
184 184
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@
 block discarded – undo
197 197
 	protected function setSubjects(IEvent $event, $subject, array $parameters) {
198 198
 		$placeholders = $replacements = [];
199 199
 		foreach ($parameters as $placeholder => $parameter) {
200
-			$placeholders[] = '{' . $placeholder . '}';
200
+			$placeholders[] = '{'.$placeholder.'}';
201 201
 			if ($parameter['type'] === 'file') {
202 202
 				$replacements[] = $parameter['path'];
203 203
 			} else {
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Providers/RemoteShares.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@
 block discarded – undo
140 140
 		return [
141 141
 			'type' => 'user',
142 142
 			'id' => $remoteUser->getUser(),
143
-			'name' => $cloudId,// Todo display name from contacts
143
+			'name' => $cloudId, // Todo display name from contacts
144 144
 			'server' => $remoteUser->getRemote(),
145 145
 		];
146 146
 	}
Please login to merge, or discard this patch.
Indentation   +124 added lines, -124 removed lines patch added patch discarded remove patch
@@ -32,128 +32,128 @@
 block discarded – undo
32 32
 
33 33
 class RemoteShares extends Base {
34 34
 
35
-	protected $cloudIdManager;
36
-
37
-	const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted';
38
-	const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined';
39
-	const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received';
40
-	const SUBJECT_REMOTE_SHARE_UNSHARED = 'remote_share_unshared';
41
-
42
-	/**
43
-	 * @param IFactory $languageFactory
44
-	 * @param IURLGenerator $url
45
-	 * @param IManager $activityManager
46
-	 * @param IUserManager $userManager
47
-	 * @param ICloudIdManager $cloudIdManager
48
-	 */
49
-	public function __construct(IFactory $languageFactory,
50
-								IURLGenerator $url,
51
-								IManager $activityManager,
52
-								IUserManager $userManager,
53
-								ICloudIdManager $cloudIdManager
54
-	) {
55
-		parent::__construct($languageFactory, $url, $activityManager, $userManager);
56
-		$this->cloudIdManager = $cloudIdManager;
57
-	}
58
-
59
-	/**
60
-	 * @param IEvent $event
61
-	 * @return IEvent
62
-	 * @throws \InvalidArgumentException
63
-	 * @since 11.0.0
64
-	 */
65
-	public function parseShortVersion(IEvent $event) {
66
-		$parsedParameters = $this->getParsedParameters($event);
67
-
68
-		if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
69
-			$subject = $this->l->t('{user} accepted the remote share');
70
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
71
-			$subject = $this->l->t('{user} declined the remote share');
72
-		} else {
73
-			throw new \InvalidArgumentException();
74
-		}
75
-
76
-		if ($this->activityManager->getRequirePNG()) {
77
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
78
-		} else {
79
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
80
-		}
81
-		$this->setSubjects($event, $subject, $parsedParameters);
82
-
83
-		return $event;
84
-	}
85
-
86
-	/**
87
-	 * @param IEvent $event
88
-	 * @return IEvent
89
-	 * @throws \InvalidArgumentException
90
-	 * @since 11.0.0
91
-	 */
92
-	public function parseLongVersion(IEvent $event) {
93
-		$parsedParameters = $this->getParsedParameters($event);
94
-
95
-		if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_RECEIVED) {
96
-			$subject = $this->l->t('You received a new remote share {file} from {user}');
97
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
98
-			$subject = $this->l->t('{user} accepted the remote share of {file}');
99
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
100
-			$subject = $this->l->t('{user} declined the remote share of {file}');
101
-		} else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_UNSHARED) {
102
-			$subject = $this->l->t('{user} unshared {file} from you');
103
-		} else {
104
-			throw new \InvalidArgumentException();
105
-		}
106
-
107
-		if ($this->activityManager->getRequirePNG()) {
108
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
109
-		} else {
110
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
111
-		}
112
-		$this->setSubjects($event, $subject, $parsedParameters);
113
-
114
-		return $event;
115
-	}
116
-
117
-	protected function getParsedParameters(IEvent $event) {
118
-		$subject = $event->getSubject();
119
-		$parameters = $event->getSubjectParameters();
120
-
121
-		switch ($subject) {
122
-			case self::SUBJECT_REMOTE_SHARE_RECEIVED:
123
-			case self::SUBJECT_REMOTE_SHARE_UNSHARED:
124
-				return [
125
-					'file' => [
126
-						'type' => 'pending-federated-share',
127
-						'id' => $parameters[1],
128
-						'name' => $parameters[1],
129
-					],
130
-					'user' => $this->getFederatedUser($parameters[0]),
131
-				];
132
-			case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
133
-			case self::SUBJECT_REMOTE_SHARE_DECLINED:
134
-				$fileParameter = $parameters[1];
135
-				if (!is_array($fileParameter)) {
136
-					$fileParameter = [$event->getObjectId() => $event->getObjectName()];
137
-				}
138
-				return [
139
-					'file' => $this->getFile($fileParameter),
140
-					'user' => $this->getFederatedUser($parameters[0]),
141
-				];
142
-		}
143
-		throw new \InvalidArgumentException();
144
-	}
145
-
146
-	/**
147
-	 * @param string $cloudId
148
-	 * @return array
149
-	 */
150
-	protected function getFederatedUser($cloudId) {
151
-		$remoteUser = $this->cloudIdManager->resolveCloudId($cloudId);
152
-		return [
153
-			'type' => 'user',
154
-			'id' => $remoteUser->getUser(),
155
-			'name' => $cloudId,// Todo display name from contacts
156
-			'server' => $remoteUser->getRemote(),
157
-		];
158
-	}
35
+    protected $cloudIdManager;
36
+
37
+    const SUBJECT_REMOTE_SHARE_ACCEPTED = 'remote_share_accepted';
38
+    const SUBJECT_REMOTE_SHARE_DECLINED = 'remote_share_declined';
39
+    const SUBJECT_REMOTE_SHARE_RECEIVED = 'remote_share_received';
40
+    const SUBJECT_REMOTE_SHARE_UNSHARED = 'remote_share_unshared';
41
+
42
+    /**
43
+     * @param IFactory $languageFactory
44
+     * @param IURLGenerator $url
45
+     * @param IManager $activityManager
46
+     * @param IUserManager $userManager
47
+     * @param ICloudIdManager $cloudIdManager
48
+     */
49
+    public function __construct(IFactory $languageFactory,
50
+                                IURLGenerator $url,
51
+                                IManager $activityManager,
52
+                                IUserManager $userManager,
53
+                                ICloudIdManager $cloudIdManager
54
+    ) {
55
+        parent::__construct($languageFactory, $url, $activityManager, $userManager);
56
+        $this->cloudIdManager = $cloudIdManager;
57
+    }
58
+
59
+    /**
60
+     * @param IEvent $event
61
+     * @return IEvent
62
+     * @throws \InvalidArgumentException
63
+     * @since 11.0.0
64
+     */
65
+    public function parseShortVersion(IEvent $event) {
66
+        $parsedParameters = $this->getParsedParameters($event);
67
+
68
+        if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
69
+            $subject = $this->l->t('{user} accepted the remote share');
70
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
71
+            $subject = $this->l->t('{user} declined the remote share');
72
+        } else {
73
+            throw new \InvalidArgumentException();
74
+        }
75
+
76
+        if ($this->activityManager->getRequirePNG()) {
77
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
78
+        } else {
79
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
80
+        }
81
+        $this->setSubjects($event, $subject, $parsedParameters);
82
+
83
+        return $event;
84
+    }
85
+
86
+    /**
87
+     * @param IEvent $event
88
+     * @return IEvent
89
+     * @throws \InvalidArgumentException
90
+     * @since 11.0.0
91
+     */
92
+    public function parseLongVersion(IEvent $event) {
93
+        $parsedParameters = $this->getParsedParameters($event);
94
+
95
+        if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_RECEIVED) {
96
+            $subject = $this->l->t('You received a new remote share {file} from {user}');
97
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_ACCEPTED) {
98
+            $subject = $this->l->t('{user} accepted the remote share of {file}');
99
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_DECLINED) {
100
+            $subject = $this->l->t('{user} declined the remote share of {file}');
101
+        } else if ($event->getSubject() === self::SUBJECT_REMOTE_SHARE_UNSHARED) {
102
+            $subject = $this->l->t('{user} unshared {file} from you');
103
+        } else {
104
+            throw new \InvalidArgumentException();
105
+        }
106
+
107
+        if ($this->activityManager->getRequirePNG()) {
108
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.png')));
109
+        } else {
110
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
111
+        }
112
+        $this->setSubjects($event, $subject, $parsedParameters);
113
+
114
+        return $event;
115
+    }
116
+
117
+    protected function getParsedParameters(IEvent $event) {
118
+        $subject = $event->getSubject();
119
+        $parameters = $event->getSubjectParameters();
120
+
121
+        switch ($subject) {
122
+            case self::SUBJECT_REMOTE_SHARE_RECEIVED:
123
+            case self::SUBJECT_REMOTE_SHARE_UNSHARED:
124
+                return [
125
+                    'file' => [
126
+                        'type' => 'pending-federated-share',
127
+                        'id' => $parameters[1],
128
+                        'name' => $parameters[1],
129
+                    ],
130
+                    'user' => $this->getFederatedUser($parameters[0]),
131
+                ];
132
+            case self::SUBJECT_REMOTE_SHARE_ACCEPTED:
133
+            case self::SUBJECT_REMOTE_SHARE_DECLINED:
134
+                $fileParameter = $parameters[1];
135
+                if (!is_array($fileParameter)) {
136
+                    $fileParameter = [$event->getObjectId() => $event->getObjectName()];
137
+                }
138
+                return [
139
+                    'file' => $this->getFile($fileParameter),
140
+                    'user' => $this->getFederatedUser($parameters[0]),
141
+                ];
142
+        }
143
+        throw new \InvalidArgumentException();
144
+    }
145
+
146
+    /**
147
+     * @param string $cloudId
148
+     * @return array
149
+     */
150
+    protected function getFederatedUser($cloudId) {
151
+        $remoteUser = $this->cloudIdManager->resolveCloudId($cloudId);
152
+        return [
153
+            'type' => 'user',
154
+            'id' => $remoteUser->getUser(),
155
+            'name' => $cloudId,// Todo display name from contacts
156
+            'server' => $remoteUser->getRemote(),
157
+        ];
158
+    }
159 159
 }
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Settings/PublicLinks.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 PublicLinks 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 'public_links';
46
-	}
40
+    /**
41
+     * @return string Lowercase a-z and underscore only identifier
42
+     * @since 11.0.0
43
+     */
44
+    public function getIdentifier() {
45
+        return 'public_links';
46
+    }
47 47
 
48
-	/**
49
-	 * @return string A translated string
50
-	 * @since 11.0.0
51
-	 */
52
-	public function getName() {
53
-		return $this->l->t('A file or folder shared by mail or by public link was <strong>downloaded</strong>');
54
-	}
48
+    /**
49
+     * @return string A translated string
50
+     * @since 11.0.0
51
+     */
52
+    public function getName() {
53
+        return $this->l->t('A file or folder shared by mail or by public link was <strong>downloaded</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 20;
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 20;
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_sharing/lib/Activity/Filter.php 1 patch
Indentation   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -27,69 +27,69 @@
 block discarded – undo
27 27
 use OCP\IURLGenerator;
28 28
 
29 29
 class Filter implements IFilter {
30
-	const TYPE_REMOTE_SHARE = 'remote_share';
31
-	const TYPE_SHARED = 'shared';
30
+    const TYPE_REMOTE_SHARE = 'remote_share';
31
+    const TYPE_SHARED = 'shared';
32 32
 
33
-	/** @var IL10N */
34
-	protected $l;
33
+    /** @var IL10N */
34
+    protected $l;
35 35
 
36
-	/** @var IURLGenerator */
37
-	protected $url;
36
+    /** @var IURLGenerator */
37
+    protected $url;
38 38
 
39
-	public function __construct(IL10N $l, IURLGenerator $url) {
40
-		$this->l = $l;
41
-		$this->url = $url;
42
-	}
39
+    public function __construct(IL10N $l, IURLGenerator $url) {
40
+        $this->l = $l;
41
+        $this->url = $url;
42
+    }
43 43
 
44
-	/**
45
-	 * @return string Lowercase a-z only identifier
46
-	 * @since 11.0.0
47
-	 */
48
-	public function getIdentifier() {
49
-		return 'files_sharing';
50
-	}
44
+    /**
45
+     * @return string Lowercase a-z only identifier
46
+     * @since 11.0.0
47
+     */
48
+    public function getIdentifier() {
49
+        return 'files_sharing';
50
+    }
51 51
 
52
-	/**
53
-	 * @return string A translated string
54
-	 * @since 11.0.0
55
-	 */
56
-	public function getName() {
57
-		return $this->l->t('File shares');
58
-	}
52
+    /**
53
+     * @return string A translated string
54
+     * @since 11.0.0
55
+     */
56
+    public function getName() {
57
+        return $this->l->t('File shares');
58
+    }
59 59
 
60
-	/**
61
-	 * @return int
62
-	 * @since 11.0.0
63
-	 */
64
-	public function getPriority() {
65
-		return 31;
66
-	}
60
+    /**
61
+     * @return int
62
+     * @since 11.0.0
63
+     */
64
+    public function getPriority() {
65
+        return 31;
66
+    }
67 67
 
68
-	/**
69
-	 * @return string Full URL to an icon, empty string when none is given
70
-	 * @since 11.0.0
71
-	 */
72
-	public function getIcon() {
73
-		return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg'));
74
-	}
68
+    /**
69
+     * @return string Full URL to an icon, empty string when none is given
70
+     * @since 11.0.0
71
+     */
72
+    public function getIcon() {
73
+        return $this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg'));
74
+    }
75 75
 
76
-	/**
77
-	 * @param string[] $types
78
-	 * @return string[] An array of allowed apps from which activities should be displayed
79
-	 * @since 11.0.0
80
-	 */
81
-	public function filterTypes(array $types) {
82
-		return array_intersect([
83
-			self::TYPE_SHARED,
84
-			self::TYPE_REMOTE_SHARE
85
-		], $types);
86
-	}
76
+    /**
77
+     * @param string[] $types
78
+     * @return string[] An array of allowed apps from which activities should be displayed
79
+     * @since 11.0.0
80
+     */
81
+    public function filterTypes(array $types) {
82
+        return array_intersect([
83
+            self::TYPE_SHARED,
84
+            self::TYPE_REMOTE_SHARE
85
+        ], $types);
86
+    }
87 87
 
88
-	/**
89
-	 * @return string[] An array of allowed apps from which activities should be displayed
90
-	 * @since 11.0.0
91
-	 */
92
-	public function allowedApps() {
93
-		return ['files_sharing'];
94
-	}
88
+    /**
89
+     * @return string[] An array of allowed apps from which activities should be displayed
90
+     * @since 11.0.0
91
+     */
92
+    public function allowedApps() {
93
+        return ['files_sharing'];
94
+    }
95 95
 }
Please login to merge, or discard this patch.
apps/files_sharing/lib/Controller/ExternalSharesController.php 2 patches
Indentation   +100 added lines, -100 removed lines patch added patch discarded remove patch
@@ -39,112 +39,112 @@
 block discarded – undo
39 39
  */
40 40
 class ExternalSharesController extends Controller {
41 41
 
42
-	/** @var \OCA\Files_Sharing\External\Manager */
43
-	private $externalManager;
44
-	/** @var IClientService */
45
-	private $clientService;
42
+    /** @var \OCA\Files_Sharing\External\Manager */
43
+    private $externalManager;
44
+    /** @var IClientService */
45
+    private $clientService;
46 46
 
47
-	/**
48
-	 * @param string $appName
49
-	 * @param IRequest $request
50
-	 * @param \OCA\Files_Sharing\External\Manager $externalManager
51
-	 * @param IClientService $clientService
52
-	 */
53
-	public function __construct($appName,
54
-								IRequest $request,
55
-								\OCA\Files_Sharing\External\Manager $externalManager,
56
-								IClientService $clientService) {
57
-		parent::__construct($appName, $request);
58
-		$this->externalManager = $externalManager;
59
-		$this->clientService = $clientService;
60
-	}
47
+    /**
48
+     * @param string $appName
49
+     * @param IRequest $request
50
+     * @param \OCA\Files_Sharing\External\Manager $externalManager
51
+     * @param IClientService $clientService
52
+     */
53
+    public function __construct($appName,
54
+                                IRequest $request,
55
+                                \OCA\Files_Sharing\External\Manager $externalManager,
56
+                                IClientService $clientService) {
57
+        parent::__construct($appName, $request);
58
+        $this->externalManager = $externalManager;
59
+        $this->clientService = $clientService;
60
+    }
61 61
 
62
-	/**
63
-	 * @NoAdminRequired
64
-	 * @NoOutgoingFederatedSharingRequired
65
-	 *
66
-	 * @return JSONResponse
67
-	 */
68
-	public function index() {
69
-		return new JSONResponse($this->externalManager->getOpenShares());
70
-	}
62
+    /**
63
+     * @NoAdminRequired
64
+     * @NoOutgoingFederatedSharingRequired
65
+     *
66
+     * @return JSONResponse
67
+     */
68
+    public function index() {
69
+        return new JSONResponse($this->externalManager->getOpenShares());
70
+    }
71 71
 
72
-	/**
73
-	 * @NoAdminRequired
74
-	 * @NoOutgoingFederatedSharingRequired
75
-	 *
76
-	 * @param int $id
77
-	 * @return JSONResponse
78
-	 */
79
-	public function create($id) {
80
-		$this->externalManager->acceptShare($id);
81
-		return new JSONResponse();
82
-	}
72
+    /**
73
+     * @NoAdminRequired
74
+     * @NoOutgoingFederatedSharingRequired
75
+     *
76
+     * @param int $id
77
+     * @return JSONResponse
78
+     */
79
+    public function create($id) {
80
+        $this->externalManager->acceptShare($id);
81
+        return new JSONResponse();
82
+    }
83 83
 
84
-	/**
85
-	 * @NoAdminRequired
86
-	 * @NoOutgoingFederatedSharingRequired
87
-	 *
88
-	 * @param integer $id
89
-	 * @return JSONResponse
90
-	 */
91
-	public function destroy($id) {
92
-		$this->externalManager->declineShare($id);
93
-		return new JSONResponse();
94
-	}
84
+    /**
85
+     * @NoAdminRequired
86
+     * @NoOutgoingFederatedSharingRequired
87
+     *
88
+     * @param integer $id
89
+     * @return JSONResponse
90
+     */
91
+    public function destroy($id) {
92
+        $this->externalManager->declineShare($id);
93
+        return new JSONResponse();
94
+    }
95 95
 
96
-	/**
97
-	 * Test whether the specified remote is accessible
98
-	 *
99
-	 * @param string $remote
100
-	 * @param bool $checkVersion
101
-	 * @return bool
102
-	 */
103
-	protected function testUrl($remote, $checkVersion = false) {
104
-		try {
105
-			$client = $this->clientService->newClient();
106
-			$response = json_decode($client->get(
107
-				$remote,
108
-				[
109
-					'timeout' => 3,
110
-					'connect_timeout' => 3,
111
-				]
112
-			)->getBody());
96
+    /**
97
+     * Test whether the specified remote is accessible
98
+     *
99
+     * @param string $remote
100
+     * @param bool $checkVersion
101
+     * @return bool
102
+     */
103
+    protected function testUrl($remote, $checkVersion = false) {
104
+        try {
105
+            $client = $this->clientService->newClient();
106
+            $response = json_decode($client->get(
107
+                $remote,
108
+                [
109
+                    'timeout' => 3,
110
+                    'connect_timeout' => 3,
111
+                ]
112
+            )->getBody());
113 113
 
114
-			if ($checkVersion) {
115
-				return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
116
-			} else {
117
-				return is_object($response);
118
-			}
119
-		} catch (\Exception $e) {
120
-			return false;
121
-		}
122
-	}
114
+            if ($checkVersion) {
115
+                return !empty($response->version) && version_compare($response->version, '7.0.0', '>=');
116
+            } else {
117
+                return is_object($response);
118
+            }
119
+        } catch (\Exception $e) {
120
+            return false;
121
+        }
122
+    }
123 123
 
124
-	/**
125
-	 * @PublicPage
126
-	 * @NoOutgoingFederatedSharingRequired
127
-	 * @NoIncomingFederatedSharingRequired
128
-	 *
129
-	 * @param string $remote
130
-	 * @return DataResponse
131
-	 */
132
-	public function testRemote($remote) {
133
-		if (
134
-			$this->testUrl('https://' . $remote . '/ocs-provider/') ||
135
-			$this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
136
-			$this->testUrl('https://' . $remote . '/status.php', true)
137
-		) {
138
-			return new DataResponse('https');
139
-		} elseif (
140
-			$this->testUrl('http://' . $remote . '/ocs-provider/') ||
141
-			$this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
142
-			$this->testUrl('http://' . $remote . '/status.php', true)
143
-		) {
144
-			return new DataResponse('http');
145
-		} else {
146
-			return new DataResponse(false);
147
-		}
148
-	}
124
+    /**
125
+     * @PublicPage
126
+     * @NoOutgoingFederatedSharingRequired
127
+     * @NoIncomingFederatedSharingRequired
128
+     *
129
+     * @param string $remote
130
+     * @return DataResponse
131
+     */
132
+    public function testRemote($remote) {
133
+        if (
134
+            $this->testUrl('https://' . $remote . '/ocs-provider/') ||
135
+            $this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
136
+            $this->testUrl('https://' . $remote . '/status.php', true)
137
+        ) {
138
+            return new DataResponse('https');
139
+        } elseif (
140
+            $this->testUrl('http://' . $remote . '/ocs-provider/') ||
141
+            $this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
142
+            $this->testUrl('http://' . $remote . '/status.php', true)
143
+        ) {
144
+            return new DataResponse('http');
145
+        } else {
146
+            return new DataResponse(false);
147
+        }
148
+    }
149 149
 
150 150
 }
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -131,15 +131,15 @@
 block discarded – undo
131 131
 	 */
132 132
 	public function testRemote($remote) {
133 133
 		if (
134
-			$this->testUrl('https://' . $remote . '/ocs-provider/') ||
135
-			$this->testUrl('https://' . $remote . '/ocs-provider/index.php') ||
136
-			$this->testUrl('https://' . $remote . '/status.php', true)
134
+			$this->testUrl('https://'.$remote.'/ocs-provider/') ||
135
+			$this->testUrl('https://'.$remote.'/ocs-provider/index.php') ||
136
+			$this->testUrl('https://'.$remote.'/status.php', true)
137 137
 		) {
138 138
 			return new DataResponse('https');
139 139
 		} elseif (
140
-			$this->testUrl('http://' . $remote . '/ocs-provider/') ||
141
-			$this->testUrl('http://' . $remote . '/ocs-provider/index.php') ||
142
-			$this->testUrl('http://' . $remote . '/status.php', true)
140
+			$this->testUrl('http://'.$remote.'/ocs-provider/') ||
141
+			$this->testUrl('http://'.$remote.'/ocs-provider/index.php') ||
142
+			$this->testUrl('http://'.$remote.'/status.php', true)
143 143
 		) {
144 144
 			return new DataResponse('http');
145 145
 		} else {
Please login to merge, or discard this patch.
apps/files_sharing/lib/ISharedStorage.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -23,6 +23,6 @@
 block discarded – undo
23 23
 
24 24
 namespace OCA\Files_Sharing;
25 25
 
26
-interface ISharedStorage{
26
+interface ISharedStorage {
27 27
 
28 28
 }
Please login to merge, or discard this patch.