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

Merge pull request #20 from serghey-rodin/master

Browse source 
update from official vesta
This commit is contained in:
myvesta 2018-10-18 12:04:37 +02:00 • committed by GitHub
commit c04eda5e09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 122 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

13
web/inc/i18n/es.php
View file

@ -193,11 +193,11 @@ $LANG['es'] = array(
'Mail Accounts' => 'Cuentas de Correo',
'Cron Jobs' => 'Tareas Programadas',
'SSH Access' => 'Acceso SSH',
'IP Address' => 'IP Address',
'IP Addresses' => 'Dirección IP',
'IP Address' => 'Dirección IP',
'IP Addresses' => 'Direcciones IP',
'Backups' => 'Respaldos',
'Backup System' => 'Sistema de Respaldo',
'backup exclusions' => 'respaldos excluídos',
'backup exclusions' => 'configurar exlusiones',
'template' => 'plantilla',
'SSL Support' => 'Soportar SSL',
'SSL Home Directory' => 'Directorio local del SSL',
@ -248,8 +248,8 @@ $LANG['es'] = array(
'SYS' => 'SYS',
'Domains' => 'Dominios',
'Status' => 'Estado',
'shared' => 'compartido',
'dedicated' => 'dedicado',
'shared' => 'compartida',
'dedicated' => 'dedicada',
'Owner' => 'Dueño',
'Users' => 'Usuarios',
'Load Average' => 'Promedio de carga',
@ -332,7 +332,7 @@ $LANG['es'] = array(
'Package Name' => 'Nombre del Plan',
'Netmask' => 'Máscara de Red',
'Interface' => 'Interfaz',
'Shared' => 'Compartido',
'Shared' => 'Compartida',
'Assigned user' => 'Usuario asignado',
'Assigned domain' => 'Dominio asignado',
'NAT IP association' => 'Asociación NAT IP',
@ -762,4 +762,5 @@ $LANG['es'] = array(
'maximum characters length, including prefix' => 'usar un máximo de %s caracteres, incluyendo prefijo',
'Email Credentials' => 'Email Credentials',
);

2
web/reset/index.php
View file

@ -48,7 +48,7 @@ if ((!empty($_POST['user'])) && (!empty($_POST['code'])) && (!empty($_POST['pass
if ( $return_var == 0 ) {
$data = json_decode(implode('', $output), true);
$rkey = $data[$user]['RKEY'];
if ($rkey == $_POST['code']) {
if (hash_equals($rkey, $_POST['code'])) {
$v_password = tempnam("/tmp","vst");
$fp = fopen($v_password, "w");
fwrite($fp, $_POST['password']."\n");