Merge pull request hestiacp#1151 from hestiacp/fix/2020-09_password_with_quotes

Password with Quotes and 2FA

Author: ScIT-Raphael

CHANGELOG.md

@@ -12,8 +12,19 @@ All notable changes to this project will be documented in this file.
 - Support for removing backup remote location (#1083)
 - Add support Proftpd TLS Support
 - Add the possibility to assign user "Administrators" rights on login. Replaces "root" login. Notifications are only send towards the "admin" account email
+- Updated translations system with the use of Gettext following languages are current supported 
+    - English
+    - German
+    - French
+    - Italian
+    - Spanish
+    - Chinese
+    - Greek
+    - Russian
+    - Ukrainian
+    - Dutch
 
-## Buggfixes
+## Bugfixes
 - Removed root login (root / root password )
 - Update apache2.conf replace Include with IncludeOptional (#1072)
 - Add ca-certificates, software-properties-common to the dependencies (#1073 + [Forum](https://forum.hestiacp.com/t/hestiscp-fails-on-new-debian-9-vps/1623/8) ) @daniel-eder

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

bin/v-change-user-language

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

bin/v-list-sys-languages

@@ -62,7 +62,7 @@ csv_list() {
 #----------------------------------------------------------#
 
 # Defining language list
-languages=$(ls $HESTIA/web/inc/i18n/ |cut -f 1 -d .)
+languages=$(ls -d $HESTIA/web/locale/*/ |awk -F'/' '{print $(NF-1)}')
 
 # Listing data
 case $format in

install/upgrade/versions/1.3.0.sh

@@ -42,3 +42,9 @@ if [ "$FTP_SYSTEM" == "proftpd" ]; then
     cp -f $HESTIA_INSTALL_DIR/proftpd/tls.conf /etc/proftpd/
 
 fi
+
+# Remove old lanugage files.
+if [ -e $HESTIA/web/inc/i18n/en.php ]; then 
+    echo "[!] Clean up old language files"
+    rm -fr $HESTIA/web/inc/i18n
+fi

src/deb/nginx/control

@@ -1,7 +1,7 @@
 Source: hestia-nginx
 Package: hestia-nginx
 Priority: optional
-Version: 1.19.1
+Version: 1.19.1~alpha
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com

src/deb/php/control

@@ -1,7 +1,7 @@
 Source: hestia-php
 Package: hestia-php
 Priority: optional
-Version: 7.4.8
+Version: 7.4.8~alpha
 Section: admin
 Maintainer: HestaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com

src/hst_autocompile.sh

@@ -86,11 +86,11 @@ fi
 
 BUILD_ARCH='amd64'
 HESTIA_V="${BUILD_VER}_${BUILD_ARCH}"
-NGINX_V=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/$branch/src/deb/nginx/control |grep "Version:" |cut -d' ' -f2)
+NGINX_V=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/$branch/src/deb/nginx/control |grep "Version:" |cut -d' ' -f2 |cut -d"~" -f1)
 OPENSSL_V='1.1.1g'
 PCRE_V='8.44'
 ZLIB_V='1.2.11'
-PHP_V=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/$branch/src/deb/php/control |grep "Version:" |cut -d' ' -f2)
+PHP_V=$(curl -s https://raw.githubusercontent.com/hestiacp/hestiacp/$branch/src/deb/php/control |grep "Version:" |cut -d' ' -f2 |cut -d"~" -f1)
 
 # Create build directories
 rm -rf $BUILD_DIR
@@ -339,6 +339,7 @@ if [ "$PHP_B" = true ] ; then
                 --with-fpm-group=admin \
                 --with-libdir=lib/x86_64-linux-gnu \
                 --with-mysqli \
+                --with-gettext \
                 --with-curl \
                 --with-zip \
                 --with-gmp \

web/add/cron/index.php

@@ -16,12 +16,12 @@
     }
 
     // Check empty fields
-    if ((!isset($_POST['v_min'])) || ($_POST['v_min'] == '')) $errors[] = __('minute');
-    if ((!isset($_POST['v_hour'])) || ($_POST['v_hour'] == '')) $errors[] = __('hour');
-    if ((!isset($_POST['v_day'])) || ($_POST['v_day'] == '')) $errors[] = __('day');
-    if ((!isset($_POST['v_month'])) || ($_POST['v_month'] == '')) $errors[] = __('month');
-    if ((!isset($_POST['v_wday'])) || ($_POST['v_wday'] == '')) $errors[] = __('day of week');
-    if ((!isset($_POST['v_cmd'])) || ($_POST['v_cmd'] == '')) $errors[] = __('cmd');
+    if ((!isset($_POST['v_min'])) || ($_POST['v_min'] == '')) $errors[] = _('minute');
+    if ((!isset($_POST['v_hour'])) || ($_POST['v_hour'] == '')) $errors[] = _('hour');
+    if ((!isset($_POST['v_day'])) || ($_POST['v_day'] == '')) $errors[] = _('day');
+    if ((!isset($_POST['v_month'])) || ($_POST['v_month'] == '')) $errors[] = _('month');
+    if ((!isset($_POST['v_wday'])) || ($_POST['v_wday'] == '')) $errors[] = _('day of week');
+    if ((!isset($_POST['v_cmd'])) || ($_POST['v_cmd'] == '')) $errors[] = _('cmd');
     if (!empty($errors[0])) {
         foreach ($errors as $i => $error) {
             if ( $i == 0 ) {
@@ -30,7 +30,7 @@
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Protect input
@@ -50,7 +50,7 @@
 
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
-        $_SESSION['ok_msg'] = __('CRON_CREATED_OK');
+        $_SESSION['ok_msg'] = _('CRON_CREATED_OK');
         unset($v_min);
         unset($v_hour);
         unset($v_day);

web/add/db/index.php

@@ -16,12 +16,12 @@
     }
 
     // Check empty fields
-    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_host'])) $errors[] = __('host');
-    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_host'])) $errors[] = _('host');
+    if (empty($_POST['v_charset'])) $errors[] = _('charset');
     if (!empty($errors[0])) {
         foreach ($errors as $i => $error) {
             if ( $i == 0 ) {
@@ -30,19 +30,19 @@
                 $error_msg = $error_msg.", ".$error;
             }
         }
-        $_SESSION['error_msg'] = __('Field "%s" can not be blank.',$error_msg);
+        $_SESSION['error_msg'] = sprintf(_('Field "%s" can not be blank.'),$error_msg);
     }
 
     // Validate email
     if ((!empty($_POST['v_db_email'])) && (empty($_SESSION['error_msg']))) {
         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.');
         }
-    }   
+    }
 
     // Check password length
     if (empty($_SESSION['error_msg'])) {
-         if (!validate_password($_POST['v_password'])) { $_SESSION['error_msg'] = __('Password does not match the minimum requirements');}
+         if (!validate_password($_POST['v_password'])) { $_SESSION['error_msg'] = _('Password does not match the minimum requirements');}
     }
 
     // Protect input
@@ -87,17 +87,17 @@
     // Email login credentials
     if ((!empty($v_db_email)) && (empty($_SESSION['error_msg']))) {
         $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 = sprintf(_('MAIL_FROM'),$hostname);
+        $mailtext = sprintf(_('DATABASE_READY'),$user."_".$_POST['v_database'],$user."_".$_POST['v_dbuser'],$_POST['v_password'],$db_admin_link);
         send_email($to, $subject, $mailtext, $from);
     }
 
     // Flush field values on success
     if (empty($_SESSION['error_msg'])) {
-        $_SESSION['ok_msg'] = __('DATABASE_CREATED_OK',htmlentities($user)."_".htmlentities($_POST['v_database']),htmlentities($user)."_".htmlentities($_POST['v_database']));
-        $_SESSION['ok_msg'] .= " / <a href=".$db_admin_link." target='_blank'>" . __('open %s',$db_admin) . "</a>";
+        $_SESSION['ok_msg'] = sprintf(_('DATABASE_CREATED_OK'),htmlentities($user)."_".htmlentities($_POST['v_database']),htmlentities($user)."_".htmlentities($_POST['v_database']));
+        $_SESSION['ok_msg'] .= " / <a href=".$db_admin_link." target='_blank'>" . sprintf(_('open %s'),$db_admin) . "</a>";
         unset($v_database);
         unset($v_dbuser);
         unset($v_password);