diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index ba7bf1164096bed3c28fe809153c9ce9417df472..1b37e866504ddfb84a3ab53502ecf6ad87756a64 100644 --- a/interface/web/client/lib/lang/en_client.lng +++ b/interface/web/client/lib/lang/en_client.lng @@ -109,5 +109,5 @@ $wb["limit_openvz_vm_template_id_txt"] = 'Force virtual server template'; $wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.'; $wb["web_php_options_notempty"] = 'No PHP option(s) selected. Select at least one PHP option.'; $wb["ssh_chroot_notempty"] = 'No SSH chroot option selected. Select at least one SSH option.'; -$wb["username_error_collision"] = 'The username may not start with the word -web- or -web- followed by a number'; +$wb["username_error_collision"] = 'The username may not start with the word -web- or -web- followed by a number.'; ?> diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng index c1e937584b9ee71986a3222d754c821e1864f7bb..504db4c13b077508417212cedeff27bdc25b537d 100644 --- a/interface/web/client/lib/lang/en_reseller.lng +++ b/interface/web/client/lib/lang/en_reseller.lng @@ -108,5 +108,5 @@ $wb["limit_openvz_vm_template_id_txt"] = 'Force virtual server template'; $wb["limit_openvz_vm_error_notint"] = 'The virtual server limit must be a number.'; $wb["web_php_options_notempty"] = 'No PHP option(s) selected. Select at least one PHP option.'; $wb["ssh_chroot_notempty"] = 'No SSH chroot option selected. Select at least one SSH option.'; -$wb["username_error_collision"] = 'The username may not start with the word -web- or -web- followed by a number'; +$wb["username_error_collision"] = 'The username may not start with the word -web- or -web- followed by a number.'; ?> diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php index 650b8432b45857ef9cb920bab81b63fe79bfe7dd..f218bf0fd9422d7aa1ee4a800ab7c2852e50611a 100644 --- a/server/plugins-available/apache2_plugin.inc.php +++ b/server/plugins-available/apache2_plugin.inc.php @@ -288,6 +288,10 @@ class apache2_plugin { $app->log('Websites cannot be owned by the root user or group.',LOGLEVEL_WARN); return 0; } + if(trim($data['new']['domain']) == '') { + $app->log('domain is empty',LOGLEVEL_WARN); + return 0; + } // Create group and user, if not exist $app->uses('system');