From e4e26d799c68aacc81a48dc35269c32de51fcdaa Mon Sep 17 00:00:00 2001 From: djmaze Date: Tue, 30 Nov 2021 11:18:52 +0100 Subject: [PATCH] Update demo plugin --- plugins/demo-account/storage.php | 4 ++-- snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/demo-account/storage.php b/plugins/demo-account/storage.php index 92d55b123..4391e0e2b 100644 --- a/plugins/demo-account/storage.php +++ b/plugins/demo-account/storage.php @@ -16,9 +16,9 @@ class DemoStorage extends \RainLoop\Providers\Storage\FileStorage \MailSo\Base\Utils::RecRmDir("{$this->sDataPath}/demo"); } - $sDataPath .= '/' . static::fixName(\RainLoop\Utils::GetConnectionToken()); + $sDataPath .= '/' . \RainLoop\Utils::fixName(\RainLoop\Utils::GetConnectionToken()); \is_dir($sDataPath) || \mkdir($sDataPath, 0700, true); - return $sDataPath . '/' . ($sKey ? static::fixName($sKey) : ''); + return $sDataPath . '/' . ($sKey ? \RainLoop\Utils::fixName($sKey) : ''); } } diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php index 366ec3780..eec2e12c2 100644 --- a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php +++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php @@ -245,7 +245,7 @@ class Utils * Replace control characters, ampersand, spaces and reserved characters (based on Win95 VFAT) * en.wikipedia.org/wiki/Filename#Reserved_characters_and_words */ - public static function fixName($filename) + public static function fixName(string $filename) : string { return \preg_replace('#[|\\\\?*<":>+\\[\\]/&\\s\\pC]#su', '-', $filename); }