Browse Source

Log function

implement log() function.
tags/2019.01
Adam Magness 2 years ago
parent
commit
14fde5dc9b
100 changed files with 1048 additions and 951 deletions
  1. +7
    -6
      bin/daemon.php
  2. +49
    -48
      include/api.php
  3. +2
    -1
      include/conversation.php
  4. +9
    -8
      include/enotify.php
  5. +9
    -8
      include/items.php
  6. +2
    -2
      include/text.php
  7. +2
    -1
      mod/acl.php
  8. +3
    -2
      mod/admin.php
  9. +2
    -1
      mod/crepair.php
  10. +14
    -13
      mod/dfrn_confirm.php
  11. +25
    -24
      mod/dfrn_notify.php
  12. +11
    -10
      mod/dfrn_poll.php
  13. +3
    -2
      mod/dfrn_request.php
  14. +2
    -1
      mod/display.php
  15. +2
    -1
      mod/events.php
  16. +2
    -1
      mod/filer.php
  17. +2
    -1
      mod/filerm.php
  18. +12
    -11
      mod/item.php
  19. +2
    -1
      mod/network.php
  20. +8
    -7
      mod/nodeinfo.php
  21. +3
    -2
      mod/openid.php
  22. +3
    -2
      mod/parse_url.php
  23. +11
    -10
      mod/photos.php
  24. +6
    -5
      mod/poco.php
  25. +3
    -2
      mod/poke.php
  26. +2
    -1
      mod/profile.php
  27. +14
    -13
      mod/pubsub.php
  28. +11
    -10
      mod/pubsubhubbub.php
  29. +9
    -8
      mod/receive.php
  30. +5
    -4
      mod/redir.php
  31. +2
    -1
      mod/register.php
  32. +13
    -12
      mod/salmon.php
  33. +5
    -4
      mod/search.php
  34. +3
    -2
      mod/settings.php
  35. +2
    -1
      mod/statistics_json.php
  36. +3
    -2
      mod/subthread.php
  37. +4
    -3
      mod/tagger.php
  38. +2
    -1
      mod/uimport.php
  39. +6
    -5
      mod/wall_upload.php
  40. +3
    -2
      mod/wallmessage.php
  41. +3
    -2
      mod/worker.php
  42. +13
    -13
      src/App.php
  43. +5
    -4
      src/BaseModule.php
  44. +9
    -8
      src/Content/Text/BBCode.php
  45. +5
    -4
      src/Core/Addon.php
  46. +4
    -3
      src/Core/Authentication.php
  47. +3
    -2
      src/Core/Cache/MemcachedCacheDriver.php
  48. +2
    -1
      src/Core/L10n.php
  49. +2
    -1
      src/Core/Lock.php
  50. +3
    -3
      src/Core/Logger.php
  51. +2
    -1
      src/Core/NotificationsManager.php
  52. +2
    -1
      src/Core/Session/CacheSessionHandler.php
  53. +2
    -1
      src/Core/Session/DatabaseSessionHandler.php
  54. +3
    -2
      src/Core/System.php
  55. +4
    -3
      src/Core/Theme.php
  56. +11
    -10
      src/Core/UserImport.php
  57. +41
    -40
      src/Core/Worker.php
  58. +13
    -12
      src/Database/DBA.php
  59. +5
    -4
      src/Database/DBStructure.php
  60. +20
    -19
      src/Database/PostUpdate.php
  61. +2
    -1
      src/Model/APContact.php
  62. +8
    -7
      src/Model/Contact.php
  63. +3
    -2
      src/Model/Conversation.php
  64. +2
    -1
      src/Model/Event.php
  65. +14
    -13
      src/Model/GContact.php
  66. +2
    -1
      src/Model/Group.php
  67. +75
    -74
      src/Model/Item.php
  68. +3
    -2
      src/Model/Mail.php
  69. +10
    -9
      src/Model/Profile.php
  70. +8
    -7
      src/Model/PushSubscriber.php
  71. +6
    -5
      src/Model/Queue.php
  72. +3
    -2
      src/Model/User.php
  73. +1
    -1
      src/Module/Inbox.php
  74. +4
    -3
      src/Module/Login.php
  75. +6
    -5
      src/Module/Magic.php
  76. +5
    -4
      src/Module/Owa.php
  77. +4
    -4
      src/Network/CurlResult.php
  78. +3
    -2
      src/Network/FKOAuth1.php
  79. +6
    -5
      src/Network/FKOAuthDataStore.php
  80. +23
    -22
      src/Network/Probe.php
  81. +11
    -10
      src/Object/Image.php
  82. +6
    -5
      src/Object/Post.php
  83. +7
    -6
      src/Object/Thread.php
  84. +22
    -21
      src/Protocol/ActivityPub/Processor.php
  85. +34
    -33
      src/Protocol/ActivityPub/Receiver.php
  86. +8
    -7
      src/Protocol/ActivityPub/Transmitter.php
  87. +72
    -71
      src/Protocol/DFRN.php
  88. +141
    -138
      src/Protocol/Diaspora.php
  89. +7
    -6
      src/Protocol/Email.php
  90. +8
    -7
      src/Protocol/Feed.php
  91. +40
    -39
      src/Protocol/OStatus.php
  92. +34
    -33
      src/Protocol/PortableContact.php
  93. +8
    -7
      src/Protocol/Salmon.php
  94. +6
    -5
      src/Util/Crypto.php
  95. +2
    -1
      src/Util/DateTimeFormat.php
  96. +3
    -2
      src/Util/Emailer.php
  97. +7
    -6
      src/Util/HTTPSignature.php
  98. +4
    -3
      src/Util/JsonLD.php
  99. +2
    -1
      src/Util/LDSignature.php
  100. +8
    -7
      src/Util/Network.php

+ 7
- 6
bin/daemon.php View File

@@ -9,6 +9,7 @@

use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Worker;
use Friendica\Database\DBA;

@@ -97,7 +98,7 @@ if ($mode == "stop") {

unlink($pidfile);

logger("Worker daemon process $pid was killed.", LOGGER_DEBUG);
Logger::log("Worker daemon process $pid was killed.", LOGGER_DEBUG);

Config::set('system', 'worker_daemon_mode', false);
die("Worker daemon process $pid was killed.\n");
@@ -107,7 +108,7 @@ if (!empty($pid) && posix_kill($pid, 0)) {
die("Daemon process $pid is already running.\n");
}

logger('Starting worker daemon.', LOGGER_DEBUG);
Logger::log('Starting worker daemon.', LOGGER_DEBUG);

if (!$foreground) {
echo "Starting worker daemon.\n";
@@ -155,7 +156,7 @@ $last_cron = 0;
// Now running as a daemon.
while (true) {
if (!$do_cron && ($last_cron + $wait_interval) < time()) {
logger('Forcing cron worker call.', LOGGER_DEBUG);
Logger::log('Forcing cron worker call.', LOGGER_DEBUG);
$do_cron = true;
}

@@ -169,7 +170,7 @@ while (true) {
$last_cron = time();
}

logger("Sleeping", LOGGER_DEBUG);
Logger::log("Sleeping", LOGGER_DEBUG);
$start = time();
do {
$seconds = (time() - $start);
@@ -186,10 +187,10 @@ while (true) {

if ($timeout) {
$do_cron = true;
logger("Woke up after $wait_interval seconds.", LOGGER_DEBUG);
Logger::log("Woke up after $wait_interval seconds.", LOGGER_DEBUG);
} else {
$do_cron = false;
logger("Worker jobs are calling to be forked.", LOGGER_DEBUG);
Logger::log("Worker jobs are calling to be forked.", LOGGER_DEBUG);
}
}



+ 49
- 48
include/api.php View File

@@ -15,6 +15,7 @@ use Friendica\Core\Addon;
use Friendica\Core\Authentication;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\NotificationsManager;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
@@ -96,9 +97,9 @@ function api_source()
return "Twidere";
}

logger("Unrecognized user-agent ".$_SERVER['HTTP_USER_AGENT'], LOGGER_DEBUG);
Logger::log("Unrecognized user-agent ".$_SERVER['HTTP_USER_AGENT'], LOGGER_DEBUG);
} else {
logger("Empty user-agent", LOGGER_DEBUG);
Logger::log("Empty user-agent", LOGGER_DEBUG);
}

return "api";
@@ -180,7 +181,7 @@ function api_login(App $a)
var_dump($consumer, $token);
die();
} catch (Exception $e) {
logger($e);
Logger::log($e);
}

// workaround for HTTP-auth in CGI mode
@@ -194,7 +195,7 @@ function api_login(App $a)
}

