Send email if no tracked data within N days.

config/global.ini.php

@@ -656,8 +656,6 @@
 ; If set to 0 it also disables the "sent plugin update emails" feature in general and the related setting in the UI.
 enable_update_communication = 1
 
-
-
 ; Comma separated list of plugin names for which console commands should be loaded (applies when Matomo is not installed yet)
 always_load_commands_from_plugin=
 
@@ -675,6 +673,9 @@
 ; If set to 0 it will disable advertisements for providers of Professional Support for Matomo.
 piwik_professional_support_ads_enabled = 1
 
+; The number of days to wait before sending the JavaScript tracking code email reminder.
+num_days_before_tracking_code_reminder = 5
+
 [Tracker]
 
 ; Matomo uses "Privacy by default" model. When one of your users visit multiple of your websites tracked in this Matomo,

core/Db/Schema/Mysql.php

@@ -75,6 +75,7 @@ public function getTablesCreateSql()
                             `group` VARCHAR(250) NOT NULL,
                             `type` VARCHAR(255) NOT NULL,
                             keep_url_fragment TINYINT NOT NULL DEFAULT 0,
+                            creator_login VARCHAR(100) NULL,
                               PRIMARY KEY(idsite)
                             ) ENGINE=$engine DEFAULT CHARSET=utf8
             ",

core/Email/ContentGenerator.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Email;
+
+use Piwik\View;
+use Piwik\View\HtmlReportEmailHeaderView;
+
+class ContentGenerator
+{
+    public function generateHtmlContent(View $body)
+    {
+        HtmlReportEmailHeaderView::assignCommonParameters($body);
+        $bodyHtml = $body->render();
+
+        $header = new View("@CoreHome/_htmlEmailHeader.twig");
+        HtmlReportEmailHeaderView::assignCommonParameters($header);
+        $headerHtml = $header->render();
+
+        $footer = new View("@CoreHome/_htmlEmailFooter.twig");
+        HtmlReportEmailHeaderView::assignCommonParameters($footer);
+        $footerHtml = $footer->render();
+
+        return $headerHtml . $bodyHtml . $footerHtml;
+    }
+}

core/Mail.php

@@ -9,8 +9,10 @@
 namespace Piwik;
 
 use Piwik\Container\StaticContainer;
+use Piwik\Email\ContentGenerator;
 use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\Translation\Translator;
+use Piwik\View\HtmlReportEmailHeaderView;
 use Zend_Mail;
 
 /**
@@ -52,6 +54,13 @@ public function setDefaultFromPiwik()
         $this->setFrom($fromEmailAddress, $fromEmailName);
     }
 
+    public function setWrappedHtmlBody(View $body)
+    {
+        $contentGenerator = StaticContainer::get(ContentGenerator::class);
+        $bodyHtml = $contentGenerator->generateHtmlContent($body);
+        $this->setBodyHtml($bodyHtml);
+    }
+
     /**
      * Sets the sender.
      *
@@ -123,7 +132,25 @@ private function initSmtpTransport()
 
     public function send($transport = null)
     {
+        if (!$this->shouldSendMail()) {
+            return $this;
+        }
+
+        $mail = $this;
+
+        /**
+         * This event is posted right before an email is sent. You can use it to customize the email by, for example, replacing
+         * the subject/body, changing the from address, etc.
+         * TODO: changelog
+         * @param Mail $this The Mail instance that is about to be sent.
+         */
+        Piwik::postEvent('Mail.send', [$mail]);
+
         if (defined('PIWIK_TEST_MODE')) { // hack
+            /**
+             * @ignore
+             * @deprecated
+             */
             Piwik::postTestEvent("Test.Mail.send", array($this));
         } else {
             return parent::send($transport);
@@ -183,4 +210,21 @@ function sanitiseString($string)
         $string = str_replace($search, $replace, $string);
         return $string;
     }
+
+    private function shouldSendMail()
+    {
+        $shouldSendMail = true;
+
+        $mail = $this;
+
+        /**
+         * This event is posted before sending an email. You can use it to abort sending a specific email, if you want.
+         * TODO: changelog
+         * @param bool &$shouldSendMail Whether to send this email or not. Set to false to skip sending.
+         * @param Mail $mail The Mail instance that will be sent.
+         */
+        Piwik::postEvent('Mail.shouldSend', [&$shouldSendMail, $mail]);
+
+        return $shouldSendMail;
+    }
 }

core/Site.php

@@ -636,4 +636,15 @@ public static function getExcludedQueryParametersFor($idsite)
     {
         return self::getFor($idsite, 'excluded_parameters');
     }
+
+    /**
+     * Returns the user that created this site.
+     *
+     * @param int $idsite The site ID.
+     * @return string|null If null, the site was created before the creation user was tracked.
+     */
+    public static function getCreatorLoginFor($idsite)
+    {
+        return self::getFor($idsite, 'creator_login');
+    }
 }

