oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-12 01:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Log function

Browse source 
implement log() function.
This commit is contained in:
Adam Magness 2018-10-29 17:20:46 -04:00
parent d6d593d724
commit 14fde5dc9b
122 changed files with 1280 additions and 1161 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Network/CurlResult.php
View file

@ -2,7 +2,7 @@
namespace Friendica\Network;
use Friendica\Core\Logger;
use Friendica\Network\HTTPException\InternalServerErrorException;
/**
@ -104,7 +104,7 @@ class CurlResult
$this->errorNumber = $errorNumber;
$this->error = $error;
logger($url . ': ' . $this->returnCode . " " . $result, LOGGER_DATA);
Logger::log($url . ': ' . $this->returnCode . " " . $result, LOGGER_DATA);
$this->parseBodyHeader($result);
$this->checkSuccess();
@ -134,8 +134,8 @@ class CurlResult
$this->isSuccess = ($this->returnCode >= 200 && $this->returnCode <= 299) || $this->errorNumber == 0;
if (!$this->isSuccess) {
logger('error: ' . $this->url . ': ' . $this->returnCode . ' - ' . $this->error, LOGGER_INFO);
logger('debug: ' . print_r($this->info, true), LOGGER_DATA);
Logger::log('error: ' . $this->url . ': ' . $this->returnCode . ' - ' . $this->error, LOGGER_INFO);
Logger::log('debug: ' . print_r($this->info, true), LOGGER_DATA);
}
if (!$this->isSuccess && $this->errorNumber == CURLE_OPERATION_TIMEDOUT) {

5
src/Network/FKOAuth1.php
View file

@ -5,6 +5,7 @@
namespace Friendica\Network;
use Friendica\Core\Addon;
use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBA;
@ -34,12 +35,12 @@ class FKOAuth1 extends OAuthServer
*/
public function loginUser($uid)
{
logger("FKOAuth1::loginUser $uid");
Logger::log("FKOAuth1::loginUser $uid");
$a = get_app();
$record = DBA::selectFirst('user', [], ['uid' => $uid, 'blocked' => 0, 'account_expired' => 0, 'account_removed' => 0, 'verified' => 1]);
if (!DBA::isResult($record)) {
logger('FKOAuth1::loginUser failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
Logger::log('FKOAuth1::loginUser failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
header('HTTP/1.0 401 Unauthorized');
die('This api requires login');
}

11
src/Network/FKOAuthDataStore.php
View file

@ -10,6 +10,7 @@
namespace Friendica\Network;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Database\DBA;
use OAuthConsumer;
use OAuthDataStore;
@ -39,7 +40,7 @@ class FKOAuthDataStore extends OAuthDataStore
*/
public function lookup_consumer($consumer_key)
{
logger(__function__ . ":" . $consumer_key);
Logger::log(__function__ . ":" . $consumer_key);
$s = DBA::select('clients', ['client_id', 'pw', 'redirect_uri'], ['client_id' => $consumer_key]);
$r = DBA::toArray($s);
@ -59,7 +60,7 @@ class FKOAuthDataStore extends OAuthDataStore
*/
public function lookup_token($consumer, $token_type, $token)
{
logger(__function__ . ":" . $consumer . ", " . $token_type . ", " . $token);
Logger::log(__function__ . ":" . $consumer . ", " . $token_type . ", " . $token);
$s = DBA::select('tokens', ['id', 'secret', 'scope', 'expires', 'uid'], ['client_id' => $consumer->key, 'scope' => $token_type, 'id' => $token]);
$r = DBA::toArray($s);
@ -99,7 +100,7 @@ class FKOAuthDataStore extends OAuthDataStore
*/
public function new_request_token($consumer, $callback = null)
{
logger(__function__ . ":" . $consumer . ", " . $callback);
Logger::log(__function__ . ":" . $consumer . ", " . $callback);
$key = self::genToken();
$sec = self::genToken();
@ -134,7 +135,7 @@ class FKOAuthDataStore extends OAuthDataStore
*/
public function new_access_token($token, $consumer, $verifier = null)
{
logger(__function__ . ":" . $token . ", " . $consumer . ", " . $verifier);
Logger::log(__function__ . ":" . $token . ", " . $consumer . ", " . $verifier);
// return a new access token attached to this consumer
// for the user associated with this token if the request token
@ -145,7 +146,7 @@ class FKOAuthDataStore extends OAuthDataStore
// get user for this verifier
$uverifier = Config::get("oauth", $verifier);
logger(__function__ . ":" . $verifier . "," . $uverifier);
Logger::log(__function__ . ":" . $verifier . "," . $uverifier);
if (is_null($verifier) || ($uverifier !== false)) {
$key = self::genToken();

45
src/Network/Probe.php
View file

@ -12,6 +12,7 @@ namespace Friendica\Network;
use DOMDocument;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
@ -109,7 +110,7 @@ class Probe
$xrd_timeout = Config::get('system', 'xrd_timeout', 20);
$redirects = 0;
logger("Probing for ".$host, LOGGER_DEBUG);
Logger::log("Probing for ".$host, LOGGER_DEBUG);
$xrd = null;
$curlResult = Network::curl($ssl_url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
@ -122,7 +123,7 @@ class Probe
if (!is_object($xrd)) {
$curlResult = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
if ($curlResult->isTimeout()) {
logger("Probing timeout for " . $url, LOGGER_DEBUG);
Logger::log("Probing timeout for " . $url, LOGGER_DEBUG);
return false;
}
$xml = $curlResult->getBody();
@ -130,13 +131,13 @@ class Probe
$host_url = 'http://'.$host;
}
if (!is_object($xrd)) {
logger("No xrd object found for ".$host, LOGGER_DEBUG);
Logger::log("No xrd object found for ".$host, LOGGER_DEBUG);
return [];
}
$links = XML::elementToArray($xrd);
if (!isset($links["xrd"]["link"])) {
logger("No xrd data found for ".$host, LOGGER_DEBUG);
Logger::log("No xrd data found for ".$host, LOGGER_DEBUG);
return [];
}
@ -164,7 +165,7 @@ class Probe
self::$baseurl = "http://".$host;
logger("Probing successful for ".$host, LOGGER_DEBUG);
Logger::log("Probing successful for ".$host, LOGGER_DEBUG);
return $lrdd;
}
@ -194,7 +195,7 @@ class Probe
$profile_link = '';
$links = self::lrdd($webbie);
logger('webfingerDfrn: '.$webbie.':'.print_r($links, true), LOGGER_DATA);
Logger::log('webfingerDfrn: '.$webbie.':'.print_r($links, true), LOGGER_DATA);
if (count($links)) {
foreach ($links as $link) {
if ($link['@attributes']['rel'] === NAMESPACE_DFRN) {
@ -253,7 +254,7 @@ class Probe
}
if (!$lrdd) {
logger("No lrdd data found for ".$uri, LOGGER_DEBUG);
Logger::log("No lrdd data found for ".$uri, LOGGER_DEBUG);
return [];
}
@ -285,7 +286,7 @@ class Probe
}
if (!is_array($webfinger["links"])) {
logger("No webfinger links found for ".$uri, LOGGER_DEBUG);
Logger::log("No webfinger links found for ".$uri, LOGGER_DEBUG);
return false;
}
@ -595,7 +596,7 @@ class Probe
$lrdd = self::hostMeta($host);
}
if (!$lrdd) {
logger('No XRD data was found for '.$uri, LOGGER_DEBUG);
Logger::log('No XRD data was found for '.$uri, LOGGER_DEBUG);
return self::feed($uri);
}
$nick = array_pop($path_parts);
@ -630,12 +631,12 @@ class Probe
}
if (!$lrdd) {
logger('No XRD data was found for '.$uri, LOGGER_DEBUG);
Logger::log('No XRD data was found for '.$uri, LOGGER_DEBUG);
return self::mail($uri, $uid);
}
$addr = $uri;
} else {
logger("Uri ".$uri." was not detectable", LOGGER_DEBUG);
Logger::log("Uri ".$uri." was not detectable", LOGGER_DEBUG);
return false;
}
@ -680,7 +681,7 @@ class Probe
$result = false;
logger("Probing ".$uri, LOGGER_DEBUG);
Logger::log("Probing ".$uri, LOGGER_DEBUG);
if (in_array($network, ["", Protocol::DFRN])) {
$result = self::dfrn($webfinger);
@ -716,7 +717,7 @@ class Probe
$result["url"] = $uri;
}
logger($uri." is ".$result["network"], LOGGER_DEBUG);
Logger::log($uri." is ".$result["network"], LOGGER_DEBUG);
if (empty($result["baseurl"])) {
$pos = strpos($result["url"], $host);
@ -751,7 +752,7 @@ class Probe
$webfinger = json_decode($data, true);
if (is_array($webfinger)) {
if (!isset($webfinger["links"])) {
logger("No json webfinger links for ".$url, LOGGER_DEBUG);
Logger::log("No json webfinger links for ".$url, LOGGER_DEBUG);
return false;
}
return $webfinger;
@ -760,13 +761,13 @@ class Probe
// If it is not JSON, maybe it is XML
$xrd = XML::parseString($data, false);
if (!is_object($xrd)) {
logger("No webfinger data retrievable for ".$url, LOGGER_DEBUG);
Logger::log("No webfinger data retrievable for ".$url, LOGGER_DEBUG);
return false;
}
$xrd_arr = XML::elementToArray($xrd);
if (!isset($xrd_arr["xrd"]["link"])) {
logger("No XML webfinger links for ".$url, LOGGER_DEBUG);
Logger::log("No XML webfinger links for ".$url, LOGGER_DEBUG);
return false;
}
@ -815,13 +816,13 @@ class Probe
}
$content = $curlResult->getBody();
if (!$content) {
logger("Empty body for ".$noscrape_url, LOGGER_DEBUG);
Logger::log("Empty body for ".$noscrape_url, LOGGER_DEBUG);
return false;
}
$json = json_decode($content, true);
if (!is_array($json)) {
logger("No json data for ".$noscrape_url, LOGGER_DEBUG);
Logger::log("No json data for ".$noscrape_url, LOGGER_DEBUG);
return false;
}
@ -927,7 +928,7 @@ class Probe
{
$data = [];
logger("Check profile ".$profile_link, LOGGER_DEBUG);
Logger::log("Check profile ".$profile_link, LOGGER_DEBUG);
// Fetch data via noscrape - this is faster
$noscrape_url = str_replace(["/hcard/", "/profile/"], "/noscrape/", $profile_link);
@ -961,7 +962,7 @@ class Probe
$prof_data["fn"] = defaults($data, 'name' , null);
$prof_data["key"] = defaults($data, 'pubkey' , null);
logger("Result for profile ".$profile_link.": ".print_r($prof_data, true), LOGGER_DEBUG);
Logger::log("Result for profile ".$profile_link.": ".print_r($prof_data, true), LOGGER_DEBUG);
return $prof_data;
}
@ -1632,7 +1633,7 @@ class Probe
}
$msgs = Email::poll($mbox, $uri);
logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
Logger::log('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
if (!count($msgs)) {
return false;
@ -1714,7 +1715,7 @@ class Probe
$fixed = $scheme.$host.$port.$path.$query.$fragment;
logger('Base: '.$base.' - Avatar: '.$avatar.' - Fixed: '.$fixed, LOGGER_DATA);
Logger::log('Base: '.$base.' - Avatar: '.$avatar.' - Fixed: '.$fixed, LOGGER_DATA);
return $fixed;
}