From b3e25ac14bb1be17f073e1f71c1225d5124dfa9e Mon Sep 17 00:00:00 2001 From: Jeroen De Meerleer Date: Sat, 2 Jul 2022 11:33:42 +0200 Subject: [PATCH] BUGFIX: demo mode was always activated --- src/Repository/JobRepository.php | 14 +++++++------- templates/flashes.html.twig | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Repository/JobRepository.php b/src/Repository/JobRepository.php index bc439f0..586c75f 100644 --- a/src/Repository/JobRepository.php +++ b/src/Repository/JobRepository.php @@ -187,7 +187,7 @@ class JobRepository extends EntityRepository */ private function runHttpJob(Job &$job): array { - if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE']) { + if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE'] == 'true') { $exitcodes = [...array_fill(0,120, $job->getData('http-status')[0]), ...array_keys(Response::$statusTexts)]; $return['exitcode'] = $exitcodes[random_int(0, 181)]; $return['failed'] = !in_array($return['exitcode'], $job->getData('http-status')); @@ -228,8 +228,8 @@ class JobRepository extends EntityRepository */ private function runCommandJob(Job &$job): array { - if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE']) { - $exitcodes = [...array_fill(0,400, $job->getData('response')), ...range(0, 255)]; + if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE'] == 'true') { + $exitcodes = [...array_fill(0,400, $job->getData('response')[0]), ...range(0, 255)]; $return['exitcode'] = $exitcodes[random_int(0, 655)]; $return['failed'] = !in_array($return['exitcode'], $job->getData('response')); $return['output'] = 'Demo mode!'; @@ -321,7 +321,7 @@ class JobRepository extends EntityRepository { $em = $this->getEntityManager(); if($job->getRunning() == 1) { - if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE']) { + if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE'] == 'true') { $job->setRunning(time() + $job->getData('reboot-delay-secs') + ($job->getData('reboot-duration') * 60)); $em->persist($job); $em->flush(); @@ -362,8 +362,8 @@ class JobRepository extends EntityRepository if($job->getRunning() > time()) { return ['status' => 'deferred']; } - if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE']) { - $exitcodes = [...array_fill(0,400, $job->getData('getservices-response')), ...range(0, 255)]; + if(isset($_ENV['DEMO_MODE']) && $_ENV['DEMO_MODE'] == 'true') { + $exitcodes = [...array_fill(0,400, $job->getData('getservices-response')[0]), ...range(0, 255)]; $return['exitcode'] = $exitcodes[random_int(0, 655)]; $return['failed'] = !in_array($return['exitcode'], $job->getData('getservices-response')); $return['output'] = 'Demo mode!'; @@ -717,4 +717,4 @@ class JobRepository extends EntityRepository return ['success' => true, 'message' => 'Cronjob succesfully deleted']; } -} \ No newline at end of file +} diff --git a/templates/flashes.html.twig b/templates/flashes.html.twig index dab3f78..e524dea 100644 --- a/templates/flashes.html.twig +++ b/templates/flashes.html.twig @@ -7,10 +7,10 @@ {% endfor %} {% endfor %} -{% if app.request.server.get('DEMO_MODE') %} +{% if app.request.server.get('DEMO_MODE') == 'true' %} -{% endif %} \ No newline at end of file +{% endif %}