*Handler.php:

- set $db_table and $id_field in the class, not inside initStruct()



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

model/AdminHandler.php

@@ -3,6 +3,9 @@
 
 class AdminHandler extends PFAHandler {
 
+    protected $db_table = 'admin';
+    protected $id_field = 'username';
+
    protected function validate_new_id() {
        $email_check = check_email($this->id);
 
@@ -21,9 +24,6 @@ class AdminHandler extends PFAHandler {
 
     # init $this->struct, $this->db_table and $this->id_field
     protected function initStruct() {
-        $this->db_table = 'admin';
-        $this->id_field = 'username';
-
         # TODO: shorter PALANG labels ;-)
         # TODO: hardcode 'default' to Config::read in pacol()?
 

model/AliasHandler.php

@@ -8,6 +8,8 @@
  */
 class AliasHandler extends PFAHandler {
 
+    protected $db_table = 'alias';
+    protected $id_field = 'address';
     protected $domain_field = 'domain';
 
     /**
@@ -17,9 +19,6 @@ class AliasHandler extends PFAHandler {
     public $return = null;
 
     protected function initStruct() {
-        $this->db_table = 'alias';
-        $this->id_field = 'address';
-
         # hide 'goto_mailbox' if $this->new
         # (for existing aliases, init() hides it for non-mailbox aliases)
         $mbgoto = 1 - $this->new;

model/AliasdomainHandler.php

@@ -6,13 +6,12 @@
  */
 class AliasdomainHandler extends PFAHandler {
 
+    protected $db_table = 'alias_domain';
+    protected $id_field = 'alias_domain';
     protected $domain_field = 'alias_domain';
 
     # init $this->struct, $this->db_table and $this->id_field
     protected function initStruct() {
-        $this->db_table = 'alias_domain';
-        $this->id_field = 'alias_domain';
-
         # TODO: add public function set_options_for_admin() to list only domains available to that admin
 
         $this->struct=array(

model/DomainHandler.php

@@ -6,6 +6,8 @@
  */
 class DomainHandler extends PFAHandler {
 
+    protected $db_table = 'domain';
+    protected $id_field = 'domain';
     protected $domain_field = 'domain';
 
    protected function validate_new_id() {
@@ -21,9 +23,6 @@ class DomainHandler extends PFAHandler {
 
     # init $this->struct, $this->db_table and $this->id_field
     protected function initStruct() {
-        $this->db_table = 'domain';
-        $this->id_field = 'domain';
-
         # TODO: shorter PALANG labels ;-)
         # TODO: hardcode 'default' to Config::read in pacol()?
 

model/MailboxHandler.php

@@ -6,13 +6,12 @@
  */
 class MailboxHandler extends PFAHandler {
 
+    protected $db_table = 'mailbox';
+    protected $id_field = 'username';
     protected $domain_field = 'domain';
 
     # init $this->struct, $this->db_table and $this->id_field
     protected function initStruct() {
-        $this->db_table = 'mailbox';
-        $this->id_field = 'username';
-
         $this->struct=array(
             # field name                allow       display in...   type    $PALANG label                     $PALANG description                 default / options / ...
             #                           editing?    form    list