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:
authorPeter Zhang <peter@innocraft.com>2022-05-18 01:12:21 +0300
committerGitHub <noreply@github.com>2022-05-18 01:12:21 +0300
commit35957fc5aeecf9f6f795e4e8e005f9d37fab7a2d (patch)
treeea88e41c8643d469bdb0352e492d401ae5bdc09a /plugins/UsersManager
parent3860159eaa190561896dcade11268193b4b4630b (diff)
[security] Force matomo.org related requests to use ssl as default (#19098)
* Update dataTable.js update database table * Update dataTable.js update table bug * Update dataTable.js shorter the query * update screenshot update screenshot * Update dataTable.js make table size stable * Revert "Update dataTable.js" This reverts commit 1a72e1d9580172414fb147cda9e66f4927f4b2ae. * Update dataTable.js update columns * Revert "update screenshot" This reverts commit c11aec88af44668171d2ee14e7a502b5fb04126f. * force ssl to api and plug force ssl to api and plug * force request to ssl force request to ssl * Update Http.php update tests * update tests update condition only on matomo.org * update checks update checks * update default to https update default to https * update phpcs check update phpcs check * Update plugins/Marketplace/config/config.php * add config force ssl on market place add config force ssl on market place * Update plugins/Marketplace/config/config.php Co-authored-by: Justin Velluppillai <justin@innocraft.com> * update config update config * update config update config * built vue files * remove double diagnostic remove double diagnostic * force api using https force api using https * update tests update tests * update feed back update feed back * Remove unused use * update failed display message update failed display message * Update plugins/CoreUpdater/Diagnostic/HttpsUpdateCheck.php Co-authored-by: Justin Velluppillai <justin@innocraft.com> * Minor text tweak * update hardcode to translation update hardcode to translation * update translation update translation * update language and some logic update language and some logic * run test run test * trigger test trigger test * update screenshot update screenshot Co-authored-by: sgiehl <stefan@matomo.org> Co-authored-by: Justin Velluppillai <justin@innocraft.com> Co-authored-by: peterhashair <peterhashair@users.noreply.github.com> Co-authored-by: Ben Burgess <88810029+bx80@users.noreply.github.com>
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r--plugins/UsersManager/NewsletterSignup.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/UsersManager/NewsletterSignup.php b/plugins/UsersManager/NewsletterSignup.php
index 3e8be85a89..f1d38a31ae 100644
--- a/plugins/UsersManager/NewsletterSignup.php
+++ b/plugins/UsersManager/NewsletterSignup.php
@@ -10,10 +10,10 @@
namespace Piwik\Plugins\UsersManager;
use Exception;
-use Piwik\Config;
use Piwik\Container\StaticContainer;
use Piwik\Http;
use Piwik\Option;
+use Piwik\Plugins\Marketplace\Api\Client;
use Piwik\SettingsPiwik;
class NewsletterSignup
@@ -28,7 +28,7 @@ class NewsletterSignup
return false;
}
- $url = Config::getInstance()->General['api_service_url'];
+ $url = Client::getApiServiceUrl();
$url .= '/1.0/subscribeNewsletter/';
$params = array(