Move /profile_photo to Module\Settings\Profile\Photo

[friendica.git] / mod / poco.php

diff --git a/mod/poco.php b/mod/poco.php
index c288f6b6393bf8a7bf3eb082b8714cb3dc4a914a..8e7d63418afba2271c32b294fa15a2cef2240277 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -6,13 +6,11 @@
 
 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\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Protocol\PortableContact;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
@@ -21,7 +19,7 @@ use Friendica\Util\XML;
 function poco_init(App $a) {
        $system_mode = false;
 
-       if (intval(Config::get('system', 'block_public')) || (Config::get('system', 'block_local_dir'))) {
+       if (intval(DI::config()->get('system', 'block_public')) || (DI::config()->get('system', 'block_local_dir'))) {
                throw new \Friendica\Network\HTTPException\ForbiddenException();
        }
 
@@ -36,7 +34,7 @@ function poco_init(App $a) {
                $system_mode = true;
        }
 
-       $format = defaults($_GET, 'format', 'json');
+       $format = ($_GET['format'] ?? '') ?: 'json';
 
        $justme = false;
        $global = false;
@@ -255,10 +253,10 @@ function poco_init(App $a) {
                                if (isset($contact['account-type'])) {
                                        $contact['contact-type'] = $contact['account-type'];
                                }
-                               $about = Cache::get("about:" . $contact['updated'] . ":" . $contact['nurl']);
+                               $about = DI::cache()->get("about:" . $contact['updated'] . ":" . $contact['nurl']);
                                if (is_null($about)) {
                                        $about = BBCode::convert($contact['about'], false);
-                                       Cache::set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about);
+                                       DI::cache()->set("about:" . $contact['updated'] . ":" . $contact['nurl'], $about);
                                }
 
                                // Non connected persons can only see the keywords of a Diaspora account