OpencachingDeutschland / oc-server3

htdocs/okapi/index.php

Spacing +2 added lines, -2 removed lines

@@ -1,7 +1,7 @@
 <?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';

htdocs/lib2/search/search.gpx.inc.php

Spacing +16 added lines, -16 removed lines

@@ -140,19 +140,19 @@ 
     $gpxTimeFormat = 'Y-m-d\TH:i:s\Z';
 
     $gpxStatus[0] = 'available="False" archived="False"'; // other (unavailable, not archived)
-    $gpxStatus[1] = 'available="True" archived="False"';  // available, not archived
+    $gpxStatus[1] = 'available="True" archived="False"'; // available, not archived
     $gpxStatus[2] = 'available="False" archived="False"'; // unavailable, not archived
-    $gpxStatus[3] = 'available="False" archived="True"';  // unavailable, archived
-    $gpxStatus[6] = 'available="False" archived="True"';  // locked, visible
+    $gpxStatus[3] = 'available="False" archived="True"'; // unavailable, archived
+    $gpxStatus[6] = 'available="False" archived="True"'; // locked, visible
 
     $gpxContainer[1] = 'Other';
     $gpxContainer[2] = 'Micro';
     $gpxContainer[3] = 'Small';
     $gpxContainer[4] = 'Regular';
     $gpxContainer[5] = 'Large';
-    $gpxContainer[6] = 'Large';     // very large
-    $gpxContainer[7] = 'Virtual';   // no container
-    $gpxContainer[8] = 'Micro';     // nano
+    $gpxContainer[6] = 'Large'; // very large
+    $gpxContainer[7] = 'Virtual'; // no container
+    $gpxContainer[8] = 'Micro'; // nano
 
     $gpxOcSize[1] = 'Other';
     $gpxOcSize[2] = 'Micro';
@@ -169,10 +169,10 @@ 
     $gpxType[4] = 'Virtual Cache';
     $gpxType[5] = 'Webcam Cache';
     $gpxType[6] = 'Event Cache';
-    $gpxType[7] = 'Unknown Cache';        // quiz cache
-    $gpxType[8] = 'Unknown Cache';        // maths/physics cache
-    $gpxType[9] = 'Unknown Cache';        // moving cache
-    $gpxType[10] = 'Traditional Cache';   // drive-in cache
+    $gpxType[7] = 'Unknown Cache'; // quiz cache
+    $gpxType[8] = 'Unknown Cache'; // maths/physics cache
+    $gpxType[9] = 'Unknown Cache'; // moving cache
+    $gpxType[10] = 'Traditional Cache'; // drive-in cache
 
     $gpxOcType[1] = 'Other Cache';
     $gpxOcType[2] = 'Traditional Cache';
@@ -181,7 +181,7 @@ 
     $gpxOcType[5] = 'Webcam Cache';
     $gpxOcType[6] = 'Event Cache';
     $gpxOcType[7] = 'Quiz Cache';
-    $gpxOcType[8] = 'Quiz Cache';         // maths/physics cache
+    $gpxOcType[8] = 'Quiz Cache'; // maths/physics cache
     $gpxOcType[9] = 'Moving Cache';
     $gpxOcType[10] = 'Traditional Cache'; // drive-in cache
 
@@ -194,8 +194,8 @@ 
     $gpxLogType[9] = 'Archive';
     $gpxLogType[10] = 'Owner Maintenance';
     $gpxLogType[11] = 'Temporarily Disable Listing';
-    $gpxLogType[13] = 'Archive';          // locked
-    $gpxLogType[14] = 'Archive';          // locked/invisible
+    $gpxLogType[13] = 'Archive'; // locked
+    $gpxLogType[14] = 'Archive'; // locked/invisible
 
     $gpxSymNormal = 'Geocache';
     $gpxSymFound = 'Geocache Found';
@@ -524,9 +524,9 @@ 
         $thisline = mb_ereg_replace('{oc_logs}', $oc_logentries, $thisline);
 
         // attributes
-        $addAttributes = [-1];  // dummy
+        $addAttributes = [-1]; // dummy
         if ($r['type'] == 10) {   // Drive-in
-            $addAttributes[] = 24;  // near the car / park and grab
+            $addAttributes[] = 24; // near the car / park and grab
         }
         $rsAttributes = sql_slave(
             "
@@ -631,7 +631,7 @@ 
             $thiswp = mb_ereg_replace('{type}', text_xmlentities($wp_typename), $thiswp);
             $thiswp = mb_ereg_replace('{parent}', $r['waypoint'], $thiswp);
             $thiswp = mb_ereg_replace('{cacheid}', $r['cacheid'], $thiswp);
-            $waypoints .= $thiswp. "\n";
+            $waypoints .= $thiswp . "\n";
             ++$n;
         }
 

