OpencachingDeutschland / oc-server3

htdocs/search.php

Spacing +23 added lines, -23 removed lines

@@ -88,7 +88,7 @@ 
 $load_query = false;
 $show_lastsearchbutton = true;
 
-$list_caches = isset($_REQUEST['addCache']) &&  $_REQUEST['addCache'] >= 1 ? $_REQUEST['addCache'] : '';
+$list_caches = isset($_REQUEST['addCache']) && $_REQUEST['addCache'] >= 1 ? $_REQUEST['addCache'] : '';
 $added_waypoints = 0;
 
 if (isset($_REQUEST['queryid']) || isset($_REQUEST['showresult'])) {  // Ocprop: showresult, queryid
@@ -255,20 +255,20 @@ 
     }
 
     // get the search options parameters and store them in the queries table (to view "the next page")
-    $options['f_userowner'] = isset($_REQUEST['f_userowner']) ? (int) $_REQUEST['f_userowner'] : 0; // Ocprop
-    $options['f_userfound'] = isset($_REQUEST['f_userfound']) ? (int) $_REQUEST['f_userfound'] : 0; // Ocprop
-    $options['f_unpublished'] = isset($_REQUEST['f_unpublished']) ? (int) $_REQUEST['f_unpublished'] : 0;
-    $options['f_disabled'] = isset($_REQUEST['f_disabled']) ? (int) $_REQUEST['f_disabled'] : 0;
-    $options['f_inactive'] = isset($_REQUEST['f_inactive']) ? (int) $_REQUEST['f_inactive'] : 1; // Ocprop
+    $options['f_userowner'] = isset($_REQUEST['f_userowner']) ? (int)$_REQUEST['f_userowner'] : 0; // Ocprop
+    $options['f_userfound'] = isset($_REQUEST['f_userfound']) ? (int)$_REQUEST['f_userfound'] : 0; // Ocprop
+    $options['f_unpublished'] = isset($_REQUEST['f_unpublished']) ? (int)$_REQUEST['f_unpublished'] : 0;
+    $options['f_disabled'] = isset($_REQUEST['f_disabled']) ? (int)$_REQUEST['f_disabled'] : 0;
+    $options['f_inactive'] = isset($_REQUEST['f_inactive']) ? (int)$_REQUEST['f_inactive'] : 1; // Ocprop
     // f_inactive formerly was used for both, archived and disabled caches.
     // After adding the separate f_disabled option, it is used only for archived
     // caches, but keeps its name for compatibility with existing stored or
     // external searches.
-    $options['f_ignored'] = isset($_REQUEST['f_ignored']) ? (int) $_REQUEST['f_ignored'] : 1;
-    $options['f_otherPlatforms'] = isset($_REQUEST['f_otherPlatforms']) ? (int) $_REQUEST['f_otherPlatforms'] : 0;
-    $options['f_geokrets'] = isset($_REQUEST['f_geokrets']) ? (int) $_REQUEST['f_geokrets'] : 0;
-    $options['expert'] = isset($_REQUEST['expert']) ? (int) $_REQUEST['expert'] : 0; // Ocprop: 0
-    $options['showresult'] = isset($_REQUEST['showresult']) ? (int) $_REQUEST['showresult'] : 0;
+    $options['f_ignored'] = isset($_REQUEST['f_ignored']) ? (int)$_REQUEST['f_ignored'] : 1;
+    $options['f_otherPlatforms'] = isset($_REQUEST['f_otherPlatforms']) ? (int)$_REQUEST['f_otherPlatforms'] : 0;
+    $options['f_geokrets'] = isset($_REQUEST['f_geokrets']) ? (int)$_REQUEST['f_geokrets'] : 0;
+    $options['expert'] = isset($_REQUEST['expert']) ? (int)$_REQUEST['expert'] : 0; // Ocprop: 0
+    $options['showresult'] = isset($_REQUEST['showresult']) ? (int)$_REQUEST['showresult'] : 0;
     $options['output'] = isset($_REQUEST['output']) ? $_REQUEST['output'] : 'HTML'; // Ocprop: HTML
     $options['bbox'] = isset($_REQUEST['bbox']) ? $_REQUEST['bbox'] : false;
 
