From 12da117cabed8d3bb34fcad65d4bc56ffd2766a0 Mon Sep 17 00:00:00 2001
From: Michael Kaufmann <d00p@froxlor.org>
Date: Sun, 8 Jan 2023 20:20:44 +0100
Subject: [PATCH] fix chmod() command in compatibility cronjob for updaters

Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
---
 install/froxlor.sql.php                    |  4 ++--
 install/updates/froxlor/update_2.x.inc.php | 24 +++++++++++++++++++++-
 lib/Froxlor/Froxlor.php                    |  2 +-
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/install/froxlor.sql.php b/install/froxlor.sql.php
index 976e0d9e..fb57268a 100644
--- a/install/froxlor.sql.php
+++ b/install/froxlor.sql.php
@@ -696,7 +696,7 @@ opcache.validate_timestamps'),
 	('system', 'distribution', ''),
 	('system', 'update_channel', 'stable'),
 	('system', 'updatecheck_data', ''),
-	('system', 'update_notify_last', '2.0.3'),
+	('system', 'update_notify_last', '2.0.4'),
 	('system', 'traffictool', 'goaccess'),
 	('api', 'enabled', '0'),
 	('2fa', 'enabled', '1'),
@@ -740,7 +740,7 @@ opcache.validate_timestamps'),
 	('panel', 'logo_overridetheme', '0'),
 	('panel', 'logo_overridecustom', '0'),
 	('panel', 'settings_mode', '0'),
-	('panel', 'version', '2.0.3'),
+	('panel', 'version', '2.0.4'),
 	('panel', 'db_version', '202212060');
 
 
diff --git a/install/updates/froxlor/update_2.x.inc.php b/install/updates/froxlor/update_2.x.inc.php
index fff2aab0..c6cc596c 100644
--- a/install/updates/froxlor/update_2.x.inc.php
+++ b/install/updates/froxlor/update_2.x.inc.php
@@ -211,7 +211,7 @@ if (Froxlor::isDatabaseVersion('202211030')) {
 	$newCronBin = Froxlor::getInstallDir().'/bin/froxlor-cli';
 	$compCron = <<<EOF
 <?php
-chmod($newCronBin, 0755);
+chmod('$newCronBin', 0755);
 // re-create cron.d configuration file
 exec('$newCronBin froxlor:cron -r 99');
 exit;
@@ -251,3 +251,25 @@ if (Froxlor::isFroxlorVersion('2.0.2')) {
 	Update::showUpdateStep("Updating from 2.0.2 to 2.0.3", false);
 	Froxlor::updateToVersion('2.0.3');
 }
+
+if (Froxlor::isFroxlorVersion('2.0.3')) {
+	Update::showUpdateStep("Updating from 2.0.3 to 2.0.4", false);
+
+	$complete_filedir = Froxlor::getInstallDir() . '/scripts';
+	// check if compat. cronjob still exists (most likely didn't run successfully b/c of error from former 2.0 release)
+	if (@file_exists($complete_filedir.'/froxlor_master_cronjob.php')) {
+		Update::showUpdateStep("Adjusting backward compatibility for cronjob");
+		$newCronBin = Froxlor::getInstallDir() . '/bin/froxlor-cli';
+		$compCron = <<<EOF
+<?php
+chmod('$newCronBin', 0755);
+// re-create cron.d configuration file
+exec('$newCronBin froxlor:cron -r 99');
+exit;
+EOF;
+		file_put_contents($complete_filedir . '/froxlor_master_cronjob.php', $compCron);
+		Update::lastStepStatus(0);
+	}
+
+	Froxlor::updateToVersion('2.0.4');
+}
diff --git a/lib/Froxlor/Froxlor.php b/lib/Froxlor/Froxlor.php
index b86dd0c5..1f4b90e5 100644
--- a/lib/Froxlor/Froxlor.php
+++ b/lib/Froxlor/Froxlor.php
@@ -31,7 +31,7 @@ final class Froxlor
 {
 
 	// Main version variable
-	const VERSION = '2.0.3';
+	const VERSION = '2.0.4';
 
 	// Database version (YYYYMMDDC where C is a daily counter)
 	const DBVERSION = '202212060';