DomainHandler.php:

- new: public function getStruct()
- make store() public explicitely
- store domain_postcreation error message in $this->errormsg
- use existing error message instead of "invalid domain"



git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@1216 a1433add-5e2c-0410-b055-b7f2511e0802

model/DomainHandler.php

@@ -55,7 +55,7 @@ class DomainHandler extends PFAHandler {
        if ($valid) {
             return true;
        } else {
-            $this->errormsg[] = 'invalid domain'; # TODO: errormsg is currently delivered via flash_error() in check_domain
+            $this->errormsg[] = Lang::read('pAdminCreate_domain_domain_text_error2'); # TODO: half of the errormsg is currently delivered via flash_error() in check_domain
             return false;
        }
    }
@@ -91,6 +91,10 @@ class DomainHandler extends PFAHandler {
 
     }
 
+    public function getStruct() {
+        return $this->struct;
+    }
+
     public function getTransports() {
         return Config::read('transport_options');
     }
@@ -144,7 +148,7 @@ class DomainHandler extends PFAHandler {
         return $this->values_valid;
     }
 
-    function store() {
+    public function store() {
         if ($this->values_valid == false) {
             $this->errormsg[] = "one or more values are invalid!";
             return false;
@@ -171,10 +175,10 @@ class DomainHandler extends PFAHandler {
                     # TODO: error checking
                 }
             }
-            $tMessage = Lang::read('pAdminCreate_domain_result_success') . "<br />(" . $this->username . ")</br />"; # TODO: remove <br> # TODO: tMessage is not used/returned anywhere
+            $tMessage = Lang::read('pAdminCreate_domain_result_success') . " (" . $this->username . ")"; # TODO: tMessage is not used/returned anywhere
         }
         if (!domain_postcreation($this->username)) {
-            $tMessage = Lang::read('pAdminCreate_domain_error'); # TODO: tMessage is not used/returned anywhere
+            $this->errormsg[] = Lang::read('pAdminCreate_domain_error');
         }
         db_log ($this->username, 'create_domain', "");
         return true;