From fc220fd7ca316a3256e00be193e7bafbe3e44744 Mon Sep 17 00:00:00 2001 From: Ian Moore Date: Mon, 7 Dec 2015 09:18:01 -0500 Subject: Prep for next release --- CHANGELOG.txt | 4 ++++ endpoints/lib/config.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 3439b3e..d3a978d 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,4 +1,8 @@ ------------------------------------- + 5.0-5 +------------------------------------- + +------------------------------------- 5.0-4 2015-12-07 ------------------------------------- Fixed bug in file / folder browser when $browserRestrictFolders is 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 { -- cgit v1.1 From e5394ddab08b57e2d0b550a831f2ec7b82e86568 Mon Sep 17 00:00:00 2001 From: Ian Moore Date: Fri, 8 Jan 2016 13:10:56 -0500 Subject: PHP7 support --- .gitignore | 1 + CHANGELOG.txt | 1 + endpoints/api.php | 2 +- endpoints/lib/auth/Builtin.php | 5 +++-- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 13fc44a..141c8a9 100644 --- a/.gitignore +++ b/.gitignore @@ -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'])); -- cgit v1.1 From 5fcef1bce2081eaa1ca81a2220e74df3ef9933d8 Mon Sep 17 00:00:00 2001 From: Ian Moore Date: Fri, 8 Jan 2016 13:50:49 -0500 Subject: 5.0-5 release --- CHANGELOG.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index d6f9393..7e05745 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,5 +1,5 @@ ------------------------------------- - 5.0-5 + 5.0-5 2016-01-08 ------------------------------------- PHP 7 support -- cgit v1.1