Inspection of "Merge pull request #10530 from nextcloud/bugfix/10..." - nextcloud/server - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 49662f...f67d94 )

by Joas

created 2018-08-06 13:42 UTC

Status

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">
@@ -44,11 +44,11 @@  discard block
 block discarded – undo
 		</div>
 
 		<?php
-		/** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
-		if(isset($template) && $template->getActionCount() !== 0) {
-			$primary = $template->getPrimaryAction();
-			$others = $template->getOtherActions();
-			?>
+        /** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
+        if(isset($template) && $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()); ?>">
@@ -61,11 +61,11 @@  discard block
 block discarded – undo
 				<div id="header-actions-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 +9 added lines, -9 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>
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
 			<span id="nextcloud">
 				<div class="logo logo-icon svg"></div>
 				<h1 class="header-appname">
-					<?php if (isset($template)) { p($template->getHeaderTitle()); } else { p($theme->getName());} ?>
+					<?php if (isset($template)) { p($template->getHeaderTitle()); } else { p($theme->getName()); } ?>
 				</h1>
 				<div class="header-shared-by">
 					<?php if (isset($template)) { p($template->getHeaderDetails()); } ?>
@@ -45,24 +45,24 @@  discard block
 block discarded – undo
 
 		<?php
 		/** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
-		if(isset($template) && $template->getActionCount() !== 0) {
+		if (isset($template) && $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><?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="header-actions-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());
 							}
 						?>
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
 	<div id="content" class="app-<?php p($_['appid']) ?>" role="main">
 		<?php print_unescaped($_['content']); ?>
 	</div>
-	<?php if(isset($template) && $template->getFooterVisible()) { ?>
+	<?php if (isset($template) && $template->getFooterVisible()) { ?>
 	<footer>
 		<p class="info"><?php print_unescaped($theme->getLongFooter()); ?></p>
 	</footer>

Please login to merge, or discard this patch.

		@@ -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">
		@@ -44,11 +44,11 @@ discard block
		block discarded – undo
44	44	</div>
45	45
46	46	<?php
47		- /** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
48		- if(isset($template) && $template->getActionCount() !== 0) {
49		- $primary = $template->getPrimaryAction();
50		- $others = $template->getOtherActions();
51		- ?>
	47	+ /** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
	48	+ if(isset($template) && $template->getActionCount() !== 0) {
	49	+ $primary = $template->getPrimaryAction();
	50	+ $others = $template->getOtherActions();
	51	+ ?>
52	52	<div class="header-right">
53	53	<span id="header-primary-action" class="<?php if($template->getActionCount() === 1) { p($primary->getIcon()); } ?>">
54	54	<a href="<?php p($primary->getLink()); ?>">
		@@ -61,11 +61,11 @@ discard block
		block discarded – undo
61	61	<div id="header-actions-menu" class="popovermenu menu">
62	62	<ul>
63	63	<?php
64		- /** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
65		- foreach($template->getOtherActions() as $action) {
66		- print_unescaped($action->render());
67		- }
68		- ?>
	64	+ /** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
	65	+ foreach($template->getOtherActions() as $action) {
	66	+ print_unescaped($action->render());
	67	+ }
	68	+ ?>
69	69	</ul>
70	70	</div>
71	71	</div>

		@@ -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>
		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	<span id="nextcloud">
36	36	<div class="logo logo-icon svg"></div>
37	37	<h1 class="header-appname">
38		- <?php if (isset($template)) { p($template->getHeaderTitle()); } else { p($theme->getName());} ?>
	38	+ <?php if (isset($template)) { p($template->getHeaderTitle()); } else { p($theme->getName()); } ?>
39	39	</h1>
40	40	<div class="header-shared-by">
41	41	<?php if (isset($template)) { p($template->getHeaderDetails()); } ?>
		@@ -45,24 +45,24 @@ discard block
		block discarded – undo
45	45
46	46	<?php
47	47	/** @var \OCP\AppFramework\Http\Template\PublicTemplateResponse $template */
48		- if(isset($template) && $template->getActionCount() !== 0) {
	48	+ if (isset($template) && $template->getActionCount() !== 0) {
49	49	$primary = $template->getPrimaryAction();
50	50	$others = $template->getOtherActions();
51	51	?>
52	52	<div class="header-right">
53		- <span id="header-primary-action" class="<?php if($template->getActionCount() === 1) { p($primary->getIcon()); } ?>">
	53	+ <span id="header-primary-action" class="<?php if ($template->getActionCount() === 1) { p($primary->getIcon()); } ?>">
54	54	<a href="<?php p($primary->getLink()); ?>">
55	55	<span><?php p($primary->getLabel()) ?></span>
56	56	</a>
57	57	</span>
58		- <?php if($template->getActionCount()>1) { ?>
	58	+ <?php if ($template->getActionCount() > 1) { ?>
59	59	<div id="header-secondary-action">
60	60	<span id="header-actions-toggle" class="menutoggle icon-more-white"></span>
61	61	<div id="header-actions-menu" class="popovermenu menu">
62	62	<ul>
63	63	<?php
64	64	/** @var \OCP\AppFramework\Http\Template\IMenuAction $action */
65		- foreach($template->getOtherActions() as $action) {
	65	+ foreach ($template->getOtherActions() as $action) {
66	66	print_unescaped($action->render());
67	67	}
68	68	?>
		@@ -76,7 +76,7 @@ discard block
		block discarded – undo
76	76	<div id="content" class="app-<?php p($_['appid']) ?>" role="main">
77	77	<?php print_unescaped($_['content']); ?>
78	78	</div>
79		- <?php if(isset($template) && $template->getFooterVisible()) { ?>
	79	+ <?php if (isset($template) && $template->getFooterVisible()) { ?>
80	80	<footer>
81	81	<p class="info"><?php print_unescaped($theme->getLongFooter()); ?></p>
82	82	</footer>

nextcloud / server

Push — master ( 49662f...f67d94 )

Status

Category

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

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