fixed domain check in controller/domain/domain.php

Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO 2020-06-29 19:39:41 +02:00
parent 2f1c52583a
commit b24df2ac86

View File

@ -106,7 +106,7 @@ class ControllerDomainDomain extends Controller {
$domains = explode("\n", $this->request->post['domain']); $domains = explode("\n", $this->request->post['domain']);
foreach ($domains as $domain) { foreach ($domains as $domain) {
$domain = rtrim($domain); $domain = rtrim($domain);
if(!preg_match('/^[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)*(\.[A-Za-z]{2,10})$/', $domain) ) { if(!validdomain($domain) ) {
$this->error['domain'] = $this->data['text_field_domain']; $this->error['domain'] = $this->data['text_field_domain'];
} }
} }
@ -115,7 +115,7 @@ class ControllerDomainDomain extends Controller {
if(!isset($this->request->post['mapped']) || strlen($this->request->post['mapped']) < 3) { if(!isset($this->request->post['mapped']) || strlen($this->request->post['mapped']) < 3) {
$this->data['text_field_length'] = str_replace("?",3,$this->data['text_field_length']); $this->data['text_field_length'] = str_replace("?",3,$this->data['text_field_length']);
$this->error['mapped'] = $this->data['text_field_length']; $this->error['mapped'] = $this->data['text_field_length'];
} elseif( !preg_match('/^[A-Za-z0-9-]+(\.[A-Za-z0-9-]+)*(\.[A-Za-z]{2,10})$/', $this->request->post['mapped']) ) { } elseif( !validdomain($this->request->post['mapped']) ) {
$this->error['mapped'] = $this->data['text_field_domain']; $this->error['mapped'] = $this->data['text_field_domain'];
} }
@ -130,5 +130,3 @@ class ControllerDomainDomain extends Controller {
} }
?>