Completed
Pull Request — master (#4108)
by Jan-Christoph
11:41
created
lib/private/legacy/defaults.php 1 patch
Indentation   +231 added lines, -231 removed lines patch added patch discarded remove patch
@@ -31,259 +31,259 @@
 block discarded – undo
31 31
  */
32 32
 class OC_Defaults {
33 33
 
34
-	private $theme;
35
-	private $l;
34
+    private $theme;
35
+    private $l;
36 36
 
37
-	private $defaultEntity;
38
-	private $defaultName;
39
-	private $defaultTitle;
40
-	private $defaultBaseUrl;
41
-	private $defaultSyncClientUrl;
42
-	private $defaultiOSClientUrl;
43
-	private $defaultiTunesAppId;
44
-	private $defaultAndroidClientUrl;
45
-	private $defaultDocBaseUrl;
46
-	private $defaultDocVersion;
47
-	private $defaultSlogan;
48
-	private $defaultLogoClaim;
49
-	private $defaultMailHeaderColor;
37
+    private $defaultEntity;
38
+    private $defaultName;
39
+    private $defaultTitle;
40
+    private $defaultBaseUrl;
41
+    private $defaultSyncClientUrl;
42
+    private $defaultiOSClientUrl;
43
+    private $defaultiTunesAppId;
44
+    private $defaultAndroidClientUrl;
45
+    private $defaultDocBaseUrl;
46
+    private $defaultDocVersion;
47
+    private $defaultSlogan;
48
+    private $defaultLogoClaim;
49
+    private $defaultMailHeaderColor;
50 50
 
51
-	function __construct() {
52
-		$this->l = \OC::$server->getL10N('lib');
51
+    function __construct() {
52
+        $this->l = \OC::$server->getL10N('lib');
53 53
 
54
-		$this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */
55
-		$this->defaultName = 'Nextcloud'; /* short name, used when referring to the software */
56
-		$this->defaultTitle = 'Nextcloud'; /* can be a longer name, for titles */
57
-		$this->defaultBaseUrl = 'https://nextcloud.com';
58
-		$this->defaultSyncClientUrl = 'https://nextcloud.com/install/#install-clients';
59
-		$this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8';
60
-		$this->defaultiTunesAppId = '1125420102';
61
-		$this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.nextcloud.client';
62
-		$this->defaultDocBaseUrl = 'https://docs.nextcloud.com';
63
-		$this->defaultDocVersion = '11'; // used to generate doc links
64
-		$this->defaultSlogan = $this->l->t('a safe home for all your data');
65
-		$this->defaultLogoClaim = '';
66
-		$this->defaultMailHeaderColor = '#0082c9'; /* header color of mail notifications */
54
+        $this->defaultEntity = 'Nextcloud'; /* e.g. company name, used for footers and copyright notices */
55
+        $this->defaultName = 'Nextcloud'; /* short name, used when referring to the software */
56
+        $this->defaultTitle = 'Nextcloud'; /* can be a longer name, for titles */
57
+        $this->defaultBaseUrl = 'https://nextcloud.com';
58
+        $this->defaultSyncClientUrl = 'https://nextcloud.com/install/#install-clients';
59
+        $this->defaultiOSClientUrl = 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8';
60
+        $this->defaultiTunesAppId = '1125420102';
61
+        $this->defaultAndroidClientUrl = 'https://play.google.com/store/apps/details?id=com.nextcloud.client';
62
+        $this->defaultDocBaseUrl = 'https://docs.nextcloud.com';
63
+        $this->defaultDocVersion = '11'; // used to generate doc links
64
+        $this->defaultSlogan = $this->l->t('a safe home for all your data');
65
+        $this->defaultLogoClaim = '';
66
+        $this->defaultMailHeaderColor = '#0082c9'; /* header color of mail notifications */
67 67
 
68
-		$themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
69
-		if (file_exists($themePath)) {
70
-			// prevent defaults.php from printing output
71
-			ob_start();
72
-			require_once $themePath;
73
-			ob_end_clean();
74
-			if (class_exists('OC_Theme')) {
75
-				$this->theme = new OC_Theme();
76
-			}
77
-		}
78
-	}
68
+        $themePath = OC::$SERVERROOT . '/themes/' . OC_Util::getTheme() . '/defaults.php';
69
+        if (file_exists($themePath)) {
70
+            // prevent defaults.php from printing output
71
+            ob_start();
72
+            require_once $themePath;
73
+            ob_end_clean();
74
+            if (class_exists('OC_Theme')) {
75
+                $this->theme = new OC_Theme();
76
+            }
77
+        }
78
+    }
79 79
 
80
-	/**
81
-	 * @param string $method
82
-	 */
83
-	private function themeExist($method) {
84
-		if (isset($this->theme) && method_exists($this->theme, $method)) {
85
-			return true;
86
-		}
87
-		return false;
88
-	}
80
+    /**
81
+     * @param string $method
82
+     */
83
+    private function themeExist($method) {
84
+        if (isset($this->theme) && method_exists($this->theme, $method)) {
85
+            return true;
86
+        }
87
+        return false;
88
+    }
89 89
 
90
-	/**
91
-	 * Returns the base URL
92
-	 * @return string URL
93
-	 */
94
-	public function getBaseUrl() {
95
-		if ($this->themeExist('getBaseUrl')) {
96
-			return $this->theme->getBaseUrl();
97
-		} else {
98
-			return $this->defaultBaseUrl;
99
-		}
100
-	}
90
+    /**
91
+     * Returns the base URL
92
+     * @return string URL
93
+     */
94
+    public function getBaseUrl() {
95
+        if ($this->themeExist('getBaseUrl')) {
96
+            return $this->theme->getBaseUrl();
97
+        } else {
98
+            return $this->defaultBaseUrl;
99
+        }
100
+    }
101 101
 
102
-	/**
103
-	 * Returns the URL where the sync clients are listed
104
-	 * @return string URL
105
-	 */
106
-	public function getSyncClientUrl() {
107
-		if ($this->themeExist('getSyncClientUrl')) {
108
-			return $this->theme->getSyncClientUrl();
109
-		} else {
110
-			return $this->defaultSyncClientUrl;
111
-		}
112
-	}
102
+    /**
103
+     * Returns the URL where the sync clients are listed
104
+     * @return string URL
105
+     */
106
+    public function getSyncClientUrl() {
107
+        if ($this->themeExist('getSyncClientUrl')) {
108
+            return $this->theme->getSyncClientUrl();
109
+        } else {
110
+            return $this->defaultSyncClientUrl;
111
+        }
112
+    }
113 113
 
114
-	/**
115
-	 * Returns the URL to the App Store for the iOS Client
116
-	 * @return string URL
117
-	 */
118
-	public function getiOSClientUrl() {
119
-		if ($this->themeExist('getiOSClientUrl')) {
120
-			return $this->theme->getiOSClientUrl();
121
-		} else {
122
-			return $this->defaultiOSClientUrl;
123
-		}
124
-	}
114
+    /**
115
+     * Returns the URL to the App Store for the iOS Client
116
+     * @return string URL
117
+     */
118
+    public function getiOSClientUrl() {
119
+        if ($this->themeExist('getiOSClientUrl')) {
120
+            return $this->theme->getiOSClientUrl();
121
+        } else {
122
+            return $this->defaultiOSClientUrl;
123
+        }
124
+    }
125 125
 
126
-	/**
127
-	 * Returns the AppId for the App Store for the iOS Client
128
-	 * @return string AppId
129
-	 */
130
-	public function getiTunesAppId() {
131
-		if ($this->themeExist('getiTunesAppId')) {
132
-			return $this->theme->getiTunesAppId();
133
-		} else {
134
-			return $this->defaultiTunesAppId;
135
-		}
136
-	}
126
+    /**
127
+     * Returns the AppId for the App Store for the iOS Client
128
+     * @return string AppId
129
+     */
130
+    public function getiTunesAppId() {
131
+        if ($this->themeExist('getiTunesAppId')) {
132
+            return $this->theme->getiTunesAppId();
133
+        } else {
134
+            return $this->defaultiTunesAppId;
135
+        }
136
+    }
137 137
 
138
-	/**
139
-	 * Returns the URL to Google Play for the Android Client
140
-	 * @return string URL
141
-	 */
142
-	public function getAndroidClientUrl() {
143
-		if ($this->themeExist('getAndroidClientUrl')) {
144
-			return $this->theme->getAndroidClientUrl();
145
-		} else {
146
-			return $this->defaultAndroidClientUrl;
147
-		}
148
-	}
138
+    /**
139
+     * Returns the URL to Google Play for the Android Client
140
+     * @return string URL
141
+     */
142
+    public function getAndroidClientUrl() {
143
+        if ($this->themeExist('getAndroidClientUrl')) {
144
+            return $this->theme->getAndroidClientUrl();
145
+        } else {
146
+            return $this->defaultAndroidClientUrl;
147
+        }
148
+    }
149 149
 
150
-	/**
151
-	 * Returns the documentation URL
152
-	 * @return string URL
153
-	 */
154
-	public function getDocBaseUrl() {
155
-		if ($this->themeExist('getDocBaseUrl')) {
156
-			return $this->theme->getDocBaseUrl();
157
-		} else {
158
-			return $this->defaultDocBaseUrl;
159
-		}
160
-	}
150
+    /**
151
+     * Returns the documentation URL
152
+     * @return string URL
153
+     */
154
+    public function getDocBaseUrl() {
155
+        if ($this->themeExist('getDocBaseUrl')) {
156
+            return $this->theme->getDocBaseUrl();
157
+        } else {
158
+            return $this->defaultDocBaseUrl;
159
+        }
160
+    }
161 161
 
162
-	/**
163
-	 * Returns the title
164
-	 * @return string title
165
-	 */
166
-	public function getTitle() {
167
-		if ($this->themeExist('getTitle')) {
168
-			return $this->theme->getTitle();
169
-		} else {
170
-			return $this->defaultTitle;
171
-		}
172
-	}
162
+    /**
163
+     * Returns the title
164
+     * @return string title
165
+     */
166
+    public function getTitle() {
167
+        if ($this->themeExist('getTitle')) {
168
+            return $this->theme->getTitle();
169
+        } else {
170
+            return $this->defaultTitle;
171
+        }
172
+    }
173 173
 
174
-	/**
175
-	 * Returns the short name of the software
176
-	 * @return string title
177
-	 */
178
-	public function getName() {
179
-		if ($this->themeExist('getName')) {
180
-			return $this->theme->getName();
181
-		} else {
182
-			return $this->defaultName;
183
-		}
184
-	}
174
+    /**
175
+     * Returns the short name of the software
176
+     * @return string title
177
+     */
178
+    public function getName() {
179
+        if ($this->themeExist('getName')) {
180
+            return $this->theme->getName();
181
+        } else {
182
+            return $this->defaultName;
183
+        }
184
+    }
185 185
 
186
-	/**
187
-	 * Returns the short name of the software containing HTML strings
188
-	 * @return string title
189
-	 */
190
-	public function getHTMLName() {
191
-		if ($this->themeExist('getHTMLName')) {
192
-			return $this->theme->getHTMLName();
193
-		} else {
194
-			return $this->defaultName;
195
-		}
196
-	}
186
+    /**
187
+     * Returns the short name of the software containing HTML strings
188
+     * @return string title
189
+     */
190
+    public function getHTMLName() {
191
+        if ($this->themeExist('getHTMLName')) {
192
+            return $this->theme->getHTMLName();
193
+        } else {
194
+            return $this->defaultName;
195
+        }
196
+    }
197 197
 
198
-	/**
199
-	 * Returns entity (e.g. company name) - used for footer, copyright
200
-	 * @return string entity name
201
-	 */
202
-	public function getEntity() {
203
-		if ($this->themeExist('getEntity')) {
204
-			return $this->theme->getEntity();
205
-		} else {
206
-			return $this->defaultEntity;
207
-		}
208
-	}
198
+    /**
199
+     * Returns entity (e.g. company name) - used for footer, copyright
200
+     * @return string entity name
201
+     */
202
+    public function getEntity() {
203
+        if ($this->themeExist('getEntity')) {
204
+            return $this->theme->getEntity();
205
+        } else {
206
+            return $this->defaultEntity;
207
+        }
208
+    }
209 209
 
210
-	/**
211
-	 * Returns slogan
212
-	 * @return string slogan
213
-	 */
214
-	public function getSlogan() {
215
-		if ($this->themeExist('getSlogan')) {
216
-			return $this->theme->getSlogan();
217
-		} else {
218
-			return $this->defaultSlogan;
219
-		}
220
-	}
210
+    /**
211
+     * Returns slogan
212
+     * @return string slogan
213
+     */
214
+    public function getSlogan() {
215
+        if ($this->themeExist('getSlogan')) {
216
+            return $this->theme->getSlogan();
217
+        } else {
218
+            return $this->defaultSlogan;
219
+        }
220
+    }
221 221
 
222
-	/**
223
-	 * Returns logo claim
224
-	 * @return string logo claim
225
-	 */
226
-	public function getLogoClaim() {
227
-		if ($this->themeExist('getLogoClaim')) {
228
-			return $this->theme->getLogoClaim();
229
-		} else {
230
-			return $this->defaultLogoClaim;
231
-		}
232
-	}
222
+    /**
223
+     * Returns logo claim
224
+     * @return string logo claim
225
+     */
226
+    public function getLogoClaim() {
227
+        if ($this->themeExist('getLogoClaim')) {
228
+            return $this->theme->getLogoClaim();
229
+        } else {
230
+            return $this->defaultLogoClaim;
231
+        }
232
+    }
233 233
 
234
-	/**
235
-	 * Returns short version of the footer
236
-	 * @return string short footer
237
-	 */
238
-	public function getShortFooter() {
239
-		if ($this->themeExist('getShortFooter')) {
240
-			$footer = $this->theme->getShortFooter();
241
-		} else {
242
-			$footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
243
-				' rel="noreferrer">' .$this->getEntity() . '</a>'.
244
-				' – ' . $this->getSlogan();
245
-		}
234
+    /**
235
+     * Returns short version of the footer
236
+     * @return string short footer
237
+     */
238
+    public function getShortFooter() {
239
+        if ($this->themeExist('getShortFooter')) {
240
+            $footer = $this->theme->getShortFooter();
241
+        } else {
242
+            $footer = '<a href="'. $this->getBaseUrl() . '" target="_blank"' .
243
+                ' rel="noreferrer">' .$this->getEntity() . '</a>'.
244
+                ' – ' . $this->getSlogan();
245
+        }
246 246
 
247
-		return $footer;
248
-	}
247
+        return $footer;
248
+    }
249 249
 
250
-	/**
251
-	 * Returns long version of the footer
252
-	 * @return string long footer
253
-	 */
254
-	public function getLongFooter() {
255
-		if ($this->themeExist('getLongFooter')) {
256
-			$footer = $this->theme->getLongFooter();
257
-		} else {
258
-			$footer = $this->getShortFooter();
259
-		}
250
+    /**
251
+     * Returns long version of the footer
252
+     * @return string long footer
253
+     */
254
+    public function getLongFooter() {
255
+        if ($this->themeExist('getLongFooter')) {
256
+            $footer = $this->theme->getLongFooter();
257
+        } else {
258
+            $footer = $this->getShortFooter();
259
+        }
260 260
 
261
-		return $footer;
262
-	}
261
+        return $footer;
262
+    }
263 263
 
264
-	/**
265
-	 * @param string $key
266
-	 */
267
-	public function buildDocLinkToKey($key) {
268
-		if ($this->themeExist('buildDocLinkToKey')) {
269
-			return $this->theme->buildDocLinkToKey($key);
270
-		}
271
-		return $this->getDocBaseUrl() . '/server/' . $this->defaultDocVersion . '/go.php?to=' . $key;
272
-	}
264
+    /**
265
+     * @param string $key
266
+     */
267
+    public function buildDocLinkToKey($key) {
268
+        if ($this->themeExist('buildDocLinkToKey')) {
269
+            return $this->theme->buildDocLinkToKey($key);
270
+        }
271
+        return $this->getDocBaseUrl() . '/server/' . $this->defaultDocVersion . '/go.php?to=' . $key;
272
+    }
273 273
 
274
-	/**
275
-	 * Returns mail header color
276
-	 * @return string
277
-	 */
278
-	public function getColorPrimary() {
279
-		if ($this->themeExist('getColorPrimary')) {
280
-			return $this->theme->getColorPrimary();
281
-		} else {
282
-			return $this->defaultMailHeaderColor;
283
-		}
284
-	}
274
+    /**
275
+     * Returns mail header color
276
+     * @return string
277
+     */
278
+    public function getColorPrimary() {
279
+        if ($this->themeExist('getColorPrimary')) {
280
+            return $this->theme->getColorPrimary();
281
+        } else {
282
+            return $this->defaultMailHeaderColor;
283
+        }
284
+    }
285 285
 
286
-	public function shouldReplaceIcons() {
287
-		return false;
288
-	}
286
+    public function shouldReplaceIcons() {
287
+        return false;
288
+    }
289 289
 }
Please login to merge, or discard this patch.
core/templates/layout.guest.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -13,10 +13,10 @@  discard block
 block discarded – undo
13 13
 		<link rel="icon" href="<?php print_unescaped(image_path('', 'favicon.ico')); /* IE11+ supports png */ ?>">
14 14
 		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path('', 'favicon-touch.png')); ?>">
