diff options
author | Thomas Steur <tsteur@users.noreply.github.com> | 2020-06-03 09:47:44 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-03 09:47:44 +0300 |
commit | 7585967cbd80d7869f57a9adc69c02e8d14cbc33 (patch) | |
tree | 7b06afedbcb883175f02ffff141809d001097b64 /plugins | |
parent | caf7dbf0fdd3e91a47fa49f297ed18a75ddeff9d (diff) |
Remove code tagged with `@deprecated` (#16001)
* remove some code tagged with deprecated
* some more tweaks
* remove more deprecated methods
* more deprecations
* remove old files
* remove more deprecated methods
* fix some tests
* update logviewer submodule
* fix some tests
* fix ui test
* another deprecation
* Update CHANGELOG.md
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* add test for dimensions provider
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Diffstat (limited to 'plugins')
27 files changed, 22 insertions, 384 deletions
diff --git a/plugins/API/API.php b/plugins/API/API.php index 3cc54e0db3..7d961f02ab 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -111,7 +111,7 @@ class API extends \Piwik\Plugin\API /** * Get Matomo version * @return string - * @deprecated + * @deprecated Deprecated but we keep it for historical reasons to not break BC */ public function getPiwikVersion() { @@ -140,19 +140,6 @@ class API extends \Piwik\Plugin\API } /** - * Default translations for many core metrics. - * This is used for exports with translated labels. The exports contain columns that - * are not visible in the UI and not present in the API meta data. These columns are - * translated here. - * @return array - * @deprecated since Matomo 2.15.1 - */ - public function getDefaultMetricTranslations() - { - return Metrics::getDefaultMetricTranslations(); - } - - /** * Returns all available measurable types. * Marked as deprecated so it won't appear in API page. It won't be a public API for now. * @deprecated @@ -241,56 +228,6 @@ class API extends \Piwik\Plugin\API } /** - * Returns the url to application logo (~280x110px) - * - * @param bool $pathOnly If true, returns path relative to doc root. Otherwise, returns a URL. - * @return string - * @deprecated since Matomo 2.15.1 - */ - public function getLogoUrl($pathOnly = false) - { - $logo = new CustomLogo(); - return $logo->getLogoUrl($pathOnly); - } - - /** - * Returns the url to header logo (~127x50px) - * - * @param bool $pathOnly If true, returns path relative to doc root. Otherwise, returns a URL. - * @return string - * @deprecated since Matomo 2.15.1 - */ - public function getHeaderLogoUrl($pathOnly = false) - { - $logo = new CustomLogo(); - return $logo->getHeaderLogoUrl($pathOnly); - } - - /** - * Returns the URL to application SVG Logo - * - * @ignore - * @param bool $pathOnly If true, returns path relative to doc root. Otherwise, returns a URL. - * @return string - */ - public function getSVGLogoUrl($pathOnly = false) - { - $logo = new CustomLogo(); - return $logo->getSVGLogoUrl($pathOnly); - } - - /** - * Returns whether there is an SVG Logo available. - * @ignore - * @return bool - */ - public function hasSVGLogo() - { - $logo = new CustomLogo(); - return $logo->hasSVGLogo(); - } - - /** * Loads reports metadata, then return the requested one, * matching optional API parameters. */ diff --git a/plugins/CoreHome/angularjs/common/services/piwik-api.js b/plugins/CoreHome/angularjs/common/services/piwik-api.js index 97a6d28bfa..c98d13260a 100644 --- a/plugins/CoreHome/angularjs/common/services/piwik-api.js +++ b/plugins/CoreHome/angularjs/common/services/piwik-api.js @@ -340,9 +340,6 @@ var hasBlockedContent = false; post: post, fetch: fetch, addPostParams: addPostParams, - /** - * @deprecated - */ abort: abort, abortAll: abortAll, mixinDefaultGetParams: mixinDefaultGetParams diff --git a/plugins/CoreHome/angularjs/history/history.service.js b/plugins/CoreHome/angularjs/history/history.service.js index 6e3f0a3a13..b2ffa769ce 100644 --- a/plugins/CoreHome/angularjs/history/history.service.js +++ b/plugins/CoreHome/angularjs/history/history.service.js @@ -13,7 +13,7 @@ * * Should only be used by the broadcast object. * - * @deprecated in 3.2.2, will be removed in Piwik 4 + * @deprecated in 3.2.2, will be removed in Matomo 5 */ (function (window, $, broadcast) { angular.module('piwikApp').service('historyService', historyService); diff --git a/plugins/CoreHome/javascripts/broadcast.js b/plugins/CoreHome/javascripts/broadcast.js index bb92ae9abf..06517de5aa 100644 --- a/plugins/CoreHome/javascripts/broadcast.js +++ b/plugins/CoreHome/javascripts/broadcast.js @@ -53,7 +53,7 @@ var broadcast = { /** * Initializes broadcast object * - * @deprecated in 3.2.2, will be removed in Piwik 4 + * @deprecated in 3.2.2, will be removed in Matomo 5 * * @return {void} */ @@ -81,7 +81,7 @@ var broadcast = { * * * Note: the method is manipulated in Overlay/javascripts/Piwik_Overlay.js - keep this in mind when making changes. * - * @deprecated since 3.2.2, will be removed in Piwik 4 + * @deprecated since 3.2.2, will be removed in Matomo 5 * * @param {string} hash to load page with * @return {void} @@ -199,7 +199,7 @@ var broadcast = { * * NOTE: this method will only make ajax call and replacing main content. * - * @deprecated in 3.2.2, will be removed in Piwik 4. + * @deprecated in 3.2.2, will be removed in Matomo 5. * * @param {string} ajaxUrl querystring with parameters to be updated * @param {boolean} [disableHistory] the hash change won't be available in the browser history diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index 4eda3739ad..da005443f2 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -150,22 +150,6 @@ class Controller extends Plugin\ControllerAdmin return $view->render(); } - /** - * @deprecated - */ - public function browsePlugins() - { - $this->redirectToIndex('Marketplace', 'overview'); - } - - /** - * @deprecated - */ - public function browseThemes() - { - $this->redirectToIndex('Marketplace', 'overview', null, null, null, array('show' => 'themes')); - } - public function tagManagerTeaser() { $this->dieIfPluginsAdminIsDisabled(); diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index d5cb16bdff..db19df33df 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -290,9 +290,9 @@ {% if displayAdminLinks %} <div class="tableActionBar"> {% if isTheme %} - <a href="{{ linkTo({'action':'browseThemes', 'sort': ''}) }}"><span class="icon-add"></span> {{ 'CorePluginsAdmin_InstallNewThemes'|translate }}</a> + <a href="{{ linkTo({'module': 'Marketplace','action':'overview', 'sort': '', 'show': 'themes'}) }}"><span class="icon-add"></span> {{ 'CorePluginsAdmin_InstallNewThemes'|translate }}</a> {% else %} - <a href="{{ linkTo({'action':'browsePlugins', 'sort': ''}) }}"><span class="icon-add"></span> {{ 'CorePluginsAdmin_InstallNewPlugins'|translate }}</a> + <a href="{{ linkTo({'module': 'Marketplace','action':'overview', 'sort': ''}) }}"><span class="icon-add"></span> {{ 'CorePluginsAdmin_InstallNewPlugins'|translate }}</a> {% endif %} </div> {% endif %} diff --git a/plugins/CorePluginsAdmin/templates/plugins.twig b/plugins/CorePluginsAdmin/templates/plugins.twig index e1b825ded6..14943ba94a 100644 --- a/plugins/CorePluginsAdmin/templates/plugins.twig +++ b/plugins/CorePluginsAdmin/templates/plugins.twig @@ -19,7 +19,7 @@ {% if isMarketplaceEnabled or isPluginUploadEnabled %} {{ 'CorePluginsAdmin_TeaserExtendPiwikByPlugin'|translate( - '<a href="' ~ linkTo({'action':'browsePlugins', 'sort': null, 'activated': null})|e('html_attr') ~ '">', + '<a href="' ~ linkTo({'module':'Marketplace', 'action':'overview', 'sort': null, 'activated': null})|e('html_attr') ~ '">', '</a>', '<a href="#" class="uploadPlugin">', '</a>' diff --git a/plugins/CorePluginsAdmin/templates/themes.twig b/plugins/CorePluginsAdmin/templates/themes.twig index d898c3c799..32a4e56444 100644 --- a/plugins/CorePluginsAdmin/templates/themes.twig +++ b/plugins/CorePluginsAdmin/templates/themes.twig @@ -15,7 +15,7 @@ {{ 'CorePluginsAdmin_ThemesDescription'|translate }} {% if isMarketplaceEnabled %} - {{ 'CorePluginsAdmin_TeaserExtendPiwikByTheme'|translate('<a href="' ~ linkTo({'action':'browseThemes', 'sort': ''}) ~ '">', '</a>')|raw }} + {{ 'CorePluginsAdmin_TeaserExtendPiwikByTheme'|translate('<a href="' ~ linkTo({'module': 'Marketplace','action':'overview', 'sort': '', 'show': 'themes'}) ~ '">', '</a>')|raw }} {% endif %} {% if otherUsersCount > 0 %} diff --git a/plugins/CoreUpdater/CoreUpdater.php b/plugins/CoreUpdater/CoreUpdater.php index 1d5eaa0161..79821d287c 100644 --- a/plugins/CoreUpdater/CoreUpdater.php +++ b/plugins/CoreUpdater/CoreUpdater.php @@ -35,22 +35,6 @@ class CoreUpdater extends \Piwik\Plugin ); } - /** - * @deprecated - */ - public static function updateComponents(PiwikCoreUpdater $updater, $componentsWithUpdateFile) - { - return $updater->updateComponents($componentsWithUpdateFile); - } - - /** - * @deprecated - */ - public static function getComponentUpdates(PiwikCoreUpdater $updater) - { - return $updater->getComponentUpdates(); - } - public function dispatch() { if (!SettingsPiwik::isAutoUpdateEnabled()) { diff --git a/plugins/CustomVariables/Model.php b/plugins/CustomVariables/Model.php index b5ffec9060..bdc28f22f7 100644 --- a/plugins/CustomVariables/Model.php +++ b/plugins/CustomVariables/Model.php @@ -10,6 +10,7 @@ namespace Piwik\Plugins\CustomVariables; use Piwik\Common; use Piwik\Container\StaticContainer; +use Piwik\DataAccess\TableMetadata; use Piwik\DataTable; use Piwik\Db; use Piwik\Log; @@ -133,7 +134,8 @@ class Model private function getCustomVarColumnNames() { - $columns = Db::getColumnNamesFromTable($this->table); + $tableMetadataAccess = new TableMetadata(); + $columns = $tableMetadataAccess->getColumns($this->table); $customVarColumns = array_filter($columns, function ($column) { return false !== strpos($column, 'custom_var_'); diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php index b3b416630f..acc635ac88 100644 --- a/plugins/DevicesDetection/API.php +++ b/plugins/DevicesDetection/API.php @@ -226,25 +226,6 @@ class API extends \Piwik\Plugin\API } /** - * Gets datatable displaying number of visits by Browser family (eg. Firefox, InternetExplorer) - * @param int $idSite - * @param string $period - * @param string $date - * @param bool|string $segment - * @return DataTable - * - * @deprecated since 2.9.0 Use {@link getBrowsers} instead. - */ - public function getBrowserFamilies($idSite, $period, $date, $segment = false) - { - $table = $this->getBrowsers($idSite, $period, $date, $segment); - // this one will not be sorted automatically by nb_visits since there is no Report class for it. - $table->filter('Sort', array(Metrics::INDEX_NB_VISITS, 'desc')); - - return $table; - } - - /** * Gets datatable displaying number of visits by Browser (Without version) * @param int $idSite * @param string $period diff --git a/plugins/Diagnostics/Diagnostic/DbMaxPacket.php b/plugins/Diagnostics/Diagnostic/DbMaxPacket.php index a771ba564d..65d2d5bcce 100644 --- a/plugins/Diagnostics/Diagnostic/DbMaxPacket.php +++ b/plugins/Diagnostics/Diagnostic/DbMaxPacket.php @@ -3,10 +3,10 @@ namespace Piwik\Plugins\Diagnostics\Diagnostic; use Piwik\Db; -use Piwik\MetricsFormatter; use Piwik\Piwik; use Piwik\SettingsPiwik; use Piwik\Translation\Translator; +use Piwik\Metrics\Formatter; /** * Check if Piwik is connected with database through ssl. @@ -40,7 +40,8 @@ class DbMaxPacket implements Diagnostic $minSize = self::MIN_VALUE_MAX_PACKET_MB * 1000 * 1000; // not using 1024 just in case... this amount be good enough if (!empty($maxPacketBytes['Value']) && $maxPacketBytes['Value'] < $minSize) { $status = DiagnosticResult::STATUS_WARNING; - $pretty = MetricsFormatter::getPrettySizeFromBytes($maxPacketBytes['Value'], 'M'); + $formatter = new Formatter\Html(); + $pretty = $formatter->getPrettySizeFromBytes($maxPacketBytes['Value'], 'M', $precision = 1); $configured = str_replace(array(' M', ' M'), 'MB', $pretty); $comment = Piwik::translate('Diagnostics_MysqlMaxPacketSizeWarning', array('64MB', $configured)); } diff --git a/plugins/ExampleAPI/API.php b/plugins/ExampleAPI/API.php index ba1d77c1b8..4e4a84de0f 100644 --- a/plugins/ExampleAPI/API.php +++ b/plugins/ExampleAPI/API.php @@ -33,16 +33,6 @@ class API extends \Piwik\Plugin\API } /** - * Get Matomo version - * @return string - * @deprecated - */ - public function getPiwikVersion() - { - return $this->getMatomoVersion(); - } - - /** * Get Answer to Life * @return integer */ diff --git a/plugins/GeoIp2/GeoIP2AutoUpdater.php b/plugins/GeoIp2/GeoIP2AutoUpdater.php index 65903e94d7..3f2b7b1baf 100644 --- a/plugins/GeoIp2/GeoIP2AutoUpdater.php +++ b/plugins/GeoIp2/GeoIP2AutoUpdater.php @@ -8,8 +8,6 @@ */ namespace Piwik\Plugins\GeoIp2; -require_once PIWIK_INCLUDE_PATH . "/core/ScheduledTask.php"; // for the tracker which doesn't include this file - use Exception; use GeoIp2\Database\Reader; use Piwik\Common; diff --git a/plugins/GeoIp2/LocationProvider/GeoIp2.php b/plugins/GeoIp2/LocationProvider/GeoIp2.php index 3a17da686d..f418c035ef 100644 --- a/plugins/GeoIp2/LocationProvider/GeoIp2.php +++ b/plugins/GeoIp2/LocationProvider/GeoIp2.php @@ -21,8 +21,6 @@ use Piwik\Plugins\UserCountry\LocationProvider; */ abstract class GeoIp2 extends LocationProvider { - /** @deprecated */ - const GEO_LITE_URL = 'https://geolite.maxmind.com/download/geoip/database/GeoLite2-City.tar.gz'; const TEST_IP = '194.57.91.215'; const SWITCH_TO_ISO_REGIONS_OPTION_NAME = 'usercountry.switchtoisoregions'; @@ -113,24 +111,6 @@ abstract class GeoIp2 extends LocationProvider return StaticContainer::get('path.geoip2') . $filename; } - /** - * Returns test IP used by isWorking and expected result. - * - * @return array eg. array('1.2.3.4', array(self::COUNTRY_CODE_KEY => ...)) - * @deprecated - */ - protected function getTestIpAndResult() - { - static $result = null; - if (is_null($result)) { - $expected = array(self::COUNTRY_CODE_KEY => 'FR', - self::REGION_CODE_KEY => 'BFC', - self::CITY_NAME_KEY => 'Besançon'); - $result = array(self::TEST_IP, $expected); - } - return $result; - } - public function activate() { $option = Option::get(self::SWITCH_TO_ISO_REGIONS_OPTION_NAME); diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index 0550c61e9b..e39b088f1d 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -54,8 +54,6 @@ use Piwik\Validators\WhitelistedValue; class API extends \Piwik\Plugin\API { const AVG_PRICE_VIEWED = 'avg_price_viewed'; - /** @deprecated Use VisitFrequency\API::NEW_VISITOR_SEGMENT */ - const NEW_VISIT_SEGMENT = 'visitorType==new'; /** * Return a single goal. diff --git a/plugins/LanguagesManager/API.php b/plugins/LanguagesManager/API.php index 59e6814916..5bc5628bbe 100644 --- a/plugins/LanguagesManager/API.php +++ b/plugins/LanguagesManager/API.php @@ -80,15 +80,6 @@ class API extends \Piwik\Plugin\API */ Piwik::postEvent('LanguagesManager.getAvailableLanguages', array(&$languages)); - /** - * Hook called after loading available language files. - * - * @param array - * - * @deprecated since v3.9.0 use LanguagesManager.getAvailableLanguages instead. Will be removed in Matomo 4.0.0 - */ - Piwik::postEvent('LanguageManager.getAvailableLanguages', array(&$languages)); - $this->languageNames = $languages; return $languages; } diff --git a/plugins/Live/API.php b/plugins/Live/API.php index 883cab4c76..69eeff0c4e 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -124,28 +124,6 @@ class API extends \Piwik\Plugin\API } /** - * The same functionality can be obtained using segment=visitorId==$visitorId with getLastVisitsDetails - * - * @deprecated - * @ignore - * @param int $visitorId - * @param int $idSite - * @param int $filter_limit - * @param bool $flat Whether to flatten the visitor details array - * - * @return DataTable - */ - public function getLastVisitsForVisitor($visitorId, $idSite, $filter_limit = 10, $flat = false) - { - Piwik::checkUserHasViewAccess($idSite); - - $table = $this->loadLastVisitsDetailsFromDatabase($idSite, $period = false, $date = false, $segment = false, $offset = 0, $filter_limit, $minTimestamp = false, $filterSortOrder = false, $visitorId); - $this->addFilterToCleanVisitors($table, $idSite, $flat); - - return $table; - } - - /** * Returns the last visits tracked in the specified website * You can define any number of filters: none, one, many or all parameters can be defined * @@ -234,26 +212,6 @@ class API extends \Piwik\Plugin\API $profile = new VisitorProfile($idSite); $result = $profile->makeVisitorProfile($visits, $visitorId, $segment, $limitVisits); - /** - * Triggered in the Live.getVisitorProfile API method. Plugins can use this event - * to discover and add extra data to visitor profiles. - * - * This event is deprecated, use [VisitorDetails](/api-reference/Piwik/Plugins/Live/VisitorDetailsAbstract#extendVisitorDetails) classes instead. - * - * For example, if an email address is found in a custom variable, a plugin could load the - * gravatar for the email and add it to the visitor profile, causing it to display in the - * visitor profile popup. - * - * The following visitor profile elements can be set to augment the visitor profile popup: - * - * - **visitorAvatar**: A URL to an image to display in the top left corner of the popup. - * - **visitorDescription**: Text to be used as the tooltip of the avatar image. - * - * @param array &$visitorProfile The unaugmented visitor profile info. - * @deprecated - */ - Piwik::postEvent('Live.getExtraVisitorDetails', array(&$result)); - return $result; } @@ -328,14 +286,6 @@ class API extends \Piwik\Plugin\API } /** - * @deprecated - */ - public function getLastVisits($idSite, $filter_limit = 10, $minTimestamp = false) - { - return $this->getLastVisitsDetails($idSite, $period = false, $date = false, $segment = false, $filter_limit, $minTimestamp, $flat = false); - } - - /** * For an array of visits, query the list of pages for this visit * as well as make the data human readable * @param DataTable $dataTable diff --git a/plugins/LogViewer b/plugins/LogViewer -Subproject 33bcbe01698ebe4e8f013018a816b04acfa924e +Subproject 033e68f4d76869597ebe9ffb8c4e0f1c5c26a3b diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php index a3bad430ba..4dde95f476 100644 --- a/plugins/Login/Login.php +++ b/plugins/Login/Login.php @@ -189,13 +189,5 @@ class Login extends \Piwik\Plugin && (Piwik::getAction() == '' || Piwik::getAction() == 'index'); } - /** - * @param $auth - * @deprecated authenticating via cookie is handled in core by SessionAuth - */ - public static function initAuthenticationFromCookie(\Piwik\Auth $auth, $activateCookieAuth) - { - // empty - } } diff --git a/plugins/Login/SessionInitializer.php b/plugins/Login/SessionInitializer.php index d8d304dc4b..64d24d177a 100644 --- a/plugins/Login/SessionInitializer.php +++ b/plugins/Login/SessionInitializer.php @@ -21,11 +21,6 @@ use Piwik\ProxyHttp; use Piwik\Session; /** - * This SessionInitializer is no longer used, but is kept for backwards compatibility. - * Session management no longer uses the piwik_auth cookie. - * - * @deprecated - * @api */ class SessionInitializer { diff --git a/plugins/ProfessionalServices/ProfessionalServices.php b/plugins/ProfessionalServices/ProfessionalServices.php index 77bf1d2118..a2d96f8b28 100644 --- a/plugins/ProfessionalServices/ProfessionalServices.php +++ b/plugins/ProfessionalServices/ProfessionalServices.php @@ -21,7 +21,6 @@ class ProfessionalServices extends \Piwik\Plugin { return array( 'AssetManager.getStylesheetFiles' => 'getStylesheetFiles', - 'Request.getRenamedModuleAndAction' => 'renameProfessionalServicesModule', 'Template.afterGoalConversionOverviewReport' => array('function' => 'getGoalOverviewPromo', 'after' => true), 'Template.afterGoalCannotAddNewGoal' => array('function' => 'getGoalOverviewPromo', 'after' => true), 'Template.endGoalEditTable' => array('function' => 'getGoalFunnelOverviewPromo', 'after' => true), @@ -40,26 +39,6 @@ class ProfessionalServices extends \Piwik\Plugin $stylesheets[] = 'plugins/ProfessionalServices/stylesheets/widget.less'; } - /** - * @deprecated Can be removed in Piwik 3.0 - * @param $module - * @param $action - */ - public function renameProfessionalServicesModule(&$module, &$action) - { - if ($module == 'ProfessionalServices') { - $module = 'ProfessionalServices'; - - if($action == 'promoPiwikPro') { - $action = 'promoServices'; - } - - if ($action == 'rssPiwikPro') { - $action = 'rss'; - } - } - } - public function isRequestForDashboardWidget() { $isWidget = Common::getRequestVar('widget', 0, 'int'); diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php index 02d3cb6380..b343b9e83f 100644 --- a/plugins/Proxy/Controller.php +++ b/plugins/Proxy/Controller.php @@ -75,39 +75,6 @@ class Controller extends \Piwik\Plugin\Controller } /** - * Output redirection page instead of linking directly to avoid - * exposing the referrer on the Piwik demo. - * - * @internal param string $url (via $_GET) - * @deprecated @since 3.6.0 - */ - public function redirect() - { - $url = Common::getRequestVar('url', '', 'string', $_GET); - if (!UrlHelper::isLookLikeUrl($url)) { - die('Please check the &url= parameter: it should to be a valid URL'); - } - // validate referrer - $referrer = Url::getReferrer(); - if (empty($referrer) || !Url::isLocalUrl($referrer)) { - die('Invalid Referrer detected - This means that your web browser is not sending the "Referrer URL" which is - required to proceed with the redirect. Verify your browser settings and add-ons, to check why your browser - is not sending this referrer. - - <br/><br/>You can access the page at: ' . $url); - } - - // mask visits to *.piwik.org - if (!self::isPiwikUrl($url)) { - Piwik::checkUserHasSomeViewAccess(); - } - Common::sendHeader('Content-Type: text/html; charset=utf-8'); - echo '<html><head><meta http-equiv="refresh" content="0;url=' . $url . '" /></head></html>'; - - exit; - } - - /** * Validate URL against *.piwik.org domains * * @param string $url diff --git a/plugins/Referrers/API.php b/plugins/Referrers/API.php index 8bc75044f8..02a37f5e7e 100644 --- a/plugins/Referrers/API.php +++ b/plugins/Referrers/API.php @@ -27,7 +27,6 @@ use Piwik\Site; * For example, "getKeywords" returns all search engine keywords (with <a href='http://matomo.org/docs/analytics-api/reference/#toc-metric-definitions' rel='noreferrer' target='_blank'>general analytics metrics</a> for each keyword), "getWebsites" returns referrer websites (along with the full Referrer URL if the parameter &expanded=1 is set). * "getReferrerType" returns the Referrer overview report. "getCampaigns" returns the list of all campaigns (and all campaign keywords if the parameter &expanded=1 is set). * - * The methods "getKeywordsForPageUrl" and "getKeywordsForPageTitle" are used to output the top keywords used to find a page. * @method static \Piwik\Plugins\Referrers\API getInstance() */ class API extends \Piwik\Plugin\API @@ -256,29 +255,6 @@ class API extends \Piwik\Plugin\API } /** - * @deprecated will be removed in Matomo 4.0.0 - */ - public function getKeywordsForPageUrl($idSite, $period, $date, $url) - { - // Fetch the Top keywords for this page - $segment = 'entryPageUrl==' . $url; - $table = $this->getKeywords($idSite, $period, $date, $segment); - $this->filterOutKeywordNotDefined($table); - return $this->getLabelsFromTable($table); - } - - /** - * @deprecated will be removed in Matomo 4.0.0 - */ - public function getKeywordsForPageTitle($idSite, $period, $date, $title) - { - $segment = 'entryPageTitle==' . $title; - $table = $this->getKeywords($idSite, $period, $date, $segment); - $this->filterOutKeywordNotDefined($table); - return $this->getLabelsFromTable($table); - } - - /** * @param DataTable $table */ private function filterOutKeywordNotDefined($table) diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index 3ec7b13efc..207e40e196 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -307,33 +307,6 @@ class API extends \Piwik\Plugin\API } /** - * Returns the list of the website IDs that received some visits since the specified timestamp. - * Requires Super User access. - * - * @param bool|int $timestamp - * @return array The list of website IDs - * @deprecated since 2.15 This method will be removed in Matomo 3.0, there is no replacement. - */ - public function getSitesIdWithVisits($timestamp = false) - { - Piwik::checkUserHasSuperUserAccess(); - - if (empty($timestamp)) $timestamp = time(); - - $time = Date::factory((int)$timestamp)->getDatetime(); - $now = Date::now()->addHour(1)->getDatetime(); - - $result = $this->getModel()->getSitesWithVisits($time, $now); - - $idSites = array(); - foreach ($result as $idSite) { - $idSites[] = $idSite['idsite']; - } - - return $idSites; - } - - /** * Returns the list of websites with the 'admin' access for the current user. * For the superUser it returns all the websites in the database. * @@ -1062,29 +1035,6 @@ class API extends \Piwik\Plugin\API } /** - * Returns true if site-specific user agent exclusion has been enabled. If it hasn't, - * only the global user agent substrings (see @setGlobalExcludedUserAgents) will be used. - * - * @return bool - * @deprecated Will be removed in Matomo 4.0 - */ - public function isSiteSpecificUserAgentExcludeEnabled() - { - return true; - } - - /** - * Sets whether it should be allowed to exclude different user agents for different - * websites. - * - * @param bool $enabled - * @deprecated Will be removed in Matomo 4.0 - */ - public function setSiteSpecificUserAgentExcludeEnabled($enabled) - { - } - - /** * Returns true if the default behavior is to keep URL fragments when tracking, * false if otherwise. * diff --git a/plugins/SitesManager/Controller.php b/plugins/SitesManager/Controller.php index 3af7c4f44c..5888aaf60e 100644 --- a/plugins/SitesManager/Controller.php +++ b/plugins/SitesManager/Controller.php @@ -100,20 +100,6 @@ class Controller extends \Piwik\Plugin\ControllerAdmin return $toReturn; } - /** - * User will download a file called PiwikTracker.php that is the content of the actual script - * - * @deprecated seems unused and PiwikTracker is now MatomoTracker - */ - function downloadPiwikTracker() - { - $path = PIWIK_INCLUDE_PATH . '/libs/PiwikTracker/'; - $filename = 'PiwikTracker.php'; - Common::sendHeader('Content-type: text/php'); - Common::sendHeader('Content-Disposition: attachment; filename="' . $filename . '"'); - return file_get_contents($path . $filename); - } - public function ignoreNoDataMessage() { Piwik::checkUserHasSomeViewAccess(); diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index 481dcd881f..97179241d8 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -40,22 +40,22 @@ class Controller extends \Piwik\Plugin\Controller /** * @deprecated used to be a widgetized URL. There to not break widget URLs */ - public function getSparklines() + public function index() { - $_GET['forceView'] = '1'; - $_GET['viewDataTable'] = Sparklines::ID; + $_GET['containerId'] = 'VisitOverviewWithGraph'; - return FrontController::getInstance()->fetchDispatch('VisitsSummary', 'get'); + return FrontController::getInstance()->fetchDispatch('CoreHome', 'renderWidgetContainer'); } /** * @deprecated used to be a widgetized URL. There to not break widget URLs */ - public function index() + public function getSparklines() { - $_GET['containerId'] = 'VisitOverviewWithGraph'; + $_GET['forceView'] = '1'; + $_GET['viewDataTable'] = Sparklines::ID; - return FrontController::getInstance()->fetchDispatch('CoreHome', 'renderWidgetContainer'); + return FrontController::getInstance()->fetchDispatch('VisitsSummary', 'get'); } public function getEvolutionGraph() |