Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

Till Brehm

2015-12-21 b25f400cd6bc255b01e05ac274f050ba4039a411

 interface/lib/classes/tform_base.inc.php

@@ -127,6 +127,7 @@
      global $app, $conf;

      include $file;
      $app->plugin->raiseEvent($_SESSION['s']['module']['name'].':'.$form['name'] . ':on_before_formdef', $this);
      $this->formDef = $form;

      $this->module = $module;
@@ -153,6 +154,8 @@

      $this->wordbook = $wb;

      $app->plugin->raiseEvent($_SESSION['s']['module']['name'].':'.$app->tform->formDef['name'] . ':on_after_formdef', $this);

      $this->dateformat = $app->lng('conf_format_dateshort');
      $this->datetimeformat = $app->lng('conf_format_datetime');