@@ -322,7 +322,7 @@ 
     } elseif (isset($_REQUEST['searchbyowner'])) { // Ocprop
         $options['searchtype'] = 'byowner';
 
-        $options['ownerid'] = isset($_REQUEST['ownerid']) ? (int) $_REQUEST['ownerid'] : 0;
+        $options['ownerid'] = isset($_REQUEST['ownerid']) ? (int)$_REQUEST['ownerid'] : 0;
         $options['owner'] = isset($_REQUEST['owner']) ? stripslashes($_REQUEST['owner']) : '';
 
         if (isset($options['owner'])) {
@@ -338,7 +338,7 @@ 
     } elseif (isset($_REQUEST['searchbyfinder'])) { // Ocprop
         $options['searchtype'] = 'byfinder';
 
-        $options['finderid'] = isset($_REQUEST['finderid']) ? (int) $_REQUEST['finderid'] : 0;
+        $options['finderid'] = isset($_REQUEST['finderid']) ? (int)$_REQUEST['finderid'] : 0;
         $options['finder'] = isset($_REQUEST['finder']) ? stripslashes($_REQUEST['finder']) : '';
         $options['logtype'] = isset($_REQUEST['logtype']) ? $_REQUEST['logtype'] : '1,7'; // Ocprop
 
@@ -393,7 +393,7 @@ 
             $options['lon_min'] = isset($_REQUEST['lon_min']) ? $_REQUEST['lon_min'] : 0;
         }
 
-        $options['distance'] = isset($_REQUEST['distance']) ? (int) $_REQUEST['distance'] : 0;
+        $options['distance'] = isset($_REQUEST['distance']) ? (int)$_REQUEST['distance'] : 0;
     } elseif (isset($_REQUEST['searchbyfulltext'])) {
         $options['searchtype'] = 'byfulltext';
 
@@ -460,11 +460,11 @@ 
     $options['cachetype'] = isset($_REQUEST['cachetype']) ? $_REQUEST['cachetype'] : '';
 
     $options['cachesize'] = isset($_REQUEST['cachesize']) ? $_REQUEST['cachesize'] : '';
-    $options['difficultymin'] = isset($_REQUEST['difficultymin']) ? (int) $_REQUEST['difficultymin'] : 0;
-    $options['difficultymax'] = isset($_REQUEST['difficultymax']) ? (int) $_REQUEST['difficultymax'] : 0;
-    $options['terrainmin'] = isset($_REQUEST['terrainmin']) ? (int) $_REQUEST['terrainmin'] : 0;
-    $options['terrainmax'] = isset($_REQUEST['terrainmax']) ? (int) $_REQUEST['terrainmax'] : 0;
-    $options['recommendationmin'] = isset($_REQUEST['recommendationmin']) ? (int) $_REQUEST['recommendationmin'] : 0;
+    $options['difficultymin'] = isset($_REQUEST['difficultymin']) ? (int)$_REQUEST['difficultymin'] : 0;
+    $options['difficultymax'] = isset($_REQUEST['difficultymax']) ? (int)$_REQUEST['difficultymax'] : 0;
+    $options['terrainmin'] = isset($_REQUEST['terrainmin']) ? (int)$_REQUEST['terrainmin'] : 0;
+    $options['terrainmax'] = isset($_REQUEST['terrainmax']) ? (int)$_REQUEST['terrainmax'] : 0;
+    $options['recommendationmin'] = isset($_REQUEST['recommendationmin']) ? (int)$_REQUEST['recommendationmin'] : 0;
 
     if (in_array($options['searchtype'], ['byort', 'byplz', 'bydistance', 'bywaypoint'])) {
         // For distance-based searches, sort by distance instead of name.
@@ -1297,11 +1297,11 @@ 
 
         //add selected caches to selected cachelist
         if (isset($_REQUEST['addToList']) && isset($_REQUEST['addCache']) && isset($_REQUEST['selectCachelist'])) {
-            $list_caches_= $_REQUEST['addToList'];
+            $list_caches_ = $_REQUEST['addToList'];
             $added_waypoints = addToList($list_caches);
-            $addCachelist= cachelist::getListById((int) $_REQUEST['selectCachelist']); // null for invalid ID
+            $addCachelist = cachelist::getListById((int)$_REQUEST['selectCachelist']); // null for invalid ID
         } elseif (isset($_REQUEST['addToList'])) {
-            $addCachelist= cachelist::getListById((int) $_REQUEST['selectCachelist']); // null for invalid ID
+            $addCachelist = cachelist::getListById((int)$_REQUEST['selectCachelist']); // null for invalid ID
             $error_addCaches = true;
         }
 
@@ -1773,7 +1773,7 @@ 
     $tpl->assign('searchtype_byname', $options['searchtype'] == 'byname');
 
     // distance
-    $tpl->assign('distance', isset($options['distance']) ? (int) $options['distance'] : DEFAULT_SEARCH_DISTANCE);
+    $tpl->assign('distance', isset($options['distance']) ? (int)$options['distance'] : DEFAULT_SEARCH_DISTANCE);
 
     if (!isset($options['unit'])) {
         $options['unit'] = DEFAULT_DISTANCE_UNIT;

htdocs_symfony/public/index.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     Request::setTrustedHosts([$trustedHosts]);
 }
 
-$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
+$kernel = new Kernel($_SERVER['APP_ENV'], (bool)$_SERVER['APP_DEBUG']);
 $request = Request::createFromGlobals();
 $response = $kernel->handle($request);
 $response->send();

htdocs/adminreports.php

Spacing +6 added lines, -6 removed lines

@@ -24,10 +24,10 @@ 
 /** @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
     ->fetchAssociative(
@@ -37,8 +37,8 @@ 
         ['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'])) {

htdocs/thumbs.php

Spacing +2 added lines, -2 removed lines

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

htdocs/adminuser.php

Spacing +5 added lines, -5 removed lines

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

htdocs/adminhistory.php

Spacing +2 added lines, -2 removed lines

@@ -28,14 +28,14 @@
         ['wp' => $_REQUEST['wp']]
     );
 } else {
-    $cacheId = isset($_REQUEST['cacheid']) ? (int) $_REQUEST['cacheid'] : -1;
+    $cacheId = isset($_REQUEST['cacheid']) ? (int)$_REQUEST['cacheid'] : -1;
 }
 
 $showHistory = false;
 $error = '';
 
 if ($cacheId >= 0 &&
-    $connection->fetchOne('SELECT COUNT(*) FROM `caches` WHERE `cache_id`=:id',['id' => $cacheId]) <> 1)
+    $connection->fetchOne('SELECT COUNT(*) FROM `caches` WHERE `cache_id`=:id', ['id' => $cacheId]) <> 1)
 {
     $error = $translate->t('Cache not found', '', '', 0);
 } elseif ($cacheId > 0) {

htdocs/usertops.php

Spacing +2 added lines, -2 removed lines

@@ -13,10 +13,10 @@
 $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->fetchOne('SELECT `username` FROM `user` WHERE `user_id` = :userId',['userId' => $userId]);
+$sUsername = $connection->fetchOne('SELECT `username` FROM `user` WHERE `user_id` = :userId', ['userId' => $userId]);
 if ($sUsername == null) {
     $tpl->error(ERROR_USER_NOT_EXISTS);
 }

htdocs/index.php

Spacing +4 added lines, -4 removed lines

@@ -75,16 +75,16 @@ 
     // current cache and log-counters
     $tpl->assign(
         'count_hiddens',
-        number1000((int) $connection->fetchOne('SELECT COUNT(*) AS `hiddens` FROM `caches` WHERE `status` = 1'))
+        number1000((int)$connection->fetchOne('SELECT COUNT(*) AS `hiddens` FROM `caches` WHERE `status` = 1'))
     );
     $tpl->assign(
         'count_founds',
-        number1000((int) $connection->fetchOne('SELECT COUNT(*) AS `founds` FROM `cache_logs` WHERE `type` = 1'))
+        number1000((int)$connection->fetchOne('SELECT COUNT(*) AS `founds` FROM `cache_logs` WHERE `type` = 1'))
     );
     $tpl->assign(
         'count_users',
         number1000(
-            (int) $connection->fetchOne(
+            (int)$connection->fetchOne(
                 'SELECT COUNT(*) AS `users`
                  FROM (
                        SELECT DISTINCT `user_id`
@@ -102,7 +102,7 @@ 
     // get total event count for all countries
     $tpl->assign(
         'total_events',
-        (int) $connection->fetchOne(
+        (int)$connection->fetchOne(
             'SELECT COUNT(*)
              FROM `caches`
              WHERE `type` = 6

htdocs/src/OcLegacy/Admin/Gdpr/GdprHandler.php

Spacing +9 added lines, -9 removed lines

@@ -227,7 +227,7 @@ 
                 WHERE cache_id = :cacheId;
 SQL
             , [
-                'cacheId' => (int) $cache['cache_id'],
+                'cacheId' => (int)$cache['cache_id'],
             ]);
 
             $this->connection->executeQuery(<<<'SQL'
@@ -239,19 +239,19 @@ 
                 WHERE cache_id = :cacheId
 SQL
             , [
-                'cacheId' => (int) $cache['cache_id'],
+                'cacheId' => (int)$cache['cache_id'],
             ]);
 
             $this->connection->executeQuery('DELETE FROM cache_desc_modified WHERE cache_id = :cacheId', [
-                'cacheId' => (int) $cache['cache_id'],
+                'cacheId' => (int)$cache['cache_id'],
             ]);
 
             $this->connection->executeQuery('DELETE FROM cache_ignore WHERE cache_id = :cacheId', [
-                'cacheId' => (int) $cache['cache_id'],
+                'cacheId' => (int)$cache['cache_id'],
             ]);
 
             $this->connection->executeQuery('DELETE FROM caches_modified WHERE cache_id = :cacheId', [
-                'cacheId' => (int) $cache['cache_id'],
+                'cacheId' => (int)$cache['cache_id'],
             ]);
         }
     }
@@ -265,8 +265,8 @@ 
             return [];
         }
 
-        $ids = array_map(static function (array $cache) use ($idField) {
-            return (int) $cache[$idField];
+        $ids = array_map(static function(array $cache) use ($idField) {
+            return (int)$cache[$idField];
         }, $data);
 
         $pictures = $this->connection->fetchAllAssociative('SELECT * FROM pictures WHERE object_id IN (' . implode(',', $ids) . ') AND object_type = :objectType', [
@@ -286,8 +286,8 @@ 
             return [];
         }
 
-        $ids = array_map(static function (array $cache) use ($idField) {
-            return (int) $cache[$idField];
+        $ids = array_map(static function(array $cache) use ($idField) {
+            return (int)$cache[$idField];
         }, $data);
 
         return $this->connection->fetchAllAssociative('SELECT * FROM pictures_modified WHERE object_id IN (' . implode(',', $ids) . ') AND object_type = :objectType', [