Inspection of "New standard for top right header" - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#8373)

by John

created 2018-03-07 10:05 UTC

Status

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
 		<meta charset="utf-8">
 		<title>
 			<?php
-				p(!empty($_['application'])?$_['application'].' - ':'');
+				p(!empty($_['application']) ? $_['application'].' - ' : '');
 				p($theme->getTitle());
 			?>
 		</title>
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
 		<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
 		<meta name="apple-mobile-web-app-capable" content="yes">
 		<meta name="apple-mobile-web-app-status-bar-style" content="black">
-		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:$theme->getTitle()); ?>">
+		<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files') ? $_['application'] : $theme->getTitle()); ?>">
 		<meta name="mobile-web-app-capable" content="yes">
 		<meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>">
 		<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 		<?php emit_script_loading_tags($_); ?>
 		<?php print_unescaped($_['headers']); ?>
 	</head>
-	<body id="<?php p($_['bodyid']);?>">
+	<body id="<?php p($_['bodyid']); ?>">
 	<?php include 'layout.noscript.warning.php'; ?>
 	<div id="notification-container">
 		<div id="notification"></div>
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
 					id="nextcloud">
 					<div class="logo logo-icon">
 						<h1 class="hidden-visually">
-							<?php p($theme->getName()); ?> <?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
+							<?php p($theme->getName()); ?> <?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
 						</h1>
 					</div>
 				</a>
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
 										<?php if ($_['themingInvertMenu']) { ?>
 										<defs><filter id="invertMenuMain-<?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" /></filter></defs>
 										<?php } ?>
-										<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon" />
+										<image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon" />
 									</svg>
 								<div class="icon-loading-small-dark"
 									 style="display:none;"></div>
@@ -72,13 +72,13 @@  discard block
 block discarded – undo
 					<div id="navigation" style="display: none;">
 						<div id="apps">
 							<ul>
-								<?php foreach($_['navigation'] as $entry): ?>
+								<?php foreach ($_['navigation'] as $entry): ?>
 									<li data-id="<?php p($entry['id']); ?>">
 									<a href="<?php print_unescaped($entry['href']); ?>"
-										<?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
+										<?php if ($entry['active']): ?> class="active"<?php endif; ?>>
 										<svg width="16" height="16" viewBox="0 0 16 16">
 											<defs><filter id="invertMenuMore-<?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>
-											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>"  class="app-icon"></image>
+											<image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>"  class="app-icon"></image>
 										</svg>
 										<div class="icon-loading-small" style="display:none;"></div>
 										<span><?php p($entry['name']); ?></span>
@@ -95,12 +95,12 @@  discard block
 block discarded – undo
 			<div class="header-right">
 				<form class="searchbox" action="#" method="post" role="search" novalidate>
 					<label for="searchbox" class="hidden-visually">
-						<?php p($l->t('Search'));?>
+						<?php p($l->t('Search')); ?>
 					</label>
 					<input id="searchbox" type="search" name="query"
 						value="" required
 						autocomplete="off">
-					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button>
+					<button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search')); ?></span></button>
 				</form>
 				<div id="contactsmenu">
 					<div class="icon-contacts menutoggle" tabindex="0" role="link"></div>
@@ -111,8 +111,8 @@  discard block
 block discarded – undo
 						<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
 							<?php if ($_['userAvatarSet']): ?>
 								<img alt="" width="32" height="32"
-								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
-								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"
+								src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
+								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"
 								>
 							<?php endif; ?>
 						</div>
@@ -120,11 +120,11 @@  discard block
 block discarded – undo
 					</div>
 					<div id="expanddiv" style="display:none;">
 					<ul>
-					<?php foreach($_['settingsnavigation'] as $entry):?>
+					<?php foreach ($_['settingsnavigation'] as $entry):?>
 						<li>
 							<a href="<?php print_unescaped($entry['href']); ?>"
-								<?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
-								<img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
+								<?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
+								<img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
 								<?php p($entry['name']) ?>
 							</a>
 						</li>

Please login to merge, or discard this patch.

apps/files_sharing/lib/Template/LinkMenuAction.php 2 patches

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

