diff options
author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-11-13 05:15:51 +0300 |
---|---|---|
committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-11-13 05:30:34 +0300 |
commit | c9d698f4fb8f9ed683bc737b7991edb3793fa498 (patch) | |
tree | fbacb0525496ea3505f144c876f65338e80ce1bc /plugins/ImageGraph | |
parent | c831518f45f2e75dce59639e7a2a10a90a830c91 (diff) |
Moved the `tmp/` path into the config (was hardcoded everywhere)
The `tmp/` path was hardcoded everywhere, which resulted in using `SettingsPiwik::rewriteTmpPathWithInstanceId()` to rewrite it for specific use cases.
I've moved that path into the config, and replaced all hardcoded usage (and calls to `rewriteTmpPathWithInstanceId()`) by a `get()` from the container.
Getting entries from the container is a bad practice and dependency injection should be preferred, but we do baby steps. When refactoring those classes to DI, we'll replace calls to the container with proper dependency injection.
Another thing we'll need to do too is move the hardcoded *sub-path* of `tmp/` (e.g. `tmp/sessions/`) into the config also (but again: baby steps).
Another future step would be to remove completely instance ID and let it be handled by a plugin (or by end-user config). Having the `tmp/` path in the config means that plugins or users can override it and know it will be taken into account everywhere in Piwik.
Diffstat (limited to 'plugins/ImageGraph')
-rw-r--r-- | plugins/ImageGraph/StaticGraph.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/plugins/ImageGraph/StaticGraph.php b/plugins/ImageGraph/StaticGraph.php index d9aeeabe67..f9bb63c6bf 100644 --- a/plugins/ImageGraph/StaticGraph.php +++ b/plugins/ImageGraph/StaticGraph.php @@ -12,8 +12,8 @@ namespace Piwik\Plugins\ImageGraph; use Exception; use pData; use pImage; +use Piwik\Container\StaticContainer; use Piwik\Piwik; -use Piwik\SettingsPiwik; use Piwik\BaseFactory; require_once PIWIK_INCLUDE_PATH . "/libs/pChart2.1.3/class/pDraw.class.php"; @@ -229,8 +229,7 @@ abstract class StaticGraph extends BaseFactory */ protected static function getOutputPath($filename) { - $outputFilename = PIWIK_USER_PATH . '/tmp/assets/' . $filename; - $outputFilename = SettingsPiwik::rewriteTmpPathWithInstanceId($outputFilename); + $outputFilename = StaticContainer::getContainer()->get('path.tmp') . '/assets/' . $filename; @chmod($outputFilename, 0600); @unlink($outputFilename); |