Inspection of "update okapi package" - OpencachingDeutschland/oc-server3 - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — next ( 141890...1bee27 )

by Thomas

created 2020-01-04 19:50 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/lib2/logic/countriesList.class.php 2 patches

Doc Comments +3 added lines patch added patch discarded remove patch

@@ -92,6 +92,9 @@
 block discarded – undo
         return $returnValue;
     }
 
+    /**
+     * @param boolean $showall
+     */
     public function getRS($selectedId, $showall)
     {
         if ($showall != false) {

Please login to merge, or discard this patch.

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

@@ -25,7 +25,7 @@
 block discarded – undo
 
     public function isDefault($id)
     {
-        $isDefault = (int) sql_value(
+        $isDefault = (int)sql_value(
             "SELECT COUNT(*) FROM `countries_list_default` WHERE `lang`='&1' AND `show`='&2'",
             0,
             $this->locale,

Please login to merge, or discard this patch.

htdocs/lib2/logic/labels.inc.php 1 patch

Doc Comments +6 added lines patch added patch discarded remove patch

@@ -164,6 +164,9 @@  discard block
 block discarded – undo
         self::$aLabels[$name] = unserialize($serialized);
     }
 
+    /**
+     * @param string $name
+     */
     public static function getLabels($name)
     {
         if (isset(self::$aLabels[$name])) {
@@ -173,6 +176,9 @@  discard block
 block discarded – undo
         return false;
     }
 
+    /**
+     * @param string $name
+     */
     public static function getLabelValue($name, $id)
     {
         if (isset(self::$aLabels[$name])) {

Please login to merge, or discard this patch.

htdocs/lib2/logic/logtypes.inc.php 1 patch

Doc Comments +7 added lines patch added patch discarded remove patch

@@ -122,12 +122,19 @@
 block discarded – undo
 }
 
 
+/**
+ * @param integer $cache_id
+ * @param integer $old_logtype
+ */
 function logtype_ok($cache_id, $logtype_id, $old_logtype, $statusLogs = true)
 {
     return in_array($logtype_id, get_cache_log_types($cache_id, $old_logtype, $statusLogs));
 }
 
 
+/**
+ * @param integer $cache_id
+ */
 function teamcomment_allowed($cache_id, $logtype_id, $old_teamcomment = false)
 {
     global $login, $opt;

Please login to merge, or discard this patch.

htdocs/lib2/logic/statpic.class.php 1 patch

Doc Comments +3 added lines patch added patch discarded remove patch

@@ -9,6 +9,9 @@
 block discarded – undo
 
     public $reUser;
 
+    /**
+     * @param integer $nNewUserId
+     */
     public function __construct($nNewUserId)
     {
         $this->reUser = new rowEditor('user');

Please login to merge, or discard this patch.

		@@ -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	}

		@@ -92,6 +92,9 @@
		block discarded – undo
92	92	return $returnValue;
93	93	}
94	94
	95	+ /**
	96	+ * @param boolean $showall
	97	+ */
95	98	public function getRS($selectedId, $showall)
96	99	{
97	100	if ($showall != false) {

		@@ -164,6 +164,9 @@ discard block
		block discarded – undo
164	164	self::$aLabels[$name] = unserialize($serialized);
165	165	}
166	166
	167	+ /**
	168	+ * @param string $name
	169	+ */
167	170	public static function getLabels($name)
168	171	{
169	172	if (isset(self::$aLabels[$name])) {
		@@ -173,6 +176,9 @@ discard block
		block discarded – undo
173	176	return false;
174	177	}
175	178
	179	+ /**
	180	+ * @param string $name
	181	+ */
176	182	public static function getLabelValue($name, $id)
177	183	{
178	184	if (isset(self::$aLabels[$name])) {

		@@ -122,12 +122,19 @@
		block discarded – undo
122	122	}
123	123
124	124
	125	+/**
	126	+ * @param integer $cache_id
	127	+ * @param integer $old_logtype
	128	+ */
125	129	function logtype_ok($cache_id, $logtype_id, $old_logtype, $statusLogs = true)
126	130	{
127	131	return in_array($logtype_id, get_cache_log_types($cache_id, $old_logtype, $statusLogs));
128	132	}
129	133
130	134
	135	+/**
	136	+ * @param integer $cache_id
	137	+ */
131	138	function teamcomment_allowed($cache_id, $logtype_id, $old_teamcomment = false)
132	139	{
133	140	global $login, $opt;

		@@ -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';

		@@ -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);

		@@ -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);

		@@ -25,7 +25,7 @@
		block discarded – undo
25	25
26	26	public function isDefault($id)
27	27	{
28		- $isDefault = (int) sql_value(
	28	+ $isDefault = (int)sql_value(
29	29	"SELECT COUNT(*) FROM `countries_list_default` WHERE `lang`='&1' AND `show`='&2'",
30	30	0,
31	31	$this->locale,

		@@ -9,6 +9,9 @@
		block discarded – undo
9	9
10	10	public $reUser;
11	11
	12	+ /**
	13	+ * @param integer $nNewUserId
	14	+ */
12	15	public function __construct($nNewUserId)
13	16	{
14	17	$this->reUser = new rowEditor('user');

OpencachingDeutschland / oc-server3

Push — next ( 141890...1bee27 )

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

Doc Comments +3 added lines patch added patch discarded remove patch

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

Doc Comments +6 added lines patch added patch discarded remove patch

Doc Comments +7 added lines patch added patch discarded remove patch

Doc Comments +3 added lines patch added patch discarded remove patch