diff options
author | Fabian Becker <fabian.becker@uni-tuebingen.de> | 2013-07-18 13:45:02 +0400 |
---|---|---|
committer | Fabian Becker <fabian.becker@uni-tuebingen.de> | 2013-07-18 13:45:02 +0400 |
commit | 03b4953f008c1063e6d7166143ba844e8c6e89cc (patch) | |
tree | 7b9f0fef13d75417c551f813c98dba1a22f2fff3 /plugins/Proxy | |
parent | 9b2c0a7a450fff3b634f8119c8003ae1d20b97d0 (diff) |
Refactor class Piwik_Common to \Piwik\Core\Common
Notice that auto refactoring has created a nested namespace. Not sure this is what we want - so we might have to edit those nested namespaces afterwards (I think they don't look so good)
Diffstat (limited to 'plugins/Proxy')
-rw-r--r-- | plugins/Proxy/Controller.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php index cac2e2505e..b97e61471c 100644 --- a/plugins/Proxy/Controller.php +++ b/plugins/Proxy/Controller.php @@ -9,7 +9,7 @@ * @package Piwik_Proxy */ use Piwik\Core\Piwik; -use Piwik\Core\Piwik_Common; +use Piwik\Core\Common; /** * Controller for proxy services @@ -32,7 +32,7 @@ class Piwik_Proxy_Controller extends Piwik_Controller Piwik::checkUserHasSomeViewAccess(); $view = new Piwik_View('@Proxy/exportImageWindow'); - $view->imageData = 'data:image/png;base64,' . Piwik_Common::getRequestVar('imageData', self::TRANSPARENT_PNG_PIXEL, 'string', $_POST); + $view->imageData = 'data:image/png;base64,' . Common::getRequestVar('imageData', self::TRANSPARENT_PNG_PIXEL, 'string', $_POST); echo $view->render(); } @@ -52,13 +52,13 @@ class Piwik_Proxy_Controller extends Piwik_Controller { Piwik::checkUserHasSomeViewAccess(); - $rawData = Piwik_Common::getRequestVar('imageData', '', 'string', $_POST); + $rawData = Common::getRequestVar('imageData', '', 'string', $_POST); // returns false if any illegal characters in input $data = base64_decode($rawData); if ($data !== false) { // check for PNG header - if (Piwik_Common::substr($data, 0, 8) === "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a") { + if (Common::substr($data, 0, 8) === "\x89\x50\x4e\x47\x0d\x0a\x1a\x0a") { header('Content-Type: image/png'); // more robust validation (if available) @@ -119,7 +119,7 @@ class Piwik_Proxy_Controller extends Piwik_Controller */ public function redirect() { - $url = Piwik_Common::getRequestVar('url', '', 'string', $_GET); + $url = Common::getRequestVar('url', '', 'string', $_GET); // validate referrer $referrer = Piwik_Url::getReferer(); @@ -135,7 +135,7 @@ class Piwik_Proxy_Controller extends Piwik_Controller if (!self::isPiwikUrl($url)) { Piwik::checkUserHasSomeViewAccess(); } - if (!Piwik_Common::isLookLikeUrl($url)) { + if (!Common::isLookLikeUrl($url)) { die('Please check the &url= parameter: it should to be a valid URL'); } @header('Content-Type: text/html; charset=utf-8'); |