From 9add999c5036b0e32acbac37001adbbbc62dfa3c Mon Sep 17 00:00:00 2001 From: tbrehm Date: Mon, 16 Apr 2012 13:03:44 +0000 Subject: [PATCH] - Skip processing of vhost in apache plugin when domain field is empty. - Improved error message in client and reseller language file. --- interface/web/client/lib/lang/en_client.lng | 2 +- interface/web/client/lib/lang/en_reseller.lng | 2 +- server/plugins-available/apache2_plugin.inc.php | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng index ba7bf1164..1b37e8665 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 c1e937584..504db4c13 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 650b8432b..f218bf0fd 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'); -- GitLab