@@ -28,31 +28,31 @@
 block discarded – undo
 
 class LinkMenuAction extends SimpleMenuAction {
 
-	/**
-	 * LinkMenuAction constructor.
-	 *
-	 * @param string $label
-	 * @param string $icon
-	 * @param string $link
-	 */
-	public function __construct(string $label, string $icon, string $link) {
-		parent::__construct('directLink-container', $label, $icon, $link);
-	}
+    /**
+     * LinkMenuAction constructor.
+     *
+     * @param string $label
+     * @param string $icon
+     * @param string $link
+     */
+    public function __construct(string $label, string $icon, string $link) {
+        parent::__construct('directLink-container', $label, $icon, $link);
+    }
 
-	/**
-	 * @return string
-	 */
-	public function render(): string {
-		return '<li>' .
-			'<a id="directLink-container">' .
-			'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
-			'<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
-			'</a>' .
-			'</li>' .
-			'<li>' .
-			'<span class="menuitem">' .
-			'<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
-			'</span>' .
-			'</li>';
-	}
+    /**
+     * @return string
+     */
+    public function render(): string {
+        return '<li>' .
+            '<a id="directLink-container">' .
+            '<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
+            '<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
+            '</a>' .
+            '</li>' .
+            '<li>' .
+            '<span class="menuitem">' .
+            '<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
+            '</span>' .
+            '</li>';
+    }
 }

Please login to merge, or discard this patch.

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -43,16 +43,16 @@
 block discarded – undo
 	 * @return string
 	 */
 	public function render(): string {
-		return '<li>' .
-			'<a id="directLink-container">' .
-			'<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
-			'<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
-			'</a>' .
-			'</li>' .
-			'<li>' .
-			'<span class="menuitem">' .
-			'<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
-			'</span>' .
+		return '<li>'.
+			'<a id="directLink-container">'.
+			'<span class="icon '.Util::sanitizeHTML($this->getIcon()).'"></span>'.
+			'<label for="directLink">'.Util::sanitizeHTML($this->getLabel()).'</label>'.
+			'</a>'.
+			'</li>'.
+			'<li>'.
+			'<span class="menuitem">'.
+			'<input id="directLink" type="text" readonly="" value="'.Util::sanitizeHTML($this->getLink()).'">'.
+			'</span>'.
 			'</li>';
 	}
 }

Please login to merge, or discard this patch.

core/templates/layout.public.php 2 patches

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

@@ -4,9 +4,9 @@  discard block
 block discarded – undo
 	<meta charset="utf-8">
 	<title>
 		<?php
-		p(!empty($_['application'])?$_['application'].' - ':'');
-		p($theme->getTitle());
-		?>
+        p(!empty($_['application'])?$_['application'].' - ':'');
+        p($theme->getTitle());
+        ?>
 	</title>
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 	<meta name="referrer" content="never">
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
 		</div>
 
 		<?php
-		/** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
-		if($template->getActionCount() !== 0) {
-			$primary = $template->getPrimaryAction();
-			$others = $template->getOtherActions();
-			?>
+        /** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
+        if($template->getActionCount() !== 0) {
+            $primary = $template->getPrimaryAction();
+            $others = $template->getOtherActions();
+            ?>
 		<div class="header-right">
 			<span id="header-primary-action" class="<?php if($template->getActionCount() === 1) {  p($primary->getIcon()); } ?>">
 				<a href="<?php p($primary->getLink()); ?>">
@@ -59,11 +59,11 @@  discard block
 block discarded – undo
 				<div id="share-menu" class="popovermenu menu">
 					<ul>
 						<?php
-							/** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
-							foreach($template->getOtherActions() as $action) {
-								print_unescaped($action->render());
-							}
-						?>
+                            /** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
+                            foreach($template->getOtherActions() as $action) {
+                                print_unescaped($action->render());
+                            }
+                        ?>
 					</ul>
 				</div>
 			</div>

Please login to merge, or discard this patch.

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -4,7 +4,7 @@  discard block
 block discarded – undo
 	<meta charset="utf-8">
 	<title>
 		<?php
-		p(!empty($_['application'])?$_['application'].' - ':'');
+		p(!empty($_['application']) ? $_['application'].' - ' : '');
 		p($theme->getTitle());
 		?>
 	</title>
@@ -14,7 +14,7 @@  discard block
 block discarded – undo
 	<meta name="apple-itunes-app" content="app-id=<?php p($theme->getiTunesAppId()); ?>">
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="apple-mobile-web-app-status-bar-style" content="black">
-	<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid']!='files')? $_['application']:$theme->getTitle()); ?>">
+	<meta name="apple-mobile-web-app-title" content="<?php p((!empty($_['application']) && $_['appid'] != 'files') ? $_['application'] : $theme->getTitle()); ?>">
 	<meta name="mobile-web-app-capable" content="yes">
 	<meta name="theme-color" content="<?php p($theme->getColorPrimary()); ?>">
 	<link rel="icon" href="<?php print_unescaped(image_path($_['appid'], 'favicon.ico')); /* IE11+ supports png */ ?>">
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 	<?php emit_script_loading_tags($_); ?>
 	<?php print_unescaped($_['headers']); ?>
 </head>
