OpencachingDeutschland /
oc-server3
@@ -76,11 +76,11 @@ |
||
| 76 | 76 | |
| 77 | 77 | return $this->render( |
| 78 | 78 | 'backend/maps/index.html.twig', [ |
| 79 | - 'mapCenterViewLat' => $mapCenterViewLat, |
|
| 80 | - 'mapCenterViewLon' => $mapCenterViewLon, |
|
| 81 | - 'mapZoom' => '6', |
|
| 82 | - 'mapWP' => $mapWP |
|
| 83 | - ] |
|
| 79 | + 'mapCenterViewLat' => $mapCenterViewLat, |
|
| 80 | + 'mapCenterViewLon' => $mapCenterViewLon, |
|
| 81 | + 'mapZoom' => '6', |
|
| 82 | + 'mapWP' => $mapWP |
|
| 83 | + ] |
|
| 84 | 84 | ); |
| 85 | 85 | } |
| 86 | 86 | } |
@@ -146,10 +146,10 @@ discard block |
||
| 146 | 146 | |
| 147 | 147 | return $this->render( |
| 148 | 148 | 'backend/roles/team.assignment.html.twig', [ |
| 149 | - 'rolesUserSearchForm' => $form->createView(), |
|
| 150 | - 'user_account_details' => $fetchedUser, |
|
| 151 | - 'roleNames' => $roleNames |
|
| 152 | - ] |
|
| 149 | + 'rolesUserSearchForm' => $form->createView(), |
|
| 150 | + 'user_account_details' => $fetchedUser, |
|
| 151 | + 'roleNames' => $roleNames |
|
| 152 | + ] |
|
| 153 | 153 | ); |
| 154 | 154 | } |
| 155 | 155 | |
@@ -177,10 +177,10 @@ discard block |
||
| 177 | 177 | |
| 178 | 178 | return $this->render( |
| 179 | 179 | 'backend/roles/team.assignment.html.twig', [ |
| 180 | - 'rolesUserSearchForm' => $form->createView(), |
|
| 181 | - 'user_account_details' => $fetchedUser, |
|
| 182 | - 'roleNames' => $roleNames |
|
| 183 | - ] |
|
| 180 | + 'rolesUserSearchForm' => $form->createView(), |
|
| 181 | + 'user_account_details' => $fetchedUser, |
|
| 182 | + 'roleNames' => $roleNames |
|
| 183 | + ] |
|
| 184 | 184 | ); |
| 185 | 185 | } |
| 186 | 186 | |
@@ -209,10 +209,10 @@ discard block |
||
| 209 | 209 | |
| 210 | 210 | return $this->render( |
| 211 | 211 | 'backend/roles/team.assignment.html.twig', [ |
| 212 | - 'rolesUserSearchForm' => $form->createView(), |
|
| 213 | - 'user_account_details' => $fetchedUser, |
|
| 214 | - 'roleNames' => $roleNames |
|
| 215 | - ] |
|
| 212 | + 'rolesUserSearchForm' => $form->createView(), |
|
| 213 | + 'user_account_details' => $fetchedUser, |
|
| 214 | + 'roleNames' => $roleNames |
|
| 215 | + ] |
|
| 216 | 216 | ); |
| 217 | 217 | } |
| 218 | 218 | |
@@ -151,7 +151,7 @@ |
||
| 151 | 151 | $inputData = $form->getData(); |
| 152 | 152 | $userId = $inputData['content_user_searchfield']; |
| 153 | 153 | |
| 154 | - $fetchedUser = $this->userRepository->fetchOneById((int) $userId); |
|
| 154 | + $fetchedUser = $this->userRepository->fetchOneById((int)$userId); |
|
| 155 | 155 | } |
| 156 | 156 | |
| 157 | 157 | return $this->render( |
@@ -172,7 +172,7 @@ discard block |
||
| 172 | 172 | $databaseArray |
| 173 | 173 | ); |
| 174 | 174 | |
| 175 | - $entity->id = (int) $this->connection->lastInsertId(); |
|
| 175 | + $entity->id = (int)$this->connection->lastInsertId(); |
|
| 176 | 176 | |
| 177 | 177 | return $entity; |
| 178 | 178 | } |
@@ -268,8 +268,8 @@ discard block |
||
| 268 | 268 | public function getEntityFromDatabaseArray(array $data) |
| 269 | 269 | : SecurityRolesEntity { |
| 270 | 270 | $entity = new SecurityRolesEntity(); |
| 271 | - $entity->id = (int) $data['id']; |
|
| 272 | - $entity->role = (string) $data['role']; |
|
| 271 | + $entity->id = (int)$data['id']; |
|
| 272 | + $entity->role = (string)$data['role']; |
|
| 273 | 273 | |
| 274 | 274 | return $entity; |
| 275 | 275 | } |
@@ -20,21 +20,21 @@ |
||
| 20 | 20 | $builder |
| 21 | 21 | ->add( |
| 22 | 22 | 'content_user_searchfield', null, [ |
| 23 | - 'attr' => [ |
|
| 24 | - 'placeholder' => 'User-Id', |
|
| 25 | - 'autofocus' => 'autofocus', |
|
| 26 | - 'size' => '10%', |
|
| 27 | - 'minlength' => '6', |
|
| 28 | - 'maxlength' => '7', |
|
| 29 | - 'style' => 'width: 250px;', |
|
| 30 | - 'pattern' => '^[0-9]{6,7}', |
|
| 31 | - 'title' => 'Only 6-7 numerics are allowed.', |
|
| 32 | - ], |
|
| 33 | - 'required' => true, |
|
| 34 | - 'disabled' => false, |
|
| 35 | - 'label' => false, |
|
| 36 | - 'trim' => true |
|
| 37 | - ] |
|
| 23 | + 'attr' => [ |
|
| 24 | + 'placeholder' => 'User-Id', |
|
| 25 | + 'autofocus' => 'autofocus', |
|
| 26 | + 'size' => '10%', |
|
| 27 | + 'minlength' => '6', |
|
| 28 | + 'maxlength' => '7', |
|
| 29 | + 'style' => 'width: 250px;', |
|
| 30 | + 'pattern' => '^[0-9]{6,7}', |
|
| 31 | + 'title' => 'Only 6-7 numerics are allowed.', |
|
| 32 | + ], |
|
| 33 | + 'required' => true, |
|
| 34 | + 'disabled' => false, |
|
| 35 | + 'label' => false, |
|
| 36 | + 'trim' => true |
|
| 37 | + ] |
|
| 38 | 38 | ) |
| 39 | 39 | ->add( |
| 40 | 40 | 'search_One', SubmitType::class, [ |
@@ -55,9 +55,9 @@ |
||
| 55 | 55 | } |
| 56 | 56 | |
| 57 | 57 | return $this->render('backend/user/index.html.twig', [ |
| 58 | - 'userSearchForm' => $searchForm->createView(), |
|
| 59 | - 'all_users_by_searchfield' => $fetchedUsers |
|
| 60 | - ] |
|
| 58 | + 'userSearchForm' => $searchForm->createView(), |
|
| 59 | + 'all_users_by_searchfield' => $fetchedUsers |
|
| 60 | + ] |
|
| 61 | 61 | ); |
| 62 | 62 | } |
| 63 | 63 | |
@@ -153,7 +153,7 @@ discard block |
||
| 153 | 153 | $databaseArray |
| 154 | 154 | ); |
| 155 | 155 | |
| 156 | - $entity->userId = (int) $this->connection->lastInsertId(); |
|
| 156 | + $entity->userId = (int)$this->connection->lastInsertId(); |
|
| 157 | 157 | |
| 158 | 158 | return $entity; |
| 159 | 159 | } |
@@ -181,7 +181,7 @@ discard block |
||
| 181 | 181 | ['user_id' => $entity->userId] |
| 182 | 182 | ); |
| 183 | 183 | |
| 184 | - $entity->userId = (int) $this->connection->lastInsertId(); |
|
| 184 | + $entity->userId = (int)$this->connection->lastInsertId(); |
|
| 185 | 185 | |
| 186 | 186 | return $entity; |
| 187 | 187 | } |
@@ -261,16 +261,16 @@ discard block |
||
| 261 | 261 | public function getEntityFromDatabaseArray(array $data) |
| 262 | 262 | : UserEntity { |
| 263 | 263 | $entity = new UserEntity(); |
| 264 | - $entity->userId = (int) $data['user_id']; |
|
| 265 | - $entity->dateCreated = (string) $data['date_created']; |
|
| 266 | - $entity->lastModified = (string) $data['last_modified']; |
|
| 264 | + $entity->userId = (int)$data['user_id']; |
|
| 265 | + $entity->dateCreated = (string)$data['date_created']; |
|
| 266 | + $entity->lastModified = (string)$data['last_modified']; |
|
| 267 | 267 | $entity->username = $data['username']; |
| 268 | 268 | $entity->password = $data['password']; |
| 269 | 269 | $entity->email = $data['email']; |
| 270 | - $entity->emailProblems = (bool) $data['email_problems']; |
|
| 271 | - $entity->latitude = (double) $data['latitude']; |
|
| 272 | - $entity->longitude = (double) $data['longitude']; |
|
| 273 | - $entity->isActive = (bool) $data['is_active_flag']; |
|
| 270 | + $entity->emailProblems = (bool)$data['email_problems']; |
|
| 271 | + $entity->latitude = (double)$data['latitude']; |
|
| 272 | + $entity->longitude = (double)$data['longitude']; |
|
| 273 | + $entity->isActive = (bool)$data['is_active_flag']; |
|
| 274 | 274 | $entity->firstname = $data['first_name']; |
| 275 | 275 | $entity->lastname = $data['last_name']; |
| 276 | 276 | $entity->country = $data['country']; |
@@ -22,29 +22,29 @@ |
||
| 22 | 22 | $builder |
| 23 | 23 | ->add( |
| 24 | 24 | 'email', EmailType::Class, [ |
| 25 | - 'attr' => [ |
|
| 26 | - 'autofocus' => 'autofocus', |
|
| 27 | - 'size' => '10%', |
|
| 28 | - 'style' => 'width: 250px;' |
|
| 29 | - ], |
|
| 30 | - 'required' => true, |
|
| 31 | - 'disabled' => false, |
|
| 32 | - 'label' => false, |
|
| 33 | - 'trim' => true |
|
| 34 | - ] |
|
| 25 | + 'attr' => [ |
|
| 26 | + 'autofocus' => 'autofocus', |
|
| 27 | + 'size' => '10%', |
|
| 28 | + 'style' => 'width: 250px;' |
|
| 29 | + ], |
|
| 30 | + 'required' => true, |
|
| 31 | + 'disabled' => false, |
|
| 32 | + 'label' => false, |
|
| 33 | + 'trim' => true |
|
| 34 | + ] |
|
| 35 | 35 | ) |
| 36 | 36 | ->add( |
| 37 | 37 | 'activationCode', null, [ |
| 38 | - 'attr' => [ |
|
| 39 | - 'size' => '10%', |
|
| 40 | - 'pattern' => '[A-F0-9]{13}', |
|
| 41 | - 'style' => 'width: 250px;' |
|
| 42 | - ], |
|
| 43 | - 'required' => true, |
|
| 44 | - 'disabled' => false, |
|
| 45 | - 'label' => false, |
|
| 46 | - 'trim' => true |
|
| 47 | - ] |
|
| 38 | + 'attr' => [ |
|
| 39 | + 'size' => '10%', |
|
| 40 | + 'pattern' => '[A-F0-9]{13}', |
|
| 41 | + 'style' => 'width: 250px;' |
|
| 42 | + ], |
|
| 43 | + 'required' => true, |
|
| 44 | + 'disabled' => false, |
|
| 45 | + 'label' => false, |
|
| 46 | + 'trim' => true |
|
| 47 | + ] |
|
| 48 | 48 | ) |
| 49 | 49 | ->add( |
| 50 | 50 | 'submit', SubmitType::class, [ |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | $databaseArray |
| 141 | 141 | ); |
| 142 | 142 | |
| 143 | - $entity->short = (int) $this->connection->lastInsertId(); |
|
| 143 | + $entity->short = (int)$this->connection->lastInsertId(); |
|
| 144 | 144 | |
| 145 | 145 | return $entity; |
| 146 | 146 | } |
@@ -249,17 +249,17 @@ discard block |
||
| 249 | 249 | public function getEntityFromDatabaseArray(array $data) |
| 250 | 250 | : CountriesEntity { |
| 251 | 251 | $entity = new CountriesEntity(); |
| 252 | - $entity->short = (string) $data['short']; |
|
| 253 | - $entity->name = (string) $data['name']; |
|
| 254 | - $entity->transId = (int) $data['trans_id']; |
|
| 255 | - $entity->de = (string) $data['de']; |
|
| 256 | - $entity->en = (string) $data['en']; |
|
| 257 | - $entity->listDefaultDe = (int) $data['list_default_de']; |
|
| 258 | - $entity->sortDe = (string) $data['sort_de']; |
|
| 259 | - $entity->listDefaultEn = (int) $data['list_default_en']; |
|
| 260 | - $entity->sortEn = (string) $data['sort_en']; |
|
| 261 | - $entity->admDisplay2 = (int) $data['adm_display2']; |
|
| 262 | - $entity->admDisplay3 = (int) $data['adm_display3']; |
|
| 252 | + $entity->short = (string)$data['short']; |
|
| 253 | + $entity->name = (string)$data['name']; |
|
| 254 | + $entity->transId = (int)$data['trans_id']; |
|
| 255 | + $entity->de = (string)$data['de']; |
|
| 256 | + $entity->en = (string)$data['en']; |
|
| 257 | + $entity->listDefaultDe = (int)$data['list_default_de']; |
|
| 258 | + $entity->sortDe = (string)$data['sort_de']; |
|
| 259 | + $entity->listDefaultEn = (int)$data['list_default_en']; |
|
| 260 | + $entity->sortEn = (string)$data['sort_en']; |
|
| 261 | + $entity->admDisplay2 = (int)$data['adm_display2']; |
|
| 262 | + $entity->admDisplay3 = (int)$data['adm_display3']; |
|
| 263 | 263 | |
| 264 | 264 | return $entity; |
| 265 | 265 | } |
@@ -27,102 +27,102 @@ discard block |
||
| 27 | 27 | $builder |
| 28 | 28 | ->add( |
| 29 | 29 | 'username', null, [ |
| 30 | - 'attr' => [ |
|
| 31 | - 'autofocus' => 'autofocus', |
|
| 32 | - 'size' => '10%', |
|
| 33 | - 'pattern' => '[a-zA-Z0-9_-]{3,60}', |
|
| 34 | - 'style' => 'width: 250px;' |
|
| 35 | - ], |
|
| 36 | - 'required' => true, |
|
| 37 | - 'disabled' => false, |
|
| 38 | - 'label' => false, |
|
| 39 | - 'trim' => true |
|
| 40 | - ] |
|
| 30 | + 'attr' => [ |
|
| 31 | + 'autofocus' => 'autofocus', |
|
| 32 | + 'size' => '10%', |
|
| 33 | + 'pattern' => '[a-zA-Z0-9_-]{3,60}', |
|
| 34 | + 'style' => 'width: 250px;' |
|
| 35 | + ], |
|
| 36 | + 'required' => true, |
|
| 37 | + 'disabled' => false, |
|
| 38 | + 'label' => false, |
|
| 39 | + 'trim' => true |
|
| 40 | + ] |
|
| 41 | 41 | ) |
| 42 | 42 | ->add( |
| 43 | 43 | 'firstname', null, [ |
| 44 | - 'attr' => [ |
|
| 45 | - 'size' => '10%', |
|
| 46 | - 'minlength' => '3', |
|
| 47 | - 'maxlength' => '100', |
|
| 48 | - 'style' => 'width: 250px;' |
|
| 49 | - ], |
|
| 50 | - 'required' => false, |
|
| 51 | - 'disabled' => false, |
|
| 52 | - 'label' => false, |
|
| 53 | - 'trim' => true |
|
| 54 | - ] |
|
| 44 | + 'attr' => [ |
|
| 45 | + 'size' => '10%', |
|
| 46 | + 'minlength' => '3', |
|
| 47 | + 'maxlength' => '100', |
|
| 48 | + 'style' => 'width: 250px;' |
|
| 49 | + ], |
|
| 50 | + 'required' => false, |
|
| 51 | + 'disabled' => false, |
|
| 52 | + 'label' => false, |
|
| 53 | + 'trim' => true |
|
| 54 | + ] |
|
| 55 | 55 | ) |
| 56 | 56 | ->add( |
| 57 | 57 | 'lastname', null, [ |
| 58 | - 'attr' => [ |
|
| 59 | - 'size' => '10%', |
|
| 60 | - 'minlength' => '3', |
|
| 61 | - 'maxlength' => '100', |
|
| 62 | - 'style' => 'width: 250px;' |
|
| 63 | - ], |
|
| 64 | - 'required' => false, |
|
| 65 | - 'disabled' => false, |
|
| 66 | - 'label' => false, |
|
| 67 | - 'trim' => true |
|
| 68 | - ] |
|
| 58 | + 'attr' => [ |
|
| 59 | + 'size' => '10%', |
|
| 60 | + 'minlength' => '3', |
|
| 61 | + 'maxlength' => '100', |
|
| 62 | + 'style' => 'width: 250px;' |
|
| 63 | + ], |
|
| 64 | + 'required' => false, |
|
| 65 | + 'disabled' => false, |
|
| 66 | + 'label' => false, |
|
| 67 | + 'trim' => true |
|
| 68 | + ] |
|
| 69 | 69 | ) |
| 70 | 70 | ->add( |
| 71 | 71 | 'country', ChoiceType::Class, [ |
| 72 | - 'attr' => [ |
|
| 73 | - 'expanded' => false, |
|
| 74 | - 'multiple' => false, |
|
| 75 | - 'style' => 'width: 250px;' |
|
| 76 | - ], |
|
| 77 | - 'choices' => $options['countryList'], |
|
| 78 | - 'required' => false, |
|
| 79 | - 'disabled' => false, |
|
| 80 | - 'label' => false, |
|
| 81 | - ] |
|
| 72 | + 'attr' => [ |
|
| 73 | + 'expanded' => false, |
|
| 74 | + 'multiple' => false, |
|
| 75 | + 'style' => 'width: 250px;' |
|
| 76 | + ], |
|
| 77 | + 'choices' => $options['countryList'], |
|
| 78 | + 'required' => false, |
|
| 79 | + 'disabled' => false, |
|
| 80 | + 'label' => false, |
|
| 81 | + ] |
|
| 82 | 82 | ) |
| 83 | 83 | ->add( |
| 84 | 84 | 'email', EmailType::Class, [ |
| 85 | - 'attr' => [ |
|
| 86 | - 'size' => '10%', |
|
| 87 | - 'minlength' => '3', |
|
| 88 | - 'maxlength' => '100', |
|
| 89 | - 'style' => 'width: 250px;' |
|
| 90 | - ], |
|
| 91 | - 'required' => true, |
|
| 92 | - 'disabled' => false, |
|
| 93 | - 'label' => false, |
|
| 94 | - 'trim' => true |
|
| 95 | - ] |
|
| 85 | + 'attr' => [ |
|
| 86 | + 'size' => '10%', |
|
| 87 | + 'minlength' => '3', |
|
| 88 | + 'maxlength' => '100', |
|
| 89 | + 'style' => 'width: 250px;' |
|
| 90 | + ], |
|
| 91 | + 'required' => true, |
|
| 92 | + 'disabled' => false, |
|
| 93 | + 'label' => false, |
|
| 94 | + 'trim' => true |
|
| 95 | + ] |
|
| 96 | 96 | ) |
| 97 | 97 | ->add( |
| 98 | 98 | 'plainPassword', RepeatedType::Class, [ |
| 99 | - 'options' => [ |
|
| 100 | - 'attr' => [ |
|
| 101 | - 'size' => '10%', |
|
| 102 | - 'minlength' => '8', |
|
| 103 | - 'maxlength' => '60', |
|
| 104 | - // TODO: pattern anpassen. Aktuell: Minimum eight characters, at least one letter, one number and one special character. |
|
| 105 | - 'pattern' => '^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$', |
|
| 106 | - 'style' => 'width: 250px;' |
|
| 107 | - ] |
|
| 108 | - ], |
|
| 109 | - 'first_options' => ['label' => false, 'error_bubbling' => true], |
|
| 110 | - 'second_options' => ['label' => false], |
|
| 111 | - 'required' => true, |
|
| 112 | - 'disabled' => false, |
|
| 113 | - 'trim' => true, |
|
| 114 | - 'type' => PasswordType::class, |
|
| 115 | - 'invalid_message' => 'Your passwords do not match.', |
|
| 116 | - 'mapped' => false, |
|
| 117 | - ] |
|
| 99 | + 'options' => [ |
|
| 100 | + 'attr' => [ |
|
| 101 | + 'size' => '10%', |
|
| 102 | + 'minlength' => '8', |
|
| 103 | + 'maxlength' => '60', |
|
| 104 | + // TODO: pattern anpassen. Aktuell: Minimum eight characters, at least one letter, one number and one special character. |
|
| 105 | + 'pattern' => '^(?=.*[A-Za-z])(?=.*\d)(?=.*[@$!%*#?&])[A-Za-z\d@$!%*#?&]{8,}$', |
|
| 106 | + 'style' => 'width: 250px;' |
|
| 107 | + ] |
|
| 108 | + ], |
|
| 109 | + 'first_options' => ['label' => false, 'error_bubbling' => true], |
|
| 110 | + 'second_options' => ['label' => false], |
|
| 111 | + 'required' => true, |
|
| 112 | + 'disabled' => false, |
|
| 113 | + 'trim' => true, |
|
| 114 | + 'type' => PasswordType::class, |
|
| 115 | + 'invalid_message' => 'Your passwords do not match.', |
|
| 116 | + 'mapped' => false, |
|
| 117 | + ] |
|
| 118 | 118 | ) |
| 119 | 119 | ->add( |
| 120 | 120 | 'tos', CheckboxType::class, [ |
| 121 | - 'attr' => [], |
|
| 122 | - 'label' => false, |
|
| 123 | - 'mapped' => false, |
|
| 124 | - 'required' => true, |
|
| 125 | - ] |
|
| 121 | + 'attr' => [], |
|
| 122 | + 'label' => false, |
|
| 123 | + 'mapped' => false, |
|
| 124 | + 'required' => true, |
|
| 125 | + ] |
|
| 126 | 126 | ) |
| 127 | 127 | ->add( |
| 128 | 128 | 'submit', SubmitType::class, [ |
@@ -140,8 +140,8 @@ discard block |
||
| 140 | 140 | public function configureOptions(OptionsResolver $resolver) |
| 141 | 141 | : void { |
| 142 | 142 | $resolver->setDefaults([ |
| 143 | - 'countryList' => [], |
|
| 144 | - 'data_class' => UserEntity::class, |
|
| 145 | - ]); |
|
| 143 | + 'countryList' => [], |
|
| 144 | + 'data_class' => UserEntity::class, |
|
| 145 | + ]); |
|
| 146 | 146 | } |
| 147 | 147 | } |