htdocs/config2/settings-dist.inc.php

Spacing +21 added lines, -21 removed lines

@@ -7,8 +7,8 @@ 
  *  Do not modify this file - use settings.inc.php!
  ***************************************************************************/
 
-require_once __DIR__. '/locale.inc.php';
-require_once __DIR__. '/settings-dist-common.inc.php';
+require_once __DIR__ . '/locale.inc.php';
+require_once __DIR__ . '/settings-dist-common.inc.php';
 
 /* PHP settings
  *
@@ -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
  *
@@ -150,15 +150,15 @@ 
  *
  * other parameters may be customized
  */
-$opt['session']['mode'] = SAVE_COOKIE;     // don't change - other option "SAVE_SESSION" is not implemented properly
+$opt['session']['mode'] = SAVE_COOKIE; // don't change - other option "SAVE_SESSION" is not implemented properly
 $opt['session']['cookiename'] = 'ocvagrant'; // 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']
 
 /* maximum session lifetime
  */
 $opt['session']['expire']['cookie'] = 31536000; // when cookies used (default 1 year)
-$opt['session']['expire']['url'] = 1800;        // when no cookies used (default 30 min since last call), attention to session.js
+$opt['session']['expire']['url'] = 1800; // when no cookies used (default 30 min since last call), attention to session.js
 
 /* If the Referer was sent by the client and the substring was not found,
  * the embedded session id will be marked as invalid.
@@ -184,7 +184,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/';
@@ -218,7 +218,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
     ],
 ];
 
@@ -378,7 +378,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';
@@ -386,18 +386,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/src/Oc/Page/BlockRepository.php

Spacing +10 added lines, -10 removed lines

@@ -50,7 +50,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -93,7 +93,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
     }
 
     /**
@@ -119,7 +119,7 @@ 
             ['id' => $entity->id]
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -166,7 +166,7 @@ 
             'page_id' => $entity->pageId,
             'title' => $entity->title,
             'html' => $entity->html,
-            'position' => (int) $entity->position,
+            'position' => (int)$entity->position,
             'updated_at' => $entity->updatedAt->format(DateTime::ATOM),
             'active' => $entity->active
         ];
@@ -182,13 +182,13 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new BlockEntity();
-        $entity->id = (int) $data['id'];
-        $entity->pageId = (int) $data['page_id'];
-        $entity->title = (string) $data['title'];
-        $entity->html = (string) $data['html'];
-        $entity->position = (int) $data['position'];
+        $entity->id = (int)$data['id'];
+        $entity->pageId = (int)$data['page_id'];
+        $entity->title = (string)$data['title'];
+        $entity->html = (string)$data['html'];
+        $entity->position = (int)$data['position'];
         $entity->updatedAt = new DateTime($data['updated_at']);
-        $entity->active = (bool) $data['active'];
+        $entity->active = (bool)$data['active'];
 
         return $entity;
     }

htdocs/src/Oc/Page/PageRepository.php

Spacing +9 added lines, -9 removed lines

@@ -52,7 +52,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -89,7 +89,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -117,7 +117,7 @@ 
             ['id' => $entity->id]
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -180,13 +180,13 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new PageEntity();
-        $entity->id = (int) $data['id'];
-        $entity->slug = (string) $data['slug'];
-        $entity->metaKeywords = (string) $data['meta_keywords'];
-        $entity->metaDescription = (string) $data['meta_description'];
-        $entity->metaSocial = (string) $data['meta_social'];
+        $entity->id = (int)$data['id'];
+        $entity->slug = (string)$data['slug'];
+        $entity->metaKeywords = (string)$data['meta_keywords'];
+        $entity->metaDescription = (string)$data['meta_description'];
+        $entity->metaSocial = (string)$data['meta_social'];
         $entity->updatedAt = new DateTime($data['updated_at']);
-        $entity->active = (bool) $data['active'];
+        $entity->active = (bool)$data['active'];
 
         return $entity;
     }

htdocs/src/Oc/Country/CountryRepository.php

Spacing +9 added lines, -9 removed lines

@@ -175,15 +175,15 @@
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new CountryEntity();
-        $entity->short = (string) $data['short'];
-        $entity->name = (string) $data['name'];
-        $entity->de = (string) $data['de'];
-        $entity->en = (string) $data['en'];
-        $entity->translationId = (int) $data['trans_id'];
-        $entity->listDefaultDe = (bool) $data['list_default_de'];
-        $entity->listDefaultEn = (bool) $data['list_default_en'];
-        $entity->sortDe = (string) $data['sort_de'];
-        $entity->sortEn = (string) $data['sort_en'];
+        $entity->short = (string)$data['short'];
+        $entity->name = (string)$data['name'];
+        $entity->de = (string)$data['de'];
+        $entity->en = (string)$data['en'];
+        $entity->translationId = (int)$data['trans_id'];
+        $entity->listDefaultDe = (bool)$data['list_default_de'];
+        $entity->listDefaultEn = (bool)$data['list_default_en'];
+        $entity->sortDe = (string)$data['sort_de'];
+        $entity->sortEn = (string)$data['sort_en'];
 
         return $entity;
     }

htdocs/src/Oc/User/UserRepository.php

Spacing +12 added lines, -12 removed lines

@@ -103,7 +103,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -131,7 +131,7 @@ 
             ['id' => $entity->id]
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -216,16 +216,16 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new UserEntity();
-        $entity->id = (int) $data['user_id'];
-        $entity->username = (string) $data['username'];
-        $entity->password = (string) $data['password'];
-        $entity->email = (string) $data['email'];
-        $entity->latitude = (double) $data['latitude'];
-        $entity->longitude = (double) $data['longitude'];
-        $entity->isActive = (bool) $data['is_active_flag'];
-        $entity->firstname = (string) $data['first_name'];
-        $entity->lastname = (string) $data['last_name'];
-        $entity->country = (string) $data['country'];
+        $entity->id = (int)$data['user_id'];
+        $entity->username = (string)$data['username'];
+        $entity->password = (string)$data['password'];
+        $entity->email = (string)$data['email'];
+        $entity->latitude = (double)$data['latitude'];
+        $entity->longitude = (double)$data['longitude'];
+        $entity->isActive = (bool)$data['is_active_flag'];
+        $entity->firstname = (string)$data['first_name'];
+        $entity->lastname = (string)$data['last_name'];
+        $entity->country = (string)$data['country'];
         $entity->language = strtolower($data['language']);
 
         return $entity;

htdocs/src/Oc/Language/LanguageRepository.php

Spacing +9 added lines, -9 removed lines

@@ -211,15 +211,15 @@
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new LanguageEntity();
-        $entity->short = (string) strtolower($data['short']);
-        $entity->name = (string) $data['name'];
-        $entity->nativeName = (string) $data['native_name'];
-        $entity->de = (string) $data['de'];
-        $entity->en = (string) $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->short = (string)strtolower($data['short']);
+        $entity->name = (string)$data['name'];
+        $entity->nativeName = (string)$data['native_name'];
+        $entity->de = (string)$data['de'];
+        $entity->en = (string)$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'];
 
         return $entity;
     }

htdocs/lib2/logic/attribute.class.php

Spacing +11 added lines, -11 removed lines

@@ -151,17 +151,17 @@
     public static function getConflictingAttribIds($attribId)
     {
         static $conflicts = [
-            [1, 38],    // only at night - 24/7
-            [1, 40],    // only at night - only by day
-            [24, 25],   // near the parking area - long walk
-            [24, 27],   // near the parking area - hilly area
-            [24, 29],   // near the parking area - swimming required
-            [24, 50],   // near the parking area - cave equipment
-            [24, 51],   // near the parking area - diving equipment
-            [24, 52],   // near the parking area - watercraft
-            [38, 39],   // 24/7 - only at specified times
-            [38, 40],   // 24/7 - only by day
-            [42, 43],   // all seasons - breeding season
+            [1, 38], // only at night - 24/7
+            [1, 40], // only at night - only by day
+            [24, 25], // near the parking area - long walk
+            [24, 27], // near the parking area - hilly area
+            [24, 29], // near the parking area - swimming required
+            [24, 50], // near the parking area - cave equipment
+            [24, 51], // near the parking area - diving equipment
+            [24, 52], // near the parking area - watercraft
+            [38, 39], // 24/7 - only at specified times
+            [38, 40], // 24/7 - only by day
+            [42, 43], // all seasons - breeding season
             [42, 60]    // all seassons - only during specified seasons
         ];