strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add meaningful return value to dba::connect

Browse source 
- Move System::unavailable call to index
This commit is contained in:
Hypolite Petovan 2018-03-18 05:15:14 -04:00
parent dcf2ed26bb
commit 881c7ccfc1
2 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/dba.php
View file

@ -13,7 +13,7 @@ use Friendica\Util\DateTimeFormat;
*/ */
class dba { class dba {
public static $connected = true; public static $connected = false;
private static $_server_info = ''; private static $_server_info = '';
private static $db; private static $db;
@ -48,8 +48,6 @@ class dba {
$db = trim($db); $db = trim($db);
if (!(strlen($server) && strlen($user))) { if (!(strlen($server) && strlen($user))) {
self::$connected = false;
self::$db = null;
return false; return false;
} }
@ -57,8 +55,6 @@ class dba {
if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
self::$error = L10n::t('Cannot locate DNS info for database server \'%s\'', $server); self::$error = L10n::t('Cannot locate DNS info for database server \'%s\'', $server);
self::$connected = false;
self::$db = null;
return false; return false;
} }
} }
@ -79,7 +75,6 @@ class dba {
self::$db = @new PDO($connect, $user, $pass); self::$db = @new PDO($connect, $user, $pass);
self::$connected = true; self::$connected = true;
} catch (PDOException $e) { } catch (PDOException $e) {
self::$connected = false;
} }
} }
@ -98,13 +93,10 @@ class dba {
// No suitable SQL driver was found. // No suitable SQL driver was found.
if (!self::$connected) { if (!self::$connected) {
self::$db = null; self::$db = null;
if (!$install) {
System::unavailable();
}
} }
$a->save_timestamp($stamp1, "network"); $a->save_timestamp($stamp1, "network");
return true; return self::$connected;
} }
/** /**

6
index.php
View file

@ -51,9 +51,13 @@ if (!$install) {
require_once "include/dba.php"; require_once "include/dba.php";
if (!$install) { if (!$install) {
dba::connect($db_host, $db_user, $db_pass, $db_data, $install); $result = dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
if (!$result) {
System::unavailable();
}
/** /**
* Load configs from db. Overwrite configs from .htconfig.php * Load configs from db. Overwrite configs from .htconfig.php
*/ */