-<body id="<?php p($_['bodyid']);?>">
+<body id="<?php p($_['bodyid']); ?>">
 <?php include('layout.noscript.warning.php'); ?>
 <header>
 	<div id="header" class="<?php p($_['header-classes']); ?>">
@@ -43,24 +43,24 @@  discard block
 block discarded – undo
 
 		<?php
 		/** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
-		if($template->getActionCount() !== 0) {
+		if ($template->getActionCount() !== 0) {
 			$primary = $template->getPrimaryAction();
 			$others = $template->getOtherActions();
 			?>
 		<div class="header-right">
-			<span id="header-primary-action" class="<?php if($template->getActionCount() === 1) {  p($primary->getIcon()); } ?>">
+			<span id="header-primary-action" class="<?php if ($template->getActionCount() === 1) {  p($primary->getIcon()); } ?>">
 				<a href="<?php p($primary->getLink()); ?>">
 					<span class="share-menutoggle-text"><?php p($primary->getLabel()) ?></span>
 				</a>
 			</span>
-			<?php if($template->getActionCount()>1) { ?>
+			<?php if ($template->getActionCount() > 1) { ?>
 			<div id="header-secondary-action">
 				<span id="header-actions-toggle" class="menutoggle icon-more-white"></span>
 				<div id="share-menu" class="popovermenu menu">
 					<ul>
 						<?php
 							/** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
-							foreach($template->getOtherActions() as $action) {
+							foreach ($template->getOtherActions() as $action) {
 								print_unescaped($action->render());
 							}
 						?>

Please login to merge, or discard this 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 */ ?>">
		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	<?php emit_script_loading_tags($_); ?>
26	26	<?php print_unescaped($_['headers']); ?>
27	27	</head>
28		- <body id="<?php p($_['bodyid']);?>">
	28	+ <body id="<?php p($_['bodyid']); ?>">
29	29	<?php include 'layout.noscript.warning.php'; ?>
30	30	<div id="notification-container">
31	31	<div id="notification"></div>
		@@ -36,7 +36,7 @@ discard block
		block discarded – undo
36	36	id="nextcloud">
37	37	<div class="logo logo-icon">
38	38	<h1 class="hidden-visually">
39		- <?php p($theme->getName()); ?> <?php p(!empty($_['application'])?$_['application']: $l->t('Apps')); ?>
	39	+ <?php p($theme->getName()); ?> <?php p(!empty($_['application']) ? $_['application'] : $l->t('Apps')); ?>
40	40	</h1>
41	41	</div>
42	42	</a>
		@@ -50,7 +50,7 @@ discard block
		block discarded – undo
50	50	<?php if ($_['themingInvertMenu']) { ?>
51	51	<defs><filter id="invertMenuMain-<?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" /></filter></defs>
52	52	<?php } ?>
53		- <image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon" />
	53	+ <image x="0" y="0" width="20" height="20" preserveAspectRatio="xMinYMin meet"<?php if ($_['themingInvertMenu']) { ?> filter="url(#invertMenuMain-<?php p($entry['id']); ?>)"<?php } ?> xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>" class="app-icon" />
