[WIP] Rewrite to Proxy class: (#5507)

[friendica.git] / include / conversation.php

diff --git a/include/conversation.php b/include/conversation.php
index 54716cd6878613e0c94bb4a6e2505843a2639ccd..5addb610c722e06746df81c86ffc396fe530543c 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -12,13 +12,15 @@ use Friendica\Core\Config;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
-use Friendica\Model\Profile;
 use Friendica\Model\Item;
+use Friendica\Model\Profile;
+use Friendica\Model\Term;
 use Friendica\Object\Post;
 use Friendica\Object\Thread;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Proxy as ProxyUtils;
 use Friendica\Util\Temporal;
 use Friendica\Util\XML;
 
@@ -134,7 +136,7 @@ function localize_item(&$item)
 
                $fields = ['author-link', 'author-name', 'verb', 'object-type', 'resource-id', 'body', 'plink'];
                $obj = Item::selectFirst($fields, ['uri' => $item['parent-uri']]);
-               if (!DBM::is_result($obj)) {
+               if (!DBA::isResult($obj)) {
                        return;
                }
 
@@ -265,7 +267,7 @@ function localize_item(&$item)
                $fields = ['author-id', 'author-link', 'author-name', 'author-network',
                        'verb', 'object-type', 'resource-id', 'body', 'plink'];
                $obj = Item::selectFirst($fields, ['uri' => $item['parent-uri']]);
-               if (!DBM::is_result($obj)) {
+               if (!DBA::isResult($obj)) {
                        return;
                }
 
@@ -320,7 +322,7 @@ function localize_item(&$item)
                if (strlen($obj->id)) {
                        $fields = ['author-link', 'author-name', 'plink'];
                        $target = Item::selectFirst($fields, ['uri' => $obj->id, 'uid' => $item['uid']]);
-                       if (DBM::is_result($target) && $target['plink']) {
+                       if (DBA::isResult($target) && $target['plink']) {
                                $Bname = $target['author-name'];
                                $Blink = $target['author-link'];
                                $A = '[url=' . Contact::magicLink($Alink) . ']' . $Aname . '[/url]';
@@ -406,7 +408,6 @@ function visible_activity($item) {
  *
  */
 function conversation(App $a, array $items, $mode, $update, $preview = false, $order = 'commented', $uid = 0) {
-       require_once 'mod/proxy.php';
 
        $ssl_state = ((local_user()) ? true : false);
 
@@ -417,8 +418,10 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 
        if (local_user()) {
                $str_blocked = PConfig::get(local_user(), 'system', 'blocked');
+
                if ($str_blocked) {
                        $arr_blocked = explode(',', $str_blocked);
+
                        for ($x = 0; $x < count($arr_blocked); $x ++) {
                                $arr_blocked[$x] = trim($arr_blocked[$x]);
                        }
@@ -476,6 +479,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                }
        } elseif ($mode === 'notes') {
                $profile_owner = local_user();
+
                if (!$update) {
                        $live_update_div = '<div id="live-notes"></div>' . "\r\n"
                                . "<script> var profile_uid = " . local_user()
@@ -483,6 +487,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                }
        } elseif ($mode === 'display') {
                $profile_owner = $a->profile['uid'];
+
                if (!$update) {
                        $live_update_div = '<div id="live-display"></div>' . "\r\n"
                                . "<script> var profile_uid = " . defaults($_SESSION, 'uid', 0) . ";"
@@ -491,6 +496,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
        } elseif ($mode === 'community') {
                $items = conversation_add_children($items, true, $order, $uid);
                $profile_owner = 0;
+
                if (!$update) {
                        $live_update_div = '<div id="live-community"></div>' . "\r\n"
                                . "<script> var profile_uid = -1; var netargs = '" . substr($a->cmd, 10)
@@ -522,7 +528,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
 
        $page_template = get_markup_template("conversation.tpl");
 
-       if ($items && count($items)) {
+       if (!empty($items)) {
                if ($mode === 'community') {
                        $writable = true;
                } else {
@@ -578,7 +584,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        $profile_name = $item['author-link'];
                                }
 
-                               $tags = \Friendica\Model\Term::populateTagsFromItem($item);
+                               $tags = Term::populateTagsFromItem($item);
 
                                $author = ['uid' => 0, 'id' => $item['author-id'],
                                        'network' => $item['author-network'], 'url' => $item['author-link']];
@@ -644,7 +650,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'name' => $profile_name_e,
                                        'sparkle' => $sparkle,
                                        'lock' => $lock,
-                                       'thumb' => System::removedBaseUrl(proxy_url($item['author-avatar'], false, PROXY_SIZE_THUMB)),
+                                       'thumb' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['author-avatar'], false, ProxyUtils::SIZE_THUMB)),
                                        'title' => $title_e,
                                        'body' => $body_e,
                                        'tags' => $tags_e,
@@ -663,7 +669,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                                        'indent' => '',
                                        'owner_name' => $owner_name_e,
                                        'owner_url' => $owner_url,
-                                       'owner_photo' => System::removedBaseUrl(proxy_url($item['owner-avatar'], false, PROXY_SIZE_THUMB)),
+                                       'owner_photo' => System::removedBaseUrl(ProxyUtils::proxifyUrl($item['owner-avatar'], false, ProxyUtils::SIZE_THUMB)),
                                        'plink' => get_plink($item),
                                        'edpost' => false,
                                        'isstarred' => $isstarred,
@@ -827,8 +833,8 @@ function item_photo_menu($item) {
        $network = '';
        $rel = 0;
        $condition = ['uid' => local_user(), 'nurl' => normalise_link($item['author-link'])];
-       $contact = dba::selectFirst('contact', ['id', 'network', 'rel'], $condition);
-       if (DBM::is_result($contact)) {
+       $contact = DBA::selectFirst('contact', ['id', 'network', 'rel'], $condition);
+       if (DBA::isResult($contact)) {
                $cid = $contact['id'];
                $network = $contact['network'];
                $rel = $contact['rel'];
@@ -865,7 +871,7 @@ function item_photo_menu($item) {
                        $menu[L10n::t("Poke")] = $poke_link;
                }
 
-               if ((($cid == 0) || ($rel == CONTACT_IS_FOLLOWER)) &&
+               if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
                        in_array($item['network'], [NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA])) {
                        $menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
                }