X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommon.php;h=5955b514362ed962f69932cdb98a636e96844703;hb=refs%2Fheads%2Ffixes%2Fe-notice-gcontact;hp=87e305e68d0b9ffc09f5d3914dbc215f73a9cfc7;hpb=8f253f6c1288534c50fac34f05afb1a2c07c9335;p=friendica.git diff --git a/mod/common.php b/mod/common.php index 87e305e68d..5955b51436 100644 --- a/mod/common.php +++ b/mod/common.php @@ -1,14 +1,22 @@ argv[1]; @@ -16,8 +24,8 @@ function common_content(App $a) { $cid = intval($a->argv[3]); $zcid = 0; - if (! local_user()) { - notice( t('Permission denied.') . EOL); + if (!local_user()) { + notice(L10n::t('Permission denied.') . EOL); return; } @@ -25,54 +33,46 @@ function common_content(App $a) { return; } - if (! $uid) { + if (!$uid) { return; } 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, get_contact_details_by_url($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) { - if(get_my_url()) { - $r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1", - dbesc(normalise_link(get_my_url())), - intval($profile_uid) - ); - if (dbm::is_result($r)) - $cid = $r[0]['id']; - else { - $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", - dbesc(normalise_link(get_my_url())) - ); - if (dbm::is_result($r)) - $zcid = $r[0]['id']; + 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::selectFirst('gcontact', ['id'], ['nurl' => normalise_link(Profile::getMyURL())]); + if (DBA::isResult($gcontact)) { + $zcid = $gcontact['id']; } } } @@ -82,75 +82,74 @@ function common_content(App $a) { } if ($cid) { - $t = count_common_friends($uid, $cid); + $t = GContact::countCommonFriends($uid, $cid); } else { - $t = count_common_friends_zcid($uid, $zcid); + $t = GContact::countCommonFriendsZcid($uid, $zcid); } - if (count($t)) { + 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; } - if ($cid) { - $r = common_friends($uid, $cid, $a->pager['start'], $a->pager['itemspage']); + $r = GContact::commonFriends($uid, $cid, $a->pager['start'], $a->pager['itemspage']); } else { - $r = common_friends_zcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']); + $r = GContact::commonFriendsZcid($uid, $zcid, $a->pager['start'], $a->pager['itemspage']); } - - if (! dbm::is_result($r)) { + if (!DBA::isResult($r)) { return $o; } $id = 0; + $entries = []; foreach ($r as $rr) { - //get further details of the contact - $contact_details = get_contact_details_by_url($rr['url'], $uid); + $contact_details = Contact::getDetailsByURL($rr['url'], $uid); // $rr['id'] is needed to use contact_photo_menu() /// @TODO Adding '/" here avoids E_NOTICE on missing constants $rr['id'] = $rr['cid']; - $photo_menu = ''; - $photo_menu = contact_photo_menu($rr); + $photo_menu = Contact::photoMenu($rr); - $entry = array( + $entry = [ 'url' => $rr['url'], - 'itemurl' => (($contact_details['addr'] != "") ? $contact_details['addr'] : $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'], 'about' => $contact_details['about'], - 'account_type' => account_type($contact_details), - 'network' => network_to_name($contact_details['network'], $contact_details['url']), + 'account_type' => Contact::getAccountType($contact_details), + 'network' => ContactSelector::networkToName($contact_details['network'], $contact_details['url']), 'photo_menu' => $photo_menu, 'id' => ++$id, - ); + ]; $entries[] = $entry; } - if ($cmd === 'loc' && $cid && $uid == local_user()) { + $title = ''; + $tab_str = ''; + 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; }