Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-07-13 03:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert #113 and #116 with a compatibility fix

Browse source
This commit is contained in:
djmaze 2021-08-23 11:50:27 +02:00
parent 881528d2ee
commit 8f1d96e86f
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/Redis.php
View file

@ -18,11 +18,6 @@ namespace MailSo\Cache\Drivers;
*/ */
class Redis implements \MailSo\Cache\DriverInterface class Redis implements \MailSo\Cache\DriverInterface
{ {
/**
* @var string
*/
private $sUrl;
/** /**
* @var int * @var int
*/ */
@ -38,16 +33,19 @@ class Redis implements \MailSo\Cache\DriverInterface
*/ */
private $sKeyPrefix; private $sKeyPrefix;
function __construct(string $sUrl = 'redis://127.0.0.1:6379', int $iExpire = 43200, string $sKeyPrefix = '')
function __construct(string $sHost = '127.0.0.1', int $iPort = 6379, int $iExpire = 43200, string $sKeyPrefix = '')
{ {
$this->sUrl = $sUrl;
$this->iExpire = 0 < $iExpire ? $iExpire : 43200; $this->iExpire = 0 < $iExpire ? $iExpire : 43200;
$this->oRedis = null; $this->oRedis = null;
try try
{ {
$this->oRedis = new \Predis\Client($sUrl); $this->oRedis = new \Predis\Client(\strpos($sHost, ':/') ? $sHost : array(
'host' => $sHost,
'port' => $iPort
));
$this->oRedis->connect(); $this->oRedis->connect();

3
snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -706,7 +706,8 @@ class Actions
case 'REDIS' === $sDriver && \class_exists('Predis\Client'): case 'REDIS' === $sDriver && \class_exists('Predis\Client'):
$oDriver = new \MailSo\Cache\Drivers\Redis( $oDriver = new \MailSo\Cache\Drivers\Redis(
$this->Config()->Get('labs', 'fast_cache_redis_url', 'tcp://127.0.0.1:6379'), $this->Config()->Get('labs', 'fast_cache_redis_host', '127.0.0.1'),
(int) $this->Config()->Get('labs', 'fast_cache_redis_port', 6379),
43200, 43200,
$sKey $sKey
); );

3
snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
View file

@ -367,7 +367,8 @@ Enables caching in the system'),
'http_client_ip_check_proxy' => array(false), 'http_client_ip_check_proxy' => array(false),
'fast_cache_memcache_host' => array('127.0.0.1'), 'fast_cache_memcache_host' => array('127.0.0.1'),
'fast_cache_memcache_port' => array(11211), 'fast_cache_memcache_port' => array(11211),
'fast_cache_redis_url' => array('tcp://127.0.0.1:6379'), 'fast_cache_redis_host' => array('127.0.0.1'),
'fast_cache_redis_port' => array(6379),
'use_local_proxy_for_external_images' => array(true), 'use_local_proxy_for_external_images' => array(true),
'detect_image_exif_orientation' => array(true), 'detect_image_exif_orientation' => array(true),
'cookie_default_path' => array(''), 'cookie_default_path' => array(''),