Only change max execution time if it's not already infinite or more.

Author: nickygerritsen

webapp/src/Controller/Jury/ProblemController.php

@@ -262,7 +262,7 @@ public function sampleZipAction(int $probId): StreamedResponse
     public function exportAction(int $problemId): StreamedResponse
     {
         // This might take a while.
-        ini_set('max_execution_time', '300');
+        Utils::extendMaxExecutionTime(300);
         /** @var Problem $problem */
         $problem = $this->em->createQueryBuilder()
             ->from(Problem::class, 'p')

webapp/src/Service/ImportProblemService.php

@@ -62,7 +62,7 @@ public function importZippedProblem(
         ?array &$messages = []
     ): ?Problem {
         // This might take a while.
-        ini_set('max_execution_time', '300');
+        Utils::extendMaxExecutionTime(300);
 
         foreach (['info', 'warning', 'danger'] as $type) {
             $messages[$type] = [];

webapp/src/Service/RejudgingService.php

@@ -193,7 +193,7 @@ public function createRejudging(
     public function finishRejudging(Rejudging $rejudging, string $action, ?callable $progressReporter = null): bool
     {
         // This might take a while.
-        ini_set('max_execution_time', '300');
+        Utils::extendMaxExecutionTime(300);
 
         if ($rejudging->getEndtime()) {
             $error = sprintf('Error: rejudging already %s.', $rejudging->getValid() ? 'applied' : 'canceled');

webapp/src/Service/ScoreboardService.php

@@ -604,7 +604,7 @@ public static function getICPCScoreKey(int $numSolved, int $totalTime, int $time
      */
     public function refreshCache(Contest $contest, ?callable $progressReporter = null): void
     {
-        ini_set('max_execution_time', 300);
+        Utils::extendMaxExecutionTime(300);
 
         $this->dj->auditlog('contest', $contest->getCid(), 'refresh scoreboard cache');
 

webapp/src/Utils/Utils.php

@@ -737,7 +737,7 @@ public static function sanitizeSvg(string $svgContents): string | false
         $sanitizer = new SvgSanitizer();
         $sanitizer->removeRemoteReferences(true);
         $sanitizer->minify(true);
-        
+
         return $sanitizer->sanitize($svgContents);
     }
 
@@ -1008,4 +1008,12 @@ public static function parseMetadata(string $raw_metadata): array
 
         return $res;
     }
+
+    public static function extendMaxExecutionTime(int $minimumMaxExecutionTime): void
+    {
+        $maxExecutionTime = (int)ini_get('max_execution_time');
+        if ($maxExecutionTime !== 0 && $maxExecutionTime < $minimumMaxExecutionTime) {
+            ini_set('max_execution_time', $minimumMaxExecutionTime);
+        }
+    }
 }