Skip to content

Commit 5bbeb08

Browse files
committed
yform 3 fixes
1 parent 84f1318 commit 5bbeb08

File tree

5 files changed

+7
-13
lines changed

5 files changed

+7
-13
lines changed

lib/d2u_guestbook_lang_helper.php

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ class d2u_guestbook_lang_helper extends \D2U_Helper\ALangHelper {
88
* value the replacement.
99
*/
1010
protected $replacements_english = [
11-
'd2u_guestbook_form_captcha' => 'To prevent abuse, please enter captcha.',
1211
'd2u_guestbook_form_email' => 'E-mail address',
1312
'd2u_guestbook_form_message' => 'Message',
1413
'd2u_guestbook_form_name' => 'Name',
@@ -19,7 +18,6 @@ class d2u_guestbook_lang_helper extends \D2U_Helper\ALangHelper {
1918
'd2u_guestbook_form_send' => 'Send',
2019
'd2u_guestbook_form_thanks' => 'Thank you for your guestbook entry. Our administrator will check the entry for spam or offending speech. This may take some time.',
2120
'd2u_guestbook_form_title' => 'Request form',
22-
'd2u_guestbook_form_validate_captcha' => 'The Captcha was not read correctly.',
2321
'd2u_guestbook_form_validate_description' => 'Please enter a message for the guestbook.',
2422
'd2u_guestbook_form_validate_name' => 'Please enter your full name.',
2523
'd2u_guestbook_form_validate_privacy_policy' => 'It\'s necessary to accept the privacy policy.',
@@ -41,7 +39,6 @@ class d2u_guestbook_lang_helper extends \D2U_Helper\ALangHelper {
4139
* value the replacement.
4240
*/
4341
protected $replacements_german = [
44-
'd2u_guestbook_form_captcha' => 'Um Missbrauch vorzubeugen bitten wir Sie das Captcha einzugeben.',
4542
'd2u_guestbook_form_email' => 'E-Mail Adresse',
4643
'd2u_guestbook_form_message' => 'Nachricht',
4744
'd2u_guestbook_form_name' => 'Name',
@@ -52,7 +49,6 @@ class d2u_guestbook_lang_helper extends \D2U_Helper\ALangHelper {
5249
'd2u_guestbook_form_send' => 'Abschicken',
5350
'd2u_guestbook_form_thanks' => 'Danke für Ihren Eintrag. Unser Eintrag wird von unserem Administrator auf Spam und inakzeptable Sprache geprüft. Das kann einige Zeit in Anspruch nehmen. Es besteht kein Anspruch auf eine Veröffentlichung.',
5451
'd2u_guestbook_form_title' => 'Anfrage zum Objekt',
55-
'd2u_guestbook_form_validate_captcha' => 'Bitte geben Sie erneut das Captcha ein.',
5652
'd2u_guestbook_form_validate_description' => 'Bitte geben Sie noch eine Nachricht fürs Gästebuch ein.',
5753
'd2u_guestbook_form_validate_name' => 'Um Sie korrekt ansprechen zu können, geben Sie bitte Ihren vollständigen Namen an.',
5854
'd2u_guestbook_form_validate_privacy_policy' => 'Der Datenschutzerklärung muss zugestimmt werden.',

modules/60/1/output.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -145,12 +145,11 @@ function click_stars(wert) {
145145
text|name|'. $tag_open .'d2u_guestbook_form_name'. $tag_close .' *
146146
text|email|'. $tag_open .'d2u_guestbook_form_email'. $tag_close .'
147147
textarea|description|'. $tag_open .'d2u_guestbook_form_message'. $tag_close .'
148-
radio|recommendation|'. $tag_open .'d2u_guestbook_form_recommendation'. $tag_close .'|'. $tag_open .'d2u_guestbook_no'. $tag_close .'=0,'. $tag_open .'d2u_guestbook_yes'. $tag_close .'=1|1|
148+
choice|recommendation|'. $tag_open .'d2u_guestbook_form_recommendation'. $tag_close .'|'. $tag_open .'d2u_guestbook_no'. $tag_close .'=0,'. $tag_open .'d2u_guestbook_yes'. $tag_close .'=1|1|0|
149149
checkbox|privacy_policy_accepted|'. $tag_open .'d2u_guestbook_form_privacy_policy'. $tag_close . ' *|0,1|0
150150
text|rating|'. $tag_open .'d2u_guestbook_form_rating'. $tag_close .' '. $stars.'|0||{"style":"display:none"}
151151
html||<br>* '. $tag_open .'d2u_guestbook_form_required'. $tag_close .'<br><br>
152152
php|validate_timer|Spamprotection|<input name="validate_timer" type="hidden" value="'. microtime(true) .'" />|
153-
captcha|'. $tag_open .'d2u_guestbook_form_captcha'. $tag_close .'|'. $tag_open .'d2u_guestbook_form_validate_captcha'. $tag_close .'|
154153
hidden|online_status|offline
155154
hidden|create_date|'. time() .'
156155
hidden|clang_id|'. rex_clang::getCurrentId() .'
@@ -160,7 +159,7 @@ function click_stars(wert) {
160159
validate|empty|name|'. $tag_open .'d2u_guestbook_form_validate_name'. $tag_close .'
161160
validate|empty|description|'. $tag_open .'d2u_guestbook_form_validate_description'. $tag_close .'
162161
validate|empty|privacy_policy_accepted|'. $tag_open .'d2u_guestbook_form_validate_privacy_policy'. $tag_close .'
163-
validate|customfunction|validate_timer|d2u_addon_frontend_helper::yform_validate_timer|10|'. $tag_open .'d2u_guestbook_form_validate_spambots'. $tag_close .'|
162+
validate|customfunction|validate_timer|d2u_addon_frontend_helper::yform_validate_timer|3|'. $tag_open .'d2u_guestbook_form_validate_spambots'. $tag_close .'|
164163
165164
action|callback|sendAdminNotification
166165
action|db|'. rex::getTablePrefix() .'d2u_guestbook|';

modules/60/3/output.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,11 @@ function click_stars(wert) {
5050
text|name|'. $tag_open .'d2u_guestbook_form_name'. $tag_close .' *
5151
text|email|'. $tag_open .'d2u_guestbook_form_email'. $tag_close .'
5252
textarea|description|'. $tag_open .'d2u_guestbook_form_message'. $tag_close .'
53-
radio|recommendation|'. $tag_open .'d2u_guestbook_form_recommendation'. $tag_close .'|'. $tag_open .'d2u_guestbook_no'. $tag_close .'=0,'. $tag_open .'d2u_guestbook_yes'. $tag_close .'=1|1|
53+
choice|recommendation|'. $tag_open .'d2u_guestbook_form_recommendation'. $tag_close .'|'. $tag_open .'d2u_guestbook_no'. $tag_close .'=0,'. $tag_open .'d2u_guestbook_yes'. $tag_close .'=1|1|0|
5454
checkbox|privacy_policy_accepted|'. $tag_open .'d2u_guestbook_form_privacy_policy'. $tag_close . ' *|0,1|0
5555
text|rating|'. $tag_open .'d2u_guestbook_form_rating'. $tag_close .' '. $stars.'|0||{"style":"display:none"}
5656
html||<br>* '. $tag_open .'d2u_guestbook_form_required'. $tag_close .'<br><br>
5757
php|validate_timer|Spamprotection|<input name="validate_timer" type="hidden" value="'. microtime(true) .'" />|
58-
captcha|'. $tag_open .'d2u_guestbook_form_captcha'. $tag_close .'|'. $tag_open .'d2u_guestbook_form_validate_captcha'. $tag_close .'|'. rex_getUrl(rex_article::getCurrentId(), null, ['entry' => 'add']) .'
5958
hidden|online_status|offline
6059
hidden|create_date|'. time() .'
6160
hidden|clang_id|'. rex_clang::getCurrentId() .'
@@ -64,7 +63,7 @@ function click_stars(wert) {
6463
6564
validate|empty|name|'. $tag_open .'d2u_guestbook_form_validate_name'. $tag_close .'
6665
validate|empty|description|'. $tag_open .'d2u_guestbook_form_validate_description'. $tag_close .'
67-
validate|customfunction|validate_timer|d2u_addon_frontend_helper::yform_validate_timer|10|'. $tag_open .'d2u_guestbook_form_validate_spambots'. $tag_close .'|
66+
validate|customfunction|validate_timer|d2u_addon_frontend_helper::yform_validate_timer|3|'. $tag_open .'d2u_guestbook_form_validate_spambots'. $tag_close .'|
6867
6968
action|callback|sendAdminNotification
7069
action|db|'. rex::getTablePrefix() .'d2u_guestbook|';

package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ requires:
1717
d2u_helper: '>=1.5.2'
1818
emailobfuscator: '>=2.1.5'
1919
sprog: '>=1.0.0'
20-
yform: '>=2.0'
20+
yform: '>=3.0'

pages/setup.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
print rex_view::error('Fehler beim Import: '. $sql->getError());
3232
}
3333
else {
34-
print rex_view::success('Daten aus TVS Gästebucherfolgreich importiert und alte Tabelle gelöscht');
34+
print rex_view::success('Daten aus TVS Gästebucherfolgreich importiert und alte Tabelle gelöscht.');
3535
}
3636
}
3737
else if($tvsgb_available) {
@@ -58,7 +58,7 @@
5858
<h2>Changelog</h2>
5959
<p>1.0.6:</p>
6060
<ul>
61-
<li>Anpassungen an YForm 3.</li>
61+
<li>Anpassungen der Module an YForm 3, welches jetzt Voraussetzung für die Version ist..</li>
6262
</ul>
6363
<p>1.0.5:</p>
6464
<ul>

0 commit comments

Comments
 (0)