Completed
Pull Request — master (#7487)
by Björn
34:37 queued 17:26
created
lib/private/Template/JSConfigHelper.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
 			$apps = $this->appManager->getEnabledAppsForUser($this->currentUser);
117 117
 		}
118 118
 
119
-		foreach($apps as $app) {
119
+		foreach ($apps as $app) {
120 120
 			$apps_paths[$app] = \OC_App::getAppWebPath($app);
121 121
 		}
122 122
 
@@ -132,8 +132,8 @@  discard block
 block discarded – undo
132 132
 		$outgoingServer2serverShareEnabled = $this->config->getAppValue('files_sharing', 'outgoing_server2server_share_enabled', 'yes') === 'yes';
133 133
 
134 134
 		$countOfDataLocation = 0;
135
-		$dataLocation = str_replace(\OC::$SERVERROOT .'/', '', $this->config->getSystemValue('datadirectory', ''), $countOfDataLocation);
136
-		if($countOfDataLocation !== 1 || !$this->groupManager->isAdmin($uid)) {
135
+		$dataLocation = str_replace(\OC::$SERVERROOT.'/', '', $this->config->getSystemValue('datadirectory', ''), $countOfDataLocation);
136
+		if ($countOfDataLocation !== 1 || !$this->groupManager->isAdmin($uid)) {
137 137
 			$dataLocation = false;
138 138
 		}
139 139
 
@@ -149,68 +149,68 @@  discard block
 block discarded – undo
149 149
 		$array = [
150 150
 			"oc_debug" => $this->config->getSystemValue('debug', false) ? 'true' : 'false',
151 151
 			"oc_isadmin" => $this->groupManager->isAdmin($uid) ? 'true' : 'false',
152
-			"backendAllowsPasswordConfirmation" => $userBackend === 'user_saml'? 'false' : 'true',
152
+			"backendAllowsPasswordConfirmation" => $userBackend === 'user_saml' ? 'false' : 'true',
153 153
 			"oc_dataURL" => is_string($dataLocation) ? "\"".$dataLocation."\"" : 'false',
154 154
 			"oc_webroot" => "\"".\OC::$WEBROOT."\"",
155 155
 			"oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
156 156
 			"datepickerFormatDate" => json_encode($this->l->l('jsdate', null)),
157 157
 			'nc_lastLogin' => $lastConfirmTimestamp,
158 158
 			"dayNames" =>  json_encode([
159
-				(string)$this->l->t('Sunday'),
160
-				(string)$this->l->t('Monday'),
161
-				(string)$this->l->t('Tuesday'),
162
-				(string)$this->l->t('Wednesday'),
163
-				(string)$this->l->t('Thursday'),
164
-				(string)$this->l->t('Friday'),
165
-				(string)$this->l->t('Saturday')
159
+				(string) $this->l->t('Sunday'),
160
+				(string) $this->l->t('Monday'),
161
+				(string) $this->l->t('Tuesday'),
162
+				(string) $this->l->t('Wednesday'),
163
+				(string) $this->l->t('Thursday'),
164
+				(string) $this->l->t('Friday'),
165
+				(string) $this->l->t('Saturday')
166 166
 			]),
167 167
 			"dayNamesShort" =>  json_encode([
168
-				(string)$this->l->t('Sun.'),
169
-				(string)$this->l->t('Mon.'),
170
-				(string)$this->l->t('Tue.'),
171
-				(string)$this->l->t('Wed.'),
172
-				(string)$this->l->t('Thu.'),
173
-				(string)$this->l->t('Fri.'),
174
-				(string)$this->l->t('Sat.')
168
+				(string) $this->l->t('Sun.'),
169
+				(string) $this->l->t('Mon.'),
170
+				(string) $this->l->t('Tue.'),
171
+				(string) $this->l->t('Wed.'),
172
+				(string) $this->l->t('Thu.'),
173
+				(string) $this->l->t('Fri.'),
174
+				(string) $this->l->t('Sat.')
175 175
 			]),
176 176
 			"dayNamesMin" =>  json_encode([
177
-				(string)$this->l->t('Su'),
178
-				(string)$this->l->t('Mo'),
179
-				(string)$this->l->t('Tu'),
180
-				(string)$this->l->t('We'),
181
-				(string)$this->l->t('Th'),
182
-				(string)$this->l->t('Fr'),
183
-				(string)$this->l->t('Sa')
177
+				(string) $this->l->t('Su'),
178
+				(string) $this->l->t('Mo'),
179
+				(string) $this->l->t('Tu'),
180
+				(string) $this->l->t('We'),
181
+				(string) $this->l->t('Th'),
182
+				(string) $this->l->t('Fr'),
183
+				(string) $this->l->t('Sa')
184 184
 			]),
185 185
 			"monthNames" => json_encode([
186
-				(string)$this->l->t('January'),
187
-				(string)$this->l->t('February'),
188
-				(string)$this->l->t('March'),
189
-				(string)$this->l->t('April'),
190
-				(string)$this->l->t('May'),
191
-				(string)$this->l->t('June'),
192
-				(string)$this->l->t('July'),
193
-				(string)$this->l->t('August'),
194
-				(string)$this->l->t('September'),
195
-				(string)$this->l->t('October'),
196
-				(string)$this->l->t('November'),
197
-				(string)$this->l->t('December')
186
+				(string) $this->l->t('January'),
187
+				(string) $this->l->t('February'),
188
+				(string) $this->l->t('March'),
189
+				(string) $this->l->t('April'),
190
+				(string) $this->l->t('May'),
191
+				(string) $this->l->t('June'),
192
+				(string) $this->l->t('July'),
193
+				(string) $this->l->t('August'),
194
+				(string) $this->l->t('September'),
195
+				(string) $this->l->t('October'),
196
+				(string) $this->l->t('November'),
197
+				(string) $this->l->t('December')
198 198
 			]),
199 199
 			"monthNamesShort" => json_encode([
200
-				(string)$this->l->t('Jan.'),
201
-				(string)$this->l->t('Feb.'),
202
-				(string)$this->l->t('Mar.'),
203
-				(string)$this->l->t('Apr.'),
204
-				(string)$this->l->t('May.'),
205
-				(string)$this->l->t('Jun.'),
206
-				(string)$this->l->t('Jul.'),
207
-				(string)$this->l->t('Aug.'),
208
-				(string)$this->l->t('Sep.'),
209
-				(string)$this->l->t('Oct.'),
210
-				(string)$this->l->t('Nov.'),
211
-				(string)$this->l->t('Dec.')
200
+				(string) $this->l->t('Jan.'),
201
+				(string) $this->l->t('Feb.'),
202
+				(string) $this->l->t('Mar.'),
203
+				(string) $this->l->t('Apr.'),
204
+				(string) $this->l->t('May.'),
205
+				(string) $this->l->t('Jun.'),
206
+				(string) $this->l->t('Jul.'),
207
+				(string) $this->l->t('Aug.'),
208
+				(string) $this->l->t('Sep.'),
209
+				(string) $this->l->t('Oct.'),
210
+				(string) $this->l->t('Nov.'),
211
+				(string) $this->l->t('Dec.')
212 212
 			]),
213
-			"firstDay" => json_encode($this->l->l('firstday', null)) ,
213
+			"firstDay" => json_encode($this->l->l('firstday', null)),
214 214
 			"oc_config" => json_encode([
215 215
 				'session_lifetime'	=> min($this->config->getSystemValue('session_lifetime', $this->iniWrapper->getNumeric('session.gc_maxlifetime')), $this->iniWrapper->getNumeric('session.gc_maxlifetime')),
216 216
 				'session_keepalive'	=> $this->config->getSystemValue('session_keepalive', true),
@@ -256,7 +256,7 @@  discard block
 block discarded – undo
256 256
 		if ($this->currentUser !== null) {
257 257
 			$array['oc_userconfig'] = json_encode([
258 258
 				'avatar' => [
259
-					'version' => (int)$this->config->getUserValue($uid, 'avatar', 'version', 0),
259
+					'version' => (int) $this->config->getUserValue($uid, 'avatar', 'version', 0),
260 260
 				]
261 261
 			]);
262 262
 		}
@@ -268,7 +268,7 @@  discard block
 block discarded – undo
268 268
 
269 269
 		// Echo it
270 270
 		foreach ($array as  $setting => $value) {
271
-			$result .= 'var '. $setting . '='. $value . ';' . PHP_EOL;
271
+			$result .= 'var '.$setting.'='.$value.';'.PHP_EOL;
272 272
 		}
273 273
 
274 274
 		return $result;
Please login to merge, or discard this patch.