diff --git a/install/dist/conf/opensuse110.conf.php b/install/dist/conf/opensuse110.conf.php
index 19b6d7af9e38f1b7987c52e658a2e25840e16372..e57d9be4674f265b1dd89c7170011b6811c5b912 100644
--- a/install/dist/conf/opensuse110.conf.php
+++ b/install/dist/conf/opensuse110.conf.php
@@ -97,7 +97,7 @@ $conf['web']['apps_vhost_user'] = 'ispapps';
$conf['web']['apps_vhost_group'] = 'ispapps';
//* Fastcgi
-$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/cgi/';
+$conf['fastcgi']['fastcgi_phpini_path'] = '/etc/php5/fastcgi/';
$conf['fastcgi']['fastcgi_starter_path'] = '/srv/www/php-fcgi-scripts/[system_user]/';
//* Postfix
diff --git a/install/dist/lib/fedora.lib.php b/install/dist/lib/fedora.lib.php
index 4fbd4b555080e11192a19225c994aef0344fdd5b..ba1c285fa2260028cc0ec97967b0b32af6683e42 100644
--- a/install/dist/lib/fedora.lib.php
+++ b/install/dist/lib/fedora.lib.php
@@ -1043,9 +1043,8 @@ class installer_dist extends installer_base {
replaceLine('/etc/sudoers','Defaults requiretty','#Defaults requiretty',0,0);
if(is_dir($install_dir.'/interface/invoices')) {
- chmod($install_dir.'/interface/invoices', 0770);
- chown($install_dir.'/interface/invoices', 'ispconfig');
- chgrp($install_dir.'/interface/invoices', 'ispconfig');
+ exec('chmod -R 770 '.escapeshellarg($install_dir.'/interface/invoices'));
+ exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
}
}
diff --git a/install/dist/lib/gentoo.lib.php b/install/dist/lib/gentoo.lib.php
index deb03f30014eeff4edf4f1411934e816e1204279..5e5c93c2ae4a78b128fef7479279928d8296572d 100644
--- a/install/dist/lib/gentoo.lib.php
+++ b/install/dist/lib/gentoo.lib.php
@@ -874,9 +874,8 @@ class installer extends installer_base
}
if(is_dir($install_dir.'/interface/invoices')) {
- chmod($install_dir.'/interface/invoices', 0770);
- chown($install_dir.'/interface/invoices', 'ispconfig');
- chgrp($install_dir.'/interface/invoices', 'ispconfig');
+ exec('chmod -R 770 '.escapeshellarg($install_dir.'/interface/invoices'));
+ exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
}
// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 8a46e3c3a87199dd253d25c4313db04cfd69dbcf..88f508a5c2d07349307d43ab51f30a83e99162c4 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -1084,9 +1084,8 @@ class installer_dist extends installer_base {
}
if(is_dir($install_dir.'/interface/invoices')) {
- chmod($install_dir.'/interface/invoices', 0770);
- chown($install_dir.'/interface/invoices', 'ispconfig');
- chgrp($install_dir.'/interface/invoices', 'ispconfig');
+ exec('chmod -R 770 '.escapeshellarg($install_dir.'/interface/invoices'));
+ exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
}
diff --git a/install/lib/installer_base.lib.php b/install/lib/installer_base.lib.php
index 4686aa3a09793cf030dfd491d382678ccfcb802c..94a176a78bda87cda83fade7172ba5735167b068 100644
--- a/install/lib/installer_base.lib.php
+++ b/install/lib/installer_base.lib.php
@@ -1784,9 +1784,8 @@ class installer_base {
}
if(is_dir($install_dir.'/interface/invoices')) {
- chmod($install_dir.'/interface/invoices', 0770);
- chown($install_dir.'/interface/invoices', 'ispconfig');
- chgrp($install_dir.'/interface/invoices', 'ispconfig');
+ exec('chmod -R 770 '.escapeshellarg($install_dir.'/interface/invoices'));
+ exec('chown -R ispconfig:ispconfig '.escapeshellarg($install_dir.'/interface/invoices'));
}
// TODO: FIXME: add the www-data user to the ispconfig group. This is just for testing
diff --git a/interface/lib/classes/validate_client.inc.php b/interface/lib/classes/validate_client.inc.php
index 97b9221822caacb2f07b90aa93052aa3d8c309ec..9b0546a600b7b814632f24f7e28e3b7a5cc33349 100644
--- a/interface/lib/classes/validate_client.inc.php
+++ b/interface/lib/classes/validate_client.inc.php
@@ -65,6 +65,36 @@ class validate_client {
}
}
+ function username_collision($field_name, $field_value, $validator) {
+ global $app;
+
+ if(isset($app->remoting_lib->primary_id)) {
+ $client_id = $app->remoting_lib->primary_id;
+ } else {
+ $client_id = $app->tform->primary_id;
+ }
+
+ $app->uses('getconf');
+ $global_config = $app->getconf->get_global_config('sites');
+
+ if((trim($field_value) == 'web' || preg_match('/^web[0-9]/',$field_value)) &&
+ ($global_config['ftpuser_prefix'] == '[CLIENTNAME]' ||
+ $global_config['ftpuser_prefix'] == '' ||
+ $global_config['shelluser_prefix'] == '[CLIENTNAME]' ||
+ $global_config['shelluser_prefix'] == '' )) {
+ $errmsg = $validator['errmsg'];
+ if(isset($app->tform->wordbook[$errmsg])) {
+ return $app->tform->wordbook[$errmsg]." \r\n";
+ } else {
+ return $errmsg." \r\n";
+ }
+ }
+
+
+
+
+ }
+
diff --git a/interface/lib/plugins/vm_openvz_plugin.inc.php b/interface/lib/plugins/vm_openvz_plugin.inc.php
index b1ce8e618d8ff0cbc6c3da484914f20a87c5a33b..42a653033b4ceec5057a0e33b7e8fdc28e6ef936 100644
--- a/interface/lib/plugins/vm_openvz_plugin.inc.php
+++ b/interface/lib/plugins/vm_openvz_plugin.inc.php
@@ -173,6 +173,7 @@ class vm_openvz_plugin {
$tpl->setVar('numfile',$vm_template['numfile']);
$tpl->setVar('avnumproc',$vm_template['avnumproc']);
$tpl->setVar('numiptent',$vm_template['numiptent']);
+ $tpl->setVar('swappages',$vm_template['swappages']);
$diskspace = $vm['diskspace']*1048576;
$diskinodes = $vm['diskspace']*524288;
diff --git a/interface/web/client/client_edit.php b/interface/web/client/client_edit.php
index c5d7ba4556bc5f33a002ac739c788241b0fa335b..76616fc26f5b0b28b5e358ae6ea5c09f2d3fd42a 100644
--- a/interface/web/client/client_edit.php
+++ b/interface/web/client/client_edit.php
@@ -1,6 +1,6 @@
auth->check_module_permissions('client');
+
+//* This function is not available in demo mode
+if($conf['demo_mode'] == true) $app->error('This function is disabled in demo mode.');
+
+$app->uses('tpl');
+
+$app->tpl->newTemplate('form.tpl.htm');
+$app->tpl->setInclude('content_tpl', 'templates/client_message.htm');
+
+//* load language file
+$lng_file = 'lib/lang/'.$_SESSION['s']['language'].'_client_message.lng';
+include($lng_file);
+$app->tpl->setVar($wb);
+
+$msg = '';
+$error = '';
+
+//* Save data
+if(isset($_POST) && count($_POST) > 1) {
+
+ //* Check values
+ if(!preg_match("/^\w+[\w\.\-\+]*\w{0,}@\w+[\w.-]*\w+\.[a-zA-Z0-9\-]{2,30}$/i", $_POST['sender'])) $error .= $wb['sender_invalid_error'].' ';
+ if(empty($_POST['subject'])) $error .= $wb['subject_invalid_error'].' ';
+ if(empty($_POST['message'])) $error .= $wb['message_invalid_error'].' ';
+
+ //* Send message
+ if($error == '') {
+ //* Select all clients and resellers
+ if($_SESSION["s"]["user"]["typ"] == 'admin'){
+ $sql = "SELECT * FROM client WHERE email != ''";
+ } else {
+ $client_id = intval($_SESSION['s']['user']['client_id']);
+ if($client_id == 0) die('Invalid Client ID.');
+ $sql = "SELECT * FROM client WHERE email != '' AND parent_client_id = '$client_id'";
+ }
+
+ //* Get clients
+ $clients = $app->db->queryAllRecords($sql);
+ if(is_array($clients)) {
+ $msg = $wb['email_sent_to_txt'].' ';
+ foreach($clients as $client) {
+
+ //* Parse cleint details into message
+ $message = $_POST['message'];
+ foreach($client as $key => $val) {
+ $message = str_replace('{'.$key.'}', $val, $message);
+ }
+
+ //* Send the email
+ $app->functions->mail($client['email'], $_POST['subject'], $message, $_POST['sender']);
+ $msg .= $client['email'].', ';
+ }
+ $msg = substr($msg,0,-2);
+ }
+
+ } else {
+ $app->tpl->setVar('sender',$_POST['sender']);
+ $app->tpl->setVar('subject',$_POST['subject']);
+ $app->tpl->setVar('message',$_POST['message']);
+ }
+}
+
+if($_SESSION["s"]["user"]["typ"] == 'admin'){
+ $app->tpl->setVar('form_legend_txt',$wb['form_legend_admin_txt']);
+} else {
+ $app->tpl->setVar('form_legend_txt',$wb['form_legend_client_txt']);
+}
+
+$app->tpl->setVar('okmsg',$msg);
+$app->tpl->setVar('error',$error);
+
+$app->tpl_defaults();
+$app->tpl->pparse();
+
+
+?>
diff --git a/interface/web/client/form/client.tform.php b/interface/web/client/form/client.tform.php
index 3fca605ef9c447f3c0ba7321c17eb7a7f53712b4..d29a54c8df3440eb73142c3a82b53598c1a88438 100644
--- a/interface/web/client/form/client.tform.php
+++ b/interface/web/client/form/client.tform.php
@@ -134,7 +134,11 @@ $form["tabs"]['address'] = array (
'class' => 'validate_client',
'function' => 'username_unique',
'errmsg'=> 'username_error_unique'),
- 2 => array ( 'type' => 'REGEX',
+ 2 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_client',
+ 'function' => 'username_collision',
+ 'errmsg'=> 'username_error_collision'),
+ 3 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-\_]{0,64}$/',
'errmsg'=> 'username_error_regex'),
),
diff --git a/interface/web/client/form/reseller.tform.php b/interface/web/client/form/reseller.tform.php
index c60d136d979f95acfa027463e810debed98b031c..f78e98a783dbf0291458de16db30c2da3d9e36e6 100644
--- a/interface/web/client/form/reseller.tform.php
+++ b/interface/web/client/form/reseller.tform.php
@@ -126,7 +126,11 @@ $form["tabs"]['address'] = array (
'class' => 'validate_client',
'function' => 'username_unique',
'errmsg'=> 'username_error_unique'),
- 2 => array ( 'type' => 'REGEX',
+ 2 => array ( 'type' => 'CUSTOM',
+ 'class' => 'validate_client',
+ 'function' => 'username_collision',
+ 'errmsg'=> 'username_error_collision'),
+ 3 => array ( 'type' => 'REGEX',
'regex' => '/^[\w\.\-\_]{0,64}$/',
'errmsg'=> 'username_error_regex'),
),
diff --git a/interface/web/client/lib/lang/ar.lng b/interface/web/client/lib/lang/ar.lng
index 9d70b064a836abfa6f3f934b6b1fbfb6335cc803..44ad01a7d7f898dd525d614b5850cd3315296c57 100644
--- a/interface/web/client/lib/lang/ar.lng
+++ b/interface/web/client/lib/lang/ar.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Resellers';
$wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/ar_client.lng b/interface/web/client/lib/lang/ar_client.lng
index f688fd5f7d0c2bc7e2fb01b07b1af3833e222fb6..cd252a060c48e7cce2365ca0dc5edef55bcda406 100644
--- a/interface/web/client/lib/lang/ar_client.lng
+++ b/interface/web/client/lib/lang/ar_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/ar_client_message.lng b/interface/web/client/lib/lang/ar_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/ar_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/ar_reseller.lng b/interface/web/client/lib/lang/ar_reseller.lng
index ea62daf721a76e25189f44f40bee4b81f055a86f..e097df03aea3f6b9e54f160024e18c9f33479b6a 100644
--- a/interface/web/client/lib/lang/ar_reseller.lng
+++ b/interface/web/client/lib/lang/ar_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/bg.lng b/interface/web/client/lib/lang/bg.lng
index 5f1f246ff752aa2d628dd33d3eadfd7f9a2d79ad..a1ad57d3b69c08156200e57ddbce3d96aa961810 100644
--- a/interface/web/client/lib/lang/bg.lng
+++ b/interface/web/client/lib/lang/bg.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Resellers';
$wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/bg_client.lng b/interface/web/client/lib/lang/bg_client.lng
index 830109f18ef4b3f1b35a70ef90ae4dba6705cc5d..650511ed00272c2a85d675d8a3eb64e863587185 100644
--- a/interface/web/client/lib/lang/bg_client.lng
+++ b/interface/web/client/lib/lang/bg_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/bg_client_message.lng b/interface/web/client/lib/lang/bg_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/bg_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/bg_reseller.lng b/interface/web/client/lib/lang/bg_reseller.lng
index ea62daf721a76e25189f44f40bee4b81f055a86f..e097df03aea3f6b9e54f160024e18c9f33479b6a 100644
--- a/interface/web/client/lib/lang/bg_reseller.lng
+++ b/interface/web/client/lib/lang/bg_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/br.lng b/interface/web/client/lib/lang/br.lng
index c47aa91e6598eed17e1730db74d82bf680aaea84..886e81db290a5a110a70c3af0e76ad0c239d2001 100644
--- a/interface/web/client/lib/lang/br.lng
+++ b/interface/web/client/lib/lang/br.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Revendedores';
$wb['error_has_clients'] = 'Este revendedor possui clientes. Você deve remover os clientes primeiro.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/br_client.lng b/interface/web/client/lib/lang/br_client.lng
index f900d5b8318d8c0e28b2f1f67154e5b5c8856e08..70b33a6ecf32cb0128c860c83eb8b7c2dc2f32f5 100644
--- a/interface/web/client/lib/lang/br_client.lng
+++ b/interface/web/client/lib/lang/br_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/br_client_message.lng b/interface/web/client/lib/lang/br_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/br_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/br_reseller.lng b/interface/web/client/lib/lang/br_reseller.lng
index 670d6756b5c36cbc39f4646aff980b80386cf9c9..3b47cc50bc2e6b74b49eb857263634608e996e8f 100644
--- a/interface/web/client/lib/lang/br_reseller.lng
+++ b/interface/web/client/lib/lang/br_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/cz.lng b/interface/web/client/lib/lang/cz.lng
index eeef0fcf6c9b38b6451ba2517bad74d11a16cc81..6cae801cb6d31530016fd4e54459af05926318bf 100644
--- a/interface/web/client/lib/lang/cz.lng
+++ b/interface/web/client/lib/lang/cz.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Distributoři';
$wb['error_has_clients'] = 'Distributor má klienty. Nejdříve smažte tyto klienty.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/cz_client.lng b/interface/web/client/lib/lang/cz_client.lng
index b6a4d22e2f4fb2891d8f2a7f4cf9f64b4d58409f..df4a92778d20bb2db1aeec6229b40515ab7f84db 100644
--- a/interface/web/client/lib/lang/cz_client.lng
+++ b/interface/web/client/lib/lang/cz_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/cz_client_message.lng b/interface/web/client/lib/lang/cz_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/cz_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/cz_reseller.lng b/interface/web/client/lib/lang/cz_reseller.lng
index 75d4cf469e68b5f250564bacafde9f5f803b9d6d..90e6832cd9e8150836d8f7229e5d8384c24d3b6a 100644
--- a/interface/web/client/lib/lang/cz_reseller.lng
+++ b/interface/web/client/lib/lang/cz_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/de.lng b/interface/web/client/lib/lang/de.lng
index 89617e20afe5c630abdc13e4bf87592bb30971d6..60c9d057022f80a80d09c3e71d9ae4b4701eda50 100644
--- a/interface/web/client/lib/lang/de.lng
+++ b/interface/web/client/lib/lang/de.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Reseller';
$wb['error_has_clients'] = 'Dieser Reseller besitzt Kunden. Bitte zuerst die Kunden löschen.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/de_client.lng b/interface/web/client/lib/lang/de_client.lng
index 587d0d5069fdeb01c6f1c96a74b9a0fc0df82e09..46c41a8c795adbd7fda142166b42596f67f512cf 100644
--- a/interface/web/client/lib/lang/de_client.lng
+++ b/interface/web/client/lib/lang/de_client.lng
@@ -106,6 +106,7 @@ $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['bank_account_number_txt'] = 'Kontonr.';
$wb['bank_code_txt'] = 'BLZ';
$wb['bank_name_txt'] = 'Bank';
diff --git a/interface/web/client/lib/lang/de_client_message.lng b/interface/web/client/lib/lang/de_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/de_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/de_reseller.lng b/interface/web/client/lib/lang/de_reseller.lng
index b34bd1cccda2aa078124bc84a23d0d3a6a4d8976..0664e88bf6d4de1e0aa303d14044b02901225733 100644
--- a/interface/web/client/lib/lang/de_reseller.lng
+++ b/interface/web/client/lib/lang/de_reseller.lng
@@ -106,6 +106,7 @@ $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["web_limits_txt"] = 'Web-Limits';
$wb["email_limits_txt"] = 'Email-Limits';
$wb["database_limits_txt"] = 'Datenbank-Limits';
diff --git a/interface/web/client/lib/lang/el.lng b/interface/web/client/lib/lang/el.lng
index cc2433aba0b0192848a22f01c6c974e2d0dc74a2..87294f68419377ac6b1d2e21ce0df733115234d7 100644
--- a/interface/web/client/lib/lang/el.lng
+++ b/interface/web/client/lib/lang/el.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Μεταπωλητές';
$wb['error_has_clients'] = 'Ο Μεταπωλητής έχει πελάτες. Διαγράψτε πρώτα τους πελάτες.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/el_client.lng b/interface/web/client/lib/lang/el_client.lng
index 6df5a003178d1ca48de0e0638f717f21f7e23d5f..e0e1387a1a0ddd303aa52e2f3d9a018b72e9a013 100644
--- a/interface/web/client/lib/lang/el_client.lng
+++ b/interface/web/client/lib/lang/el_client.lng
@@ -106,4 +106,5 @@ $wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπ
$wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.';
$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.';
?>
diff --git a/interface/web/client/lib/lang/el_client_message.lng b/interface/web/client/lib/lang/el_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/el_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/el_reseller.lng b/interface/web/client/lib/lang/el_reseller.lng
index 79e54efae0bad63c71043a86bc43e3c87fd87421..3403175557851929a4b37832aa6cf50d434505da 100644
--- a/interface/web/client/lib/lang/el_reseller.lng
+++ b/interface/web/client/lib/lang/el_reseller.lng
@@ -106,4 +106,5 @@ $wb['limit_openvz_vm_template_id_txt'] = 'Εξαναγκασμός προτύπ
$wb['limit_openvz_vm_error_notint'] = 'Το όριο εικονικών server πρέπει να είναι αριθμός.';
$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.';
?>
diff --git a/interface/web/client/lib/lang/en.lng b/interface/web/client/lib/lang/en.lng
index 4b10b2b8e687a879d6f69aa92cbdc6693a9372d4..03e36b2ceb254a8df92a473cfb90fcbd7aa7f069 100644
--- a/interface/web/client/lib/lang/en.lng
+++ b/interface/web/client/lib/lang/en.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Resellers';
$wb["error_has_clients"] = 'This reseller has clients. Delete the clients of the reseller first.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
\ No newline at end of file
diff --git a/interface/web/client/lib/lang/en_client.lng b/interface/web/client/lib/lang/en_client.lng
index d912744554f3169603b115445347518c0d6fa4f4..3a9f30e31df8e26272f428fd1b9c1fda030479bd 100644
--- a/interface/web/client/lib/lang/en_client.lng
+++ b/interface/web/client/lib/lang/en_client.lng
@@ -109,6 +109,7 @@ $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["bank_account_number_txt"] = 'Bank account no.';
$wb["bank_code_txt"] = 'Bank code';
$wb["bank_name_txt"] = 'Bank name';
diff --git a/interface/web/client/lib/lang/en_client_message.lng b/interface/web/client/lib/lang/en_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/en_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/en_reseller.lng b/interface/web/client/lib/lang/en_reseller.lng
index df2ec24ace746415a6d8eb913ae072d0b0d33aad..4863a4eb09a62b917ab306def6ab9a82870092c9 100644
--- a/interface/web/client/lib/lang/en_reseller.lng
+++ b/interface/web/client/lib/lang/en_reseller.lng
@@ -108,6 +108,7 @@ $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["web_limits_txt"] = 'Web Limits';
$wb["email_limits_txt"] = 'Email Limits';
$wb["database_limits_txt"] = 'Database Limits';
diff --git a/interface/web/client/lib/lang/es.lng b/interface/web/client/lib/lang/es.lng
index 9f72fe574b4f95a21fb204a2fe97d1090e95897b..8d77b9203f61e4b48c1e901cb731650cbc29f0b2 100644
--- a/interface/web/client/lib/lang/es.lng
+++ b/interface/web/client/lib/lang/es.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Revendedores';
$wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/es_client.lng b/interface/web/client/lib/lang/es_client.lng
index 3c461a54addc0cedd1d0c3e89eceecb72c6b75cb..047e70a2dda94784307d028a892ed9760d3f1a22 100644
--- a/interface/web/client/lib/lang/es_client.lng
+++ b/interface/web/client/lib/lang/es_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/es_client_message.lng b/interface/web/client/lib/lang/es_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/es_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/es_reseller.lng b/interface/web/client/lib/lang/es_reseller.lng
index 23ea38e5e84a47c4ae834388afb562b221094ecb..412bafe02d34c0c1f8c0ea624cf906bafb89dd74 100644
--- a/interface/web/client/lib/lang/es_reseller.lng
+++ b/interface/web/client/lib/lang/es_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/fi.lng b/interface/web/client/lib/lang/fi.lng
index 538902414f0e7a8241a1075efd13263476a26820..243ac6db499e6a01df240cd7427c2fbc075ecc08 100755
--- a/interface/web/client/lib/lang/fi.lng
+++ b/interface/web/client/lib/lang/fi.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Jälleenmyyjät';
$wb['error_has_clients'] = 'Tällä jälleenmyyjällä on asiakkaita, poista ne ensin.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/fi_client.lng b/interface/web/client/lib/lang/fi_client.lng
index 45fbefa3b2f4eb85b7d6ef74b379cb1c8beea3e3..30f111e94dd010e14abb6451dd40cd6ff454d0fc 100755
--- a/interface/web/client/lib/lang/fi_client.lng
+++ b/interface/web/client/lib/lang/fi_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/fi_client_message.lng b/interface/web/client/lib/lang/fi_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/fi_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/fi_reseller.lng b/interface/web/client/lib/lang/fi_reseller.lng
index bc4b368654cd68cbaa52bbcc16f5ebc9dc80aa9c..0bc176186dd3ebbafeb5864b2a13d6608cb77d83 100644
--- a/interface/web/client/lib/lang/fi_reseller.lng
+++ b/interface/web/client/lib/lang/fi_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/fr.lng b/interface/web/client/lib/lang/fr.lng
index 624247c7f0f13df3e4811a9c6e9312c1bea17569..a7e1738015c12f0a29908174aab821c57806476d 100644
--- a/interface/web/client/lib/lang/fr.lng
+++ b/interface/web/client/lib/lang/fr.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Revendeurs';
$wb['error_has_clients'] = 'Ce revendeur a des clients. Effacez dabord les clients de ce revendeur.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/fr_client.lng b/interface/web/client/lib/lang/fr_client.lng
index 3254ca0efbf600f17b3d63834b4f661ece8d0b03..38e85f6cf75a5973e2a62719078315a84425383e 100644
--- a/interface/web/client/lib/lang/fr_client.lng
+++ b/interface/web/client/lib/lang/fr_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/fr_client_message.lng b/interface/web/client/lib/lang/fr_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/fr_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/fr_reseller.lng b/interface/web/client/lib/lang/fr_reseller.lng
index 40b3502cca864ed024b2dec117b032b1617a9b4a..d9387747f099f15ee639c39eec8cc97399643da7 100644
--- a/interface/web/client/lib/lang/fr_reseller.lng
+++ b/interface/web/client/lib/lang/fr_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/hr.lng b/interface/web/client/lib/lang/hr.lng
index 73850f43a32eb2f9ae5e9cc173a24bf38eaa98a3..f4126df215e68f06ed38b068b8f977f3ef666bca 100644
--- a/interface/web/client/lib/lang/hr.lng
+++ b/interface/web/client/lib/lang/hr.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Preprodavači';
$wb['error_has_clients'] = 'Ovaj preprodavač ima klijente. Prvo morate obrisati klijente preprodavača.';
$wb['add_additional_template_txt'] = 'Dodaj dodatni predložak';
$wb['delete_additional_template_txt'] = 'Obriši dodatni predložak';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/hr_client.lng b/interface/web/client/lib/lang/hr_client.lng
index a635281957cf1ec448fd0743a190767ca0b1d6dd..2537d74c1407cf5bcca5f8ffd6f090bca38668ef 100644
--- a/interface/web/client/lib/lang/hr_client.lng
+++ b/interface/web/client/lib/lang/hr_client.lng
@@ -106,4 +106,5 @@ $wb['limit_openvz_vm_template_id_txt'] = 'Primjeni predložak virtualnog servera
$wb['limit_openvz_vm_error_notint'] = 'Broj virtualnih servera mora biti znamenka.';
$wb['web_php_options_notempty'] = 'Nisu izabrane PHP opcije. Izaberite jednu PHP opciju.';
$wb['ssh_chroot_notempty'] = 'Nisu izabrane SSH opcije. Izaberite jednu SSH opciju.';
+$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/hr_client_message.lng b/interface/web/client/lib/lang/hr_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/hr_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/hr_reseller.lng b/interface/web/client/lib/lang/hr_reseller.lng
index 3f932b16a92eea5f2c223e0d2d747b5dc12df4ae..241f3ce442e745cf19663df32661a9bfe29893da 100644
--- a/interface/web/client/lib/lang/hr_reseller.lng
+++ b/interface/web/client/lib/lang/hr_reseller.lng
@@ -106,4 +106,5 @@ $wb['limit_openvz_vm_template_id_txt'] = 'Primjeni predložak virtualnog servera
$wb['limit_openvz_vm_error_notint'] = 'Broj virtualnih servera mora biti znamenka.';
$wb['web_php_options_notempty'] = 'Nisu izabrane PHP opcije. Izaberite jednu PHP opciju.';
$wb['ssh_chroot_notempty'] = 'Nisu izabrane SSH opcije. Izaberite jednu SSH opciju.';
+$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/hu.lng b/interface/web/client/lib/lang/hu.lng
index ee5a41d3430d22ddebea92f2e3a757c087e19fd4..2ad20039aa019302e80531425093492f0468caf1 100644
--- a/interface/web/client/lib/lang/hu.lng
+++ b/interface/web/client/lib/lang/hu.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Viszonteladók';
$wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/hu_client.lng b/interface/web/client/lib/lang/hu_client.lng
index 6bc3a8b8308864d0a5215d6ab2ae6c4268b0f375..f31ec8d278a6e6c8214b15de46e120d3475a6b50 100644
--- a/interface/web/client/lib/lang/hu_client.lng
+++ b/interface/web/client/lib/lang/hu_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/hu_client_message.lng b/interface/web/client/lib/lang/hu_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/hu_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/hu_reseller.lng b/interface/web/client/lib/lang/hu_reseller.lng
index b1d8e0135e0a287dd924b9a8a3e5cb48c3e0d247..6e129d28878f05fe9a5c23427504b00898ab5de0 100644
--- a/interface/web/client/lib/lang/hu_reseller.lng
+++ b/interface/web/client/lib/lang/hu_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/id.lng b/interface/web/client/lib/lang/id.lng
index 09bf4fb48e6730a71e007ba64c23dbc357f95f42..78c0101b83f1cf9f8a77d17bd11e1f60ed2a82da 100644
--- a/interface/web/client/lib/lang/id.lng
+++ b/interface/web/client/lib/lang/id.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Reseller';
$wb['error_has_clients'] = 'Reseller ini memiliki klien. Hapus klien dari reseller terlebih dahulu.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/id_client.lng b/interface/web/client/lib/lang/id_client.lng
index 5465034e5548b23ac249ac9f3096817199fcc0b1..f85bb00113b844bdc2cbb4a90296f7f548a569c4 100644
--- a/interface/web/client/lib/lang/id_client.lng
+++ b/interface/web/client/lib/lang/id_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/id_client_message.lng b/interface/web/client/lib/lang/id_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/id_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/id_reseller.lng b/interface/web/client/lib/lang/id_reseller.lng
index 4ce86492bf4b55afeb881fe2796ca0c92064e672..b03aae63eb0dbc64216bd350712319b85bfc24c9 100644
--- a/interface/web/client/lib/lang/id_reseller.lng
+++ b/interface/web/client/lib/lang/id_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/it.lng b/interface/web/client/lib/lang/it.lng
index 44d29f733a4a8517d5baa2cb24986f47871071ed..9ea1419ebe15cfe6b3c1e10837dc84a7fdf8e3f2 100644
--- a/interface/web/client/lib/lang/it.lng
+++ b/interface/web/client/lib/lang/it.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Rivenditori';
$wb['error_has_clients'] = 'Questo rivenditore ha dei clienti, bisogna cancellarli prima di procedere.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/it_client.lng b/interface/web/client/lib/lang/it_client.lng
index a0f5bba7fe2171c96c2b795f564ae71f96d4bdd1..1682d848efcaccfafbc3cde3598dcf1f64e7f889 100644
--- a/interface/web/client/lib/lang/it_client.lng
+++ b/interface/web/client/lib/lang/it_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/it_client_message.lng b/interface/web/client/lib/lang/it_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/it_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/it_reseller.lng b/interface/web/client/lib/lang/it_reseller.lng
index ea62daf721a76e25189f44f40bee4b81f055a86f..e097df03aea3f6b9e54f160024e18c9f33479b6a 100644
--- a/interface/web/client/lib/lang/it_reseller.lng
+++ b/interface/web/client/lib/lang/it_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/ja.lng b/interface/web/client/lib/lang/ja.lng
index 66ed95ed7d27aa95917b16125a68a35579694c8c..0eb9efe5217d695977d38eabfccf1111724c3fe2 100644
--- a/interface/web/client/lib/lang/ja.lng
+++ b/interface/web/client/lib/lang/ja.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'リセラー';
$wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/ja_client.lng b/interface/web/client/lib/lang/ja_client.lng
index edf1a4fac69e1c35fd8c38b88c8ffc527546ffe9..e8f0c2ae1cf0379f256753a9958cc901aaef3723 100644
--- a/interface/web/client/lib/lang/ja_client.lng
+++ b/interface/web/client/lib/lang/ja_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/ja_client_message.lng b/interface/web/client/lib/lang/ja_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/ja_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/ja_reseller.lng b/interface/web/client/lib/lang/ja_reseller.lng
index b3b08a6a9b7efc7e42af21c4efb6972cc90e6dce..35543702aba94c53eedfbf3ab700b047cbca4b62 100644
--- a/interface/web/client/lib/lang/ja_reseller.lng
+++ b/interface/web/client/lib/lang/ja_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/nl.lng b/interface/web/client/lib/lang/nl.lng
index abfdc9184dded265f67991b4253310e2a55929f9..e344124b1b67a8872a756f035132671cc029de06 100644
--- a/interface/web/client/lib/lang/nl.lng
+++ b/interface/web/client/lib/lang/nl.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Resellers';
$wb['error_has_clients'] = 'Deze reseller heeft klanten. Verwijder eerst de klanten van de reseller';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/nl_client.lng b/interface/web/client/lib/lang/nl_client.lng
index 35234e59b1a159b8f4a6fb91ac7a54a2b3f1f3cf..acbe70cdb33cb20d5042674a4621800e52500e48 100644
--- a/interface/web/client/lib/lang/nl_client.lng
+++ b/interface/web/client/lib/lang/nl_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/nl_client_message.lng b/interface/web/client/lib/lang/nl_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/nl_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/nl_reseller.lng b/interface/web/client/lib/lang/nl_reseller.lng
index 59913a16352b4799ae0f0fee6f65e20f8a48ba13..f9bd57ea6a973f66690ab8249a632efec04008c8 100644
--- a/interface/web/client/lib/lang/nl_reseller.lng
+++ b/interface/web/client/lib/lang/nl_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/pl.lng b/interface/web/client/lib/lang/pl.lng
index f0200d37841f20e54708d2c25c69103a1957af2e..ddecb90ff313697cd67860459964f09f44a664ab 100644
--- a/interface/web/client/lib/lang/pl.lng
+++ b/interface/web/client/lib/lang/pl.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Resellerzy';
$wb['error_has_clients'] = 'Reseller posiada klientów. Usuń ich zanim usuniesz resellera.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/pl_client.lng b/interface/web/client/lib/lang/pl_client.lng
index b822079e4862d0a11e89948e1651aa8c0f487612..e2e3cabfb1a4d784a01a1a2e11667e8faa3f647e 100644
--- a/interface/web/client/lib/lang/pl_client.lng
+++ b/interface/web/client/lib/lang/pl_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/pl_client_message.lng b/interface/web/client/lib/lang/pl_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/pl_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/pl_reseller.lng b/interface/web/client/lib/lang/pl_reseller.lng
index e0631f2b9e47b4fac5df401b85f761638c29b95a..e4ab1fb268b017a291a7622eb7a1c764d08d47c6 100644
--- a/interface/web/client/lib/lang/pl_reseller.lng
+++ b/interface/web/client/lib/lang/pl_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/pt.lng b/interface/web/client/lib/lang/pt.lng
index 8ec6dd1dc0e83621bc98881552c8db757244a9cd..274c0f85609fd670370ed967bc5fa0f47b7a3a3e 100644
--- a/interface/web/client/lib/lang/pt.lng
+++ b/interface/web/client/lib/lang/pt.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Revendedores';
$wb['error_has_clients'] = 'Este revendedor possui clientes. Deve remover os clientes primeiro.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/pt_client.lng b/interface/web/client/lib/lang/pt_client.lng
index bdc3f7eb8775ca8853640a0e5b0e8301f89f79c9..7cf9c96042e67a61813d4030d1fa3b5072b36f52 100644
--- a/interface/web/client/lib/lang/pt_client.lng
+++ b/interface/web/client/lib/lang/pt_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/pt_client_message.lng b/interface/web/client/lib/lang/pt_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/pt_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/pt_reseller.lng b/interface/web/client/lib/lang/pt_reseller.lng
index 83c9fa94f87cad5f7cb7a8f9b29e37c54f4f3d19..ac55686f696a56c0f2f8a74bb644cd17a33d8623 100644
--- a/interface/web/client/lib/lang/pt_reseller.lng
+++ b/interface/web/client/lib/lang/pt_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/ro.lng b/interface/web/client/lib/lang/ro.lng
index 9d70b064a836abfa6f3f934b6b1fbfb6335cc803..44ad01a7d7f898dd525d614b5850cd3315296c57 100644
--- a/interface/web/client/lib/lang/ro.lng
+++ b/interface/web/client/lib/lang/ro.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Resellers';
$wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/ro_client.lng b/interface/web/client/lib/lang/ro_client.lng
index 1380813b1f77e874757d673efa5ae7bb84505d70..6712694f529bd2e86c4142815c63374a9f3d39ba 100644
--- a/interface/web/client/lib/lang/ro_client.lng
+++ b/interface/web/client/lib/lang/ro_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/ro_client_message.lng b/interface/web/client/lib/lang/ro_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/ro_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/ro_reseller.lng b/interface/web/client/lib/lang/ro_reseller.lng
index ea62daf721a76e25189f44f40bee4b81f055a86f..e097df03aea3f6b9e54f160024e18c9f33479b6a 100644
--- a/interface/web/client/lib/lang/ro_reseller.lng
+++ b/interface/web/client/lib/lang/ro_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/ru.lng b/interface/web/client/lib/lang/ru.lng
index ec39c062945834af8f62c191e600bc1a01b27dbe..d10a3cc05d016106811c1759163b5feb284b6885 100644
--- a/interface/web/client/lib/lang/ru.lng
+++ b/interface/web/client/lib/lang/ru.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Реселлеры';
$wb['error_has_clients'] = 'У реселлера есть клиенты. Вначале удалите их.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/ru_client.lng b/interface/web/client/lib/lang/ru_client.lng
index ab7c44803cd3eb664993b591810327bb96d4ee23..c18f5b81a2fa90470b9b7c071e1f56318819f664 100644
--- a/interface/web/client/lib/lang/ru_client.lng
+++ b/interface/web/client/lib/lang/ru_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/ru_client_message.lng b/interface/web/client/lib/lang/ru_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/ru_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/ru_reseller.lng b/interface/web/client/lib/lang/ru_reseller.lng
index 3c36e5bc2dca8ca81fc80c9aac106476e6aa9b25..768a8bd8ce7a14cb854c4f0b7db5bd3b2b41d32e 100644
--- a/interface/web/client/lib/lang/ru_reseller.lng
+++ b/interface/web/client/lib/lang/ru_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/se.lng b/interface/web/client/lib/lang/se.lng
index 9d70b064a836abfa6f3f934b6b1fbfb6335cc803..44ad01a7d7f898dd525d614b5850cd3315296c57 100644
--- a/interface/web/client/lib/lang/se.lng
+++ b/interface/web/client/lib/lang/se.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Resellers';
$wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/se_client.lng b/interface/web/client/lib/lang/se_client.lng
index bcefaddf21b91548809c26a8f75ec7131dfbadc2..214a56dab389d4aac4490e5829ea67248594753e 100644
--- a/interface/web/client/lib/lang/se_client.lng
+++ b/interface/web/client/lib/lang/se_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/se_client_message.lng b/interface/web/client/lib/lang/se_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/se_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/se_reseller.lng b/interface/web/client/lib/lang/se_reseller.lng
index ea62daf721a76e25189f44f40bee4b81f055a86f..e097df03aea3f6b9e54f160024e18c9f33479b6a 100644
--- a/interface/web/client/lib/lang/se_reseller.lng
+++ b/interface/web/client/lib/lang/se_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/sk.lng b/interface/web/client/lib/lang/sk.lng
index a6f182ee2e51878cf9d2eb94d6526997fa643148..2f7fe8fdce8c4d26755c5d24794d9fdcc3fe5046 100644
--- a/interface/web/client/lib/lang/sk.lng
+++ b/interface/web/client/lib/lang/sk.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Predajcovia';
$wb['error_has_clients'] = 'This reseller has clients. Delete the clients of the reseller first.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/sk_client.lng b/interface/web/client/lib/lang/sk_client.lng
index 72cd85323181715492442ba4c0f152b68f331209..4c088f4c46e4819bc472cb61d4b58f7120b208c5 100644
--- a/interface/web/client/lib/lang/sk_client.lng
+++ b/interface/web/client/lib/lang/sk_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/sk_client_message.lng b/interface/web/client/lib/lang/sk_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/sk_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/sk_reseller.lng b/interface/web/client/lib/lang/sk_reseller.lng
index 2008e6c1c61a94144b5901b90f42beea9ac306b5..859158bf034833d67ad15c390ff257d710c7aa2a 100644
--- a/interface/web/client/lib/lang/sk_reseller.lng
+++ b/interface/web/client/lib/lang/sk_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/tr.lng b/interface/web/client/lib/lang/tr.lng
index 9caa4cb8c4a8552945c05a8e1af23c78df6d4e76..d336d75967016e8f779569204bd1fc541369c16a 100644
--- a/interface/web/client/lib/lang/tr.lng
+++ b/interface/web/client/lib/lang/tr.lng
@@ -12,4 +12,6 @@ $wb['Resellers'] = 'Resellerlar';
$wb['error_has_clients'] = 'Bu reseller müşterilere sahip. Resellerı silmeden önce müşterilerini silmelisiniz.';
$wb['add_additional_template_txt'] = 'Add additional template';
$wb['delete_additional_template_txt'] = 'Delete additional template';
+$wb['Messaging'] = 'Messaging';
+$wb['Send Email'] = 'Send Email';
?>
diff --git a/interface/web/client/lib/lang/tr_client.lng b/interface/web/client/lib/lang/tr_client.lng
index 117eb4f4bebc4391188fae99f81c3b219bcc1779..8da9085607eeffe185c4d1319ae947e73f93789c 100644
--- a/interface/web/client/lib/lang/tr_client.lng
+++ b/interface/web/client/lib/lang/tr_client.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/lang/tr_client_message.lng b/interface/web/client/lib/lang/tr_client_message.lng
new file mode 100644
index 0000000000000000000000000000000000000000..4f4ef3799f6380b3749c69d50ea7696b64041c5e
--- /dev/null
+++ b/interface/web/client/lib/lang/tr_client_message.lng
@@ -0,0 +1,13 @@
+
diff --git a/interface/web/client/lib/lang/tr_reseller.lng b/interface/web/client/lib/lang/tr_reseller.lng
index ba24fda9b88c684b626715d033b7e3d9b32c2a1e..5022db2d64269bff3b563f5e3f45141c7a8a578c 100644
--- a/interface/web/client/lib/lang/tr_reseller.lng
+++ b/interface/web/client/lib/lang/tr_reseller.lng
@@ -106,4 +106,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.';
?>
diff --git a/interface/web/client/lib/module.conf.php b/interface/web/client/lib/module.conf.php
index f37461d0d9740fe6ded82fad3b8200d5caf15aa7..3e36a26e88782d011f0a389c98da3a4210f4702e 100644
--- a/interface/web/client/lib/module.conf.php
+++ b/interface/web/client/lib/module.conf.php
@@ -52,9 +52,19 @@ $items[] = array( 'title' => "Add Reseller",
$module["nav"][] = array( 'title' => 'Resellers',
'open' => 1,
'items' => $items);
+
+unset($items);
}
+$items[] = array( 'title' => "Send email",
+ 'target' => 'content',
+ 'link' => 'client/client_message.php',
+ 'html_id' => 'reseller_add');
+$module["nav"][] = array( 'title' => 'Messaging',
+ 'open' => 1,
+ 'items' => $items);
+unset($items);
?>
\ No newline at end of file
diff --git a/interface/web/client/templates/client_message.htm b/interface/web/client/templates/client_message.htm
new file mode 100644
index 0000000000000000000000000000000000000000..cc2183ed4b9eba9552ce6a3399f2cf9cd3f1f16b
--- /dev/null
+++ b/interface/web/client/templates/client_message.htm
@@ -0,0 +1,31 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/interface/web/dns/lib/lang/ar_dns_import.lng b/interface/web/dns/lib/lang/ar_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/ar_dns_import.lng
+++ b/interface/web/dns/lib/lang/ar_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/bg_dns_import.lng b/interface/web/dns/lib/lang/bg_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/bg_dns_import.lng
+++ b/interface/web/dns/lib/lang/bg_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/br_dns_import.lng b/interface/web/dns/lib/lang/br_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/br_dns_import.lng
+++ b/interface/web/dns/lib/lang/br_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/cz_dns_import.lng b/interface/web/dns/lib/lang/cz_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/cz_dns_import.lng
+++ b/interface/web/dns/lib/lang/cz_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/de_dns_import.lng b/interface/web/dns/lib/lang/de_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/de_dns_import.lng
+++ b/interface/web/dns/lib/lang/de_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/el_dns_import.lng b/interface/web/dns/lib/lang/el_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/el_dns_import.lng
+++ b/interface/web/dns/lib/lang/el_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/es_dns_import.lng b/interface/web/dns/lib/lang/es_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/es_dns_import.lng
+++ b/interface/web/dns/lib/lang/es_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/fi_dns_import.lng b/interface/web/dns/lib/lang/fi_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/fi_dns_import.lng
+++ b/interface/web/dns/lib/lang/fi_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/fr_dns_import.lng b/interface/web/dns/lib/lang/fr_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/fr_dns_import.lng
+++ b/interface/web/dns/lib/lang/fr_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/hr_dns_import.lng b/interface/web/dns/lib/lang/hr_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/hr_dns_import.lng
+++ b/interface/web/dns/lib/lang/hr_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/hu_dns_import.lng b/interface/web/dns/lib/lang/hu_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/hu_dns_import.lng
+++ b/interface/web/dns/lib/lang/hu_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/id_dns_import.lng b/interface/web/dns/lib/lang/id_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/id_dns_import.lng
+++ b/interface/web/dns/lib/lang/id_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/it_dns_import.lng b/interface/web/dns/lib/lang/it_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/it_dns_import.lng
+++ b/interface/web/dns/lib/lang/it_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/ja_dns_import.lng b/interface/web/dns/lib/lang/ja_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/ja_dns_import.lng
+++ b/interface/web/dns/lib/lang/ja_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/nl_dns_import.lng b/interface/web/dns/lib/lang/nl_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/nl_dns_import.lng
+++ b/interface/web/dns/lib/lang/nl_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/pl_dns_import.lng b/interface/web/dns/lib/lang/pl_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/pl_dns_import.lng
+++ b/interface/web/dns/lib/lang/pl_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/pt_dns_import.lng b/interface/web/dns/lib/lang/pt_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/pt_dns_import.lng
+++ b/interface/web/dns/lib/lang/pt_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/ro_dns_import.lng b/interface/web/dns/lib/lang/ro_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/ro_dns_import.lng
+++ b/interface/web/dns/lib/lang/ro_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/ru_dns_import.lng b/interface/web/dns/lib/lang/ru_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/ru_dns_import.lng
+++ b/interface/web/dns/lib/lang/ru_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/se_dns_import.lng b/interface/web/dns/lib/lang/se_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/se_dns_import.lng
+++ b/interface/web/dns/lib/lang/se_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/sk_dns_import.lng b/interface/web/dns/lib/lang/sk_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/sk_dns_import.lng
+++ b/interface/web/dns/lib/lang/sk_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/lib/lang/tr_dns_import.lng b/interface/web/dns/lib/lang/tr_dns_import.lng
index 536c62f78103cbe5a160d7965f10fe441f86ea09..201a755b36f55e19e247d075c463ced0fc45c030 100644
--- a/interface/web/dns/lib/lang/tr_dns_import.lng
+++ b/interface/web/dns/lib/lang/tr_dns_import.lng
@@ -1,9 +1,8 @@
\ No newline at end of file
+?>
diff --git a/interface/web/dns/list/dns_a.list.php b/interface/web/dns/list/dns_a.list.php
index 1f23439acbe468fe3d540c3fd7da3158a92c2af4..ec32eb8234fba5047dd5016ae17b40f6ccb5930c 100644
--- a/interface/web/dns/list/dns_a.list.php
+++ b/interface/web/dns/list/dns_a.list.php
@@ -55,7 +55,7 @@ $liste["item"][] = array( 'field' => "active",
'prefix' => "",
'suffix' => "",
'width' => "",
- 'value' => array('y' => "