OpencachingDeutschland / oc-server3

htdocs_symfony/src/Controller/Backend/SupportController.php

Indentation +53 added lines, -53 removed lines

@@ -180,9 +180,9 @@ 
 
         return $this->render(
             'backend/support/searchedCaches.html.twig', [
-                                                          'supportCachesForm' => $formSearch->createView(),
-                                                          'foundCaches' => $fetchedCaches
-                                                      ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'foundCaches' => $fetchedCaches
+                                                        ]
         );
     }
 
@@ -201,9 +201,9 @@ 
 
         return $this->render(
             'backend/support/reportedCaches.html.twig', [
-                                                          'supportCachesForm' => $formSearch->createView(),
-                                                          'reportedCaches_by_id' => $fetchedReports
-                                                      ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'reportedCaches_by_id' => $fetchedReports
+                                                        ]
         );
     }
 
@@ -221,9 +221,9 @@ 
 
         return $this->render(
             'backend/support/bonusCaches.html.twig', [
-                                                       'supportCachesForm' => $formSearch->createView(),
-                                                       'bonusCaches_by_id' => $fetchedBonuscaches
-                                                   ]
+                                                        'supportCachesForm' => $formSearch->createView(),
+                                                        'bonusCaches_by_id' => $fetchedBonuscaches
+                                                    ]
         );
     }
 
@@ -264,10 +264,10 @@ 
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'SQLFlexForm' => $form->createView(),
-                                                           'suppSQLqueryFlex' => $fetchedInformation
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'SQLFlexForm' => $form->createView(),
+                                                            'suppSQLqueryFlex' => $fetchedInformation
+                                                        ]
         );
     }
 
@@ -395,16 +395,16 @@ 
 
         return $this->render(
             'backend/support/occ.html.twig', [
-                                               'supportCachesForm' => $formSearch->createView(),
-                                               'supportCommentFormUser' => $formCommentUser->createView(),
-                                               'supportCommentFormCache' => $formCommentCache->createView(),
-                                               'occ_cache_data' => $fetchedCacheData,
-                                               'occ_cache_comments' => $fetchedCacheComments,
-                                               'occ_cache_infos' => $fetchedCacheInfos,
-                                               'occ_user_data' => $fetchedUserData,
-                                               'occ_user_comments' => $fetchedUserComments,
-                                               'occ_user_relations' => $fetchedUserRelations
-                                           ]
+                                                'supportCachesForm' => $formSearch->createView(),
+                                                'supportCommentFormUser' => $formCommentUser->createView(),
+                                                'supportCommentFormCache' => $formCommentCache->createView(),
+                                                'occ_cache_data' => $fetchedCacheData,
+                                                'occ_cache_comments' => $fetchedCacheComments,
+                                                'occ_cache_infos' => $fetchedCacheInfos,
+                                                'occ_user_data' => $fetchedUserData,
+                                                'occ_user_comments' => $fetchedUserComments,
+                                                'occ_user_relations' => $fetchedUserRelations
+                                            ]
         );
     }
 
@@ -528,10 +528,10 @@ 
 
         return $this->render(
             'backend/support/userDetails.html.twig', [
-                                                       'supportCachesForm' => $formSearch->createView(),
-                                                       'supportUserAccountActions' => $formActions->createView(),
-                                                       'user_account_details' => $fetchedUserDetails
-                                                   ]
+                                                        'supportCachesForm' => $formSearch->createView(),
+                                                        'supportUserAccountActions' => $formActions->createView(),
+                                                        'user_account_details' => $fetchedUserDetails
+                                                    ]
         );
     }
 
@@ -620,9 +620,9 @@ 
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'suppSQLquery1' => $qb->execute()->fetchAll()
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'suppSQLquery1' => $qb->execute()->fetchAll()
+                                                        ]
         );
     }
 
@@ -646,9 +646,9 @@ 
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'suppSQLquery2' => $qb->execute()->fetchAll()
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'suppSQLquery2' => $qb->execute()->fetchAll()
+                                                        ]
         );
     }
 
@@ -674,9 +674,9 @@ 
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'suppSQLquery4' => $qb->execute()->fetchAll()
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'suppSQLquery4' => $qb->execute()->fetchAll()
+                                                        ]
         );
     }
 
@@ -692,9 +692,9 @@ 
 
         return $this->render(
             'backend/support/databaseQueries.html.twig', [
-                                                           'supportCachesForm' => $formSearch->createView(),
-                                                           'suppSQLquery5' => $this->supportUserCommentsRepository->fetchAll()
-                                                       ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'suppSQLquery5' => $this->supportUserCommentsRepository->fetchAll()
+                                                        ]
         );
     }
 
@@ -799,15 +799,15 @@ 
 
         return $this->render(
             'backend/support/occ_gpx_import.html.twig', [
-                                                          'supportCachesForm' => $formSearch->createView(),
-                                                          'supportUploadGPXForm' => $formUpload->createView(),
-                                                          'amountProcessedCaches' => $amountProcessedCaches,
-                                                          'amountAssignedCaches' => $amountAssignedCaches,
-                                                          'amountUpdatedCaches' => $amountUpdatedCaches,
-                                                          'listOfAmbiguousCaches' => $listOfAmbiguousCaches,
-                                                          'fetchedListingInfos' => $fetchedListingInfos,
-                                                          'differencesDetected' => $differencesDetected
-                                                      ]
+                                                            'supportCachesForm' => $formSearch->createView(),
+                                                            'supportUploadGPXForm' => $formUpload->createView(),
+                                                            'amountProcessedCaches' => $amountProcessedCaches,
+                                                            'amountAssignedCaches' => $amountAssignedCaches,
+                                                            'amountUpdatedCaches' => $amountUpdatedCaches,
+                                                            'listOfAmbiguousCaches' => $listOfAmbiguousCaches,
+                                                            'fetchedListingInfos' => $fetchedListingInfos,
+                                                            'differencesDetected' => $differencesDetected
+                                                        ]
         );
     }
 
@@ -959,11 +959,11 @@ 
                     ] as $checkItem) {
                         if ($wpt[$checkItem] != $fetchedExistingSupportListingInfoArray[$checkItem]) {
                             $newComment .= $checkItem
-                                           . ' changed from '
-                                           . $fetchedExistingSupportListingInfoArray[$checkItem]
-                                           . ' to '
-                                           . $wpt[$checkItem]
-                                           . PHP_EOL;
+                                            . ' changed from '
+                                            . $fetchedExistingSupportListingInfoArray[$checkItem]
+                                            . ' to '
+                                            . $wpt[$checkItem]
+                                            . PHP_EOL;
                         }
                     }
 

Spacing +8 added lines, -8 removed lines

@@ -249,7 +249,7 @@ 
             $fetchedInformation = $this->executeSQL_flexible($inputData['content_WHAT'], $inputData['content_TABLE']);
 
             $countFetched = count($fetchedInformation);
