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

Resolve #538

Browse source
This commit is contained in:
the-djmaze 2022-10-02 15:19:23 +02:00
parent e623351d24
commit 23bbd10b9a
5 changed files with 25 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

1
dev/boot.js
View file

@ -18,6 +18,7 @@ const
script.onload = () => resolve(); script.onload = () => resolve();
script.onerror = () => reject(new Error('Failed loading ' + src)); script.onerror = () => reject(new Error('Failed loading ' + src));
script.src = src; script.src = src;
// script.async = true;
doc.head.append(script); doc.head.append(script);
}); });
}; };

21
snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
View file

@ -198,22 +198,17 @@ abstract class Service
if ($sResult) { if ($sResult) {
$sResult .= '<!--cached-->'; $sResult .= '<!--cached-->';
} else { } else {
$aTemplateParameters['{{BaseAppThemeCss}}'] = $oActions->compileCss($oActions->GetTheme($bAdmin), $bAdmin);
$aTemplateParameters['{{BaseLanguage}}'] = $oActions->compileLanguage($sLanguage, $bAdmin);
$aTemplateParameters['{{BaseTemplates}}'] = $oServiceActions->compileTemplates($bAdmin);
$aTemplateParameters['{{BaseAppBootCss}}'] = \file_get_contents(APP_VERSION_ROOT_PATH.'static/css/boot'.$sAppCssMin.'.css'); $aTemplateParameters['{{BaseAppBootCss}}'] = \file_get_contents(APP_VERSION_ROOT_PATH.'static/css/boot'.$sAppCssMin.'.css');
$aTemplateParameters['{{BaseAppBootScript}}'] = \file_get_contents(APP_VERSION_ROOT_PATH.'static/js'.($sAppJsMin ? '/min' : '').'/boot'.$sAppJsMin.'.js'); $aTemplateParameters['{{BaseAppBootScript}}'] = \file_get_contents(APP_VERSION_ROOT_PATH.'static/js'.($sAppJsMin ? '/min' : '').'/boot'.$sAppJsMin.'.js');
$sResult = \strtr(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/Index.html'), $aTemplateParameters); $aTemplateParameters['{{BaseAppThemeCss}}'] = \preg_replace(
'/\\s*([:;{},]+)\\s*/s',
if ($sAppJsMin || $sAppCssMin) { '$1',
$sResult = \preg_replace( $oActions->compileCss($oActions->GetTheme($bAdmin), $bAdmin)
['@\\s*/>@', '/\\s*&nbsp;/i', '/&nbsp;\\s*/i', '/>\\s+</'],
['>', "\xC2\xA0", "\xC2\xA0", '><'],
\trim($sResult)
); );
} else { $aTemplateParameters['{{BaseLanguage}}'] = $oActions->compileLanguage($sLanguage, $bAdmin);
$sResult = Utils::ClearHtmlOutput($sResult); $aTemplateParameters['{{BaseTemplates}}'] = Utils::ClearHtmlOutput($oServiceActions->compileTemplates($bAdmin));
} $sResult = Utils::ClearHtmlOutput(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/Index.html'));
$sResult = \strtr($sResult, $aTemplateParameters);
if ($sCacheFileName) { if ($sCacheFileName) {
$oActions->Cacher()->Set($sCacheFileName, $sResult); $oActions->Cacher()->Set($sCacheFileName, $sResult);
} }

2
snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
View file

@ -864,7 +864,7 @@ class ServiceActions
foreach ($aTemplates as $sName => $sFile) { foreach ($aTemplates as $sName => $sFile) {
$sName = \preg_replace('/[^a-zA-Z0-9]/', '', $sName); $sName = \preg_replace('/[^a-zA-Z0-9]/', '', $sName);
$sHtml .= '<template id="'.$sName.'">' $sHtml .= '<template id="'.$sName.'">'
. Utils::ClearHtmlOutput(\preg_replace('/<(\/?)script/i', '<$1x-script', \file_get_contents($sFile))) . \preg_replace('/<(\/?)script/i', '<$1x-script', \file_get_contents($sFile))
. '</template>'; . '</template>';
} }

8
snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
View file

@ -82,11 +82,11 @@ class Utils
public static function ClearHtmlOutput(string $sHtml) : string public static function ClearHtmlOutput(string $sHtml) : string
{ {
// return $sHtml; // return $sHtml;
return \preg_replace( return \preg_replace('/>\\s+</', '><', \preg_replace(
['@\\s*/>@', '/\\s*&nbsp;/i', '/&nbsp;\\s*/i', '/[\\r\\n\\t]+/', '/>\\s+</'], ['@\\s*/>@', '/\\s*&nbsp;/i', '/&nbsp;\\s*/i', '/[\\r\\n\\t]+/'],
['>', "\xC2\xA0", "\xC2\xA0", ' ', '><'], ['>', "\xC2\xA0", "\xC2\xA0", ' '],
\trim($sHtml) \trim($sHtml)
); ));
} }
/** /**