if (!x($_SERVER, 'PHP_AUTH_USER')) {
logger('API_login: ' . print_r($_SERVER, true), LOGGER_DEBUG);
Logger::log('API_login: ' . print_r($_SERVER, true), LOGGER_DEBUG);
header('WWW-Authenticate: Basic realm="Friendica"');
throw new UnauthorizedException("This API requires login");
}
@@ -235,7 +236,7 @@ function api_login(App $a)
}

if (!DBA::isResult($record)) {
logger('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
Logger::log('API_login failure: ' . print_r($_SERVER, true), LOGGER_DEBUG);
header('WWW-Authenticate: Basic realm="Friendica"');
//header('HTTP/1.0 401 Unauthorized');
//die('This api requires login');
@@ -308,19 +309,19 @@ function api_call(App $a)
api_login($a);
}

logger('API call for ' . $a->user['username'] . ': ' . $a->query_string);
logger('API parameters: ' . print_r($_REQUEST, true));
Logger::log('API call for ' . $a->user['username'] . ': ' . $a->query_string);
Logger::log('API parameters: ' . print_r($_REQUEST, true));

$stamp = microtime(true);
$return = call_user_func($info['func'], $type);
$duration = (float) (microtime(true) - $stamp);
logger("API call duration: " . round($duration, 2) . "\t" . $a->query_string, LOGGER_DEBUG);
Logger::log("API call duration: " . round($duration, 2) . "\t" . $a->query_string, LOGGER_DEBUG);

if (Config::get("system", "profiler")) {
$duration = microtime(true)-$a->performance["start"];

/// @TODO round() really everywhere?
logger(
Logger::log(
parse_url($a->query_string, PHP_URL_PATH) . ": " . sprintf(
"Database: %s/%s, Cache %s/%s, Network: %s, I/O: %s, Other: %s, Total: %s",
round($a->performance["database"] - $a->performance["database_write"], 3),
@@ -375,7 +376,7 @@ function api_call(App $a)
$o .= $func . ": " . $time . "\n";
}
}
logger($o, LOGGER_DEBUG);
Logger::log($o, LOGGER_DEBUG);
}
}

@@ -412,7 +413,7 @@ function api_call(App $a)
}
}

logger('API call not implemented: ' . $a->query_string);
Logger::log('API call not implemented: ' . $a->query_string);
throw new NotImplementedException();
} catch (HTTPException $e) {
header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}");
@@ -521,7 +522,7 @@ function api_get_user(App $a, $contact_id = null)
$extra_query = "";
$url = "";

logger("api_get_user: Fetching user data for user ".$contact_id, LOGGER_DEBUG);
Logger::log("api_get_user: Fetching user data for user ".$contact_id, LOGGER_DEBUG);

// Searching for contact URL
if (!is_null($contact_id) && (intval($contact_id) == 0)) {
@@ -605,7 +606,7 @@ function api_get_user(App $a, $contact_id = null)
}
}

logger("api_get_user: user ".$user, LOGGER_DEBUG);
Logger::log("api_get_user: user ".$user, LOGGER_DEBUG);

if (!$user) {
if (api_user() === false) {
@@ -617,7 +618,7 @@ function api_get_user(App $a, $contact_id = null)
}
}

logger('api_user: ' . $extra_query . ', user: ' . $user);
Logger::log('api_user: ' . $extra_query . ', user: ' . $user);

// user info
$uinfo = q(
@@ -1033,7 +1034,7 @@ function api_statuses_mediap($type)
$a = get_app();

if (api_user() === false) {
logger('api_statuses_update: no user');
Logger::log('api_statuses_update: no user');
throw new ForbiddenException();
}
$user_info = api_get_user($a);
@@ -1081,7 +1082,7 @@ function api_statuses_update($type)
$a = get_app();

if (api_user() === false) {
logger('api_statuses_update: no user');
Logger::log('api_statuses_update: no user');
throw new ForbiddenException();
}

@@ -1135,7 +1136,7 @@ function api_statuses_update($type)
$posts_day = DBA::count('thread', $condition);

if ($posts_day > $throttle_day) {
logger('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG);
Logger::log('Daily posting limit reached for user '.api_user(), LOGGER_DEBUG);
// die(api_error($type, L10n::t("Daily posting limit of %d posts reached. The post was rejected.", $throttle_day));
throw new TooManyRequestsException(L10n::tt("Daily posting limit of %d post reached. The post was rejected.", "Daily posting limit of %d posts reached. The post was rejected.", $throttle_day));
}
@@ -1149,7 +1150,7 @@ function api_statuses_update($type)
$posts_week = DBA::count('thread', $condition);

if ($posts_week > $throttle_week) {
logger('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG);
Logger::log('Weekly posting limit reached for user '.api_user(), LOGGER_DEBUG);
// die(api_error($type, L10n::t("Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week)));
throw new TooManyRequestsException(L10n::tt("Weekly posting limit of %d post reached. The post was rejected.", "Weekly posting limit of %d posts reached. The post was rejected.", $throttle_week));
}
@@ -1163,7 +1164,7 @@ function api_statuses_update($type)
$posts_month = DBA::count('thread', $condition);

if ($posts_month > $throttle_month) {
logger('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG);
Logger::log('Monthly posting limit reached for user '.api_user(), LOGGER_DEBUG);
// die(api_error($type, L10n::t("Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
throw new TooManyRequestsException(L10n::t("Monthly posting limit of %d post reached. The post was rejected.", "Monthly posting limit of %d posts reached. The post was rejected.", $throttle_month));
}
@@ -1223,7 +1224,7 @@ function api_media_upload()
$a = get_app();

if (api_user() === false) {
logger('no user');
Logger::log('no user');
throw new ForbiddenException();
}

@@ -1248,7 +1249,7 @@ function api_media_upload()
"h" => $media["height"],
"image_type" => $media["type"]];

logger("Media uploaded: " . print_r($returndata, true), LOGGER_DEBUG);
Logger::log("Media uploaded: " . print_r($returndata, true), LOGGER_DEBUG);

return ["media" => $returndata];
}
@@ -1268,7 +1269,7 @@ function api_status_show($type, $item_id = 0)

$user_info = api_get_user($a);

logger('api_status_show: user_info: '.print_r($user_info, true), LOGGER_DEBUG);
Logger::log('api_status_show: user_info: '.print_r($user_info, true), LOGGER_DEBUG);

if ($type == "raw") {
$privacy_sql = "AND NOT `private`";
@@ -1344,7 +1345,7 @@ function api_status_show($type, $item_id = 0)
unset($status_info["user"]["uid"]);
unset($status_info["user"]["self"]);

logger('status_info: '.print_r($status_info, true), LOGGER_DEBUG);
Logger::log('status_info: '.print_r($status_info, true), LOGGER_DEBUG);

if ($type == "raw") {
return $status_info;
@@ -1824,7 +1825,7 @@ function api_statuses_show($type)
$id = intval(defaults($a->argv, 4, 0));
}

logger('API: api_statuses_show: ' . $id);
Logger::log('API: api_statuses_show: ' . $id);

$conversation = !empty($_REQUEST['conversation']);

@@ -1906,7 +1907,7 @@ function api_conversation_show($type)
$id = intval(defaults($a->argv, 4, 0));
}

logger('API: api_conversation_show: '.$id);
Logger::log('API: api_conversation_show: '.$id);

// try to fetch the item for the local user - or the public item, if there is no local one
$item = Item::selectFirst(['parent-uri'], ['id' => $id]);
@@ -1977,7 +1978,7 @@ function api_statuses_repeat($type)
$id = intval(defaults($a->argv, 4, 0));
}

logger('API: api_statuses_repeat: '.$id);
Logger::log('API: api_statuses_repeat: '.$id);

$fields = ['body', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
$item = Item::selectFirst($fields, ['id' => $id, 'private' => false]);
@@ -2042,7 +2043,7 @@ function api_statuses_destroy($type)
$id = intval(defaults($a->argv, 4, 0));
}

logger('API: api_statuses_destroy: '.$id);
Logger::log('API: api_statuses_destroy: '.$id);

$ret = api_statuses_show($type);

@@ -2137,7 +2138,7 @@ function api_statuses_user_timeline($type)
throw new ForbiddenException();
}

