Merge branch 'main' into staging/fixes

ScIT-Raphael · web-flow · commit b52c4f8798eb · 2020-11-13T10:00:21.000+01:00
diff --git a/bin/v-change-sys-config-value b/bin/v-change-sys-config-value
@@ -23,6 +23,8 @@ source $HESTIA/conf/hestia.conf
 
 PATH="$PATH:/usr/local/sbin:/sbin:/usr/sbin:/root/bin"
 
+# Perform verification if read-only mode is enabled
+check_hestia_demo_mode
 
 #----------------------------------------------------------#
 #                    Verifications                         #
diff --git a/install/deb/nginx/nginx.conf b/install/deb/nginx/nginx.conf
@@ -131,14 +131,6 @@ http {
     proxy_cache_use_stale error timeout invalid_header http_502;
     proxy_cache_valid any 1d;
 
-    # FastCGI Cache settings
-    fastcgi_cache_path /var/cache/nginx/php-fpm levels=2 keys_zone=cache:10m inactive=60m max_size=1024m;
-    fastcgi_cache_key "$host$request_uri $cookie_user";
-    fastcgi_temp_path  /var/cache/nginx/temp;
-    fastcgi_ignore_headers Expires Cache-Control;
-    fastcgi_cache_use_stale error timeout invalid_header;
-    fastcgi_cache_valid any 1d;
-
     # Cache bypass
     map $http_cookie $no_cache {
         default 0;
diff --git a/install/deb/templates/web/nginx/caching.stpl b/install/deb/templates/web/nginx/caching.stpl
@@ -17,7 +17,7 @@ server {
     location / {
         proxy_pass      https://%ip%:%web_ssl_port%;
 
-        proxy_cache %domain%;
+        proxy_cache cache;
         proxy_cache_valid 15m;
         proxy_cache_valid 404 1m;
         proxy_no_cache $no_cache;
diff --git a/install/deb/templates/web/nginx/caching.tpl b/install/deb/templates/web/nginx/caching.tpl
@@ -12,7 +12,7 @@ server {
     location / {
         proxy_pass      http://%ip%:%web_port%;
 
-        proxy_cache %domain%;
+        proxy_cache cache;
         proxy_cache_valid 15m;
         proxy_cache_valid 404 1m;
         proxy_no_cache $no_cache;
diff --git a/install/deb/templates/web/nginx/php-fpm/caching.sh b/install/deb/templates/web/nginx/php-fpm/caching.sh
diff --git a/install/deb/templates/web/nginx/php-fpm/caching.stpl b/install/deb/templates/web/nginx/php-fpm/caching.stpl
diff --git a/install/deb/templates/web/nginx/php-fpm/caching.tpl b/install/deb/templates/web/nginx/php-fpm/caching.tpl
diff --git a/src/deb/hestia/control b/src/deb/hestia/control
@@ -1,7 +1,7 @@
 Source: hestia
 Package: hestia
 Priority: optional
-Version: 1.3.1
+Version: 1.3.1~RC
 Section: admin
 Maintainer: HestiaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com
diff --git a/src/deb/php/control b/src/deb/php/control
@@ -1,7 +1,7 @@
 Source: hestia-php
 Package: hestia-php
 Priority: optional
-Version: 7.4.12
+Version: 7.4.12-1
 Section: admin
 Maintainer: HestaCP <info@hestiacp.com>
 Homepage: https://www.hestiacp.com
diff --git a/src/hst_autocompile.sh b/src/hst_autocompile.sh
@@ -180,7 +180,7 @@ NGINX='https://nginx.org/download/nginx-'$(echo $NGINX_V |cut -d"~" -f1)'.tar.gz
 OPENSSL='https://www.openssl.org/source/openssl-'$OPENSSL_V'.tar.gz'
 PCRE='https://ftp.pcre.org/pub/pcre/pcre-'$PCRE_V'.tar.gz'
 ZLIB='https://www.zlib.net/zlib-'$ZLIB_V'.tar.gz'
-PHP='http://de2.php.net/distributions/php-'$(echo $PHP_V |cut -d"-" -f1)'.tar.gz'
+PHP='http://de2.php.net/distributions/php-'$(echo $PHP_V |cut -d"~" -f1)'.tar.gz'
 
 # Forward slashes in branchname are replaced with dashes to match foldername in github archive.
 branch=$(echo "$branch" |sed 's/\//-/g');
@@ -330,7 +330,7 @@ if [ "$PHP_B" = true ] ; then
     download_file $PHP '-' | tar xz
 
     # Change to php directory
-    cd php-$(echo $PHP_V |cut -d"-" -f1)
+    cd php-$(echo $PHP_V |cut -d"~" -f1)
 
     # Configure PHP
     ./configure   --prefix=/usr/local/hestia/php \
@@ -355,7 +355,7 @@ if [ "$PHP_B" = true ] ; then
 
     # Cleare up unused files
     cd $BUILD_DIR
-    rm -r php-$(echo $PHP_V |cut -d"-" -f1)
+    rm -r php-$(echo $PHP_V |cut -d"~" -f1)
 
     # Prepare Deb Package Folder Structure
     cd hestia-php_$PHP_V/
diff --git a/web/add/user/index.php b/web/add/user/index.php
@@ -123,8 +123,11 @@
 
 // List languages
 exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
-$languages = json_decode(implode('', $output), true);
-unset($output);
+$language = json_decode(implode('', $output), true);
+foreach($language as $lang){
+    $languages[$lang] = translate_json($lang);
+}
+asort($languages);
 
 // Render page
 render_page($user, $TAB, 'add_user');
diff --git a/web/edit/server/index.php b/web/edit/server/index.php
@@ -91,9 +91,13 @@
     return $phpinfo;
 }, $v_php_versions);
 
-// List supported languages
+// List languages
 exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
-$languages = json_decode(implode('', $output), true);
+$language = json_decode(implode('', $output), true);
+foreach($language as $lang){
+    $languages[$lang] = translate_json($lang);
+}
+asort($languages);
 unset($output);
 
 // List themes
diff --git a/web/edit/user/index.php b/web/edit/user/index.php
@@ -70,7 +70,11 @@
 
 // List languages
 exec (HESTIA_CMD."v-list-sys-languages json", $output, $return_var);
-$languages = json_decode(implode('', $output), true);
+$language = json_decode(implode('', $output), true);
+foreach($language as $lang){
+    $languages[$lang] = translate_json($lang);
+}
+asort($languages);
 unset($output);
 
 // List shells
diff --git a/web/inc/i18n.php b/web/inc/i18n.php
@@ -25,7 +25,17 @@ function detect_user_language() {
        return 'en';
    }
 }
-
+/**
+ * Translate ISO2 to "Language" 
+ * nl = Dutch, de = German
+ * @param string iso2 code
+ * @return string Language
+ */
+function translate_json($string){
+    $json = file_get_contents($_SERVER['DOCUMENT_ROOT'].'/locale/languages.json');
+    $json_a = json_decode($json, true);
+    return $json_a[$string][0] .' ('.$json_a[$string.'_locale'][0].')';
+}
 /**
  * Detects user language .
  * @param string Fallback language (default: 'en')
diff --git a/web/locale/languages.json b/web/locale/languages.json
@@ -0,0 +1 @@
+{"az_locale":["Az\u0259rbaycan dili"],"zh-tw_locale":["\u81fa\u7063\u8a71"],"zh-tw":["Chinese (Taiwan)"],"zh-cn_locale":["\u666e\u901a\u8bdd"],"zh-cn":["Chinese"],"vi_locale":["Ti\u1ebfng Vi\u1ec7t"],"vi":["Vietnamese"],"ur_locale":["\u0627\u064f\u0631\u062f\u064f\u0648"],"ur":["Urdu"],"uk_locale":["Y\u043a\u0440\u0430\u0457\u043d\u0441\u044c\u043a\u0430 \u043c\u043e\u0432\u0430"],"uk":["Ukrainian"],"tr_locale":["T\u00fcrk\u00e7e"],"tr":["Turkish"],"th_locale":["\u0e44\u0e17\u0e22"],"th":["Thai"],"sv_locale":["Svenska"],"sv":["Swedish"],"sr_locale":["\u0441\u0440\u043f\u0441\u043a\u0438"],"sr":["Serbian"],"ru_locale":["\u0420\u0443\u0441\u0441\u043a\u0438\u0439 \u044f\u0437\u044b\u043a"],"ru":["Russian"],"ro_locale":["Rom\u00e2n\u0103"],"ro":["Romanian"],"pt-br_locale":["Portugu\u00eas (Brasil)"],"pt-br":["Portuguese (Brasil)"],"pt_locale":["Portugu\u00eas"],"pt":["Portuguese"],"pl_locale":["Polski"],"pl":["Polish"],"no_locale":["Norsk"],"no":["Norwegain"],"nl_locale":["Nederlands"],"nl":["Dutch"],"ko_locale":["\ud55c\uad6d\uc5b4"],"ko":["Korean"],"ka_locale":["\u10e5\u10d0\u10e0\u10d7\u10e3\u10da\u10d8 \u10d4\u10dc\u10d0"],"ka":["Georgian"],"ja_locale":["\u65e5\u672c\u8a9e"],"ja":["Japanese"],"it_locale":["Italiano"],"it":["Italian"],"id_locale":["Bahasa Indonesia"],"id":["Indonesian"],"hu_locale":["Magyar"],"hu":["Hungarian"],"hr_locale":["Hravtski"],"hr":["Croatian"],"fr_locale":["Fran\u00e7ais "],"fr":["French"],"fi_locale":["Suomi"],"fi":["Finnish"],"fa_locale":["\u0641\u0627\u0631\u0633\u06cc"],"fa":["Persian"],"es_locale":["Espa\u00f1ol"],"es":["Spanish"],"en_locale":["English"],"en":["English"],"el_locale":["\u03b5\u03bb\u03bb\u03b7\u03bd\u03b9\u03ba\u03ac"],"el":["Greek"],"de_locale":["Deutsch"],"de":["German"],"da_locale":["Dansk"],"da":["Danish"],"cs_locale":["\u010de\u0161tina"],"cs":["Czech"],"bs_locale":["Bosanski"],"bs":["Bosnian"],"bg_locale":["\u0431\u044a\u043b\u0433\u0430\u0440\u0441\u043a\u0438"],"bg":["Bulgarian"],"az":["Azerbaijani"],"ar_locale":["\u0639\u0631\u0628\u0649"],"ar":["Arabic"]}
diff --git a/web/templates/admin/add_user.html b/web/templates/admin/add_user.html
@@ -154,13 +154,12 @@
                                     <select class="vst-list" name="v_language" tabindex="7" >
                                         <?php
                                             foreach ($languages as $key => $value) {
-                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($value)."\"";
-                                                $svalue = "'".$value."'";
-                                                if (( $value == $_SESSION['LANGUAGE'] ) && (empty($v_language))){
+                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".htmlentities($key)."\"";
+                                                if (( $key == $_SESSION['LANGUAGE'] ) && (empty($v_language))){
                                                     echo ' selected' ;
                                                 }
                                                 if (isset($v_language)){
-                                                    if (( $value == $v_language ) || ( $svalue == $v_language)){
+                                                    if ( $key == $v_language ){
                                                         echo ' selected' ;
                                                     }
                                                 }
diff --git a/web/templates/admin/edit_server.html b/web/templates/admin/edit_server.html
@@ -131,14 +131,14 @@
                                                 <select class="vst-list" name="v_language">
                                                     <?php
                                                         foreach ($languages as $key => $value) {
-                                                            echo "\t\t\t\t<option value=\"".$value."\"";
-                                                            if ((!empty($_SESSION['LANGUAGE'])) && ( $value == $_SESSION['LANGUAGE'])){
-                                                                echo ' selected' ;
+                                                            echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
+                                                            if ( $key == $v_language ){
+                                                                echo 'selected' ;
                                                             }
-                                                            if ((!empty($_SESSION['LANGUAGE'])) && ( $value == $_POST['v_language'])){
-                                                                echo ' selected' ;
+                                                            if (( $key == detect_user_language() ) && (empty($v_language))){
+                                                                echo 'selected' ;
                                                             }
-                                                            echo ">".$value."</option>\n";
+                                                            echo ">".htmlentities($value)."</option>\n";
                                                         }
                                                     ?>
                                                 </select>
diff --git a/web/templates/admin/edit_user.html b/web/templates/admin/edit_user.html
@@ -163,12 +163,12 @@
                                     <select class="vst-list" name="v_language">
                                         <?php
                                             foreach ($languages as $key => $value) {
-                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
-                                                $svalue = "'".$value."'";
-                                                if (( $value == $v_language ) || ( $svalue == $v_language)){
+                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
+                                                $skey = "'".$key."'";
+                                                if (( $key == $v_language ) || ( $skey == $v_language)){
                                                     echo 'selected' ;
                                                 }
-                                                if (( $value == detect_user_language() ) && (empty($v_language))){
+                                                if (( $key == detect_user_language() ) && (empty($v_language))){
                                                     echo 'selected' ;
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
diff --git a/web/templates/user/edit_user.html b/web/templates/user/edit_user.html
@@ -127,12 +127,11 @@
                                     <select class="vst-list" name="v_language">
                                         <?php
                                             foreach ($languages as $key => $value) {
-                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$value."\"";
-                                                $svalue = "'".$value."'";
-                                                if (( $value == $v_language ) || ( $svalue == $v_language)){
+                                                echo "\n\t\t\t\t\t\t\t\t\t<option value=\"".$key."\"";
+                                                if ( $key == $v_language ){
                                                     echo 'selected' ;
                                                 }
-                                                if (( $value == detect_user_language() ) && (empty($v_language))){
+                                                if (( $key == detect_user_language() ) && (empty($v_language))){
                                                     echo 'selected' ;
                                                 }
                                                 echo ">".htmlentities($value)."</option>\n";
