Ops, one more left ...

[friendica.git] / mod / common.php

diff --git a/mod/common.php b/mod/common.php
index 9521b61af63d627f8306d710b12670389e25a465..5955b514362ed962f69932cdb98a636e96844703 100644 (file)
--- a/mod/common.php
+++ b/mod/common.php
@@ -1,14 +1,18 @@
 <?php
-
 /**
  * @file include/common.php
  */
+
 use Friendica\App;
 use Friendica\Content\ContactSelector;
-use Friendica\Database\DBM;
+use Friendica\Core\L10n;
+use Friendica\Database\DBA;
 use Friendica\Model\Contact;
 use Friendica\Model\GContact;
+use Friendica\Model\Profile;
+use Friendica\Util\Proxy as ProxyUtils;
 
+require_once 'include/dba.php';
 require_once 'mod/contacts.php';
 
 function common_content(App $a)
@@ -21,7 +25,7 @@ function common_content(App $a)
        $zcid = 0;
 
        if (!local_user()) {
-               notice(t('Permission denied.') . EOL);
+               notice(L10n::t('Permission denied.') . EOL);
                return;
        }
 
@@ -34,41 +38,40 @@ function common_content(App $a)
        }
 
        if ($cmd === 'loc' && $cid) {
-               $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($cid),
-                       intval($uid)
-               );
-               /// @TODO Handle $c with DBM::is_result()
-               $a->page['aside'] = "";
-               profile_load($a, "", 0, Contact::getDetailsByURL($c[0]["url"]));
+               $contact = DBA::selectFirst('contact', ['name', 'url', 'photo'], ['id' => $cid, 'uid' => $uid]);
+
+               if (DBA::isResult($contact)) {
+                       $a->page['aside'] = "";
+                       Profile::load($a, "", 0, Contact::getDetailsByURL($contact["url"]));
+               }
        } else {
-               $c = q("SELECT `name`, `url`, `photo` FROM `contact` WHERE `self` = 1 AND `uid` = %d LIMIT 1",
-                       intval($uid)
-               );
-               /// @TODO Handle $c with DBM::is_result()
-               $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), array(
-                       '$name' => htmlentities($c[0]['name']),
-                       '$photo' => $c[0]['photo'],
-                       'url' => 'contacts/' . $cid
-               ));
-
-               if (!x($a->page, 'aside')) {
-                       $a->page['aside'] = '';
+               $contact = DBA::selectFirst('contact', ['name', 'url', 'photo'], ['self' => true, 'uid' => $uid]);
+
+               if (DBA::isResult($contact)) {
+                       $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [
+                               '$name' => htmlentities($contact['name']),
+                               '$photo' => $contact['photo'],
+                               'url' => 'contacts/' . $cid
+                       ]);
+
+                       if (!x($a->page, 'aside')) {
+                               $a->page['aside'] = '';
+                       }
+                       $a->page['aside'] .= $vcard_widget;
                }
-               $a->page['aside'] .= $vcard_widget;
        }
 
-       if (!DBM::is_result($c)) {
+       if (!DBA::isResult($contact)) {
                return;
        }
 
-       if (!$cid && get_my_url()) {
-               $contact = dba::selectOne('contact', ['id'], ['nurl' => normalise_link(get_my_url()), 'uid' => $uid]);
-               if (DBM::is_result($contact)) {
+       if (!$cid && Profile::getMyURL()) {
+               $contact = DBA::selectFirst('contact', ['id'], ['nurl' => normalise_link(Profile::getMyURL()), 'uid' => $uid]);
+               if (DBA::isResult($contact)) {
                        $cid = $contact['id'];
                } else {
-                       $gcontact = dba::selectOne('gcontact', ['id'], ['nurl' => normalise_link(get_my_url())]);
-                       if (DBM::is_result($gcontact)) {
+                       $gcontact = DBA::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]);
+                       if (DBA::isResult($gcontact)) {
                                $zcid = $gcontact['id'];
                        }
                }
@@ -87,7 +90,7 @@ function common_content(App $a)
        if ($t > 0) {
                $a->set_pager_total($t);
        } else {
-               notice(t('No contacts in common.') . EOL);
+               notice(L10n::t('No contacts in common.') . EOL);
                return $o;
        }
 
@@ -97,7 +100,7 @@ function common_content(App $a)
                $r = GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']);
        }
 
-       if (!DBM::is_result($r)) {
+       if (!DBA::isResult($r)) {
                return $o;
        }
 
@@ -114,11 +117,11 @@ function common_content(App $a)
 
                $photo_menu = Contact::photoMenu($rr);
 
-               $entry = array(
+               $entry = [
                        'url'          => $rr['url'],
                        'itemurl'      => defaults($contact_details, 'addr', $rr['url']),
                        'name'         => $contact_details['name'],
-                       'thumb'        => proxy_url($contact_details['thumb'], false, PROXY_SIZE_THUMB),
+                       'thumb'        => ProxyUtils::proxifyUrl($contact_details['thumb'], false, ProxyUtils::SIZE_THUMB),
                        'img_hover'    => htmlentities($contact_details['name']),
                        'details'      => $contact_details['location'],
                        'tags'         => $contact_details['keywords'],
@@ -127,7 +130,7 @@ function common_content(App $a)
                        'network'      => ContactSelector::networkToName($contact_details['network'], $contact_details['url']),
                        'photo_menu'   => $photo_menu,
                        'id'           => ++$id,
-               );
+               ];
                $entries[] = $entry;
        }
 
@@ -136,17 +139,17 @@ function common_content(App $a)
        if ($cmd === 'loc' && $cid && local_user() == $uid) {
                $tab_str = contacts_tab($a, $cid, 4);
        } else {
-               $title = t('Common Friends');
+               $title = L10n::t('Common Friends');
        }
 
        $tpl = get_markup_template('viewcontact_template.tpl');
 
-       $o .= replace_macros($tpl, array(
+       $o .= replace_macros($tpl, [
                '$title'    => $title,
                '$tab_str'  => $tab_str,
                '$contacts' => $entries,
                '$paginate' => paginate($a),
-       ));
+       ]);
 
        return $o;
 }