Presentation fixes, no functional changes

app/Classes/Dynamic/NodelistSegment.php

@@ -59,7 +59,7 @@ class NodelistSegment extends Dynamic
 			$result->push('CM');
 
 		if ($ao->system->address) {
-			$result->push(sprintf('INA:%s',$ao->system->address));
+			$result->push(sprintf('INA:%s',our_address($ao->domain)->contains($ao->id) ? our_hostname($ao) : $ao->system->address));
 
 			if (($x=$ao->system->mailers->pluck('name')->search('BINKP')) !== FALSE)
 				$result->push(sprintf('IBN%s',(($y=$ao->system->mailers->get($x)->pivot->port) !== 24554) ? ':'.$y : ''));

app/Http/Requests/AddressMerge.php

@@ -36,7 +36,7 @@ class AddressMerge extends FormRequest
 					$src = Address::withTrashed()->findOrFail($request->src);
 
 					if ((! $dst->active) && ($dst->system_id !== $src->system_id) && ($src->system->name !== System::default))
-						$fail('Destination must be active, or be from the system system');
+						$fail('Destination must be active, or be from the same system');
 				},
 				function ($attribute,$value,$fail) use ($request) {
 					$dst = Address::withTrashed()->findOrFail($value);

app/helpers.php

@@ -100,7 +100,7 @@ function our_address(Domain|Address $o=NULL): Collection|Address|NULL
 	$our = Cache::remember(sprintf('%d-akas',$so->system_id),60,function() use ($so) {
 		$so->load([
 			'system:id,name',
-			'system.akas:addresses.id,addresses.zone_id,host_id,node_id,point_id,addresses.system_id,addresses.active,role',
+			'system.akas:addresses.id,addresses.zone_id,region_id,host_id,node_id,point_id,addresses.system_id,addresses.active,role',
 			'system.akas.zone:id,domain_id,zone_id',
 			'system.akas.zone.domain:id,name',
 		]);
@@ -150,6 +150,7 @@ function our_hostname(Address $o): string
 				->prepend(sprintf('z%d',$our->zone->zone_id));
 			break;
 
+		case Address::NODE_RC:
 		case Address::NODE_NC:
 			$domain = collect(explode('.',gethostname()))->forget(0)
 				->prepend(sprintf('z%d',$our->zone->zone_id))

resources/views/dashboard.blade.php

@@ -35,7 +35,7 @@ $user->load(['systems.akas.zone.domain.echoareas','systems.akas.echoareas']);
 								<!-- {{ $x=$list->first()->domain->name }} -->
 								<div class="accordion-item">
 									<h3 class="accordion-header">
-										<span class="accordion-button" id="hd_{{ $x }}" data-bs-toggle="collapse" data-bs-target="#collapse_{{ $x }}" aria-expanded="true" aria-controls="collapse_{{ $x }}">{{ $x }}</span>
+										<span @class(['accordion-button','collapsed'=>$loop->index]) id="hd_{{ $x }}" data-bs-toggle="collapse" data-bs-target="#collapse_{{ $x }}" aria-expanded="true" aria-controls="collapse_{{ $x }}">{{ $x }}</span>
 									</h3>
 
 									<div id="collapse_{{ $x }}" class="accordion-collapse {{ ($loop->index) ? 'collapse' : 'show' }}" aria-labelledby="{{ $x }}" data-bs-parent="#accordion_details">