diff --git a/web/Modules/Email/App/Http/Livewire/DkimSetup.php b/web/Modules/Email/App/Http/Livewire/DkimSetup.php index d127938..81d0647 100644 --- a/web/Modules/Email/App/Http/Livewire/DkimSetup.php +++ b/web/Modules/Email/App/Http/Livewire/DkimSetup.php @@ -12,9 +12,11 @@ class DkimSetup extends Component public function render() { $secure = $this->secure(); + $verify = $this->verify(); return view('email::livewire.dkim-setup', [ 'secure' => $secure, + 'verify' => $verify, ]); } @@ -37,7 +39,8 @@ class DkimSetup extends Component $checks[] = [ 'check' => 'MX', 'pass' => $checkOnePass, - 'result'=>$checkOne + 'result'=>$checkOne, + 'must'=>'10 '.$this->domain ]; $checkTwo = shell_exec('dig @1.1.1.1 +short A '.$this->domain); @@ -50,7 +53,8 @@ class DkimSetup extends Component $checks[] = [ 'check'=>'IP', 'pass'=>$checkTwoPass, - 'result'=>$checkTwo + 'result'=>$checkTwo, + 'must'=>$getIpOfDomain ]; $checkThree = shell_exec('dig @1.1.1.1 +short -x ' . $getIpOfDomain); @@ -62,10 +66,14 @@ class DkimSetup extends Component $checks[] = [ 'check'=>'Reverse DNS', 'pass'=>$checkTreePass, - 'result'=>$checkThree + 'result'=>$checkThree, + 'must'=>$this->domain ]; - return $checks; + return [ + 'checks' => $checks, + 'pass' => $checkOnePass && $checkTwoPass && $checkTreePass, + ]; } public function secure() diff --git a/web/Modules/Email/resources/views/livewire/dkim-setup.blade.php b/web/Modules/Email/resources/views/livewire/dkim-setup.blade.php index 1e2ec0f..cdb53c4 100644 --- a/web/Modules/Email/resources/views/livewire/dkim-setup.blade.php +++ b/web/Modules/Email/resources/views/livewire/dkim-setup.blade.php @@ -1,3 +1,4 @@ +
@if(isset($secure['text'])) @@ -11,9 +12,36 @@
+ @if($verify && !empty($verify)) +
+
+ Verification Results: + @if ($verify['pass']) + Pass + @else + Fail + @endif +
+
+ @foreach($verify['checks'] as $v) + @php + if ($v['pass']) { + continue; + } + @endphp +
+ Check: {{ $v['check'] }}
+ Pass: {{ $v['pass'] ? 'Yes' : 'No' }}
+ Result: {{ $v['result'] }}
+ Return result must be: {{ $v['must'] }} +
+ @endforeach + @endif + Check DNS Record @endif
+