Completed
Push — development ( 0269cd...ec6fa2 )
by Thomas
10:08 queued 05:37
created
htdocs/lib2/logic/cache.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -505,8 +505,8 @@
 block discarded – undo
505 505
         }
506 506
 
507 507
         $coords = [];
508
-        if ($this->getType() != 7 && $this->getType() != 8 &&  // quiz cache
509
-            $this->hasAttribute(61) != true &&                 // safari cache
508
+        if ($this->getType() != 7 && $this->getType() != 8 && // quiz cache
509
+            $this->hasAttribute(61) != true && // safari cache
510 510
             $this->getStatus() != 5                            // unpublished cache
511 511
         ) {
512 512
             $rsCoords = sql(
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
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';
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
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);
Please login to merge, or discard this patch.
htdocs/src/Oc/Command/CodeSnifferCommand.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@
 block discarded – undo
43 43
         }
44 44
 
45 45
         $process = new Process($cmd, $this->rootPath, null, null, 9600);
46
-        $process->run(function ($type, $buffer) {
46
+        $process->run(function($type, $buffer) {
47 47
             echo $buffer;
48 48
         });
49 49
 
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
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
 }
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
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);
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
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'])) {
Please login to merge, or discard this patch.
htdocs/lib2/login.class.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -15,13 +15,13 @@  discard block
 block discarded – undo
15 15
 
16 16
 use OcLegacy\Util\PasswordCrypt;
17 17
 
18
-define('LOGIN_UNKNOWN_ERROR', -1);     // unknown error occurred
19
-define('LOGIN_OK', 0);                 // login succeeded
20
-define('LOGIN_BADUSERPW', 1);          // bad username or password
21
-define('LOGIN_TOOMUCHLOGINS', 2);      // too many logins in short time
22
-define('LOGIN_USERNOTACTIVE', 3);      // the userAccount locked
18
+define('LOGIN_UNKNOWN_ERROR', -1); // unknown error occurred
19
+define('LOGIN_OK', 0); // login succeeded
20
+define('LOGIN_BADUSERPW', 1); // bad username or password
21
+define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time
22
+define('LOGIN_USERNOTACTIVE', 3); // the userAccount locked
23 23
 define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty
24
-define('LOGIN_LOGOUT_OK', 5);          // logout was successful
24
+define('LOGIN_LOGOUT_OK', 5); // logout was successful
25 25
 
26 26
 // login times in seconds
27 27
 define('LOGIN_TIME', 60 * 60);
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
69 69
 
70 70
         // TODO good input evaluation
71 71
         if ($cookie->is_set('userid') && $cookie->is_set('username')) {
72
-            $this->userid = (int) $cookie->get('userid');
72
+            $this->userid = (int)$cookie->get('userid');
73 73
             $this->username = $cookie->get('username');
74 74
             $this->permanent = (($cookie->get('permanent') + 0) == 1);
75 75
             $this->lastlogin = $cookie->get('lastlogin');
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
     public function pStoreCookie()
101 101
     {
102 102
         global $cookie;
103
-        $cookie->set('userid', (int) $this->userid);
103
+        $cookie->set('userid', (int)$this->userid);
104 104
         $cookie->set('username', $this->username);
105 105
         $cookie->set('permanent', ($this->permanent === true ? 1 : 0));
106 106
         $cookie->set('lastlogin', $this->lastlogin);
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
                     $rUser['user_id'],
298 298
                     ($permanent != false ? 1 : 0)
299 299
                 );
300
-                $this->userid = (int) $rUser['user_id'];
300
+                $this->userid = (int)$rUser['user_id'];
301 301
                 $this->username = $rUser['username'];
302 302
                 $this->permanent = $permanent;
303 303
                 $this->lastlogin = date('Y-m-d H:i:s');
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
             );
344 344
             if ($rUser = sql_fetch_assoc($rs)) {
345 345
                 $this->username = $rUser['username'];
346
-                $this->userid = (int) $rUser['user_id'];
346
+                $this->userid = (int)$rUser['user_id'];
347 347
                 $this->admin = $rUser['admin'];
348 348
                 $this->verified = true;
349 349
                 sqlf("UPDATE `user` SET `user`.`last_login`=NOW() WHERE `user`.`user_id`='&1'", $this->userid);
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
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) {
Please login to merge, or discard this patch.