diff --git a/.travis.yml b/.travis.yml index 51e234a..dbecbe6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,7 @@ language: php php: - - 5.6 - - 5.3.3 -# - hhvm + - 7.2.5 services: - redis-server @@ -20,11 +18,8 @@ env: - TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=minimum_required_piwik matrix: - exclude: - # execute latest stable tests only w/ PHP 5.5 - - php: 5.3.3 - env: TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=minimum_required_piwik - - php: 5.4 + exclude: + - php: 7.2.5 env: TEST_SUITE=PluginTests MYSQL_ADAPTER=PDO_MYSQL TEST_AGAINST_CORE=minimum_required_piwik script: $PIWIK_ROOT_DIR/tests/travis/travis.sh diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ad2cca..23b37e0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ ## Changelog +### CustomOptOut 2.0.0 +* Matomo 4 compatibility +* Fix spelling issue + ### CustomOptOut 1.0.2, 1.0.3 (HotFix) * (PR #53) CSS fix and libraries update * Update [CodeMirror Editor](http://codemirror.net) diff --git a/SystemSettings.php b/SystemSettings.php index e84808f..ff4c3d0 100644 --- a/SystemSettings.php +++ b/SystemSettings.php @@ -11,7 +11,7 @@ use Piwik\Piwik; use Piwik\Settings\FieldConfig; use Piwik\Settings\Setting; - +use Piwik\Settings\Plugin\SystemSettings as BaseSettings; /** * Defines Settings for CustomOptOut. * @@ -21,7 +21,7 @@ * $settings->metric->getValue(); * */ -class SystemSettings extends \Piwik\Settings\Plugin\SystemSettings +class SystemSettings extends BaseSettings { /** * @var Setting diff --git a/lang/en.json b/lang/en.json index 6f67149..3fd97b4 100644 --- a/lang/en.json +++ b/lang/en.json @@ -5,10 +5,10 @@ "EditorThemeOptionName" : "Editor Theme", "EditorThemeDescription" : "Choose a theme for the editor.", "DefaultCssStyles" : "Default Stylesheets", - "DefaultCssStylesDescription": "This css styles will be used if no page is selected.", + "DefaultCssStylesDescription": "This css style will be used if no page is selected.", "DefaultCssFile": "Default Stylesheets file", "DefaultCssFileDescription": "This css file will be used if no page is selected.", "EnableJavascriptInjectionDescription": "Enable this option to show fields to enter javascript.", - "EnableJavascriptInjection": "Enable Javascript fields" + "EnableJavascriptInjection": "Enable Javascript fields" } } diff --git a/plugin.json b/plugin.json index 5534da0..d5b021e 100644 --- a/plugin.json +++ b/plugin.json @@ -1,6 +1,6 @@ { "name": "CustomOptOut", - "version": "1.0.3", + "version": "2.0.0", "description": "Create your own opt-out iframe css styles", "keywords": [ "Opt-Out", @@ -10,8 +10,8 @@ "license": "GPL-3.0+", "homepage": "https:\/\/www.zwei-entwickler.de", "require": { - "piwik": ">=3.0.0-b1,<4.0.0-b1", - "php": ">=5.5.9" + "matomo": ">=4.0.0-b1,<5.0.0-b1", + "php": ">=7.2.5" }, "donate": { "paypal": "info@two-developers.com" diff --git a/templates/index.twig b/templates/index.twig index 95fedeb..3677c1d 100644 --- a/templates/index.twig +++ b/templates/index.twig @@ -61,20 +61,20 @@ {% endif %} - {% set optOutUrl %}{% spaceless %} + {% set optOutUrl %} {% if showOldLinks %} {{ piwikUrl }}index.php?module=CustomOptOut&action=optOut&idsite={{ site.idsite|escape('url') }}&language={{ language }} {% else %} {{ piwikUrl }}index.php?module=CoreAdminHome&action=optOut&idsite={{ site.idsite|escape('url') }}&language={{ language }} {% endif %} - {% endspaceless %}{% endset %} + {% endset %} {% set iframeOptOut %} {% endset %} {{ iframeOptOut|escape }}
- {{ 'CoreAdminHome_OptOutExplanationBis'|translate("","")|raw }} + {{ 'CoreAdminHome_OptOutExplanationIntro'|translate("","")|raw }} {% endfor %}