-            for ($i = 0; $i < $countFetched; $i ++) {
+            for ($i = 0; $i < $countFetched; $i++) {
                 if (array_key_exists('password', $fetchedInformation[$i])) {
                     $fetchedInformation[$i]['password'] = '-';
                 }
@@ -425,18 +425,18 @@ 
             $inputData = $form->getData();
 
             if ($inputData['hidden_sender'] == 'textfield_cache_comment') {
-                $entity = $this->supportListingCommentsRepository->fetchOneBy(['wp_oc' => (string) $inputData['hidden_ID2']]);
+                $entity = $this->supportListingCommentsRepository->fetchOneBy(['wp_oc' => (string)$inputData['hidden_ID2']]);
                 $entity->comment = $inputData['content_comment_field'];
                 $this->supportListingCommentsRepository->update($entity);
             } elseif ($inputData['hidden_sender'] == 'textfield_user_comment') {
-                $entity = $this->supportUserCommentsRepository->fetchOneBy(['oc_user_id' => (int) $inputData['hidden_ID1']]);
+                $entity = $this->supportUserCommentsRepository->fetchOneBy(['oc_user_id' => (int)$inputData['hidden_ID1']]);
                 $entity->comment = $inputData['content_comment_field'];
                 $this->supportUserCommentsRepository->update($entity);
             }
 
             return $this->redirectToRoute('backend_support_occ', [
-                'userID' => (string) $inputData['hidden_ID1'],
-                'wpID' => (string) $inputData['hidden_ID2']
+                'userID' => (string)$inputData['hidden_ID1'],
+                'wpID' => (string)$inputData['hidden_ID2']
             ]);
         }
 
@@ -459,7 +459,7 @@ 
         if ($form->isSubmitted() && $form->isValid()) {
             $inputData = $form->getData();
 
-            $entity = $this->cacheReportsRepository->fetchOneBy(['id' => (int) $inputData['hidden_ID1']]);
+            $entity = $this->cacheReportsRepository->fetchOneBy(['id' => (int)$inputData['hidden_ID1']]);
             $entity->comment = $inputData['content_comment_field'];
 
             $this->cacheReportsRepository->update($entity);
@@ -845,7 +845,7 @@ 
                 array_push($tempArray, '');
             }
 
-            if (round ($fetchedOCCache->longitude * 10000) != round($fetchedListingInfo->nodeListingCoordinatesLon * 10000)) {
+            if (round($fetchedOCCache->longitude * 10000) != round($fetchedListingInfo->nodeListingCoordinatesLon * 10000)) {
                 array_push($tempArray, $fetchedOCCache->longitude . ' != ' . $fetchedListingInfo->nodeListingCoordinatesLon);
             } else {
                 array_push($tempArray, '');
@@ -995,7 +995,7 @@ 
                 $entity = $this->supportListingInfosRepository->getEntityFromDatabaseArray($wpt);
                 $this->supportListingInfosRepository->create($entity);
 
-                $amountAssignedCaches ++;
+                $amountAssignedCaches++;
             }
         }
         return([$amountAssignedCaches, $amountUpdatedCaches, $listOfAmbiguousCaches]);

Braces +3 added lines, -1 removed lines

@@ -860,7 +860,9 @@
             if ((($fetchedListingInfo->nodeListingAvailable == true) && ($fetchedOCCache->status != 1)) ||
                 (($fetchedListingInfo->nodeListingAvailable == false) && ($fetchedOCCache->status == 1))) {
                 array_push($tempArray, 'OC status != import status');
-            } else array_push($tempArray, '');
+            } else {
+                array_push($tempArray, '');
+            }
 
             if ((($fetchedListingInfo->nodeListingArchived == true) && ($fetchedOCCache->status != 3)) ||
                 (($fetchedListingInfo->nodeListingAvailable == false) && ($fetchedOCCache->status == 3))) {

htdocs_symfony/src/Form/SupportImportGPX.php

Indentation +11 added lines, -11 removed lines

@@ -27,14 +27,14 @@ 
                                 ],
                                 'constraints' => [
                                     new File([
-                                                 'maxSize' => '20480000',
-                                                 'mimeTypes' => [
-                                                     'application/gpx+xml',
-                                                     'application/xml',
-                                                     'text/xml',
-                                                 ],
-                                                 'mimeTypesMessage' => 'Please upload a valid GPX/XML document',
-                                             ])
+                                                    'maxSize' => '20480000',
+                                                    'mimeTypes' => [
+                                                        'application/gpx+xml',
+                                                        'application/xml',
+                                                        'text/xml',
+                                                    ],
+                                                    'mimeTypesMessage' => 'Please upload a valid GPX/XML document',
+                                                ])
                                 ],
                                 'multiple' => false,
                                 'required' => true,
