diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Loader.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Loader.php index e54f8a33e..0a58e5517 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Loader.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Loader.php @@ -22,6 +22,16 @@ class Loader */ public static $StoreStatistic = true; + /** + * @var int + */ + public static $InitTime = 0; + + /** + * @var float + */ + public static $InitMicrotimeTime = 0; + /** * @var array */ @@ -43,7 +53,11 @@ class Loader if (!$bIsInited) { $bIsInited = true; - self::SetStatistic('Inited', \microtime(true)); + + self::$InitTime = \time(); + self::$InitMicrotimeTime = \microtime(true); + + self::SetStatistic('Inited', self::$InitMicrotimeTime); } } diff --git a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php index 7eeebfcd4..6c1fc8bba 100644 --- a/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php +++ b/rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php @@ -1276,6 +1276,13 @@ END; */ public static function ResetTimeLimit($iTimeToReset = 15, $iTimeToAdd = 120) { + $iTime = \time(); + if ($iTime < \MailSo\Base\Loader::$InitTime + 5) + { + // do nothing first 5s + return true; + } + static $bValidateAction = null; static $iResetTimer = null; @@ -1289,9 +1296,9 @@ END; $bValidateAction = !$bSafeMode && \MailSo\Base\Utils::FunctionExistsAndEnabled('set_time_limit'); } - if ($bValidateAction && $iTimeToReset < \time() - $iResetTimer) + if ($bValidateAction && $iTimeToReset < $iTime - $iResetTimer) { - $iResetTimer = \time(); + $iResetTimer = $iTime; if (!@\set_time_limit($iTimeToAdd)) { $bValidateAction = false; diff --git a/rainloop/v/0.0.0/app/localization/webmail/_source.en.yml b/rainloop/v/0.0.0/app/localization/webmail/_source.en.yml index 9d9a4e2d9..4e21a8da0 100644 --- a/rainloop/v/0.0.0/app/localization/webmail/_source.en.yml +++ b/rainloop/v/0.0.0/app/localization/webmail/_source.en.yml @@ -528,7 +528,7 @@ en: SETTINGS_FOLDERS: LEGEND_FOLDERS: "Folder List" BUTTON_CREATE: "Create Folder" - BUTTON_SYSTEM: "Select System Folders" + BUTTON_SYSTEM: "System Folders" BUTTON_DELETE: "Delete" BUTTON_SUBSCRIBE: "Subscribe" BUTTON_UNSUBSCRIBE: "Unsubscribe" diff --git a/rainloop/v/0.0.0/themes/Clear/styles.less b/rainloop/v/0.0.0/themes/Clear/styles.less index 84360436e..fbca4f5dc 100644 --- a/rainloop/v/0.0.0/themes/Clear/styles.less +++ b/rainloop/v/0.0.0/themes/Clear/styles.less @@ -1,3 +1,3 @@ -@spinner-background: rgba(255,255,255,.5); +@spinner-background: rgba(255,255,255,.4); @spinner-color: #666; diff --git a/rainloop/v/0.0.0/themes/Mobile/styles.less b/rainloop/v/0.0.0/themes/Mobile/styles.less index 84360436e..fbca4f5dc 100644 --- a/rainloop/v/0.0.0/themes/Mobile/styles.less +++ b/rainloop/v/0.0.0/themes/Mobile/styles.less @@ -1,3 +1,3 @@ -@spinner-background: rgba(255,255,255,.5); +@spinner-background: rgba(255,255,255,.4); @spinner-color: #666; diff --git a/rainloop/v/0.0.0/themes/Wood/styles.less b/rainloop/v/0.0.0/themes/Wood/styles.less index 0e574704b..b70c203f3 100644 --- a/rainloop/v/0.0.0/themes/Wood/styles.less +++ b/rainloop/v/0.0.0/themes/Wood/styles.less @@ -15,7 +15,7 @@ @login-border: none; @login-border-radius: 7px; -@spinner-background: rgba(255,255,255,.5); +@spinner-background: rgba(255,255,255,.4); @spinner-color: #666; // MENU