diff --git a/web/add/user/index.php b/web/add/user/index.php index 48d8f9e9..7510d598 100644 --- a/web/add/user/index.php +++ b/web/add/user/index.php @@ -64,15 +64,15 @@ if ($_SESSION['user'] == 'admin') { exec (VESTA_CMD."v-change-user-language ".$v_username." ".$v_language, $output, $return_var); if (!empty($v_notify)) { $to = $_POST['v_notify']; - $subject = _("Welcome to Vesta Control Panel"); + $subject = _translate($v_language,"Welcome to Vesta Control Panel"); $hostname = exec('hostname'); - $from = _('MAIL_FROM',$hostname); + $from = _translate($v_language,'MAIL_FROM',$hostname); if (!empty($_POST['v_fname'])) { - $mailtext = _('GREETINGS_GORDON_FREEMAN',$_POST['v_fname'],$_POST['v_lname']); + $mailtext = _translate($v_language,'GREETINGS_GORDON_FREEMAN',$_POST['v_fname'],$_POST['v_lname']); } else { - $mailtext = _('GREETINGS'); + $mailtext = _translate($v_language,'GREETINGS'); } - $mailtext .= _('ACCOUNT_READY',$_SERVER['HTTP_HOST'],$_POST['v_username'],$_POST['v_password']); + $mailtext .= _translate($v_language,'ACCOUNT_READY',$_SERVER['HTTP_HOST'],$_POST['v_username'],$_POST['v_password']); send_email($to, $subject, $mailtext, $from); } diff --git a/web/inc/i18n/en.php b/web/inc/i18n/en.php index dd544580..001dd106 100644 --- a/web/inc/i18n/en.php +++ b/web/inc/i18n/en.php @@ -7,7 +7,7 @@ if (!defined('LANGUAGE')) die('Direct access not allowed'); -$LANG = array( +$LANG['en'] = array( 'yes' => 'yes', 'no' => 'no', 'none' => 'нет', diff --git a/web/inc/i18n/ru.php b/web/inc/i18n/ru.php index 13829d1b..c33fb243 100644 --- a/web/inc/i18n/ru.php +++ b/web/inc/i18n/ru.php @@ -7,7 +7,7 @@ if (!defined('LANGUAGE')) die('Direct access not allowed'); -$LANG = array( +$LANG['ru'] = array( 'yes' => 'да', 'no' => 'нет', 'none' => 'нет', diff --git a/web/inc/main.php b/web/inc/main.php index d90ecb98..6766cc69 100644 --- a/web/inc/main.php +++ b/web/inc/main.php @@ -1,25 +1,71 @@ 1) { $args[0] = $text; return call_user_func_array("sprintf",$args); } else return $text; } -// Check user session + +define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/'); + +$i = 0; + +// setting language here + + + $ls['command'] = VESTA_CMD."v-list-sys-languages json"; + exec ($ls['command'], $ls['output'], $ls['return_var']); + $ls['langs'] = json_decode(implode('', $ls['output']), true); + + if (isset($_SESSION['language'])&&!in_array($_SESSION['language'],$ls['langs'])) { + $ls['browserlang'] = strtolower(substr($_SERVER['HTTP_ACCEPT_LANGUAGE'],0,2)); + if (!in_array($ls['browserlang'],$ls['langs'])) { + unset($ls); + $ls['command'] = VESTA_CMD."v-list-sys-config json"; + exec ($ls['command'], $ls['output'], $ls['return_var']); + $ls['langs'] = json_decode(implode('',$ls['output']),true); + $_SESSION['language'] = $ls['langs']['config']['LANGUAGE']; + } else { + $_SESSION['language'] = $ls['browserlang']; + } + } + unset($ls); + if ((!isset($_SESSION['user'])) && (!isset($api_mode))&&!defined('NO_AUTH_REQUIRED')) { $_SESSION['request_uri'] = $_SERVER['REQUEST_URI']; header("Location: /login/"); @@ -32,10 +78,6 @@ if (isset($_SESSION['look']) && ( $_SESSION['look'] != 'admin' )) { $user = $_SESSION['user']; } -define('VESTA_CMD', '/usr/bin/sudo /usr/local/vesta/bin/'); - -$i = 0; - // Define functions function check_error($return_var){ if ( $return_var > 0 ) { diff --git a/web/index.php b/web/index.php index 35c889c9..ab20f591 100644 --- a/web/index.php +++ b/web/index.php @@ -1,5 +1,11 @@