15 15
 		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path('', 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
16
-		<?php foreach($_['cssfiles'] as $cssfile): ?>
16
+		<?php foreach ($_['cssfiles'] as $cssfile): ?>
17 17
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>">
18 18
 		<?php endforeach; ?>
19
-		<?php foreach($_['printcssfiles'] as $cssfile): ?>
19
+		<?php foreach ($_['printcssfiles'] as $cssfile): ?>
20 20
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print">
21 21
 		<?php endforeach; ?>
22 22
 		<?php if (isset($_['inline_ocjs'])): ?>
@@ -24,16 +24,16 @@  discard block
 block discarded – undo
24 24
 				<?php print_unescaped($_['inline_ocjs']); ?>
25 25
 			</script>
26 26
 		<?php endif; ?>
27
-		<?php foreach($_['jsfiles'] as $jsfile): ?>
27
+		<?php foreach ($_['jsfiles'] as $jsfile): ?>
28 28
 			<script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script>
29 29
 		<?php endforeach; ?>
30 30
 		<?php print_unescaped($_['headers']); ?>
31 31
 	</head>
32
-	<body id="<?php p($_['bodyid']);?>">
32
+	<body id="<?php p($_['bodyid']); ?>">
33 33
 		<?php include('layout.noscript.warning.php'); ?>
34 34
 		<div class="wrapper">
35 35
 			<div class="v-align">
36
-				<?php if ($_['bodyid'] === 'body-login' ): ?>
36
+				<?php if ($_['bodyid'] === 'body-login'): ?>
37 37
 					<header role="banner">
38 38
 						<div id="header">
39 39
 							<div class="logo">
Please login to merge, or discard this patch.
core/templates/mail.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 <tr><td>
3 3
 <table cellspacing="0" cellpadding="0" border="0" width="600px">
4 4
 <tr>
5
-<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>">
5
+<td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>">
6 6
 <img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
7 7
 </td>
8 8
 </tr>
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
 <td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
13 13
 <?php
14 14
 print_unescaped($l->t('Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href="%s">View it!</a><br><br>', array($_['user_displayname'], $_['filename'], $_['link'])));
15
-if ( isset($_['expiration']) ) {
15
+if (isset($_['expiration'])) {
16 16
 	p($l->t("The share will expire on %s.", array($_['expiration'])));
17 17
 	print_unescaped('<br><br>');
18 18
 }
@@ -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.
core/templates/layout.user.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 		<meta charset="utf-8">
5 5
 		<title>
6 6
 			<?php
7
-				p(!empty($_['application'])?$_['application'].' - ':'');
7
+				p(!empty($_['application']) ? $_['application'].' - ' : '');
8 8
 				p($theme->getTitle());
9 9
 			?>
10 10
 		</title>
@@ -14,16 +14,16 @@  discard block
 block discarded – undo
14 14
 		<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
15 15
 		<meta name="apple-mobile-web-app-capable" content="yes">
16 16
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
17
-		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:$theme->getTitle()); ?>">
17
+		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files') ? $_['application'] : $theme->getTitle()); ?>">
18 18
 		<meta name="mobile-web-app-capable" content="yes">
19 19
 		<meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>">
20 20
 		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
21 21
 		<link rel="apple-touch-icon-precomposed" href="<?php print_unescaped(image_path($_['appid'], 'favicon-touch.png')); ?>">
22 22
 		<link rel="mask-icon" sizes="any" href="<?php print_unescaped(image_path($_['appid'], 'favicon-mask.svg')); ?>" color="<?php p($theme->getColorPrimary()); ?>">
23
-		<?php foreach($_['cssfiles'] as $cssfile): ?>
23
+		<?php foreach ($_['cssfiles'] as $cssfile): ?>
24 24
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>">
25 25
 		<?php endforeach; ?>
26
-		<?php foreach($_['printcssfiles'] as $cssfile): ?>
26
+		<?php foreach ($_['printcssfiles'] as $cssfile): ?>
27 27
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print">
28 28
 		<?php endforeach; ?>
29 29
 		<?php if (isset($_['inline_ocjs'])): ?>
@@ -31,12 +31,12 @@  discard block
 block discarded – undo
31 31
 				<?php print_unescaped($_['inline_ocjs']); ?>
32 32
 			</script>
33 33
 		<?php endif; ?>
34
-		<?php foreach($_['jsfiles'] as $jsfile): ?>
34
+		<?php foreach ($_['jsfiles'] as $jsfile): ?>
35 35
 			<script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script>
36 36
 		<?php endforeach; ?>
37 37
 		<?php print_unescaped($_['headers']); ?>
38 38
 	</head>
39
-	<body id="<?php p($_['bodyid']);?>">
39
+	<body id="<?php p($_['bodyid']); ?>">
40 40
 	<?php include('layout.noscript.warning.php'); ?>
41 41
 	<div id="notification-container">
42 42
 		<div id="notification"></div>
@@ -54,18 +54,18 @@  discard block
 block discarded – undo
54 54
 
55 55
 				<a href="#" class="header-appname-container menutoggle" tabindex="2">
56 56
 					<h1 class="header-appname">
57
-						<?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
57
+						<?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
58 58
 					</h1>
59 59
 					<div class="icon-caret"></div>
60 60
 				</a>
61 61
 
62 62
 				<div id="appmenu">
63 63
 					<ul>
64
-						<?php foreach($_['headernavigation'] as $entry): ?>
64
+						<?php foreach ($_['headernavigation'] as $entry): ?>
65 65
 							<li data-id="<?php p($entry['id']); ?>">
66 66
 								<a href="<?php print_unescaped($entry['href']); ?>" tabindex="3"
67
-									<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
68
-									<img src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon" />
67
+									<?php if ($entry['active']): ?> class="active"<?php endif; ?>>
68
+									<img src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon" />
69 69
 									<div class="icon-loading-dark" style="display:none;"></div>
70 70
 									<span>
71 71
 								<?php p($entry['name']); ?>
@@ -85,17 +85,17 @@  discard block
 block discarded – undo
85 85
 				<nav role="navigation"><div id="navigation">
86 86
 						<div id="apps">
87 87
 							<ul>
88
-								<?php foreach($_['navigation'] as $entry): ?>
89
-									<?php if($entry['showInHeader']): ?>
88
+								<?php foreach ($_['navigation'] as $entry): ?>
89
+									<?php if ($entry['showInHeader']): ?>
90 90
 										<li data-id="<?php p($entry['id']); ?>" class="in-header">
91 91
 									<?php else: ?>
92 92
 										<li data-id="<?php p($entry['id']); ?>">
93 93
 									<?php endif; ?>
94 94
 									<a href="<?php print_unescaped($entry['href']); ?>" tabindex="3"
95
-										<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
95
+										<?php if ($entry['active']): ?> class="active"<?php endif; ?>>
96 96
 										<svg width="32" height="32" viewBox="0 0 32 32">
97 97
 											<defs><filter id="invert-<?php p($entry['id']); ?>"><feColorMatrix in="SourceGraphic" type="matrix" values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"></feColorMatrix></filter></defs>
98
-											<image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon"></image>
98
+											<image x="0" y="0" width="32" height="32" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon"></image>
99 99
 										</svg>
100 100
 										<div class="icon-loading-dark" style="display:none;"></div>
101 101
 										<span>
@@ -113,7 +113,7 @@  discard block
 block discarded – undo
113 113
 			<div id="header-right">
114 114
 				<form class="searchbox" action="#" method="post" role="search" novalidate>
115 115
 					<label for="searchbox" class="hidden-visually">
116
-						<?php p($l->t('Search'));?>
116
+						<?php p($l->t('Search')); ?>
117 117
 					</label>
118 118
 					<input id="searchbox" type="search" name="query"
119 119
 						value="" required
@@ -125,8 +125,8 @@  discard block
 block discarded – undo
125 125
 						<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
126 126
 							<?php if ($_['userAvatarSet']): ?>
127 127
 								<img alt="" width="32" height="32"
128
-								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
129
-								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']]));?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']]));?> 4x"
128
+								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
129
+								srcset="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 64, 'v' => $_['userAvatarVersion']])); ?> 2x, <?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 128, 'v' => $_['userAvatarVersion']])); ?> 4x"
130 130
 								>
