X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FCore%2FConsole%2FGlobalCommunitySilence.php;h=03101cdf0f3ec4da192a2436f0ec1fa74a747046;hb=306688057d64a156969eff79fff546c82d8e616a;hp=72d5a4f88102d70fa003b9b72162fcf03b23bcb5;hpb=88353ce56f0e5da6352af2d999a58bd0c9b375f7;p=friendica.git diff --git a/src/Core/Console/GlobalCommunitySilence.php b/src/Core/Console/GlobalCommunitySilence.php index 72d5a4f881..03101cdf0f 100644 --- a/src/Core/Console/GlobalCommunitySilence.php +++ b/src/Core/Console/GlobalCommunitySilence.php @@ -3,8 +3,9 @@ namespace Friendica\Core\Console; use Friendica\Core\Protocol; -use Friendica\Database\DBM; +use Friendica\Database\DBA; use Friendica\Network\Probe; +use RuntimeException; require_once 'include/text.php'; @@ -18,8 +19,8 @@ require_once 'include/text.php'; * * License: AGPLv3 or later, same as Friendica * - * @author Tobias Diekershoff - * @author Hypolite Petovan + * @author Tobias Diekershoff + * @author Hypolite Petovan */ class GlobalCommunitySilence extends \Asika\SimpleConsole\Console { @@ -64,12 +65,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->isInstallMode()) { + throw new RuntimeException('Database isn\'t ready or populated yet'); } /** @@ -79,16 +76,16 @@ HELP; * */ $net = Probe::uri($this->getArgument(0)); if (in_array($net['network'], [Protocol::PHANTOM, Protocol::MAIL])) { - throw new \RuntimeException('This account seems not to exist.'); + throw new RuntimeException('This account seems not to exist.'); } $nurl = normalise_link($net['url']); - $contact = \dba::selectFirst("contact", ["id"], ["nurl" => $nurl, "uid" => 0]); - if (DBM::is_result($contact)) { - \dba::update("contact", ["hidden" => true], ["id" => $contact["id"]]); + $contact = DBA::selectFirst("contact", ["id"], ["nurl" => $nurl, "uid" => 0]); + if (DBA::isResult($contact)) { + DBA::update("contact", ["hidden" => true], ["id" => $contact["id"]]); $this->out('NOTICE: The account should be silenced from the global community page'); } else { - throw new \RuntimeException('NOTICE: Could not find any entry for this URL (' . $nurl . ')'); + throw new RuntimeException('NOTICE: Could not find any entry for this URL (' . $nurl . ')'); } return 0;