From 6e6dd31ad48794482dd247a4d3b2cf9a0ebef102 Mon Sep 17 00:00:00 2001 From: RainLoop Team Date: Wed, 13 Jul 2016 22:48:18 +0300 Subject: [PATCH] Fix set_time_limit system policy error (#1103) --- rainloop/v/0.0.0/app/libraries/MailSo/Base/Utils.php | 7 ++++++- rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) 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 a112ccc82..7eeebfcd4 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 @@ -1292,7 +1292,12 @@ END; if ($bValidateAction && $iTimeToReset < \time() - $iResetTimer) { $iResetTimer = \time(); - \set_time_limit($iTimeToAdd); + if (!@\set_time_limit($iTimeToAdd)) + { + $bValidateAction = false; + return false; + } + return true; } diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php index c9e4d3fb3..0bfdc54d0 100644 --- a/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php +++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php @@ -4690,7 +4690,7 @@ NewThemeLink IncludeCss LoadingDescriptionEsc TemplatesLink LangLink IncludeBack $iCode = 0; $sContentType = ''; - @\set_time_limit(90); + @\set_time_limit(120); $oHttp = \MailSo\Base\Http::SingletonInstance(); $bResult = $oHttp->SaveUrlToFile($sUrl, $pDest, $sTmp, $sContentType, $iCode, $this->Logger(), 60,