54	54	</svg>
55	55	<div class="icon-loading-small-dark"
56	56	style="display:none;"></div>
		@@ -72,13 +72,13 @@ discard block
		block discarded – undo
72	72	<div id="navigation" style="display: none;">
73	73	<div id="apps">
74	74	<ul>
75		- <?php foreach($_['navigation'] as $entry): ?>
	75	+ <?php foreach ($_['navigation'] as $entry): ?>
76	76	<li data-id="<?php p($entry['id']); ?>">
77	77	<a href="<?php print_unescaped($entry['href']); ?>"
78		- <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
	78	+ <?php if ($entry['active']): ?> class="active"<?php endif; ?>>
79	79	<svg width="16" height="16" viewBox="0 0 16 16">
80	80	<defs><filter id="invertMenuMore-<?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>
81		- <image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>" class="app-icon"></image>
	81	+ <image x="0" y="0" width="16" height="16" preserveAspectRatio="xMinYMin meet" filter="url(#invertMenuMore-<?php p($entry['id']); ?>)" xlink:href="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>" class="app-icon"></image>
82	82	</svg>
83	83	<div class="icon-loading-small" style="display:none;"></div>
84	84	<span><?php p($entry['name']); ?></span>
		@@ -95,12 +95,12 @@ discard block
		block discarded – undo
95	95	<div class="header-right">
96	96	<form class="searchbox" action="#" method="post" role="search" novalidate>
97	97	<label for="searchbox" class="hidden-visually">
98		- <?php p($l->t('Search'));?>
	98	+ <?php p($l->t('Search')); ?>
99	99	</label>
100	100	<input id="searchbox" type="search" name="query"
101	101	value="" required
102	102	autocomplete="off">
103		- <button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search'));?></span></button>
	103	+ <button class="icon-close-white" type="reset"><span class="hidden-visually"><?php p($l->t('Reset search')); ?></span></button>
104	104	</form>
105	105	<div id="contactsmenu">
106	106	<div class="icon-contacts menutoggle" tabindex="0" role="link"></div>
		@@ -111,8 +111,8 @@ discard block
		block discarded – undo
111	111	<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown'); } else { print_unescaped('" style="display: none'); } ?>">
112	112	<?php if ($_['userAvatarSet']): ?>
113	113	<img alt="" width="32" height="32"
114		- src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']]));?>"
115		- 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"
	114	+ src="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.getAvatar', ['userId' => $_['user_uid'], 'size' => 32, 'v' => $_['userAvatarVersion']])); ?>"
	115	+ 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"
116	116	>
117	117	<?php endif; ?>
118	118	</div>
		@@ -120,11 +120,11 @@ discard block
		block discarded – undo
120	120	</div>
121	121	<div id="expanddiv" style="display:none;">
122	122	<ul>
123		- <?php foreach($_['settingsnavigation'] as $entry):?>
	123	+ <?php foreach ($_['settingsnavigation'] as $entry):?>
124	124	<li>
125	125	<a href="<?php print_unescaped($entry['href']); ?>"
126		- <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>>
127		- <img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
	126	+ <?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
	127	+ <img alt="" src="<?php print_unescaped($entry['icon'].'?v='.$_['versionHash']); ?>">
128	128	<?php p($entry['name']) ?>
129	129	</a>
130	130	</li>

		@@ -28,31 +28,31 @@
		block discarded – undo
28	28
29	29	class LinkMenuAction extends SimpleMenuAction {
30	30
31		- /**
32		- * LinkMenuAction constructor.
33		- *
34		- * @param string $label
35		- * @param string $icon
36		- * @param string $link
37		- */
38		- public function __construct(string $label, string $icon, string $link) {
39		- parent::__construct('directLink-container', $label, $icon, $link);
40		- }
	31	+ /**
	32	+ * LinkMenuAction constructor.
	33	+ *
	34	+ * @param string $label
	35	+ * @param string $icon
	36	+ * @param string $link
	37	+ */
	38	+ public function __construct(string $label, string $icon, string $link) {
	39	+ parent::__construct('directLink-container', $label, $icon, $link);
	40	+ }
41	41
42		- /**
43		- * @return string
44		- */
45		- public function render(): string {
46		- return '<li>' .
47		- '<a id="directLink-container">' .
48		- '<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
49		- '<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
50		- '</a>' .
51		- '</li>' .
52		- '<li>' .
53		- '<span class="menuitem">' .
54		- '<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
55		- '</span>' .
56		- '</li>';
57		- }
	42	+ /**
	43	+ * @return string
	44	+ */
	45	+ public function render(): string {
	46	+ return '<li>' .
	47	+ '<a id="directLink-container">' .
	48	+ '<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
	49	+ '<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
	50	+ '</a>' .
	51	+ '</li>' .
	52	+ '<li>' .
	53	+ '<span class="menuitem">' .
	54	+ '<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
	55	+ '</span>' .
	56	+ '</li>';
	57	+ }
58	58	}

		@@ -43,16 +43,16 @@
		block discarded – undo
