MongoDB: Display Authentication failed instead of exception
This commit is contained in:
parent
08637cee62
commit
1e4fb073b5
|
@ -13,7 +13,10 @@ if (isset($_GET["mongo"])) {
|
||||||
|
|
||||||
function connect($uri, $options) {
|
function connect($uri, $options) {
|
||||||
$class = 'MongoDB\Driver\Manager';
|
$class = 'MongoDB\Driver\Manager';
|
||||||
return new $class($uri, $options);
|
$return = new $class($uri, $options);
|
||||||
|
$class = 'MongoDB\Driver\Command';
|
||||||
|
$return->executeCommand('admin', new $class(array('ping' => 1)));
|
||||||
|
return $return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function query($query) {
|
function query($query) {
|
||||||
|
@ -28,11 +31,6 @@ if (isset($_GET["mongo"])) {
|
||||||
function quote($string) {
|
function quote($string) {
|
||||||
return $string;
|
return $string;
|
||||||
}
|
}
|
||||||
|
|
||||||
function ping($link) {
|
|
||||||
$class = 'MongoDB\Driver\Command';
|
|
||||||
$link->executeCommand('admin', new $class(array('ping' => 1)));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class Min_Result {
|
class Min_Result {
|
||||||
|
@ -397,9 +395,6 @@ if (isset($_GET["mongo"])) {
|
||||||
function quote($string) {
|
function quote($string) {
|
||||||
return $string;
|
return $string;
|
||||||
}
|
}
|
||||||
|
|
||||||
function ping($link) {
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class Min_Result {
|
class Min_Result {
|
||||||
|
@ -631,7 +626,7 @@ if (isset($_GET["mongo"])) {
|
||||||
if ($password != "") {
|
if ($password != "") {
|
||||||
$options["password"] = "";
|
$options["password"] = "";
|
||||||
try {
|
try {
|
||||||
$connection->ping($connection->connect("mongodb://$server", $options));
|
$connection->connect("mongodb://$server", $options);
|
||||||
return lang('Database does not support password.');
|
return lang('Database does not support password.');
|
||||||
} catch (Exception $ex) {
|
} catch (Exception $ex) {
|
||||||
// this is what we want
|
// this is what we want
|
||||||
|
|
Loading…
Reference in a new issue