Inspection of "Merge pull request #890 from fraggle-DE/OCC-152_wo..." - OpencachingDeutschland/oc-server3 - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — next ( c582f9...4beac3 )

by Thomas

created 2022-08-30 08:00 UTC

Status

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

@@ -52,7 +52,7 @@
 block discarded – undo
         'OC_COOKIE_NAME'   => $opt['session']['cookiename'] . 'data',
         'VERSION_FILE'     => __DIR__ . '/okapi/meta.php',
         'OCDE_HTML_PURIFIER_SETTINGS'
-                           => $opt['html_purifier'],
+                            => $opt['html_purifier'],
         'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],
     ];
 }

Please login to merge, or discard this patch.

htdocs/okapi/index.php 1 patch

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

@@ -1,7 +1,7 @@
 block discarded – undo
 <?php
 
-$GLOBALS['rootpath'] = __DIR__.'/../';
+$GLOBALS['rootpath'] = __DIR__ . '/../';
 
 require_once __DIR__ . '/../vendor/autoload.php';
 
-require_once __DIR__ .'/../vendor/opencaching/okapi/okapi/index.php';
+require_once __DIR__ . '/../vendor/opencaching/okapi/okapi/index.php';

Please login to merge, or discard this patch.

htdocs/lib2/OcHTMLPurifier.class.php 1 patch

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

@@ -63,7 +63,7 @@  discard block
 block discarded – undo
         $config->set(
             'HTML.ForbiddenElements',
             [
-                'basefont',   // workaround for HTMLPurifier bug, which allows this in the <body>
+                'basefont', // workaround for HTMLPurifier bug, which allows this in the <body>
             ]
         );
 
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
         // add attributes
         $def->addAttribute('a', 'rel', 'CDATA');
         $def->addAttribute('img', 'usemap', 'CDATA');
-        $def->addAttribute('map', 'name', 'CDATA');   // workaround for HTMLPurifer bug
+        $def->addAttribute('map', 'name', 'CDATA'); // workaround for HTMLPurifer bug
 
         // create parent object with config
         parent::__construct($config);

Please login to merge, or discard this patch.

htdocs/usertops.php 1 patch

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

@@ -13,10 +13,10 @@
 block discarded – undo
 $tpl->name = 'usertops';
 $tpl->menuitem = MNU_CACHES_USERTOPS;
 
-$userId = (int) isset($_REQUEST['userid']) ? $_REQUEST['userid']: 0;
+$userId = (int)isset($_REQUEST['userid']) ? $_REQUEST['userid'] : 0;
 $ocOnly = isset($_REQUEST['oconly']) && $_REQUEST['oconly'];
 
-$sUsername = $connection->fetchColumn('SELECT `username` FROM `user` WHERE `user_id` = :userId',['userId' => $userId]);
+$sUsername = $connection->fetchColumn('SELECT `username` FROM `user` WHERE `user_id` = :userId', ['userId' => $userId]);
 if ($sUsername == null) {
     $tpl->error(ERROR_USER_NOT_EXISTS);
 }

Please login to merge, or discard this patch.

htdocs/ocstats.php 1 patch

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

@@ -11,7 +11,7 @@  discard block
 block discarded – undo
 $jpegQuality = 80;
 $fontFile = __DIR__ . '/resource2/' . $opt['template']['style'] . '/fonts/dejavu/ttf/DejaVuSans.ttf';
 
