Completed
Pull Request — master (#9488)
by John
26:02 queued 01:01
created
apps/files/templates/simplelist.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -19,14 +19,14 @@
 block discarded – undo
19 19
 		<tr>
20 20
 			<th id='headerName' class="hidden column-name">
21 21
 				<div id="headerName-container">
22
-					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
22
+					<a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
23 23
 				</div>
24 24
 			</th>
25 25
 			<th id="headerSize" class="hidden column-size">
26 26
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
27 27
 			</th>
28 28
 			<th id="headerDate" class="hidden column-mtime">
29
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Modified' )); ?></span><span class="sort-indicator"></span></a>
29
+				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
30 30
 					<span class="selectedActions"><a href="" class="delete-selected">
31 31
 						<?php p($l->t('Delete'))?>
32 32
 						<img class="svg" alt=""
Please login to merge, or discard this patch.
lib/private/Repair/NC13/RepairInvalidPaths.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -159,7 +159,7 @@  discard block
 block discarded – undo
159 159
 		$count = 0;
160 160
 		foreach ($entries as $entry) {
161 161
 			$count++;
162
-			$calculatedPath = $entry['parent_path'] . '/' . $entry['name'];
162
+			$calculatedPath = $entry['parent_path'].'/'.$entry['name'];
163 163
 			if ($newId = $this->getId($entry['parent_storage'], $calculatedPath)) {
164 164
 				// a new entry with the correct path has already been created, reuse that one and delete the incorrect entry
165 165
 				$this->reparent($entry['fileid'], $newId);
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 		if ($this->shouldRun()) {
187 187
 			$count = $this->repair();
188 188
 
189
-			$output->info('Repaired ' . $count . ' paths');
189
+			$output->info('Repaired '.$count.' paths');
190 190
 		}
191 191
 	}
192 192
 }
Please login to merge, or discard this patch.
lib/private/App/InfoParser.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -49,8 +49,8 @@  discard block
 block discarded – undo
49 49
 			return null;
50 50
 		}
51 51
 
