X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FExAuth.php;h=25eb3cc62e41ca449dde8f222d73ce7dfab89145;hb=f4e1acedfcd86c81403c14747ecfd3b11583506e;hp=f3eb746ca366db33fd5dfedbab28f8db882ebe8c;hpb=0a4119adaf6294bf43d135a0f435c1dd677c50e0;p=friendica.git diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php index f3eb746ca3..25eb3cc62e 100644 --- a/src/Util/ExAuth.php +++ b/src/Util/ExAuth.php @@ -1,6 +1,6 @@ @@ -34,7 +34,6 @@ namespace Friendica\Util; -use Friendica\Core\Config; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\User; @@ -50,7 +49,7 @@ class ExAuth */ public function __construct() { - $this->bDebug = (int) Config::get('jabber', 'debug'); + $this->bDebug = (int) DI::config()->get('jabber', 'debug'); openlog('auth_ejabberd', LOG_PID, LOG_USER); @@ -74,6 +73,11 @@ class ExAuth } $iHeader = fgets(STDIN, 3); + if (empty($iHeader)) { + $this->writeLog(LOG_ERR, 'empty stdin'); + return; + } + $aLength = unpack('n', $iHeader); $iLength = $aLength['1']; @@ -177,7 +181,7 @@ class ExAuth $url = ($ssl ? 'https' : 'http') . '://' . $host . '/noscrape/' . $user; - $curlResult = Network::curl($url); + $curlResult = DI::httpRequest()->get($url); if (!$curlResult->isSuccess()) { return false; @@ -305,7 +309,7 @@ class ExAuth $this->host = $host; - $lockpath = Config::get('jabber', 'lockpath'); + $lockpath = DI::config()->get('jabber', 'lockpath'); if (is_null($lockpath)) { $this->writeLog(LOG_INFO, 'No lockpath defined.'); return;