OpencachingDeutschland / oc-server3

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
     ->fetchAssoc(
@@ -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/admins.php

Spacing +1 added lines, -1 removed lines

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

htdocs/log.php

Unused Use Statements -2 removed lines

@@ -3,11 +3,9 @@
  * for license information see LICENSE.md
  ***************************************************************************/
 
-use Oc\FieldNotes\Entity\FieldNote;
 use Oc\FieldNotes\Enum\LogType as FieldNotesLogType;
 use Oc\FieldNotes\Persistence\FieldNoteEntity;
 use Oc\FieldNotes\Persistence\FieldNoteService;
-use Oc\GeoCache\Entity\GeocacheLog;
 use Oc\GeoCache\Enum\GeoCacheType;
 use Oc\GeoCache\Enum\LogType as GeoCacheLogType;
 use Oc\GeoCache\Enum\NeedMaintenance;

Spacing +17 added lines, -17 removed lines

@@ -49,8 +49,8 @@ 
     $fieldNoteService = AppKernel::Container()->get(FieldNoteService::class);
 
     $fieldNote = $fieldNoteService->fetchOneBy([
-        'id' => (int) $_GET['fieldnoteid'],
-        'user_id' => (int) $user->getUserId()
+        'id' => (int)$_GET['fieldnoteid'],
+        'user_id' => (int)$user->getUserId()
     ]);
 
     if ($fieldNote !== null) {
@@ -96,7 +96,7 @@ 
     // check if masslog warning is accepted (in cookie)
     $masslogCookieSet = isset($_COOKIE['ocsuppressmasslogwarn']);
     if ($masslogCookieSet) {
-        $masslogCookieContent = (int) $_COOKIE['ocsuppressmasslogwarn'];
+        $masslogCookieContent = (int)$_COOKIE['ocsuppressmasslogwarn'];
     } else {
         // save masslog acception in cookie that expires on midnight if clicked
         if (isset($_REQUEST['suppressMasslogWarning']) && $_REQUEST['suppressMasslogWarning'] == 1) {
@@ -108,17 +108,17 @@ 
     //   logtext, logtype, logday, logmonth, logyear
 
     $logText = isset($_POST['logtext']) ? trim($_POST['logtext']) : '';
-    $logType = isset($_REQUEST['logtype']) ? (int) $_REQUEST['logtype'] : null;
+    $logType = isset($_REQUEST['logtype']) ? (int)$_REQUEST['logtype'] : null;
     $logDateDay = isset($_POST['logday']) ? trim($_POST['logday']) : ($datesaved ? $defaultLogDay : date('d'));
     $logDateMonth = isset($_POST['logmonth']) ? trim($_POST['logmonth']) : ($datesaved ? $defaultLogMonth : date('m'));
     $logDateYear = isset($_POST['logyear']) ? trim($_POST['logyear']) : ($datesaved ? $defaultLogYear : date('Y'));
     $logTimeHour = isset($_POST['loghour']) ? trim($_POST['loghour']) : '';
     $logTimeMinute = isset($_POST['logminute']) ? trim($_POST['logminute']) : '';
-    $needsMaintenance = isset($_POST['needs_maintenance2']) ? (int) $_POST['needs_maintenance2'] : (isset($_POST['needs_maintenance']) ? (int) $_POST['needs_maintenance'] : 0);
-    $listingOutdated = isset($_POST['listing_outdated2']) ? (int) $_POST['listing_outdated2'] : (isset($_POST['listing_outdated']) ? (int) $_POST['listing_outdated'] : 0);
-    $confirmListingOk = isset($_POST['confirm_listing_ok']) ? (int) $_POST['confirm_listing_ok'] : 0;
-    $rateOption = isset($_POST['ratingoption']) ? (int) $_POST['ratingoption'] : 0;
-    $rateCache = isset($_POST['rating']) ? (int) $_POST['rating'] : 0;
+    $needsMaintenance = isset($_POST['needs_maintenance2']) ? (int)$_POST['needs_maintenance2'] : (isset($_POST['needs_maintenance']) ? (int)$_POST['needs_maintenance'] : 0);
+    $listingOutdated = isset($_POST['listing_outdated2']) ? (int)$_POST['listing_outdated2'] : (isset($_POST['listing_outdated']) ? (int)$_POST['listing_outdated'] : 0);
+    $confirmListingOk = isset($_POST['confirm_listing_ok']) ? (int)$_POST['confirm_listing_ok'] : 0;
+    $rateOption = isset($_POST['ratingoption']) ? (int)$_POST['ratingoption'] : 0;
+    $rateCache = isset($_POST['rating']) ? (int)$_POST['rating'] : 0;
     $ocTeamComment = isset($_REQUEST['teamcomment']) ? $_REQUEST['teamcomment'] != 0 : 0;
     $suppressMasslogWarning = isset($_REQUEST['suppressMasslogWarning']) ? $_REQUEST['suppressMasslogWarning'] : ($masslogCookieSet ? $masslogCookieContent : 0);
 
@@ -164,12 +164,12 @@ 
     }
 
     // if not a found log, ignore the rating
-    $rateOption = (int) ($logType == 1 || $logType == 7);
+    $rateOption = (int)($logType == 1 || $logType == 7);
 
     // get log text editor mode (from form or from userprofile)
     // 1 = text; 2 = HTML; 3 = tinyMCE
     if (isset($_POST['descMode'])) {
-        $descMode = (int) $_POST['descMode'];  // Ocprop: 2
+        $descMode = (int)$_POST['descMode']; // Ocprop: 2
         if (($descMode < 1) || ($descMode > 3)) {
             $descMode = 3;
         }
@@ -251,7 +251,7 @@ 
          * set seconds 00:00:01, means "00:00 was logged"
          * set seconds 00:00:00, means "no time was logged"
          */
-        $logTimeSecond = (int) ($logTimeHour . $logTimeMinute != ''
+        $logTimeSecond = (int)($logTimeHour . $logTimeMinute != ''
                 && $logTimeHour == 0
                 && $logTimeMinute == 0);
 
@@ -259,8 +259,8 @@ 
         $logDate = date(
             $opt['db']['dateformat'],
             mktime(
-                (int) $logTimeHour,
-                (int) $logTimeMinute,
+                (int)$logTimeHour,
+                (int)$logTimeMinute,
                 $logTimeSecond,
                 $logDateMonth,
                 $logDateDay,
@@ -311,7 +311,7 @@ 
             if (isset($_REQUEST['fieldnoteid']) && $_REQUEST['fieldnoteid']) {
                 sql(
                     'DELETE FROM field_note WHERE `id` = &1 AND `user_id` = &2',
-                    (int) $_REQUEST['fieldnoteid'],
+                    (int)$_REQUEST['fieldnoteid'],
                     $user->getUserId()
                 );
 
@@ -398,8 +398,8 @@ 
 
 // prepare template and display
 $tpl->assign('logtype_allows_nm', implode(',', $logtype_allows_nm));
-$tpl->assign('scrollposx', isset($_REQUEST['scrollposx']) ? (int) $_REQUEST['scrollposx']: 0);
-$tpl->assign('scrollposy', isset($_REQUEST['scrollposy']) ? (int) $_REQUEST['scrollposy']: 0);
+$tpl->assign('scrollposx', isset($_REQUEST['scrollposx']) ? (int)$_REQUEST['scrollposx'] : 0);
+$tpl->assign('scrollposy', isset($_REQUEST['scrollposy']) ? (int)$_REQUEST['scrollposy'] : 0);
 $tpl->assign('validate', $validate);
 $tpl->assign('editlog', false);
 

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
             ->fetchColumn(
                 'SELECT COUNT(*)
                  FROM `cache_logs`
@@ -62,7 +62,7 @@ 
 
         }
     } elseif ($r['object_type'] == 2) {
-        $check = (int) $connection
+        $check = (int)$connection
             ->fetchColumn(
                 'SELECT COUNT(*)
                            FROM `caches`

htdocs/adminuser.php

Spacing +5 added lines, -5 removed lines

@@ -142,22 +142,22 @@
 
     $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']]
     );

htdocs/src/Oc/Language/LanguageRepository.php

Spacing +4 added lines, -4 removed lines

@@ -218,10 +218,10 @@
         $entity->nativeName = $data['native_name'];
         $entity->de = $data['de'];
         $entity->en = $data['en'];
-        $entity->translationId = (int) $data['trans_id'];
-        $entity->listDefaultDe = (bool) $data['list_default_de'];
-        $entity->listDefaultEn = (bool) $data['list_default_en'];
-        $entity->isTranslated = (bool) $data['is_translated'];
+        $entity->translationId = (int)$data['trans_id'];
+        $entity->listDefaultDe = (bool)$data['list_default_de'];
+        $entity->listDefaultEn = (bool)$data['list_default_en'];
+        $entity->isTranslated = (bool)$data['is_translated'];
 
         return $entity;
     }

htdocs/src/Oc/Country/CountryRepository.php

Spacing +3 added lines, -3 removed lines

@@ -181,9 +181,9 @@
         $entity->name = $data['name'];
         $entity->de = $data['de'];
         $entity->en = $data['en'];
-        $entity->translationId = (int) $data['trans_id'];
-        $entity->listDefaultDe = (bool) $data['list_default_de'];
-        $entity->listDefaultEn = (bool) $data['list_default_en'];
+        $entity->translationId = (int)$data['trans_id'];
+        $entity->listDefaultDe = (bool)$data['list_default_de'];
+        $entity->listDefaultEn = (bool)$data['list_default_en'];
         $entity->sortDe = $data['sort_de'];
         $entity->sortEn = $data['sort_en'];
 

htdocs/lib2/logic/user.class.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
      */
     public static function fromEMail($email)
     {
-        $userId = (int) sql_value("SELECT `user_id` FROM `user` WHERE `email`='&1'", 0, $email);
+        $userId = (int)sql_value("SELECT `user_id` FROM `user` WHERE `email`='&1'", 0, $email);
         if ($userId === 0) {
             return null;
         }
@@ -41,7 +41,7 @@ 
      */
     public static function fromUsername($username)
     {
-        $userId = (int) sql_value("SELECT `user_id` FROM `user` WHERE `username`='&1'", 0, $username);
+        $userId = (int)sql_value("SELECT `user_id` FROM `user` WHERE `username`='&1'", 0, $username);
         if ($userId === 0) {
             return null;
         }

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->fetchColumn('SELECT COUNT(*) FROM `caches` WHERE `cache_id`=:id',[':id' => $cacheId]) <> 1)
+    $connection->fetchColumn('SELECT COUNT(*) FROM `caches` WHERE `cache_id`=:id', [':id' => $cacheId]) <> 1)
 {
     $error = $translate->t('Cache not found', '', '', 0);
 } elseif ($cacheId > 0) {