diff options
Diffstat (limited to 'endpoints/lib')
| -rw-r--r-- | endpoints/lib/config.php | 2 | ||||
| -rw-r--r-- | endpoints/lib/language.php | 4 | ||||
| -rw-r--r-- | endpoints/lib/vboxconnector.php | 18 |
3 files changed, 4 insertions, 20 deletions
diff --git a/endpoints/lib/config.php b/endpoints/lib/config.php index 4cb4ee2..ebe34c2 100644 --- a/endpoints/lib/config.php +++ b/endpoints/lib/config.php @@ -14,7 +14,7 @@ /*
* This version of phpVirtualBox
*/
-define('PHPVBOX_VER', '5.0-1');
+define('PHPVBOX_VER', '5.0-2');
class phpVBoxConfigClass {
diff --git a/endpoints/lib/language.php b/endpoints/lib/language.php index 4e5b6b4..da8241b 100644 --- a/endpoints/lib/language.php +++ b/endpoints/lib/language.php @@ -68,9 +68,9 @@ class __vbox_language { }
- self::$langdata = unserialize(file_get_contents(VBOX_BASE_LANG_DIR.'/source/'.$lang.'.dat'));
+ self::$langdata = unserialize(@file_get_contents(VBOX_BASE_LANG_DIR.'/source/'.$lang.'.dat'));
- $xmlObj = simplexml_load_string(file_get_contents(VBOX_BASE_LANG_DIR.'/'.$lang.'.xml'));
+ $xmlObj = simplexml_load_string(@file_get_contents(VBOX_BASE_LANG_DIR.'/'.$lang.'.xml'));
$arrXml = $this->objectsIntoArray($xmlObj);
$lang = array();
diff --git a/endpoints/lib/vboxconnector.php b/endpoints/lib/vboxconnector.php index c813f78..c1d6cd7 100644 --- a/endpoints/lib/vboxconnector.php +++ b/endpoints/lib/vboxconnector.php @@ -1463,8 +1463,6 @@ class vboxconnector { $m->setExtraData('phpvb/icon', $args['customIcon']); }
- $m->setExtraData('GUI/SaveMountedAtRuntime', ($args['GUI']['SaveMountedAtRuntime'] == 'no' ? 'no' : 'yes')); - // VRDE settings try { if($m->VRDEServer && $this->vbox->systemProperties->defaultVRDEExtPack) { @@ -1914,8 +1912,6 @@ class vboxconnector { $m->VRAMSize = $args['VRAMSize']; - $m->setExtraData('GUI/SaveMountedAtRuntime', ($args['GUI']['SaveMountedAtRuntime'] == 'no' ? 'no' : 'yes')); - // Video $m->accelerate3DEnabled = $args['accelerate3DEnabled']; $m->accelerate2DVideoEnabled = $args['accelerate2DVideoEnabled']; @@ -2360,7 +2356,6 @@ class vboxconnector { // progress operation result $response = array(); - $success = 1; $error = 0; // Connect to vboxwebsrv @@ -2382,7 +2377,6 @@ class vboxconnector { } catch (Exception $e) { $this->errors[] = $e; throw new Exception('Could not obtain progress operation: '.$args['progress']); - $success = 0; } $response['progress'] = $args['progress']; @@ -2428,16 +2422,9 @@ class vboxconnector { } } catch (Exception $null) {} - // Some progress operations seem to go away after completion - if(!($this->session->handle && (string)$this->session->state == 'Unlocked')) { - $this->errors[] = $e; - $success = 0; - } - } if($error) { - $success = 0; if(@$args['catcherrs']) $response['error'] = $error; else $this->errors[] = new Exception($error['message']); @@ -3832,7 +3819,6 @@ class vboxconnector { $this->session->machine->setExtraData('VBoxAuthSimple/users/'.$_SESSION['user'].'', $_SESSION['uHash']); // Always set - $this->session->machine->setExtraData('GUI/SaveMountedAtRuntime', 'yes'); $this->session->machine->setExtraData('GUI/FirstRun', 'yes'); try { @@ -4261,8 +4247,7 @@ class vboxconnector { 'bootOrder' => $this->_machineGetBootOrder($m), 'chipsetType' => (string)$m->chipsetType, 'GUI' => array( - 'SaveMountedAtRuntime' => $m->getExtraData('GUI/SaveMountedAtRuntime'), - 'FirstRun' => $m->getExtraData('GUI/FirstRun') + 'FirstRun' => $m->getExtraData('GUI/FirstRun'), ), 'customIcon' => (@$this->settings->enableCustomIcons ? $m->getExtraData('phpvb/icon') : ''), 'disableHostTimeSync' => intval($m->getExtraData("VBoxInternal/Devices/VMMDev/0/Config/GetHostTimeDisabled")), @@ -5358,7 +5343,6 @@ class vboxconnector { /* @var $machine IMachine */ $machine = $this->vbox->findMachine($args['vm']); $state = (string)$machine->sessionState; - $save = (strtolower($machine->getExtraData('GUI/SaveMountedAtRuntime')) == 'yes'); // create session $this->session = $this->websessionManager->getSessionObject($this->vbox->handle); |