diff --git a/app/Classes/FTN/Tic.php b/app/Classes/FTN/Tic.php index c187c46..febe9de 100644 --- a/app/Classes/FTN/Tic.php +++ b/app/Classes/FTN/Tic.php @@ -140,7 +140,7 @@ class Tic extends FTNBase $this->file->name, )); return (($this->file->nodelist_filearea_id === $this->file->filearea->domain->filearea_id) - && (preg_match(str_replace(['.','?'],['\.','.'],'#^'.$this->file->filearea->domain->nodelist_filename.'$#i'),$this->file->name))); + && (preg_match(str_replace(['.','?'],['\.','[0-9]'],'#^'.$this->file->filearea->domain->nodelist_filename.'$#i'),$this->file->name))); } /** diff --git a/app/Jobs/TicProcess.php b/app/Jobs/TicProcess.php index 1498dd6..58056d1 100644 --- a/app/Jobs/TicProcess.php +++ b/app/Jobs/TicProcess.php @@ -99,6 +99,6 @@ class TicProcess implements ShouldQueue } if ($to->isNodelist()) - NodelistImport::dispatch($to->fo,$this->domain); + NodelistImport::dispatch($fo,$this->domain); } } \ No newline at end of file