github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-20 21:34:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #5 from serghey-rodin/master

Browse source 
update from master
This commit is contained in:
myvesta 2018-05-18 15:56:53 +02:00 • committed by GitHub
commit c80350ff3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
install/vst-install-rhel.sh
View file

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

1
web/inc/i18n/nl.php
View file

@ -16,6 +16,7 @@ $LANG['nl'] = array(
'Services' => 'Processen', 'Services' => 'Processen',
'Firewall' => 'Firewall', 'Firewall' => 'Firewall',
'Updates' => 'Updates', 'Updates' => 'Updates',
'Apps' => 'Applicaties',
'Log in' => 'Inloggen', 'Log in' => 'Inloggen',
'Log out' => 'Uitloggen', 'Log out' => 'Uitloggen',

4
web/view/file/index.php
View file

@ -13,10 +13,10 @@ if (($_SESSION['user'] == 'admin') && (!empty($_SESSION['look']))) {
} }
if (!empty($_REQUEST['path'])) { if (!empty($_REQUEST['path'])) {
$path = $_REQUEST['path']; $path = htmlspecialchars($_REQUEST['path'], ENT_QUOTES, 'UTF-8');
if (!empty($_REQUEST['raw'])) { if (!empty($_REQUEST['raw'])) {
header('content-type: image/jpeg'); 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; exit;
} }
} }