Changes due to dependency of old system.

Minor bug in /web/add/user/index.php as we can't translate emaill in "user" language instead of admin

Author: jaapmarcus

bin/v-change-sys-language

@@ -19,7 +19,7 @@ source $HESTIA/conf/hestia.conf
 
 
 is_language_valid() {
-    if [ ! -e "$HESTIA/web/inc/i18n/$language.php" ]; then
+    if [ ! -d "$HESTIA/web/locale/$language" ]; then
         echo "Error: language file $language doesn't exist"
         log_event "$E_NOTEXIST $ARGUMENTS"
         exit $E_NOTEXIST

web/add/user/index.php

@@ -81,17 +81,17 @@
     // Send email to the new user
     if ((empty($_SESSION['error_msg'])) && (!empty($v_notify))) {
         $to = $_POST['v_notify'];
-        $subject = _translate($_POST['v_language'],"Welcome to Hestia Control Panel");
+        $subject = _("Welcome to Hestia Control Panel"); //currently not supported to use the account language
         $hostname = exec('hostname');
         unset($output);
-        $from = _translate($_POST['v_language'],'MAIL_FROM',$hostname);
+        $from = _('MAIL_FROM',$hostname); //currently not supported to use the account language
 
         if (!empty($_POST['v_name'])) {
-            $mailtext = _translate($_POST['v_language'],'GREETINGS_GORDON',$_POST['v_name']);
+            $mailtext = _('GREETINGS_GORDON',$_POST['v_name']);
         } else {
-            $mailtext = _translate($_POST['v_language'],'GREETINGS');
+            $mailtext = _('GREETINGS');
         }
-        $mailtext .= _translate($_POST['v_language'],'ACCOUNT_READY',$_SERVER['HTTP_HOST'],$_POST['v_username'],$_POST['v_password']);
+        $mailtext .= _($_POST['v_language'],'ACCOUNT_READY',$_SERVER['HTTP_HOST'],$_POST['v_username'],$_POST['v_password']);
         send_email($to, $subject, $mailtext, $from);
     }
 

web/inc/i18n.php

@@ -1,42 +1,23 @@
 <?php
 // Functions for internationalization
 // I18N support information here
-$language = 'nl_NL';
 
-putenv("LANGUAGE=$language");
+putenv("LANGUAGE=".$_SESSION['language']);
 setlocale( LC_ALL, 'C.UTF-8' );
 
-$domain = 'messages';
+$domain = 'hestiacp';
 $localedir = '/usr/local/hestia/web/locale';
 bindtextdomain($domain, $localedir);
 textdomain($domain);
 
 
-
-/**
- * Translates string to given language in first parameter, key given in second parameter (dynamically loads required language). Works like spritf from second parameter
- * @global array $LANG Associative array of language pharses
- * @return string Translated string
- */
-function _translate() {
-
-}
-
-/**
- * Translates string by a given key in first parameter to current session language. Works like sprintf
- * @global array $LANG Associative array of language pharses
- * @return string Translated string
- * @see _translate()
- */
-
-
 /**
  * Detects user language from Accept-Language HTTP header.
  * @param string Fallback language (default: 'en')
  * @return string Language code (such as 'en' and 'ja')
  */
-function detect_user_language($fallback='en') {
-
+function detect_user_language($fallback='en_US') {
+    
 }
 
 /**

web/inc/mail-wrapper.php

@@ -23,9 +23,8 @@
 if (!empty( $data['config']['LANGUAGE'])) {
     $_SESSION['language'] = $data['config']['LANGUAGE'];
 } else {
-    $_SESSION['language'] = 'en';
+    $_SESSION['language'] = 'en_US';
 }
-require_once('/usr/local/hestia/web/inc/i18n/'.$_SESSION['language'].'.php');
 
 // Define vars
 $from = 'Hestia Control Panel <hestia@'.gethostname().'>';

web/inc/main.php

@@ -8,9 +8,6 @@
 
 $i = 0;
 
-require_once(dirname(__FILE__).'/i18n.php');
-
-
 // Saving user IPs to the session for preventing session hijacking
 $user_combined_ip = $_SERVER['REMOTE_ADDR'];
 
@@ -47,6 +44,8 @@
     header("Location: /login/");
     exit;
 }
+// Load Hestia Config directly
+    load_hestia_config();
 
 // Check system settings
 if ((!isset($_SESSION['VERSION'])) && (!defined('NO_AUTH_REQUIRED'))) {
@@ -72,37 +71,15 @@
     }
 }
 
-if (isset($_SESSION['language'])) {
-    switch ($_SESSION['language']) {
-        case 'ro':
-            setlocale(LC_ALL, 'ro_RO.utf8');
-            break;
-        case 'ru':
-            setlocale(LC_ALL, 'ru_RU.utf8');
-            break;
-        case 'ua':
-            setlocale(LC_ALL, 'uk_UA.utf8');
-            break;
-        case 'es':
-            setlocale(LC_ALL, 'es_ES.utf8');
-            break;
-        case 'ja':
-            setlocale(LC_ALL, 'ja_JP.utf8');
-            break;
-        default:
-            setlocale(LC_ALL, 'en_US.utf8');
-    }
-}
-
 if (isset($_SESSION['user'])) {
     $user = $_SESSION['user'];
-    load_hestia_config();
 }
 
 if (isset($_SESSION['look']) && ( $_SESSION['look'] != 'admin' )) {
     $user = $_SESSION['look'];
 }
 
+require_once(dirname(__FILE__).'/i18n.php');
 
 function check_error($return_var) {
     if ( $return_var > 0 ) {

web/js/i18n.js.php

@@ -3,10 +3,6 @@
 session_start();
 
 require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n.php');
-
-if (empty($_SESSION['language'])) {
-    //$_SESSION['language'] = detect_user_language();
-}
 ?>
 
 App.i18n.ARE_YOU_SURE                           = '<?=_('Are you sure?')?>';

web/login/index.php

@@ -170,13 +170,13 @@ function authenticate_user(){
         $_SESSION['language'] = $lang;
     }
     else {
-        $_SESSION['language'] = 'en';
+        $_SESSION['language'] = 'en_US';
     }
 }
 
 // Generate CSRF token
 $_SESSION['token'] = md5(uniqid(mt_rand(), true));
-require_once($_SERVER['DOCUMENT_ROOT'].'/inc/i18n/'.$_SESSION['language'].'.php');
+
 require_once('../templates/header.html');
 if (empty($_POST['user'])) {
     require_once('../templates/login.html');

web/reset/index.php

@@ -94,9 +94,6 @@
     }
 }
 
-// Detect language
-if (empty($_SESSION['language'])) $_SESSION['language'] = detect_user_language();
-
 if (empty($_GET['action'])) {
     require_once '../templates/header.html';
     require_once '../templates/reset_1.html';

web/reset2fa/index.php

@@ -10,10 +10,6 @@
 // Main include
 include($_SERVER['DOCUMENT_ROOT']."/inc/main.php");
 
-// Detect language
-if (empty($_SESSION['language'])){ 
-    $_SESSION['language'] = detect_user_language();
-}
 //Check values
 if(!empty($_POST['user']) && !empty($_POST['twofa'])){
     $error = true;