Merge remote-tracking branch 'renky/vhostalias'

Marius Cramer

2014-01-24 e60d4c7e35e5dd3a5f4fb1d5b3a25345b6275146

 interface/web/dashboard/dashlets/limits.php

@@ -71,7 +71,7 @@

      $limits[] = array('field' => 'limit_web_aliasdomain',
         'db_table' => 'web_domain',
         'db_where' => "type = 'alias'");
                    'db_where' => "(type = 'alias' OR type = 'vhostalias')");

      $limits[] = array('field' => 'limit_ftp_user',
         'db_table' => 'ftp_user',