diff options
| author | imoore76 <imoore76@users.noreply.github.com> | 2016-01-08 13:52:24 -0500 |
|---|---|---|
| committer | imoore76 <imoore76@users.noreply.github.com> | 2016-01-08 13:52:24 -0500 |
| commit | 11206435d3656c20b0f552942f58881836e311d6 (patch) | |
| tree | 5c093bf37eb6e35c2defd55398acd489b650c737 /endpoints | |
| parent | b2711b1bccc38d52214288c2a40232ddb67efb24 (diff) | |
| parent | 5fcef1bce2081eaa1ca81a2220e74df3ef9933d8 (diff) | |
| download | phpvirtualbox-11206435d3656c20b0f552942f58881836e311d6.zip phpvirtualbox-11206435d3656c20b0f552942f58881836e311d6.tar.gz phpvirtualbox-11206435d3656c20b0f552942f58881836e311d6.tar.bz2 | |
Merge pull request #12 from imoore76/develop
5.0-5 from develop
Diffstat (limited to 'endpoints')
| -rw-r--r-- | endpoints/api.php | 2 | ||||
| -rw-r--r-- | endpoints/lib/auth/Builtin.php | 5 | ||||
| -rw-r--r-- | endpoints/lib/config.php | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/endpoints/api.php b/endpoints/api.php index 8abd6e9..b6d768e 100644 --- a/endpoints/api.php +++ b/endpoints/api.php @@ -313,7 +313,7 @@ try { /*
* Call to vboxconnector
*/
- $vbox->$request['fn']($request['params'],array(&$response));
+ $vbox->{$request['fn']}($request['params'],array(&$response));
/*
diff --git a/endpoints/lib/auth/Builtin.php b/endpoints/lib/auth/Builtin.php index 30e5a82..fea93ab 100644 --- a/endpoints/lib/auth/Builtin.php +++ b/endpoints/lib/auth/Builtin.php @@ -167,7 +167,8 @@ class phpvbAuthBuiltin implements phpvbAuth { global $_SESSION; // Must be an admin - if(!$_SESSION['admin']) break; + if(!$_SESSION['admin']) + return; // Use main / auth server $vbox = new vboxconnector(true); @@ -175,7 +176,7 @@ class phpvbAuthBuiltin implements phpvbAuth { // See if it exists if(!$skipExistCheck && $vbox->vbox->getExtraData('phpvb/users/'.$vboxRequest['u'].'/pass')) - break; + return; if($vboxRequest['p']) $vbox->vbox->setExtraData('phpvb/users/'.$vboxRequest['u'].'/pass', hash('sha512', $vboxRequest['p'])); diff --git a/endpoints/lib/config.php b/endpoints/lib/config.php index 2c0c3b1..4c4fe2c 100644 --- a/endpoints/lib/config.php +++ b/endpoints/lib/config.php @@ -14,7 +14,7 @@ /*
* This version of phpVirtualBox
*/
-define('PHPVBOX_VER', '5.0-4');
+define('PHPVBOX_VER', '5.0-5');
class phpVBoxConfigClass {
|