Dereku/snappymail
0
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-11-03 10:58:50 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

some small cleanups

Browse source
This commit is contained in:
the-djmaze 2026-11-03 00:59:09 +01:00
parent c4f2033368
commit bf90b32b51
4 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
build/plugins.php
View file

@ -150,6 +150,12 @@ foreach (glob(ROOT_DIR . '/plugins/*', GLOB_NOSORT | GLOB_ONLYDIR) as $dir) {
ksort($manifest_item);
$manifest[$name] = $manifest_item;
foreach (glob("{$dir}/*.min.js") as $file) {
unlink($file);
}
foreach (glob("{$dir}/js/*.min.js") as $file) {
unlink($file);
}
} else {
echo "- {$name} {$version}\n";
}

1
dev/Model/FolderCollection.js
View file

@ -502,6 +502,7 @@ export class FolderModel extends AbstractModel {
*/
get fullNameHash() {
return this.fullName.replace(/[^a-z0-9._-]+/giu, b64EncodeJSONSafe);
// return this.fullName.replace(/\/+/g, b64EncodeJSONSafe);
// return /^[a-z0-9._-]+$/iu.test(this.fullName) ? this.fullName : b64EncodeJSONSafe(this.fullName);
}

6
dev/Storage/Client.js
View file

@ -6,7 +6,7 @@ const
try {
const value = localStorage.getItem(CLIENT_SIDE_STORAGE_INDEX_NAME);
return value ? JSON.parse(value) : null;
} catch (e) {
} catch {
return null;
}
};
@ -45,7 +45,7 @@ export function set(key, data) {
try {
localStorage.setItem(CLIENT_SIDE_STORAGE_INDEX_NAME, JSON.stringify(storageResult));
return true;
} catch (e) {
} catch {
return false;
}
}
@ -57,7 +57,7 @@ export function set(key, data) {
export function get(key) {
try {
return (getStorage() || {})['p' + key];
} catch (e) {
} catch {
return null;
}
}

4
plugins/avatars/index.php
View file

@ -30,6 +30,7 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
// https://github.com/the-djmaze/snappymail/issues/714
if ($this->Config()->Get('plugin', 'service', true)
// || !$this->Config()->Get('plugin', 'delay', true)
|| $this->Config()->Get('plugin', 'contacts', false)
|| $this->Config()->Get('plugin', 'gravatar', false)
|| $this->Config()->Get('plugin', 'bimi', false)
|| $this->Config()->Get('plugin', 'favicon', false)
@ -75,7 +76,8 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
}
if (\is_array($mFrom)) {
if (/*!$this->Config()->Get('plugin', 'delay', true)
&& */($this->Config()->Get('plugin', 'gravatar', false)
&& */($this->Config()->Get('plugin', 'contacts', false)
|| $this->Config()->Get('plugin', 'gravatar', false)
|| ($this->Config()->Get('plugin', 'bimi', false) && 'pass' == $mFrom['dkimStatus'])
|| ($this->Config()->Get('plugin', 'favicon', false) && 'pass' == $mFrom['dkimStatus'])
)