Completed
Pull Request — master (#4598)
by Jan-Christoph
15:55 queued 04:40
created
core/templates/layout.user.php 1 patch
Spacing   +17 added lines, -17 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,7 +14,7 @@  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 */ ?>">
@@ -26,18 +26,18 @@  discard block
 block discarded – undo
26 26
 				<?php print_unescaped($_['inline_ocjs']); ?>
27 27
 			</script>
28 28
 		<?php endif; ?>
29
-		<?php foreach($_['cssfiles'] as $cssfile): ?>
29
+		<?php foreach ($_['cssfiles'] as $cssfile): ?>
30 30
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>">
31 31
 		<?php endforeach; ?>
32
-		<?php foreach($_['printcssfiles'] as $cssfile): ?>
32
+		<?php foreach ($_['printcssfiles'] as $cssfile): ?>
33 33
 			<link rel="stylesheet" href="<?php print_unescaped($cssfile); ?>" media="print">
34 34
 		<?php endforeach; ?>
35
-		<?php foreach($_['jsfiles'] as $jsfile): ?>
35
+		<?php foreach ($_['jsfiles'] as $jsfile): ?>
36 36
 			<script nonce="<?php p(\OC::$server->getContentSecurityPolicyNonceManager()->getNonce()) ?>" src="<?php print_unescaped($jsfile); ?>"></script>
37 37
 		<?php endforeach; ?>
38 38
 		<?php print_unescaped($_['headers']); ?>
39 39
 	</head>
40
-	<body id="<?php p($_['bodyid']);?>">
40
+	<body id="<?php p($_['bodyid']); ?>">
41 41
 	<?php include('layout.noscript.warning.php'); ?>
42 42
 	<div id="notification-container">
43 43
 		<div id="notification"></div>
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 
56 56
 				<a href="#" class="header-appname-container menutoggle" tabindex="2">
57 57
 					<h1 class="header-appname">
58
-						<?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
58
+						<?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
59 59
 					</h1>
60 60
 					<div class="icon-caret"></div>
61 61
 				</a>
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 							<a href="<?php print_unescaped($entry['href']); ?>"
67 67
 							   tabindex="3"
68 68
 								<?php if ($entry['active']): ?> class="active"<?php endif; ?>>
69
-								<img src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"
69
+								<img src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"
70 70
 									 class="app-icon"/>
71 71
 								<div class="icon-loading-small-dark"
72 72
 									 style="display:none;"></div>
@@ -88,13 +88,13 @@  discard block
 block discarded – undo
88 88
 					<div id="navigation" style="display: none;">
89 89
 						<div id="apps">
90 90
 							<ul>
91
-								<?php foreach($_['navigation'] as $entry): ?>
91
+								<?php foreach ($_['navigation'] as $entry): ?>
92 92
 									<li data-id="<?php p($entry['id']); ?>">
93 93
 									<a href="<?php print_unescaped($entry['href']); ?>" tabindex="3"
94
-										<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
94
+										<?php if ($entry['active']): ?> class="active"<?php endif; ?>>
95 95
 										<svg width="16" height="16" viewBox="0 0 16 16">
96 96
 											<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>
97
-											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon"></image>
97
+											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invert-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon"></image>
98 98
 										</svg>
99 99
 										<div class="icon-loading-small-dark" style="display:none;"></div>
100 100
 										<span><?php p($entry['name']); ?></span>
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 			<div id="header-right">
112 112
 				<form class="searchbox" action="#" method="post" role="search" novalidate>
113 113
 					<label for="searchbox" class="hidden-visually">
114
-						<?php p($l->t('Search'));?>
114
+						<?php p($l->t('Search')); ?>
115 115
 					</label>
116 116
 					<input id="searchbox" type="search" name="query"
117 117
 						value="" required
@@ -127,8 +127,8 @@  discard block
 block discarded – undo
127 127
 						<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
128 128
 							<?php if ($_['userAvatarSet']): ?>
129 129
 								<img alt="" width="32" height="32"
130
-								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
131
-								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
+								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
131
+								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"
132 132
 								>
133 133
 							<?php endif; ?>
134 134
 						</div>
@@ -136,11 +136,11 @@  discard block
 block discarded – undo
136 136
 					</div>
137 137
 					<div id="expanddiv" style="display:none;">
138 138
 					<ul>
139
-					<?php foreach($_['settingsnavigation'] as $entry):?>
139
+					<?php foreach ($_['settingsnavigation'] as $entry):?>
140 140
 						<li>
141 141
 							<a href="<?php print_unescaped($entry['href']); ?>"
142
-								<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
143
-								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
142
+								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
143
+								<img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
144 144
 								<?php p($entry['name']) ?>
145 145
 							</a>
146 146
 						</li>
Please login to merge, or discard this patch.