Skip to content

An open-source, self-hostable PaaS alternative to Vercel, Heroku & Netlify that lets you easily deploy static sites, databases, full-stack applications and 360+ one-click services on your own servers.

Merge origin/next into main

Andras Bacsai541d743907f7
diff --cc app/Actions/Server/CheckUpdates.php
index f90e007089,e801a1c997..5cf5658f8f
--- a/app/Actions/Server/CheckUpdates.php
+++ b/app/Actions/Server/CheckUpdates.php
@@@ -3,6 -3,6 +3,7 @@@
namespace App\Actions\Server;
use App\Models\Server;
++use Illuminate\Support\Facades\Log;
use Lorisleiva\Actions\Concerns\AsAction;
class CheckUpdates
@@@ -266,7 -275,7 +276,7 @@@
// Include unparsed lines in the result for debugging if any exist
if (! empty($unparsedLines)) {
$result['unparsed_lines'] = $unparsedLines;
-- \Illuminate\Support\Facades\Log::debug('Pacman output contained unparsed lines', [
++ Log::debug('Pacman output contained unparsed lines', [
'unparsed_lines' => $unparsedLines,
]);
}
diff --cc app/Livewire/Notifications/Email.php
index 3d95668b91,11280799e3..2a373a5065
--- a/app/Livewire/Notifications/Email.php
+++ b/app/Livewire/Notifications/Email.php
@@@ -336,6 -344,44 +352,45 @@@ class Email extends Componen
}
}
+ private function validateSmtpSettings(): void
+ {
+ $this->validate([
+ 'smtpEnabled' => 'boolean',
+ 'smtpFromAddress' => 'required|email',
+ 'smtpFromName' => 'required|string',
+ 'smtpHost' => 'required|string',
+ 'smtpPort' => 'required|numeric',
+ 'smtpEncryption' => 'required|string|in:starttls,tls,none',
+ 'smtpUsername' => 'nullable|string',
+ 'smtpPassword' => 'nullable|string',
+ 'smtpTimeout' => 'nullable|numeric',
++ 'smtpEhloDomain' => ['nullable', 'string', new ValidHostname],
+ ], [
+ 'smtpFromAddress.required' => 'From Address is required.',
+ 'smtpFromAddress.email' => 'Please enter a valid email address.',
+ 'smtpFromName.required' => 'From Name is required.',
+ 'smtpHost.required' => 'SMTP Host is required.',
+ 'smtpPort.required' => 'SMTP Port is required.',
+ 'smtpPort.numeric' => 'SMTP Port must be a number.',
+ 'smtpEncryption.required' => 'Encryption type is required.',
+ ]);
+ }
+
+ private function validateResendSettings(): void
+ {
+ $this->validate([
+ 'resendEnabled' => 'boolean',
+ 'resendApiKey' => $this->resendEnabled ? 'required|string' : 'nullable|string',
+ 'smtpFromAddress' => 'required|email',
+ 'smtpFromName' => 'required|string',
+ ], [
+ 'resendApiKey.required' => 'Resend API Key is required.',
+ 'smtpFromAddress.required' => 'From Address is required.',
+ 'smtpFromAddress.email' => 'Please enter a valid email address.',
+ 'smtpFromName.required' => 'From Name is required.',
+ ]);
+ }
+
public function sendTestEmail()
{
try {
diff --cc app/Livewire/SettingsEmail.php
index 9bca0db2e3,e8a5815b09..1426f61f02
--- a/app/Livewire/SettingsEmail.php
+++ b/app/Livewire/SettingsEmail.php
@@@ -237,6 -252,44 +260,45 @@@ class SettingsEmail extends Componen
}
}
+ private function validateSmtpSettings(): void
+ {
+ $this->validate([
+ 'smtpEnabled' => 'boolean',
+ 'smtpFromAddress' => 'required|email',
+ 'smtpFromName' => 'required|string',
+ 'smtpHost' => 'required|string',
+ 'smtpPort' => 'required|numeric',
+ 'smtpEncryption' => 'required|string|in:starttls,tls,none',
+ 'smtpUsername' => 'nullable|string',
+ 'smtpPassword' => 'nullable|string',
+ 'smtpTimeout' => 'nullable|numeric',
++ 'smtpEhloDomain' => ['nullable', 'string', new ValidHostname],
+ ], [
+ 'smtpFromAddress.required' => 'From Address is required.',
+ 'smtpFromAddress.email' => 'Please enter a valid email address.',
+ 'smtpFromName.required' => 'From Name is required.',
+ 'smtpHost.required' => 'SMTP Host is required.',
+ 'smtpPort.required' => 'SMTP Port is required.',
+ 'smtpPort.numeric' => 'SMTP Port must be a number.',
+ 'smtpEncryption.required' => 'Encryption type is required.',
+ ]);
+ }
+
+ private function validateResendSettings(): void
+ {
+ $this->validate([
+ 'resendEnabled' => 'boolean',
+ 'resendApiKey' => $this->resendEnabled ? 'required|string' : 'nullable|string',
+ 'smtpFromAddress' => 'required|email',
+ 'smtpFromName' => 'required|string',
+ ], [
+ 'resendApiKey.required' => 'Resend API Key is required.',
+ 'smtpFromAddress.required' => 'From Address is required.',
+ 'smtpFromAddress.email' => 'Please enter a valid email address.',
+ 'smtpFromName.required' => 'From Name is required.',
+ ]);
+ }
+
public function sendTestEmail()
{
try {