Skip to content

Commit c6b7c0b

Browse files
serghey-rodinserghey-rodin
committed
i18n db
1 parent 497f7d9 commit c6b7c0b

File tree

8 files changed

+315
-312
lines changed

8 files changed

+315
-312
lines changed

‎web/add/db/index.php‎

Lines changed: 36 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
// Panel
1313
top_panel($user,$TAB);
1414

15-
// Are you admin?
16-
//if ($_SESSION['user'] == 'admin') {
15+
$v_db_email = $panel[$user]['CONTACT'];
16+
1717
if (!empty($_POST['ok'])) {
1818
// Check input
1919
if (empty($_POST['v_database'])) $errors[] = _('database');
@@ -22,13 +22,18 @@
2222
if (empty($_POST['v_type'])) $errors[] = _('type');
2323
if (empty($_POST['v_charset'])) $errors[] = _('charset');
2424

25-
// Protect input
26-
$v_database = escapeshellarg($_POST['v_database']);
27-
$v_dbuser = escapeshellarg($_POST['v_dbuser']);
28-
$v_password = escapeshellarg($_POST['v_password']);
29-
$v_type = $_POST['v_type'];
30-
$v_charset = $_POST['v_charset'];
31-
if (empty($_POST['v_notify'])) $v_notify = 'off';
25+
// Validate email
26+
if (!filter_var($_POST['v_db_email'], FILTER_VALIDATE_EMAIL)) {
27+
$_SESSION['error_msg'] = _('Please enter valid email address.');
28+
}
29+
30+
// Protect input
31+
$v_database = escapeshellarg($_POST['v_database']);
32+
$v_dbuser = escapeshellarg($_POST['v_dbuser']);
33+
$v_password = escapeshellarg($_POST['v_password']);
34+
$v_type = $_POST['v_type'];
35+
$v_charset = $_POST['v_charset'];
36+
$v_db_email = $_POST['v_db_email'];
3237

3338
// Check for errors
3439
if (!empty($errors[0])) {
@@ -53,57 +58,38 @@
5358
$_SESSION['error_msg'] = $error;
5459
unset($v_password);
5560
unset($output);
56-
} else {
57-
// Add Database
58-
$v_type = escapeshellarg($_POST['v_type']);
59-
$v_charset = escapeshellarg($_POST['v_charset']);
60-
exec (VESTA_CMD."v-add-database ".$user." ".$v_database." ".$v_dbuser." ".$v_password." ".$v_type." 'default' ".$v_charset, $output, $return_var);
61-
$v_type = $_POST['v_type'];
62-
$v_charset = $_POST['v_charset'];
63-
if ($return_var != 0) {
64-
$error = implode('<br>', $output);
65-
if (empty($error)) $error = _('Error: vesta did not return any output.');
66-
$_SESSION['error_msg'] = $error;
67-
unset($v_password);
68-
unset($output);
69-
}
70-
else {
71-
if (empty($v_notify)) {
72-
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"]);
73-
if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
74-
if ($_POST['v_type'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
75-
76-
$to = $panel[$user]['CONTACT'];
77-
$subject = _("Database Credentials");
78-
$hostname = exec('hostname');
79-
$from = _('MAIL_FROM',$hostname);
80-
$mailtext = _('DATABASE_READY',$panel[$user]['FNAME'],$panel[$user]['LNAME'],$_POST['v_type'],$user,$_POST['v_database'],$user,$_POST['v_dbuser'],$_POST['v_password']);
81-
$mailtext .= $db_admin_link."\n\n";
82-
83-
$mailtext .= "--\n"._('Vesta Control Panel')."\n";
84-
send_email($to, $subject, $mailtext, $from);
85-
86-
}
87-
$_SESSION['ok_msg'] = _('DATABASE_CREATED_OK',$user."_".$_POST['v_database'],$user."_".$_POST['v_database']);
88-
unset($v_database);
89-
unset($v_dbuser);
90-
unset($v_password);
91-
unset($v_type);
92-
unset($v_charset);
93-
unset($output);
9461
}
62+
if (!empty($v_db_email)) {
63+
list($http_host, $port) = explode(':', $_SERVER["HTTP_HOST"]);
64+
if ($_POST['v_type'] == 'mysql') $db_admin_link = "http://".$http_host."/phpMyAdmin/";
65+
if ($_POST['v_type'] == 'pgsql') $db_admin_link = "http://".$http_host."/phpPgAdmin/";
66+
$to = $v_db_email;
67+
$subject = _("Database Credentials");
68+
$hostname = exec('hostname');
69+
$from = _('MAIL_FROM',$hostname);
70+
$mailtext = _('DATABASE_READY',$user,$_POST['v_database'],$user,$_POST['v_dbuser'],$_POST['v_password']);
71+
$mailtext .= $db_admin_link."\n\n";
72+
$mailtext .= "--\n"._('Vesta Control Panel')."\n";
73+
send_email($to, $subject, $mailtext, $from);
74+
}
75+
$_SESSION['ok_msg'] = _('DATABASE_CREATED_OK',$user."_".$_POST['v_database'],$user."_".$_POST['v_database']);
76+
unset($v_database);
77+
unset($v_dbuser);
78+
unset($v_password);
79+
unset($v_type);
80+
unset($v_charset);
81+
unset($output);
9582
}
9683
}
97-
}
84+
9885
exec (VESTA_CMD."v-list-database-types 'json'", $output, $return_var);
9986
$db_types = json_decode(implode('', $output), true);
10087
unset($output);
10188

10289
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/add_db.html');
10390
unset($_SESSION['error_msg']);
10491
unset($_SESSION['ok_msg']);
105-
//}
10692

10793
// Footer
10894
include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');
109-
?>
95+
?>

‎web/edit/db/index.php‎

Lines changed: 54 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -13,67 +13,68 @@
1313
// Panel
1414
top_panel($user,$TAB);
1515

16-
// Check user argument?
17-
if (empty($_GET['database'])) {
18-
header("Location: /list/db/");
19-
exit;
20-
}
16+
$lang = 'ru_RU.utf8';
17+
setlocale(LC_ALL, $lang);
2118

22-
// Edit as someone else?
23-
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
24-
$user=escapeshellarg($_GET['user']);
25-
}
19+
if (empty($_GET['database'])) {
20+
header("Location: /list/db/");
21+
exit;
22+
}
23+
24+
// Edit as someone else?
25+
if (($_SESSION['user'] == 'admin') && (!empty($_GET['user']))) {
26+
$user=escapeshellarg($_GET['user']);
27+
}
2628

