Browse Source

Remove extraneous dba::connect calls

pull/5295/head
Hypolite Petovan 2 years ago
parent
commit
3985a4bc43
11 changed files with 18 additions and 60 deletions
  1. +0
    -5
      bin/auth_ejabberd.php
  2. +4
    -5
      bin/daemon.php
  3. +0
    -5
      bin/worker.php
  4. +1
    -4
      index.php
  5. +2
    -6
      src/Core/Console/ArchiveContact.php
  6. +2
    -6
      src/Core/Console/Config.php
  7. +1
    -5
      src/Core/Console/DatabaseStructure.php
  8. +2
    -6
      src/Core/Console/GlobalCommunityBlock.php
  9. +2
    -6
      src/Core/Console/GlobalCommunitySilence.php
  10. +2
    -6
      src/Core/Console/Maintenance.php
  11. +2
    -6
      src/Core/Console/NewPassword.php

+ 0
- 5
bin/auth_ejabberd.php View File

@ -33,7 +33,6 @@
*/
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Util\ExAuth;
if (sizeof($_SERVER["argv"]) == 0) {
@ -55,10 +54,6 @@ require_once "include/dba.php";
$a = new App(dirname(__DIR__));
@include ".htconfig.php";
dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
$oAuth = new ExAuth();
$oAuth->readStdin();

+ 4
- 5
bin/daemon.php View File

@ -28,8 +28,9 @@ require_once "include/dba.php";
$a = new App(dirname(__DIR__));
require_once ".htconfig.php";
dba::connect($db_host, $db_user, $db_pass, $db_data);
if ($a->mode === App::MODE_INSTALL) {
die("Friendica isn't properly installed yet.\n");
}
Config::load();
@ -125,11 +126,9 @@ if (!$foreground) {
file_put_contents($pidfile, $pid);
// We lose the database connection upon forking
dba::connect($db_host, $db_user, $db_pass, $db_data);
$a->loadDatabase();
}
unset($db_host, $db_user, $db_pass, $db_data);
Config::set('system', 'worker_daemon_mode', true);
// Just to be sure that this script really runs endlessly


+ 0
- 5
bin/worker.php View File

@ -24,14 +24,9 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
}
require_once "boot.php";
require_once "include/dba.php";
$a = new App(dirname(__DIR__));
require_once ".htconfig.php";
dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
Config::load();
// Check the database structure and possibly fixes it


+ 1
- 4
index.php View File

@ -41,10 +41,7 @@ if (!$a->mode == App::MODE_INSTALL) {
require_once "include/dba.php";
if (!$a->mode == App::MODE_INSTALL) {
$result = dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
if (!$result) {
if (!dba::connected()) {
System::unavailable();
}


+ 2
- 6
src/Core/Console/ArchiveContact.php View File

@ -54,12 +54,8 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
require_once '.htconfig.php';
$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
if (!$result) {
throw new \RuntimeException('Unable to connect to database');
if ($a->mode === App::MODE_INSTALL) {
throw new \RuntimeException('Friendica isn\'t properly installed yet.');
}
$nurl = normalise_link($this->getArgument(0));


+ 2
- 6
src/Core/Console/Config.php View File

@ -92,12 +92,8 @@ HELP;
throw new CommandArgsException('Too many arguments');
}
require_once '.htconfig.php';
$result = dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
if (!$result) {
throw new \RuntimeException('Unable to connect to database');
if ($a->mode === \Friendica\App::MODE_INSTALL) {
$this->out('Database isn\'t ready or populated yet, showing file config only');
}
if (count($this->args) == 3) {


+ 1
- 5
src/Core/Console/DatabaseStructure.php View File

@ -56,11 +56,7 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
require_once '.htconfig.php';
$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
if (!$result) {
if (!\dba::connected()) {
throw new \RuntimeException('Unable to connect to database');
}


+ 2
- 6
src/Core/Console/GlobalCommunityBlock.php View File

@ -56,12 +56,8 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
require_once '.htconfig.php';
$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
if (!$result) {
throw new \RuntimeException('Unable to connect to database');
if ($a->mode == \Friendica\App::MODE_INSTALL) {
throw new \RuntimeException('Database isn\'t ready or populated yet');
}
$contact_id = Contact::getIdForURL($this->getArgument(0));


+ 2
- 6
src/Core/Console/GlobalCommunitySilence.php View File

@ -64,12 +64,8 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
require_once '.htconfig.php';
$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
if (!$result) {
throw new \RuntimeException('Unable to connect to database');
if ($a->mode == \Friendica\App::MODE_INSTALL) {
throw new \RuntimeException('Database isn\'t ready or populated yet');
}
/**


+ 2
- 6
src/Core/Console/Maintenance.php View File

@ -64,12 +64,8 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
require_once '.htconfig.php';
$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
if (!$result) {
throw new \RuntimeException('Unable to connect to database');
if ($a->mode == \Friendica\App::MODE_INSTALL) {
throw new \RuntimeException('Database isn\'t ready or populated yet');
}
Core\Config::load();


+ 2
- 6
src/Core/Console/NewPassword.php View File

@ -58,12 +58,8 @@ HELP;
throw new \Asika\SimpleConsole\CommandArgsException('Too many arguments');
}
require_once '.htconfig.php';
$result = \dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data);
if (!$result) {
throw new \RuntimeException('Unable to connect to database');
if ($a->mode == \Friendica\App::MODE_INSTALL) {
throw new \RuntimeException('Database isn\'t ready or populated yet');
}
$nick = $this->getArgument(0);


Loading…
Cancel
Save