yform 3 fixes

Author: TobiasKrais

lib/d2u_guestbook_lang_helper.php

@@ -8,7 +8,6 @@ class d2u_guestbook_lang_helper extends \D2U_Helper\ALangHelper {
 	 * value the replacement. 
 	 */
 	protected $replacements_english = [
-		'd2u_guestbook_form_captcha' => 'To prevent abuse, please enter captcha.',
 		'd2u_guestbook_form_email' => 'E-mail address',
 		'd2u_guestbook_form_message' => 'Message',
 		'd2u_guestbook_form_name' => 'Name',
@@ -19,7 +18,6 @@ class d2u_guestbook_lang_helper extends \D2U_Helper\ALangHelper {
 		'd2u_guestbook_form_send' => 'Send',
 		'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.',
 		'd2u_guestbook_form_title' => 'Request form',
-		'd2u_guestbook_form_validate_captcha' => 'The Captcha was not read correctly.',
 		'd2u_guestbook_form_validate_description' => 'Please enter a message for the guestbook.',
 		'd2u_guestbook_form_validate_name' => 'Please enter your full name.',
 		'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 {
 	 * value the replacement. 
 	 */
 	protected $replacements_german = [
-		'd2u_guestbook_form_captcha' => 'Um Missbrauch vorzubeugen bitten wir Sie das Captcha einzugeben.',
 		'd2u_guestbook_form_email' => 'E-Mail Adresse',
 		'd2u_guestbook_form_message' => 'Nachricht',
 		'd2u_guestbook_form_name' => 'Name',
@@ -52,7 +49,6 @@ class d2u_guestbook_lang_helper extends \D2U_Helper\ALangHelper {
 		'd2u_guestbook_form_send' => 'Abschicken',
 		'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.',
 		'd2u_guestbook_form_title' => 'Anfrage zum Objekt',
-		'd2u_guestbook_form_validate_captcha' => 'Bitte geben Sie erneut das Captcha ein.',
 		'd2u_guestbook_form_validate_description' => 'Bitte geben Sie noch eine Nachricht fürs Gästebuch ein.',
 		'd2u_guestbook_form_validate_name' => 'Um Sie korrekt ansprechen zu können, geben Sie bitte Ihren vollständigen Namen an.',
 		'd2u_guestbook_form_validate_privacy_policy' => 'Der Datenschutzerklärung muss zugestimmt werden.',

modules/60/1/output.php

@@ -145,12 +145,11 @@ function click_stars(wert) {
 	text|name|'. $tag_open .'d2u_guestbook_form_name'. $tag_close .' *
 	text|email|'. $tag_open .'d2u_guestbook_form_email'. $tag_close .'
 	textarea|description|'. $tag_open .'d2u_guestbook_form_message'. $tag_close .'
-	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|
+	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|
 	checkbox|privacy_policy_accepted|'. $tag_open .'d2u_guestbook_form_privacy_policy'. $tag_close . ' *|0,1|0
 	text|rating|'. $tag_open .'d2u_guestbook_form_rating'. $tag_close .'   '. $stars.'|0||{"style":"display:none"}
 	html||<br>* '. $tag_open .'d2u_guestbook_form_required'. $tag_close .'<br><br>
 	php|validate_timer|Spamprotection|<input name="validate_timer" type="hidden" value="'. microtime(true) .'" />|
-	captcha|'. $tag_open .'d2u_guestbook_form_captcha'. $tag_close .'|'. $tag_open .'d2u_guestbook_form_validate_captcha'. $tag_close .'|
 	hidden|online_status|offline
 	hidden|create_date|'. time() .'
 	hidden|clang_id|'. rex_clang::getCurrentId() .'
@@ -160,7 +159,7 @@ function click_stars(wert) {
 	validate|empty|name|'. $tag_open .'d2u_guestbook_form_validate_name'. $tag_close .'
 	validate|empty|description|'. $tag_open .'d2u_guestbook_form_validate_description'. $tag_close .'
 	validate|empty|privacy_policy_accepted|'. $tag_open .'d2u_guestbook_form_validate_privacy_policy'. $tag_close .'
-	validate|customfunction|validate_timer|d2u_addon_frontend_helper::yform_validate_timer|10|'. $tag_open .'d2u_guestbook_form_validate_spambots'. $tag_close .'|
+	validate|customfunction|validate_timer|d2u_addon_frontend_helper::yform_validate_timer|3|'. $tag_open .'d2u_guestbook_form_validate_spambots'. $tag_close .'|
 
 	action|callback|sendAdminNotification
 	action|db|'. rex::getTablePrefix() .'d2u_guestbook|';

modules/60/3/output.php

@@ -50,12 +50,11 @@ function click_stars(wert) {
 		text|name|'. $tag_open .'d2u_guestbook_form_name'. $tag_close .' *
 		text|email|'. $tag_open .'d2u_guestbook_form_email'. $tag_close .'
 		textarea|description|'. $tag_open .'d2u_guestbook_form_message'. $tag_close .'
-		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|
+		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|
 		checkbox|privacy_policy_accepted|'. $tag_open .'d2u_guestbook_form_privacy_policy'. $tag_close . ' *|0,1|0
 		text|rating|'. $tag_open .'d2u_guestbook_form_rating'. $tag_close .'   '. $stars.'|0||{"style":"display:none"}
 		html||<br>* '. $tag_open .'d2u_guestbook_form_required'. $tag_close .'<br><br>
 		php|validate_timer|Spamprotection|<input name="validate_timer" type="hidden" value="'. microtime(true) .'" />|
-		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']) .'
 		hidden|online_status|offline
 		hidden|create_date|'. time() .'
 		hidden|clang_id|'. rex_clang::getCurrentId() .'
@@ -64,7 +63,7 @@ function click_stars(wert) {
 
 		validate|empty|name|'. $tag_open .'d2u_guestbook_form_validate_name'. $tag_close .'
 		validate|empty|description|'. $tag_open .'d2u_guestbook_form_validate_description'. $tag_close .'
-		validate|customfunction|validate_timer|d2u_addon_frontend_helper::yform_validate_timer|10|'. $tag_open .'d2u_guestbook_form_validate_spambots'. $tag_close .'|
+		validate|customfunction|validate_timer|d2u_addon_frontend_helper::yform_validate_timer|3|'. $tag_open .'d2u_guestbook_form_validate_spambots'. $tag_close .'|
 
 		action|callback|sendAdminNotification
 		action|db|'. rex::getTablePrefix() .'d2u_guestbook|';

package.yml

@@ -17,4 +17,4 @@ requires:
         d2u_helper: '>=1.5.2'
         emailobfuscator: '>=2.1.5'
         sprog: '>=1.0.0'
-        yform: '>=2.0'
+        yform: '>=3.0'

pages/setup.php

@@ -31,7 +31,7 @@
 		print rex_view::error('Fehler beim Import: '. $sql->getError());
 	}
 	else {
-		print rex_view::success('Daten aus TVS Gästebucherfolgreich importiert und alte Tabelle gelöscht');
+		print rex_view::success('Daten aus TVS Gästebucherfolgreich importiert und alte Tabelle gelöscht.');
 	}
 }
 else if($tvsgb_available) {
@@ -58,7 +58,7 @@
 <h2>Changelog</h2>
 <p>1.0.6:</p>
 <ul>
-	<li>Anpassungen an YForm 3.</li>
+	<li>Anpassungen der Module an YForm 3, welches jetzt Voraussetzung für die Version ist..</li>
 </ul>
 <p>1.0.5:</p>
 <ul>