Commit e94a9fb5 authored by tbrehm's avatar tbrehm

Merged revisions...

Merged revisions 3049-3051,3053-3054,3058,3070,3074-3077,3082,3086-3088,3091-3092,3094-3095 from stable branch.
parent 4c28d9c3
......@@ -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
......
......@@ -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'));
}
}
......
......@@ -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
......
......@@ -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'));
}
......
......@@ -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
......
......@@ -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]."<br>\r\n";
} else {
return $errmsg."<br>\r\n";
}
}
}
......
......@@ -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;
......
<?php
/*
Copyright (c) 2005 - 2008, Till Brehm, projektfarm Gmbh
Copyright (c) 2005 - 2012, Till Brehm, projektfarm Gmbh, ISPConfig UG
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
......
<?php
/*
Copyright (c) 2012, Till Brehm, ISPConfig UG
All rights reserved.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of ISPConfig nor the names of its contributors
may be used to endorse or promote products derived from this software without
specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
require_once('../../lib/config.inc.php');
require_once('../../lib/app.inc.php');
//* Check permissions for module
$app->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'].'<br />';
if(empty($_POST['subject'])) $error .= $wb['subject_invalid_error'].'<br />';
if(empty($_POST['message'])) $error .= $wb['message_invalid_error'].'<br />';
//* 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();
?>
......@@ -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'),
),
......
......@@ -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'),
),
......
......@@ -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';
?>
......@@ -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.';
?>
<?php
$wb["btn_send_txt"] = 'Send email';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["sender_txt"] = 'Sender email address';
$wb["subject_txt"] = 'Subject';
$wb["message_txt"] = 'Message';
$wb["form_legend_client_txt"] = 'Send email message to all clients.';
$wb["form_legend_admin_txt"] = 'Send email message to all clients and resellers.';
$wb["sender_invalid_error"] = 'Sender email invalid.';
$wb["subject_invalid_error"] = 'Subject is empty.';
$wb["message_invalid_error"] = 'Message is empty.';
$wb["email_sent_to_txt"] = 'Email sent to:';
?>
......@@ -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.';
?>
......@@ -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';
?>
......@@ -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.';
?>
<?php
$wb["btn_send_txt"] = 'Send email';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["sender_txt"] = 'Sender email address';
$wb["subject_txt"] = 'Subject';
$wb["message_txt"] = 'Message';
$wb["form_legend_client_txt"] = 'Send email message to all clients.';
$wb["form_legend_admin_txt"] = 'Send email message to all clients and resellers.';
$wb["sender_invalid_error"] = 'Sender email invalid.';
$wb["subject_invalid_error"] = 'Subject is empty.';
$wb["message_invalid_error"] = 'Message is empty.';
$wb["email_sent_to_txt"] = 'Email sent to:';
?>
......@@ -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.';
?>
......@@ -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';
?>
......@@ -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.';
?>
<?php
$wb["btn_send_txt"] = 'Send email';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["sender_txt"] = 'Sender email address';
$wb["subject_txt"] = 'Subject';
$wb["message_txt"] = 'Message';
$wb["form_legend_client_txt"] = 'Send email message to all clients.';
$wb["form_legend_admin_txt"] = 'Send email message to all clients and resellers.';
$wb["sender_invalid_error"] = 'Sender email invalid.';
$wb["subject_invalid_error"] = 'Subject is empty.';
$wb["message_invalid_error"] = 'Message is empty.';
$wb["email_sent_to_txt"] = 'Email sent to:';
?>
......@@ -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.';
?>
......@@ -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';
?>
......@@ -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.';
?>
<?php
$wb["btn_send_txt"] = 'Send email';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["sender_txt"] = 'Sender email address';
$wb["subject_txt"] = 'Subject';
$wb["message_txt"] = 'Message';
$wb["form_legend_client_txt"] = 'Send email message to all clients.';
$wb["form_legend_admin_txt"] = 'Send email message to all clients and resellers.';
$wb["sender_invalid_error"] = 'Sender email invalid.';
$wb["subject_invalid_error"] = 'Subject is empty.';
$wb["message_invalid_error"] = 'Message is empty.';
$wb["email_sent_to_txt"] = 'Email sent to:';
?>
......@@ -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.';
?>
......@@ -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';
?>
......@@ -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';
......
<?php
$wb["btn_send_txt"] = 'Send email';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["sender_txt"] = 'Sender email address';
$wb["subject_txt"] = 'Subject';
$wb["message_txt"] = 'Message';
$wb["form_legend_client_txt"] = 'Send email message to all clients.';
$wb["form_legend_admin_txt"] = 'Send email message to all clients and resellers.';
$wb["sender_invalid_error"] = 'Sender email invalid.';
$wb["subject_invalid_error"] = 'Subject is empty.';
$wb["message_invalid_error"] = 'Message is empty.';
$wb["email_sent_to_txt"] = 'Email sent to:';
?>
......@@ -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';
......
......@@ -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';
?>
......@@ -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.';
?>
<?php
$wb["btn_send_txt"] = 'Send email';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["sender_txt"] = 'Sender email address';
$wb["subject_txt"] = 'Subject';
$wb["message_txt"] = 'Message';
$wb["form_legend_client_txt"] = 'Send email message to all clients.';
$wb["form_legend_admin_txt"] = 'Send email message to all clients and resellers.';
$wb["sender_invalid_error"] = 'Sender email invalid.';
$wb["subject_invalid_error"] = 'Subject is empty.';
$wb["message_invalid_error"] = 'Message is empty.';
$wb["email_sent_to_txt"] = 'Email sent to:';
?>
......@@ -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.';
?>
......@@ -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
......@@ -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';
......
<?php
$wb["btn_send_txt"] = 'Send email';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["sender_txt"] = 'Sender email address';
$wb["subject_txt"] = 'Subject';
$wb["message_txt"] = 'Message';
$wb["form_legend_client_txt"] = 'Send email message to all clients.';
$wb["form_legend_admin_txt"] = 'Send email message to all clients and resellers.';
$wb["sender_invalid_error"] = 'Sender email invalid.';
$wb["subject_invalid_error"] = 'Subject is empty.';
$wb["message_invalid_error"] = 'Message is empty.';
$wb["email_sent_to_txt"] = 'Email sent to:';
?>
......@@ -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';
......
......@@ -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';
?>
......@@ -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.';
?>
<?php
$wb["btn_send_txt"] = 'Send email';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["sender_txt"] = 'Sender email address';
$wb["subject_txt"] = 'Subject';
$wb["message_txt"] = 'Message';
$wb["form_legend_client_txt"] = 'Send email message to all clients.';
$wb["form_legend_admin_txt"] = 'Send email message to all clients and resellers.';
$wb["sender_invalid_error"] = 'Sender email invalid.';
$wb["subject_invalid_error"] = 'Subject is empty.';
$wb["message_invalid_error"] = 'Message is empty.';
$wb["email_sent_to_txt"] = 'Email sent to:';
?>
......@@ -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.';
?>
......@@ -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';
?>
......@@ -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.';
?>
<?php
$wb["btn_send_txt"] = 'Send email';
$wb["btn_cancel_txt"] = 'Cancel';
$wb["sender_txt"] = 'Sender email address';
$wb["subject_txt"] = 'Subject';
$wb["message_txt"] = 'Message';
$wb["form_legend_client_txt"] = 'Send email message to all clients.';
$wb["form_legend_admin_txt"] = 'Send email message to all clients and resellers.';
$wb["sender_invalid_error"] = 'Sender email invalid.';
$wb["subject_invalid_error"] = 'Subject is empty.';
$wb["message_invalid_error"] = 'Message is empty.';
$wb["email_sent_to_txt"] = 'Email sent to:';
?>
......@@ -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.';
?>
......@@ -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';
?>
......@@ -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.';
?>
<?php
$wb["btn_send_txt"] = 'Send email';
$wb["btn_cancel_txt"] = 'Cancel';