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

Resolve https://github.com/the-djmaze/snappymail/issues/46

Browse source 
Issue from https://github.com/the-djmaze/snappymail/pull/40
And my own broken $upload_max_filesize
This commit is contained in:
djmaze 2020-12-09 22:40:21 +01:00
parent 54f3337f01
commit 21d3a9f401
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1041,10 +1041,9 @@ class Actions
NewThemeLink TemplatesLink LangLink PluginsLink AuthAccountHash NewThemeLink TemplatesLink LangLink PluginsLink AuthAccountHash
*/ */
$upload_max_filesize = \ini_get('upload_max_filesize'); $value = \ini_get('upload_max_filesize');
$size = \strtoupper(\substr($value,-1)); $upload_max_filesize = \intval($value);
$upload_max_filesize = \intval($upload_max_filesize); switch (\strtoupper(\substr($value, -1))) {
switch ($size) {
case 'G': $upload_max_filesize *= 1024; case 'G': $upload_max_filesize *= 1024;
case 'M': $upload_max_filesize *= 1024; case 'M': $upload_max_filesize *= 1024;
case 'K': $upload_max_filesize *= 1024; case 'K': $upload_max_filesize *= 1024;

5
snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php
View file

@ -130,9 +130,12 @@ class Identities extends AbstractProvider
$identities = []; $identities = [];
foreach ($this->drivers as $driver) { foreach ($this->drivers as $driver) {
// Merge and replace by key // Merge and replace by key
foreach ($identitiesPerDriver[$driver->Name()] as $identity) if (isset($identitiesPerDriver[$driver->Name()])) {
foreach ($identitiesPerDriver[$driver->Name()] as $identity) {
$identities[$identity->Id(true)] = $identity; $identities[$identity->Id(true)] = $identity;
} }
}
}
return \array_values($identities); return \array_values($identities);
} }