diff --git a/web/add/cron/index.php b/web/add/cron/index.php
index b3c54cb3..f2fd6bf9 100644
--- a/web/add/cron/index.php
+++ b/web/add/cron/index.php
@@ -16,12 +16,12 @@ top_panel($user,$TAB);
//if ($_SESSION['user'] == 'admin') {
if (!empty($_POST['ok'])) {
// Check input
- if (empty($_POST['v_min'])) $errors[] = _('minute');
- if (empty($_POST['v_hour'])) $errors[] = _('hour');
- if (empty($_POST['v_day'])) $errors[] = _('day');
- if (empty($_POST['v_month'])) $errors[] = _('month');
- if (empty($_POST['v_wday'])) $errors[] = _('day of week');
- if (empty($_POST['v_cmd'])) $errors[] = _('cmd');
+ if (empty($_POST['v_min'])) $errors[] = __('minute');
+ if (empty($_POST['v_hour'])) $errors[] = __('hour');
+ if (empty($_POST['v_day'])) $errors[] = __('day');
+ if (empty($_POST['v_month'])) $errors[] = __('month');
+ if (empty($_POST['v_wday'])) $errors[] = __('day of week');
+ if (empty($_POST['v_cmd'])) $errors[] = __('cmd');
// Protect input
$v_min = escapeshellarg($_POST['v_min']);
@@ -40,7 +40,7 @@ top_panel($user,$TAB);
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
} else {
// Add Cron Job
exec (VESTA_CMD."v-add-cron-job ".$user." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var);
@@ -48,12 +48,12 @@ top_panel($user,$TAB);
$v_charset = $_POST['v_charset'];
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
unset($v_password);
unset($output);
} else {
- $_SESSION['ok_msg'] = _('CRON_CREATED_OK');
+ $_SESSION['ok_msg'] = __('CRON_CREATED_OK');
unset($v_min);
unset($v_hour);
unset($v_day);
diff --git a/web/add/db/index.php b/web/add/db/index.php
index e85dab13..aa4de933 100644
--- a/web/add/db/index.php
+++ b/web/add/db/index.php
@@ -16,11 +16,11 @@ $v_db_email = $panel[$user]['CONTACT'];
if (!empty($_POST['ok'])) {
// Check input
- if (empty($_POST['v_database'])) $errors[] = _('database');
- if (empty($_POST['v_dbuser'])) $errors[] = _('username');
- if (empty($_POST['v_password'])) $errors[] = _('password');
- if (empty($_POST['v_type'])) $errors[] = _('type');
- if (empty($_POST['v_charset'])) $errors[] = _('charset');
+ if (empty($_POST['v_database'])) $errors[] = __('database');
+ if (empty($_POST['v_dbuser'])) $errors[] = __('username');
+ if (empty($_POST['v_password'])) $errors[] = __('password');
+ if (empty($_POST['v_type'])) $errors[] = __('type');
+ if (empty($_POST['v_charset'])) $errors[] = __('charset');
// Check for errors
if (!empty($errors[0])) {
@@ -31,13 +31,13 @@ if (!empty($_POST['ok'])) {
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
}
// Validate email
if (!empty($_POST['v_db_email'])) {
if (!filter_var($_POST['v_db_email'], FILTER_VALIDATE_EMAIL)) {
- $_SESSION['error_msg'] = _('Please enter valid email address.');
+ $_SESSION['error_msg'] = __('Please enter valid email address.');
}
}
@@ -52,7 +52,7 @@ if (!empty($_POST['ok'])) {
// Check password length
if (empty($_SESSION['error_msg'])) {
$pw_len = strlen($_POST['v_password']);
- if ($pw_len < 6 ) $_SESSION['error_msg'] = _('Password is too short.',$error_msg);
+ if ($pw_len < 6 ) $_SESSION['error_msg'] = __('Password is too short.',$error_msg);
}
if (empty($_SESSION['error_msg'])) {
@@ -64,7 +64,7 @@ if (!empty($_POST['ok'])) {
$v_charset = $_POST['v_charset'];
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
unset($v_password);
unset($output);
@@ -74,13 +74,13 @@ if (!empty($_POST['ok'])) {
if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
if ($_POST['v_type'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
$to = $v_db_email;
- $subject = _("Database Credentials");
+ $subject = __("Database Credentials");
$hostname = exec('hostname');
- $from = _('MAIL_FROM',$hostname);
- $mailtext = _('DATABASE_READY',$user."_".$_POST['v_database'],$user."_".$_POST['v_dbuser'],$_POST['v_password'],$db_admin_link);
+ $from = __('MAIL_FROM',$hostname);
+ $mailtext = __('DATABASE_READY',$user."_".$_POST['v_database'],$user."_".$_POST['v_dbuser'],$_POST['v_password'],$db_admin_link);
send_email($to, $subject, $mailtext, $from);
}
- $_SESSION['ok_msg'] = _('DATABASE_CREATED_OK',$user."_".$_POST['v_database'],$user."_".$_POST['v_database']);
+ $_SESSION['ok_msg'] = __('DATABASE_CREATED_OK',$user."_".$_POST['v_database'],$user."_".$_POST['v_database']);
unset($v_database);
unset($v_dbuser);
unset($v_password);
diff --git a/web/add/dns/index.php b/web/add/dns/index.php
index d78c17da..fdf1e1b4 100644
--- a/web/add/dns/index.php
+++ b/web/add/dns/index.php
@@ -14,8 +14,8 @@ top_panel($user,$TAB);
if (!empty($_POST['ok'])) {
// Check input
- if (empty($_POST['v_domain'])) $errors[] = _('domain');
- if (empty($_POST['v_ip'])) $errors[] = _('ip');
+ if (empty($_POST['v_domain'])) $errors[] = __('domain');
+ if (empty($_POST['v_ip'])) $errors[] = __('ip');
// Protect input
$v_domain = preg_replace("/^www./i", "", $_POST['v_domain']);
@@ -41,13 +41,13 @@ if (!empty($_POST['ok'])) {
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
} else {
// Add DNS
exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip." ".$v_template." ".$v_ns1." ".$v_ns2." ".$v_ns3." ".$ns4, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -58,7 +58,7 @@ if (!empty($_POST['ok'])) {
exec (VESTA_CMD."v-change-dns-domain-exp ".$user." ".$v_domain." ".$v_exp, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -70,14 +70,14 @@ if (!empty($_POST['ok'])) {
exec (VESTA_CMD."v-change-dns-domain-ttl ".$user." ".$v_domain." ".$v_ttl, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('DNS_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
+ $_SESSION['ok_msg'] = __('DNS_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
unset($v_domain);
}
}
@@ -107,19 +107,19 @@ if (!empty($_POST['ok_rec'])) {
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
} else {
// Add DNS Record
exec (VESTA_CMD."v-add-dns-domain-record ".$user." ".$v_domain." ".$v_rec." ".$v_type." ".$v_val." ".$v_priority, $output, $return_var);
$v_type = $_POST['v_type'];
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('DNS_RECORD_CREATED_OK',$_POST[v_rec],$_POST[v_domain]);
+ $_SESSION['ok_msg'] = __('DNS_RECORD_CREATED_OK',$_POST[v_rec],$_POST[v_domain]);
unset($v_domain);
unset($v_rec);
unset($v_val);
diff --git a/web/add/ip/index.php b/web/add/ip/index.php
index ba163066..d94b97e3 100644
--- a/web/add/ip/index.php
+++ b/web/add/ip/index.php
@@ -16,10 +16,10 @@ top_panel($user,$TAB);
if ($_SESSION['user'] == 'admin') {
if (!empty($_POST['ok'])) {
// Check input
- if (empty($_POST['v_ip'])) $errors[] = _('ip address');
- if (empty($_POST['v_netmask'])) $errors[] = _('netmask');
- if (empty($_POST['v_interface'])) $errors[] = _('interface');
- if (empty($_POST['v_owner'])) $errors[] = _('assigned user');
+ if (empty($_POST['v_ip'])) $errors[] = __('ip address');
+ if (empty($_POST['v_netmask'])) $errors[] = __('netmask');
+ if (empty($_POST['v_interface'])) $errors[] = __('interface');
+ if (empty($_POST['v_owner'])) $errors[] = __('assigned user');
// Protect input
$v_ip = escapeshellarg($_POST['v_ip']);
@@ -47,7 +47,7 @@ if ($_SESSION['user'] == 'admin') {
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
} else {
// Add IP
$v_interface = escapeshellarg($_POST['v_interface']);
@@ -57,12 +57,12 @@ if ($_SESSION['user'] == 'admin') {
$v_interface = $_POST['v_interface'];
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
unset($v_password);
unset($output);
} else {
- $_SESSION['ok_msg'] = _('IP_CREATED_OK',$_POST['v_ip'],$_POST['v_ip']);
+ $_SESSION['ok_msg'] = __('IP_CREATED_OK',$_POST['v_ip'],$_POST['v_ip']);
unset($v_ip);
unset($v_netmask);
unset($v_name);
diff --git a/web/add/mail/index.php b/web/add/mail/index.php
index 4a37cc98..4f5d18bb 100644
--- a/web/add/mail/index.php
+++ b/web/add/mail/index.php
@@ -16,7 +16,7 @@ top_panel($user,$TAB);
//if ($_SESSION['user'] == 'admin') {
// Mail Domain
if (!empty($_POST['ok'])) {
- if (empty($_POST['v_domain'])) $errors[] = _('domain');
+ if (empty($_POST['v_domain'])) $errors[] = __('domain');
if (!empty($_POST['v_antispam'])) {
$v_antispam = 'yes';
} else {
@@ -48,20 +48,20 @@ top_panel($user,$TAB);
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
} else {
// Add mail domain
exec (VESTA_CMD."v-add-mail-domain ".$user." ".$v_domain." ".$v_antispam." ".$v_antivirus." ".$v_dkim, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('MAIL_DOMAIN_CREATED_OK',$_POST['v_domain'],$_POST['v_domain']);
+ $_SESSION['ok_msg'] = __('MAIL_DOMAIN_CREATED_OK',$_POST['v_domain'],$_POST['v_domain']);
unset($v_domain);
}
}
@@ -71,9 +71,9 @@ top_panel($user,$TAB);
// Mail Account
if (!empty($_POST['ok_acc'])) {
// Check input
- if (empty($_POST['v_domain'])) $errors[] = _('domain');
- if (empty($_POST['v_account'])) $errors[] = _('account');
- if (empty($_POST['v_password'])) $errors[] = _('password');
+ if (empty($_POST['v_domain'])) $errors[] = __('domain');
+ if (empty($_POST['v_account'])) $errors[] = __('account');
+ if (empty($_POST['v_password'])) $errors[] = __('password');
// Protect input
$v_domain = escapeshellarg($_POST['v_domain']);
@@ -95,13 +95,13 @@ top_panel($user,$TAB);
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
} else {
// Add Mail Account
exec (VESTA_CMD."v-add-mail-account ".$user." ".$v_domain." ".$v_account." ".$v_password." ".$v_quota, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
@@ -118,7 +118,7 @@ top_panel($user,$TAB);
exec (VESTA_CMD."v-add-mail-account-alias ".$user." ".$v_domain." ".$v_account." ".$alias, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
}
@@ -139,7 +139,7 @@ top_panel($user,$TAB);
exec (VESTA_CMD."v-add-mail-account-forward ".$user." ".$v_domain." ".$v_account." ".$forward, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
}
@@ -149,7 +149,7 @@ top_panel($user,$TAB);
unset($output);
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('MAIL_ACCOUNT_CREATED_OK',$_POST['v_account'],$_POST[v_domain],$_POST['v_account'],$_POST[v_domain]);
+ $_SESSION['ok_msg'] = __('MAIL_ACCOUNT_CREATED_OK',$_POST['v_account'],$_POST[v_domain],$_POST['v_account'],$_POST[v_domain]);
unset($v_account);
unset($v_password);
unset($v_password);
diff --git a/web/add/package/index.php b/web/add/package/index.php
index 6c5d8751..69cc88b3 100644
--- a/web/add/package/index.php
+++ b/web/add/package/index.php
@@ -20,22 +20,22 @@ top_panel($user,$TAB);
if ($_SESSION['user'] == 'admin') {
if (!empty($_POST['ok'])) {
// Check input
- if (empty($_POST['v_package'])) $errors[] = _('package');
- if (empty($_POST['v_template'])) $errors[] = _('template');
- if (empty($_POST['v_shell'])) $errrors[] = _('shell');
- if (!isset($_POST['v_web_domains'])) $errors[] = _('web domains');
- if (!isset($_POST['v_web_aliases'])) $errors[] = _('web aliases');
- if (!isset($_POST['v_dns_domains'])) $errors[] = _('dns domains');
- if (!isset($_POST['v_dns_records'])) $errors[] = _('dns records');
- if (!isset($_POST['v_mail_domains'])) $errors[] = _('mail domains');
- if (!isset($_POST['v_mail_accounts'])) $errors[] = _('mail accounts');
- if (!isset($_POST['v_databases'])) $errors[] = _('databases');
- if (!isset($_POST['v_cron_jobs'])) $errors[] = _('cron jobs');
- if (!isset($_POST['v_backups'])) $errors[] = _('backups');
- if (!isset($_POST['v_disk_quota'])) $errors[] = _('quota');
- if (!isset($_POST['v_bandwidth'])) $errors[] = _('bandwidth');
- if (empty($_POST['v_ns1'])) $errors[] = _('ns1');
- if (empty($_POST['v_ns2'])) $errors[] = _('ns2');
+ if (empty($_POST['v_package'])) $errors[] = __('package');
+ if (empty($_POST['v_template'])) $errors[] = __('template');
+ if (empty($_POST['v_shell'])) $errrors[] = __('shell');
+ if (!isset($_POST['v_web_domains'])) $errors[] = __('web domains');
+ if (!isset($_POST['v_web_aliases'])) $errors[] = __('web aliases');
+ if (!isset($_POST['v_dns_domains'])) $errors[] = __('dns domains');
+ if (!isset($_POST['v_dns_records'])) $errors[] = __('dns records');
+ if (!isset($_POST['v_mail_domains'])) $errors[] = __('mail domains');
+ if (!isset($_POST['v_mail_accounts'])) $errors[] = __('mail accounts');
+ if (!isset($_POST['v_databases'])) $errors[] = __('databases');
+ if (!isset($_POST['v_cron_jobs'])) $errors[] = __('cron jobs');
+ if (!isset($_POST['v_backups'])) $errors[] = __('backups');
+ if (!isset($_POST['v_disk_quota'])) $errors[] = __('quota');
+ if (!isset($_POST['v_bandwidth'])) $errors[] = __('bandwidth');
+ if (empty($_POST['v_ns1'])) $errors[] = __('ns1');
+ if (empty($_POST['v_ns2'])) $errors[] = __('ns2');
// Protect input
@@ -73,7 +73,7 @@ if ($_SESSION['user'] == 'admin') {
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
} else {
exec ('mktemp -d', $output, $return_var);
$tmpdir = $output[0];
@@ -107,7 +107,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -119,7 +119,7 @@ if ($_SESSION['user'] == 'admin') {
// Check output
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('PACKAGE_CREATED_OK',$_POST['v_package'],$_POST['v_package']);
+ $_SESSION['ok_msg'] = __('PACKAGE_CREATED_OK',$_POST['v_package'],$_POST['v_package']);
unset($v_package);
}
diff --git a/web/add/user/index.php b/web/add/user/index.php
index 2cc773df..28da3447 100644
--- a/web/add/user/index.php
+++ b/web/add/user/index.php
@@ -19,12 +19,12 @@ top_panel($user,$TAB);
if ($_SESSION['user'] == 'admin') {
if (!empty($_POST['ok'])) {
// Check input
- if (empty($_POST['v_username'])) $errors[] = _('user');
- if (empty($_POST['v_password'])) $errors[] = _('password');
- if (empty($_POST['v_package'])) $errrors[] = _('package');
- if (empty($_POST['v_email'])) $errors[] = _('email');
- if (empty($_POST['v_fname'])) $errors[] = _('first name');
- if (empty($_POST['v_lname'])) $errors[] = _('last name');
+ if (empty($_POST['v_username'])) $errors[] = __('user');
+ if (empty($_POST['v_password'])) $errors[] = __('password');
+ if (empty($_POST['v_package'])) $errrors[] = __('package');
+ if (empty($_POST['v_email'])) $errors[] = __('email');
+ if (empty($_POST['v_fname'])) $errors[] = __('first name');
+ if (empty($_POST['v_lname'])) $errors[] = __('last name');
// Protect input
$v_username = escapeshellarg($_POST['v_username']);
@@ -38,7 +38,7 @@ if ($_SESSION['user'] == 'admin') {
// Validate email
if (!filter_var($_POST['v_email'], FILTER_VALIDATE_EMAIL)) {
- $_SESSION['error_msg'] = _('Please enter valid email address.');
+ $_SESSION['error_msg'] = __('Please enter valid email address.');
}
// Check for errors
@@ -50,20 +50,20 @@ if ($_SESSION['user'] == 'admin') {
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
}
// Check password length
if (empty($_SESSION['error_msg'])) {
$pw_len = strlen($_POST['v_password']);
- if ($pw_len < 6 ) $_SESSION['error_msg'] = _('Password is too short.',$error_msg);
+ if ($pw_len < 6 ) $_SESSION['error_msg'] = __('Password is too short.',$error_msg);
}
if (empty($_SESSION['error_msg'])) {
exec (VESTA_CMD."v-add-user ".$v_username." ".$v_password." ".$v_email." ".$v_package." ".$v_fname." ".$v_lname, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var);
@@ -81,7 +81,7 @@ if ($_SESSION['user'] == 'admin') {
send_email($to, $subject, $mailtext, $from);
}
- $_SESSION['ok_msg'] = _('USER_CREATED_OK',$_POST[v_username],$_POST[v_username]);
+ $_SESSION['ok_msg'] = __('USER_CREATED_OK',$_POST[v_username],$_POST[v_username]);
unset($v_username);
unset($v_password);
unset($v_email);
diff --git a/web/add/web/index.php b/web/add/web/index.php
index efb2f953..19f2e04c 100644
--- a/web/add/web/index.php
+++ b/web/add/web/index.php
@@ -14,12 +14,12 @@ top_panel($user,$TAB);
$v_ftp_email = $panel[$user]['CONTACT'];
if (!empty($_POST['ok'])) {
// Check input
- if (empty($_POST['v_domain'])) $errors[] = _('domain');
- if (empty($_POST['v_ip'])) $errors[] = _('ip');
- if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_crt']))) $errors[] = _('ssl certificate');
- if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_key']))) $errors[] = _('ssl key');
- if ((!empty($_POST['v_stats_user'])) && (empty($_POST['v_stats_password']))) $errors[] = _('stats user password');
- if ((!empty($_POST['v_ftp_user'])) && (empty($_POST['v_ftp_password']))) $errors[] = _('ftp user password');
+ if (empty($_POST['v_domain'])) $errors[] = __('domain');
+ if (empty($_POST['v_ip'])) $errors[] = __('ip');
+ if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_crt']))) $errors[] = __('ssl certificate');
+ if ((!empty($_POST['v_ssl'])) && (empty($_POST['v_ssl_key']))) $errors[] = __('ssl key');
+ if ((!empty($_POST['v_stats_user'])) && (empty($_POST['v_stats_password']))) $errors[] = __('stats user password');
+ if ((!empty($_POST['v_ftp_user'])) && (empty($_POST['v_ftp_password']))) $errors[] = __('ftp user password');
if ((!empty($_POST['v_aliases'])) && ($_POST['v_aliases'] != 'www.'.$_POST['v_domain'])) $v_adv = 'yes';
if ((!empty($_POST['v_ssl'])) || (!empty($_POST['v_elog']))) $v_adv = 'yes';
@@ -67,14 +67,14 @@ $v_ftp_email = $panel[$user]['CONTACT'];
// Validate email
if ((!empty($_POST['v_ftp_email'])) && (!filter_var($_POST['v_ftp_email'], FILTER_VALIDATE_EMAIL))) {
- $_SESSION['error_msg'] = _('Please enter valid email address.');
+ $_SESSION['error_msg'] = __('Please enter valid email address.');
}
// Check ftp password length
if (empty($_SESSION['error_msg'])) {
if (!empty($_POST['v_ftp_user'])) {
$pw_len = strlen($_POST['v_ftp_password']);
- if ($pw_len < 6 ) $_SESSION['error_msg'] = _('Password is too short.',$error_msg);
+ if ($pw_len < 6 ) $_SESSION['error_msg'] = __('Password is too short.',$error_msg);
}
}
@@ -82,7 +82,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
if (empty($_SESSION['error_msg'])) {
if (!empty($_POST['v_stats_user'])) {
$pw_len = strlen($_POST['v_stats_password']);
- if ($pw_len < 6 ) $_SESSION['error_msg'] = _('Password is too short.',$error_msg);
+ if ($pw_len < 6 ) $_SESSION['error_msg'] = __('Password is too short.',$error_msg);
}
}
@@ -95,7 +95,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
}
if (empty($_SESSION['error_msg'])) {
@@ -103,7 +103,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-add-web-domain ".$user." ".$v_domain." ".$v_ip." ".$v_template." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -113,7 +113,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-add-dns-domain ".$user." ".$v_domain." ".$v_ip, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -124,7 +124,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-add-mail-domain ".$user." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -146,7 +146,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-add-web-domain-alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
}
@@ -155,7 +155,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-add-dns-on-web-alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -170,7 +170,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-delete-web-domain-alias ".$user." ".$v_domain." ".$alias." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
}
@@ -183,7 +183,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-add-web-domain-nginx ".$user." ".$v_domain." 'default' ".$ext." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -222,7 +222,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -234,7 +234,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-add-web-domain-stats ".$user." ".$v_domain." ".$v_stats, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -245,7 +245,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-add-web-domain-stats-user ".$user." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($v_stats_user);
@@ -262,15 +262,15 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-add-web-domain-ftp ".$user." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
if (!empty($v_ftp_email)) {
$to = $_POST['v_ftp_email'];
- $subject = _("FTP login credentials");
+ $subject = __("FTP login credentials");
$hostname = exec('hostname');
- $from = _('MAIL_FROM',$hostname);
- $mailtext .= _('FTP_ACCOUNT_READY',$_POST['v_domain'],$user,$_POST['v_ftp_user'],$_POST['v_ftp_password']);
+ $from = __('MAIL_FROM',$hostname);
+ $mailtext .= __('FTP_ACCOUNT_READY',$_POST['v_domain'],$user,$_POST['v_ftp_user'],$_POST['v_ftp_password']);
send_email($to, $subject, $mailtext, $from);
//unset($v_ftp_email);
}
@@ -285,7 +285,7 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-restart-dns", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -295,11 +295,11 @@ $v_ftp_email = $panel[$user]['CONTACT'];
exec (VESTA_CMD."v-restart-web", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
- $_SESSION['ok_msg'] = _('WEB_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
+ $_SESSION['ok_msg'] = __('WEB_DOMAIN_CREATED_OK',$_POST[v_domain],$_POST[v_domain]);
unset($v_domain);
unset($v_aliases);
unset($v_ssl);
diff --git a/web/bulk/restore/index.php b/web/bulk/restore/index.php
index ff19146a..f55e8919 100644
--- a/web/bulk/restore/index.php
+++ b/web/bulk/restore/index.php
@@ -26,14 +26,14 @@ if (!empty($_POST['udir'])) $udir = escapeshellarg(implode(",",$_POST['udir']));
if ($action == 'restore') {
exec (VESTA_CMD."v-schedule-user-restore ".$user." ".$backup." ".$web." ".$dns." ".$mail." ".$db." ".$cron." ".$udir, $output, $return_var);
if ($return_var == 0) {
- $_SESSION['restore_msg'] = _('RESTORE_SCHEDULED');
+ $_SESSION['restore_msg'] = __('RESTORE_SCHEDULED');
} else {
$_SESSION['restore_msg'] = implode('
', $output);
if (empty($_SESSION['restore_msg'])) {
- $_SESSION['restore_msg'] = _('Error: vesta did not return any output.');
+ $_SESSION['restore_msg'] = __('Error: vesta did not return any output.');
}
if ($return_var == 4) {
- $_SESSION['restore_msg'] = _('RESTORE_EXISTS');
+ $_SESSION['restore_msg'] = __('RESTORE_EXISTS');
}
}
}
diff --git a/web/delete/backup/index.php b/web/delete/backup/index.php
index 097c5170..d472e6c7 100644
--- a/web/delete/backup/index.php
+++ b/web/delete/backup/index.php
@@ -17,7 +17,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/delete/cron/index.php b/web/delete/cron/index.php
index 2ab53391..9aac32aa 100644
--- a/web/delete/cron/index.php
+++ b/web/delete/cron/index.php
@@ -17,7 +17,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/delete/db/index.php b/web/delete/db/index.php
index 9ee3951a..5404a9f2 100644
--- a/web/delete/db/index.php
+++ b/web/delete/db/index.php
@@ -17,7 +17,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/delete/dns/index.php b/web/delete/dns/index.php
index 9c87a2b2..69ee3169 100644
--- a/web/delete/dns/index.php
+++ b/web/delete/dns/index.php
@@ -17,7 +17,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -39,7 +39,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
exec (VESTA_CMD."v-delete-dns-domain-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/delete/ip/index.php b/web/delete/ip/index.php
index 15b5e6bc..60c4039d 100644
--- a/web/delete/ip/index.php
+++ b/web/delete/ip/index.php
@@ -12,8 +12,8 @@ if ($_SESSION['user'] == 'admin') {
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
- if ($return_var == 4) $error = _('IP address is in use');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
+ if ($return_var == 4) $error = __('IP address is in use');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/delete/mail/index.php b/web/delete/mail/index.php
index becc84ba..6f2a0df9 100644
--- a/web/delete/mail/index.php
+++ b/web/delete/mail/index.php
@@ -17,7 +17,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -38,7 +38,7 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
exec (VESTA_CMD."v-delete-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/delete/package/index.php b/web/delete/package/index.php
index ec69576d..12f85bbc 100644
--- a/web/delete/package/index.php
+++ b/web/delete/package/index.php
@@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') {
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/delete/user/index.php b/web/delete/user/index.php
index 7be62363..e702e321 100644
--- a/web/delete/user/index.php
+++ b/web/delete/user/index.php
@@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') {
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/delete/web/index.php b/web/delete/web/index.php
index b38bdb2d..ee66335c 100644
--- a/web/delete/web/index.php
+++ b/web/delete/web/index.php
@@ -16,7 +16,7 @@ if (!empty($_GET['domain'])) {
exec (VESTA_CMD."v-delete-web-domain ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -28,7 +28,7 @@ if (!empty($_GET['domain'])) {
exec (VESTA_CMD."v-delete-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -42,7 +42,7 @@ if (!empty($_GET['domain'])) {
exec (VESTA_CMD."v-delete-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/edit/cron/index.php b/web/edit/cron/index.php
index 50bce954..41ae47d1 100644
--- a/web/edit/cron/index.php
+++ b/web/edit/cron/index.php
@@ -28,7 +28,7 @@ $v_job = escapeshellarg($_GET['job']);
exec (VESTA_CMD."v-list-cron-job ".$user." ".$v_job." 'json'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
$data = json_decode(implode('', $output), true);
@@ -64,14 +64,14 @@ if ($return_var != 0) {
exec (VESTA_CMD."v-change-cron-job ".$v_username." ".$v_job." ".$v_min." ".$v_hour." ".$v_day." ".$v_month." ".$v_wday." ".$v_cmd, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
$v_cmd = $_POST['v_cmd'];
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _("Changes has been saved.");
+ $_SESSION['ok_msg'] = __("Changes has been saved.");
}
}
}
diff --git a/web/edit/db/index.php b/web/edit/db/index.php
index 713f13a8..b047527a 100644
--- a/web/edit/db/index.php
+++ b/web/edit/db/index.php
@@ -27,7 +27,7 @@ $v_database = escapeshellarg($_GET['database']);
exec (VESTA_CMD."v-list-database ".$user." ".$v_database." 'json'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
$data = json_decode(implode('', $output), true);
@@ -57,14 +57,14 @@ if ($return_var != 0) {
exec (VESTA_CMD."v-change-database-password ".$v_username." ".$v_database." ".$v_password, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_password = "••••••••";
unset($output);
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('Changes has been saved.');
+ $_SESSION['ok_msg'] = __('Changes has been saved.');
}
}
}
diff --git a/web/edit/dns/index.php b/web/edit/dns/index.php
index ad03b4ac..88152db3 100644
--- a/web/edit/dns/index.php
+++ b/web/edit/dns/index.php
@@ -30,7 +30,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) {
exec (VESTA_CMD."v-list-dns-domain ".$user." ".$v_domain." json", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
$data = json_decode(implode('', $output), true);
@@ -67,7 +67,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) {
exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$restart_dns = 'yes';
@@ -80,7 +80,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) {
exec (VESTA_CMD."v-change-dns-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -93,7 +93,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) {
exec (VESTA_CMD."v-change-dns-domain-soa ".$v_username." ".$v_domain." ".$v_soa." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -106,7 +106,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) {
exec (VESTA_CMD."v-change-dns-domain-exp ".$v_username." ".$v_domain." ".$v_exp." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -119,7 +119,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) {
exec (VESTA_CMD."v-change-dns-domain-ttl ".$v_username." ".$v_domain." ".$v_ttl." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -131,13 +131,13 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) {
exec (VESTA_CMD."v-restart-dns", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('Changes has been saved.');
+ $_SESSION['ok_msg'] = __('Changes has been saved.');
}
}
@@ -155,7 +155,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) {
exec (VESTA_CMD."v-list-dns-domain-records ".$user." ".$v_domain." 'json'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
$data = json_decode(implode('', $output), true);
@@ -187,7 +187,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) {
exec (VESTA_CMD."v-change-dns-domain-record ".$v_username." ".$v_domain." ".$v_record_id." ".$v_val." ".$v_priority, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
@@ -196,7 +196,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['record_id']))) {
unset($output);
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('Changes has been saved.');
+ $_SESSION['ok_msg'] = __('Changes has been saved.');
}
}
diff --git a/web/edit/ip/index.php b/web/edit/ip/index.php
index f29438f8..af4d5410 100644
--- a/web/edit/ip/index.php
+++ b/web/edit/ip/index.php
@@ -26,7 +26,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-list-sys-ip ".$v_ip." 'json'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
$data = json_decode(implode('', $output), true);
@@ -63,7 +63,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'dedicated'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -73,7 +73,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-sys-ip-status ".$v_ip." 'shared'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -86,7 +86,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-sys-ip-owner ".$v_ip." ".$v_owner, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_owner = $_POST['v_owner'];
@@ -99,7 +99,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-sys-ip-name ".$v_ip." ".$v_name, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -111,14 +111,14 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-sys-ip-nat ".$v_ip." ".$v_nat, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('Changes has been saved.');
+ $_SESSION['ok_msg'] = __('Changes has been saved.');
}
}
}
diff --git a/web/edit/mail/index.php b/web/edit/mail/index.php
index bc123383..4ae73e84 100644
--- a/web/edit/mail/index.php
+++ b/web/edit/mail/index.php
@@ -30,7 +30,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-list-mail-domain ".$user." ".$v_domain." json", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
$data = json_decode(implode('', $output), true);
@@ -59,7 +59,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-delete-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_antispam = 'no';
@@ -69,7 +69,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-add-mail-domain-antispam ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_antispam = 'yes';
@@ -80,7 +80,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-delete-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_antivirus = 'no';
@@ -90,14 +90,14 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-add-mail-domain-antivirus ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_antivirus = 'yes';
unset($output);
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('Changes has been saved.');
+ $_SESSION['ok_msg'] = __('Changes has been saved.');
}
// DKIM
@@ -105,7 +105,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-delete-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_dkim = 'no';
@@ -115,7 +115,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-add-mail-domain-dkim ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_dkim = 'yes';
@@ -127,7 +127,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-delete-mail-domain-catchall ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_catchall = '';
@@ -139,7 +139,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-change-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -150,13 +150,13 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-add-mail-domain-catchall ".$v_username." ".$v_domain." ".$v_catchall, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('Changes has been saved.');
+ $_SESSION['ok_msg'] = __('Changes has been saved.');
}
}
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail.html');
@@ -169,7 +169,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-list-mail-account ".$user." ".$v_domain." ".$v_account." 'json'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
$data = json_decode(implode('', $output), true);
@@ -210,7 +210,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-change-mail-account-password ".$v_username." ".$v_domain." ".$v_account." ".$v_password, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_password = "••••••••";
@@ -227,7 +227,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-change-mail-account-quota ".$v_username." ".$v_domain." ".$v_account." ".$v_quota, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -247,7 +247,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-delete-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -259,7 +259,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-add-mail-account-alias ".$v_username." ".$v_domain." ".$v_account." '".$alias."'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -280,7 +280,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-delete-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -292,7 +292,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-add-mail-account-forward ".$v_username." ".$v_domain." ".$v_account." '".$forward."'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -305,7 +305,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-delete-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -319,7 +319,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
exec (VESTA_CMD."v-add-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -327,14 +327,14 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
}
}
if (($v_autoreply == 'no') && (!empty($_POST['v_autoreply'])) && (empty($_SESSION['error_msg']))) {
- if (empty($_POST['v_autoreply_message'])) $_SESSION['error_msg'] = $_SESSION['error_msg'] = _('Field "%s" can not be blank.','atoreply');
+ if (empty($_POST['v_autoreply_message'])) $_SESSION['error_msg'] = $_SESSION['error_msg'] = __('Field "%s" can not be blank.','atoreply');
if (empty($_SESSION['error_msg'])) {
$v_autoreply_message = str_replace("\r\n", "\n", $_POST['v_autoreply_message']);
$v_autoreply_message = escapeshellarg($v_autoreply_message);
exec (VESTA_CMD."v-add-mail-account-autoreply ".$v_username." ".$v_domain." ".$v_account." ".$v_autoreply_message, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -344,7 +344,7 @@ if ((!empty($_GET['domain'])) && (empty($_GET['account']))) {
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('Changes has been saved.');
+ $_SESSION['ok_msg'] = __('Changes has been saved.');
}
}
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_mail_acc.html');
diff --git a/web/edit/package/index.php b/web/edit/package/index.php
index f67c6db7..9903481f 100644
--- a/web/edit/package/index.php
+++ b/web/edit/package/index.php
@@ -26,7 +26,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-list-user-package ".$v_package." 'json'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
$data = json_decode(implode('', $output), true);
@@ -70,22 +70,22 @@ if ($_SESSION['user'] == 'admin') {
// Action
if (!empty($_POST['save'])) {
// Check input
- if (empty($_POST['v_package'])) $errors[] = _('package');
- if (empty($_POST['v_template'])) $errors[] = _('template');
- if (empty($_POST['v_shell'])) $errrors[] = _('shell');
- if (!isset($_POST['v_web_domains'])) $errors[] = _('web domains');
- if (!isset($_POST['v_web_aliases'])) $errors[] = _('web aliases');
- if (!isset($_POST['v_dns_domains'])) $errors[] = _('dns domains');
- if (!isset($_POST['v_dns_records'])) $errors[] = _('dns records');
- if (!isset($_POST['v_mail_domains'])) $errors[] = _('mail domains');
- if (!isset($_POST['v_mail_accounts'])) $errors[] = _('mail accounts');
- if (!isset($_POST['v_databases'])) $errors[] = _('databases');
- if (!isset($_POST['v_cron_jobs'])) $errors[] = _('cron jobs');
- if (!isset($_POST['v_backups'])) $errors[] = _('backups');
- if (!isset($_POST['v_disk_quota'])) $errors[] = _('quota');
- if (!isset($_POST['v_bandwidth'])) $errors[] = _('bandwidth');
- if (empty($_POST['v_ns1'])) $errors[] = _('ns1');
- if (empty($_POST['v_ns2'])) $errors[] = _('ns2');
+ if (empty($_POST['v_package'])) $errors[] = __('package');
+ if (empty($_POST['v_template'])) $errors[] = __('template');
+ if (empty($_POST['v_shell'])) $errrors[] = __('shell');
+ if (!isset($_POST['v_web_domains'])) $errors[] = __('web domains');
+ if (!isset($_POST['v_web_aliases'])) $errors[] = __('web aliases');
+ if (!isset($_POST['v_dns_domains'])) $errors[] = __('dns domains');
+ if (!isset($_POST['v_dns_records'])) $errors[] = __('dns records');
+ if (!isset($_POST['v_mail_domains'])) $errors[] = __('mail domains');
+ if (!isset($_POST['v_mail_accounts'])) $errors[] = __('mail accounts');
+ if (!isset($_POST['v_databases'])) $errors[] = __('databases');
+ if (!isset($_POST['v_cron_jobs'])) $errors[] = __('cron jobs');
+ if (!isset($_POST['v_backups'])) $errors[] = __('backups');
+ if (!isset($_POST['v_disk_quota'])) $errors[] = __('quota');
+ if (!isset($_POST['v_bandwidth'])) $errors[] = __('bandwidth');
+ if (empty($_POST['v_ns1'])) $errors[] = __('ns1');
+ if (empty($_POST['v_ns2'])) $errors[] = __('ns2');
// Protect input
$v_package = escapeshellarg($_POST['v_package']);
@@ -122,7 +122,7 @@ if ($_SESSION['user'] == 'admin') {
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
} else {
exec ('mktemp -d', $output, $return_var);
$tmpdir = $output[0];
@@ -156,7 +156,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-add-user-package ".$tmpdir." ".$v_package." 'yes'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -170,12 +170,12 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-update-user-package ".$v_package." 'json'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('Changes has been saved.');
+ $_SESSION['ok_msg'] = __('Changes has been saved.');
}
}
}
diff --git a/web/edit/user/index.php b/web/edit/user/index.php
index d8deef67..47d6eeaa 100644
--- a/web/edit/user/index.php
+++ b/web/edit/user/index.php
@@ -24,7 +24,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-list-user ".$v_username." json", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
$data = json_decode(implode('', $output), true);
@@ -80,7 +80,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-user-password ".$v_username." ".$v_password, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_password = "••••••••";
@@ -93,7 +93,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-user-package ".$v_username." ".$v_package, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -105,7 +105,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
if ($_GET['user'] == 'admin') $_SESSION['language'] = $_POST['v_language'];
@@ -119,7 +119,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-user-template ".$v_username." ".$v_template, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -131,7 +131,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-user-shell ".$v_username." ".$v_shell, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -141,13 +141,13 @@ if ($_SESSION['user'] == 'admin') {
if (($v_email != $_POST['v_email']) && (empty($_SESSION['error_msg']))) {
// Validate email
if (!filter_var($_POST['v_email'], FILTER_VALIDATE_EMAIL)) {
- $_SESSION['error_msg'] = _('Please enter valid email address.');
+ $_SESSION['error_msg'] = __('Please enter valid email address.');
} else {
$v_email = escapeshellarg($_POST['v_email']);
exec (VESTA_CMD."v-change-user-contact ".$v_username." ".$v_email, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
}
@@ -161,7 +161,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-user-name ".$v_username." ".$v_fname." ".$v_lname, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -179,14 +179,14 @@ if ($_SESSION['user'] == 'admin') {
exec ($ns_cmd, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('Changes has been saved.');
+ $_SESSION['ok_msg'] = __('Changes has been saved.');
}
}
// Panel
@@ -207,7 +207,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-list-user ".$v_username." json", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
$data = json_decode(implode('', $output), true);
@@ -249,7 +249,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-user-password ".$v_username." ".$v_password, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_password = "••••••••";
@@ -262,7 +262,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
$_SESSION['language'] = $_POST['v_language'];
@@ -276,7 +276,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-change-user-contact ".$v_username." ".$v_email, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -294,14 +294,14 @@ if ($_SESSION['user'] == 'admin') {
exec ($ns_cmd, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('Changes has been saved.');
+ $_SESSION['ok_msg'] = __('Changes has been saved.');
}
}
// Panel
diff --git a/web/edit/web/index.php b/web/edit/web/index.php
index b006dc08..1615b2e3 100644
--- a/web/edit/web/index.php
+++ b/web/edit/web/index.php
@@ -30,7 +30,7 @@ $v_domain = escapeshellarg($_GET['domain']);
exec (VESTA_CMD."v-list-web-domain ".$user." ".$v_domain." json", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
$data = json_decode(implode('', $output), true);
@@ -95,7 +95,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-change-web-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$restart_web = 'yes';
@@ -106,7 +106,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." ".$v_domain." ".$v_ip." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$restart_dns = 'yes';
@@ -118,7 +118,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-change-dns-domain-ip ".$v_username." '".$v_alias."' ".$v_ip, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$restart_dns = 'yes';
@@ -133,7 +133,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-change-web-domain-tpl ".$v_username." ".$v_domain." ".$v_template." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -156,7 +156,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-delete-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -165,7 +165,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-delete-dns-on-web-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$restart_dns = 'yes';
@@ -182,7 +182,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-add-web-domain-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -190,7 +190,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-add-dns-on-web-alias ".$v_username." ".$v_domain." '".$alias."' 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$restart_dns = 'yes';
@@ -205,7 +205,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-delete-web-domain-nginx ".$v_username." ".$v_domain." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -223,7 +223,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-change-web-domain-nginx-tpl ".$v_username." ".$v_domain." 'default' ".escapeshellarg($ext)." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_nginx_ext = str_replace(',', ', ', $ext);
@@ -244,7 +244,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-add-web-domain-nginx ".$v_username." ".$v_domain." 'default' ".escapeshellarg($ext)." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -257,7 +257,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-delete-web-domain-ssl ".$v_username." ".$v_domain." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -296,7 +296,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-change-web-domain-sslcert ".$user." ".$v_domain." ".$tmpdir." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -312,7 +312,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-change-web-domain-sslhome ".$user." ".$v_domain." ".$v_ssl_home." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
$v_ssl_home = $_POST['v_ssl_home'];
@@ -332,7 +332,7 @@ if (!empty($_POST['save'])) {
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
} else {
exec ('mktemp -d', $mktemp_output, $return_var);
$tmpdir = $mktemp_output[0];
@@ -360,7 +360,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-add-web-domain-ssl ".$user." ".$v_domain." ".$tmpdir." ".$v_ssl_home." 'no'", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -378,7 +378,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-delete-web-domain-stats ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -389,7 +389,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-change-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -399,7 +399,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-add-web-domain-stats ".$v_username." ".$v_domain." ".$v_stats, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -410,7 +410,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-delete-web-domain-stats-user ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -418,8 +418,8 @@ if (!empty($_POST['save'])) {
$v_stats_password = '';
}
if ((empty($v_stats_user)) && (!empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) {
- if (empty($_POST['v_stats_user'])) $errors[] = _('stats username');
- if (empty($_POST['v_stats_password'])) $errors[] = _('stats password');
+ if (empty($_POST['v_stats_user'])) $errors[] = __('stats username');
+ if (empty($_POST['v_stats_password'])) $errors[] = __('stats password');
if (!empty($errors[0])) {
foreach ($errors as $i => $error) {
if ( $i == 0 ) {
@@ -428,14 +428,14 @@ if (!empty($_POST['save'])) {
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
} else {
$v_stats_user = escapeshellarg($_POST['v_stats_user']);
$v_stats_password = escapeshellarg($_POST['v_stats_password']);
exec (VESTA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -443,8 +443,8 @@ if (!empty($_POST['save'])) {
}
}
if ((!empty($v_stats_user)) && (!empty($_POST['v_stats_auth'])) && (empty($_SESSION['error_msg']))) {
- if (empty($_POST['v_stats_user'])) $errors[] = _('stats user');
- if (empty($_POST['v_stats_password'])) $errors[] = _('stats password');
+ if (empty($_POST['v_stats_user'])) $errors[] = __('stats user');
+ if (empty($_POST['v_stats_password'])) $errors[] = __('stats password');
if (!empty($errors[0])) {
foreach ($errors as $i => $error) {
if ( $i == 0 ) {
@@ -453,7 +453,7 @@ if (!empty($_POST['save'])) {
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
}
if (($v_stats_user != $_POST['v_stats_user']) || ($_POST['v_stats_password'] != "••••••••" ) && (empty($_SESSION['error_msg']))) {
$v_stats_user = escapeshellarg($_POST['v_stats_user']);
@@ -461,7 +461,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-add-web-domain-stats-user ".$v_username." ".$v_domain." ".$v_stats_user." ".$v_stats_password, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -474,7 +474,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-delete-web-domain-ftp ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -485,8 +485,8 @@ if (!empty($_POST['save'])) {
// Change FTP Account
if ((!empty($v_ftp_user)) && (!empty($_POST['v_ftp'])) && (empty($_SESSION['error_msg']))) {
- if (empty($_POST['v_ftp_user'])) $errors[] = _('ftp user');
- if (empty($_POST['v_ftp_password'])) $errors[] = _('ftp user password');
+ if (empty($_POST['v_ftp_user'])) $errors[] = __('ftp user');
+ if (empty($_POST['v_ftp_password'])) $errors[] = __('ftp user password');
if (!empty($errors[0])) {
foreach ($errors as $i => $error) {
if ( $i == 0 ) {
@@ -495,7 +495,7 @@ if (!empty($_POST['save'])) {
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
}
if (($v_ftp_user != $_POST['v_ftp_user']) || ($_POST['v_ftp_password'] != "••••••••" ) && (empty($_SESSION['error_msg']))) {
$v_ftp_user = preg_replace("/^".$user."_/", "", $_POST['v_ftp_user']);
@@ -504,7 +504,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -516,7 +516,7 @@ if (!empty($_POST['save'])) {
// Add FTP Account
if ((empty($v_ftp_user)) && (!empty($_POST['v_ftp'])) && (empty($_SESSION['error_msg']))) {
- if ((!empty($_POST['v_ftp_email'])) && (!filter_var($_POST['v_ftp_email'], FILTER_VALIDATE_EMAIL))) $_SESSION['error_msg'] = _('Please enter valid email address.');
+ if ((!empty($_POST['v_ftp_email'])) && (!filter_var($_POST['v_ftp_email'], FILTER_VALIDATE_EMAIL))) $_SESSION['error_msg'] = __('Please enter valid email address.');
if (empty($_POST['v_ftp_user'])) $errors[] = 'ftp user';
if (empty($_POST['v_ftp_password'])) $errors[] = 'ftp user password';
if (!empty($errors[0])) {
@@ -527,7 +527,7 @@ if (!empty($_POST['save'])) {
$error_msg = $error_msg.", ".$error;
}
}
- $_SESSION['error_msg'] = _('Field "%s" can not be blank.',$error_msg);
+ $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
}
if (empty($_SESSION['error_msg'])) {
$v_ftp_user = escapeshellarg($_POST['v_ftp_user']);
@@ -535,15 +535,15 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-add-web-domain-ftp ".$v_username." ".$v_domain." ".$v_ftp_user." ".$v_ftp_password, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
} else {
if (!empty($_POST['v_ftp_email'])) {
$to = $_POST['v_ftp_email'];
- $subject = _("FTP login credentials");
+ $subject = __("FTP login credentials");
$hostname = exec('hostname');
- $from = _('MAIL_FROM',$hostname);
- $mailtext .= _('FTP_ACCOUNT_READY',$_GET['domain'],$user,$_POST['v_ftp_user'],$_POST['v_ftp_password']);
+ $from = __('MAIL_FROM',$hostname);
+ $mailtext .= __('FTP_ACCOUNT_READY',$_GET['domain'],$user,$_POST['v_ftp_user'],$_POST['v_ftp_password']);
send_email($to, $subject, $mailtext, $from);
unset($v_ftp_email);
}
@@ -560,7 +560,7 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-restart-web", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
}
@@ -570,13 +570,13 @@ if (!empty($_POST['save'])) {
exec (VESTA_CMD."v-restart-dns", $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error code:',$return_var);
+ if (empty($error)) $error = __('Error code:',$return_var);
$_SESSION['error_msg'] = $error;
}
}
if (empty($_SESSION['error_msg'])) {
- $_SESSION['ok_msg'] = _('Changes has been saved.');
+ $_SESSION['ok_msg'] = __('Changes has been saved.');
}
}
diff --git a/web/inc/main.php b/web/inc/main.php
index 1fe10eda..6d3a1300 100644
--- a/web/inc/main.php
+++ b/web/inc/main.php
@@ -18,7 +18,7 @@ if (isset($_SESSION['user'])) {
* @return string Translated string
* @see _translate()
*/
-function _() {
+function __() {
$args = func_get_args();
array_unshift($args,$_SESSION['language']);
return call_user_func_array("_translate",$args);
@@ -120,23 +120,23 @@ function humanize_time($usage) {
$usage = $usage / 24;
$usage = number_format($usage);
if ( $usage == 1 ) {
- $usage = $usage." "._('day');
+ $usage = $usage." ".__('day');
} else {
- $usage = $usage." "._('days');
+ $usage = $usage." ".__('days');
}
} else {
$usage = number_format($usage);
if ( $usage == 1 ) {
- $usage = $usage." "._('hour');
+ $usage = $usage." ".__('hour');
} else {
- $usage = $usage." "._('hours');
+ $usage = $usage." ".__('hours');
}
}
} else {
if ( $usage == 1 ) {
- $usage = $usage." "._('minute');
+ $usage = $usage." ".__('minute');
} else {
- $usage = $usage." "._('minutes');
+ $usage = $usage." ".__('minutes');
}
}
return $usage;
@@ -150,17 +150,17 @@ function humanize_usage($usage) {
if ( $usage > 1000 ) {
$usage = $usage / 1000 ;
$usage = number_format($usage, 2);
- $usage = $usage." "._('pb');
+ $usage = $usage." ".__('pb');
} else {
$usage = number_format($usage, 2);
- $usage = $usage." "._('tb');
+ $usage = $usage." ".__('tb');
}
} else {
$usage = number_format($usage, 2);
- $usage = $usage." "._('gb');
+ $usage = $usage." ".__('gb');
}
} else {
- $usage = $usage." "._('mb');
+ $usage = $usage." ".__('mb');
}
return $usage;
}
diff --git a/web/login/index.php b/web/login/index.php
index a865e57f..778f30c5 100644
--- a/web/login/index.php
+++ b/web/login/index.php
@@ -32,7 +32,7 @@ if (isset($_POST['user']) && isset($_POST['password'])) {
$v_password = escapeshellarg($_POST['password']);
exec(VESTA_CMD ."v-check-user-password ".$v_user." ".$v_password." '".$_SERVER["REMOTE_ADDR"]."'", $output, $return_var);
if ( $return_var > 0 ) {
- $ERROR = ""._('Invalid username or password')."";
+ $ERROR = "".__('Invalid username or password')."";
// Set system language
exec (VESTA_CMD . "v-list-sys-config json", $output, $return_var);
$data = json_decode(implode('', $output), true);
diff --git a/web/reset/index.php b/web/reset/index.php
index 1bc264b3..10f082dc 100644
--- a/web/reset/index.php
+++ b/web/reset/index.php
@@ -18,15 +18,15 @@ if ((!empty($_POST['user'])) && (empty($_POST['code']))) {
$lname = $data[$user]['LNAME'];
$contact = $data[$user]['CONTACT'];
$to = $data[$user]['CONTACT'];
- $subject = _('MAIL_RESET_SUBJECT',date("Y-m-d H:i:s"));
+ $subject = __('MAIL_RESET_SUBJECT',date("Y-m-d H:i:s"));
$hostname = exec('hostname');
- $from = _('MAIL_FROM',$hostname);
+ $from = __('MAIL_FROM',$hostname);
if (!empty($fname)) {
- $mailtext = _('GREETINGS_GORDON_FREEMAN',$fname,$lname);
+ $mailtext = __('GREETINGS_GORDON_FREEMAN',$fname,$lname);
} else {
- $mailtext = _('GREETINGS');
+ $mailtext = __('GREETINGS');
}
- $mailtext .= _('PASSWORD_RESET_REQUEST',$_SERVER['HTTP_HOST'],$user,$rkey,$_SERVER['HTTP_HOST'],$user,$rkey);
+ $mailtext .= __('PASSWORD_RESET_REQUEST',$_SERVER['HTTP_HOST'],$user,$rkey,$_SERVER['HTTP_HOST'],$user,$rkey);
if (!empty($rkey)) send_email($to, $subject, $mailtext, $from);
unset($output);
}
@@ -49,20 +49,20 @@ if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['pass
$cmd="/usr/bin/sudo /usr/local/vesta/bin/v-change-user-password";
exec ($cmd." ".$v_user." ".$v_password, $output, $return_var);
if ( $return_var > 0 ) {
- $ERROR = ""._('An internal error occurred')."";
+ $ERROR = "".__('An internal error occurred')."";
} else {
$_SESSION['user'] = $_POST['user'];
header("Location: /");
exit;
}
} else {
- $ERROR = ""._('Invalid username or code')."";
+ $ERROR = "".__('Invalid username or code')."";
}
} else {
- $ERROR = ""._('Invalid username or code')."";
+ $ERROR = "".__('Invalid username or code')."";
}
} else {
- $ERROR = ""._('Passwords not match')."";
+ $ERROR = "".__('Passwords not match')."";
}
}
diff --git a/web/restart/service/index.php b/web/restart/service/index.php
index 3261e631..923d1c06 100644
--- a/web/restart/service/index.php
+++ b/web/restart/service/index.php
@@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') {
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('SERVICE_ACTION_FAILED',_('restart'),$v_service);
+ if (empty($error)) $error = __('SERVICE_ACTION_FAILED',__('restart'),$v_service);
$_SESSION['error_srv'] = $error;
}
unset($output);
diff --git a/web/schedule/backup/index.php b/web/schedule/backup/index.php
index a548d160..15cb2d20 100644
--- a/web/schedule/backup/index.php
+++ b/web/schedule/backup/index.php
@@ -8,15 +8,15 @@ include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
$v_username = escapeshellarg($user);
exec (VESTA_CMD."v-schedule-user-backup ".$v_username, $output, $return_var);
if ($return_var == 0) {
- $_SESSION['backup_msg'] = _('BACKUP_SCHEDULED');
+ $_SESSION['backup_msg'] = __('BACKUP_SCHEDULED');
} else {
$_SESSION['backup_msg'] = implode('
', $output);
if (empty($_SESSION['backup_msg'])) {
- $_SESSION['backup_msg'] = _('Error: vesta did not return any output.');
+ $_SESSION['backup_msg'] = __('Error: vesta did not return any output.');
}
if ($return_var == 4) {
- $_SESSION['backup_msg'] = _('BACKUP_EXISTS');
+ $_SESSION['backup_msg'] = __('BACKUP_EXISTS');
}
}
diff --git a/web/schedule/restore/index.php b/web/schedule/restore/index.php
index cf7ed6d9..bdc3d22a 100644
--- a/web/schedule/restore/index.php
+++ b/web/schedule/restore/index.php
@@ -25,14 +25,14 @@ if ($_GET['type'] == 'udir') $udir = escapeshellarg($_GET['object']);
if (!empty($_GET['type'])) {
exec (VESTA_CMD."v-schedule-user-restore ".$user." ".$backup." ".$web." ".$dns." ".$mail." ".$db." ".$cron." ".$udir, $output, $return_var);
if ($return_var == 0) {
- $_SESSION['restore_msg'] = _('RESTORE_SCHEDULED');
+ $_SESSION['restore_msg'] = __('RESTORE_SCHEDULED');
} else {
$_SESSION['restore_msg'] = implode('
', $output);
if (empty($_SESSION['restore_msg'])) {
- $_SESSION['restore_msg'] = _('Error: vesta did not return any output.');
+ $_SESSION['restore_msg'] = __('Error: vesta did not return any output.');
}
if ($return_var == 4) {
- $_SESSION['restore_msg'] = _('RESTORE_EXISTS');
+ $_SESSION['restore_msg'] = __('RESTORE_EXISTS');
}
}
}
diff --git a/web/start/service/index.php b/web/start/service/index.php
index 4d68a2d8..0d34eb84 100644
--- a/web/start/service/index.php
+++ b/web/start/service/index.php
@@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') {
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('SERVICE_ACTION_FAILED',_('start'),$v_service);;
+ if (empty($error)) $error = __('SERVICE_ACTION_FAILED',__('start'),$v_service);;
$_SESSION['error_srv'] = $error;
}
unset($output);
diff --git a/web/stop/service/index.php b/web/stop/service/index.php
index 70f3a90c..7c43c578 100644
--- a/web/stop/service/index.php
+++ b/web/stop/service/index.php
@@ -12,7 +12,7 @@ if ($_SESSION['user'] == 'admin') {
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('SERVICE_ACTION_FAILED',_('stop'),$v_service);
+ if (empty($error)) $error = __('SERVICE_ACTION_FAILED',__('stop'),$v_service);
$_SESSION['error_srv'] = $error;
}
unset($output);
diff --git a/web/suspend/cron/index.php b/web/suspend/cron/index.php
index c8539bca..2703547b 100644
--- a/web/suspend/cron/index.php
+++ b/web/suspend/cron/index.php
@@ -16,7 +16,7 @@ if ($_SESSION['user'] == 'admin') {
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/suspend/db/index.php b/web/suspend/db/index.php
index c135829b..e107f509 100644
--- a/web/suspend/db/index.php
+++ b/web/suspend/db/index.php
@@ -17,7 +17,7 @@ if ($_SESSION['user'] == 'admin') {
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/suspend/dns/index.php b/web/suspend/dns/index.php
index 726d6ff2..ffe0c978 100644
--- a/web/suspend/dns/index.php
+++ b/web/suspend/dns/index.php
@@ -17,7 +17,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-suspend-dns-domain ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -38,7 +38,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-suspend-dns-domain-record ".$v_username." ".$v_domain." ".$v_record_id, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/suspend/mail/index.php b/web/suspend/mail/index.php
index b80cf8d9..9dff6f85 100644
--- a/web/suspend/mail/index.php
+++ b/web/suspend/mail/index.php
@@ -17,7 +17,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-suspend-mail-domain ".$v_username." ".$v_domain, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
@@ -38,7 +38,7 @@ if ($_SESSION['user'] == 'admin') {
exec (VESTA_CMD."v-suspend-mail-account ".$v_username." ".$v_domain." ".$v_account, $output, $return_var);
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/suspend/user/index.php b/web/suspend/user/index.php
index 5d552a05..9b02ee4d 100644
--- a/web/suspend/user/index.php
+++ b/web/suspend/user/index.php
@@ -13,7 +13,7 @@ if ($_SESSION['user'] == 'admin') {
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/suspend/web/index.php b/web/suspend/web/index.php
index b6204890..1e51f207 100644
--- a/web/suspend/web/index.php
+++ b/web/suspend/web/index.php
@@ -17,7 +17,7 @@ if ($_SESSION['user'] == 'admin') {
}
if ($return_var != 0) {
$error = implode('
', $output);
- if (empty($error)) $error = _('Error: vesta did not return any output.');
+ if (empty($error)) $error = __('Error: vesta did not return any output.');
$_SESSION['error_msg'] = $error;
}
unset($output);
diff --git a/web/templates/admin/add_cron.html b/web/templates/admin/add_cron.html
index 206ecfdb..e94b6b97 100644
--- a/web/templates/admin/add_cron.html
+++ b/web/templates/admin/add_cron.html
@@ -10,7 +10,7 @@
-
+
" />
- 
-
+
-
+