131 131
 							<?php endif; ?>
132 132
 						</div>
@@ -134,11 +134,11 @@  discard block
 block discarded – undo
134 134
 					</div>
135 135
 					<div id="expanddiv">
136 136
 					<ul>
137
-					<?php foreach($_['settingsnavigation'] as $entry):?>
137
+					<?php foreach ($_['settingsnavigation'] as $entry):?>
138 138
 						<li>
139 139
 							<a href="<?php print_unescaped($entry['href']); ?>"
140
-								<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
141
-								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
140
+								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
141
+								<img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
142 142
 								<?php p($entry['name']) ?>
143 143
 							</a>
144 144
 						</li>
Please login to merge, or discard this patch.
settings/templates/email.new_user.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 	<tr><td>
3 3
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
4 4
 				<tr>
5
-					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>" bordercolor="<?php p($theme->getColorPrimary());?>" border>
5
+					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>" bordercolor="<?php p($theme->getColorPrimary()); ?>" border>
6 6
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
7 7
 					</td>
8 8
 				</tr>
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
25 25
 						<?php p($theme->getName()); ?> -
26 26
 						<?php p($theme->getSlogan()); ?>
27
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
27
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
28 28
 					</td>
29 29
 				</tr>
30 30
 				<tr>
Please login to merge, or discard this patch.
themes/example/defaults.php 1 patch
Indentation   +130 added lines, -130 removed lines patch added patch discarded remove patch
@@ -20,135 +20,135 @@
 block discarded – undo
