OpencachingDeutschland / oc-server3

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

Spacing +9 added lines, -9 removed lines

@@ -225,7 +225,7 @@ 
                 WHERE cache_id = :cacheId;
 SQL
             , [
-                'cacheId' => (int) $cache['cache_id'],
+                'cacheId' => (int)$cache['cache_id'],
             ]);
 
             $this->connection->executeQuery(<<<'SQL'
@@ -237,19 +237,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'],
             ]);
         }
     }
@@ -260,8 +260,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->fetchAll('SELECT * FROM pictures WHERE object_id IN (' . implode(',', $ids) . ') AND object_type = :objectType', [
@@ -281,8 +281,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->fetchAll('SELECT * FROM pictures_modified WHERE object_id IN (' . implode(',', $ids) . ') AND object_type = :objectType', [

htdocs/okapi/meta.php

Indentation +2 added lines, -2 removed lines

@@ -1,4 +1,4 @@
 <?php return array (
-  'version_number' => 1926,
-  'git_revision' => 'dbed1d0d908dcc00a4aa7387de2e08b727dccee8',
+    'version_number' => 1926,
+    'git_revision' => 'dbed1d0d908dcc00a4aa7387de2e08b727dccee8',
 );
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<?php return array (
+<?php return array(
   'version_number' => 1926,
   'git_revision' => 'dbed1d0d908dcc00a4aa7387de2e08b727dccee8',
 );
\ No newline at end of file

local/devel/generator.php

Spacing +3 added lines, -3 removed lines

@@ -359,13 +359,13 @@ 
 
     file_put_contents(
         __DIR__ . '/Entities/' . $classNameEntity . '.php',
-        "<?php \n\n" . (string) $classEntity,
+        "<?php \n\n" . (string)$classEntity,
         LOCK_EX
     );
 
     file_put_contents(
         __DIR__ . '/Entities/' . $classNameEntity . 'Test.php',
-        "<?php \n\n use OcTest\Modules\AbstractModuleTest; \n\n" . (string) $classEntityTest,
+        "<?php \n\n use OcTest\Modules\AbstractModuleTest; \n\n" . (string)$classEntityTest,
         LOCK_EX
     );
 
@@ -378,7 +378,7 @@ 
 use Oc\Repository\Exception\RecordNotFoundException;
 use Oc\Repository\Exception\RecordNotPersistedException;
 use Oc\Repository\Exception\RecordsNotFoundException; \n\n" .
-        (string) $classRepository,
+        (string)$classRepository,
         LOCK_EX
     );
 }

htdocs/config2/settings-dist.inc.php

Spacing +17 added lines, -17 removed lines

@@ -107,7 +107,7 @@ 
 // database placeholder
 
 // productive database with opencaching-tables
-$opt['db']['placeholder']['db'] = '';    // selected by default
+$opt['db']['placeholder']['db'] = ''; // selected by default
 
 // empty database for temporary table creation
 $opt['db']['placeholder']['tmpdb'] = '';
@@ -121,14 +121,14 @@ 
 $opt['system']['maillog']['syslog_db_user'] = '';
 $opt['system']['maillog']['syslog_db_password'] = '';
 $opt['system']['maillog']['syslog_db_table'] = '';
-$opt['system']['maillog']['syslog_oc_host'] = '';  // 'host_name' column in syslog DB
-$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%';  // 'program' column in syslog DB
-$opt['system']['maillog']['column']['id'] = 'id';               // 'ID'
-$opt['system']['maillog']['column']['created'] = 'created';     // 'ReceivedAt'
+$opt['system']['maillog']['syslog_oc_host'] = ''; // 'host_name' column in syslog DB
+$opt['system']['maillog']['syslog_mta'] = 'postfix/smtp%'; // 'program' column in syslog DB
+$opt['system']['maillog']['column']['id'] = 'id'; // 'ID'
+$opt['system']['maillog']['column']['created'] = 'created'; // 'ReceivedAt'
 $opt['system']['maillog']['column']['host_name'] = 'host_name'; // 'FromHost'
-$opt['system']['maillog']['column']['message'] = 'message';     // 'Message'
-$opt['system']['maillog']['column']['program'] = 'program';     // 'SysLogTag'
-$opt['system']['maillog']['inactivity_warning'] = 30;   // warn after N days without new entries
+$opt['system']['maillog']['column']['message'] = 'message'; // 'Message'
+$opt['system']['maillog']['column']['program'] = 'program'; // 'SysLogTag'
+$opt['system']['maillog']['inactivity_warning'] = 30; // warn after N days without new entries
 
 /* cookie or session
  *
@@ -152,7 +152,7 @@ 
  */
 $opt['session']['cookiename'] = 'ocdevelopment'; // only with SAVE_COOKIE
 $opt['session']['path'] = '/';
-$opt['session']['domain'] = '';    // may be overwritten by $opt['domain'][...]['cookiedomain']
+$opt['session']['domain'] = ''; // may be overwritten by $opt['domain'][...]['cookiedomain']
 
 /* Debug level (combine with OR | )
  *  DEBUG_NO              = productive use
@@ -170,7 +170,7 @@ 
 /* other template options
  *
  */
-$opt['page']['origin_url'] = 'https://www.opencaching.de/';  // production installation for this OC site
+$opt['page']['origin_url'] = 'https://www.opencaching.de/'; // production installation for this OC site
 $opt['page']['develsystem'] = false;
 $opt['page']['teampic_url'] = 'https://www.opencaching.de/images/team/';
 $opt['page']['teammember_url'] = 'https://www.opencaching.de/';
@@ -204,7 +204,7 @@ 
     'newcaches' => [
         'show' => true,
         'url' => 'https://www.opencaching.de',
-        'urlname' => '',  // optional: show other name than the url-domain
+        'urlname' => '', // optional: show other name than the url-domain
     ],
 ];
 
@@ -364,7 +364,7 @@ 
 
 /* license-related functions
  */
-$opt['logic']['license']['newusers'] = 2;  // see license constants in lib2/logic/const.inc.php
+$opt['logic']['license']['newusers'] = 2; // see license constants in lib2/logic/const.inc.php
 $opt['logic']['license']['admin'] = true;
 $opt['logic']['license']['disclaimer'] = false;
 $opt['logic']['license']['terms'] = 'articles.php?page=impressum#datalicense';
@@ -372,18 +372,18 @@ 
 
 /* optional APIs
  */
-$opt['logic']['api']['email_problems']['key'] = '';   // must be set to enable
-$opt['logic']['api']['user_inactivity']['key'] = '';  // must be set to enable
+$opt['logic']['api']['email_problems']['key'] = ''; // must be set to enable
+$opt['logic']['api']['user_inactivity']['key'] = ''; // must be set to enable
 
 /* cache report info settings
  */
 $opt['logic']['cache_reports']['delaydays'] = 2;
-$opt['logic']['cache_reports']['min_processperday'] = 5;   // set to 0 to disable
-$opt['logic']['cache_reports']['max_processperday'] = 20;  // set to 0 to disable
+$opt['logic']['cache_reports']['min_processperday'] = 5; // set to 0 to disable
+$opt['logic']['cache_reports']['max_processperday'] = 20; // set to 0 to disable
 
 /* cronjob
  */
-$opt['cron']['username'] = 'apache';   // system username for cronjobs
+$opt['cron']['username'] = 'apache'; // system username for cronjobs
 
 /* generate sitemap.xml and upload to search engines
  *

htdocs/mylists.php

Spacing +2 added lines, -2 removed lines

@@ -25,13 +25,13 @@
 
 if (isset($_REQUEST['list_caches'])) {
     $list_caches = strtoupper(trim($_REQUEST['list_caches']));
-} elseif (isset($_REQUEST['addCache']) &&  $_REQUEST['addCache'] >= 1) {
+} elseif (isset($_REQUEST['addCache']) && $_REQUEST['addCache'] >= 1) {
     $list_caches = $_REQUEST['addCache'];
 } else {
     $list_caches = '';
 }
 
-if (isset($_REQUEST['addCache'])){
+if (isset($_REQUEST['addCache'])) {
     foreach ($list_caches as $nCacheId) {
         $cache = new cache($nCacheId);
         $oc_codes[] = $cache->getWPOC();

htdocs/search.php

Spacing +4 added lines, -4 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
@@ -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;
         }
 

htdocs/lib2/edithelper.inc.php

Spacing +1 added lines, -1 removed lines

@@ -96,7 +96,7 @@
         // REDMINE-1249: Missing log text in mail notification
         // simpler solution that converts html to text as the previous class html2text emptied the text completely
         // implementation for line wrap, url's and probably more is missing
-        $text = preg_replace( "/\n\s+/", "\n", rtrim(html_entity_decode(strip_tags($text))));
+        $text = preg_replace("/\n\s+/", "\n", rtrim(html_entity_decode(strip_tags($text))));
 
         $text = str_replace(
             [

htdocs/log.php

Spacing +17 added lines, -17 removed lines

@@ -50,8 +50,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) {
@@ -97,7 +97,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) {
@@ -109,17 +109,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);
 
@@ -165,12 +165,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 < EditorConstants::HTML_MODE) || ($descMode > EditorConstants::EDITOR_MODE)) {
             $descMode = EditorConstants::EDITOR_MODE;
         }
@@ -248,7 +248,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);
 
@@ -256,8 +256,8 @@ 
         $logDate = date(
             $opt['db']['dateformat'],
             mktime(
-                (int) $logTimeHour,
-                (int) $logTimeMinute,
+                (int)$logTimeHour,
+                (int)$logTimeMinute,
                 $logTimeSecond,
                 $logDateMonth,
                 $logDateDay,
@@ -308,7 +308,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()
                 );
 
@@ -395,8 +395,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/editlog.php

Spacing +1 added lines, -1 removed lines

@@ -143,7 +143,7 @@
 
 // editor mode switching
 if (isset($_POST['descMode'])) {
-    $descMode = (int) $_POST['descMode']; // Ocprop: 2
+    $descMode = (int)$_POST['descMode']; // Ocprop: 2
     if (($descMode < EditorConstants::HTML_MODE) || ($descMode > EditorConstants::EDITOR_MODE)) {
         $descMode = EditorConstants::EDITOR_MODE;
     }