27-
$v_database = escapeshellarg($_GET['database']);
28-
exec (VESTA_CMD."v-list-database ".$user." ".$v_database." 'json'", $output, $return_var);
29-
if ($return_var != 0) {
30-
$error = implode('<br>', $output);
31-
if (empty($error)) $error = _('Error: vesta did not return any output.');
32-
$_SESSION['error_msg'] = $error;
29+
$v_database = escapeshellarg($_GET['database']);
30+
exec (VESTA_CMD."v-list-database ".$user." ".$v_database." 'json'", $output, $return_var);
31+
if ($return_var != 0) {
32+
$error = implode('<br>', $output);
33+
if (empty($error)) $error = _('Error: vesta did not return any output.');
34+
$_SESSION['error_msg'] = $error;
35+
} else {
36+
$data = json_decode(implode('', $output), true);
37+
unset($output);
38+
$v_username = $user;
39+
$v_database = $_GET['database'];
40+
$v_dbuser = $data[$v_database]['DBUSER'];
41+
$v_password = "••••••••";
42+
$v_host = $data[$v_database]['HOST'];
43+
$v_type = $data[$v_database]['TYPE'];
44+
$v_charset = $data[$v_database]['CHARSET'];
45+
$v_date = $data[$v_database]['DATE'];
46+
$v_time = $data[$v_database]['TIME'];
47+
$v_suspended = $data[$v_database]['SUSPENDED'];
48+
if ( $v_suspended == 'yes' ) {
49+
$v_status = 'suspended';
3350
} else {
34-
$data = json_decode(implode('', $output), true);
35-
unset($output);
36-
$v_username = $user;
37-
$v_database = $_GET['database'];
38-
$v_dbuser = $data[$v_database]['DBUSER'];
39-
$v_password = "••••••••";
40-
$v_host = $data[$v_database]['HOST'];
41-
$v_type = $data[$v_database]['TYPE'];
42-
$v_charset = $data[$v_database]['CHARSET'];
43-
$v_date = $data[$v_database]['DATE'];
44-
$v_time = $data[$v_database]['TIME'];
45-
$v_suspended = $data[$v_database]['SUSPENDED'];
46-
if ( $v_suspended == 'yes' ) {
47-
$v_status = 'suspended';
48-
} else {
49-
$v_status = 'active';
50-
}
51+
$v_status = 'active';
52+
}
5153

52-
// Action
53-
if (!empty($_POST['save'])) {
54-
$v_username = $user;
55-
// Change password
56-
if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) {
57-
$v_password = escapeshellarg($_POST['v_password']);
58-
exec (VESTA_CMD."v-change-database-password ".$v_username." ".$v_database." ".$v_password, $output, $return_var);
59-
if ($return_var != 0) {
60-
$error = implode('<br>', $output);
61-
if (empty($error)) $error = _('Error: vesta did not return any output.');
62-
$_SESSION['error_msg'] = $error;
63-
}
64-
$v_password = "••••••••";
65-
unset($output);
66-
}
67-
if (empty($_SESSION['error_msg'])) {
68-
$_SESSION['ok_msg'] = _('OK: changes has been saved.');
54+
// Action
55+
if (!empty($_POST['save'])) {
56+
$v_username = $user;
57+
// Change password
58+
if (($v_password != $_POST['v_password']) && (empty($_SESSION['error_msg']))) {
59+
$v_password = escapeshellarg($_POST['v_password']);
60+
exec (VESTA_CMD."v-change-database-password ".$v_username." ".$v_database." ".$v_password, $output, $return_var);
61+
if ($return_var != 0) {
62+
$error = implode('<br>', $output);
63+
if (empty($error)) $error = _('Error: vesta did not return any output.');
64+
$_SESSION['error_msg'] = $error;
6965
}
66+
$v_password = "••••••••";
67+
unset($output);
68+
}
69+
if (empty($_SESSION['error_msg'])) {
70+
$_SESSION['ok_msg'] = _('OK: changes has been saved.');
7071
}
7172
}
73+
}
7274

73-
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_db.html');
74-
unset($_SESSION['error_msg']);
75-
unset($_SESSION['ok_msg']);
76-
//}
75+
include($_SERVER['DOCUMENT_ROOT'].'/templates/admin/edit_db.html');
76+
unset($_SESSION['error_msg']);
77+
unset($_SESSION['ok_msg']);
7778

7879
// Footer
7980
include($_SERVER['DOCUMENT_ROOT'].'/templates/footer.html');

‎web/inc/i18n/en.php‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,9 @@
88
if (!defined('LANGUAGE')) die('Direct access not allowed');
99

1010
$LANG = array(
11-
'yes' => 'да',
12-
'no' => 'нет',
13-
'none' => 'нет',
1411
'yes' => 'yes',
1512
'no' => 'no',
13+
'none' => 'нет',
1614
'Hour' => 'Hour',
1715
'Min' => 'Min',
1816
'pb' => 'pb',
@@ -192,7 +190,6 @@
192190
'traffic' => 'traffic',
193191
'Database Credentials' => 'Database Credentials',
194192
'DATABASE_READY'=>"Hello, %s %s,\nDatabase %s has been created successfully.\n\nDatabase: %s_%s\nUser: %s_%s\nPassword: %s\n\n",
195-
'Send credentials to' => 'Send credentials to',
196193
'Adding DNS Record' => 'Adding DNS Record',
197194
'Record' => 'Record / Subdomain',
198195
'IP or Value' => 'IP-address or Valie',

‎web/inc/i18n/ru.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
'charset' => 'кодировка',
3838
'edit' => 'редактировать',
3939
'DATABASE_CREATED_OK' => 'База данных <a href="/edit/db/?database=%s"><b>%s</b></a> успешно создана.',
40+
'User' => 'Пользователь',
41+
'Host' => 'Хост',
4042
'domain' => 'домен',
4143
'ip' => 'IP',
4244
'DOMAIN_CREATED_OK' => 'Домен <a href="/list/dns/?domain=%s"><b>%s</b></a> успешно создан.',
@@ -192,8 +194,7 @@
192194
'Disk' => 'Диск',
193195
'traffic' => 'трафик',
194196
'Database Credentials' => 'Данные для доступа к БД',
195-
'DATABASE_READY'=>"Здравствуйте %s %s,\nВаша %s база данных создана успешно.\n\nИмя БД: %s_%s\nПользователь: %s_%s\nПароль: %s\n\n",
196-
'Send credentials to' => 'Отправить данные для доступа к ',
197+
'DATABASE_READY'=>"База данных создана успешно.\n\nИмя БД: %s_%s\nПользователь: %s_%s\nПароль: %s\n\n",
197198
'Adding DNS Record' => 'Добавление DNS записи',
198199
'Record' => 'Запись / Поддомен',
199200
'IP or Value' => 'IP-адрес или значение',
@@ -349,7 +350,6 @@
349350
'Load Average' => 'Нагрузка',
350351
'Memory Usage' => 'Использование Памяти',
351352
'Bandwidth Usage' => 'Использование Сети',
352-
353353
);
354354

355355
/*error_reporting(E_ALL);

‎web/list/db/index.php‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
// Panel
1313
top_panel($user,$TAB);
1414

15+
$lang = 'ru_RU.utf8';
16+
setlocale(LC_ALL, $lang);
17+
1518
// Data
1619
if ($_SESSION['user'] == 'admin') {
1720
exec (VESTA_CMD."v-list-databases $user json", $output, $return_var);

0 commit comments

Comments
 (0)