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:
authormattab <matthieu.aubry@gmail.com>2013-09-14 04:14:23 +0400
committermattab <matthieu.aubry@gmail.com>2013-09-14 04:14:23 +0400
commitcf279bc8aa095c849932182bd3eb1c60ed9f67a3 (patch)
treeab8230b7e4e7b46065c079d3bfdaf3d28c443978 /plugins/Overlay
parentdf470ed7170e4b323b4623fd55453abc2d7810ad (diff)
ProxyHttp class until I find a better name
Diffstat (limited to 'plugins/Overlay')
-rw-r--r--plugins/Overlay/Controller.php11
1 files changed, 6 insertions, 5 deletions
diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php
index 3721c9b226..128ba12e6b 100644
--- a/plugins/Overlay/Controller.php
+++ b/plugins/Overlay/Controller.php
@@ -11,14 +11,15 @@
namespace Piwik\Plugins\Overlay;
use Piwik\API\Request;
+use Piwik\Common;
+use Piwik\Config;
use Piwik\Metrics;
use Piwik\Piwik;
-use Piwik\Config;
-use Piwik\Common;
use Piwik\Plugins\Actions\ArchivingHelper;
+use Piwik\Plugins\SitesManager\API;
+use Piwik\ProxyHttp;
use Piwik\Tracker\Action;
use Piwik\View;
-use Piwik\Plugins\SitesManager\API;
class Controller extends \Piwik\Controller
{
@@ -41,7 +42,7 @@ class Controller extends \Piwik\Controller
$view->date = Common::getRequestVar('date', 'today');
$view->period = Common::getRequestVar('period', 'day');
- $view->ssl = Piwik::isHttps();
+ $view->ssl = ProxyHttp::isHttps();
echo $view->render();
}
@@ -137,7 +138,7 @@ class Controller extends \Piwik\Controller
<html><head><title></title></head><body>
<script type="text/javascript">
function handleProtocol(url) {
- if (' . (Piwik::isHttps() ? 'true' : 'false') . ') {
+ if (' . (ProxyHttp::isHttps() ? 'true' : 'false') . ') {
return url.replace(/http:\/\//i, "https://");
} else {
return url.replace(/https:\/\//i, "http://");