20 20
 
21 21
 class OC_Theme {
22 22
 
23
-	/**
24
-	 * Returns the base URL
25
-	 * @return string URL
26
-	 */
27
-	public function getBaseUrl() {
28
-		return 'https://nextcloud.com';
29
-	}
30
-
31
-	/**
32
-	 * Returns the URL where the sync clients are listed
33
-	 * @return string URL
34
-	 */
35
-	public function getSyncClientUrl() {
36
-		return 'https://nextcloud.com/install/#install-clients';
37
-	}
38
-
39
-	/**
40
-	 * Returns the URL to the App Store for the iOS Client
41
-	 * @return string URL
42
-	 */
43
-	public function getiOSClientUrl() {
44
-		return 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8';
45
-	}
46
-
47
-	/**
48
-	 * Returns the AppId for the App Store for the iOS Client
49
-	 * @return string AppId
50
-	 */
51
-	public function getiTunesAppId() {
52
-		return '1125420102';
53
-	}
54
-
55
-	/**
56
-	 * Returns the URL to Google Play for the Android Client
57
-	 * @return string URL
58
-	 */
59
-	public function getAndroidClientUrl() {
60
-		return 'https://play.google.com/store/apps/details?id=com.nextcloud.client';
61
-	}
62
-
63
-	/**
64
-	 * Returns the documentation URL
65
-	 * @return string URL
66
-	 */
67
-	public function getDocBaseUrl() {
68
-		return 'https://docs.nextcloud.com';
69
-	}
70
-
71
-	/**
72
-	 * Returns the title
73
-	 * @return string title
74
-	 */
75
-	public function getTitle() {
76
-		return 'Custom Cloud';
77
-	}
78
-
79
-	/**
80
-	 * Returns the short name of the software
81
-	 * @return string title
82
-	 */
83
-	public function getName() {
84
-		return 'Custom Cloud';
85
-	}
86
-
87
-	/**
88
-	 * Returns the short name of the software containing HTML strings
89
-	 * @return string title
90
-	 */
91
-	public function getHTMLName() {
92
-		return 'Custom Cloud';
93
-	}
94
-
95
-	/**
96
-	 * Returns entity (e.g. company name) - used for footer, copyright
97
-	 * @return string entity name
98
-	 */
99
-	public function getEntity() {
100
-		return 'Custom Cloud Co.';
101
-	}
102
-
103
-	/**
104
-	 * Returns slogan
105
-	 * @return string slogan
106
-	 */
107
-	public function getSlogan() {
108
-		return 'Your custom cloud, personalized for you!';
109
-	}
110
-
111
-	/**
112
-	 * Returns logo claim
113
-	 * @return string logo claim
114
-	 */
115
-	public function getLogoClaim() {
116
-		return '';
117
-	}
118
-
119
-	/**
120
-	 * Returns short version of the footer
121
-	 * @return string short footer
122
-	 */
123
-	public function getShortFooter() {
124
-		$footer = '© 2016 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
125
-			'<br/>' . $this->getSlogan();
126
-
127
-		return $footer;
128
-	}
129
-
130
-	/**
131
-	 * Returns long version of the footer
132
-	 * @return string long footer
133
-	 */
134
-	public function getLongFooter() {
135
-		$footer = '© 2016 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
136
-			'<br/>' . $this->getSlogan();
137
-
138
-		return $footer;
139
-	}
140
-
141
-	public function buildDocLinkToKey($key) {
142
-		return $this->getDocBaseUrl() . '/server/11/go.php?to=' . $key;
143
-	}
144
-
145
-
146
-	/**
147
-	 * Returns mail header color
148
-	 * @return string
149
-	 */
150
-	public function getColorPrimary() {
151
-		return '#745bca';
152
-	}
23
+    /**
24
+     * Returns the base URL
25
+     * @return string URL
26
+     */
27
+    public function getBaseUrl() {
28
+        return 'https://nextcloud.com';
29
+    }
30
+
31
+    /**
32
+     * Returns the URL where the sync clients are listed
33
+     * @return string URL
34
+     */
35
+    public function getSyncClientUrl() {
36
+        return 'https://nextcloud.com/install/#install-clients';
37
+    }
38
+
39
+    /**
40
+     * Returns the URL to the App Store for the iOS Client
41
+     * @return string URL
42
+     */
43
+    public function getiOSClientUrl() {
44
+        return 'https://itunes.apple.com/us/app/nextcloud/id1125420102?mt=8';
45
+    }
46
+
47
+    /**
48
+     * Returns the AppId for the App Store for the iOS Client
49
+     * @return string AppId
50
+     */
51
+    public function getiTunesAppId() {
52
+        return '1125420102';
53
+    }
54
+
55
+    /**
56
+     * Returns the URL to Google Play for the Android Client
57
+     * @return string URL
58
+     */
59
+    public function getAndroidClientUrl() {
60
+        return 'https://play.google.com/store/apps/details?id=com.nextcloud.client';
61
+    }
62
+
63
+    /**
64
+     * Returns the documentation URL
65
+     * @return string URL
66
+     */
67
+    public function getDocBaseUrl() {
68
+        return 'https://docs.nextcloud.com';
69
+    }
70
+
71
+    /**
72
+     * Returns the title
73
+     * @return string title
74
+     */
75
+    public function getTitle() {
76
+        return 'Custom Cloud';
77
+    }
78
+
79
+    /**
80
+     * Returns the short name of the software
81
+     * @return string title
82
+     */
83
+    public function getName() {
84
+        return 'Custom Cloud';
85
+    }
86
+
87
+    /**
88
+     * Returns the short name of the software containing HTML strings
89
+     * @return string title
90
+     */
91
+    public function getHTMLName() {
92
+        return 'Custom Cloud';
93
+    }
94
+
95
+    /**
96
+     * Returns entity (e.g. company name) - used for footer, copyright
97
+     * @return string entity name
98
+     */
99
+    public function getEntity() {
100
+        return 'Custom Cloud Co.';
101
+    }
102
+
103
+    /**
104
+     * Returns slogan
105
+     * @return string slogan
106
+     */
107
+    public function getSlogan() {
108
+        return 'Your custom cloud, personalized for you!';
109
+    }
110
+
111
+    /**
112
+     * Returns logo claim
113
+     * @return string logo claim
114
+     */
115
+    public function getLogoClaim() {
116
+        return '';
117
+    }
118
+
119
+    /**
120
+     * Returns short version of the footer
121
+     * @return string short footer
122
+     */
123
+    public function getShortFooter() {
124
+        $footer = '© 2016 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
125
+            '<br/>' . $this->getSlogan();
126
+
127
+        return $footer;
128
+    }
129
+
130
+    /**
131
+     * Returns long version of the footer
132
+     * @return string long footer
133
+     */
134
+    public function getLongFooter() {
135
+        $footer = '© 2016 <a href="'.$this->getBaseUrl().'" target="_blank\">'.$this->getEntity().'</a>'.
136
+            '<br/>' . $this->getSlogan();
137
+
138
+        return $footer;
139
+    }
140
+
141
+    public function buildDocLinkToKey($key) {
142
+        return $this->getDocBaseUrl() . '/server/11/go.php?to=' . $key;
143
+    }
144
+
145
+
146
+    /**
147
+     * Returns mail header color
148
+     * @return string
149
+     */
150
+    public function getColorPrimary() {
151
+        return '#745bca';
152
+    }
153 153
 
154 154
 }
