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

This commit is contained in:
Deon George 2024-05-22 15:25:39 +10:00
parent 49e40f4fb8
commit a5e9a28673
3 changed files with 6 additions and 7 deletions

View File

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

View File

@ -1,6 +1,6 @@
<span> <span>
<small> <small>
<a href="/" class="goback float-start p-0">{{ request()->getHost() }}</a> &copy {{ \Carbon\Carbon::now()->year }} Deon George <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> </small>
</span> </span>