github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 10:37:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4 from serghey-rodin/master

Browse source 
updates from master branch
This commit is contained in:
myvesta 2018-05-14 16:55:36 +02:00 • committed by GitHub
commit 5d10ea26d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 98 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

6
web/inc/i18n/sr.php
View file

@ -489,7 +489,7 @@ $LANG['sr'] = array(
'Welcome' => 'Dobrodošli',
'LOGGED_IN_AS' => 'Ulogovani ste kao %s',
'Error' => 'Greška',
'Invalid username or password' => 'Pogrešani login podaci',
'Invalid username or password' => 'Pogrešni login podaci',
'Invalid username or code' => 'Pogrešno korisničko ime ili kod',
'Passwords not match' => 'Passwordi se ne poklapaju',
'Please enter valid email address.' => 'Potrebno je uneti validnu email adresu.',
@ -512,8 +512,8 @@ $LANG['sr'] = array(
'Welcome to Vesta Control Panel' => 'Dobrodošli u Vesta kontrolni panel',
'MAIL_FROM' => 'Vesta kontrolni panel <noreply@%s>',
'GREETINGS_GORDON_FREEMAN' => "Poštovanje, %s %s,\n",
'GREETINGS' => "Poštovanje,\n",
'GREETINGS_GORDON_FREEMAN' => "Poštovani %s %s,\n",
'GREETINGS' => "Poštovani,\n",
'ACCOUNT_READY' => "Vaš hosting nalog je kreiran i spreman za korišćenje.\n\nhttps://%s/login/\nKorisničko ime: %s\nŠifra: %s\n\n--\nVesta kontrolni panel\n",
'FTP login credentials' => 'FTP podaci',

35
web/upload/UploadHandler.php
View file

@ -1117,37 +1117,12 @@ class UploadHandler
$append_file = $content_range && is_file($file_path) &&
$file->size > $this->get_file_size($file_path);
if ($uploaded_file && is_uploaded_file($uploaded_file)) {
// multipart/formdata uploads (POST method uploads)
if ($append_file) {
file_put_contents(
$file_path,
fopen($uploaded_file, 'r'),
FILE_APPEND
);
} else {
chmod($uploaded_file, 0644);
// move_uploaded_file($uploaded_file, $file_path);
exec (VESTA_CMD . "v-copy-fs-file ". USERNAME ." {$uploaded_file} '{$file_path}'", $output, $return_var);
$error = check_return_code($return_var, $output);
if ($return_var != 0) {
//var_dump(VESTA_CMD . "v-copy-fs-file {$user} {$fn} {$path}");
//var_dump($path);
//var_dump($output);
$file->error = 'Error while saving file ';
// var_dump(VESTA_CMD . "v-copy-fs-file ". USERNAME ." {$uploaded_file} {$file_path}");
// var_dump($return_var);
// var_dump($output);
// exit();
}
chmod($uploaded_file, 0644);
exec (VESTA_CMD . "v-copy-fs-file ". USERNAME ." {$uploaded_file} '{$file_path}'", $output, $return_var);
$error = check_return_code($return_var, $output);
if ($return_var != 0) {
$file->error = 'Error while saving file ';
}
} else {
// Non-multipart uploads (PUT method support)
file_put_contents(
$file_path,
fopen('php://input', 'r'),
$append_file ? FILE_APPEND : 0
);
}
$file_size = $this->get_file_size($file_path, $append_file);

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

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