From c85d0c5e0e84c66871c861f994e81e9fa6470dee Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 May 2013 09:15:21 +0200 Subject: php-tcpdf: 1 cache dir per user --- php-tcpdf_config.patch | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) (limited to 'php-tcpdf_config.patch') diff --git a/php-tcpdf_config.patch b/php-tcpdf_config.patch index bb6f5a2..10cd020 100644 --- a/php-tcpdf_config.patch +++ b/php-tcpdf_config.patch @@ -1,6 +1,6 @@ -diff -up ./config/tcpdf_config_alt.php.config ./config/tcpdf_config_alt.php ---- ./config/tcpdf_config_alt.php.config 2013-04-21 21:15:04.000000000 +0200 -+++ ./config/tcpdf_config_alt.php 2013-05-09 16:47:02.868144489 +0200 +diff -up tcpdf/config/tcpdf_config_alt.php.config tcpdf/config/tcpdf_config_alt.php +--- tcpdf/config/tcpdf_config_alt.php.config 2013-04-21 21:15:04.000000000 +0200 ++++ tcpdf/config/tcpdf_config_alt.php 2013-05-10 08:52:56.098202050 +0200 @@ -61,7 +61,7 @@ if (substr($k_path_main, -1) != '/') { * Installation path (/var/www/tcpdf/). * By default it is automatically calculated but you can also set it as a fixed string to improve performances. @@ -10,18 +10,23 @@ diff -up ./config/tcpdf_config_alt.php.config ./config/tcpdf_config_alt.php // Automatic calculation for the following K_PATH_URL constant if (isset($_SERVER['HTTP_HOST']) AND (!empty($_SERVER['HTTP_HOST']))) { -@@ -89,7 +89,7 @@ define ('K_PATH_FONTS', K_PATH_MAIN.'fon +@@ -89,7 +89,12 @@ define ('K_PATH_FONTS', K_PATH_MAIN.'fon /** * cache directory for temporary files (full path) */ -define ('K_PATH_CACHE', K_PATH_MAIN.'cache/'); -+define ('K_PATH_CACHE', '/var/cache/php-tcpdf/'); ++$k_path_cache = '/var/cache/php-tcpdf/'.posix_getuid().'/'; ++if (is_dir($k_path_cache) && is_writable($k_path_cache)) { ++ define ('K_PATH_CACHE', $k_path_cache); ++} else { ++ define ('K_PATH_CACHE', sys_get_temp_dir().'/'); ++} /** * cache directory for temporary files (url path) -diff -up ./config/tcpdf_config.php.config ./config/tcpdf_config.php ---- ./config/tcpdf_config.php.config 2013-04-21 21:15:04.000000000 +0200 -+++ ./config/tcpdf_config.php 2013-05-09 16:46:46.391084498 +0200 +diff -up tcpdf/config/tcpdf_config.php.config tcpdf/config/tcpdf_config.php +--- tcpdf/config/tcpdf_config.php.config 2013-04-21 21:15:04.000000000 +0200 ++++ tcpdf/config/tcpdf_config.php 2013-05-10 08:55:59.206957827 +0200 @@ -65,7 +65,7 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) * Installation path (/var/www/tcpdf/). * By default it is automatically calculated but you can also set it as a fixed string to improve performances. @@ -31,18 +36,23 @@ diff -up ./config/tcpdf_config.php.config ./config/tcpdf_config.php // Automatic calculation for the following K_PATH_URL constant $k_path_url = $k_path_main; // default value for console mode -@@ -94,7 +94,7 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) +@@ -94,7 +94,12 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) /** * cache directory for temporary files (full path) */ - define ('K_PATH_CACHE', K_PATH_MAIN.'cache/'); -+ define ('K_PATH_CACHE', '/var/cache/php-tcpdf/'); ++ $k_path_cache = '/var/cache/php-tcpdf/'.posix_getuid().'/'; ++ if (is_dir($k_path_cache) && is_writable($k_path_cache)) { ++ define ('K_PATH_CACHE', $k_path_cache); ++ } else { ++ define ('K_PATH_CACHE', sys_get_temp_dir().'/'); ++ } /** * cache directory for temporary files (url path) -diff -up ./tcpdf.php.config ./tcpdf.php ---- ./tcpdf.php.config 2013-05-09 16:43:00.199254100 +0200 -+++ ./tcpdf.php 2013-05-09 16:43:00.212254149 +0200 +diff -up tcpdf/tcpdf.php.config tcpdf/tcpdf.php +--- tcpdf/tcpdf.php.config 2013-05-10 08:52:06.656998071 +0200 ++++ tcpdf/tcpdf.php 2013-05-10 08:52:06.669998125 +0200 @@ -144,7 +144,7 @@ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) { -- cgit