Skip to content

Commit

Permalink
Version 7.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@bihor
bihor committed Aug 20, 2024
1 parent ad1d098 commit 714db27
Show file tree
Hide file tree
Showing 14 changed files with 145 additions and 101 deletions.
14 changes: 14 additions & 0 deletions Classes/Domain/Repository/LogRepository.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,20 @@ function deleteExternalUser($uid, $mode, $dmCatArr = [], $table = 'tt_address',
$queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($uid, \PDO::PARAM_INT))
)
->executeStatement();
} elseif ($mode == 4) {
if ($table == 'fe_users') {
$flag = 'disable';
} else {
$flag = 'hidden';
}
$queryBuilder
->update($table)
->where(
$queryBuilder->expr()->eq('uid', $queryBuilder->createNamedParameter($uid, \PDO::PARAM_INT))
)
->set($flag, 1)
->set('tstamp', time())
->executeStatement();
} elseif ($mode != 3) {
$queryBuilder
->update($table)
Expand Down
4 changes: 4 additions & 0 deletions Configuration/FlexForms/flexform_pi1.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,10 @@
<numIndex index="0">LLL:EXT:fp_newsletter/Resources/Private/Language/locallang_be.xlf:settings.deleteMode.3</numIndex>
<numIndex index="1">3</numIndex>
</numIndex>
<numIndex index="3" type="array">
<numIndex index="0">LLL:EXT:fp_newsletter/Resources/Private/Language/locallang_be.xlf:settings.deleteMode.4</numIndex>
<numIndex index="1">4</numIndex>
</numIndex>
</items>
</config>
</TCEforms>
Expand Down
3 changes: 2 additions & 1 deletion Documentation/Administrator/Index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ or if you use addresses from fe_users with the extension luxletter or mail.
Templates
---------

You will find 2 folders in the templates-folders: Email and Log. In the Log-folder are the form-templates.
You will find 4 folders in the Templates-folders: Backend, Widget, Email and Log. Backend and Widget are used only in the backend.
In the Log-folder are the form-templates.
If a user submits the form, the entries lands in the table tx_fpnewsletter_domain_model_log.
Only if a user verifies his email-address, his entry will be copied to the table tt_address.

Expand Down
5 changes: 4 additions & 1 deletion Documentation/ChangeLog/Index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,4 +190,7 @@ Version 7.0.3:
- Bugfix: Plugin-Updater.

Version 7.0.4:
- Unnecessary sql-fields removed.
- Unnecessary sql-fields removed.

Version 7.0.5:
- deleteMode 4 (set hidden/disable flag) added.
92 changes: 46 additions & 46 deletions Documentation/Configuration/Index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,68 +23,68 @@ Properties for settings

.. container:: ts-properties

================================= =========== ===================================================================== =================================
Property Data type Description Default
================================= =========== ===================================================================== =================================
table string tt_address, fe_users or none (empty value) supported tt_address
newsletterExtension string luxletter (default for fe_users) or mail (default for tt_address) empty = luxletter
optionalFields string Optional fields: see below gender,firstname,lastname
================================= =========== ========================================================================= =================================
Property Data type Description Default value
================================= =========== ========================================================================= =================================
table string tt_address, fe_users or none (empty value) supported tt_address
newsletterExtension string luxletter (default for fe_users) or mail (default for tt_address) empty = luxletter
optionalFields string Optional fields: see below gender,firstname,lastname
optionalFieldsRequired string Optional required* fields: see below
doubleOptOut boolean Enable double out out unsubscription? 1
disableErrorMsg boolean Disable some error messages (e.g. already/not subscribed)? 0
enableUnsubscribeForm boolean Enable unsubscribe form at the subscribe page?** 0
enableUnsubscribeGdprAsHidden boolean Do not show the gdpr-checkbox at unsubscribe form? 0
enableEditForm boolean Enable edit form at the subscribe page?** 0
subscribeUid integer Page for the subscription 1
doubleOptOut boolean Enable double out out unsubscription? 1
disableErrorMsg boolean Disable some error messages (e.g. already/not subscribed)? 0
enableUnsubscribeForm boolean Enable unsubscribe form at the subscribe page?** 0
enableUnsubscribeGdprAsHidden boolean Do not show the gdpr-checkbox at unsubscribe form? 0
enableEditForm boolean Enable edit form at the subscribe page?** 0
subscribeUid integer Page for the subscription 1
subscribeMessageUid integer Optional page for the redirect after subscription
subscribeVerifyUid integer Page for the subscription-verification
subscribeVerifyMessageUid integer Optional page for the redirect after subscription-verification
unsubscribeUid integer Page for the unsubscription 1
unsubscribeUid integer Page for the unsubscription 1
unsubscribeMessageUid integer Optional page for the redirect after unsubscription
unsubscribeVerifyUid integer Page for the unsubscription-verification
unsubscribeVerifyMessageUid integer Optional page for the redirect after unsubscription-verification***
resendVerificationUid integer Page, where a user can request the verification-email again
editUid integer Page, where a user can edit his subscription
gdprUid integer Page with the GDPR text 1
daysExpire integer The link expires after X days 2
searchPidMode integer Search in folders: 0: only in the 1. folder; 1: in all folders° 0
deleteMode integer 1: set deletion flag; 2: delete entry; 3: remove only the cat./group 1
languageMode integer 0: uses -1 if L>0; 1: uses the sys_language_uid from pages 0
categoryMode integer 0: allow only categories/groups specified in categoryOrGroup; 1: all 1
categoryOrderBy string category order by: title, sorting or uid title
unsubscribeMode integer 0: direct unsubscription with a link from Luxletter; 1: show a form 0
gdprUid integer Page with the GDPR text 1
daysExpire integer The link expires after X days 2
searchPidMode integer Search in folders: 0: only in the 1. folder; 1: in all folders° 0
deleteMode integer 1: deleted flag; 2: delete entry; 3: remove only cat./group; 4: hidden f. 1
languageMode integer 0: uses -1 if L>0; 1: uses the sys_language_uid from pages 0
categoryMode integer 0: allow only categories/groups specified in categoryOrGroup; 1: all 1
categoryOrderBy string category order by: title, sorting or uid title
unsubscribeMode integer 0: direct unsubscription with a link from Luxletter; 1: show a form 0
categoryOrGroup string List of categories/groups (uid) from sys_category or fe_groups°°
html integer 0: only TEXT; 1: TEXT and HTML; -1: ignore mail-fields in tt_address 1
password string Password for the fe_users table. random creates a random password. random
html integer 0: only TEXT; 1: TEXT and HTML; -1: ignore mail-fields in tt_address 1
password string Password for the fe_users table. random creates a random password. random
authCodeFields string Copy "Fields ... of authentication codes" from mail here
reCAPTCHA_site_key string Website-key for Google reCaptcha v3.
reCAPTCHA_secret_key string Secret key for Google reCaptcha v3
mathCAPTCHA integer Show a mathematical captcha? 0: no; 1: with 1 digit; 2: with 2 digits 0
honeypot boolean Enable a honeypot against spam? 0
debug boolean Don´t send email when debug=1 0
checkForRequiredExtensions boolean Check, if required extensions are installed. 0: no; 1: yes. 1
company string Name of your company Ihre Firma
gender.please string Text for gender selection Bitte auswählen
gender.mr string Text for the gender mr Herr
gender.mrs string Text for the gender mrs Frau
mathCAPTCHA integer Show a mathematical captcha? 0: no; 1: with 1 digit; 2: with 2 digits 0
honeypot boolean Enable a honeypot against spam? 0
debug boolean Don´t send email when debug=1 0
checkForRequiredExtensions boolean Check, if required extensions are installed. 0: no; 1: yes. 1
company string Name of your company Ihre Firma
gender.please string Text for gender selection Bitte auswählen
gender.mr string Text for the gender mr Herr
gender.mrs string Text for the gender mrs Frau
parameters.active string Parameter for newsletter subscription in external extension (POST)
parameters.email string Parameter for the email from external source (GET/POST-parameter)
email.senderMail string Your email-address beispiel@test.de
email.senderName string Your name Absender-Name
email.subscribeVerifySubject string Subject of the verify email (subscription) Bitte verifizieren ...
email.unsubscribeVerifySubject string Subject of the verify email (unsubscription) Bitte verifizieren ...
email.senderMail string Your email-address beispiel@test.de
email.senderName string Your name Absender-Name
email.subscribeVerifySubject string Subject of the verify email (subscription) Bitte verifizieren ...
email.unsubscribeVerifySubject string Subject of the verify email (unsubscription) Bitte verifizieren ...
email.adminMail string Admin email-address - if not empty: an email goes to an admin too
email.adminName string Admin name Admin
email.adminSubscribeSubject string Subject of the admin email (subscription) Neue Newsletter-Anmeldung
email.adminUnsubscribeSubject string Subject of the admin email (unsubscription) Neue Newsletter-Abmeldung
email.adminMailBeforeVerification boolean 0: send email to admin after verification; 1: before verification 0
email.subscribedSubject string Subject of the confirmation email (subscription) Bestätigung Newsletter-Anmeldung
email.unsubscribedSubject string Subject of the confirmation email (unsubscription) Bestätigung Newsletter-Abmeldung
email.editSubject string Subject to the edit email Ändern Sie Ihr Newsletter-Abo...
email.enableConfirmationMails boolean Send confirmation email to the user after verification? 0: no; 1: yes 0
email.dontAppendL boolean Append the language UID to a template (when L>0)? 0: yes; 1: no°°° 1
overrideFlexformSettingsIfEmpty string Empty FlexForms should be overwritten by TypoScript all uid settings
================================= =========== ===================================================================== =================================
email.adminName string Admin name Admin
email.adminSubscribeSubject string Subject of the admin email (subscription) Neue Newsletter-Anmeldung
email.adminUnsubscribeSubject string Subject of the admin email (unsubscription) Neue Newsletter-Abmeldung
email.adminMailBeforeVerification boolean 0: send email to admin after verification; 1: before verification 0
email.subscribedSubject string Subject of the confirmation email (subscription) Bestätigung Newsletter-Anmeldung
email.unsubscribedSubject string Subject of the confirmation email (unsubscription) Bestätigung Newsletter-Abmeldung
email.editSubject string Subject to the edit email Ändern Sie Ihr Newsletter-Abo...
email.enableConfirmationMails boolean Send confirmation email to the user after verification? 0: no; 1: yes 0
email.dontAppendL boolean Append the language UID to a template (when L>0)? 0: yes; 1: no°°° 1
overrideFlexformSettingsIfEmpty string Empty FlexForms should be overwritten by TypoScript all uid settings
================================= =========== ========================================================================= =================================

Note*: only a check via browser is made for the optional required fields.

Expand Down
5 changes: 3 additions & 2 deletions Documentation/Localization.de_DE/Administrator/Index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,13 @@ benutzt wird.
Templates
---------

Man findet 2 Ordner mit Templates: Email und Log. Im Log-Ordner findet man die Templates für die Formulare.
Man findet 4 Ordner mit Templates: Backend, Widget, Email und Log. Backend und Widget wird nur im Backend verwendet.
Im Log-Ordner findet man die Templates für die Formulare.
Wenn ein Benutzer solch ein Formular absendet, landen die Daten in der Tabelle tx_fpnewsletter_domain_model_log.
Erst nachdem ein Benutzer seine E-Mail-Adresse verifiziert hat, werden die Daten in die Tabelle tt_address oder fe_users kopiert.

Im Email-Ordner findet man die Templates, die per E-Mail verschickt werden.
Es gibt Email-Templates für die Verifizierung der E-Mail-Adresse und für den Admin.
Es gibt E-Mail-Templates für die Verifizierung der E-Mail-Adresse und für den Admin.
UserToAdmin wird vor der Verifikation benutzt und SubscribeToAdmin nach der Verifikation der E-Mail-Adresse.
Zum ändern der Templates muss man sie z.B. nach fileadmin kopieren und den Link dazu angeben::

Expand Down
5 changes: 4 additions & 1 deletion Documentation/Localization.de_DE/ChangeLog/Index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,7 @@ Version 7.0.3:
- Bugfix: Plugin-Updater.

Version 7.0.4:
- Unnötige SQL-Felder entfernt.
- Unnötige SQL-Felder entfernt.

Version 7.0.5:
- deleteMode 4 (hidden-Flag setzen) hinzugefügt.
Loading

0 comments on commit 714db27

Please sign in to comment.