Merge remote-tracking branch 'ispc3master/master' into vhostalias

Dominik

2014-01-23 2d7d9eaa5acda62f1580bc09304ce85a7f7cea9f

 interface/web/client/domain_edit.php

@@ -52,6 +52,15 @@
$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'.lng';
include $lng_file;

if(!$app->tform->checkClientLimit('limit_domainmodule')) {
   $app->uses('ini_parser,getconf');
   $settings = $app->getconf->get_global_config('domains');
   if ($settings['use_domain_module'] == 'y') {
      $app->error($settings['new_domain_html']);
   }
}


class page_action extends tform_actions {

   function onShowNew() {