logger(
Logger::log(
"api_statuses_user_timeline: api_user: ". api_user() .
"\nuser_info: ".print_r($user_info, true) .
"\n_REQUEST: ".print_r($_REQUEST, true),
@@ -2294,7 +2295,7 @@ function api_favorites($type)

// in friendica starred item are private
// return favorites only for self
logger('api_favorites: self:' . $user_info['self']);
Logger::log('api_favorites: self:' . $user_info['self']);

if ($user_info['self'] == 0) {
$ret = [];
@@ -3649,7 +3650,7 @@ function api_friendships_destroy($type)
$contact_id = defaults($_REQUEST, 'user_id');

if (empty($contact_id)) {
logger("No user_id specified", LOGGER_DEBUG);
Logger::log("No user_id specified", LOGGER_DEBUG);
throw new BadRequestException("no user_id specified");
}

@@ -3657,7 +3658,7 @@ function api_friendships_destroy($type)
$contact = DBA::selectFirst('contact', ['url'], ['id' => $contact_id, 'uid' => 0, 'self' => false]);

if(!DBA::isResult($contact)) {
logger("No contact found for ID" . $contact_id, LOGGER_DEBUG);
Logger::log("No contact found for ID" . $contact_id, LOGGER_DEBUG);
throw new NotFoundException("no contact found to given ID");
}

@@ -3669,12 +3670,12 @@ function api_friendships_destroy($type)
$contact = DBA::selectFirst('contact', [], $condition);

if (!DBA::isResult($contact)) {
logger("Not following Contact", LOGGER_DEBUG);
Logger::log("Not following Contact", LOGGER_DEBUG);
throw new NotFoundException("Not following Contact");
}

if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
logger("Not supported", LOGGER_DEBUG);
Logger::log("Not supported", LOGGER_DEBUG);
throw new ExpectationFailedException("Not supported");
}

@@ -3685,7 +3686,7 @@ function api_friendships_destroy($type)
Contact::terminateFriendship($owner, $contact, $dissolve);
}
else {
logger("No owner found", LOGGER_DEBUG);
Logger::log("No owner found", LOGGER_DEBUG);
throw new NotFoundException("Error Processing Request");
}

@@ -4485,7 +4486,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
if ($imagedata) {
$filetype = $imagedata['mime'];
}
logger(
Logger::log(
"File upload src: " . $src . " - filename: " . $filename .
" - size: " . $filesize . " - type: " . $filetype,
LOGGER_DEBUG
@@ -4520,7 +4521,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
}
if ($max_length > 0) {
$Image->scaleDown($max_length);
logger("File upload: Scaling picture to new size " . $max_length, LOGGER_DEBUG);
Logger::log("File upload: Scaling picture to new size " . $max_length, LOGGER_DEBUG);
}
$width = $Image->getWidth();
$height = $Image->getHeight();
@@ -4530,17 +4531,17 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $

if ($mediatype == "photo") {
// upload normal image (scales 0, 1, 2)
logger("photo upload: starting new photo upload", LOGGER_DEBUG);
Logger::log("photo upload: starting new photo upload", LOGGER_DEBUG);

$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 0, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) {
logger("photo upload: image upload with scale 0 (original size) failed");
Logger::log("photo upload: image upload with scale 0 (original size) failed");
}
if ($width > 640 || $height > 640) {
$Image->scaleDown(640);
$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 1, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) {
logger("photo upload: image upload with scale 1 (640x640) failed");
Logger::log("photo upload: image upload with scale 1 (640x640) failed");
}
}

@@ -4548,19 +4549,19 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
$Image->scaleDown(320);
$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 2, 0, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) {
logger("photo upload: image upload with scale 2 (320x320) failed");
Logger::log("photo upload: image upload with scale 2 (320x320) failed");
}
}
logger("photo upload: new photo upload ended", LOGGER_DEBUG);
Logger::log("photo upload: new photo upload ended", LOGGER_DEBUG);
} elseif ($mediatype == "profileimage") {
// upload profile image (scales 4, 5, 6)
logger("photo upload: starting new profile image upload", LOGGER_DEBUG);
Logger::log("photo upload: starting new profile image upload", LOGGER_DEBUG);

if ($width > 300 || $height > 300) {
$Image->scaleDown(300);
$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 4, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) {
logger("photo upload: profile image upload with scale 4 (300x300) failed");
Logger::log("photo upload: profile image upload with scale 4 (300x300) failed");
}
}

@@ -4568,7 +4569,7 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
$Image->scaleDown(80);
$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 5, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) {
logger("photo upload: profile image upload with scale 5 (80x80) failed");
Logger::log("photo upload: profile image upload with scale 5 (80x80) failed");
}
}

@@ -4576,11 +4577,11 @@ function save_media_to_database($mediatype, $media, $type, $album, $allow_cid, $
$Image->scaleDown(48);
$r = Photo::store($Image, local_user(), $visitor, $hash, $filename, $album, 6, $profile, $allow_cid, $allow_gid, $deny_cid, $deny_gid, $desc);
if (!$r) {
logger("photo upload: profile image upload with scale 6 (48x48) failed");
Logger::log("photo upload: profile image upload with scale 6 (48x48) failed");
}
}
$Image->__destruct();
logger("photo upload: new profile image upload ended", LOGGER_DEBUG);
Logger::log("photo upload: new profile image upload ended", LOGGER_DEBUG);
}

if (isset($r) && $r) {
@@ -4807,7 +4808,7 @@ function api_friendica_remoteauth()
'sec' => $sec, 'expire' => time() + 45];
DBA::insert('profile_check', $fields);

logger($contact['name'] . ' ' . $sec, LOGGER_DEBUG);
Logger::log($contact['name'] . ' ' . $sec, LOGGER_DEBUG);
$dest = ($url ? '&destination_url=' . $url : '');

