GDPR + Add a couple of new platform features especially around validating settings (#12558)

* add a couple of new platform features especially around validating settings

* more validators and other tweaks

* few tweaks

* allow plugins to add header script in JS tests

* some work on gdpr

* remove email feature

* menu update

* add date tooltip

* make sure privacy has its own icon

* added some text

* add opt out info

* better titles

* add some information about webserver logs

* add log import notice

* give angular some time to render

* show border around iframe

* make sure to place a notification in modal dialog if needed

* when opening a modal, make sure the top part is visible

* disable newsletter sign up by default

* command line tool to anonymize and remove previously tracked raw data

* implement some basic consent features into piwik.js

* minor tweak

* schedule entries to anonymize data in past

* let users anonymize historical data

* better overview

* better naming

* explain consent tracking

* add legitimate interest

* new menu structure for privacy

* use a proper db table for scheduled anonymizations

* add some tracker tests

* some tests and fixes

* couple of fixes and tests

* starting to add some UI tests

* more tweaks

* add missing file

* fix jslint

* have the field full width

* more tweaks

* create directory if needed

* various fixes

* fix some tests

* make sure keys will be always returned in same order

* more fixes

* fix some tests

* apply feedback from review

* fix some tests

* this might fix mysqli tests

* fix some tests

* trying to fix mysqli tests

* fix system test

* fix comment

* remove some duplicated code

* update method name

* trigger event when logs need to be deleted

* add possibility to anonymize userId and orderId

* trigger event in tracking code page

* expire consent in hours

* post another event

* update wording for privacy GDPR

* fix various ui tests

* fix some tests

* trying to fix ui tests

* trigger another test run

* fix system test

* fix some ui tests

* show a table of contents on tracking code page, fix title, add mobile apps and API

* fix ui test

* 3.5.0-b2 update

* Re-generate piwik.js

* fix job status and selector style

* make sure to include only sites with admin access

* some tweaks

* fix some ui tests

* fix some ui tests

* fix test

3 files changed, 47 insertions, 6 deletions

diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
index 8ca2d69077..3fead3fa3a 100644
--- a/plugins/CoreAdminHome/Controller.php
+++ b/plugins/CoreAdminHome/Controller.php
@@ -173,6 +173,14 @@ class Controller extends ControllerAdmin
         $defaultIdSite = reset($viewableIdSites);
         $view->idSite = Common::getRequestVar('idSite', $defaultIdSite, 'int');
 
+        if ($view->idSite) {
+            try {
+                $view->siteName = Site::getNameFor($view->idSite);
+            } catch (Exception $e) {
+                // ignore if site no longer exists
+            }
+        }
+
         $view->defaultReportSiteName = Site::getNameFor($view->idSite);
         $view->defaultSiteRevenue = Site::getCurrencySymbolFor($view->idSite);
         $view->maxCustomVariables = CustomVariables::getNumUsableCustomVariables();
diff --git a/plugins/CoreAdminHome/lang/en.json b/plugins/CoreAdminHome/lang/en.json
index 6f98029d49..0c8e4c8fd8 100644
--- a/plugins/CoreAdminHome/lang/en.json
+++ b/plugins/CoreAdminHome/lang/en.json
@@ -22,6 +22,8 @@
         "InvalidPluginsWarning": "The following plugins are not compatible with %1$s and could not be loaded: %2$s.",
         "InvalidPluginsYouCanUninstall": "You can update or uninstall these plugins on the %1$sManage Plugins%2$s page.",
         "JavaScriptTracking": "JavaScript Tracking",
+        "HttpTrackingApi": "HTTP Tracking API",
+        "HttpTrackingApiDescription": "The %1$sHTTP Tracking API%2$s allows you to track anything. This may be useful if you are using a programming language for which no SDK exists yet. It may also be useful when you want to track devices or application in a special way.",
         "JSTracking_CampaignKwdParam": "Campaign Keyword parameter",
         "JSTracking_CampaignNameParam": "Campaign Name parameter",
         "JSTracking_CodeNoteBeforeClosingHead": "Make sure this code is on every page of your website. We recommend to paste it immediately before the closing %1$s tag.",
@@ -86,6 +88,7 @@
         "SystemPluginSettings": "System Plugin Settings",
         "TrackAGoal": "Track a goal",
         "TrackingCode": "Tracking Code",
+        "TrackingCodeIntro": "Matomo offers you various ways to embed the tracking code for your website, mobile app, and even for any device or application.",
         "TrustedHostConfirm": "Are you sure you want to change the trusted Matomo hostname?",
         "TrustedHostSettings": "Trusted Matomo Hostname",
         "UpdateSettings": "Update settings",
diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index 1ea4a0f744..dab8773815 100644
--- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
+++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -5,17 +5,34 @@
     <link rel="stylesheet" href="plugins/CoreAdminHome/stylesheets/jsTrackingGenerator.css" />
 {% endblock %}
 
-{% set title %}{{ 'CoreAdminHome_JavaScriptTracking'|translate }}{% endset %}
+{% set title %}{{ 'CoreAdminHome_TrackingCode'|translate }}{% endset %}
 
 {% block content %}
 
+    <div class="card">
+        <div class="card-content">
+            <h2 piwik-enriched-headline
+                help-url="https://matomo.org/docs/tracking-api/"
+                rate="{{ 'CoreAdminHome_TrackingCode'|translate|e('html_attr') }}">{{ 'CoreAdminHome_TrackingCode'|translate  }}</h2>
+            <p style="padding-left: 0;">{{ 'CoreAdminHome_TrackingCodeIntro'|translate }}</p>
+        </div>
+        <div class="card-action">
+            {{ 'General_GoTo2'|translate }}:
+            <a href="#javaScriptTracking">{{ 'CoreAdminHome_JavaScriptTracking'|translate  }}</a>
+            <a href="#imageTracking">{{ 'CoreAdminHome_ImageTracking'|translate }}</a>
+            <a href="#importServerLogs">{{ 'CoreAdminHome_ImportingServerLogs'|translate }}</a>
+            <a href="#mobileAppsAndSdks">{{ 'SitesManager_MobileAppsAndSDKs'|translate }}</a>
+            <a href="#trackingApi">{{ 'CoreAdminHome_HttpTrackingApi'|translate }}</a>
+            {{ postEvent('Template.endTrackingCodePageTableOfContents') }}
+        </div>
+    </div>
+
     <input type="hidden" name="numMaxCustomVariables"
            value="{{ maxCustomVariables|e('html_attr') }}">
 
 <div piwik-content-block
-     content-title="{{ title|e('html_attr') }}"
-     help-url="https://matomo.org/docs/tracking-api/"
-     rate="{{ 'CoreAdminHome_TrackingCode'|translate|e('html_attr') }}">
+     anchor="javaScriptTracking"
+     content-title="{{ 'CoreAdminHome_JavaScriptTracking'|translate|e('html_attr') }}">
 
     <div id="js-code-options" ng-controller="JsTrackingCodeController as jsTrackingCode">
 
@@ -238,7 +255,8 @@
     </div>
 </div>
 
-<div piwik-content-block content-title="{{ 'CoreAdminHome_ImageTracking'|translate|e('html_attr') }}">
+<div piwik-content-block content-title="{{ 'CoreAdminHome_ImageTracking'|translate|e('html_attr') }}"
+     anchor="imageTracking">
     <a name="image-tracking-link"></a>
 
     <div id="image-tracking-code-options" ng-controller="ImageTrackingCodeController as imageTrackingCode">
@@ -314,9 +332,21 @@
     </div>
 </div>
 
-<div piwik-content-block content-title="{{ 'CoreAdminHome_ImportingServerLogs'|translate|e('html_attr') }}">
+<div piwik-content-block content-title="{{ 'CoreAdminHome_ImportingServerLogs'|translate|e('html_attr') }}"
+     anchor="importServerLogs">
     <p>
         {{ 'CoreAdminHome_ImportingServerLogsDesc'|translate('<a href="https://matomo.org/log-analytics/" rel="noreferrer"  target="_blank">','</a>')|raw }}
     </p>
 </div>
+
+<div piwik-content-block content-title="{{ 'SitesManager_MobileAppsAndSDKs'|translate }}" anchor="mobileAppsAndSdks">
+    <p>{{ 'SitesManager_MobileAppsAndSDKsDescription'|translate('<a href="https://matomo.org/integrate/#programming-language-platforms-and-frameworks" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
+</div>
+
+<div piwik-content-block content-title="{{ 'CoreAdminHome_HttpTrackingApi'|translate }}" anchor="trackingApi">
+    <p>{{ 'CoreAdminHome_HttpTrackingApiDescription'|translate('<a href="https://developer.matomo.org/api-reference/tracking-api" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
+</div>
+
+{{ postEvent('Template.endTrackingCodePage') }}
+
 {% endblock %}