Compare commits

..

14 Commits

Author SHA1 Message Date
a5e9a28673 Added PRODUCT_NAME_SHORT and updated PID/TID kludge to include git hash
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 41s
Create Docker Image / Build Docker Image (arm64) (push) Successful in 1m43s
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
2024-05-22 15:31:10 +10:00
49e40f4fb8 Generated mail from the hub wont have $model->errors defined 2024-05-22 09:21:59 +10:00
924d760c79 Fix FSC45 packets, point_id was still being validated the old way 2024-05-22 09:21:59 +10:00
58dc090c83 Use packets domain for packet validation, not remote sytems address 2024-05-22 09:21:59 +10:00
b20878e378 Kludges are not required in messages 2024-05-22 09:21:59 +10:00
b443762739 Fix processing echomail and when mail crc is calculated as it was decompressing the CompressedString 2024-05-22 09:21:59 +10:00
18f5354d0c Mail validation errors is now an object, and must be tested with ->count() 2024-05-22 09:21:59 +10:00
17e3c69f07 Fix for invalid-zone validation comparing a string with an int 2024-05-22 09:21:59 +10:00
51784df6a8 Fix missed Notification using old Message::class 2024-05-22 09:21:59 +10:00
8df6384736 Fixed checking for RESCAN kludge 2024-05-22 09:21:59 +10:00
752462d20f Update job:list, and change "subject" to "jobname" 2024-05-22 09:21:59 +10:00
72d68fa1ab Update SocketClient to support raw IP addresses 2024-05-22 09:21:59 +10:00
aaec5f8f4a Security update enabling update_nn to edit system details 2024-05-22 09:21:59 +10:00
ab2e288f06 More complete rework of packet parsing and packet generation with f279d85 - and testing passes 2024-05-22 09:21:59 +10:00
4 changed files with 7 additions and 8 deletions

View File

@ -539,10 +539,8 @@ class Message extends FTNBase
$this->mo->kludges->put('TOPT',$this->mo->tftn->point_id);
}
if ($this->mo->isFlagSet(self::FLAG_LOCAL))
$this->mo->kludges->put('PID',sprintf('clrghouz %s',$s->version));
else
$this->mo->kludges->put('TID',sprintf('clrghouz %s',$s->version));
$this->mo->kludges->put($this->mo->isFlagSet(self::FLAG_LOCAL) ? 'PID:' : 'TID:',sprintf('%s %s',Setup::PRODUCT_NAME_SHORT,$s->version));
$this->mo->kludges->put('DBID:',$this->mo->id);
if ($this->mo instanceof Echomail)
$return .= sprintf("AREA:%s\r",strtoupper($this->mo->echoarea->name));
@ -565,10 +563,10 @@ class Message extends FTNBase
$return .= sprintf("\x01Via %s\r",$this->mo->via($ao));
// Add our address
$return .= sprintf("\x01Via %s @%s.UTC %s (%04X)\r",
$return .= sprintf("\x01Via %s @%s.UTC %s %s\r",
$this->us->ftn3d,
Carbon::now()->format('Ymd.His'),
Setup::PRODUCT_NAME,Setup::PRODUCT_ID);
Setup::PRODUCT_NAME_SHORT,$s->version);
} else {
// FTS-0004.001/FSC-0068.001 The message SEEN-BY lines

View File

@ -20,6 +20,7 @@ use App\Classes\Protocol\{Binkp,DNS,EMSI};
class Setup extends Model
{
public const PRODUCT_NAME = 'Clearing Houz';
public const PRODUCT_NAME_SHORT = 'clrghouz';
public const PRODUCT_ID = 0xAB8D;
public const PRODUCT_VERSION_MAJ = 0;
public const PRODUCT_VERSION_MIN = 0;

View File

@ -60,7 +60,7 @@ trait MessageAttributes
if ($this->origin)
$result .= sprintf("%s",$this->origin);
return rtrim($result,"\r").'xx';
return rtrim($result,"\r");
}
public function getDateAttribute(): Carbon

View File

@ -1,6 +1,6 @@
<span>
<small>
<a href="/" class="goback float-start p-0">{{ request()->getHost() }}</a> &copy {{ \Carbon\Carbon::now()->year }} Deon George
<span class="float-end"><strong class="highlight">clrghouz</strong> <small>[<strong class="gray">{{ gethostname() }}</strong>@if (File::exists('../VERSION')) @ <strong class="success">{{ chop(File::get('../VERSION')) }}</strong>@endif]</small></span>
<span class="float-end"><strong class="highlight">{{ \App\Models\Setup::PRODUCT_NAME_SHORT }}</strong> <small>[<strong class="gray">{{ gethostname() }}</strong>@if (File::exists('../VERSION')) @ <strong class="success">{{ chop(File::get('../VERSION')) }}</strong>@endif]</small></span>
</small>
</span>