dave/coolify
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

remove unnecessary validation and fix safe to DB

Browse Source
This commit is contained in:
ayntk-ai
2024-08-14 23:29:33 +02:00
parent 99f2d4d711
commit 44f319460f
1 changed files with 7 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/Livewire/Server/Form.php
View File

@@ -243,6 +243,7 @@ class Form extends Component
return; return;
} }
$this->server->settings->server_timezone = $value; $this->server->settings->server_timezone = $value;
$this->updateServerTimezone($value);
} }
private function updateServerTimezone($value) private function updateServerTimezone($value)
@@ -261,41 +262,12 @@ class Form extends Component
"cat /etc/timezone 2>/dev/null || echo 'Unable to read /etc/timezone'", "cat /etc/timezone 2>/dev/null || echo 'Unable to read /etc/timezone'",
]; ];
$result = instant_remote_process($commands, $this->server); instant_remote_process($commands, $this->server);
if (!isset($result['output']) || empty($result['output'])) { $this->server->settings->server_timezone = $value;
throw new \Exception("No output received from server. The timezone may not have been updated.");
}
$output = is_array($result['output']) ? $result['output'] : explode("\n", trim($result['output']));
$output = array_filter($output); // Remove empty lines
if (count($output) < 2) {
throw new \Exception("Unexpected output format: " . implode("\n", $output));
}
$oldTimezone = $output[0];
$newTimezone = end($output);
$errors = array_filter($output, function($line) {
return strpos($line, 'failed') !== false;
});
if (!empty($errors)) {
throw new \Exception("Timezone change failed. Errors: " . implode(", ", $errors));
}
if ($oldTimezone === $newTimezone) {
throw new \Exception("Timezone change failed. The timezone is still set to {$oldTimezone}.");
}
$dateTime = new \DateTime('now', new \DateTimeZone($value));
$phpTimezone = $dateTime->getTimezone()->getName();
$this->server->settings->server_timezone = $phpTimezone;
$this->server->settings->save(); $this->server->settings->save();
$this->dispatch('success', "Timezone successfully changed from {$oldTimezone} to {$newTimezone} (PHP: {$phpTimezone})."); $this->dispatch('success', "Timezone successfully changed to {$value}.");
return true; return true;
} catch (\Exception $e) { } catch (\Exception $e) {
$this->dispatch('error', $e->getMessage()); $this->dispatch('error', $e->getMessage());