core/Updates/3.6.1-b2.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Updates;
+
+use Piwik\Common;
+use Piwik\Updater\Migration\Factory as MigrationFactory;
+use Piwik\Updates;
+use Piwik\Updater;
+
+/**
+ * Update for version 3.6.1-b2.
+ */
+class Updates_3_6_1_b2 extends Updates
+{
+    /**
+     * @var MigrationFactory
+     */
+    private $migration;
+
+    public function __construct(MigrationFactory $factory)
+    {
+        $this->migration = $factory;
+    }
+
+    public function getMigrations(Updater $updater)
+    {
+        return array(
+            $this->migration->db->addColumn('site', 'creator_login', ' VARCHAR(100) NULL'),
+        );
+    }
+
+    public function doUpdate(Updater $updater)
+    {
+        $updater->executeMigrations(__FILE__, $this->getMigrations($updater));
+    }
+}

core/Version.php

@@ -20,7 +20,7 @@ final class Version
      * The current Matomo version.
      * @var string
      */
-    const VERSION = '3.6.1-b1';
+    const VERSION = '3.6.1-b2';
 
     public function isStableVersion($version)
     {

core/View/HtmlEmailFooterView.php

@@ -20,6 +20,6 @@ public function __construct()
     {
         parent::__construct(self::TEMPLATE_FILE);
 
-        $this->hasWhiteLabel = \Piwik\Plugin\Manager::getInstance()->isPluginLoaded('WhiteLabel');
+        HtmlReportEmailHeaderView::assignCommonParameters($this);
     }
 }

core/View/HtmlReportEmailHeaderView.php

@@ -47,10 +47,6 @@ public function __construct($reportTitle, $prettyDate, $description, $reportMeta
         $this->assign("idSite", $idSite);
         $this->assign("period", $period);
 
-        $customLogo = new CustomLogo();
-        $this->assign("isCustomLogo", $customLogo->isEnabled() && CustomLogo::hasUserLogo());
-        $this->assign("logoHeader", $customLogo->getHeaderLogoUrl($pathOnly = false));
-
         $date = Date::now()->setTimezone(Site::getTimezoneFor($idSite))->toString();
         $this->assign("date", $date);
 
@@ -72,6 +68,15 @@ public static function assignCommonParameters(View $view)
 
         $view->themeStyles = $themeStyles;
         $view->emailStyles = $emailStyles;
+
+        $view->fontStyle = 'color:' . $themeStyles->colorText . ';font-family:' . $themeStyles->fontFamilyBase.';';
+        $view->styleParagraph = 'font-size:15px;line-height:24px;margin:0 0 16px;';
+
+        $customLogo = new CustomLogo();
+        $view->isCustomLogo = $customLogo->isEnabled() && CustomLogo::hasUserLogo();
+        $view->logoHeader = $customLogo->getHeaderLogoUrl($pathOnly = false);
+
+        $view->hasWhiteLabel = \Piwik\Plugin\Manager::getInstance()->isPluginLoaded('WhiteLabel');
     }
 
     private static function getPeriodToFrequencyAsAdjective()

plugins/CoreAdminHome/Emails/JsTrackingCodeMissingEmail.php

@@ -0,0 +1,92 @@
+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+
+namespace Piwik\Plugins\CoreAdminHome\Emails;
+
+use Piwik\Mail;
+use Piwik\Piwik;
+use Piwik\Site;
+use Piwik\View;
+
+class JsTrackingCodeMissingEmail extends Mail
+{
+    /**
+     * @var string
+     */
+    private $login;
+
+    /**
+     * @var string
+     */
+    private $emailAddress;
+
+    /**
+     * @var int
+     */
+    private $idSite;
+
+    public function __construct($login, $emailAddress, $idSite)
+    {
+        parent::__construct();
+
+        $this->login = $login;
+        $this->emailAddress = $emailAddress;
+        $this->idSite = $idSite;
+
+        $this->setUpEmail();
+    }
+
+    /**
+     * @return string
+     */
+    public function getLogin()
+    {
+        return $this->login;
+    }
+
+    /**
+     * @return string
+     */
+    public function getEmailAddress()
+    {
+        return $this->emailAddress;
+    }
+
+    /**
+     * @return int
+     */
+    public function getIdSite()
+    {
+        return $this->idSite;
+    }
+
+    private function setUpEmail()
+    {
+        $this->setDefaultFromPiwik();
+        $this->addTo($this->emailAddress);
+        $this->setSubject($this->getDefaultSubject());
+        $this->setReplyTo($this->getFrom());
+        $this->setWrappedHtmlBody($this->getDefaultBodyView());
+    }
+
+    private function getDefaultSubject()
+    {
+        return Piwik::translate('CoreAdminHome_MissingTrackingCodeEmailSubject', [Site::getMainUrlFor($this->idSite)]);
+    }
+
+    private function getDefaultBodyView()
+    {
+        $view = new View('@CoreAdminHome/_jsTrackingCodeMissingEmail.twig');
+        $view->login = $this->login;
+        $view->emailAddress = $this->emailAddress;
+        $view->idSite = $this->idSite;
+        $view->siteUrl = Site::getMainUrlFor($this->idSite);
+        return $view;
+    }
+}