Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

fix: labels

Browse Source
This commit is contained in:
Andras Bacsai 2023-12-12 16:45:46 +01:00
parent f68aace445
commit d3c9894479
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Jobs/ApplicationDeploymentJob.php
View File

@ -883,6 +883,11 @@ class ApplicationDeploymentJob implements ShouldQueue, ShouldBeEncrypted
$this->application->save(); $this->application->save();
} }
if (mb_detect_encoding(base64_decode($this->application->custom_labels), 'ASCII', true) === false) {
ray('custom_labels contains non-ascii characters');
$this->application->custom_labels = base64_encode(str(implode(",", generateLabelsApplication($this->application, $this->preview)))->replace(',', "\n"));
$this->application->save();
}
$labels = collect(preg_split("/\r\n|\n|\r/", base64_decode($this->application->custom_labels))); $labels = collect(preg_split("/\r\n|\n|\r/", base64_decode($this->application->custom_labels)));
$labels = $labels->filter(function ($value, $key) { $labels = $labels->filter(function ($value, $key) {
return !Str::startsWith($value, 'coolify.'); return !Str::startsWith($value, 'coolify.');

4
app/Livewire/Project/Application/General.php
View File

@ -120,8 +120,8 @@ class General extends Component
$this->application->save(); $this->application->save();
} }
$this->customLabels = base64_decode(data_get($this->application, 'custom_labels')); $this->customLabels = base64_decode(data_get($this->application, 'custom_labels'));
// Fix for non-ascii characters // // Fix for non-ascii characters
if (preg_match('~[^\x20-\x7E\t\r\n]~', $this->customLabels) > 0) { if (mb_detect_encoding($this->customLabels, 'ASCII', true) === false) {
ray('custom_labels contains non-ascii characters'); ray('custom_labels contains non-ascii characters');
$this->resetDefaultLabels(false); $this->resetDefaultLabels(false);
} }