Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/ScheduledReports')
-rw-r--r--plugins/ScheduledReports/API.php2
-rw-r--r--plugins/ScheduledReports/angularjs/manage-scheduled-report/manage-scheduled-report.controller.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/ScheduledReports/API.php b/plugins/ScheduledReports/API.php
index 35b3f078b0..7674634120 100644
--- a/plugins/ScheduledReports/API.php
+++ b/plugins/ScheduledReports/API.php
@@ -478,7 +478,7 @@ class API extends \Piwik\Plugin\API
$reportRenderer->setReport($report);
// render report
- $description = str_replace(array("\r", "\n"), ' ', $report['description']);
+ $description = str_replace(array("\r", "\n"), ' ', Common::unsanitizeInputValue($report['description']));
list($reportSubject, $reportTitle) = self::getReportSubjectAndReportTitle(Common::unsanitizeInputValue(Site::getNameFor($idSite)), $report['reports']);
diff --git a/plugins/ScheduledReports/angularjs/manage-scheduled-report/manage-scheduled-report.controller.js b/plugins/ScheduledReports/angularjs/manage-scheduled-report/manage-scheduled-report.controller.js
index afc2932898..35a5223c32 100644
--- a/plugins/ScheduledReports/angularjs/manage-scheduled-report/manage-scheduled-report.controller.js
+++ b/plugins/ScheduledReports/angularjs/manage-scheduled-report/manage-scheduled-report.controller.js
@@ -133,7 +133,7 @@
apiParameters.reportFormat = this.report['format' + this.report.type];
var period = self.report.period;
- var hour = adjustHourToTimezone(this.report.hour, timeZoneDifference);
+ var hour = adjustHourToTimezone(this.report.hour, -timeZoneDifference);
var reports = [];
$('[name=reportsList].' + apiParameters.reportType + ' input:checked').each(function () {