Please login to merge, or discard this patch.
apps/federatedfilesharing/settings-personal.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 $isIE8 = false;
36 36
 preg_match('/MSIE (.*?);/', $_SERVER['HTTP_USER_AGENT'], $matches);
37 37
 if (count($matches) > 0 && $matches[1] <= 9) {
38
-	$isIE8 = true;
38
+    $isIE8 = true;
39 39
 }
40 40
 
41 41
 $cloudID = \OC::$server->getUserSession()->getUser()->getCloudId();
@@ -45,15 +45,15 @@  discard block
 block discarded – undo
45 45
 $color = $theme->getColorPrimary();
46 46
 $textColor = "#ffffff";
47 47
 if(\OC::$server->getAppManager()->isEnabledForUser("theming")) {
48
-	$logoPath = $theme->getLogo();
49
-	try {
50
-		$util = \OC::$server->query("\OCA\Theming\Util");
51
-		if($util->invertTextColor($color)) {
52
-			$textColor = "#000000";
53
-		}
54
-	} catch (OCP\AppFramework\QueryException $e) {
48
+    $logoPath = $theme->getLogo();
49
+    try {
50
+        $util = \OC::$server->query("\OCA\Theming\Util");
51
+        if($util->invertTextColor($color)) {
52
+            $textColor = "#000000";
53
+        }
54
+    } catch (OCP\AppFramework\QueryException $e) {
55 55
 		
56
-	}
56
+    }
57 57
 }
