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

Improved demo mode plugin

Browse source
This commit is contained in:
djmaze 2021-11-08 17:40:21 +01:00
parent 2f97d4bafb
commit 70f9f0bd76
4 changed files with 14 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/demo-account/index.php
View file

@ -86,7 +86,7 @@ class DemoAccountPlugin extends \RainLoop\Plugins\AbstractPlugin
*/ */
public function MainFabrica($sName, &$oDriver) public function MainFabrica($sName, &$oDriver)
{ {
if (('storage' === $sName || 'storage-local' === $sName) && \function_exists('apcu_store')) { if ('storage' === $sName || 'storage-local' === $sName) {
$oAccount = $this->Manager()->Actions()->GetAccount(); $oAccount = $this->Manager()->Actions()->GetAccount();
if ($this->isDemoAccount($oAccount)) { if ($this->isDemoAccount($oAccount)) {
require_once __DIR__ . '/storage.php'; require_once __DIR__ . '/storage.php';

56
plugins/demo-account/storage.php
View file

@ -2,56 +2,18 @@
class DemoStorage extends \RainLoop\Providers\Storage\FileStorage class DemoStorage extends \RainLoop\Providers\Storage\FileStorage
{ {
/**
* @param \RainLoop\Model\Account|string|null $oAccount
*/
public function Put($oAccount, int $iStorageType, string $sKey, string $sValue) : bool
{
return !!\apcu_store($this->generateFileName($oAccount, $iStorageType, $sKey, true), $sValue);
}
/**
* @param \RainLoop\Model\Account|string|null $oAccount
* @param mixed $mDefault = false
*
* @return mixed
*/
public function Get($oAccount, int $iStorageType, string $sKey, $mDefault = false)
{
$bValue = false;
$mValue = \apcu_fetch($this->generateFileName($oAccount, $iStorageType, $sKey), $bValue);
if (!$bValue)
{
$mValue = $mDefault;
}
return $mValue;
}
/**
* @param \RainLoop\Model\Account|string|null $oAccount
*/
public function Clear($oAccount, int $iStorageType, string $sKey) : bool
{
\apcu_delete($this->generateFileName($oAccount, $iStorageType, $sKey));
return true;
}
/**
* @param \RainLoop\Model\Account|string $oAccount
*/
public function DeleteStorage($oAccount) : bool
{
return !!$oAccount;
}
/** /**
* @param \RainLoop\Model\Account|string|null $mAccount * @param \RainLoop\Model\Account|string|null $mAccount
*/ */
public function generateFileName($mAccount, int $iStorageType, string $sKey, bool $bMkDir = false, bool $bForDeleteAction = false) : string protected function generateFileName($mAccount, int $iStorageType, string $sKey, bool $bMkDir = false, bool $bForDeleteAction = false) : string
{ {
$sFileName = parent::generateFileName($mAccount, $iStorageType, $sKey, false, false); if (\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY === $iStorageType) {
return $sFileName.'/'.\RainLoop\Utils::GetConnectionToken().'/'; return parent::generateFileName($mAccount, $iStorageType, $sKey, $bMkDir, $bForDeleteAction);
}
return $this->sDataPath
.'/demo'
.'/'.static::fixName(\RainLoop\Utils::GetConnectionToken())
.'/'.($sKey ? static::fixName($sKey) : '');
} }
} }

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

@ -828,9 +828,9 @@ class Actions
'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false), 'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false),
'MPP' => (int) $oConfig->Get('webmail', 'messages_per_page', 25), 'MPP' => (int) $oConfig->Get('webmail', 'messages_per_page', 25),
'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5), 'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5),
'SoundNotification' => false, 'SoundNotification' => true,
'NotificationSound' => 'new-mail', 'NotificationSound' => 'new-mail',
'DesktopNotifications' => false, 'DesktopNotifications' => true,
'Layout' => (int) $oConfig->Get('defaults', 'view_layout', Enumerations\Layout::SIDE_PREVIEW), 'Layout' => (int) $oConfig->Get('defaults', 'view_layout', Enumerations\Layout::SIDE_PREVIEW),
'EditorDefaultType' => (string) $oConfig->Get('defaults', 'view_editor_type', ''), 'EditorDefaultType' => (string) $oConfig->Get('defaults', 'view_editor_type', ''),
'UseCheckboxesInList' => (bool) $oConfig->Get('defaults', 'view_use_checkboxes', true), 'UseCheckboxesInList' => (bool) $oConfig->Get('defaults', 'view_use_checkboxes', true),

4
snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php
View file

@ -89,7 +89,7 @@ class FileStorage implements \RainLoop\Providers\Storage\IStorage
* Replace control characters, ampersand, spaces and reserved characters (based on Win95 VFAT) * Replace control characters, ampersand, spaces and reserved characters (based on Win95 VFAT)
* en.wikipedia.org/wiki/Filename#Reserved_characters_and_words * en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
*/ */
private static function fixName($filename) protected static function fixName($filename)
{ {
return \preg_replace('#[|\\\\?*<":>+\\[\\]/&\\s\\pC]#su', '-', $filename); return \preg_replace('#[|\\\\?*<":>+\\[\\]/&\\s\\pC]#su', '-', $filename);
} }
@ -97,7 +97,7 @@ class FileStorage implements \RainLoop\Providers\Storage\IStorage
/** /**
* @param \RainLoop\Model\Account|string|null $mAccount * @param \RainLoop\Model\Account|string|null $mAccount
*/ */
private function generateFileName($mAccount, int $iStorageType, string $sKey, bool $bMkDir = false, bool $bForDeleteAction = false) : string protected function generateFileName($mAccount, int $iStorageType, string $sKey, bool $bMkDir = false, bool $bForDeleteAction = false) : string
{ {
$sEmail = $sSubEmail = ''; $sEmail = $sSubEmail = '';
if (null === $mAccount) { if (null === $mAccount) {