System::externalRedirect(
@@ -5055,7 +5056,7 @@ function api_in_reply_to($item)
// https://github.com/friendica/friendica/issues/1010
// This is a bugfix for that.
if (intval($in_reply_to['status_id']) == intval($item['id'])) {
logger('this message should never appear: id: '.$item['id'].' similar to reply-to: '.$in_reply_to['status_id'], LOGGER_DEBUG);
Logger::log('this message should never appear: id: '.$item['id'].' similar to reply-to: '.$in_reply_to['status_id'], LOGGER_DEBUG);
$in_reply_to['status_id'] = null;
$in_reply_to['user_id'] = null;
$in_reply_to['status_id_str'] = null;


+ 2
- 1
include/conversation.php View File

@@ -11,6 +11,7 @@ use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\System;
@@ -751,7 +752,7 @@ function conversation(App $a, array $items, Pager $pager, $mode, $update, $previ

$threads = $conv->getTemplateData($conv_responses);
if (!$threads) {
logger('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
Logger::log('[ERROR] conversation : Failed to get template data.', LOGGER_DEBUG);
$threads = [];
}
}


+ 9
- 8
include/enotify.php View File

@@ -7,6 +7,7 @@ use Friendica\Content\Text\BBCode;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
@@ -29,7 +30,7 @@ function notification($params)

// Temporary logging for finding the origin
if (!isset($params['language']) || !isset($params['uid'])) {
logger('Missing parameters.' . System::callstack());
Logger::log('Missing parameters.' . System::callstack());
}

// Ensure that the important fields are set at any time
@@ -37,7 +38,7 @@ function notification($params)
$user = DBA::selectFirst('user', $fields, ['uid' => $params['uid']]);

if (!DBA::isResult($user)) {
logger('Unknown user ' . $params['uid']);
Logger::log('Unknown user ' . $params['uid']);
return;
}

@@ -133,7 +134,7 @@ function notification($params)
if ($params['type'] == NOTIFY_COMMENT) {
$thread = Item::selectFirstThreadForUser($params['uid'] ,['ignored'], ['iid' => $parent_id]);
if (DBA::isResult($thread) && $thread["ignored"]) {
logger("Thread ".$parent_id." will be ignored", LOGGER_DEBUG);
Logger::log("Thread ".$parent_id." will be ignored", LOGGER_DEBUG);
L10n::popLang();
return;
}
@@ -452,7 +453,7 @@ function notification($params)
$itemlink = $h['itemlink'];

if ($show_in_notification_page) {
logger("adding notification entry", LOGGER_DEBUG);
Logger::log("adding notification entry", LOGGER_DEBUG);
do {
$dups = false;
$hash = random_string();
@@ -529,14 +530,14 @@ function notification($params)
|| $params['type'] == NOTIFY_SYSTEM
|| $params['type'] == SYSTEM_EMAIL) {

logger('sending notification email');
Logger::log('sending notification email');

if (isset($params['parent']) && (intval($params['parent']) != 0)) {
$id_for_parent = $params['parent']."@".$hostname;

// Is this the first email notification for this parent item and user?
if (!DBA::exists('notify-threads', ['master-parent-item' => $params['parent'], 'receiver-uid' => $params['uid']])) {
logger("notify_id:".intval($notify_id).", parent: ".intval($params['parent'])."uid: ".intval($params['uid']), LOGGER_DEBUG);
Logger::log("notify_id:".intval($notify_id).", parent: ".intval($params['parent'])."uid: ".intval($params['uid']), LOGGER_DEBUG);

$fields = ['notify-id' => $notify_id, 'master-parent-item' => $params['parent'],
'receiver-uid' => $params['uid'], 'parent-item' => 0];
@@ -545,11 +546,11 @@ function notification($params)
$additional_mail_header .= "Message-ID: <${id_for_parent}>\n";
$log_msg = "include/enotify: No previous notification found for this parent:\n".
" parent: ${params['parent']}\n"." uid : ${params['uid']}\n";
logger($log_msg, LOGGER_DEBUG);
Logger::log($log_msg, LOGGER_DEBUG);
} else {
// If not, just "follow" the thread.
$additional_mail_header .= "References: <${id_for_parent}>\nIn-Reply-To: <${id_for_parent}>\n";
logger("There's already a notification for this parent.", LOGGER_DEBUG);
Logger::log("There's already a notification for this parent.", LOGGER_DEBUG);
}
}



+ 9
- 8
include/items.php View File

@@ -8,6 +8,7 @@ use Friendica\Content\Feature;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Core\System;
@@ -109,7 +110,7 @@ function query_page_info($url, $photo = "", $keywords = false, $keyword_blacklis
$data["images"][0]["src"] = $photo;
}

logger('fetch page info for ' . $url . ' ' . print_r($data, true), LOGGER_DEBUG);
Logger::log('fetch page info for ' . $url . ' ' . print_r($data, true), LOGGER_DEBUG);

if (!$keywords && isset($data["keywords"])) {
unset($data["keywords"]);
@@ -167,7 +168,7 @@ function add_page_info($url, $no_photos = false, $photo = "", $keywords = false,

function add_page_info_to_body($body, $texturl = false, $no_photos = false)
{
logger('add_page_info_to_body: fetch page info for body ' . $body, LOGGER_DEBUG);
Logger::log('add_page_info_to_body: fetch page info for body ' . $body, LOGGER_DEBUG);

$URLSearchString = "^\[\]";

@@ -251,7 +252,7 @@ function consume_feed($xml, array $importer, array $contact, &$hub, $datedir = 0
// Test - remove before flight
//$tempfile = tempnam(get_temppath(), "ostatus2");
//file_put_contents($tempfile, $xml);
logger("Consume OStatus messages ", LOGGER_DEBUG);
Logger::log("Consume OStatus messages ", LOGGER_DEBUG);
OStatus::import($xml, $importer, $contact, $hub);
}

@@ -260,7 +261,7 @@ function consume_feed($xml, array $importer, array $contact, &$hub, $datedir = 0

if ($contact['network'] === Protocol::FEED) {
if ($pass < 2) {
logger("Consume feeds", LOGGER_DEBUG);
Logger::log("Consume feeds", LOGGER_DEBUG);
Feed::import($xml, $importer, $contact, $hub);
}

@@ -268,10 +269,10 @@ function consume_feed($xml, array $importer, array $contact, &$hub, $datedir = 0
}

if ($contact['network'] === Protocol::DFRN) {
logger("Consume DFRN messages", LOGGER_DEBUG);
Logger::log("Consume DFRN messages", LOGGER_DEBUG);
$dfrn_importer = DFRN::getImporter($contact["id"], $importer["uid"]);
if (!empty($dfrn_importer)) {
logger("Now import the DFRN feed");
Logger::log("Now import the DFRN feed");
DFRN::import($xml, $dfrn_importer, true);
return;
}
@@ -310,7 +311,7 @@ function subscribe_to_hub($url, array $importer, array $contact, $hubmode = 'sub

$params= 'hub.mode=' . $hubmode . '&hub.callback=' . urlencode($push_url) . '&hub.topic=' . urlencode($contact['poll']) . '&hub.verify=async&hub.verify_token=' . $verify_token;

logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: ' . $push_url . ' with verifier ' . $verify_token);
Logger::log('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: ' . $push_url . ' with verifier ' . $verify_token);

if (!strlen($contact['hub-verify']) || ($contact['hub-verify'] != $verify_token)) {
DBA::update('contact', ['hub-verify' => $verify_token], ['id' => $contact['id']]);
@@ -318,7 +319,7 @@ function subscribe_to_hub($url, array $importer, array $contact, $hubmode = 'sub

$postResult = Network::post($url, $params);

logger('subscribe_to_hub: returns: ' . $postResult->getReturnCode(), LOGGER_DEBUG);
Logger::log('subscribe_to_hub: returns: ' . $postResult->getReturnCode(), LOGGER_DEBUG);

return;



+ 2
- 2
include/text.php View File

@@ -399,7 +399,7 @@ function attribute_contains($attr, $s) {
*/
function logger($msg, $level = LOGGER_INFO)
{
Logger::logger($msg, $level);
Logger::log($msg, $level);
}

/**
@@ -422,7 +422,7 @@ function logger($msg, $level = LOGGER_INFO)
*/
function dlogger($msg, $level = LOGGER_INFO)
{
Logger::dlogger($msg, $level);
Logger::devLog($msg, $level);
}




+ 2
- 1
mod/acl.php View File

@@ -6,6 +6,7 @@ use Friendica\App;
use Friendica\Content\Widget;
use Friendica\Core\ACL;
use Friendica\Core\Addon;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
@@ -34,7 +35,7 @@ function acl_content(App $a)
$search = $_REQUEST['query'];
}

logger("Searching for ".$search." - type ".$type." conversation ".$conv_id, LOGGER_DEBUG);
Logger::log("Searching for ".$search." - type ".$type." conversation ".$conv_id, LOGGER_DEBUG);

if ($search != '') {
$sql_extra = "AND `name` LIKE '%%" . DBA::escape($search) . "%%'";


+ 3
- 2
mod/admin.php View File

@@ -13,6 +13,7 @@ use Friendica\Content\Text\Markdown;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Core\Theme;
use Friendica\Core\Worker;
@@ -910,7 +911,7 @@ function admin_page_summary(App $a)
$users+= $u['count'];
}

logger('accounts: ' . print_r($accounts, true), LOGGER_DATA);
Logger::log('accounts: ' . print_r($accounts, true), LOGGER_DATA);

$pending = Register::getPendingCount();

@@ -2499,7 +2500,7 @@ function admin_page_features_post(App $a)
{
BaseModule::checkFormSecurityTokenRedirectOnError('/admin/features', 'admin_manage_features');

logger('postvars: ' . print_r($_POST, true), LOGGER_DATA);
Logger::log('postvars: ' . print_r($_POST, true), LOGGER_DATA);

$features = Feature::get(false);



+ 2
- 1
mod/crepair.php View File

@@ -6,6 +6,7 @@
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\Model;
@@ -78,7 +79,7 @@ function crepair_post(App $a)
);

if ($photo) {
logger('mod-crepair: updating photo from ' . $photo);
Logger::log('mod-crepair: updating photo from ' . $photo);

Model\Contact::updateAvatar($photo, local_user(), $contact['id']);
}


+ 14
- 13
mod/dfrn_confirm.php View File

@@ -20,6 +20,7 @@
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
@@ -76,7 +77,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)

// These data elements may come from either the friend request notification form or $handsfree array.
if (is_array($handsfree)) {
logger('Confirm in handsfree mode');
Logger::log('Confirm in handsfree mode');
$dfrn_id = $handsfree['dfrn_id'];
$intro_id = $handsfree['intro_id'];
$duplex = $handsfree['duplex'];
@@ -99,9 +100,9 @@ function dfrn_confirm_post(App $a, $handsfree = null)
$cid = 0;
}

logger('Confirming request for dfrn_id (issued) ' . $dfrn_id);
Logger::log('Confirming request for dfrn_id (issued) ' . $dfrn_id);
if ($cid) {
logger('Confirming follower with contact_id: ' . $cid);
Logger::log('Confirming follower with contact_id: ' . $cid);
}

/*
@@ -124,7 +125,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
intval($uid)
);
if (!DBA::isResult($r)) {
logger('Contact not found in DB.');
Logger::log('Contact not found in DB.');
notice(L10n::t('Contact not found.') . EOL);
notice(L10n::t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL);
return;
@@ -211,7 +212,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
$params['page'] = 2;
}

logger('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), LOGGER_DATA);
Logger::log('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params, true), LOGGER_DATA);

/*
*
@@ -223,7 +224,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)

$res = Network::post($dfrn_confirm, $params, null, $redirects, 120)->getBody();

logger(' Confirm: received data: ' . $res, LOGGER_DATA);
Logger::log(' Confirm: received data: ' . $res, LOGGER_DATA);

// Now figure out what they responded. Try to be robust if the remote site is
// having difficulty and throwing up errors of some kind.
@@ -248,7 +249,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)

if (stristr($res, "<status") === false) {
// wrong xml! stop here!
logger('Unexpected response posting to ' . $dfrn_confirm);
Logger::log('Unexpected response posting to ' . $dfrn_confirm);
notice(L10n::t('Unexpected response from remote site: ') . EOL . htmlspecialchars($res) . EOL);
return;
}
@@ -305,7 +306,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
*/
Contact::updateAvatar($contact['photo'], $uid, $contact_id);

logger('dfrn_confirm: confirm - imported photos');
Logger::log('dfrn_confirm: confirm - imported photos');

if ($network === Protocol::DFRN) {
$new_relation = Contact::FOLLOWER;
@@ -387,7 +388,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
if ((isset($new_relation) && $new_relation == Contact::FRIEND)) {
if (DBA::isResult($contact) && ($contact['network'] === Protocol::DIASPORA)) {
$ret = Diaspora::sendShare($user, $contact);
logger('share returns: ' . $ret);
Logger::log('share returns: ' . $ret);
}
}

@@ -427,9 +428,9 @@ function dfrn_confirm_post(App $a, $handsfree = null)
$forum = (($page == 1) ? 1 : 0);
$prv = (($page == 2) ? 1 : 0);

logger('dfrn_confirm: requestee contacted: ' . $node);
Logger::log('dfrn_confirm: requestee contacted: ' . $node);

logger('dfrn_confirm: request: POST=' . print_r($_POST, true), LOGGER_DATA);
Logger::log('dfrn_confirm: request: POST=' . print_r($_POST, true), LOGGER_DATA);

// If $aes_key is set, both of these items require unpacking from the hex transport encoding.

@@ -542,7 +543,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)

Contact::updateAvatar($photo, $local_uid, $dfrn_record);

logger('dfrn_confirm: request - photos imported');
Logger::log('dfrn_confirm: request - photos imported');

$new_relation = Contact::SHARING;

@@ -582,7 +583,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
// Otherwise everything seems to have worked and we are almost done. Yay!
// Send an email notification

logger('dfrn_confirm: request: info updated');
Logger::log('dfrn_confirm: request: info updated');

$combined = null;
$r = q("SELECT `contact`.*, `user`.*


+ 25
- 24
mod/dfrn_notify.php View File

@@ -8,6 +8,7 @@

use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
@@ -17,7 +18,7 @@ use Friendica\Protocol\Diaspora;
require_once 'include/items.php';

function dfrn_notify_post(App $a) {
logger(__function__, LOGGER_TRACE);
Logger::log(__function__, LOGGER_TRACE);

$postdata = file_get_contents('php://input');

@@ -63,7 +64,7 @@ function dfrn_notify_post(App $a) {
}

if (!DBA::exists('challenge', ['dfrn-id' => $dfrn_id, 'challenge' => $challenge])) {
logger('could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
Logger::log('could not match challenge to dfrn_id ' . $dfrn_id . ' challenge=' . $challenge);
System::xmlExit(3, 'Could not match challenge');
}

@@ -71,7 +72,7 @@ function dfrn_notify_post(App $a) {

$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
if (!DBA::isResult($user)) {
logger('User not found for nickname ' . $a->argv[1]);
Logger::log('User not found for nickname ' . $a->argv[1]);
System::xmlExit(3, 'User not found');
}

@@ -94,7 +95,7 @@ function dfrn_notify_post(App $a) {

$contact = DBA::selectFirst('contact', ['id'], $condition);
if (!DBA::isResult($contact)) {
logger('contact not found for dfrn_id ' . $dfrn_id);
Logger::log('contact not found for dfrn_id ' . $dfrn_id);
System::xmlExit(3, 'Contact not found');
}

@@ -117,12 +118,12 @@ function dfrn_notify_post(App $a) {

$importer = Contact::updateSslPolicy($importer, $ssl_policy);

logger('data: ' . $data, LOGGER_DATA);
Logger::log('data: ' . $data, LOGGER_DATA);

if ($dissolve == 1) {
// Relationship is dissolved permanently
Contact::remove($importer['id']);
logger('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
Logger::log('relationship dissolved : ' . $importer['name'] . ' dissolved ' . $importer['username']);
System::xmlExit(0, 'relationship dissolved');
}

@@ -134,12 +135,12 @@ function dfrn_notify_post(App $a) {
// if local rino is lower than remote rino, abort: should not happen!
// but only for $remote_rino > 1, because old code did't send rino version
if ($rino_remote > 1 && $rino < $rino_remote) {
logger("rino version '$rino_remote' is lower than supported '$rino'");
Logger::log("rino version '$rino_remote' is lower than supported '$rino'");
System::xmlExit(0, "rino version '$rino_remote' is lower than supported '$rino'");
}

$rawkey = hex2bin(trim($key));
logger('rino: md5 raw key: ' . md5($rawkey), LOGGER_DATA);
Logger::log('rino: md5 raw key: ' . md5($rawkey), LOGGER_DATA);

$final_key = '';

@@ -165,14 +166,14 @@ function dfrn_notify_post(App $a) {
$data = DFRN::aesDecrypt(hex2bin($data), $final_key);
break;
default:
logger("rino: invalid sent version '$rino_remote'");
Logger::log("rino: invalid sent version '$rino_remote'");
System::xmlExit(0, "Invalid sent version '$rino_remote'");
}

logger('rino: decrypted data: ' . $data, LOGGER_DATA);
Logger::log('rino: decrypted data: ' . $data, LOGGER_DATA);
}

logger('Importing post from ' . $importer['addr'] . ' to ' . $importer['nickname'] . ' with the RINO ' . $rino_remote . ' encryption.', LOGGER_DEBUG);
Logger::log('Importing post from ' . $importer['addr'] . ' to ' . $importer['nickname'] . ' with the RINO ' . $rino_remote . ' encryption.', LOGGER_DEBUG);

$ret = DFRN::import($data, $importer);
System::xmlExit($ret, 'Processed');
@@ -191,7 +192,7 @@ function dfrn_dispatch_public($postdata)
// Fetch the corresponding public contact
$contact = Contact::getDetailsByAddr($msg['author'], 0);
if (!$contact) {
logger('Contact not found for address ' . $msg['author']);
Logger::log('Contact not found for address ' . $msg['author']);
System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
}

@@ -199,11 +200,11 @@ function dfrn_dispatch_public($postdata)

// This should never fail
if (empty($importer)) {
logger('Contact not found for address ' . $msg['author']);
Logger::log('Contact not found for address ' . $msg['author']);
System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
}

logger('Importing post from ' . $msg['author'] . ' with the public envelope.', LOGGER_DEBUG);
Logger::log('Importing post from ' . $msg['author'] . ' with the public envelope.', LOGGER_DEBUG);

// Now we should be able to import it
$ret = DFRN::import($msg['message'], $importer);
@@ -223,7 +224,7 @@ function dfrn_dispatch_private($user, $postdata)
// Otherwise there should be a public contact
$cid = Contact::getIdForURL($msg['author']);
if (!$cid) {
logger('Contact not found for address ' . $msg['author']);
Logger::log('Contact not found for address ' . $msg['author']);
System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
}
}
@@ -232,11 +233,11 @@ function dfrn_dispatch_private($user, $postdata)

// This should never fail
if (empty($importer)) {
logger('Contact not found for address ' . $msg['author']);
Logger::log('Contact not found for address ' . $msg['author']);
System::xmlExit(3, 'Contact ' . $msg['author'] . ' not found');
}

logger('Importing post from ' . $msg['author'] . ' to ' . $user['nickname'] . ' with the private envelope.', LOGGER_DEBUG);
Logger::log('Importing post from ' . $msg['author'] . ' to ' . $user['nickname'] . ' with the private envelope.', LOGGER_DEBUG);

// Now we should be able to import it
$ret = DFRN::import($msg['message'], $importer);
@@ -258,7 +259,7 @@ function dfrn_notify_content(App $a) {
$type = "";
$last_update = "";

logger('new notification dfrn_id=' . $dfrn_id);
Logger::log('new notification dfrn_id=' . $dfrn_id);

$direction = (-1);
if (strpos($dfrn_id,':') == 1) {
@@ -276,11 +277,11 @@ function dfrn_notify_content(App $a) {
'type' => $type, 'last_update' => $last_update];
DBA::insert('challenge', $fields);

logger('challenge=' . $hash, LOGGER_DATA);
Logger::log('challenge=' . $hash, LOGGER_DATA);

$user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
if (!DBA::isResult($user)) {
logger('User not found for nickname ' . $a->argv[1]);
Logger::log('User not found for nickname ' . $a->argv[1]);
killme();
}

@@ -305,18 +306,18 @@ function dfrn_notify_content(App $a) {

$contact = DBA::selectFirst('contact', ['id'], $condition);
if (!DBA::isResult($contact)) {
logger('contact not found for dfrn_id ' . $dfrn_id);
Logger::log('contact not found for dfrn_id ' . $dfrn_id);
System::xmlExit(3, 'Contact not found');
}

// $importer in this case contains the contact record for the remote contact joined with the user record of our user.
$importer = DFRN::getImporter($contact['id'], $user['uid']);
if (empty($importer)) {
logger('No importer data found for user ' . $a->argv[1] . ' and contact ' . $dfrn_id);
Logger::log('No importer data found for user ' . $a->argv[1] . ' and contact ' . $dfrn_id);
killme();
}

logger("Remote rino version: ".$rino_remote." for ".$importer["url"], LOGGER_DATA);
Logger::log("Remote rino version: ".$rino_remote." for ".$importer["url"], LOGGER_DATA);

$challenge = '';
$encrypted_id = '';
@@ -344,7 +345,7 @@ function dfrn_notify_content(App $a) {
$rino = Config::get('system', 'rino_encrypt');
$rino = intval($rino);

logger("Local rino version: ". $rino, LOGGER_DATA);
Logger::log("Local rino version: ". $rino, LOGGER_DATA);

// if requested rino is lower than enabled local rino, lower local rino version
// if requested rino is higher than enabled local rino, reply with local rino


+ 11
- 10
mod/dfrn_poll.php View File

@@ -7,6 +7,7 @@
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Module\Login;
@@ -68,7 +69,7 @@ function dfrn_poll_init(App $a)
$user = $r[0]['nickname'];
}

logger('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
Logger::log('dfrn_poll: public feed request from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $user);
header("Content-type: application/atom+xml");
echo DFRN::feed('', $user, $last_update, 0, $hidewall);
killme();
@@ -104,7 +105,7 @@ function dfrn_poll_init(App $a)
if (DBA::isResult($r)) {
$s = Network::fetchUrl($r[0]['poll'] . '?dfrn_id=' . $my_id . '&type=profile-check');

logger("dfrn_poll: old profile returns " . $s, LOGGER_DATA);
Logger::log("dfrn_poll: old profile returns " . $s, LOGGER_DATA);

if (strlen($s)) {
$xml = XML::parseString($s);
@@ -191,7 +192,7 @@ function dfrn_poll_init(App $a)
}

if ($final_dfrn_id != $orig_id) {
logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
Logger::log('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
// did not decode properly - cannot trust this site
System::xmlExit(3, 'Bad decryption');
}
@@ -238,7 +239,7 @@ function dfrn_poll_post(App $a)

if ($ptype === 'profile-check') {
if (strlen($challenge) && strlen($sec)) {
logger('dfrn_poll: POST: profile-check');
Logger::log('dfrn_poll: POST: profile-check');

DBA::delete('profile_check', ["`expire` < ?", time()]);
$r = q("SELECT * FROM `profile_check` WHERE `sec` = '%s' ORDER BY `expire` DESC LIMIT 1",
@@ -283,7 +284,7 @@ function dfrn_poll_post(App $a)
}

if ($final_dfrn_id != $orig_id) {
logger('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
Logger::log('profile_check: ' . $final_dfrn_id . ' != ' . $orig_id, LOGGER_DEBUG);
// did not decode properly - cannot trust this site
System::xmlExit(3, 'Bad decryption');
}
@@ -372,7 +373,7 @@ function dfrn_poll_post(App $a)
// NOTREACHED
} else {
// Update the writable flag if it changed
logger('dfrn_poll: post request feed: ' . print_r($_POST, true), LOGGER_DATA);
Logger::log('dfrn_poll: post request feed: ' . print_r($_POST, true), LOGGER_DATA);
if ($dfrn_version >= 2.21) {
if ($perm === 'rw') {
$writable = 1;
@@ -510,15 +511,15 @@ function dfrn_poll_content(App $a)
])->getBody();
}

logger("dfrn_poll: sec profile: " . $s, LOGGER_DATA);
Logger::log("dfrn_poll: sec profile: " . $s, LOGGER_DATA);

if (strlen($s) && strstr($s, '<?xml')) {
$xml = XML::parseString($s);

logger('dfrn_poll: profile: parsed xml: ' . print_r($xml, true), LOGGER_DATA);
Logger::log('dfrn_poll: profile: parsed xml: ' . print_r($xml, true), LOGGER_DATA);

logger('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash);
logger('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec);
Logger::log('dfrn_poll: secure profile: challenge: ' . $xml->challenge . ' expecting ' . $hash);
Logger::log('dfrn_poll: secure profile: sec: ' . $xml->sec . ' expecting ' . $sec);

if (((int) $xml->status == 0) && ($xml->challenge == $hash) && ($xml->sec == $sec)) {
$_SESSION['authenticated'] = 1;


+ 3
- 2
mod/dfrn_request.php View File

@@ -15,6 +15,7 @@
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
@@ -57,7 +58,7 @@ function dfrn_request_init(App $a)
function dfrn_request_post(App $a)
{
if (($a->argc != 2) || (!count($a->profile))) {
logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
Logger::log('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
return;
}

@@ -297,7 +298,7 @@ function dfrn_request_post(App $a)
$network = Protocol::DFRN;
}

logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
Logger::log('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);

if ($network === Protocol::DFRN) {
$ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",


+ 2
- 1
mod/display.php View File

@@ -10,6 +10,7 @@ use Friendica\Content\Text\HTML;
use Friendica\Core\ACL;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
@@ -74,7 +75,7 @@ function display_init(App $a)
}

if (!empty($_SERVER['HTTP_ACCEPT']) && strstr($_SERVER['HTTP_ACCEPT'], 'application/atom+xml')) {
logger('Directly serving XML for id '.$item["id"], LOGGER_DEBUG);
Logger::log('Directly serving XML for id '.$item["id"], LOGGER_DEBUG);
displayShowFeed($item["id"], false);
}



+ 2
- 1
mod/events.php View File

@@ -9,6 +9,7 @@ use Friendica\Content\Nav;
use Friendica\Content\Widget\CalendarExport;
use Friendica\Core\ACL;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
@@ -47,7 +48,7 @@ function events_init(App $a)
function events_post(App $a)
{

logger('post: ' . print_r($_REQUEST, true), LOGGER_DATA);
Logger::log('post: ' . print_r($_REQUEST, true), LOGGER_DATA);

if (!local_user()) {
return;


+ 2
- 1
mod/filer.php View File

@@ -4,6 +4,7 @@
*/
use Friendica\App;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\PConfig;

require_once 'include/items.php';
@@ -17,7 +18,7 @@ function filer_content(App $a)
$term = unxmlify(trim(defaults($_GET, 'term', '')));
$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);

logger('filer: tag ' . $term . ' item ' . $item_id);
Logger::log('filer: tag ' . $term . ' item ' . $item_id);

if ($item_id && strlen($term)) {
// file item


+ 2
- 1
mod/filerm.php View File

@@ -1,6 +1,7 @@
<?php

use Friendica\App;
use Friendica\Core\Logger;
use Friendica\Core\System;

function filerm_content(App $a) {
@@ -19,7 +20,7 @@ function filerm_content(App $a) {

$item_id = (($a->argc > 1) ? intval($a->argv[1]) : 0);

logger('filerm: tag ' . $term . ' item ' . $item_id);
Logger::log('filerm: tag ' . $term . ' item ' . $item_id);

if ($item_id && strlen($term)) {
file_tag_unsave_file(local_user(),$item_id,$term, $category);


+ 12
- 11
mod/item.php View File

@@ -22,6 +22,7 @@ use Friendica\Content\Text\HTML;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
@@ -56,7 +57,7 @@ function item_post(App $a) {

Addon::callHooks('post_local_start', $_REQUEST);

logger('postvars ' . print_r($_REQUEST, true), LOGGER_DATA);
Logger::log('postvars ' . print_r($_REQUEST, true), LOGGER_DATA);

$api_source = defaults($_REQUEST, 'api_source', false);

@@ -72,7 +73,7 @@ function item_post(App $a) {
*/
if (!$preview && !empty($_REQUEST['post_id_random'])) {
if (!empty($_SESSION['post-random']) && $_SESSION['post-random'] == $_REQUEST['post_id_random']) {
logger("item post: duplicate post", LOGGER_DEBUG);
Logger::log("item post: duplicate post", LOGGER_DEBUG);
item_post_return(System::baseUrl(), $api_source, $return_path);
} else {
$_SESSION['post-random'] = $_REQUEST['post_id_random'];
@@ -130,7 +131,7 @@ function item_post(App $a) {
}

if ($parent) {
logger('mod_item: item_post parent=' . $parent);
Logger::log('mod_item: item_post parent=' . $parent);
}

$post_id = intval(defaults($_REQUEST, 'post_id', 0));
@@ -153,7 +154,7 @@ function item_post(App $a) {
// Check for multiple posts with the same message id (when the post was created via API)
if (($message_id != '') && ($profile_uid != 0)) {
if (Item::exists(['uri' => $message_id, 'uid' => $profile_uid])) {
logger("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG);
Logger::log("Message with URI ".$message_id." already exists for user ".$profile_uid, LOGGER_DEBUG);
return 0;
}
}
@@ -669,7 +670,7 @@ function item_post(App $a) {
$datarray["author-network"] = Protocol::DFRN;

$o = conversation($a, [array_merge($contact_record, $datarray)], new Pager($a->query_string), 'search', false, true);
logger('preview: ' . $o);
Logger::log('preview: ' . $o);
echo json_encode(['preview' => $o]);
exit();
}
@@ -677,7 +678,7 @@ function item_post(App $a) {
Addon::callHooks('post_local',$datarray);

if (!empty($datarray['cancel'])) {
logger('mod_item: post cancelled by addon.');
Logger::log('mod_item: post cancelled by addon.');
if ($return_path) {
$a->internalRedirect($return_path);
}
@@ -714,7 +715,7 @@ function item_post(App $a) {
file_tag_update_pconfig($uid,$categories_old,$categories_new,'category');

if (!empty($_REQUEST['return']) && strlen($return_path)) {
logger('return: ' . $return_path);
Logger::log('return: ' . $return_path);
$a->internalRedirect($return_path);
}
killme();
@@ -736,14 +737,14 @@ function item_post(App $a) {
$post_id = Item::insert($datarray);

if (!$post_id) {
logger("Item wasn't stored.");
Logger::log("Item wasn't stored.");
$a->internalRedirect($return_path);
}

$datarray = Item::selectFirst(Item::ITEM_FIELDLIST, ['id' => $post_id]);

if (!DBA::isResult($datarray)) {
logger("Item with id ".$post_id." couldn't be fetched.");
Logger::log("Item with id ".$post_id." couldn't be fetched.");
$a->internalRedirect($return_path);
}

@@ -833,7 +834,7 @@ function item_post(App $a) {
// We don't fork a new process since this is done anyway with the following command
Worker::add(['priority' => PRIORITY_HIGH, 'dont_fork' => true], "CreateShadowEntry", $post_id);

logger('post_complete');
Logger::log('post_complete');

if ($api_source) {
return $post_id;
@@ -861,7 +862,7 @@ function item_post_return($baseurl, $api_source, $return_path)
$json['reload'] = $baseurl . '/' . $_REQUEST['jsreload'];
}

logger('post_json: ' . print_r($json, true), LOGGER_DEBUG);
Logger::log('post_json: ' . print_r($json, true), LOGGER_DEBUG);

echo json_encode($json);
killme();


+ 2
- 1
mod/network.php View File

@@ -15,6 +15,7 @@ use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
@@ -871,7 +872,7 @@ function networkThreadedView(App $a, $update, $parent)
$_SESSION['network_last_date'] = $tag_top_limit;
}

logger('Tagged items: ' . count($data) . ' - ' . $bottom_limit . ' - ' . $top_limit . ' - ' . local_user().' - '.(int)$update);
Logger::log('Tagged items: ' . count($data) . ' - ' . $bottom_limit . ' - ' . $top_limit . ' - ' . local_user().' - '.(int)$update);
$s = [];
foreach ($r as $item) {
$s[$item['uri']] = $item;


+ 8
- 7
mod/nodeinfo.php View File

@@ -8,6 +8,7 @@
use Friendica\App;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;
use Friendica\Util\Network;
@@ -172,7 +173,7 @@ function nodeinfo_cron() {
return;
}

logger('cron_start');
Logger::log('cron_start');

$users = q("SELECT `user`.`uid`, `user`.`login_date`, `contact`.`last-item`
FROM `user`
@@ -203,22 +204,22 @@ function nodeinfo_cron() {
Config::set('nodeinfo', 'active_users_halfyear', $active_users_halfyear);
Config::set('nodeinfo', 'active_users_monthly', $active_users_monthly);

logger('total_users: ' . $total_users . '/' . $active_users_halfyear. '/' . $active_users_monthly, LOGGER_DEBUG);
Logger::log('total_users: ' . $total_users . '/' . $active_users_halfyear. '/' . $active_users_monthly, LOGGER_DEBUG);
}

$local_posts = DBA::count('thread', ["`wall` AND NOT `deleted` AND `uid` != 0"]);
Config::set('nodeinfo', 'local_posts', $local_posts);
logger('local_posts: ' . $local_posts, LOGGER_DEBUG);
Logger::log('local_posts: ' . $local_posts, LOGGER_DEBUG);

$local_comments = DBA::count('item', ["`origin` AND `id` != `parent` AND NOT `deleted` AND `uid` != 0"]);
Config::set('nodeinfo', 'local_comments', $local_comments);
logger('local_comments: ' . $local_comments, LOGGER_DEBUG);
Logger::log('local_comments: ' . $local_comments, LOGGER_DEBUG);

// Now trying to register
$url = 'http://the-federation.info/register/'.$a->getHostName();
logger('registering url: '.$url, LOGGER_DEBUG);
Logger::log('registering url: '.$url, LOGGER_DEBUG);
$ret = Network::fetchUrl($url);
logger('registering answer: '.$ret, LOGGER_DEBUG);
Logger::log('registering answer: '.$ret, LOGGER_DEBUG);

logger('cron_end');
Logger::log('cron_end');
}

+ 3
- 2
mod/openid.php View File

@@ -7,6 +7,7 @@ use Friendica\App;
use Friendica\Core\Authentication;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Database\DBA;

@@ -16,7 +17,7 @@ function openid_content(App $a) {
if($noid)
$a->internalRedirect();

logger('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);
Logger::log('mod_openid ' . print_r($_REQUEST,true), LOGGER_DATA);

if((x($_GET,'openid_mode')) && (x($_SESSION,'openid'))) {

@@ -27,7 +28,7 @@ function openid_content(App $a) {
$authid = $_REQUEST['openid_identity'];

if(! strlen($authid)) {
logger(L10n::t('OpenID protocol error. No ID returned.') . EOL);
Logger::log(L10n::t('OpenID protocol error. No ID returned.') . EOL);
$a->internalRedirect();
}



+ 3
- 2
mod/parse_url.php View File

@@ -11,6 +11,7 @@
*/
use Friendica\App;
use Friendica\Core\Addon;
use Friendica\Core\Logger;
use Friendica\Util\Network;
use Friendica\Util\ParseUrl;

@@ -54,7 +55,7 @@ function parse_url_content(App $a)
}
}

logger($url);
Logger::log($url);

// Check if the URL is an image, video or audio file. If so format
// the URL with the corresponding BBCode media tag
@@ -114,7 +115,7 @@ function parse_url_content(App $a)

$result = sprintf($template, $url, ($title) ? $title : $url, $text) . $str_tags;

logger('(unparsed): returns: ' . $result);
Logger::log('(unparsed): returns: ' . $result);

echo $result;
exit();


+ 11
- 10
mod/photos.php View File

@@ -12,6 +12,7 @@ use Friendica\Core\ACL;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
@@ -141,9 +142,9 @@ function photos_init(App $a) {

function photos_post(App $a)
{
logger('mod-photos: photos_post: begin' , LOGGER_DEBUG);
logger('mod_photos: REQUEST ' . print_r($_REQUEST, true), LOGGER_DATA);
logger('mod_photos: FILES ' . print_r($_FILES, true), LOGGER_DATA);
Logger::log('mod-photos: photos_post: begin' , LOGGER_DEBUG);
Logger::log('mod_photos: REQUEST ' . print_r($_REQUEST, true), LOGGER_DATA);
Logger::log('mod_photos: FILES ' . print_r($_FILES, true), LOGGER_DATA);

$phototypes = Image::supportedTypes();

@@ -189,7 +190,7 @@ function photos_post(App $a)

if (!$owner_record) {
notice(L10n::t('Contact information unavailable') . EOL);
logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
Logger::log('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
killme();
}

@@ -379,7 +380,7 @@ function photos_post(App $a)
}

if (!empty($_POST['rotate']) && (intval($_POST['rotate']) == 1 || intval($_POST['rotate']) == 2)) {
logger('rotate');
Logger::log('rotate');

$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = 0 LIMIT 1",
DBA::escape($resource_id),
@@ -706,7 +707,7 @@ function photos_post(App $a)
$album = !empty($_REQUEST['album']) ? notags(trim($_REQUEST['album'])) : '';
$newalbum = !empty($_REQUEST['newalbum']) ? notags(trim($_REQUEST['newalbum'])) : '';

logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);
Logger::log('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);

if (!strlen($album)) {
if (strlen($newalbum)) {
@@ -799,7 +800,7 @@ function photos_post(App $a)
$type = Image::guessType($filename);
}

logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG);
Logger::log('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG);

$maximagesize = Config::get('system', 'maximagesize');

@@ -819,14 +820,14 @@ function photos_post(App $a)
return;
}

logger('mod/photos.php: photos_post(): loading the contents of ' . $src , LOGGER_DEBUG);
Logger::log('mod/photos.php: photos_post(): loading the contents of ' . $src , LOGGER_DEBUG);

$imagedata = @file_get_contents($src);

$image = new Image($imagedata, $type);

if (!$image->isValid()) {
logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
Logger::log('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
notice(L10n::t('Unable to process image.') . EOL);
@unlink($src);
$foo = 0;
@@ -855,7 +856,7 @@ function photos_post(App $a)
$r = Photo::store($image, $page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);

if (!$r) {
logger('mod/photos.php: photos_post(): image store failed', LOGGER_DEBUG);
Logger::log('mod/photos.php: photos_post(): image store failed', LOGGER_DEBUG);
notice(L10n::t('Image upload failed.') . EOL);
killme();
}


+ 6
- 5
mod/poco.php View File

@@ -8,6 +8,7 @@ use Friendica\App;
use Friendica\Content\Text\BBCode;
use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
@@ -121,7 +122,7 @@ function poco_init(App $a) {
$itemsPerPage = ((x($_GET, 'count') && intval($_GET['count'])) ? intval($_GET['count']) : $totalResults);

if ($global) {
logger("Start global query", LOGGER_DEBUG);
Logger::log("Start global query", LOGGER_DEBUG);
$contacts = q("SELECT * FROM `gcontact` WHERE `updated` > '%s' AND NOT `hide` AND `network` IN ('%s', '%s', '%s') AND `updated` > `last_failure`
ORDER BY `updated` DESC LIMIT %d, %d",
DBA::escape($update_limit),
@@ -132,7 +133,7 @@ function poco_init(App $a) {
intval($itemsPerPage)
);
} elseif ($system_mode) {
logger("Start system mode query", LOGGER_DEBUG);
Logger::log("Start system mode query", LOGGER_DEBUG);
$contacts = q("SELECT `contact`.*, `profile`.`about` AS `pabout`, `profile`.`locality` AS `plocation`, `profile`.`pub_keywords`,
`profile`.`gender` AS `pgender`, `profile`.`address` AS `paddress`, `profile`.`region` AS `pregion`,
`profile`.`postal-code` AS `ppostalcode`, `profile`.`country-name` AS `pcountry`, `user`.`account-type`
@@ -144,7 +145,7 @@ function poco_init(App $a) {
intval($itemsPerPage)
);
} else {
logger("Start query for user " . $user['nickname'], LOGGER_DEBUG);
Logger::log("Start query for user " . $user['nickname'], LOGGER_DEBUG);
$contacts = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 AND `archive` = 0
AND (`success_update` >= `failure_update` OR `last-item` >= `failure_update`)
AND `network` IN ('%s', '%s', '%s', '%s') $sql_extra LIMIT %d, %d",
@@ -157,7 +158,7 @@ function poco_init(App $a) {
intval($itemsPerPage)
);
}
logger("Query done", LOGGER_DEBUG);
Logger::log("Query done", LOGGER_DEBUG);

$ret = [];
if (x($_GET, 'sorted')) {
@@ -369,7 +370,7 @@ function poco_init(App $a) {
} else {
System::httpExit(500);
}
logger("End of poco", LOGGER_DEBUG);
Logger::log("End of poco", LOGGER_DEBUG);

if ($format === 'xml') {
header('Content-type: text/xml');


+ 3
- 2
mod/poke.php View File

@@ -16,6 +16,7 @@
use Friendica\App;
use Friendica\Core\Addon;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
@@ -53,7 +54,7 @@ function poke_init(App $a)
$parent = (x($_GET,'parent') ? intval($_GET['parent']) : 0);


logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
Logger::log('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);


$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
@@ -62,7 +63,7 @@ function poke_init(App $a)
);

if (!DBA::isResult($r)) {
logger('poke: no contact ' . $contact_id);
Logger::log('poke: no contact ' . $contact_id);
return;
}



+ 2
- 1
mod/profile.php View File

@@ -11,6 +11,7 @@ use Friendica\Core\ACL;
use Friendica\Core\Addon;
use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBA;
@@ -37,7 +38,7 @@ function profile_init(App $a)
if (DBA::isResult($r)) {
$a->internalRedirect('profile/' . $r[0]['nickname']);
} else {
logger('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
Logger::log('profile error: mod_profile ' . $a->query_string, LOGGER_DEBUG);
notice(L10n::t('Requested profile is not available.') . EOL);
$a->error = 404;
return;


+ 14
- 13
mod/pubsub.php View File

@@ -1,6 +1,7 @@
<?php

use Friendica\App;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
@@ -39,14 +40,14 @@ function pubsub_init(App $a)
$hub_lease = notags(trim(defaults($_GET, 'hub_lease_seconds', '')));
$hub_verify = notags(trim(defaults($_GET, 'hub_verify_token', '')));

logger('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
logger('Data: ' . print_r($_GET,true), LOGGER_DATA);
Logger::log('Subscription from ' . $_SERVER['REMOTE_ADDR'] . ' Mode: ' . $hub_mode . ' Nick: ' . $nick);
Logger::log('Data: ' . print_r($_GET,true), LOGGER_DATA);

$subscribe = (($hub_mode === 'subscribe') ? 1 : 0);

$owner = DBA::selectFirst('user', ['uid'], ['nickname' => $nick, 'account_expired' => false, 'account_removed' => false]);
if (!DBA::isResult($owner)) {
logger('Local account not found: ' . $nick);
Logger::log('Local account not found: ' . $nick);
hub_return(false, '');
}

@@ -58,12 +59,12 @@ function pubsub_init(App $a)

$contact = DBA::selectFirst('contact', ['id', 'poll'], $condition);
if (!DBA::isResult($contact)) {
logger('Contact ' . $contact_id . ' not found.');
Logger::log('Contact ' . $contact_id . ' not found.');
hub_return(false, '');
}

if (!empty($hub_topic) && !link_compare($hub_topic, $contact['poll'])) {
logger('Hub topic ' . $hub_topic . ' != ' . $contact['poll']);
Logger::log('Hub topic ' . $hub_topic . ' != ' . $contact['poll']);
hub_return(false, '');
}

@@ -71,13 +72,13 @@ function pubsub_init(App $a)
// Don't allow outsiders to unsubscribe us.

if (($hub_mode === 'unsubscribe') && empty($hub_verify)) {
logger('Bogus unsubscribe');
Logger::log('Bogus unsubscribe');
hub_return(false, '');
}

if (!empty($hub_mode)) {
DBA::update('contact', ['subhub' => $subscribe], ['id' => $contact['id']]);
logger($hub_mode . ' success for contact ' . $contact_id . '.');
Logger::log($hub_mode . ' success for contact ' . $contact_id . '.');
}
hub_return(true, $hub_challenge);
}
@@ -87,8 +88,8 @@ function pubsub_post(App $a)
{
$xml = file_get_contents('php://input');

logger('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $a->cmd . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
logger('Data: ' . $xml, LOGGER_DATA);
Logger::log('Feed arrived from ' . $_SERVER['REMOTE_ADDR'] . ' for ' . $a->cmd . ' with user-agent: ' . $_SERVER['HTTP_USER_AGENT']);
Logger::log('Data: ' . $xml, LOGGER_DATA);

$nick = (($a->argc > 1) ? notags(trim($a->argv[1])) : '');
$contact_id = (($a->argc > 2) ? intval($a->argv[2]) : 0 );
@@ -106,16 +107,16 @@ function pubsub_post(App $a)
if (!empty($author['contact-id'])) {
$condition = ['id' => $author['contact-id'], 'uid' => $importer['uid'], 'subhub' => true, 'blocked' => false];
$contact = DBA::selectFirst('contact', [], $condition);
logger('No record for ' . $nick .' with contact id ' . $contact_id . ' - using '.$author['contact-id'].' instead.');
Logger::log('No record for ' . $nick .' with contact id ' . $contact_id . ' - using '.$author['contact-id'].' instead.');
<