X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=a4caafe8f9cd8b2e4f2e5b7d1f1af11cc7efafed;hb=050ad68b9fc21fc5cf06153d2c6d161d30b241c6;hp=f673f84f1039ed61dc0d32ec4e4679385af4e760;hpb=b958a0702f688cbec70064467dafa1754d04784c;p=friendica.git diff --git a/mod/contacts.php b/mod/contacts.php index f673f84f10..a4caafe8f9 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -1,19 +1,25 @@ page['aside'] = ''; } - $contact = []; + $contact_id = null; + $contact = null; if ((($a->argc == 2) && intval($a->argv[1])) || (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts"))) { $contact_id = intval($a->argv[1]); - $contact = dba::select('contact', [], ['id' => $contact_id, 'uid' => local_user()], ['limit' => 1]); + $contact = dba::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]); } if (DBM::is_result($contact)) { + if ($contact['self']) { + if (($a->argc == 3) && intval($a->argv[1]) && ($a->argv[2] == "posts")) { + goaway('profile/' . $contact['nick']); + } else { + goaway('profile/' . $contact['nick'] . '?tab=profile'); + } + } + $a->data['contact'] = $contact; if (($a->data['contact']['network'] != "") && ($a->data['contact']['network'] != NETWORK_DFRN)) { @@ -47,53 +62,53 @@ function contacts_init(App $a) } /// @TODO Add nice spaces - $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), array( + $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"), [ '$name' => htmlentities($a->data['contact']['name']), '$photo' => $a->data['contact']['photo'], - '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/" . $a->data['contact']['id'] : $a->data['contact']['url'], + '$url' => Contact::MagicLink($a->data['contact']['url']), '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""), '$network_name' => $networkname, - '$network' => t('Network:'), + '$network' => L10n::t('Network:'), '$account_type' => Contact::getAccountType($a->data['contact']) - )); + ]); $findpeople_widget = ''; $follow_widget = ''; $networks_widget = ''; } else { $vcard_widget = ''; - $networks_widget = networks_widget('contacts', $nets); + $networks_widget = Widget::networks('contacts', $nets); if (isset($_GET['add'])) { - $follow_widget = follow_widget($_GET['add']); + $follow_widget = Widget::follow($_GET['add']); } else { - $follow_widget = follow_widget(); + $follow_widget = Widget::follow(); } - $findpeople_widget = findpeople_widget(); + $findpeople_widget = Widget::findPeople(); } - $groups_widget = Group::sidebarWidget('contacts', 'group', 'full', 0, $contact_id); + $groups_widget = Group::sidebarWidget('contacts', 'group', 'full', 'everyone', $contact_id); - $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"), array( + $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"), [ '$vcard_widget' => $vcard_widget, '$findpeople_widget' => $findpeople_widget, '$follow_widget' => $follow_widget, '$groups_widget' => $groups_widget, '$networks_widget' => $networks_widget - )); + ]); $base = System::baseUrl(); $tpl = get_markup_template("contacts-head.tpl"); - $a->page['htmlhead'] .= replace_macros($tpl, array( + $a->page['htmlhead'] .= replace_macros($tpl, [ '$baseurl' => System::baseUrl(true), '$base' => $base - )); + ]); $tpl = get_markup_template("contacts-end.tpl"); - $a->page['end'] .= replace_macros($tpl, array( + $a->page['end'] .= replace_macros($tpl, [ '$baseurl' => System::baseUrl(true), '$base' => $base - )); + ]); } function contacts_batch_actions(App $a) @@ -139,7 +154,7 @@ function contacts_batch_actions(App $a) } } if ($count_actions > 0) { - info(tt("%d contact edited.", "%d contacts edited.", $count_actions)); + info(L10n::tt("%d contact edited.", "%d contacts edited.", $count_actions)); } if (x($_SESSION, 'return_url')) { @@ -165,26 +180,18 @@ function contacts_post(App $a) return; } - $orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($contact_id), - intval(local_user()) - ); - if (!DBM::is_result($orig_record)) { - notice(t('Could not access contact record.') . EOL); + if (!dba::exists('contact', ['id' => $contact_id, 'uid' => local_user()])) { + notice(L10n::t('Could not access contact record.') . EOL); goaway('contacts'); return; // NOTREACHED } - call_hooks('contact_edit_post', $_POST); + Addon::callHooks('contact_edit_post', $_POST); $profile_id = intval($_POST['profile-assign']); if ($profile_id) { - $r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", - intval($profile_id), - intval(local_user()) - ); - if (!DBM::is_result($r)) { - notice(t('Could not locate selected profile.') . EOL); + if (!dba::exists('profile', ['id' => $profile_id, 'uid' => local_user()])) { + notice(L10n::t('Could not locate selected profile.') . EOL); return; } } @@ -218,30 +225,31 @@ function contacts_post(App $a) intval(local_user()) ); if (DBM::is_result($r)) { - info(t('Contact updated.') . EOL); + info(L10n::t('Contact updated.') . EOL); } else { - notice(t('Failed to update contact record.') . EOL); + notice(L10n::t('Failed to update contact record.') . EOL); } - $contact = dba::select('contact', [], ['id' => $contact_id, 'uid' => local_user()], ['limit' => 1]); + $contact = dba::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]); if (DBM::is_result($contact)) { $a->data['contact'] = $contact; } return; } + /* contact actions */ function _contact_update($contact_id) { - $contact = dba::select('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()], ['limit' => 1]); + $contact = dba::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]); if (!DBM::is_result($contact)) { return; } $uid = $contact["uid"]; - if ($r[0]["network"] == NETWORK_OSTATUS) { + if ($contact["network"] == NETWORK_OSTATUS) { $result = Contact::createFromProbe($uid, $contact["url"], false, $contact["network"]); if ($result['success']) { @@ -255,7 +263,7 @@ function _contact_update($contact_id) function _contact_update_profile($contact_id) { - $contact = dba::select('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()], ['limit' => 1]); + $contact = dba::selectFirst('contact', ['uid', 'url', 'network'], ['id' => $contact_id, 'uid' => local_user()]); if (!DBM::is_result($contact)) { return; } @@ -265,13 +273,13 @@ function _contact_update_profile($contact_id) $data = Probe::uri($contact["url"], "", 0, false); // "Feed" or "Unknown" is mostly a sign of communication problems - if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) && ($data["network"] != $contact["network"])) { + if ((in_array($data["network"], [NETWORK_FEED, NETWORK_PHANTOM])) && ($data["network"] != $contact["network"])) { return; } - $updatefields = array("name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm", - "poco", "network", "alias"); - $update = array(); + $updatefields = ["name", "nick", "url", "addr", "batch", "notify", "poll", "request", "confirm", + "poco", "network", "alias"]; + $update = []; if ($data["network"] == NETWORK_OSTATUS) { $result = Contact::createFromProbe($uid, $data["url"], false); @@ -349,9 +357,6 @@ function _contact_archive($contact_id, $orig_record) intval($contact_id), intval(local_user()) ); - if ($archived) { - q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact_id), intval(local_user())); - } return DBM::is_result($r); } @@ -375,10 +380,10 @@ function contacts_content(App $a) { $sort_type = 0; $o = ''; - nav_set_selected('contacts'); + Nav::setSelected('contacts'); if (!local_user()) { - notice(t('Permission denied.') . EOL); + notice(L10n::t('Permission denied.') . EOL); return; } @@ -390,9 +395,9 @@ function contacts_content(App $a) $cmd = $a->argv[2]; - $orig_record = dba::select('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'self' => false], ['limit' => 1]); + $orig_record = dba::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user(), 'self' => false]); if (!DBM::is_result($orig_record)) { - notice(t('Could not access contact record.') . EOL); + notice(L10n::t('Could not access contact record.') . EOL); goaway('contacts'); return; // NOTREACHED } @@ -413,7 +418,7 @@ function contacts_content(App $a) $r = _contact_block($contact_id, $orig_record); if ($r) { $blocked = (($orig_record['blocked']) ? 0 : 1); - info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL); + info((($blocked) ? L10n::t('Contact has been blocked') : L10n::t('Contact has been unblocked')) . EOL); } goaway('contacts/' . $contact_id); @@ -424,7 +429,7 @@ function contacts_content(App $a) $r = _contact_ignore($contact_id, $orig_record); if ($r) { $readonly = (($orig_record['readonly']) ? 0 : 1); - info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL); + info((($readonly) ? L10n::t('Contact has been ignored') : L10n::t('Contact has been unignored')) . EOL); } goaway('contacts/' . $contact_id); @@ -435,7 +440,7 @@ function contacts_content(App $a) $r = _contact_archive($contact_id, $orig_record); if ($r) { $archived = (($orig_record['archive']) ? 0 : 1); - info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')) . EOL); + info((($archived) ? L10n::t('Contact has been archived') : L10n::t('Contact has been unarchived')) . EOL); } goaway('contacts/' . $contact_id); @@ -448,27 +453,27 @@ function contacts_content(App $a) //