@@ -45,9 +45,9 @@ 
             )
             ->add(
                 'start_upload', SubmitType::class, [
-                                  'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 100px;'],
-                                  'label' => '

htdocs_symfony/src/Repository/CacheLogsArchivedRepository.php

Spacing +17 added lines, -17 removed lines

@@ -143,7 +143,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -240,30 +240,30 @@ 
     public function getEntityFromDatabaseArray(array $data)
     {
         $entity = new GeoCacheLogsArchivedEntity();
-        $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 = date('Y-m-d H:i:s');
-        $entity->okapiSyncbase = (string) $data['okapi_syncbase'];
+        $entity->okapiSyncbase = (string)$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 = (int) $data['oc_team_comment'];
+        $entity->cacheId = (int)$data['cache_id'];
+        $entity->userId = (int)$data['user_id'];
+        $entity->type = (int)$data['type'];
+        $entity->ocTeamComment = (int)$data['oc_team_comment'];
         $entity->date = new DateTime($data['date']);
         $entity->orderDate = new DateTime($data['order_date']);
-        $entity->needsMaintenance = (int) $data['needs_maintenance'];
-        $entity->listingOutdated = (int) $data['listing_outdated'];
-        $entity->text = (string) $data['text'];
-        $entity->textHtml = (int) $data['text_html'];
-        $entity->textHtmledit = (int) $data['text_htmledit'];
-        $entity->ownerNotified = (int) $data['owner_notified'];
+        $entity->needsMaintenance = (int)$data['needs_maintenance'];
+        $entity->listingOutdated = (int)$data['listing_outdated'];
+        $entity->text = (string)$data['text'];
+        $entity->textHtml = (int)$data['text_html'];
+        $entity->textHtmledit = (int)$data['text_htmledit'];
+        $entity->ownerNotified = (int)$data['owner_notified'];
         $entity->picture = $data['picture'];
         $entity->deletionDate = new DateTime($data['deletion_date']);
-        $entity->deletedBy = (int) $data['deleted_by'];
-        $entity->restoredBy = (int) $data['restored_by'];
+        $entity->deletedBy = (int)$data['deleted_by'];
+        $entity->restoredBy = (int)$data['restored_by'];
 
         return $entity;
     }

htdocs_symfony/src/Repository/SupportListingInfosRepository.php

Spacing +16 added lines, -16 removed lines

@@ -148,7 +148,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -237,22 +237,22 @@ 
     public function getEntityFromDatabaseArray(array $data)
     : SupportListingInfosEntity {
         $entity = new SupportListingInfosEntity();
-        $entity->id = (array_key_exists('id', $data)) ? (int) $data['id'] : NULL;
-        $entity->wpOc = (string) $data['wp_oc'];
-        $entity->nodeId = (int) $data['node_id'];
-        $entity->nodeOwnerId = (string) $data['node_owner_id'];
-        $entity->nodeListingId = (string) $data['node_listing_id'];
-        $entity->nodeListingWp = (string) $data['node_listing_wp'];
-        $entity->nodeListingName = (string) $data['node_listing_name'];
-        $entity->nodeListingSize = (int) $data['node_listing_size'];
-        $entity->nodeListingDifficulty = (int) $data['node_listing_difficulty'];
-        $entity->nodeListingTerrain = (int) $data['node_listing_terrain'];
-        $entity->nodeListingCoordinatesLon = (double) $data['node_listing_coordinates_lon'];
-        $entity->nodeListingCoordinatesLat = (double) $data['node_listing_coordinates_lat'];
-        $entity->nodeListingAvailable = (bool) $data['node_listing_available'];
-        $entity->nodeListingArchived = (bool) $data['node_listing_archived'];
+        $entity->id = (array_key_exists('id', $data)) ? (int)$data['id'] : NULL;
+        $entity->wpOc = (string)$data['wp_oc'];
+        $entity->nodeId = (int)$data['node_id'];
+        $entity->nodeOwnerId = (string)$data['node_owner_id'];
+        $entity->nodeListingId = (string)$data['node_listing_id'];
+        $entity->nodeListingWp = (string)$data['node_listing_wp'];
+        $entity->nodeListingName = (string)$data['node_listing_name'];
+        $entity->nodeListingSize = (int)$data['node_listing_size'];
+        $entity->nodeListingDifficulty = (int)$data['node_listing_difficulty'];
+        $entity->nodeListingTerrain = (int)$data['node_listing_terrain'];
+        $entity->nodeListingCoordinatesLon = (double)$data['node_listing_coordinates_lon'];
+        $entity->nodeListingCoordinatesLat = (double)$data['node_listing_coordinates_lat'];
+        $entity->nodeListingAvailable = (bool)$data['node_listing_available'];
+        $entity->nodeListingArchived = (bool)$data['node_listing_archived'];
         $entity->lastModified = date('Y-m-d H:i:s');
-        $entity->importStatus = (int) $data['importstatus'];
+        $entity->importStatus = (int)$data['importstatus'];
         $entity->node = $this->nodesRepository->fetchOneBy(['id' => $entity->nodeId]);
 
         return $entity;

htdocs_symfony/src/Repository/CacheReportsRepository.php

Spacing +9 added lines, -9 removed lines

@@ -182,7 +182,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -266,16 +266,16 @@ 
     {
 
         $entity = new GeoCacheReportsEntity();
-        $entity->id = (int) $data['id'];
+        $entity->id = (int)$data['id'];
         $entity->dateCreated = new DateTime($data['date_created']);
-        $entity->cacheid = (int) $data['cacheid'];
-        $entity->userid = (int) $data['userid'];
-        $entity->reason = (int) $data['reason'];
-        $entity->note = (string) $data['note'];
-        $entity->status = (int) $data['status'];
-        $entity->adminid = (int) $data['adminid'];
+        $entity->cacheid = (int)$data['cacheid'];
+        $entity->userid = (int)$data['userid'];
+        $entity->reason = (int)$data['reason'];
+        $entity->note = (string)$data['note'];
+        $entity->status = (int)$data['status'];
+        $entity->adminid = (int)$data['adminid'];
         $entity->lastmodified = date('Y-m-d H:i:s');
-        $entity->comment = (string) $data['comment'];
+        $entity->comment = (string)$data['comment'];
         $entity->cache = $this->cachesRepository->fetchOneBy(['cache_id' => $entity->cacheid]);
         $entity->user = $this->userRepository->fetchOneById($entity->userid);
         if ($entity->adminid) $entity->admin = $this->userRepository->fetchOneById($entity->adminid);

htdocs_symfony/src/Repository/SupportUserCommentsRepository.php

Spacing +5 added lines, -5 removed lines

@@ -145,7 +145,7 @@ 
             $databaseArray
         );
 
-        $entity->id = (int) $this->connection->lastInsertId();
+        $entity->id = (int)$this->connection->lastInsertId();
 
         return $entity;
     }
@@ -223,11 +223,11 @@ 
     public function getEntityFromDatabaseArray(array $data)
     : SupportUserCommentsEntity {
         $entity = new SupportUserCommentsEntity(0);
-        $entity->id = (int) $data['id'];
-        $entity->ocUserId = (int) $data['oc_user_id'];
+        $entity->id = (int)$data['id'];
+        $entity->ocUserId = (int)$data['oc_user_id'];
         $entity->user = $this->userRepository->fetchOneById($entity->ocUserId);
-        $entity->comment = (string) $data['comment'];
-        $entity->commentCreated = (string) $data['comment_created'];
+        $entity->comment = (string)$data['comment'];
+        $entity->commentCreated = (string)$data['comment_created'];
         $entity->commentLastModified = date('Y-m-d H:i:s');
 
         return $entity;