diff options
| author | Ian Moore <imoore76@yahoo.com> | 2016-01-08 13:10:56 -0500 |
|---|---|---|
| committer | Ian Moore <imoore76@yahoo.com> | 2016-01-08 13:10:56 -0500 |
| commit | e5394ddab08b57e2d0b550a831f2ec7b82e86568 (patch) | |
| tree | 16789a171282daa19569ad92898d7eb056bd2731 | |
| parent | fc220fd7ca316a3256e00be193e7bafbe3e44744 (diff) | |
| download | phpvirtualbox-e5394ddab08b57e2d0b550a831f2ec7b82e86568.zip phpvirtualbox-e5394ddab08b57e2d0b550a831f2ec7b82e86568.tar.gz phpvirtualbox-e5394ddab08b57e2d0b550a831f2ec7b82e86568.tar.bz2 | |
PHP7 support
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CHANGELOG.txt | 1 | ||||
| -rw-r--r-- | endpoints/api.php | 2 | ||||
| -rw-r--r-- | endpoints/lib/auth/Builtin.php | 5 |
4 files changed, 6 insertions, 3 deletions
@@ -2,3 +2,4 @@ /.buildpath /.project /config.php +/phpinfo.php diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d3a978d..d6f9393 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,7 @@ -------------------------------------
5.0-5
-------------------------------------
+PHP 7 support
-------------------------------------
5.0-4 2015-12-07
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'])); |