58 58
 
59 59
 
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -39,16 +39,16 @@
 block discarded – undo
39 39
 }
40 40
 
41 41
 $cloudID = \OC::$server->getUserSession()->getUser()->getCloudId();
42
-$url = 'https://nextcloud.com/federation#' . $cloudID;
42
+$url = 'https://nextcloud.com/federation#'.$cloudID;
43 43
 $logoPath = \OC::$server->getURLGenerator()->imagePath('core', 'logo-icon.svg');
44 44
 $theme = \OC::$server->getThemingDefaults();
45 45
 $color = $theme->getColorPrimary();
46 46
 $textColor = "#ffffff";
47
-if(\OC::$server->getAppManager()->isEnabledForUser("theming")) {
47
+if (\OC::$server->getAppManager()->isEnabledForUser("theming")) {
48 48
 	$logoPath = $theme->getLogo();
49 49
 	try {
50 50
 		$util = \OC::$server->query("\OCA\Theming\Util");
51
-		if($util->invertTextColor($color)) {
51
+		if ($util->invertTextColor($color)) {
52 52
 			$textColor = "#000000";
53 53
 		}
54 54
 	} catch (OCP\AppFramework\QueryException $e) {
Please login to merge, or discard this patch.
apps/sharebymail/templates/mail.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	<tr><td>
28 28
 			<table cellspacing="0" cellpadding="0" border="0" width="600px">
29 29
 				<tr>
30
-					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary());?>">
30
+					<td colspan="2" bgcolor="<?php p($theme->getColorPrimary()); ?>">
31 31
 						<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.png'))); ?>" alt="<?php p($theme->getName()); ?>"/>
32 32
 					</td>
33 33
 				</tr>
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 					<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">--<br>
53 53
 						<?php p($theme->getName()); ?> -
54 54
 						<?php p($theme->getSlogan()); ?>
55
-						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl());?></a>
55
+						<br><a href="<?php p($theme->getBaseUrl()); ?>"><?php p($theme->getBaseUrl()); ?></a>
56 56
 					</td>
57 57
 				</tr>
58 58
 				<tr>
Please login to merge, or discard this patch.
apps/theming/lib/Settings/Admin.php 1 patch
Indentation   +60 added lines, -60 removed lines patch added patch discarded remove patch
@@ -31,72 +31,72 @@
 block discarded – undo
31 31
 use OCP\Settings\ISettings;
32 32
 
33 33
 class Admin implements ISettings {
34
-	/** @var IConfig */
35
-	private $config;
36
-	/** @var IL10N */
37
-	private $l;
38
-	/** @var ThemingDefaults */
39
-	private $themingDefaults;
40
-	/** @var IURLGenerator */
41
-	private $urlGenerator;
34
+    /** @var IConfig */
35
+    private $config;
36
+    /** @var IL10N */
37
+    private $l;
38
+    /** @var ThemingDefaults */
39
+    private $themingDefaults;
40
+    /** @var IURLGenerator */
41
+    private $urlGenerator;
42 42
 
43
-	public function __construct(IConfig $config,
44
-								IL10N $l,
45
-								ThemingDefaults $themingDefaults,
46
-								IURLGenerator $urlGenerator) {
47
-		$this->config = $config;
48
-		$this->l = $l;
49
-		$this->themingDefaults = $themingDefaults;
50
-		$this->urlGenerator = $urlGenerator;
51
-	}
43
+    public function __construct(IConfig $config,
44
+                                IL10N $l,
45
+                                ThemingDefaults $themingDefaults,
46
+                                IURLGenerator $urlGenerator) {
47
+        $this->config = $config;
48
+        $this->l = $l;
49
+        $this->themingDefaults = $themingDefaults;
50
+        $this->urlGenerator = $urlGenerator;
51
+    }
52 52
 
53
-	/**
54
-	 * @return TemplateResponse
55
-	 */
56
-	public function getForm() {
57
-		$path = $this->urlGenerator->linkToRoute('theming.Theming.updateLogo');
53
+    /**
54
+     * @return TemplateResponse
55
+     */
56
+    public function getForm() {
57
+        $path = $this->urlGenerator->linkToRoute('theming.Theming.updateLogo');
58 58
 
59
-		$themable = true;
60
-		$errorMessage = '';
61
-		$theme = $this->config->getSystemValue('theme', '');
62
-		if ($theme !== '') {
63
-			$themable = false;
64
-			$errorMessage = $this->l->t('You are already using a custom theme');
65
-		}
59
+        $themable = true;
60
+        $errorMessage = '';
61
+        $theme = $this->config->getSystemValue('theme', '');
62
+        if ($theme !== '') {
63
+            $themable = false;
64
+            $errorMessage = $this->l->t('You are already using a custom theme');
65
+        }
66 66
 
67
-		$parameters = [
68
-			'themable'        => $themable,
69
-			'errorMessage'    => $errorMessage,
70
-			'name'            => $this->themingDefaults->getEntity(),
71
-			'url'             => $this->themingDefaults->getBaseUrl(),
72
-			'slogan'          => $this->themingDefaults->getSlogan(),
73
-			'color'           => $this->themingDefaults->getColorPrimary(),
74
-			'logo'            => $this->themingDefaults->getLogo(),
75
-			'logoMime'        => $this->config->getAppValue('theming', 'logoMime', ''),
76
-			'background'      => $this->themingDefaults->getBackground(),
77
-			'backgroundMime'  => $this->config->getAppValue('theming', 'backgroundMime', ''),
78
-			'uploadLogoRoute' => $path,
79
-		];
67
+        $parameters = [
68
+            'themable'        => $themable,
69
+            'errorMessage'    => $errorMessage,
70
+            'name'            => $this->themingDefaults->getEntity(),
71
+            'url'             => $this->themingDefaults->getBaseUrl(),
72
+            'slogan'          => $this->themingDefaults->getSlogan(),
73
+            'color'           => $this->themingDefaults->getColorPrimary(),
74
+            'logo'            => $this->themingDefaults->getLogo(),
75
+            'logoMime'        => $this->config->getAppValue('theming', 'logoMime', ''),
76
+            'background'      => $this->themingDefaults->getBackground(),
77
+            'backgroundMime'  => $this->config->getAppValue('theming', 'backgroundMime', ''),
78
+            'uploadLogoRoute' => $path,
79
+        ];
80 80
 
81
-		return new TemplateResponse('theming', 'settings-admin', $parameters, '');
82
-	}
81
+        return new TemplateResponse('theming', 'settings-admin', $parameters, '');
82
+    }
83 83
 
84
-	/**
85
-	 * @return string the section ID, e.g. 'sharing'
86
-	 */
87
-	public function getSection() {
88
-		return 'theming';
89
-	}
84
+    /**
85
+     * @return string the section ID, e.g. 'sharing'
86
+     */
87
+    public function getSection() {
88
+        return 'theming';
89
+    }
90 90
 
91
-	/**
92
-	 * @return int whether the form should be rather on the top or bottom of
93
-	 * the admin section. The forms are arranged in ascending order of the
94
-	 * priority values. It is required to return a value between 0 and 100.
95
-	 *
96
-	 * E.g.: 70
97
-	 */
98
-	public function getPriority() {
99
-		return 5;
100
-	}
91
+    /**
92
+     * @return int whether the form should be rather on the top or bottom of
93
+     * the admin section. The forms are arranged in ascending order of the
94
+     * priority values. It is required to return a value between 0 and 100.
95
+     *
96
+     * E.g.: 70
97
+     */
98
+    public function getPriority() {
99
+        return 5;
100
+    }
101 101
 
102 102
 }
Please login to merge, or discard this patch.