@@ -19,19 +19,19 @@ |
||
| 19 | 19 | $builder |
| 20 | 20 | ->add( |
| 21 | 21 | 'content_support_searchfield', null, [ |
| 22 | - 'attr' => [ |
|
| 23 | - 'placeholder' => 'OC / GC / Name / Owner / %%%', |
|
| 24 | - 'autofocus' => 'autofocus', |
|
| 25 | - 'size' => '10%', |
|
| 26 | - 'minlength' => '3', |
|
| 27 | - 'maxlength' => '100', |
|
| 28 | - 'style' => 'width: 250px;' |
|
| 29 | - ], |
|
| 30 | - 'required' => true, |
|
| 31 | - 'disabled' => false, |
|
| 32 | - 'label' => false, |
|
| 33 | - 'trim' => true |
|
| 34 | - ] |
|
| 22 | + 'attr' => [ |
|
| 23 | + 'placeholder' => 'OC / GC / Name / Owner / %%%', |
|
| 24 | + 'autofocus' => 'autofocus', |
|
| 25 | + 'size' => '10%', |
|
| 26 | + 'minlength' => '3', |
|
| 27 | + 'maxlength' => '100', |
|
| 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 | 'search_All', SubmitType::class, [ |
@@ -19,21 +19,21 @@ |
||
| 19 | 19 | $builder |
| 20 | 20 | ->add( |
| 21 | 21 | 'button_account_inactive', SubmitType::class, [ |
| 22 | - 'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 180px;'], |
|
| 23 | - 'label' => false |
|
| 24 | - ] |
|
| 22 | + 'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 180px;'], |
|
| 23 | + 'label' => false |
|
| 24 | + ] |
|
| 25 | 25 | ) |
| 26 | 26 | ->add( |
| 27 | 27 | 'button_GDPR_deletion', SubmitType::class, [ |
| 28 | - 'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 180px;'], |
|
| 29 | - 'label' => false |
|
| 30 | - ] |
|
| 28 | + 'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 180px;'], |
|
| 29 | + 'label' => false |
|
| 30 | + ] |
|
| 31 | 31 | ) |
| 32 | 32 | ->add( |
| 33 | 33 | 'button_mark_email_invalid', SubmitType::class, [ |
| 34 | - 'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 180px;'], |
|
| 35 | - 'label' => false |
|
| 36 | - ] |
|
| 34 | + 'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 180px;'], |
|
| 35 | + 'label' => false |
|
| 36 | + ] |
|
| 37 | 37 | ) |
| 38 | 38 | ->add( |
| 39 | 39 | 'check_Sure', CheckboxType::class, [ |
@@ -16,40 +16,40 @@ |
||
| 16 | 16 | $builder |
| 17 | 17 | ->add( |
| 18 | 18 | 'content_wp_to_be_assigned', null, [ |
| 19 | - 'attr' => [ |
|
| 20 | - 'placeholder' => 'waypoint', |
|
| 21 | - 'size' => '10%', |
|
| 22 | - 'minlength' => '6', |
|
| 23 | - 'maxlength' => '7', |
|
| 24 | - 'pattern' => '[a-fA-FoO0-9]{6,7}', |
|
| 25 | - 'style' => 'width: 250px;' |
|
| 26 | - ], |
|
| 27 | - 'required' => false, |
|
| 28 | - 'disabled' => false, |
|
| 29 | - 'label' => false, |
|
| 30 | - 'trim' => true |
|
| 31 | - ] |
|
| 19 | + 'attr' => [ |
|
| 20 | + 'placeholder' => 'waypoint', |
|
| 21 | + 'size' => '10%', |
|
| 22 | + 'minlength' => '6', |
|
| 23 | + 'maxlength' => '7', |
|
| 24 | + 'pattern' => '[a-fA-FoO0-9]{6,7}', |
|
| 25 | + 'style' => 'width: 250px;' |
|
| 26 | + ], |
|
| 27 | + 'required' => false, |
|
| 28 | + 'disabled' => false, |
|
| 29 | + 'label' => false, |
|
| 30 | + 'trim' => true |
|
| 31 | + ] |
|
| 32 | 32 | ) |
| 33 | 33 | ->add( |
| 34 | 34 | 'content_wp_that_is_bonus_cache', null, [ |
| 35 | - 'attr' => [ |
|
| 36 | - 'placeholder' => 'waypoint bonus', |
|
| 37 | - 'size' => '10%', |
|
| 38 | - 'minlength' => '6', |
|
| 39 | - 'maxlength' => '7', |
|
| 40 | - 'style' => 'width: 250px;' |
|
| 41 | - ], |
|
| 42 | - 'required' => true, |
|
| 43 | - 'disabled' => false, |
|
| 44 | - 'label' => false, |
|
| 45 | - 'trim' => true |
|
| 46 | - ] |
|
| 35 | + 'attr' => [ |
|
| 36 | + 'placeholder' => 'waypoint bonus', |
|
| 37 | + 'size' => '10%', |
|
| 38 | + 'minlength' => '6', |
|
| 39 | + 'maxlength' => '7', |
|
| 40 | + 'style' => 'width: 250px;' |
|
| 41 | + ], |
|
| 42 | + 'required' => true, |
|
| 43 | + 'disabled' => false, |
|
| 44 | + 'label' => false, |
|
| 45 | + 'trim' => true |
|
| 46 | + ] |
|
| 47 | 47 | ) |
| 48 | 48 | ->add( |
| 49 | 49 | 'start_assignment', SubmitType::class, [ |
| 50 | - 'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 100px;'], |
|
| 51 | - 'label' => false |
|
| 52 | - ] |
|
| 50 | + 'attr' => ['class' => 'btn btn-primary', 'style' => 'width: 100px;'], |
|
| 51 | + 'label' => false |
|
| 52 | + ] |
|
| 53 | 53 | ); |
| 54 | 54 | } |
| 55 | 55 | } |
@@ -30,61 +30,61 @@ |
||
| 30 | 30 | ) |
| 31 | 31 | ->add( |
| 32 | 32 | 'content_WHAT', null, [ |
| 33 | - 'required' => true, |
|
| 34 | - 'data' => '*', |
|
| 35 | - 'attr' => [ |
|
| 36 | - 'style' => 'width: 180px;' |
|
| 37 | - ], |
|
| 38 | - 'disabled' => false, |
|
| 39 | - 'label' => false, |
|
| 40 | - 'trim' => true |
|
| 41 | - ] |
|
| 33 | + 'required' => true, |
|
| 34 | + 'data' => '*', |
|
| 35 | + 'attr' => [ |
|
| 36 | + 'style' => 'width: 180px;' |
|
| 37 | + ], |
|
| 38 | + 'disabled' => false, |
|
| 39 | + 'label' => false, |
|
| 40 | + 'trim' => true |
|
| 41 | + ] |
|
| 42 | 42 | ) |
| 43 | 43 | ->add( |
| 44 | 44 | 'content_FROM', ChoiceType::class, [ |
| 45 | - 'choices' => ['FROM' => 'FROM'], |
|
| 46 | - 'attr' => [ |
|
| 47 | - 'style' => 'width: 180px;' |
|
| 48 | - ], |
|
| 49 | - 'disabled' => true, |
|
| 50 | - 'label' => false, |
|
| 51 | - 'trim' => true |
|
| 52 | - ] |
|
| 45 | + 'choices' => ['FROM' => 'FROM'], |
|
| 46 | + 'attr' => [ |
|
| 47 | + 'style' => 'width: 180px;' |
|
| 48 | + ], |
|
| 49 | + 'disabled' => true, |
|
| 50 | + 'label' => false, |
|
| 51 | + 'trim' => true |
|
| 52 | + ] |
|
| 53 | 53 | ) |
| 54 | 54 | ->add( |
| 55 | 55 | 'content_TABLE', ChoiceType::class, [ |
| 56 | - 'choices' => ['caches' => 'caches', 'user' => 'user'], |
|
| 57 | - 'attr' => [ |
|
| 58 | - 'style' => 'width: 180px;' |
|
| 59 | - ], |
|
| 60 | - 'disabled' => false, |
|
| 61 | - 'label' => false, |
|
| 62 | - 'trim' => true |
|
| 63 | - ] |
|
| 56 | + 'choices' => ['caches' => 'caches', 'user' => 'user'], |
|
| 57 | + 'attr' => [ |
|
| 58 | + 'style' => 'width: 180px;' |
|
| 59 | + ], |
|
| 60 | + 'disabled' => false, |
|
| 61 | + 'label' => false, |
|
| 62 | + 'trim' => true |
|
| 63 | + ] |
|
| 64 | 64 | ) |
| 65 | 65 | ->add( |
| 66 | 66 | 'content_WHERE', ChoiceType::class, [ |
| 67 | - 'choices' => ['WHERE' => 'WHERE'], |
|
| 68 | - 'attr' => [ |
|
| 69 | - 'style' => 'width: 180px;' |
|
| 70 | - ], |
|
| 71 | - 'disabled' => true, |
|
| 72 | - 'label' => false, |
|
| 73 | - 'trim' => true |
|
| 74 | - ] |
|
| 67 | + 'choices' => ['WHERE' => 'WHERE'], |
|
| 68 | + 'attr' => [ |
|
| 69 | + 'style' => 'width: 180px;' |
|
| 70 | + ], |
|
| 71 | + 'disabled' => true, |
|
| 72 | + 'label' => false, |
|
| 73 | + 'trim' => true |
|
| 74 | + ] |
|
| 75 | 75 | ) |
| 76 | 76 | ->add( |
| 77 | 77 | 'content_CONDITION', null, [ |
| 78 | - 'required' => false, |
|
| 79 | - 'data' => '', |
|
| 80 | - 'attr' => [ |
|
| 81 | - 'placeholder' => 'id=\'123\'', |
|
| 82 | - 'style' => 'width: 180px;' |
|
| 83 | - ], |
|
| 84 | - 'disabled' => false, |
|
| 85 | - 'label' => false, |
|
| 86 | - 'trim' => true |
|
| 87 | - ] |
|
| 78 | + 'required' => false, |
|
| 79 | + 'data' => '', |
|
| 80 | + 'attr' => [ |
|
| 81 | + 'placeholder' => 'id=\'123\'', |
|
| 82 | + 'style' => 'width: 180px;' |
|
| 83 | + ], |
|
| 84 | + 'disabled' => false, |
|
| 85 | + 'label' => false, |
|
| 86 | + 'trim' => true |
|
| 87 | + ] |
|
| 88 | 88 | ) |
| 89 | 89 | ->add( |
| 90 | 90 | 'Suchen', SubmitType::class, [ |
@@ -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, [ |
@@ -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, [ |
@@ -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 | } |
@@ -20,8 +20,8 @@ |
||
| 20 | 20 | if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? false) { |
| 21 | 21 | Request::setTrustedProxies( |
| 22 | 22 | explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_FOR |
| 23 | - ^ Request::HEADER_X_FORWARDED_PROTO |
|
| 24 | - ^ Request::HEADER_X_FORWARDED_PORT |
|
| 23 | + ^ Request::HEADER_X_FORWARDED_PROTO |
|
| 24 | + ^ Request::HEADER_X_FORWARDED_PORT |
|
| 25 | 25 | ); |
| 26 | 26 | } |
| 27 | 27 | |
@@ -592,7 +592,7 @@ discard block |
||
| 592 | 592 | |
| 593 | 593 | // ok ... redirect the get-data |
| 594 | 594 | $target = ($opt['page']['https']['force_login'] ? 'https' : $opt['page']['protocol']) |
| 595 | - . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
|
| 595 | + . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']; |
|
| 596 | 596 | $this->redirect('login.php?target=' . urlencode($target)); |
| 597 | 597 | } |
| 598 | 598 | |
@@ -738,7 +738,7 @@ discard block |
||
| 738 | 738 | $this->_dvar_math_regexp = '(?:[\+\*\/\%]|(?:-(?!>)))'; |
| 739 | 739 | $this->_dvar_math_var_regexp = '[\$\w\.\+\-\*\/\%\d\>\[\]]'; |
| 740 | 740 | $this->_dvar_guts_regexp = '\w+(?:' . $this->_var_bracket_regexp |
| 741 | - . ')*(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . ')*)*(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?'; |
|
| 741 | + . ')*(?:\.\$?\w+(?:' . $this->_var_bracket_regexp . ')*)*(?:' . $this->_dvar_math_regexp . '(?:' . $this->_num_const_regexp . '|' . $this->_dvar_math_var_regexp . ')*)?'; |
|
| 742 | 742 | $this->_dvar_regexp = '\$' . $this->_dvar_guts_regexp; |
| 743 | 743 | |
| 744 | 744 | // matches config vars: |
@@ -752,7 +752,7 @@ discard block |
||
| 752 | 752 | |
| 753 | 753 | // matches all valid variables (no quotes, no modifiers) |
| 754 | 754 | $this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|' |
| 755 | - . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')'; |
|
| 755 | + . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')'; |
|
| 756 | 756 | |
| 757 | 757 | // matches valid variable syntax: |
| 758 | 758 | // $foo |
@@ -776,10 +776,10 @@ discard block |
||
| 776 | 776 | // $foo->bar($foo->bar($blah,$foo,44,"foo",$foo[0].bar)) |
| 777 | 777 | $this->_obj_ext_regexp = '\->(?:\$?' . $this->_dvar_guts_regexp . ')'; |
| 778 | 778 | $this->_obj_restricted_param_regexp = '(?:' |
| 779 | - . '(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')(?:' . $this->_obj_ext_regexp . '(?:\((?:(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')' |
|
| 780 | - . '(?:\s*,\s*(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . '))*)?\))?)*)'; |
|
| 779 | + . '(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')(?:' . $this->_obj_ext_regexp . '(?:\((?:(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . ')' |
|
| 780 | + . '(?:\s*,\s*(?:' . $this->_var_regexp . '|' . $this->_num_const_regexp . '))*)?\))?)*)'; |
|
| 781 | 781 | $this->_obj_single_param_regexp = '(?:\w+|' . $this->_obj_restricted_param_regexp . '(?:\s*,\s*(?:(?:\w+|' |
| 782 | - . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)'; |
|
| 782 | + . $this->_var_regexp . $this->_obj_restricted_param_regexp . ')))*)'; |
|
| 783 | 783 | $this->_obj_params_regexp = '\((?:' . $this->_obj_single_param_regexp |
| 784 | 784 | . '(?:\s*,\s*' . $this->_obj_single_param_regexp . ')*)?\)'; |
| 785 | 785 | $this->_obj_start_regexp = '(?:' . $this->_dvar_regexp . '(?:' . $this->_obj_ext_regexp . ')+)'; |
@@ -794,7 +794,7 @@ discard block |
||
| 794 | 794 | // |foo|bar |
| 795 | 795 | // |foo:$foo->bar |
| 796 | 796 | $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|' |
| 797 | - . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)'; |
|
| 797 | + . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)'; |
|
| 798 | 798 | |
| 799 | 799 | // matches valid function name: |
| 800 | 800 | // foo123 |
@@ -815,7 +815,7 @@ discard block |
||
| 815 | 815 | // "text"|bar |
| 816 | 816 | // $foo->bar |
| 817 | 817 | $this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|' |
| 818 | - . $this->_var_regexp . '|' . $this->_num_const_regexp . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)'; |
|
| 818 | + . $this->_var_regexp . '|' . $this->_num_const_regexp . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)'; |
|
| 819 | 819 | |
| 820 | 820 | // matches valid parenthesised function parameters: |
| 821 | 821 | // |
@@ -823,8 +823,8 @@ discard block |
||
| 823 | 823 | // $foo, $bar, "text" |
| 824 | 824 | // $foo|bar, "foo"|bar, $foo->bar($foo)|bar |
| 825 | 825 | $this->_parenth_param_regexp = '(?:\((?:\w+|' |
| 826 | - . $this->_param_regexp . '(?:\s*,\s*(?:(?:\w+|' |
|
| 827 | - . $this->_param_regexp . ')))*)?\))'; |
|
| 826 | + . $this->_param_regexp . '(?:\s*,\s*(?:(?:\w+|' |
|
| 827 | + . $this->_param_regexp . ')))*)?\))'; |
|
| 828 | 828 | |
| 829 | 829 | // matches valid function call: |
| 830 | 830 | // foo() |