From 16b01b9b37ecaf17848364a9b33651c45d0431e8 Mon Sep 17 00:00:00 2001 From: SJ Date: Fri, 22 Jun 2012 13:37:13 +0200 Subject: [PATCH] minor webui fixes around the group handling --- webui/controller/group/add.php | 9 ++++----- webui/language/en/messages.php | 3 ++- webui/language/hu/messages.iso-8859-2.php | 3 ++- webui/language/hu/messages.php | 3 ++- webui/view/theme/default/templates/group/add.tpl | 10 ++++++++-- webui/view/theme/default/templates/group/edit.tpl | 7 ++++++- 6 files changed, 24 insertions(+), 11 deletions(-) diff --git a/webui/controller/group/add.php b/webui/controller/group/add.php index 8d834736..a7a0f5aa 100644 --- a/webui/controller/group/add.php +++ b/webui/controller/group/add.php @@ -41,14 +41,10 @@ class ControllerGroupAdd extends Controller { if($ret == 0) { - //$this->data['post'] = $this->request->post; - //$this->data['next_group_id'] = $this->model_group_group->getNextUid(); + $this->data['post'] = $this->request->post; } } - else { - //$this->data['next_group_id'] = $this->model_group_group->getNextUid(); - } } else { $this->template = "common/error.tpl"; @@ -68,6 +64,9 @@ class ControllerGroupAdd extends Controller { $this->error['group'] = $this->data['text_missing_data']; } + if(!isset($this->request->post['email']) || $this->request->post['email'] == '') { + $this->error['email'] = $this->data['text_missing_data']; + } if (!$this->error) { return true; diff --git a/webui/language/en/messages.php b/webui/language/en/messages.php index 0ae7beac..64e554a7 100644 --- a/webui/language/en/messages.php +++ b/webui/language/en/messages.php @@ -76,13 +76,14 @@ $_['text_download_message2'] = "download message"; $_['text_edit'] = "Edit"; $_['text_edit_or_view'] = "Edit/view"; $_['text_email'] = "Email address"; -$_['text_email_addresses'] = "Email address(es)"; +$_['text_email_addresses'] = "Email addresses"; $_['text_email_aliases'] = "Email aliases"; $_['text_email_in_unknown_domain'] = "Email address is in an unknown domain"; $_['text_empty_search_criteria'] = "'Empty criteria'"; $_['text_empty_search_result'] = "Empty search result"; $_['text_enable'] = "Enable"; $_['text_enabled'] = "enabled"; +$_['text_enter_one_email_address_per_line'] = "Enter one email address per line"; $_['text_enter_search_terms'] = "Enter your search terms"; $_['text_error'] = "Error"; $_['text_exact_domain_name_or_email_address'] = "exact domain name or email address"; diff --git a/webui/language/hu/messages.iso-8859-2.php b/webui/language/hu/messages.iso-8859-2.php index a36b8eb2..c59f4c9c 100644 --- a/webui/language/hu/messages.iso-8859-2.php +++ b/webui/language/hu/messages.iso-8859-2.php @@ -76,13 +76,14 @@ $_['text_download_message2'] = "lev $_['text_edit'] = "Szerkeszt"; $_['text_edit_or_view'] = "Szerkeszt/Megnéz"; $_['text_email'] = "Email cím"; -$_['text_email_addresses'] = "Email cím(ek)"; +$_['text_email_addresses'] = "Email címek"; $_['text_email_aliases'] = "Email álcímek"; $_['text_email_in_unknown_domain'] = "Az email cím ismeretlen domainben van"; $_['text_empty_search_criteria'] = "'Üres feltétel'"; $_['text_empty_search_result'] = "Nincs találat a keresésre"; $_['text_enable'] = "Engedélyez"; $_['text_enabled'] = "engedélyezve"; +$_['text_enter_one_email_address_per_line'] = "Egy sorba egy email címet írjon"; $_['text_enter_search_terms'] = "Írja be a keresési feltételeket"; $_['text_error'] = "Hiba"; $_['text_exact_domain_name_or_email_address'] = "pontos domainnév vagy email cím"; diff --git a/webui/language/hu/messages.php b/webui/language/hu/messages.php index 7da603db..e99ab726 100644 --- a/webui/language/hu/messages.php +++ b/webui/language/hu/messages.php @@ -76,13 +76,14 @@ $_['text_download_message2'] = "levĂ©l letöltĂ©se"; $_['text_edit'] = "Szerkeszt"; $_['text_edit_or_view'] = "Szerkeszt/MegnĂ©z"; $_['text_email'] = "Email cĂ­m"; -$_['text_email_addresses'] = "Email cĂ­m(ek)"; +$_['text_email_addresses'] = "Email cĂ­mek"; $_['text_email_aliases'] = "Email álcĂ­mek"; $_['text_email_in_unknown_domain'] = "Az email cĂ­m ismeretlen domainben van"; $_['text_empty_search_criteria'] = "'Ăśres feltĂ©tel'"; $_['text_empty_search_result'] = "Nincs találat a keresĂ©sre"; $_['text_enable'] = "EngedĂ©lyez"; $_['text_enabled'] = "engedĂ©lyezve"; +$_['text_enter_one_email_address_per_line'] = "Egy sorba egy email cĂ­met Ă­rjon"; $_['text_enter_search_terms'] = "ĂŤrja be a keresĂ©si feltĂ©teleket"; $_['text_error'] = "Hiba"; $_['text_exact_domain_name_or_email_address'] = "pontos domainnĂ©v vagy email cĂ­m"; diff --git a/webui/view/theme/default/templates/group/add.tpl b/webui/view/theme/default/templates/group/add.tpl index 9aacf686..27812745 100644 --- a/webui/view/theme/default/templates/group/add.tpl +++ b/webui/view/theme/default/templates/group/add.tpl @@ -14,10 +14,16 @@
-
:
-
+
*:
+
+
+
 
+
*:
+
+ +
 
diff --git a/webui/view/theme/default/templates/group/edit.tpl b/webui/view/theme/default/templates/group/edit.tpl index ba15042e..ee11bca9 100644 --- a/webui/view/theme/default/templates/group/edit.tpl +++ b/webui/view/theme/default/templates/group/edit.tpl @@ -13,10 +13,15 @@
-
:
+
*:
+
+
 
+
*:
+
+