Skip to content

Improvements to Check version and Vrdeaddress #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcelojannotti wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Improvements to Check version and Vrdeaddress #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
54b4490
Improvements on "Check for version mismatches"
marcelojannotti May 4, 2018
f796aeb
Update pt_br.xml
marcelojannotti May 4, 2018
6f197fa
Permit empty value on VRDEADDRESS
marcelojannotti Jun 5, 2018
2205f7d
Update VRDE Address info
marcelojannotti Jun 5, 2018
68f06c3
VRDE Address default value changed
marcelojannotti Jun 12, 2018
0fdd681
Update VRDEAddress info
marcelojannotti Jun 12, 2018
0f725f7
Cleaning VRDEAaddress code
marcelojannotti Jun 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions config.php-example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,14 @@ var $language = 'en';

/* Set the standard VRDE Port Number / Range, e.g. 1010-1020 or 1027 */
var $vrdeports = '9000-9100';
/* Set the default VRDE address, e.g. 192.168.1.1 */
#var $vrdeaddress = '192.168.1.1';

/*
* Set the VRDE address, e.g. 192.168.1.1
* To permit any address set '' (empty) or '0.0.0.0'
* Default value is '' empty (permit any address)
*/

#var $vrdeaddress = '';

/*
*
Expand Down
2 changes: 1 addition & 1 deletion endpoints/lib/vboxconnector.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3828,7 +3828,7 @@ public function remote_machineCreate($args) {
$this->session->machine->VRDEServer->enabled = 1;
$this->session->machine->VRDEServer->authTimeout = 5000;
$this->session->machine->VRDEServer->setVRDEProperty('TCP/Ports',($this->settings->vrdeports ? $this->settings->vrdeports : '3390-5000'));
$this->session->machine->VRDEServer->setVRDEProperty('TCP/Address',($this->settings->vrdeaddress ? $this->settings->vrdeaddress : '127.0.0.1'));
$this->session->machine->VRDEServer->setVRDEProperty('TCP/Address',($this->settings->vrdeaddress ? $this->settings->vrdeaddress : ''));
}
} catch (Exception $e) {
//Ignore
Expand Down
8 changes: 4 additions & 4 deletions js/chooser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -717,10 +717,10 @@ var vboxChooser = {
// Check for version mismatches?
if(!vboxChooser._versionChecked) {
vboxChooser._versionChecked = true;
var vStr = $('#vboxPane').data('vboxConfig').phpvboxver.substring(0,$('#vboxPane').data('vboxConfig').phpvboxver.indexOf('-'));
var vStr = $('#vboxPane').data('vboxConfig').phpvboxver.substring(0,$('#vboxPane').data('vboxConfig').phpvboxver.indexOf('-')).split('.');
var vers = $('#vboxPane').data('vboxConfig').version.string.replace('_OSE','').split('.');
if(vers[0]+'.'+vers[1] != vStr) {
vboxAlert('This version of phpVirtualBox ('+$('#vboxPane').data('vboxConfig').phpvboxver+') is incompatible with VirtualBox ' + $('#vboxPane').data('vboxConfig').version.string + ". You probably need to <a href='http://sourceforge.net/projects/phpvirtualbox/files/' target=_blank>download the latest phpVirtualBox " + vers[0]+'.'+vers[1] + "-x</a>.<p>See the Versioning section below the file list in the link for more information</p>",{'width':'auto'});
if(vers[0] != vStr[0] || vers[1] > vStr[1]) {
vboxAlert(trans("This version of phpVirtualBox (%1) is incompatible with VirtualBox %2. You probably need to <a href='%3' target='_blank'>download the latest phpVirtualBox %4-x</a>.",'phpVirtualBox').replace('%1',$('#vboxPane').data('vboxConfig').phpvboxver).replace('%2',$('#vboxPane').data('vboxConfig').version.string).replace('%3','https://github.com/phpvirtualbox/phpvirtualbox').replace('%4',vers[0]+'.'+vers[1]),{'width':'auto'});
}
}
} else {
Expand Down Expand Up @@ -2448,4 +2448,4 @@ $(document).ready(function(){



});
});
4 changes: 4 additions & 0 deletions languages/pt_br.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<language>
<context>
<name>phpVirtualBox</name>
<message>
<source>This version of phpVirtualBox (%1) is incompatible with VirtualBox %2. You probably need to &lt;a href='%3' target='_blank'&gt;download the latest phpVirtualBox %4-x&lt;/a&gt;.</source>
<translation>A versão do phpVirtualBox (%1) é incompatível com o VirtualBox %2. Você provavelmente precisará &lt;a href='%3' target='_blank'&gt;fazer o dowload da versão mais recente do phpVirtualBox %4-x&lt;/a&gt;.</translation>
</message>
<message>
<source>Warning: A VirtualBox internal operation is in progress. Closing this window or navigating away from this web page may cause unexpected and undesirable results. Please wait for the operation to complete.</source>
<translation>Aviso: Uma operação do VirtualBox está em execução. Fechar esta janela ou navegar fora desta página pode causar resultados inesperados e indesejáveis. Por favor espere até que a tarefa seja executada.</translation>
Expand Down