Skip to content

Commit 900c141

Browse files
Merge branch 'multipleEmailRecipients330-757' into 'stable-3_3_0'
Permite envio do e-mail mensal para múltiplos endereços - 3.3.0 See merge request softwares-pkp/plugins_ojs/relatorioscielo!29
2 parents ceab4d7 + da79b93 commit 900c141

9 files changed

Lines changed: 31 additions & 16 deletions

File tree

ScieloSubmissionsReportForm.inc.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @file plugins/reports/scieloSubmissionsReport/ScieloSubmissionsReportForm.inc.php
45
*

classes/ScieloArticlesDAO.inc.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @file plugins/reports/scieloSubmissionsReport/classes/ScieloArticlesDAO.inc.php
45
*

classes/ScieloPreprintsDAO.inc.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* @file plugins/reports/scieloSubmissionsReport/classes/ScieloPreprintDAO.inc.php
45
*

classes/tasks/SendReportEmail.inc.php

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@ public function executeActions()
1414
PluginRegistry::loadCategory('reports');
1515
$plugin = PluginRegistry::getPlugin('reports', 'scielosubmissionsreportplugin');
1616

17-
$recipientEmail = $plugin->getSetting($context->getId(), 'recipientEmail');
17+
$recipientEmails = $this->getRecipientEmails($plugin, $context->getId());
1818

19-
if ($application == 'ops' && !is_null($recipientEmail)) {
19+
if ($application == 'ops' && !empty($recipientEmails)) {
2020
$locale = AppLocale::getLocale();
2121
$this->loadLocalesForTask($plugin, $locale);
2222

2323
$report = $this->getReport($application, $context, $locale);
2424
$reportFilePath = $this->writeReportFile($context, $report);
2525

26-
$email = $this->createReportEmail($context, $recipientEmail, $reportFilePath);
26+
$email = $this->createReportEmail($context, $recipientEmails, $reportFilePath);
2727
$email->send();
2828
}
2929

@@ -70,20 +70,29 @@ private function getAllSectionsIds($contextId)
7070
return $sectionsIds;
7171
}
7272

73-
private function createReportEmail($context, $recipientEmail, $reportFilePath)
73+
private function getRecipientEmails($plugin, $contextId)
74+
{
75+
$recipientEmailSetting = $plugin->getSetting($contextId, 'recipientEmail');
76+
if (is_null($recipientEmailSetting)) {
77+
return [];
78+
}
79+
80+
$recipientEmails = array_map(function ($email) {
81+
return ['name' => '', 'email' => trim($email)];
82+
}, explode(',', $recipientEmailSetting));
83+
84+
return $recipientEmails;
85+
}
86+
87+
private function createReportEmail($context, $recipientEmails, $reportFilePath)
7488
{
7589
$email = new Mail();
7690

7791
$fromName = $context->getLocalizedData('name');
7892
$fromEmail = $context->getData('contactEmail');
7993
$email->setFrom($fromEmail, $fromName);
8094

81-
$email->setRecipients([
82-
[
83-
'name' => '',
84-
'email' => $recipientEmail,
85-
],
86-
]);
95+
$email->setRecipients($recipientEmails);
8796

8897
$subject = __('plugins.reports.scieloSubmissionsReport.reportEmail.subject', ['contextName' => $fromName]);
8998
$body = __('plugins.reports.scieloSubmissionsReport.reportEmail.body', ['contextName' => $fromName]);

locale/en_US/locale.po

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,8 @@ msgid "plugins.reports.scieloSubmissionsReport.settings.recipientEmail"
155155
msgstr "Recipient e-mail"
156156

157157
msgid "plugins.reports.scieloSubmissionsReport.settings.recipientEmail.description"
158-
msgstr "The report of all submissions will be sent to this e-mail address"
158+
msgstr "The report of all submissions will be sent to this e-mail address."
159+
" To add more than one address, enter them separated by commas."
159160

160161

161162
msgid "plugins.reports.scieloSubmissionsReport.reportEmail.subject"

locale/es_ES/locale.po

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,8 @@ msgid "plugins.reports.scieloSubmissionsReport.settings.recipientEmail"
146146
msgstr "Correo electrónico de destino"
147147

148148
msgid "plugins.reports.scieloSubmissionsReport.settings.recipientEmail.description"
149-
msgstr "El informe completo de envíos será enviado a este correo electrónico"
149+
msgstr "El informe completo de envíos será enviado a esta dirección de correo electrónico."
150+
" Para añadir más de una dirección, introdúzcalas separadas por comas."
150151

151152

152153
msgid "plugins.reports.scieloSubmissionsReport.reportEmail.subject"

locale/pt_BR/locale.po

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,8 @@ msgid "plugins.reports.scieloSubmissionsReport.settings.recipientEmail"
156156
msgstr "E-mail de destino"
157157

158158
msgid "plugins.reports.scieloSubmissionsReport.settings.recipientEmail.description"
159-
msgstr "O relatório completo das submissões será enviado para este e-mail"
159+
msgstr "O relatório completo das submissões será enviado para este endereço de e-mail."
160+
" Para adicionar mais de um endereço, insira-os separados por vírgula."
160161

161162

162163
msgid "plugins.reports.scieloSubmissionsReport.reportEmail.subject"

templates/settingsForm.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
{include file="controllers/notification/inPlaceNotification.tpl" notificationId="scieloSubmissionsReportSettingsFormNotification"}
2121

2222
{fbvFormSection title="plugins.reports.scieloSubmissionsReport.settings.recipientEmail"}
23-
{fbvElement id="recipientEmail" class="recipientEmail" type="email" value="{$recipientEmail|escape}" required="true" label="plugins.reports.scieloSubmissionsReport.settings.recipientEmail.description" size=$fbvStyles.size.MEDIUM}
23+
{fbvElement id="recipientEmail" class="recipientEmail" type="text" value="{$recipientEmail|escape}" required="true" label="plugins.reports.scieloSubmissionsReport.settings.recipientEmail.description" size=$fbvStyles.size.MEDIUM}
2424
{/fbvFormSection}
2525
{fbvFormButtons submitText="common.save"}
2626
</form>

version.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
<version>
55
<application>scieloSubmissionsReport</application>
66
<type>plugins.reports</type>
7-
<release>2.4.3.1</release>
8-
<date>2024-11-06</date>
7+
<release>2.4.4.0</release>
8+
<date>2025-03-20</date>
99
<lazy-load>1</lazy-load>
1010
<class>ScieloSubmissionsReportPlugin</class>
1111
</version>

0 commit comments

Comments
 (0)