-$userId = isset($_REQUEST['userid']) ? (int) $_REQUEST['userid'] : 0;
+$userId = isset($_REQUEST['userid']) ? (int)$_REQUEST['userid'] : 0;
 $lang = isset($_REQUEST['lang']) ? mb_strtoupper($_REQUEST['lang']) : $opt['template']['locale'];
 
 if (!isset($opt['locale'][$lang])) {
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
 $connection = AppKernel::Container()->get(Connection::class);
 
 $fileName = __DIR__ . '/images/statpics/statpic' . $userId . $lang . '.jpg';
-$userStatisticPicture = (int) $connection->createQueryBuilder()
+$userStatisticPicture = (int)$connection->createQueryBuilder()
     ->select('COUNT(*)')
     ->from('user_statpic')
     ->where('user_id = :userId')
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
 
     if (is_array($userData)) {
         $username = $userData['username'];
-        $found = (int) $userData['found'];
-        $hidden = (int) $userData['hidden'];
-        $logo = (int) $userData['statpic_logo'];
+        $found = (int)$userData['found'];
+        $hidden = (int)$userData['hidden'];
+        $logo = (int)$userData['statpic_logo'];
         $logoText = $userData['statpic_text'];
 
         $textCounterStatistic = $translate->t('Finds: %1  Hidden: %2', '', '', 0, '', 0, $lang);

Please login to merge, or discard this patch.

htdocs/adminreports.php 1 patch

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

@@ -24,10 +24,10 @@  discard block
 block discarded – undo
 /** @var Connection $connection */
 $connection = AppKernel::Container()->get(Connection::class);
 
-$id = (int) isset($_REQUEST['id']) ? $_REQUEST['id'] : 0;
-$rId = (int) isset($_REQUEST['rid']) ? $_REQUEST['rid'] : 0;
-$cacheId = (int) isset($_REQUEST['cacheid']) ? $_REQUEST['cacheid'] : 0;
-$ownerId = (int) isset($_REQUEST['ownerid']) ? $_REQUEST['ownerid'] : 0;
+$id = (int)isset($_REQUEST['id']) ? $_REQUEST['id'] : 0;
+$rId = (int)isset($_REQUEST['rid']) ? $_REQUEST['rid'] : 0;
+$cacheId = (int)isset($_REQUEST['cacheid']) ? $_REQUEST['cacheid'] : 0;
+$ownerId = (int)isset($_REQUEST['ownerid']) ? $_REQUEST['ownerid'] : 0;
 
 $reportData = $connection
     ->fetchAssoc(
@@ -37,8 +37,8 @@  discard block
 block discarded – undo
         ['id' => $rId]
     );
 
-$reporterId = (int) $reportData['userid'];
-$adminId = (int) $reportData['adminid'];
+$reporterId = (int)$reportData['userid'];
+$adminId = (int)$reportData['adminid'];
 $age = $reportData['age'];
 
 if (isset($_REQUEST['savecomment'])) {

Please login to merge, or discard this patch.

htdocs/admins.php 1 patch

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

@@ -31,7 +31,7 @@
 block discarded – undo
      ORDER BY username'
 );
 
-foreach($admins as &$admin) {
+foreach ($admins as &$admin) {
     $rights = [];
 
     if ($admin['admin'] & ADMIN_TRANSLATE) {

Please login to merge, or discard this patch.

htdocs/thumbs.php 1 patch

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

@@ -37,7 +37,7 @@  discard block
 block discarded – undo
 );
 if ($r) {
     if ($r['object_type'] == 1) {
-        $check = (int) $connection
+        $check = (int)$connection
             ->fetchColumn(
                 'SELECT COUNT(*)
                  FROM `cache_logs`
@@ -62,7 +62,7 @@  discard block
 block discarded – undo
 
         }
     } elseif ($r['object_type'] == 2) {
-        $check = (int) $connection
+        $check = (int)$connection
             ->fetchColumn(
                 'SELECT COUNT(*)
                            FROM `caches`

Please login to merge, or discard this patch.

htdocs/adminuser.php 1 patch

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

@@ -142,22 +142,22 @@
 block discarded – undo
 
     $tpl->assign('showdetails', true);
 
-    $r['hidden'] = (int) $connection->fetchColumn(
+    $r['hidden'] = (int)$connection->fetchColumn(
         'SELECT COUNT(*) FROM `caches` WHERE `user_id`=:userId', [':userId' => $r['user_id']]
     );
-    $r['hidden_active'] = (int) $connection->fetchColumn(
+    $r['hidden_active'] = (int)$connection->fetchColumn(
         'SELECT COUNT(*) FROM `caches` WHERE `user_id`= :userId AND `status`=1',
         [':userId' => $r['user_id']]
     );
-    $r['logentries'] = (int) $connection->fetchColumn(
+    $r['logentries'] = (int)$connection->fetchColumn(
         'SELECT COUNT(*) FROM `cache_logs` WHERE `user_id`= :userId',
         [':userId' => $r['user_id']]
     );
-    $r['deleted_logentries'] = (int) $connection->fetchColumn(
+    $r['deleted_logentries'] = (int)$connection->fetchColumn(
         'SELECT COUNT(*) FROM `cache_logs_archived` WHERE `user_id`= :userId',
         [':userId' => $r['user_id']]
     );
-    $r['reports'] = (int) $connection->fetchColumn(
+    $r['reports'] = (int)$connection->fetchColumn(
         'SELECT COUNT(*) FROM `cache_reports` WHERE `userid`= :userId',
         [':userId' => $r['user_id']]
     );

Please login to merge, or discard this patch.

		@@ -63,7 +63,7 @@ discard block
		block discarded – undo
63	63	$config->set(
64	64	'HTML.ForbiddenElements',
65	65	[
66		- 'basefont', // workaround for HTMLPurifier bug, which allows this in the <body>
	66	+ 'basefont', // workaround for HTMLPurifier bug, which allows this in the <body>
67	67	]
68	68	);
69	69
		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	// add attributes
99	99	$def->addAttribute('a', 'rel', 'CDATA');
100	100	$def->addAttribute('img', 'usemap', 'CDATA');
101		- $def->addAttribute('map', 'name', 'CDATA'); // workaround for HTMLPurifer bug
	101	+ $def->addAttribute('map', 'name', 'CDATA'); // workaround for HTMLPurifer bug
102	102
103	103	// create parent object with config
104	104	parent::__construct($config);

		@@ -142,22 +142,22 @@
		block discarded – undo
142	142
143	143	$tpl->assign('showdetails', true);
144	144
145		- $r['hidden'] = (int) $connection->fetchColumn(
	145	+ $r['hidden'] = (int)$connection->fetchColumn(
146	146	'SELECT COUNT(*) FROM `caches` WHERE `user_id`=:userId', [':userId' => $r['user_id']]
147	147	);
148		- $r['hidden_active'] = (int) $connection->fetchColumn(
	148	+ $r['hidden_active'] = (int)$connection->fetchColumn(
149	149	'SELECT COUNT(*) FROM `caches` WHERE `user_id`= :userId AND `status`=1',
150	150	[':userId' => $r['user_id']]
151	151	);
152		- $r['logentries'] = (int) $connection->fetchColumn(
	152	+ $r['logentries'] = (int)$connection->fetchColumn(
153	153	'SELECT COUNT(*) FROM `cache_logs` WHERE `user_id`= :userId',
154	154	[':userId' => $r['user_id']]
155	155	);
156		- $r['deleted_logentries'] = (int) $connection->fetchColumn(
	156	+ $r['deleted_logentries'] = (int)$connection->fetchColumn(
157	157	'SELECT COUNT(*) FROM `cache_logs_archived` WHERE `user_id`= :userId',
158	158	[':userId' => $r['user_id']]
159	159	);
160		- $r['reports'] = (int) $connection->fetchColumn(
	160	+ $r['reports'] = (int)$connection->fetchColumn(
161	161	'SELECT COUNT(*) FROM `cache_reports` WHERE `userid`= :userId',
162	162	[':userId' => $r['user_id']]
163	163	);

		@@ -52,7 +52,7 @@
		block discarded – undo
52	52	'OC_COOKIE_NAME' => $opt['session']['cookiename'] . 'data',
53	53	'VERSION_FILE' => __DIR__ . '/okapi/meta.php',
54	54	'OCDE_HTML_PURIFIER_SETTINGS'
55		- => $opt['html_purifier'],
	55	+ => $opt['html_purifier'],
56	56	'GITHUB_ACCESS_TOKEN' => $opt['okapi']['github_access_token'],
57	57	];
58	58	}

		@@ -1,7 +1,7 @@
		block discarded – undo
1	1	<?php
2	2
3		-$GLOBALS['rootpath'] = __DIR__.'/../';
	3	+$GLOBALS['rootpath'] = __DIR__ . '/../';
4	4
5	5	require_once __DIR__ . '/../vendor/autoload.php';
6	6
7		-require_once __DIR__ .'/../vendor/opencaching/okapi/okapi/index.php';
	7	+require_once __DIR__ . '/../vendor/opencaching/okapi/okapi/index.php';

		@@ -13,10 +13,10 @@
		block discarded – undo
13	13	$tpl->name = 'usertops';
14	14	$tpl->menuitem = MNU_CACHES_USERTOPS;
15	15
16		-$userId = (int) isset($_REQUEST['userid']) ? $_REQUEST['userid']: 0;
	16	+$userId = (int)isset($_REQUEST['userid']) ? $_REQUEST['userid'] : 0;
17	17	$ocOnly = isset($_REQUEST['oconly']) && $_REQUEST['oconly'];
18	18
19		-$sUsername = $connection->fetchColumn('SELECT `username` FROM `user` WHERE `user_id` = :userId',['userId' => $userId]);
	19	+$sUsername = $connection->fetchColumn('SELECT `username` FROM `user` WHERE `user_id` = :userId', ['userId' => $userId]);
20	20	if ($sUsername == null) {
21	21	$tpl->error(ERROR_USER_NOT_EXISTS);
22	22	}

		@@ -11,7 +11,7 @@ discard block
		block discarded – undo
11	11	$jpegQuality = 80;
12	12	$fontFile = __DIR__ . '/resource2/' . $opt['template']['style'] . '/fonts/dejavu/ttf/DejaVuSans.ttf';
13	13
14		-$userId = isset($_REQUEST['userid']) ? (int) $_REQUEST['userid'] : 0;
	14	+$userId = isset($_REQUEST['userid']) ? (int)$_REQUEST['userid'] : 0;
15	15	$lang = isset($_REQUEST['lang']) ? mb_strtoupper($_REQUEST['lang']) : $opt['template']['locale'];
16	16
17	17	if (!isset($opt['locale'][$lang])) {
		@@ -22,7 +22,7 @@ discard block
		block discarded – undo
22	22	$connection = AppKernel::Container()->get(Connection::class);
23	23
24	24	$fileName = __DIR__ . '/images/statpics/statpic' . $userId . $lang . '.jpg';
25		-$userStatisticPicture = (int) $connection->createQueryBuilder()
	25	+$userStatisticPicture = (int)$connection->createQueryBuilder()
26	26	->select('COUNT(*)')
27	27	->from('user_statpic')
28	28	->where('user_id = :userId')
		@@ -48,9 +48,9 @@ discard block
		block discarded – undo
48	48
49	49	if (is_array($userData)) {
50	50	$username = $userData['username'];
51		- $found = (int) $userData['found'];
52		- $hidden = (int) $userData['hidden'];
53		- $logo = (int) $userData['statpic_logo'];
	51	+ $found = (int)$userData['found'];
	52	+ $hidden = (int)$userData['hidden'];
	53	+ $logo = (int)$userData['statpic_logo'];
54	54	$logoText = $userData['statpic_text'];
55	55
56	56	$textCounterStatistic = $translate->t('Finds: %1 Hidden: %2', '', '', 0, '', 0, $lang);

		@@ -24,10 +24,10 @@ discard block
		block discarded – undo
24	24	/** @var Connection $connection */
25	25	$connection = AppKernel::Container()->get(Connection::class);
26	26
27		-$id = (int) isset($_REQUEST['id']) ? $_REQUEST['id'] : 0;
28		-$rId = (int) isset($_REQUEST['rid']) ? $_REQUEST['rid'] : 0;
29		-$cacheId = (int) isset($_REQUEST['cacheid']) ? $_REQUEST['cacheid'] : 0;
30		-$ownerId = (int) isset($_REQUEST['ownerid']) ? $_REQUEST['ownerid'] : 0;
	27	+$id = (int)isset($_REQUEST['id']) ? $_REQUEST['id'] : 0;
	28	+$rId = (int)isset($_REQUEST['rid']) ? $_REQUEST['rid'] : 0;
	29	+$cacheId = (int)isset($_REQUEST['cacheid']) ? $_REQUEST['cacheid'] : 0;
	30	+$ownerId = (int)isset($_REQUEST['ownerid']) ? $_REQUEST['ownerid'] : 0;
31	31
32	32	$reportData = $connection
33	33	->fetchAssoc(
		@@ -37,8 +37,8 @@ discard block
		block discarded – undo
37	37	['id' => $rId]
38	38	);
39	39
40		-$reporterId = (int) $reportData['userid'];
41		-$adminId = (int) $reportData['adminid'];
	40	+$reporterId = (int)$reportData['userid'];
	41	+$adminId = (int)$reportData['adminid'];
42	42	$age = $reportData['age'];
43	43
44	44	if (isset($_REQUEST['savecomment'])) {

		@@ -31,7 +31,7 @@
		block discarded – undo
31	31	ORDER BY username'
32	32	);
33	33
34		-foreach($admins as &$admin) {
	34	+foreach ($admins as &$admin) {
35	35	$rights = [];
36	36
37	37	if ($admin['admin'] & ADMIN_TRANSLATE) {

		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	);
38	38	if ($r) {
39	39	if ($r['object_type'] == 1) {
40		- $check = (int) $connection
	40	+ $check = (int)$connection
41	41	->fetchColumn(
42	42	'SELECT COUNT(*)
43	43	FROM `cache_logs`
		@@ -62,7 +62,7 @@ discard block
		block discarded – undo
62	62
63	63	}
64	64	} elseif ($r['object_type'] == 2) {
65		- $check = (int) $connection
	65	+ $check = (int)$connection
66	66	->fetchColumn(
67	67	'SELECT COUNT(*)
68	68	FROM `caches`

OpencachingDeutschland / oc-server3

Push — next ( c582f9...4beac3 )

Status

Category

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

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

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

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

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

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

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

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

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