maketank/Froxlor
2
0
Fork 0
Code Pull Requests Releases Activity

make froxlor_master_cronkjob a froxlor-cli command; secure files/folders in froxlor-virtualhost;

Browse Source 
Signed-off-by: Michael Kaufmann <d00p@froxlor.org>
This commit is contained in:
Michael Kaufmann
2022-08-09 15:49:44 +02:00
parent 293c0ceb9d
commit 31500522ce
25 changed files with 398 additions and 501 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
install/updates/froxlor/update_0.11.inc.php
View File

@@ -24,6 +24,7 @@
*/
use Froxlor\Froxlor;
use Froxlor\FileDir;
use Froxlor\Database\Database;
use Froxlor\Settings;
use Froxlor\Install\Update;
@@ -105,15 +106,16 @@ if (Froxlor::isFroxlorVersion('0.10.99')) {
"lng/lng_references.php",
"lng/portugues.lng.php",
"lng/swedish.lng.php",
"scripts",
);
$disabled = explode(',', ini_get('disable_functions'));
$exec_allowed = !in_array('exec', $disabled);
$del_list = "";
foreach ($to_clean as $filedir) {
$complete_filedir = \Froxlor\Froxlor::getInstallDir() . $filedir;
$complete_filedir = Froxlor::getInstallDir() . $filedir;
if (file_exists($complete_filedir)) {
if ($exec_allowed) {
Froxlor\FileDir::safe_exec("rm -rf " . escapeshellarg($complete_filedir));
FileDir::safe_exec("rm -rf " . escapeshellarg($complete_filedir));
} else {
$del_list .= "rm -rf " . escapeshellarg($complete_filedir) . PHP_EOL;
}
@@ -154,6 +156,7 @@ if (Froxlor::isFroxlorVersion('0.10.99')) {
'&#268;esk&aacute; republika' => 'cs'
];
Settings::Set('panel.standardlanguage', $lang_map[Settings::Get('panel_standardlanguage')] ?? 'en');
Database::query("DELETE FROM `" . TABLE_PANEL_SETTINGS . "` WHERE `settinggroup` = 'system' AND `varname` = 'debug_cron'");
Update::lastStepStatus(0);
Froxlor::updateToVersion($update_to);

6
install/updatesql.php
View File

@@ -64,10 +64,10 @@ if (Froxlor::isFroxlor()) {
$integrity = new IntegrityCheck();
if (!$integrity->checkAll()) {
Update::lastStepStatus(1, 'Monkeys ate the integrity');
Update::showUpdateStep("Trying to remove monkeys, feeding bananas");
Update::lastStepStatus(1, 'Integrity could not be validated');
Update::showUpdateStep("Trying to automatically restore integrity");
if (!$integrity->fixAll()) {
Update::lastStepStatus(2, 'failed', 'Some monkeys just would not move, you should contact team@froxlor.org');
Update::lastStepStatus(2, 'failed', 'Check "database validation" as admin on the left-side menu to see where the problem is');
} else {
Update::lastStepStatus(0, 'Integrity restored');
}