Commit 9add999c authored by tbrehm's avatar tbrehm

- Skip processing of vhost in apache plugin when domain field is empty.

- Improved error message in client and reseller language file.
parent 6361e431
......@@ -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.';
?>
......@@ -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.';
?>
......@@ -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');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment