diff --git a/app/Classes/FTN/Message.php b/app/Classes/FTN/Message.php index 7362147..72970c0 100644 --- a/app/Classes/FTN/Message.php +++ b/app/Classes/FTN/Message.php @@ -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 : ''] ]); diff --git a/app/Classes/FTN/Packet.php b/app/Classes/FTN/Packet.php index 6db0e53..b64ec06 100644 --- a/app/Classes/FTN/Packet.php +++ b/app/Classes/FTN/Packet.php @@ -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'), diff --git a/app/Classes/Protocol/Binkp.php b/app/Classes/Protocol/Binkp.php index 61691fe..93fee12 100644 --- a/app/Classes/Protocol/Binkp.php +++ b/app/Classes/Protocol/Binkp.php @@ -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; } diff --git a/app/Classes/Protocol/EMSI.php b/app/Classes/Protocol/EMSI.php index 3acb138..ed5035b 100644 --- a/app/Classes/Protocol/EMSI.php +++ b/app/Classes/Protocol/EMSI.php @@ -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), diff --git a/resources/views/domain/home.blade.php b/resources/views/domain/home.blade.php index f00e0cd..10692ed 100644 --- a/resources/views/domain/home.blade.php +++ b/resources/views/domain/home.blade.php @@ -42,7 +42,7 @@ {{ $oo->name }} {{ $oo->active ? 'YES' : 'NO' }} {{ $oo->dnsdomain }} - {{ join(', ',$oo->zones->pluck('zone_id')->sort()->toArray()) }} + {{ $oo->zones->pluck('zone_id')->sort()->join(', ') }} @endforeach diff --git a/resources/views/pkt.blade.php b/resources/views/pkt.blade.php index 62a4804..58bead4 100644 --- a/resources/views/pkt.blade.php +++ b/resources/views/pkt.blade.php @@ -112,19 +112,19 @@ @if($msg->isNetmail())
- VIA:
{!! join('
',$msg->via->toArray()) !!} + VIA:
{!! $msg->via->join('
') !!}
@else
- SEENBY:
{!! join('
',$msg->seenby->toArray()) !!} + SEENBY:
{!! $msg->seenby->join('
') !!}
- PATH:
{!! join('
',$msg->path->toArray()) !!} + PATH:
{!! $msg->path->join('
') !!}
@endif diff --git a/resources/views/setup.blade.php b/resources/views/setup.blade.php index 91bd719..df11d0b 100644 --- a/resources/views/setup.blade.php +++ b/resources/views/setup.blade.php @@ -62,7 +62,7 @@ use App\Models\Setup; @foreach ($o->system->addresses->groupBy('zone_id') as $zones) {{ $zones->first()->zone->domain->name }} - {!! join('
',$zones->pluck('ftn')->toArray()) !!} + {!! $zones->pluck('ftn')->join('
') !!} @endforeach diff --git a/resources/views/system/home.blade.php b/resources/views/system/home.blade.php index c721ac5..dc4658a 100644 --- a/resources/views/system/home.blade.php +++ b/resources/views/system/home.blade.php @@ -50,7 +50,7 @@ @default No details @endswitch - {{ join(',',$oo->addresses->pluck('ftn')->toArray()) }} + {{ $oo->addresses->pluck('ftn')->join(', ') }} {{ $oo->zt_id }} @endforeach