43	43	* @return string
44	44	*/
45	45	public function render(): string {
46		- return '<li>' .
47		- '<a id="directLink-container">' .
48		- '<span class="icon ' . Util::sanitizeHTML($this->getIcon()) . '"></span>' .
49		- '<label for="directLink">' . Util::sanitizeHTML($this->getLabel()) . '</label>' .
50		- '</a>' .
51		- '</li>' .
52		- '<li>' .
53		- '<span class="menuitem">' .
54		- '<input id="directLink" type="text" readonly="" value="' . Util::sanitizeHTML($this->getLink()) . '">' .
55		- '</span>' .
	46	+ return '<li>'.
	47	+ '<a id="directLink-container">'.
	48	+ '<span class="icon '.Util::sanitizeHTML($this->getIcon()).'"></span>'.
	49	+ '<label for="directLink">'.Util::sanitizeHTML($this->getLabel()).'</label>'.
	50	+ '</a>'.
	51	+ '</li>'.
	52	+ '<li>'.
	53	+ '<span class="menuitem">'.
	54	+ '<input id="directLink" type="text" readonly="" value="'.Util::sanitizeHTML($this->getLink()).'">'.
	55	+ '</span>'.
56	56	'</li>';
57	57	}
58	58	}

		@@ -4,9 +4,9 @@ discard block
		block discarded – undo
4	4	<meta charset="utf-8">
5	5	<title>
6	6	<?php
7		- p(!empty($_['application'])?$_['application'].' - ':'');
8		- p($theme->getTitle());
9		- ?>
	7	+ p(!empty($_['application'])?$_['application'].' - ':'');
	8	+ p($theme->getTitle());
	9	+ ?>
10	10	</title>
11	11	<meta http-equiv="X-UA-Compatible" content="IE=edge">
12	12	<meta name="referrer" content="never">
		@@ -42,11 +42,11 @@ discard block
		block discarded – undo
42	42	</div>
43	43
44	44	<?php
45		- /** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
46		- if($template->getActionCount() !== 0) {
47		- $primary = $template->getPrimaryAction();
48		- $others = $template->getOtherActions();
49		- ?>
	45	+ /** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
	46	+ if($template->getActionCount() !== 0) {
	47	+ $primary = $template->getPrimaryAction();
	48	+ $others = $template->getOtherActions();
	49	+ ?>
50	50	<div class="header-right">
51	51	<span id="header-primary-action" class="<?php if($template->getActionCount() === 1) { p($primary->getIcon()); } ?>">
52	52	<a href="<?php p($primary->getLink()); ?>">
		@@ -59,11 +59,11 @@ discard block
		block discarded – undo
59	59	<div id="share-menu" class="popovermenu menu">
60	60	<ul>
61	61	<?php
62		- /** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
63		- foreach($template->getOtherActions() as $action) {
64		- print_unescaped($action->render());
65		- }
66		- ?>
	62	+ /** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
	63	+ foreach($template->getOtherActions() as $action) {
	64	+ print_unescaped($action->render());
	65	+ }
	66	+ ?>
67	67	</ul>
68	68	</div>
69	69	</div>

nextcloud / server

Pull Request — master (#8373)

Status

Category

Spacing +15 added lines, -15 removed lines patch added patch discarded remove patch

Indentation +26 added lines, -26 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Indentation +13 added lines, -13 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch