Completed
Pull Request — master (#10075)
by
unknown
27:10
created
settings/help.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -31,28 +31,28 @@
 block discarded – undo
31 31
 OC_Util::checkLoggedIn();
32 32
 
33 33
 // Load the files we need
34
-OC_Util::addStyle( "settings", "settings" );
34
+OC_Util::addStyle("settings", "settings");
35 35
 \OC::$server->getNavigationManager()->setActiveEntry('help');
36 36
 
37 37
 
38
-if(isset($_GET['mode']) and $_GET['mode'] === 'admin') {
39
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/admin/index.html' );
40
-	$style1='';
41
-	$style2=' active';
42
-}else{
43
-	$url=\OCP\Util::linkToAbsolute( 'core', 'doc/user/index.html' );
44
-	$style1=' active';
45
-	$style2='';
38
+if (isset($_GET['mode']) and $_GET['mode'] === 'admin') {
39
+	$url = \OCP\Util::linkToAbsolute('core', 'doc/admin/index.html');
40
+	$style1 = '';
41
+	$style2 = ' active';
42
+} else {
43
+	$url = \OCP\Util::linkToAbsolute('core', 'doc/user/index.html');
44
+	$style1 = ' active';
45
+	$style2 = '';
46 46
 }
47 47
 
48
-$url1=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';
49
-$url2=\OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin';
48
+$url1 = \OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=user';
49
+$url2 = \OC::$server->getURLGenerator()->linkToRoute('settings_help').'?mode=admin';
50 50
 
51
-$tmpl = new OC_Template( "settings", "help", "user" );
52
-$tmpl->assign( "admin", OC_User::isAdminUser(OC_User::getUser()));
53
-$tmpl->assign( "url", $url );
54
-$tmpl->assign( "url1", $url1 );
55
-$tmpl->assign( "url2", $url2 );
56
-$tmpl->assign( "style1", $style1 );
57
-$tmpl->assign( "style2", $style2 );
51
+$tmpl = new OC_Template("settings", "help", "user");
52
+$tmpl->assign("admin", OC_User::isAdminUser(OC_User::getUser()));
53
+$tmpl->assign("url", $url);
54
+$tmpl->assign("url1", $url1);
55
+$tmpl->assign("url2", $url2);
56
+$tmpl->assign("style1", $style1);
57
+$tmpl->assign("style2", $style2);
58 58
 $tmpl->printPage();
Please login to merge, or discard this patch.
lib/public/AppFramework/Db/DoesNotExistException.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 	 * @param string $msg the error message
38 38
 	 * @since 7.0.0
39 39
 	 */
40
-	public function __construct($msg){
40
+	public function __construct($msg) {
41 41
 		parent::__construct($msg);
42 42
 	}
43 43
 
Please login to merge, or discard this patch.
apps/files_sharing/lib/Activity/Providers/Base.php 1 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_external/lib/Command/Delete.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -68,7 +68,7 @@
 block discarded – undo
68 68
 		try {
69 69
 			$mount = $this->globalService->getStorage($mountId);
70 70
 		} catch (NotFoundException $e) {
71
-			$output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>');
71
+			$output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>');
72 72
 			return 404;
73 73
 		}
74 74
 
Please login to merge, or discard this patch.
apps/files_trashbin/lib/BackgroundJob/ExpireTrash.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -117,7 +117,7 @@
 block discarded – undo
117 117
 		\OC_Util::setupFS($user);
118 118
 
119 119
 		// Check if this user has a trashbin directory
120
-		$view = new \OC\Files\View('/' . $user);
120
+		$view = new \OC\Files\View('/'.$user);
121 121
 		if (!$view->is_dir('/files_trashbin/files')) {
122 122
 			return false;
123 123
 		}
Please login to merge, or discard this patch.
apps/files_external/templates/list.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 		<tr>
18 18
 			<th id='headerName' class="hidden column-name">
19 19
 				<div id="headerName-container">
20
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
20
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
21 21
 				</div>
22 22
 			</th>
23 23
 			<th id="headerBackend" class="hidden column-backend">
Please login to merge, or discard this patch.
lib/private/DB/MDB2SchemaReader.php 1 patch
Spacing   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 					$this->loadTable($schema, $child);
95 95
 					break;
96 96
 				default:
97
-					throw new \DomainException('Unknown element: ' . $child->getName());
97
+					throw new \DomainException('Unknown element: '.$child->getName());
98 98
 
99 99
 			}
100 100
 		}
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
 			 */
115 115
 			switch ($child->getName()) {
116 116
 				case 'name':
117
-					$name = (string)$child;
117
+					$name = (string) $child;
118 118
 					$name = str_replace('*dbprefix*', $this->DBTABLEPREFIX, $name);
119 119
 					$name = $this->platform->quoteIdentifier($name);
120 120
 					$table = $schema->createTable($name);
@@ -132,7 +132,7 @@  discard block
 block discarded – undo
132 132
 					$this->loadDeclaration($table, $child);
133 133
 					break;
134 134
 				default:
135
-					throw new \DomainException('Unknown element: ' . $child->getName());
135
+					throw new \DomainException('Unknown element: '.$child->getName());
136 136
 
137 137
 			}
138 138
 		}
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 					$this->loadIndex($table, $child);
157 157
 					break;
