Completed
Pull Request — master (#4106)
by Blizzz
11:34
created
apps/sharebymail/templates/altmail.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -22,9 +22,9 @@
 block discarded – undo
22 22
 /** @var OC_Theme $theme */
23 23
 /** @var array $_ */
24 24
 if ($_['onBehalfOf']) {
25
-	print_unescaped($l->t("Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n", [$_['owner'], $_['filename'], $_['initiator'], $_['link']]));
25
+    print_unescaped($l->t("Hey there,\n\n%s shared »%s« with you on behalf of %s.\n\n%s\n\n", [$_['owner'], $_['filename'], $_['initiator'], $_['link']]));
26 26
 } else {
27
-	print_unescaped($l->t("Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n", [$_['owner'], $_['filename'], $_['link']]));
27
+    print_unescaped($l->t("Hey there,\n\n%s shared »%s« with you.\n\n%s\n\n", [$_['owner'], $_['filename'], $_['link']]));
28 28
 }
29 29
 // TRANSLATORS term at the end of a mail
30 30
 p($l->t("Cheers!"));
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,5 +32,5 @@
 block discarded – undo
32 32
 ?>
33 33
 
34 34
 --
35
-<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
35
+<?php p($theme->getName().' - '.$theme->getSlogan()); ?>
36 36
 <?php print_unescaped("\n".$theme->getBaseUrl());
Please login to merge, or discard this patch.
apps/sharebymail/templates/mail.php 2 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -36,14 +36,14 @@
 block discarded – undo
36 36
 					<td width="20px">&nbsp;</td>
37 37
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
38 38
 						<?php
39
-						if ($_['onBehalfOf']) {
40
-							print_unescaped($l->t('Hey there,<br><br>%s shared <a href="%s">%s</a> with you on behalf of %s.<br><br>', [$_['owner'], $_['link'], $_['filename'], $_['initiator']]));
41
-						} else {
42
-							print_unescaped($l->t('Hey there,<br><br>%s shared <a href="%s">%s</a> with you.<br><br>', [$_['owner'], $_['link'], $_['filename']]));
43
-						}
44
-						// TRANSLATORS term at the end of a mail
45
-						p($l->t('Cheers!'));
46
-						?>
39
+                        if ($_['onBehalfOf']) {
40
+                            print_unescaped($l->t('Hey there,<br><br>%s shared <a href="%s">%s</a> with you on behalf of %s.<br><br>', [$_['owner'], $_['link'], $_['filename'], $_['initiator']]));
41
+                        } else {
42
+                            print_unescaped($l->t('Hey there,<br><br>%s shared <a href="%s">%s</a> with you.<br><br>', [$_['owner'], $_['link'], $_['filename']]));
43
+                        }
44
+                        // TRANSLATORS term at the end of a mail
45
+                        p($l->t('Cheers!'));
46
+                        ?>
47 47
 					</td>
48 48
 				</tr>
49 49
 				<tr><td colspan="2">&nbsp;</td></tr>
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 	<tr><td>
7 7
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
8 8
 				<tr>
9
-					<td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor());?>">
9
+					<td colspan="2" bgcolor="<?php p($theme->getMailHeaderColor()); ?>">
10 10
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
11 11
 					</td>
12 12
 				</tr>
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
28 28
 						<?php p($theme->getName()); ?> -
29 29
 						<?php p($theme->getSlogan()); ?>
30
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
30
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
31 31
 					</td>
32 32
 				</tr>
33 33
 				<tr>
Please login to merge, or discard this patch.
apps/sharebymail/lib/Activity.php 1 patch
Indentation   +232 added lines, -232 removed lines patch added patch discarded remove patch
@@ -33,236 +33,236 @@
 block discarded – undo
33 33
 
