Merge pull request hestiacp#5 from serghey-rodin/master

update from master

Author: myvesta

install/vst-install-rhel.sh

@@ -636,14 +636,17 @@ fi
 #----------------------------------------------------------#
 
 # Installing rpm packages
-if [ "$remi" = 'yes' ]; then
-    yum -y --disablerepo=* \
-        --enablerepo="*base,*updates,nginx,epel,vesta,remi*" \
-        install $software
-else
-    yum -y --disablerepo=* --enablerepo="*base,*updates,nginx,epel,vesta" \
-        install $software
-fi
+#if [ "$remi" = 'yes' ]; then
+#    yum -y --disablerepo=* \
+#        --enablerepo="*base,*updates,nginx,epel,vesta,remi*" \
+#        install $software
+#else
+#    yum -y --disablerepo=* --enablerepo="*base,*updates,nginx,epel,vesta" \
+#        install $software
+#fi
+
+# Temporary fix for centos vault issue
+yum install $software
 check_result $? "yum install failed"
 
 

web/inc/i18n/nl.php

@@ -16,6 +16,7 @@
     'Services'  => 'Processen',
     'Firewall' => 'Firewall',
     'Updates'  => 'Updates',
+    'Apps' => 'Applicaties',
     'Log in'  => 'Inloggen',
     'Log out'  => 'Uitloggen',
 

web/view/file/index.php

@@ -13,10 +13,10 @@
 }
 
 if (!empty($_REQUEST['path'])) {
-    $path = $_REQUEST['path'];
+    $path = htmlspecialchars($_REQUEST['path'], ENT_QUOTES, 'UTF-8');
     if (!empty($_REQUEST['raw'])) {
         header('content-type: image/jpeg');
-        passthru (VESTA_CMD . "v-open-fs-file " . $user . " " . escapeshellarg(htmlspecialchars($_REQUEST['path'], ENT_QUOTES, 'UTF-8')));
+        passthru (VESTA_CMD . "v-open-fs-file " . $user . " " . escapeshellarg($path));
         exit;
     }
 }