158 158
 				default:
159
-					throw new \DomainException('Unknown element: ' . $child->getName());
159
+					throw new \DomainException('Unknown element: '.$child->getName());
160 160
 
161 161
 			}
162 162
 		}
@@ -168,18 +168,18 @@  discard block
 block discarded – undo
168 168
 	 * @throws \DomainException
169 169
 	 */
170 170
 	private function loadField($table, $xml) {
171
-		$options = array( 'notnull' => false );
171
+		$options = array('notnull' => false);
172 172
 		foreach ($xml->children() as $child) {
173 173
 			/**
174 174
 			 * @var \SimpleXMLElement $child
175 175
 			 */
176 176
 			switch ($child->getName()) {
177 177
 				case 'name':
178
-					$name = (string)$child;
178
+					$name = (string) $child;
179 179
 					$name = $this->platform->quoteIdentifier($name);
180 180
 					break;
181 181
 				case 'type':
182
-					$type = (string)$child;
182
+					$type = (string) $child;
183 183
 					switch ($type) {
184 184
 						case 'text':
185 185
 							$type = 'string';
@@ -196,7 +196,7 @@  discard block
 block discarded – undo
196 196
 					}
197 197
 					break;
198 198
 				case 'length':
199
-					$length = (string)$child;
199
+					$length = (string) $child;
200 200
 					$options['length'] = $length;
201 201
 					break;
202 202
 				case 'unsigned':
@@ -212,11 +212,11 @@  discard block
 block discarded – undo
212 212
 					$options['autoincrement'] = $autoincrement;
213 213
 					break;
214 214
 				case 'default':
215
-					$default = (string)$child;
215
+					$default = (string) $child;
216 216
 					$options['default'] = $default;
217 217
 					break;
218 218
 				case 'comments':
219
-					$comment = (string)$child;
219
+					$comment = (string) $child;
220 220
 					$options['comment'] = $comment;
221 221
 					break;
222 222
 				case 'primary':
@@ -224,15 +224,15 @@  discard block
 block discarded – undo
224 224
 					$options['primary'] = $primary;
225 225
 					break;
226 226
 				case 'precision':
227
-					$precision = (string)$child;
227
+					$precision = (string) $child;
228 228
 					$options['precision'] = $precision;
229 229
 					break;
230 230
 				case 'scale':
231
-					$scale = (string)$child;
231
+					$scale = (string) $child;
232 232
 					$options['scale'] = $scale;
233 233
 					break;
234 234
 				default:
235
-					throw new \DomainException('Unknown element: ' . $child->getName());
235
+					throw new \DomainException('Unknown element: '.$child->getName());
236 236
 
237 237
 			}
238 238
 		}
@@ -254,7 +254,7 @@  discard block
 block discarded – undo
254 254
 				}