34 34
 class Activity implements IProvider {
35 35
 
36
-	/** @var IFactory */
37
-	protected $languageFactory;
38
-
39
-	/** @var IL10N */
40
-	protected $l;
41
-
42
-	/** @var IURLGenerator */
43
-	protected $url;
44
-
45
-	/** @var IManager */
46
-	protected $activityManager;
47
-
48
-	/** @var IUserManager */
49
-	protected $userManager;
50
-	/** @var IContactsManager */
51
-	protected $contactsManager;
52
-
53
-	/** @var array */
54
-	protected $displayNames = [];
55
-
56
-	/** @var array */
57
-	protected $contactNames = [];
58
-
59
-	const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self';
60
-	const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by';
61
-
62
-	/**
63
-	 * @param IFactory $languageFactory
64
-	 * @param IURLGenerator $url
65
-	 * @param IManager $activityManager
66
-	 * @param IUserManager $userManager
67
-	 * @param IContactsManager $contactsManager
68
-	 */
69
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IContactsManager $contactsManager) {
70
-		$this->languageFactory = $languageFactory;
71
-		$this->url = $url;
72
-		$this->activityManager = $activityManager;
73
-		$this->userManager = $userManager;
74
-		$this->contactsManager = $contactsManager;
75
-	}
76
-
77
-	/**
78
-	 * @param string $language
79
-	 * @param IEvent $event
80
-	 * @param IEvent|null $previousEvent
81
-	 * @return IEvent
82
-	 * @throws \InvalidArgumentException
83
-	 * @since 11.0.0
84
-	 */
85
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
86
-		if ($event->getApp() !== 'sharebymail') {
87
-			throw new \InvalidArgumentException();
88
-		}
89
-
90
-		$this->l = $this->languageFactory->get('sharebymail', $language);
91
-
92
-		if ($this->activityManager->isFormattingFilteredObject()) {
93
-			try {
94
-				return $this->parseShortVersion($event);
95
-			} catch (\InvalidArgumentException $e) {
96
-				// Ignore and simply use the long version...
97
-			}
98
-		}
99
-
100
-		return $this->parseLongVersion($event);
101
-	}
102
-
103
-	/**
104
-	 * @param IEvent $event
105
-	 * @return IEvent
106
-	 * @throws \InvalidArgumentException
107
-	 * @since 11.0.0
108
-	 */
109
-	public function parseShortVersion(IEvent $event) {
110
-		$parsedParameters = $this->getParsedParameters($event);
111
-
112
-		if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
113
-			$event->setParsedSubject($this->l->t('Shared with %1$s', [
114
-					$parsedParameters['email']['name'],
115
-				]))
116
-				->setRichSubject($this->l->t('Shared with {email}'), [
117
-					'email' => $parsedParameters['email'],
118
-				])
119
-				->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
120
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
121
-			$event->setParsedSubject($this->l->t('Shared with %1$s by %2$s', [
122
-					$parsedParameters['email']['name'],
123
-					$parsedParameters['actor']['name'],
124
-				]))
125
-				->setRichSubject($this->l->t('Shared with {email} by {actor}'), [
126
-					'email' => $parsedParameters['email'],
127
-					'actor' => $parsedParameters['actor'],
128
-				])
129
-				->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
130
-
131
-		} else {
132
-			throw new \InvalidArgumentException();
133
-		}
134
-
135
-		return $event;
136
-	}
137
-
138
-	/**
139
-	 * @param IEvent $event
140
-	 * @return IEvent
141
-	 * @throws \InvalidArgumentException
142
-	 * @since 11.0.0
143
-	 */
144
-	public function parseLongVersion(IEvent $event) {
145
-		$parsedParameters = $this->getParsedParameters($event);
146
-
147
-		if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
148
-			$event->setParsedSubject($this->l->t('You shared %1$s with %2$s by mail', [
149
-					$parsedParameters['file']['path'],
150
-					$parsedParameters['email']['name'],
151
-				]))
152
-				->setRichSubject($this->l->t('You shared {file} with {email} by mail'), $parsedParameters)
153
-				->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
154
-		} else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
155
-			$event->setParsedSubject($this->l->t('%3$s shared %1$s with %2$s by mail', [
156
-					$parsedParameters['file']['path'],
157
-					$parsedParameters['email']['name'],
158
-					$parsedParameters['actor']['name'],
159
-				]))
160
-				->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters)
161
-				->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
162
-		} else {
163
-			throw new \InvalidArgumentException();
164
-		}
165
-
166
-		return $event;
167
-	}
168
-
169
-	protected function getParsedParameters(IEvent $event) {
170
-		$subject = $event->getSubject();
171
-		$parameters = $event->getSubjectParameters();
172
-
173
-		switch ($subject) {
174
-			case self::SUBJECT_SHARED_EMAIL_SELF:
175
-				return [
176
-					'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
177
-					'email' => $this->generateEmailParameter($parameters[1]),
178
-				];
179
-			case self::SUBJECT_SHARED_EMAIL_BY:
180
-				return [
181
-					'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
182
-					'email' => $this->generateEmailParameter($parameters[1]),
183
-					'actor' => $this->generateUserParameter($parameters[2]),
184
-				];
185
-		}
186
-		throw new \InvalidArgumentException();
187
-	}
188
-
189
-	/**
190
-	 * @param int $id
191
-	 * @param string $path
192
-	 * @return array
193
-	 */
194
-	protected function generateFileParameter($id, $path) {
195
-		return [
196
-			'type' => 'file',
197
-			'id' => $id,
198
-			'name' => basename($path),
199
-			'path' => trim($path, '/'),
200
-			'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
201
-		];
202
-	}
203
-
204
-	/**
205
-	 * @param string $email
206
-	 * @return array
207
-	 */
208
-	protected function generateEmailParameter($email) {
209
-		if (!isset($this->contactNames[$email])) {
210
-			$this->contactNames[$email] = $this->getContactName($email);
211
-		}
212
-
213
-		return [
214
-			'type' => 'email',
215
-			'id' => $email,
216
-			'name' => $this->contactNames[$email],
217
-		];
218
-	}
219
-
220
-	/**
221
-	 * @param string $uid
222
-	 * @return array
223
-	 */
224
-	protected function generateUserParameter($uid) {
225
-		if (!isset($this->displayNames[$uid])) {
226
-			$this->displayNames[$uid] = $this->getDisplayName($uid);
227
-		}
228
-
229
-		return [
230
-			'type' => 'user',
231
-			'id' => $uid,
232
-			'name' => $this->displayNames[$uid],
233
-		];
234
-	}
235
-
236
-	/**
237
-	 * @param string $email
238
-	 * @return string
239
-	 */
240
-	protected function getContactName($email) {
241
-		$addressBookContacts = $this->contactsManager->search($email, ['EMAIL']);
242
-
243
-		foreach ($addressBookContacts as $contact) {
244
-			if (isset($contact['isLocalSystemBook'])) {
245
-				continue;
246
-			}
247
-
248
-			if (in_array($email, $contact['EMAIL'])) {
249
-				return $contact['FN'];
250
-			}
251
-		}
252
-
253
-		return $email;
254
-	}
255
-
256
-	/**
257
-	 * @param string $uid
258
-	 * @return string
259
-	 */
260
-	protected function getDisplayName($uid) {
261
-		$user = $this->userManager->get($uid);
262
-		if ($user instanceof IUser) {
263
-			return $user->getDisplayName();
264
-		} else {
265
-			return $uid;
266
-		}
267
-	}
36
+    /** @var IFactory */
37
+    protected $languageFactory;
38
+
39
+    /** @var IL10N */
40
+    protected $l;
41
+
42
+    /** @var IURLGenerator */
43
+    protected $url;
44
+
45
+    /** @var IManager */
46
+    protected $activityManager;
47
+
48
+    /** @var IUserManager */
49
+    protected $userManager;
50
+    /** @var IContactsManager */
51
+    protected $contactsManager;
52
+
53
+    /** @var array */
54
+    protected $displayNames = [];
55
+
56
+    /** @var array */
57
+    protected $contactNames = [];
58
+
59
+    const SUBJECT_SHARED_EMAIL_SELF = 'shared_with_email_self';
60
+    const SUBJECT_SHARED_EMAIL_BY = 'shared_with_email_by';
61
+
62
+    /**
63
+     * @param IFactory $languageFactory
64
+     * @param IURLGenerator $url
65
+     * @param IManager $activityManager
66
+     * @param IUserManager $userManager
67
+     * @param IContactsManager $contactsManager
68
+     */
69
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IContactsManager $contactsManager) {
70
+        $this->languageFactory = $languageFactory;
71
+        $this->url = $url;
72
+        $this->activityManager = $activityManager;
73
+        $this->userManager = $userManager;
74
+        $this->contactsManager = $contactsManager;
75
+    }
76
+
77
+    /**
78
+     * @param string $language
79
+     * @param IEvent $event
80
+     * @param IEvent|null $previousEvent
81
+     * @return IEvent
82
+     * @throws \InvalidArgumentException
83
+     * @since 11.0.0
84
+     */
85
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
86
+        if ($event->getApp() !== 'sharebymail') {
87
+            throw new \InvalidArgumentException();
88
+        }
89
+
90
+        $this->l = $this->languageFactory->get('sharebymail', $language);
91
+
92
+        if ($this->activityManager->isFormattingFilteredObject()) {
93
+            try {
94
+                return $this->parseShortVersion($event);
95
+            } catch (\InvalidArgumentException $e) {
96
+                // Ignore and simply use the long version...
97
+            }
98
+        }
99
+
100
+        return $this->parseLongVersion($event);
101
+    }
102
+
103
+    /**
104
+     * @param IEvent $event
105
+     * @return IEvent
106
+     * @throws \InvalidArgumentException
107
+     * @since 11.0.0
108
+     */
109
+    public function parseShortVersion(IEvent $event) {
110
+        $parsedParameters = $this->getParsedParameters($event);
111
+
112
+        if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
113
+            $event->setParsedSubject($this->l->t('Shared with %1$s', [
114
+                    $parsedParameters['email']['name'],
115
+                ]))
116
+                ->setRichSubject($this->l->t('Shared with {email}'), [
117
+                    'email' => $parsedParameters['email'],
118
+                ])
119
+                ->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
120
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
121
+            $event->setParsedSubject($this->l->t('Shared with %1$s by %2$s', [
122
+                    $parsedParameters['email']['name'],
123
+                    $parsedParameters['actor']['name'],
124
+                ]))
125
+                ->setRichSubject($this->l->t('Shared with {email} by {actor}'), [
126
+                    'email' => $parsedParameters['email'],
127
+                    'actor' => $parsedParameters['actor'],
128
+                ])
129
+                ->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
130
+
131
+        } else {
132
+            throw new \InvalidArgumentException();
133
+        }
134
+
135
+        return $event;
136
+    }
137
+
138
+    /**
139
+     * @param IEvent $event
140
+     * @return IEvent
141
+     * @throws \InvalidArgumentException
142
+     * @since 11.0.0
143
+     */
144
+    public function parseLongVersion(IEvent $event) {
145
+        $parsedParameters = $this->getParsedParameters($event);
146
+
147
+        if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_SELF) {
148
+            $event->setParsedSubject($this->l->t('You shared %1$s with %2$s by mail', [
149
+                    $parsedParameters['file']['path'],
150
+                    $parsedParameters['email']['name'],
151
+                ]))
152
+                ->setRichSubject($this->l->t('You shared {file} with {email} by mail'), $parsedParameters)
153
+                ->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
154
+        } else if ($event->getSubject() === self::SUBJECT_SHARED_EMAIL_BY) {
155
+            $event->setParsedSubject($this->l->t('%3$s shared %1$s with %2$s by mail', [
156
+                    $parsedParameters['file']['path'],
157
+                    $parsedParameters['email']['name'],
158
+                    $parsedParameters['actor']['name'],
159
+                ]))
160
+                ->setRichSubject($this->l->t('{actor} shared {file} with {email} by mail'), $parsedParameters)
161
+                ->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/share.svg')));
162
+        } else {
163
+            throw new \InvalidArgumentException();
164
+        }
165
+
166
+        return $event;
167
+    }
168
+
169
+    protected function getParsedParameters(IEvent $event) {
170
+        $subject = $event->getSubject();
171
+        $parameters = $event->getSubjectParameters();
172
+
173
+        switch ($subject) {
174
+            case self::SUBJECT_SHARED_EMAIL_SELF:
175
+                return [
176
+                    'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
177
+                    'email' => $this->generateEmailParameter($parameters[1]),
178
+                ];
179
+            case self::SUBJECT_SHARED_EMAIL_BY:
180
+                return [
181
+                    'file' => $this->generateFileParameter((int) $event->getObjectId(), $parameters[0]),
182
+                    'email' => $this->generateEmailParameter($parameters[1]),
183
+                    'actor' => $this->generateUserParameter($parameters[2]),
184
+                ];
185
+        }
186
+        throw new \InvalidArgumentException();
187
+    }
188
+
189
+    /**
190
+     * @param int $id
191
+     * @param string $path
192
+     * @return array
193
+     */
194
+    protected function generateFileParameter($id, $path) {
195
+        return [
196
+            'type' => 'file',
197
+            'id' => $id,
198
+            'name' => basename($path),
199
+            'path' => trim($path, '/'),
200
+            'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $id]),
201
+        ];
202
+    }
203
+
204
+    /**
205
+     * @param string $email
206
+     * @return array
207
+     */
208
+    protected function generateEmailParameter($email) {
209
+        if (!isset($this->contactNames[$email])) {
210
+            $this->contactNames[$email] = $this->getContactName($email);
211
+        }
212
+
213
+        return [
214
+            'type' => 'email',
215
+            'id' => $email,
216
+            'name' => $this->contactNames[$email],
217
+        ];
218
+    }
219
+
220
+    /**
221
+     * @param string $uid
222
+     * @return array
223
+     */
224
+    protected function generateUserParameter($uid) {
225
+        if (!isset($this->displayNames[$uid])) {
226
+            $this->displayNames[$uid] = $this->getDisplayName($uid);
227
+        }
228
+
229
+        return [
230
+            'type' => 'user',
231
+            'id' => $uid,
232
+            'name' => $this->displayNames[$uid],
233
+        ];
234
+    }
235
+
236
+    /**
237
+     * @param string $email
238
+     * @return string
239
+     */
240
+    protected function getContactName($email) {
241
+        $addressBookContacts = $this->contactsManager->search($email, ['EMAIL']);
242
+
243
+        foreach ($addressBookContacts as $contact) {
244
+            if (isset($contact['isLocalSystemBook'])) {
245
+                continue;
246
+            }
247
+
248
+            if (in_array($email, $contact['EMAIL'])) {
249
+                return $contact['FN'];
250
+            }
251
+        }
252
+
253
+        return $email;
254
+    }
255
+
256
+    /**
257
+     * @param string $uid
258
+     * @return string
259
+     */
260
+    protected function getDisplayName($uid) {
261
+        $user = $this->userManager->get($uid);
262
+        if ($user instanceof IUser) {
263
+            return $user->getDisplayName();
264
+        } else {
265
+            return $uid;
266
+        }
267
+    }
268 268
 }
