Refactoring ProxyStaticFile class:

Small static file server proxy, with compression, caching.
 Used to server piwik.js and the merged+minified CSS and JS files

1 files changed, 6 insertions, 5 deletions

diff --git a/plugins/Proxy/Controller.php b/plugins/Proxy/Controller.php
index af251fe32a..9378a6f3e1 100644
--- a/plugins/Proxy/Controller.php
+++ b/plugins/Proxy/Controller.php
@@ -10,9 +10,10 @@
  */
 namespace Piwik\Plugins\Proxy;
 
-use Piwik\Piwik;
-use Piwik\Common;
 use Piwik\AssetManager;
+use Piwik\Common;
+use Piwik\Piwik;
+use Piwik\ProxyStaticFile;
 use Piwik\Url;
 
 /**
@@ -34,7 +35,7 @@ class Controller extends \Piwik\Controller
     public function getCss()
     {
         $cssMergedFile = AssetManager::getMergedCssFileLocation();
-        Piwik::serveStaticFile($cssMergedFile, "text/css");
+        ProxyStaticFile::serveFile($cssMergedFile, "text/css");
     }
 
     /**
@@ -46,7 +47,7 @@ class Controller extends \Piwik\Controller
     public function getJs()
     {
         $jsMergedFile = AssetManager::getMergedJsFileLocation();
-        Piwik::serveStaticFile($jsMergedFile, self::JS_MIME_TYPE);
+        ProxyStaticFile::serveFile($jsMergedFile, self::JS_MIME_TYPE);
     }
 
     /**
@@ -64,7 +65,7 @@ class Controller extends \Piwik\Controller
         AssetManager::removeTranslationsJsFile();
         
         $translationsJsFile = AssetManager::getTranslationsJsFileLocation();
-        Piwik::serveStaticFile($translationsJsFile, self::JS_MIME_TYPE);
+        ProxyStaticFile::serveFile($translationsJsFile, self::JS_MIME_TYPE);
     }
 
     /**