52
-		if(!is_null($this->cache)) {
53
-			$fileCacheKey = $file . filemtime($file);
52
+		if (!is_null($this->cache)) {
53
+			$fileCacheKey = $file.filemtime($file);
54 54
 			if ($cachedValue = $this->cache->get($fileCacheKey)) {
55 55
 				return json_decode($cachedValue, true);
56 56
 			}
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
 			$array['settings']['personal-section'] = [$array['settings']['personal-section']];
200 200
 		}
201 201
 
202
-		if(!is_null($this->cache)) {
202
+		if (!is_null($this->cache)) {
203 203
 			$this->cache->set($fileCacheKey, json_encode($array));
204 204
 		}
205 205
 		return $array;
@@ -211,7 +211,7 @@  discard block
 block discarded – undo
211 211
 	 */
212 212
 	public function xmlToArray($xml) {
213 213
 		if (!$xml->children()) {
214
-			return (string)$xml;
214
+			return (string) $xml;
215 215
 		}
216 216
 
217 217
 		$array = [];
@@ -227,16 +227,16 @@  discard block
 block discarded – undo
227 227
 				$data = [
228 228
 					'@attributes' => [],
229 229
 				];
230
-				if (!count($node->children())){
231
-					$value = (string)$node;
230
+				if (!count($node->children())) {
231
+					$value = (string) $node;
232 232
 					if (!empty($value)) {
233
-						$data['@value'] = (string)$node;
233
+						$data['@value'] = (string) $node;
234 234
 					}
235 235
 				} else {
236 236
 					$data = array_merge($data, $this->xmlToArray($node));
237 237
 				}
238 238
 				foreach ($attributes as $attr => $value) {
239
-					$data['@attributes'][$attr] = (string)$value;
239
+					$data['@attributes'][$attr] = (string) $value;
240 240
 				}
241 241
 
242 242
 				if ($totalElement > 1) {
Please login to merge, or discard this patch.
lib/private/Collaboration/AutoComplete/Manager.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
 class Manager implements IManager {
31 31
 	/** @var string[] */
32
-	protected $sorters =[];
32
+	protected $sorters = [];
33 33
 
34 34
 	/** @var ISorter[]  */
35 35
 	protected $sorterInstances = [];
@@ -42,8 +42,8 @@  discard block
 block discarded – undo
42 42
 
43 43
 	public function runSorters(array $sorters, array &$sortArray, array $context) {
44 44
 		$sorterInstances = $this->getSorters();
45
-		while($sorter = array_shift($sorters)) {
46
-			if(isset($sorterInstances[$sorter])) {
45
+		while ($sorter = array_shift($sorters)) {
46
+			if (isset($sorterInstances[$sorter])) {
47 47
 				$sorterInstances[$sorter]->sort($sortArray, $context);
48 48
 			} else {
49 49
 				$this->c->getLogger()->warning('No sorter for ID "{id}", skipping', [
@@ -58,17 +58,17 @@  discard block
 block discarded – undo
58 58
 	}
59 59
 
60 60
 	protected function getSorters() {
61
-		if(count($this->sorterInstances) === 0) {
61
+		if (count($this->sorterInstances) === 0) {
62 62
 			foreach ($this->sorters as $sorter) {
63 63
 				/** @var ISorter $instance */
64 64
 				$instance = $this->c->resolve($sorter);
65
-				if(!$instance instanceof ISorter) {
65
+				if (!$instance instanceof ISorter) {
66 66
 					$this->c->getLogger()->notice('Skipping sorter which is not an instance of ISorter. Class name: {class}',
67 67
 						['app' => 'core', 'class' => $sorter]);
68 68
 					continue;
69 69
 				}
70 70
 				$sorterId = trim($instance->getId());
71
-				if(trim($sorterId) === '') {
71
+				if (trim($sorterId) === '') {
72 72
 					$this->c->getLogger()->notice('Skipping sorter with empty ID. Class name: {class}',
73 73
 						['app' => 'core', 'class' => $sorter]);
74 74
 					continue;
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
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 	<h2 class="inlineblock"><?php p($_['heading']); ?></h2>
27 27
 	<?php if (!empty($_['docs'])): ?>
28 28
 		<a target="_blank" rel="noreferrer noopener" class="icon-info svg"
29
-		   title="<?php p($l->t('Open documentation'));?>"
29
+		   title="<?php p($l->t('Open documentation')); ?>"
30 30
 		   href="<?php p(link_to_docs($_['docs'])); ?>">
31 31
 		</a>
32 32
 	<?php endif; ?>
Please login to merge, or discard this patch.
apps/user_ldap/templates/part.settingcontrols.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <div class="ldapSettingControls">
2 2
 	<button type="button" class="ldap_action_test_connection" name="ldap_action_test_connection">
3
-		<?php p($l->t('Test Configuration'));?>
3
+		<?php p($l->t('Test Configuration')); ?>
4 4
 	</button>
5 5
 	<a href="<?php p(link_to_docs('admin-ldap')); ?>"
6 6
 		target="_blank" rel="noreferrer noopener">
7 7
 		<img src="<?php print_unescaped(image_path('', 'actions/info.svg')); ?>"
8 8
 			style="height:1.75ex" />
9
-		<?php p($l->t('Help'));?>
9
+		<?php p($l->t('Help')); ?>
10 10
 	</a>
11 11
 </div>
Please login to merge, or discard this patch.
settings/templates/help.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <div id="app-navigation">
2 2
 	<ul>
3
-	<?php if($_['admin']) { ?>
3
+	<?php if ($_['admin']) { ?>
4 4
 		<li>
5 5
 			<a class="<?php p($_['style1']); ?>"
6 6
 				href="<?php print_unescaped($_['url1']); ?>">
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 			</a>
27 27
 		</li>
28 28
 
29
-	<?php if($_['admin']) { ?>
29
+	<?php if ($_['admin']) { ?>
30 30
 		<li>
31 31
 			<a href="https://nextcloud.com/support/" target="_blank" rel="noreferrer noopener">
32 32
 				<?php p($l->t('Getting help')); ?> ↗
Please login to merge, or discard this patch.
settings/templates/settings/admin/additional-mail.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
52 52
 
53 53
 <div class="section" id="mail_general_settings">
54 54
 	<form id="mail_general_settings_form" class="mail_settings">
55
-		<h2><?php p($l->t('Email server'));?></h2>
55
+		<h2><?php p($l->t('Email server')); ?></h2>
56 56
 		<a target="_blank" rel="noreferrer noopener" class="icon-info"
57
-		   title="<?php p($l->t('Open documentation'));?>"
57
+		   title="<?php p($l->t('Open documentation')); ?>"
58 58
 		   href="<?php p(link_to_docs('admin-email')); ?>"></a>
59 59
 		<p class="settings-hint"><?php p($l->t('It is important to set up this server to be able to send emails, like for password reset and notifications.')); ?></p>
60 60
 		<p><span id="mail_settings_msg" class="msg"></span></p>
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 						$selected = 'selected="selected"';
69 69
 					endif; ?>
70 70
 					<option value="<?php p($smtpmode[0])?>" <?php p($selected) ?>><?php p($smtpmode[1]) ?></option>
71
-				<?php endforeach;?>
71
+				<?php endforeach; ?>
72 72
 			</select>
73 73
 
74 74
 			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 						$selected = 'selected="selected"';
84 84
 					endif; ?>
85 85
 					<option value="<?php p($secure)?>" <?php p($selected) ?>><?php p($name) ?></option>
86
-				<?php endforeach;?>
86
+				<?php endforeach; ?>
87 87
 			</select>
88 88
 		</p>
89 89
 
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 						$selected = 'selected="selected"';
105 105
 					endif; ?>
106 106
 					<option value="<?php p($authtype)?>" <?php p($selected) ?>><?php p($name) ?></option>
107
-				<?php endforeach;?>
107
+				<?php endforeach; ?>
108 108
 			</select>
109 109
 
110 110
 			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" class="checkbox" value="1"
Please login to merge, or discard this patch.
settings/templates/settings/admin/encryption.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@
 block discarded – undo
29 29
 <div class="section" id='encryptionAPI'>
30 30
 	<h2><?php p($l->t('Server-side encryption')); ?></h2>
31 31
 	<a target="_blank" rel="noreferrer noopener" class="icon-info"
32
-	   title="<?php p($l->t('Open documentation'));?>"
32
+	   title="<?php p($l->t('Open documentation')); ?>"
33 33
 	   href="<?php p(link_to_docs('admin-encryption')); ?>"></a>
34 34
 	<p class="settings-hint"><?php p($l->t('Server-side encryption makes it possible to encrypt files which are uploaded to this server. This comes with limitations like a performance penalty, so enable this only if needed.')); ?></p>
35 35
 	<p id="enable">
Please login to merge, or discard this patch.