Please login to merge, or discard this patch.
apps/sharebymail/lib/Settings.php 1 patch
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -25,14 +25,14 @@
 block discarded – undo
25 25
 
26 26
 class Settings {
27 27
 
28
-	/**
29
-	 * announce that the share-by-mail share provider is enabled
30
-	 *
31
-	 * @param array $settings
32
-	 */
33
-	public function announceShareProvider(array $settings) {
34
-		$array = json_decode($settings['array']['oc_appconfig'], true);
35
-		$array['shareByMailEnabled'] = true;
36
-		$settings['array']['oc_appconfig'] = json_encode($array);
37
-	}
28
+    /**
29
+     * announce that the share-by-mail share provider is enabled
30
+     *
31
+     * @param array $settings
32
+     */
33
+    public function announceShareProvider(array $settings) {
34
+        $array = json_decode($settings['array']['oc_appconfig'], true);
35
+        $array['shareByMailEnabled'] = true;
36
+        $settings['array']['oc_appconfig'] = json_encode($array);
37
+    }
38 38
 }
Please login to merge, or discard this patch.
apps/workflowengine/templates/admin.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@
 block discarded – undo
27 27
 
28 28
 	<?php if (!empty($_['docs'])): ?>
29 29
 		<a target="_blank" rel="noreferrer" class="icon-info svg"
