From a32d3b7c8a53877ab88836e30870dcd522ea1f91 Mon Sep 17 00:00:00 2001 From: SJ Date: Wed, 19 Mar 2014 16:43:55 +0100 Subject: [PATCH] gui fixes --- webui/controller/domain/remove.php | 2 +- webui/controller/message/bulkrestore.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webui/controller/domain/remove.php b/webui/controller/domain/remove.php index 8c873beb..99141216 100644 --- a/webui/controller/domain/remove.php +++ b/webui/controller/domain/remove.php @@ -56,7 +56,7 @@ class ControllerDomainRemove extends Controller { $this->error['admin'] = $this->data['text_you_are_not_admin']; } - if(!isset($this->request->get['name']) || strlen($this->request->get['name']) < 3 || ($this->request->get['name'] != "local" && !preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,5})$/', $this->request->get['name'])) ) { + if(!isset($this->request->get['name']) || strlen($this->request->get['name']) < 3 || ($this->request->get['name'] != "local" && !preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,10})$/', $this->request->get['name'])) ) { $this->error['domain'] = $this->data['text_invalid_data']; } diff --git a/webui/controller/message/bulkrestore.php b/webui/controller/message/bulkrestore.php index ed776299..8301e516 100644 --- a/webui/controller/message/bulkrestore.php +++ b/webui/controller/message/bulkrestore.php @@ -69,7 +69,7 @@ class ControllerMessageBulkrestore extends Controller { $rcpt[0] = $email; } else { - $rcpt = $this->model_search_search->get_message_recipients($id); + $rcpt[0] = $session->get("email"); } } else {