bbs/clrghouz
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Change joins with a collection to use collection joins

Browse Source
This commit is contained in:
Deon George
2021-08-14 11:22:45 +10:00
parent 6db826c8a4
commit 6c6976678f
8 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Classes/FTN/Message.php
View File

@@ -394,7 +394,7 @@ class Message extends FTNBase
{
$return = '';
$return .= pack(join('',collect(self::header)->pluck(1)->toArray()),
$return .= pack(collect(self::header)->pluck(1)->join(''),
$this->ff,
$this->tf,
$this->fn,
@@ -723,7 +723,7 @@ class Message extends FTNBase
'flags' => 'required|numeric',
'cost' => 'required|numeric',
'echoarea' => 'nullable|max:'.self::AREATAG_LEN,
'ozone' => ['required',$this->domain ? 'in:'.$x=join(',',$this->domain->zones->pluck('zone_id')->toArray()): ''],
'ozone' => ['required',$this->domain ? 'in:'.$x=$this->domain->zones->pluck('zone_id')->join(','): ''],
'dzone' => ['required',$this->domain ? 'in:'.$x : '']
]);

2
app/Classes/FTN/Packet.php
View File

@@ -269,7 +269,7 @@ class Packet extends FTNBase
private function createHeader(): string
{
try {
$a = pack(join('',collect(self::v2header)->pluck(1)->toArray()),
$a = pack(collect(self::v2header)->pluck(1)->join(''),
$this->ff,
$this->tf,
Arr::get($this->header,'y'),

4
app/Classes/Protocol/Binkp.php
View File

@@ -144,7 +144,7 @@ final class Binkp extends BaseProtocol
// If we are originating, we'll show the remote our address in the same network
// @todo Implement hiding our AKAs not in this network.
if ($this->originate)
$this->msgs(self::BPM_ADR,join(' ',$this->setup->system->addresses->pluck('ftn')->toArray()));
$this->msgs(self::BPM_ADR,$this->setup->system->addresses->pluck('ftn')->join(' '));
}
/**
@@ -667,7 +667,7 @@ final class Binkp extends BaseProtocol
// If we are not the originator, we'll show our addresses in common.
// @todo make this an option to hideAKAs or not
if (! $this->originate)
$this->msgs(self::BPM_ADR,join(' ',$this->setup->system->addresses->pluck('ftn')->toArray()));
$this->msgs(self::BPM_ADR,$this->setup->system->addresses->pluck('ftn')->join(' '));
return 1;
}

2
app/Classes/Protocol/EMSI.php
View File

@@ -184,7 +184,7 @@ final class EMSI extends BaseProtocol implements CRCInterface,ZmodemInterface
// Site address, password and compatibility
// @todo Only show the AKAs that is relevant to the node we are connecting to
$makedata .= sprintf('{EMSI}{%s}{%s}{%s}{%s}',
join(' ',$this->setup->system->addresses->pluck('ftn')->toArray()),
$this->setup->system->addresses->pluck('ftn')->join(' '),
$this->node->password == '-' ? '' : $this->node->password,
join(',',$link_codes),
join(',',$compat_codes),