From b1dc2100264388d758aa4209005e581b50b407a6 Mon Sep 17 00:00:00 2001 From: Olivier PORTIER Date: Wed, 29 Apr 2020 17:40:37 +0200 Subject: [PATCH 01/12] Fix page navigator missing in cjw_newsletter_list_children.tpl --- design/admin2/templates/cjw_newsletter_list_children.tpl | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/design/admin2/templates/cjw_newsletter_list_children.tpl b/design/admin2/templates/cjw_newsletter_list_children.tpl index ba0be9b..bf17e7c 100644 --- a/design/admin2/templates/cjw_newsletter_list_children.tpl +++ b/design/admin2/templates/cjw_newsletter_list_children.tpl @@ -176,6 +176,15 @@ edition_node_list_count = $children_count show_actions_colum = true()} +
+ {include name = 'Navigator' + uri = 'design:navigator/google.tpl' + page_uri = $node.url_alias + item_count = $children_count + view_parameters = $view_parameters + item_limit = $number_of_items} +
+ {def $viewmode_newsletter=true()} {* Else: there are no children. *} From 51d49d515cd9468a42bf1021f0131350b74c3e8e Mon Sep 17 00:00:00 2001 From: Olivier PORTIER Date: Thu, 26 Nov 2020 13:30:06 +0100 Subject: [PATCH 02/12] Add filter based on status parameter and export only filtered users --- .../newsletter/subscription_list.tpl | 2 +- .../subscription_list_csvexport.tpl | 2 +- modules/newsletter/module.php | 1 + .../subscription_list_csvexport.php | 92 +++++++++++++++++-- 4 files changed, 88 insertions(+), 9 deletions(-) diff --git a/design/standard/templates/newsletter/subscription_list.tpl b/design/standard/templates/newsletter/subscription_list.tpl index 5512e90..417f96f 100644 --- a/design/standard/templates/newsletter/subscription_list.tpl +++ b/design/standard/templates/newsletter/subscription_list.tpl @@ -126,7 +126,7 @@ -
+
diff --git a/design/standard/templates/newsletter/subscription_list_csvexport.tpl b/design/standard/templates/newsletter/subscription_list_csvexport.tpl index d0936f3..12969e0 100644 --- a/design/standard/templates/newsletter/subscription_list_csvexport.tpl +++ b/design/standard/templates/newsletter/subscription_list_csvexport.tpl @@ -6,7 +6,7 @@ \ No newline at end of file + From a3448b4ca1bc2a8bd9ba9c7e40b022583873c6c8 Mon Sep 17 00:00:00 2001 From: j-mello <46940856+j-mello@users.noreply.github.com> Date: Mon, 30 Nov 2020 11:18:14 +0100 Subject: [PATCH 07/12] Correctif affichage --- .../newsletter/subscription_list_csvimport.tpl | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/design/standard/templates/newsletter/subscription_list_csvimport.tpl b/design/standard/templates/newsletter/subscription_list_csvimport.tpl index dd09536..ba9163f 100644 --- a/design/standard/templates/newsletter/subscription_list_csvimport.tpl +++ b/design/standard/templates/newsletter/subscription_list_csvimport.tpl @@ -372,16 +372,17 @@ list all blacklist items {if $data_set.s_status|eq( '1' )} - {'created'|i18n( 'cjw_newsletter/subscription_list_csvimport' )} + {'Created'|i18n( 'cjw_newsletter/subscription_list_csvimport' )} {elseif $data_set.s_status|eq( '2' )} - {'updated'|i18n( 'cjw_newsletter/subscription_list_csvimport' )} + {'Updated'|i18n( 'cjw_newsletter/subscription_list_csvimport' )} {elseif $data_set.s_status|eq( '0' )} - {'no'|i18n( 'cjw_newsletter/subscription_list_csvimport' )} - {if $data_set.s_status|eq( 3 )} - {'Removed by user'|i18n( 'cjw_newsletter/subscription/status' )} - {elseif $data_set.s_status|eq( 8 )} - {'Blacklisted'|i18n( 'cjw_newsletter/subscription/status' )} - {/if} + {'No change'|i18n( 'cjw_newsletter/subscription_list_csvimport' )} + {elsif $data_set.s_status|eq( 3 )} + {'Removed by user'|i18n( 'cjw_newsletter/subscription/status' )} + {elsif $data_set.s_status|eq( 4 )} + {'Removed by admin'|i18n( 'cjw_newsletter/subscription/status' )} + {elseif $data_set.s_status|eq( 8 )} + {'Blacklisted'|i18n( 'cjw_newsletter/subscription/status' ) {else} {$user_created|wash()} {/if} From 58bc10298a36fbdb490ad4c7bb184f16b91117bf Mon Sep 17 00:00:00 2001 From: j-mello <46940856+j-mello@users.noreply.github.com> Date: Mon, 30 Nov 2020 12:21:12 +0100 Subject: [PATCH 08/12] Correctif affichage --- .../templates/newsletter/subscription_list_csvimport.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/design/standard/templates/newsletter/subscription_list_csvimport.tpl b/design/standard/templates/newsletter/subscription_list_csvimport.tpl index ba9163f..da4b195 100644 --- a/design/standard/templates/newsletter/subscription_list_csvimport.tpl +++ b/design/standard/templates/newsletter/subscription_list_csvimport.tpl @@ -377,9 +377,9 @@ list all blacklist items {'Updated'|i18n( 'cjw_newsletter/subscription_list_csvimport' )} {elseif $data_set.s_status|eq( '0' )} {'No change'|i18n( 'cjw_newsletter/subscription_list_csvimport' )} - {elsif $data_set.s_status|eq( 3 )} + {elseif $data_set.s_status|eq( 3 )} {'Removed by user'|i18n( 'cjw_newsletter/subscription/status' )} - {elsif $data_set.s_status|eq( 4 )} + {elseif $data_set.s_status|eq( 4 )} {'Removed by admin'|i18n( 'cjw_newsletter/subscription/status' )} {elseif $data_set.s_status|eq( 8 )} {'Blacklisted'|i18n( 'cjw_newsletter/subscription/status' ) From ae1edb2e9c149c4369fd2a3b8f102a6ed078ce98 Mon Sep 17 00:00:00 2001 From: j-mello <46940856+j-mello@users.noreply.github.com> Date: Mon, 30 Nov 2020 16:25:44 +0100 Subject: [PATCH 09/12] Changement "no" en "pending" --- .../templates/newsletter/subscription_list_csvimport.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/design/standard/templates/newsletter/subscription_list_csvimport.tpl b/design/standard/templates/newsletter/subscription_list_csvimport.tpl index da4b195..2909bd6 100644 --- a/design/standard/templates/newsletter/subscription_list_csvimport.tpl +++ b/design/standard/templates/newsletter/subscription_list_csvimport.tpl @@ -376,7 +376,7 @@ list all blacklist items {elseif $data_set.s_status|eq( '2' )} {'Updated'|i18n( 'cjw_newsletter/subscription_list_csvimport' )} {elseif $data_set.s_status|eq( '0' )} - {'No change'|i18n( 'cjw_newsletter/subscription_list_csvimport' )} + {'Pending'|i18n( 'cjw_newsletter/subscription_list_csvimport' )} {elseif $data_set.s_status|eq( 3 )} {'Removed by user'|i18n( 'cjw_newsletter/subscription/status' )} {elseif $data_set.s_status|eq( 4 )} From 21406e2c6be8a7606b8563451daf478601fc5201 Mon Sep 17 00:00:00 2001 From: j-mello <46940856+j-mello@users.noreply.github.com> Date: Mon, 30 Nov 2020 16:31:07 +0100 Subject: [PATCH 10/12] Prise en compte statut 4 pour sauvegarde --- modules/newsletter/subscription_list_csvimport.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/newsletter/subscription_list_csvimport.php b/modules/newsletter/subscription_list_csvimport.php index 21402a8..60da047 100644 --- a/modules/newsletter/subscription_list_csvimport.php +++ b/modules/newsletter/subscription_list_csvimport.php @@ -454,7 +454,13 @@ // 2 - update $createNewSubscription = 2; $subscriptionObject = $existingSubscription; - + + if ( $s_status == '4' ) + { + $subscriptionObject->setAttribute( 'status', CjwNewsletterUser::STATUS_REMOVED_ADMIN ); + } else { + $subscriptionObject->setAttribute( 'status', CjwNewsletterUser::STATUS_APPROVED ); + } $subscriptionObject->setAttribute( 'status', CjwNewsletterSubscription::STATUS_APPROVED ); $subscriptionObject->setAttribute( 'import_id', $importId ); // set new remote_id From 2661c0d4c836f25489d270430a36e54167ca7e19 Mon Sep 17 00:00:00 2001 From: Olivier PORTIER Date: Tue, 1 Dec 2020 14:14:03 +0100 Subject: [PATCH 11/12] Add support of status Removed by admin during csv import --- .../subscription_list_csvimport.php | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/newsletter/subscription_list_csvimport.php b/modules/newsletter/subscription_list_csvimport.php index 60da047..741457a 100644 --- a/modules/newsletter/subscription_list_csvimport.php +++ b/modules/newsletter/subscription_list_csvimport.php @@ -381,12 +381,13 @@ $userObject->setAttribute( 'custom_data_text_3', $customDataText3 ); if ( $customDataText4 != '' ) $userObject->setAttribute( 'custom_data_text_4', $customDataText4 ); + if ( $s_status == '4' ) { - $userObject->setAttribute( 's_status', CjwNewsletterUser::STATUS_REMOVED_ADMIN); + $userObject->setAttribute( 'status', CjwNewsletterUser::STATUS_REMOVED_ADMIN); } else { - $userObject->setAttribute( 's_status', CjwNewsletterUser::STATUS_CONFIRMED); + $userObject->setAttribute( 'status', CjwNewsletterUser::STATUS_CONFIRMED); } $userObject->setAttribute( 'import_id', $importId ); @@ -457,11 +458,12 @@ if ( $s_status == '4' ) { - $subscriptionObject->setAttribute( 'status', CjwNewsletterUser::STATUS_REMOVED_ADMIN ); - } else { - $subscriptionObject->setAttribute( 'status', CjwNewsletterUser::STATUS_APPROVED ); + $subscriptionObject->setAttribute( 'status', CjwNewsletterSubscription::STATUS_REMOVED_ADMIN ); + } + else + { + $subscriptionObject->setAttribute( 'status', CjwNewsletterSubscription::STATUS_APPROVED ); } - $subscriptionObject->setAttribute( 'status', CjwNewsletterSubscription::STATUS_APPROVED ); $subscriptionObject->setAttribute( 'import_id', $importId ); // set new remote_id $subscriptionObject->setAttribute( 'remote_id', 'cjwnl:csvimport:'. CjwNewsletterUtils::generateUniqueMd5Hash( $newsletterUserId . $importId ) ); @@ -477,6 +479,12 @@ $newsletterUserId, $outputFormatArray, CjwNewsletterSubscription::STATUS_APPROVED ); + + if ( $s_status == '4' ) + { + $newListSubscription->setAttribute( 'status', CjwNewsletterSubscription::STATUS_REMOVED_ADMIN ); + } + $newListSubscription->setAttribute( 'import_id', $importId ); // set new remote_id $newListSubscription->setAttribute( 'remote_id', 'cjwnl:csvimport:'. CjwNewsletterUtils::generateUniqueMd5Hash( $newsletterUserId . $importId ) ); From 62a4a203064182eecace62c76da9a8dd77233502 Mon Sep 17 00:00:00 2001 From: Olivier PORTIER Date: Fri, 21 May 2021 13:43:17 +0200 Subject: [PATCH 12/12] Add First row is label checkbox checked by default --- settings/cjw_newsletter.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/cjw_newsletter.ini b/settings/cjw_newsletter.ini index 9a39dd8..8647e49 100644 --- a/settings/cjw_newsletter.ini +++ b/settings/cjw_newsletter.ini @@ -122,7 +122,7 @@ AvailableFilterTypeClassArray[]=CjwNewsletterFilterTypeEmail # , ; \t | DefaultCsvDelimiter=; # true or false -DefaultFirstRowIsLabel=false +DefaultFirstRowIsLabel=true # true or false DefaultUtf8Encode=true