X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fpoco.php;h=671551f832589e89ab4c839e1c48ada353a79cb7;hb=80a4e6263fd53f83a710d2a2e6c57baae38cb14b;hp=348f76d1ce8904c52a695edf3a24e5310a343280;hpb=cd3643d17485aa1000c41312f5b363788e755c49;p=friendica.git diff --git a/mod/poco.php b/mod/poco.php index 348f76d1ce..671551f832 100644 --- a/mod/poco.php +++ b/mod/poco.php @@ -3,18 +3,21 @@ // See here for a documentation for portable contacts: // https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html + use Friendica\App; +use Friendica\Content\Text\BBCode; use Friendica\Core\Cache; use Friendica\Core\Config; +use Friendica\Core\System; use Friendica\Database\DBM; use Friendica\Protocol\PortableContact; -use Friendica\Util\Network; +use Friendica\Util\DateTimeFormat; function poco_init(App $a) { $system_mode = false; if (intval(Config::get('system', 'block_public')) || (Config::get('system', 'block_local_dir'))) { - Network::httpStatusExit(401); + System::httpExit(401); } if ($a->argc > 1) { @@ -23,7 +26,7 @@ function poco_init(App $a) { if (! x($user)) { $c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1"); if (! DBM::is_result($c)) { - Network::httpStatusExit(401); + System::httpExit(401); } $system_mode = true; } @@ -40,10 +43,11 @@ function poco_init(App $a) { echo json_encode($ret); killme(); } + if ($a->argc > 1 && $a->argv[1] === '@global') { // List of all profiles that this server recently had data from $global = true; - $update_limit = date("Y-m-d H:i:s", time() - 30 * 86400); + $update_limit = date(DateTimeFormat::MYSQL, time() - 30 * 86400); } if ($a->argc > 2 && $a->argv[2] === '@me') { $justme = true; @@ -64,7 +68,7 @@ function poco_init(App $a) { dbesc($user) ); if (! DBM::is_result($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) { - Network::httpStatusExit(404); + System::httpExit(404); } $user = $users[0]; @@ -80,7 +84,7 @@ function poco_init(App $a) { $sql_extra = sprintf(" AND `contact`.`id` = %d ", intval($cid)); } if (x($_GET, 'updatedSince')) { - $update_limit = date("Y-m-d H:i:s", strtotime($_GET['updatedSince'])); + $update_limit = date(DateTimeFormat::MYSQL, strtotime($_GET['updatedSince'])); } if ($global) { $contacts = q("SELECT count(*) AS `total` FROM `gcontact` WHERE `updated` >= '%s' AND `updated` >= `last_failure` AND NOT `hide` AND `network` IN ('%s', '%s', '%s')", @@ -243,8 +247,7 @@ function poco_init(App $a) { } $about = Cache::get("about:" . $contact['updated'] . ":" . $contact['nurl']); if (is_null($about)) { - require_once 'include/bbcode.php'; - $about = bbcode($contact['about'], false, false); + $about = BBCode::convert($contact['about'], false); Cache::set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about); } @@ -358,7 +361,7 @@ function poco_init(App $a) { $ret['entry'][] = []; } } else { - Network::httpStatusExit(500); + System::httpExit(500); } logger("End of poco", LOGGER_DEBUG); @@ -372,6 +375,6 @@ function poco_init(App $a) { echo json_encode($ret); killme(); } else { - Network::httpStatusExit(500); + System::httpExit(500); } }