30
-		   title="<?php p($l->t('Open documentation'));?>"
30
+		   title="<?php p($l->t('Open documentation')); ?>"
31 31
 		   href="<?php p(link_to_docs($_['docs'])); ?>">
32 32
 		</a>
33 33
 	<?php endif; ?>
Please login to merge, or discard this patch.
apps/workflowengine/lib/Controller/RequestTime.php 2 patches
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -26,27 +26,27 @@
 block discarded – undo
26 26
 
27 27
 class RequestTime extends Controller {
28 28
 
29
-	/**
30
-	 * @NoAdminRequired
31
-	 *
32
-	 * @param string $search
33
-	 * @return JSONResponse
34
-	 */
35
-	public function getTimezones($search = '') {
36
-		$timezones = \DateTimeZone::listIdentifiers();
29
+    /**
30
+     * @NoAdminRequired
31
+     *
32
+     * @param string $search
33
+     * @return JSONResponse
34
+     */
35
+    public function getTimezones($search = '') {
36
+        $timezones = \DateTimeZone::listIdentifiers();
37 37
 
38
-		if ($search !== '') {
39
-			$timezones = array_filter($timezones, function ($timezone) use ($search) {
40
-				return strpos(strtolower($timezone), strtolower($search)) !== false;
41
-			});
42
-		}
38
+        if ($search !== '') {
39
+            $timezones = array_filter($timezones, function ($timezone) use ($search) {
40
+                return strpos(strtolower($timezone), strtolower($search)) !== false;
41
+            });
42
+        }
43 43
 
44
-		$timezones = array_slice($timezones, 0, 10);
44
+        $timezones = array_slice($timezones, 0, 10);
45 45
 
46
-		$response = [];
47
-		foreach ($timezones as $timezone) {
48
-			$response[$timezone] = $timezone;
49
-		}
50
-		return new JSONResponse($response);
51
-	}
46
+        $response = [];
47
+        foreach ($timezones as $timezone) {
48
+            $response[$timezone] = $timezone;
49
+        }
50
+        return new JSONResponse($response);
51
+    }
52 52
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@
 block discarded – undo
36 36
 		$timezones = \DateTimeZone::listIdentifiers();
37 37
 
38 38
 		if ($search !== '') {
39
-			$timezones = array_filter($timezones, function ($timezone) use ($search) {
39
+			$timezones = array_filter($timezones, function($timezone) use ($search) {
40 40
 				return strpos(strtolower($timezone), strtolower($search)) !== false;
41 41
 			});
42 42
 		}
Please login to merge, or discard this patch.
apps/workflowengine/lib/Controller/FlowOperations.php 1 patch
Indentation   +85 added lines, -85 removed lines patch added patch discarded remove patch
@@ -29,100 +29,100 @@
 block discarded – undo
29 29
 
30 30
 class FlowOperations extends Controller {
31 31
 
32
-	/** @var Manager */
33
-	protected $manager;
32
+    /** @var Manager */
33
+    protected $manager;
34 34
 
35
-	/**
36
-	 * @param IRequest $request
37
-	 * @param Manager $manager
38
-	 */
39
-	public function __construct(IRequest $request, Manager $manager) {
40
-		parent::__construct('workflowengine', $request);
41
-		$this->manager = $manager;
42
-	}
35
+    /**
36
+     * @param IRequest $request
37
+     * @param Manager $manager
38
+     */
39
+    public function __construct(IRequest $request, Manager $manager) {
40
+        parent::__construct('workflowengine', $request);
41
+        $this->manager = $manager;
42
+    }
43 43
 
44
-	/**
45
-	 * @NoCSRFRequired
46
-	 *
47
-	 * @param string $class
48
-	 * @return JSONResponse
49
-	 */
50
-	public function getOperations($class) {
51
-		$operations = $this->manager->getOperations($class);
44
+    /**
45
+     * @NoCSRFRequired
46
+     *
47
+     * @param string $class
48
+     * @return JSONResponse
49
+     */
50
+    public function getOperations($class) {
51
+        $operations = $this->manager->getOperations($class);
52 52
 
53
-		foreach ($operations as &$operation) {
54
-			$operation = $this->prepareOperation($operation);
55
-		}
53
+        foreach ($operations as &$operation) {
54
+            $operation = $this->prepareOperation($operation);
55
+        }
56 56
 
57
-		return new JSONResponse($operations);
58
-	}
57
+        return new JSONResponse($operations);
58
+    }
59 59
 
60
-	/**
61
-	 * @PasswordConfirmationRequired
62
-	 *
63
-	 * @param string $class
64
-	 * @param string $name
65
-	 * @param array[] $checks
66
-	 * @param string $operation
67
-	 * @return JSONResponse The added element
68
-	 */
69
-	public function addOperation($class, $name, $checks, $operation) {
70
-		try {
71
-			$operation = $this->manager->addOperation($class, $name, $checks, $operation);
72
-			$operation = $this->prepareOperation($operation);
73
-			return new JSONResponse($operation);
74
-		} catch (\UnexpectedValueException $e) {
75
-			return new JSONResponse($e->getMessage(), Http::STATUS_BAD_REQUEST);
76
-		}
77
-	}
60
+    /**
61
+     * @PasswordConfirmationRequired
62
+     *
63
+     * @param string $class
64
+     * @param string $name
65
+     * @param array[] $checks
66
+     * @param string $operation
67
+     * @return JSONResponse The added element
68
+     */
69
+    public function addOperation($class, $name, $checks, $operation) {
70
+        try {
71
+            $operation = $this->manager->addOperation($class, $name, $checks, $operation);
72
+            $operation = $this->prepareOperation($operation);
73
+            return new JSONResponse($operation);
74
+        } catch (\UnexpectedValueException $e) {
75
+            return new JSONResponse($e->getMessage(), Http::STATUS_BAD_REQUEST);
76
+        }
77
+    }
78 78
 
79
-	/**
80
-	 * @PasswordConfirmationRequired
81
-	 *
82
-	 * @param int $id
83
-	 * @param string $name
84
-	 * @param array[] $checks
85
-	 * @param string $operation
86
-	 * @return JSONResponse The updated element
87
-	 */
88
-	public function updateOperation($id, $name, $checks, $operation) {
89
-		try {
90
-			$operation = $this->manager->updateOperation($id, $name, $checks, $operation);
91
-			$operation = $this->prepareOperation($operation);
92
-			return new JSONResponse($operation);
93
-		} catch (\UnexpectedValueException $e) {
94
-			return new JSONResponse($e->getMessage(), Http::STATUS_BAD_REQUEST);
95
-		}
96
-	}
79
+    /**
80
+     * @PasswordConfirmationRequired
81
+     *
82
+     * @param int $id
83
+     * @param string $name
84
+     * @param array[] $checks
85
+     * @param string $operation
86
+     * @return JSONResponse The updated element
87
+     */
88
+    public function updateOperation($id, $name, $checks, $operation) {
89
+        try {
90
+            $operation = $this->manager->updateOperation($id, $name, $checks, $operation);
91
+            $operation = $this->prepareOperation($operation);
92
+            return new JSONResponse($operation);
93
+        } catch (\UnexpectedValueException $e) {
94
+            return new JSONResponse($e->getMessage(), Http::STATUS_BAD_REQUEST);
95
+        }
96
+    }
97 97
 
98
-	/**
99
-	 * @PasswordConfirmationRequired
100
-	 *
101
-	 * @param int $id
102
-	 * @return JSONResponse
103
-	 */
104
-	public function deleteOperation($id) {
105
-		$deleted = $this->manager->deleteOperation((int) $id);
106
-		return new JSONResponse($deleted);
107
-	}
98
+    /**
99
+     * @PasswordConfirmationRequired
100
+     *
101
+     * @param int $id
102
+     * @return JSONResponse
103
+     */
104
+    public function deleteOperation($id) {
105
+        $deleted = $this->manager->deleteOperation((int) $id);
106
+        return new JSONResponse($deleted);
107
+    }
108 108
 
109
-	/**
110
-	 * @param array $operation
111
-	 * @return array
112
-	 */
113
-	protected function prepareOperation(array $operation) {
114
-		$checkIds = json_decode($operation['checks']);
115
-		$checks = $this->manager->getChecks($checkIds);
109
+    /**
110
+     * @param array $operation
111
+     * @return array
112
+     */
113
+    protected function prepareOperation(array $operation) {
114
+        $checkIds = json_decode($operation['checks']);
115
+        $checks = $this->manager->getChecks($checkIds);
116 116
 
117
-		$operation['checks'] = [];
118
-		foreach ($checks as $check) {
119
-			// Remove internal values
120
-			unset($check['id']);
121
-			unset($check['hash']);
117
+        $operation['checks'] = [];
118
+        foreach ($checks as $check) {
119
+            // Remove internal values
120
+            unset($check['id']);
121
+            unset($check['hash']);
122 122
 
123
-			$operation['checks'][] = $check;
124
-		}
123
+            $operation['checks'][] = $check;
124
+        }
125 125
 
126
-		return $operation;
127
-	}
126
+        return $operation;
127
+    }
128 128
 }
Please login to merge, or discard this patch.
apps/workflowengine/lib/Settings/Section.php 1 patch
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -28,45 +28,45 @@
 block discarded – undo
28 28
 use OCP\Settings\IIconSection;
29 29
 
30 30
 class Section implements IIconSection {
31
-	/** @var IL10N */
32
-	private $l;
33
-	/** @var IURLGenerator */
34
-	private $url;
31
+    /** @var IL10N */
32
+    private $l;
33
+    /** @var IURLGenerator */
34
+    private $url;
35 35
 
36
-	/**
37
-	 * @param IURLGenerator $url
38
-	 * @param IL10N $l
39
-	 */
40
-	public function __construct(IURLGenerator $url, IL10N $l) {
41
-		$this->url = $url;
42
-		$this->l = $l;
43
-	}
36
+    /**
37
+     * @param IURLGenerator $url
38
+     * @param IL10N $l
39
+     */
40
+    public function __construct(IURLGenerator $url, IL10N $l) {
41
+        $this->url = $url;
42
+        $this->l = $l;
43
+    }
44 44
 
45
-	/**
46
-	 * {@inheritdoc}
47
-	 */
48
-	public function getID() {
49
-		return 'workflow';
50
-	}
45
+    /**
46
+     * {@inheritdoc}
47
+     */
48
+    public function getID() {
49
+        return 'workflow';
50
+    }
51 51
 
52
-	/**
53
-	 * {@inheritdoc}
54
-	 */
55
-	public function getName() {
56
-		return $this->l->t('Workflow');
57
-	}
52
+    /**
53
+     * {@inheritdoc}
54
+     */
55
+    public function getName() {
56
+        return $this->l->t('Workflow');
57
+    }
58 58
 
59
-	/**
60
-	 * {@inheritdoc}
61
-	 */
62
-	public function getPriority() {
63
-		return 55;
64
-	}
59
+    /**
60
+     * {@inheritdoc}
61
+     */
62
+    public function getPriority() {
63
+        return 55;
64
+    }
65 65
 
66
-	/**
67
-	 * {@inheritdoc}
68
-	 */
69
-	public function getIcon() {
70
-		return $this->url->imagePath('core', 'actions/tag.svg');
71
-	}
66
+    /**
67
+     * {@inheritdoc}
68
+     */
69
+    public function getIcon() {
70
+        return $this->url->imagePath('core', 'actions/tag.svg');
71
+    }
72 72
 }
Please login to merge, or discard this patch.
apps/workflowengine/lib/Check/AbstractStringCheck.php 2 patches
Indentation   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -28,94 +28,94 @@
 block discarded – undo
28 28
 
29 29
 abstract class AbstractStringCheck implements ICheck {
30 30
 
31
-	/** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */
32
-	protected $matches;
31
+    /** @var array[] Nested array: [Pattern => [ActualValue => Regex Result]] */
32
+    protected $matches;
33 33
 
34
-	/** @var IL10N */
35
-	protected $l;
34
+    /** @var IL10N */
35
+    protected $l;
36 36
 
37
-	/**
38
-	 * @param IL10N $l
39
-	 */
40
-	public function __construct(IL10N $l) {
41
-		$this->l = $l;
42
-	}
37
+    /**
38
+     * @param IL10N $l
39
+     */
40
+    public function __construct(IL10N $l) {
41
+        $this->l = $l;
42
+    }
43 43
 
44
-	/**
45
-	 * @param IStorage $storage
46
-	 * @param string $path
47
-	 */
48
-	public function setFileInfo(IStorage $storage, $path) {
49
-		// Nothing changes here with a different path
50
-	}
44
+    /**
45
+     * @param IStorage $storage
46
+     * @param string $path
47
+     */
48
+    public function setFileInfo(IStorage $storage, $path) {
49
+        // Nothing changes here with a different path
50
+    }
51 51
 
52
-	/**
53
-	 * @return string
54
-	 */
55
-	abstract protected function getActualValue();
52
+    /**
53
+     * @return string
54
+     */
55
+    abstract protected function getActualValue();
56 56
 
57
-	/**
58
-	 * @param string $operator
59
-	 * @param string $value
60
-	 * @return bool
61
-	 */
62
-	public function executeCheck($operator, $value)  {
63
-		$actualValue = $this->getActualValue();
64
-		return $this->executeStringCheck($operator, $value, $actualValue);
65
-	}
57
+    /**
58
+     * @param string $operator
59
+     * @param string $value
60
+     * @return bool
61
+     */
62
+    public function executeCheck($operator, $value)  {
63
+        $actualValue = $this->getActualValue();
64
+        return $this->executeStringCheck($operator, $value, $actualValue);
65
+    }
66 66
 
67
-	/**
68
-	 * @param string $operator
69
-	 * @param string $checkValue
70
-	 * @param string $actualValue
71
-	 * @return bool
72
-	 */
73
-	protected function executeStringCheck($operator, $checkValue, $actualValue) {
74
-		if ($operator === 'is') {
75
-			return $checkValue === $actualValue;
76
-		} else if ($operator === '!is') {
77
-			return $checkValue !== $actualValue;
78
-		} else {
79
-			$match = $this->match($checkValue, $actualValue);
80
-			if ($operator === 'matches') {
81
-				return $match === 1;
82
-			} else {
83
-				return $match === 0;
84
-			}
85
-		}
86
-	}
67
+    /**
68
+     * @param string $operator
69
+     * @param string $checkValue
70
+     * @param string $actualValue
71
+     * @return bool
72
+     */
73
+    protected function executeStringCheck($operator, $checkValue, $actualValue) {
74
+        if ($operator === 'is') {
75
+            return $checkValue === $actualValue;
76
+        } else if ($operator === '!is') {
77
+            return $checkValue !== $actualValue;
78
+        } else {
79
+            $match = $this->match($checkValue, $actualValue);
80
+            if ($operator === 'matches') {
81
+                return $match === 1;
82
+            } else {
83
+                return $match === 0;
84
+            }
85
+        }
86
+    }
87 87
 
88
-	/**
89
-	 * @param string $operator
90
-	 * @param string $value
91
-	 * @throws \UnexpectedValueException
92
-	 */
93
-	public function validateCheck($operator, $value) {
94
-		if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) {
95
-			throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
96
-		}
88
+    /**
89
+     * @param string $operator
90
+     * @param string $value
91
+     * @throws \UnexpectedValueException
92
+     */
93
+    public function validateCheck($operator, $value) {
94
+        if (!in_array($operator, ['is', '!is', 'matches', '!matches'])) {
95
+            throw new \UnexpectedValueException($this->l->t('The given operator is invalid'), 1);
96
+        }
97 97
 
98
-		if (in_array($operator, ['matches', '!matches']) &&
99
-			  @preg_match($value, null) === false) {
100
-			throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2);
101
-		}
102
-	}
98
+        if (in_array($operator, ['matches', '!matches']) &&
99
+              @preg_match($value, null) === false) {
100
+            throw new \UnexpectedValueException($this->l->t('The given regular expression is invalid'), 2);
101
+        }
102
+    }
103 103
 
104
-	/**
105
-	 * @param string $pattern
106
-	 * @param string $subject
107
-	 * @return int|bool
108
-	 */
109
-	protected function match($pattern, $subject) {
110
-		$patternHash = md5($pattern);
111
-		$subjectHash = md5($subject);
112
-		if (isset($this->matches[$patternHash][$subjectHash])) {
113
-			return $this->matches[$patternHash][$subjectHash];
114
-		}
115
-		if (!isset($this->matches[$patternHash])) {
116
-			$this->matches[$patternHash] = [];
117
-		}
118
-		$this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject);
119
-		return $this->matches[$patternHash][$subjectHash];
120
-	}
104
+    /**
105
+     * @param string $pattern
106
+     * @param string $subject
107
+     * @return int|bool
108
+     */
109
+    protected function match($pattern, $subject) {
110
+        $patternHash = md5($pattern);
111
+        $subjectHash = md5($subject);
112
+        if (isset($this->matches[$patternHash][$subjectHash])) {
113
+            return $this->matches[$patternHash][$subjectHash];
114
+        }
115
+        if (!isset($this->matches[$patternHash])) {
116
+            $this->matches[$patternHash] = [];
117
+        }
118
+        $this->matches[$patternHash][$subjectHash] = preg_match($pattern, $subject);
119
+        return $this->matches[$patternHash][$subjectHash];
120
+    }
121 121
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -59,7 +59,7 @@
 block discarded – undo
59 59
 	 * @param string $value
60 60
 	 * @return bool
61 61
 	 */
62
-	public function executeCheck($operator, $value)  {
62
+	public function executeCheck($operator, $value) {
63 63
 		$actualValue = $this->getActualValue();
64 64
 		return $this->executeStringCheck($operator, $value, $actualValue);
65 65
 	}
Please login to merge, or discard this patch.