255 255
 			}
256 256
 			if ($type === 'integer' && isset($options['default'])) {
257
-				$options['default'] = (int)$options['default'];
257
+				$options['default'] = (int) $options['default'];
258 258
 			}
259 259
 			if ($type === 'integer' && isset($options['length'])) {
260 260
 				$length = $options['length'];
@@ -293,7 +293,7 @@  discard block
 block discarded – undo
293 293
 			 */
294 294
 			switch ($child->getName()) {
295 295
 				case 'name':
296
-					$name = (string)$child;
296
+					$name = (string) $child;
297 297
 					break;
298 298
 				case 'primary':
299 299
 					$primary = $this->asBool($child);
@@ -308,20 +308,20 @@  discard block
 block discarded – undo
308 308
 						 */
309 309
 						switch ($field->getName()) {
310 310
 							case 'name':
311
-								$field_name = (string)$field;
311
+								$field_name = (string) $field;
312 312
 								$field_name = $this->platform->quoteIdentifier($field_name);
313 313
 								$fields[] = $field_name;
314 314
 								break;
315 315
 							case 'sorting':
316 316
 								break;
317 317
 							default:
318
-								throw new \DomainException('Unknown element: ' . $field->getName());
318
+								throw new \DomainException('Unknown element: '.$field->getName());
319 319
 
320 320
 						}
321 321
 					}
322 322
 					break;
323 323
 				default:
324
-					throw new \DomainException('Unknown element: ' . $child->getName());
324
+					throw new \DomainException('Unknown element: '.$child->getName());
325 325
 
326 326
 			}
327 327
 		}
@@ -339,7 +339,7 @@  discard block
 block discarded – undo
339 339
 				}
340 340
 			}
341 341
 		} else {
342
-			throw new \DomainException('Empty index definition: ' . $name . ' options:' . print_r($fields, true));
342
+			throw new \DomainException('Empty index definition: '.$name.' options:'.print_r($fields, true));
343 343
 		}
344 344
 	}
345 345
 
@@ -348,13 +348,13 @@  discard block
 block discarded – undo
348 348
 	 * @return bool
349 349
 	 */
350 350
 	private function asBool($xml) {
351
-		$result = (string)$xml;
351
+		$result = (string) $xml;
352 352
 		if ($result == 'true') {
353 353
 			$result = true;
354 354
 		} elseif ($result == 'false') {
355 355
 			$result = false;
356 356
 		}
357
-		return (bool)$result;
357
+		return (bool) $result;
358 358
 	}
359 359
 
360 360
 }
Please login to merge, or discard this patch.
lib/private/Contacts/ContactsMenu/ActionFactory.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -51,7 +51,7 @@
 block discarded – undo
51 51
 	 * @return ILinkAction
52 52
 	 */
53 53
 	public function newEMailAction($icon, $name, $email) {
54
-		return $this->newLinkAction($icon, $name, 'mailto:' . urlencode($email));
54
+		return $this->newLinkAction($icon, $name, 'mailto:'.urlencode($email));
55 55
 	}
56 56
 
57 57
 }
Please login to merge, or discard this patch.
lib/private/DB/QueryBuilder/FunctionBuilder/OCIFunctionBuilder.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,6 +25,6 @@
 block discarded – undo
25 25
 
26 26
 class OCIFunctionBuilder extends FunctionBuilder {
27 27
 	public function md5($input) {
28
-		return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw(' . $this->helper->quoteColumnName($input) .')))');
28
+		return new QueryFunction('LOWER(DBMS_OBFUSCATION_TOOLKIT.md5 (input => UTL_RAW.cast_to_raw('.$this->helper->quoteColumnName($input).')))');
29 29
 	}
30 30
 }
Please login to merge, or discard this patch.