OpencachingDeutschland / oc-server3

htdocs/ocstats.php

Spacing +5 added lines, -5 removed lines

@@ -11,7 +11,7 @@ 
 $jpegQuality = 80;
 $fontFile = __DIR__ . '/resource2/' . $opt['template']['style'] . '/fonts/dejavu/ttf/DejaVuSans.ttf';
 
-$userId = isset($_REQUEST['userid']) ? (int) $_REQUEST['userid'] : 0;
+$userId = isset($_REQUEST['userid']) ? (int)$_REQUEST['userid'] : 0;
 $lang = isset($_REQUEST['lang']) ? mb_strtoupper($_REQUEST['lang']) : $opt['template']['locale'];
 
 if (!isset($opt['locale'][$lang])) {
@@ -22,7 +22,7 @@ 
 $connection = AppKernel::Container()->get(Connection::class);
 
 $fileName = __DIR__ . '/images/statpics/statpic' . $userId . $lang . '.jpg';
-$userStatisticPicture = (int) $connection->createQueryBuilder()
+$userStatisticPicture = (int)$connection->createQueryBuilder()
     ->select('COUNT(*)')
     ->from('user_statpic')
     ->where('user_id = :userId')
@@ -48,9 +48,9 @@ 
 
     if (is_array($userData)) {
         $username = $userData['username'];
-        $found = (int) $userData['found'];
-        $hidden = (int) $userData['hidden'];
-        $logo = (int) $userData['statpic_logo'];
+        $found = (int)$userData['found'];
+        $hidden = (int)$userData['hidden'];
+        $logo = (int)$userData['statpic_logo'];
         $logoText = $userData['statpic_text'];
 
         $textCounterStatistic = $translate->t('Finds: %1  Hidden: %2', '', '', 0, '', 0, $lang);

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/lib2/login.class.php

Spacing +10 added lines, -10 removed lines

@@ -15,13 +15,13 @@ 
 
 use OcLegacy\Util\PasswordCrypt;
 
-define('LOGIN_UNKNOWN_ERROR', -1);     // unknown error occurred
-define('LOGIN_OK', 0);                 // login succeeded
-define('LOGIN_BADUSERPW', 1);          // bad username or password
-define('LOGIN_TOOMUCHLOGINS', 2);      // too many logins in short time
-define('LOGIN_USERNOTACTIVE', 3);      // the userAccount locked
+define('LOGIN_UNKNOWN_ERROR', -1); // unknown error occurred
+define('LOGIN_OK', 0); // login succeeded
+define('LOGIN_BADUSERPW', 1); // bad username or password
+define('LOGIN_TOOMUCHLOGINS', 2); // too many logins in short time
+define('LOGIN_USERNOTACTIVE', 3); // the userAccount locked
 define('LOGIN_EMPTY_USERPASSWORD', 4); // given username/password was empty
-define('LOGIN_LOGOUT_OK', 5);          // logout was successful
+define('LOGIN_LOGOUT_OK', 5); // logout was successful
 
 // login times in seconds
 define('LOGIN_TIME', 60 * 60);
@@ -69,7 +69,7 @@ 
 
         // TODO good input evaluation
         if ($cookie->is_set('userid') && $cookie->is_set('username')) {
-            $this->userid = (int) $cookie->get('userid');
+            $this->userid = (int)$cookie->get('userid');
             $this->username = $cookie->get('username');
             $this->permanent = (($cookie->get('permanent') + 0) == 1);
             $this->lastlogin = $cookie->get('lastlogin');
@@ -100,7 +100,7 @@ 
     public function pStoreCookie()
     {
         global $cookie;
-        $cookie->set('userid', (int) $this->userid);
+        $cookie->set('userid', (int)$this->userid);
         $cookie->set('username', $this->username);
         $cookie->set('permanent', ($this->permanent === true ? 1 : 0));
         $cookie->set('lastlogin', $this->lastlogin);
@@ -297,7 +297,7 @@ 
                     $rUser['user_id'],
                     ($permanent != false ? 1 : 0)
                 );
-                $this->userid = (int) $rUser['user_id'];
+                $this->userid = (int)$rUser['user_id'];
                 $this->username = $rUser['username'];
                 $this->permanent = $permanent;
                 $this->lastlogin = date('Y-m-d H:i:s');
@@ -343,7 +343,7 @@ 
             );
             if ($rUser = sql_fetch_assoc($rs)) {
                 $this->username = $rUser['username'];
-                $this->userid = (int) $rUser['user_id'];
+                $this->userid = (int)$rUser['user_id'];
                 $this->admin = $rUser['admin'];
                 $this->verified = true;
                 sqlf("UPDATE `user` SET `user`.`last_login`=NOW() WHERE `user`.`user_id`='&1'", $this->userid);

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/src/Oc/Page/BlockRepository.php

Spacing +10 added lines, -10 removed lines

@@ -54,7 +54,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -97,7 +97,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -125,7 +125,7 @@ 
             ['id' => $entity->id]
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -169,7 +169,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
         ];
@@ -185,13 +185,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/Validator/Exception/ValidationException.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
     {
         $this->setViolations($violations);
 
-        parent::__construct((string) $this);
+        parent::__construct((string)$this);
     }
 
     /**

htdocs/src/Oc/GeoCache/Persistence/GeoCacheLog/GeoCacheLogRepository.php

Spacing +17 added lines, -17 removed lines

@@ -85,7 +85,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -117,7 +117,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -292,27 +292,27 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new GeoCacheLogEntity();
-        $entity->id = (int) $data['id'];
-        $entity->uuid = (string) $data['uuid'];
-        $entity->node = (int) $data['node'];
+        $entity->id = (int)$data['id'];
+        $entity->uuid = (string)$data['uuid'];
+        $entity->node = (int)$data['node'];
         $entity->dateCreated = new DateTime($data['date_created']);
         $entity->entryLastModified = new DateTime($data['entry_last_modified']);
         $entity->lastModified = new DateTime($data['last_modified']);
-        $entity->okapiSyncbase = (int) $data['okapi_syncbase'];
+        $entity->okapiSyncbase = (int)$data['okapi_syncbase'];
         $entity->logLastModified = new DateTime($data['log_last_modified']);
-        $entity->cacheId = (int) $data['cache_id'];
-        $entity->userId = (int) $data['user_id'];
-        $entity->type = (int) $data['type'];
-        $entity->ocTeamComment = (bool) $data['oc_team_comment'];
+        $entity->cacheId = (int)$data['cache_id'];
+        $entity->userId = (int)$data['user_id'];
+        $entity->type = (int)$data['type'];
+        $entity->ocTeamComment = (bool)$data['oc_team_comment'];
         $entity->date = new DateTime($data['date']);
         $entity->orderDate = new DateTime($data['order_date']);
-        $entity->needsMaintenance = (bool) $data['needs_maintenance'];
-        $entity->listingOutdated = (bool) $data['listing_outdated'];
-        $entity->text = (string) $data['text'];
-        $entity->textHtml = (bool) $data['text_html'];
-        $entity->textHtmledit = (bool) $data['text_htmledit'];
-        $entity->ownerNotified = (bool) $data['owner_notified'];
-        $entity->picture = (int) $data['picture'];
+        $entity->needsMaintenance = (bool)$data['needs_maintenance'];
+        $entity->listingOutdated = (bool)$data['listing_outdated'];
+        $entity->text = (string)$data['text'];
+        $entity->textHtml = (bool)$data['text_html'];
+        $entity->textHtmledit = (bool)$data['text_htmledit'];
+        $entity->ownerNotified = (bool)$data['owner_notified'];
+        $entity->picture = (int)$data['picture'];
 
         return $entity;
     }

htdocs/src/Oc/GeoCache/Persistence/GeoCache/GeoCacheRepository.php

Spacing +30 added lines, -30 removed lines

@@ -86,7 +86,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -118,7 +118,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -310,40 +310,40 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new GeoCacheEntity();
-        $entity->cacheId = (string) $data['cache_id'];
-        $entity->uuid = (string) $data['uuid'];
-        $entity->node = (int) $data['node'];
+        $entity->cacheId = (string)$data['cache_id'];
+        $entity->uuid = (string)$data['uuid'];
+        $entity->node = (int)$data['node'];
         $entity->dateCreated = new DateTime($data['date_created']);
-        $entity->isPublishdate = (bool) $data['is_publishdate'];
+        $entity->isPublishdate = (bool)$data['is_publishdate'];
         $entity->lastModified = new DateTime($data['last_modified']);
-        $entity->okapiSyncbase = (int) $data['okapi_syncbase'];
+        $entity->okapiSyncbase = (int)$data['okapi_syncbase'];
         $entity->listingLastModified = new DateTime($data['listing_last_modified']);
         $entity->metaLastModified = new DateTime($data['meta_last_modified']);
-        $entity->userId = (int) $data['user_id'];
-        $entity->name = (string) $data['name'];
-        $entity->longitude = (double) $data['longitude'];
-        $entity->latitude = (double) $data['latitude'];
-        $entity->type = (int) $data['type'];
-        $entity->status = (int) $data['status'];
-        $entity->country = (string) $data['country'];
+        $entity->userId = (int)$data['user_id'];
+        $entity->name = (string)$data['name'];
+        $entity->longitude = (double)$data['longitude'];
+        $entity->latitude = (double)$data['latitude'];
+        $entity->type = (int)$data['type'];
+        $entity->status = (int)$data['status'];
+        $entity->country = (string)$data['country'];
         $entity->dateHidden = new DateTime($data['date_hidden']);
-        $entity->size = (int) $data['size'];
-        $entity->difficulty = (int) $data['difficulty'];
-        $entity->terrain = (int) $data['terrain'];
-        $entity->logpw = (string) $data['logpw'];
-        $entity->searchTime = (float) $data['search_time'];
-        $entity->wayLength = (float) $data['way_length'];
-        $entity->wpGc = (string) $data['wp_gc'];
-        $entity->wpGcMaintained = (string) $data['wp_gc_maintained'];
-        $entity->wpOc = (string) $data['wp_oc'];
-        $entity->descLanguages = (string) $data['desc_languages'];
-        $entity->defaultDesclang = (string) $data['default_desclang'];
+        $entity->size = (int)$data['size'];
+        $entity->difficulty = (int)$data['difficulty'];
+        $entity->terrain = (int)$data['terrain'];
+        $entity->logpw = (string)$data['logpw'];
+        $entity->searchTime = (float)$data['search_time'];
+        $entity->wayLength = (float)$data['way_length'];
+        $entity->wpGc = (string)$data['wp_gc'];
+        $entity->wpGcMaintained = (string)$data['wp_gc_maintained'];
+        $entity->wpOc = (string)$data['wp_oc'];
+        $entity->descLanguages = (string)$data['desc_languages'];
+        $entity->defaultDesclang = (string)$data['default_desclang'];
         $entity->dateActivate = new DateTime($data['date_activate']);
-        $entity->needNpaRecalc = (bool) $data['need_npa_recalc'];
-        $entity->showCachelists = (bool) $data['show_cachelists'];
-        $entity->protectOldCoords = (bool) $data['protect_old_coords'];
-        $entity->needsMaintenance = (bool) $data['needs_maintenance'];
-        $entity->listingOutdated = (bool) $data['listing_outdated'];
+        $entity->needNpaRecalc = (bool)$data['need_npa_recalc'];
+        $entity->showCachelists = (bool)$data['show_cachelists'];
+        $entity->protectOldCoords = (bool)$data['protect_old_coords'];
+        $entity->needsMaintenance = (bool)$data['needs_maintenance'];
+        $entity->listingOutdated = (bool)$data['listing_outdated'];
         $entity->flagsLastModified = new DateTime($data['flags_last_modified']);
 
         return $entity;

htdocs/src/Oc/FieldNotes/Persistence/FieldNoteRepository.php

Spacing +3 added lines, -3 removed lines

@@ -90,7 +90,7 @@ 
             ->from(self::TABLE);
 
         foreach ($where as $column => $value) {
-            $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+            $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
         }
 
         foreach ($order as $field => $direction) {
@@ -132,7 +132,7 @@ 
 
         if (count($where) > 0) {
             foreach ($where as $column => $value) {
-                $queryBuilder->andWhere($column . ' = ' .  $queryBuilder->createNamedParameter($value));
+                $queryBuilder->andWhere($column . ' = ' . $queryBuilder->createNamedParameter($value));
             }
         }
 
@@ -286,7 +286,7 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new FieldNoteEntity();
-        $entity->id = (string) $data['id'];
+        $entity->id = (string)$data['id'];
         $entity->userId = $data['user_id'];
         $entity->geocacheId = $data['geocache_id'];
         $entity->type = $data['type'];