Browse Source

Bugfixing DB/Installer

- default value with HiddenString
- Fixing checkDB during installation
tags/2019.09
Philipp Holzer 5 months ago
parent
commit
ab7c6499ff
No account linked to committer's email address
2 changed files with 8 additions and 13 deletions
  1. 1
    1
      config/defaults.config.php
  2. 7
    12
      src/Core/Installer.php

+ 1
- 1
config/defaults.config.php View File

@@ -22,7 +22,7 @@ return [

// pass (String)
// Database user password. Please don't use empty passwords.
'password' => '',
'password' => new \ParagonIE\HiddenString\HiddenString(''),

// base (String)
// Database name.

+ 7
- 12
src/Core/Installer.php View File

@@ -7,8 +7,8 @@ namespace Friendica\Core;
use DOMDocument;
use Exception;
use Friendica\Core\Config\Cache\IConfigCache;
use Friendica\Database\DBA;
use Friendica\Database\DBStructure;
use Friendica\Factory\DBFactory;
use Friendica\Object\Image;
use Friendica\Util\Logger\VoidLogger;
use Friendica\Util\Network;
@@ -600,23 +600,18 @@ class Installer
*/
public function checkDB(IConfigCache $configCache, Profiler $profiler)
{
$dbhost = $configCache->get('database', 'hostname');
$dbuser = $configCache->get('database', 'username');
$dbpass = $configCache->get('database', 'password');
$dbdata = $configCache->get('database', 'database');
$database = DBFactory::init($configCache, $profiler, [], new VoidLogger());

if (!DBA::connect($configCache, $profiler, new VoidLogger(), $dbhost, $dbuser, $dbpass, $dbdata)) {
$this->addCheck(L10n::t('Could not connect to database.'), false, true, '');

return false;
}

if (DBA::connected()) {
if ($database->connected()) {
if (DBStructure::existsTable('user')) {
$this->addCheck(L10n::t('Database already in use.'), false, true, '');

return false;
}
} else {
$this->addCheck(L10n::t('Could not connect to database.'), false, true, '');

return false;
}

return true;

Loading…
Cancel
Save