bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Update formatting of Module\Contact

Browse source 
- Replace double quotes with single
- Align array declarations
- Replace q() call with Model\User::getOwnerDataById()
This commit is contained in:
Hypolite Petovan 2018-10-14 18:30:02 -04:00
parent a883a99fe6
commit aa8039373a
1 changed files with 150 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

143
src/Module/Contact.php
View file

@ -37,8 +37,8 @@ class Contact extends BaseModule
} }
$nets = defaults($_GET, 'nets', ''); $nets = defaults($_GET, 'nets', '');
if ($nets == "all") { if ($nets == 'all') {
$nets = ""; $nets = '';
} }
if (!x($a->page, 'aside')) { if (!x($a->page, 'aside')) {
@ -47,7 +47,9 @@ class Contact extends BaseModule
$contact_id = null; $contact_id = null;
$contact = null; $contact = null;
if ((($a->argc == 2) && intval($a->argv[1])) || (($a->argc == 3) && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations']))) { if ($a->argc == 2 && intval($a->argv[1])
|| $a->argc == 3 && intval($a->argv[1]) && in_array($a->argv[2], ['posts', 'conversations'])
) {
$contact_id = intval($a->argv[1]); $contact_id = intval($a->argv[1]);
$contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]); $contact = DBA::selectFirst('contact', [], ['id' => $contact_id, 'uid' => local_user()]);
@ -110,7 +112,7 @@ class Contact extends BaseModule
$groups_widget = null; $groups_widget = null;
} }
$a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"), [ $a->page['aside'] .= replace_macros(get_markup_template('contacts-widget-sidebar.tpl'), [
'$vcard_widget' => $vcard_widget, '$vcard_widget' => $vcard_widget,
'$findpeople_widget' => $findpeople_widget, '$findpeople_widget' => $findpeople_widget,
'$follow_widget' => $follow_widget, '$follow_widget' => $follow_widget,
@ -119,7 +121,7 @@ class Contact extends BaseModule
]); ]);
$base = $a->getBaseURL(); $base = $a->getBaseURL();
$tpl = get_markup_template("contacts-head.tpl"); $tpl = get_markup_template('contacts-head.tpl');
$a->page['htmlhead'] .= replace_macros($tpl, [ $a->page['htmlhead'] .= replace_macros($tpl, [
'$baseurl' => System::baseUrl(true), '$baseurl' => System::baseUrl(true),
'$base' => $base '$base' => $base
@ -163,7 +165,7 @@ class Contact extends BaseModule
} }
} }
if ($count_actions > 0) { if ($count_actions > 0) {
info(L10n::tt("%d contact edited.", "%d contacts edited.", $count_actions)); info(L10n::tt('%d contact edited.', '%d contacts edited.', $count_actions));
} }
goaway('contact'); goaway('contact');
@ -177,7 +179,7 @@ class Contact extends BaseModule
return; return;
} }
if ($a->argv[1] === "batch") { if ($a->argv[1] === 'batch') {
self::batchActions($a); self::batchActions($a);
return; return;
} }
@ -218,15 +220,16 @@ class Contact extends BaseModule
$info = escape_tags(trim($_POST['info'])); $info = escape_tags(trim($_POST['info']));
$r = DBA::update('contact', $r = DBA::update('contact', [
['profile-id' => $profile_id, 'profile-id' => $profile_id,
'priority' => $priority, 'priority' => $priority,
'info' => $info, 'info' => $info,
'hidden' => $hidden, 'hidden' => $hidden,
'notify_new_posts' => $notify, 'notify_new_posts' => $notify,
'fetch_further_information' => $fetch_further_information, 'fetch_further_information' => $fetch_further_information,
'ffi_keyword_blacklist' => $ffi_keyword_blacklist], 'ffi_keyword_blacklist' => $ffi_keyword_blacklist],
['id' => $contact_id, 'uid' => local_user()]); ['id' => $contact_id, 'uid' => local_user()]
);
if (DBA::isResult($r)) { if (DBA::isResult($r)) {
info(L10n::t('Contact updated.') . EOL); info(L10n::t('Contact updated.') . EOL);
@ -251,17 +254,17 @@ class Contact extends BaseModule
return; return;
} }
$uid = $contact["uid"]; $uid = $contact['uid'];
if ($contact["network"] == Protocol::OSTATUS) { if ($contact['network'] == Protocol::OSTATUS) {
$result = Model\Contact::createFromProbe($uid, $contact["url"], false, $contact["network"]); $result = Model\Contact::createFromProbe($uid, $contact['url'], false, $contact['network']);
if ($result['success']) { if ($result['success']) {
DBA::update('contact', ['subhub' => 1], ['id' => $contact_id]); DBA::update('contact', ['subhub' => 1], ['id' => $contact_id]);
} }
} else { } else {
// pull feed and consume it, which should subscribe to the hub. // pull feed and consume it, which should subscribe to the hub.
Worker::add(PRIORITY_HIGH, "OnePoll", $contact_id, "force"); Worker::add(PRIORITY_HIGH, 'OnePoll', $contact_id, 'force');
} }
} }
@ -272,12 +275,12 @@ class Contact extends BaseModule
return; return;
} }
$uid = $contact["uid"]; $uid = $contact['uid'];
$data = Probe::uri($contact["url"], "", 0, false); $data = Probe::uri($contact['url'], '', 0, false);
// "Feed" or "Unknown" is mostly a sign of communication problems // 'Feed' or 'Unknown' is mostly a sign of communication problems
if ((in_array($data["network"], [Protocol::FEED, Protocol::PHANTOM])) && ($data["network"] != $contact["network"])) { if ((in_array($data['network'], [Protocol::FEED, Protocol::PHANTOM])) && ($data['network'] != $contact['network'])) {
return; return;
} }
@ -314,7 +317,7 @@ class Contact extends BaseModule
Model\Contact::updateAvatar($data['photo'], local_user(), $contact_id, true); Model\Contact::updateAvatar($data['photo'], local_user(), $contact_id, true);
// Update the entry in the gcontact table // Update the entry in the gcontact table
Model\GContact::updateFromProbe($data["url"]); Model\GContact::updateFromProbe($data['url']);
} }
private static function blockContact($contact_id) private static function blockContact($contact_id)
@ -339,17 +342,12 @@ class Contact extends BaseModule
private static function dropContact($orig_record) private static function dropContact($orig_record)
{ {
$a = get_app(); $owner = Model\User::getOwnerDataById(local_user());
if (!DBA::isResult($owner)) {
$r = q("SELECT `contact`.*, `user`.* FROM `contact` INNER JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `user`.`uid` = %d AND `contact`.`self` LIMIT 1",
intval($a->user['uid'])
);
if (!DBA::isResult($r)) {
return; return;
} }
Model\Contact::terminateFriendship($r[0], $orig_record, true); Model\Contact::terminateFriendship($owner, $orig_record, true);
Model\Contact::remove($orig_record['id']); Model\Contact::remove($orig_record['id']);
} }
@ -510,7 +508,7 @@ class Contact extends BaseModule
} }
if (!in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) { if (!in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
$relation_text = ""; $relation_text = '';
} }
$relation_text = sprintf($relation_text, htmlentities($contact['name'])); $relation_text = sprintf($relation_text, htmlentities($contact['name']));
@ -527,13 +525,13 @@ class Contact extends BaseModule
$last_update = (($contact['last-update'] <= NULL_DATE) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A')); $last_update = (($contact['last-update'] <= NULL_DATE) ? L10n::t('Never') : DateTimeFormat::local($contact['last-update'], 'D, j M Y, g:i A'));
if ($contact['last-update'] > NULL_DATE) { if ($contact['last-update'] > NULL_DATE) {
$last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? L10n::t("\x28Update was successful\x29") : L10n::t("\x28Update was not successful\x29")); $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? L10n::t('(Update was successful)') : L10n::t('(Update was not successful)'));
} }
$lblsuggest = (($contact['network'] === Protocol::DFRN) ? L10n::t('Suggest friends') : ''); $lblsuggest = (($contact['network'] === Protocol::DFRN) ? L10n::t('Suggest friends') : '');
$poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]); $poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
$nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact["url"])); $nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact['url']));
// tabs // tabs
$tab_str = self::getTabsHTML($a, $contact, 3); $tab_str = self::getTabsHTML($a, $contact, 3);
@ -546,8 +544,9 @@ class Contact extends BaseModule
'fetch_further_information', 'fetch_further_information',
L10n::t('Fetch further information for feeds'), L10n::t('Fetch further information for feeds'),
$contact['fetch_further_information'], $contact['fetch_further_information'],
L10n::t("Fetch information like preview pictures, title and teaser from the feed item. You can activate this if the feed doesn't contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags."), L10n::t('Fetch information like preview pictures, title and teaser from the feed item. You can activate this if the feed doesn\'t contain much text. Keywords are taken from the meta header in the feed item and are posted as hash tags.'),
['0' => L10n::t('Disabled'), [
'0' => L10n::t('Disabled'),
'1' => L10n::t('Fetch information'), '1' => L10n::t('Fetch information'),
'3' => L10n::t('Fetch keywords'), '3' => L10n::t('Fetch keywords'),
'2' => L10n::t('Fetch information and keywords') '2' => L10n::t('Fetch information and keywords')
@ -557,12 +556,12 @@ class Contact extends BaseModule
$poll_interval = null; $poll_interval = null;
if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) { if (in_array($contact['network'], [Protocol::FEED, Protocol::MAIL])) {
$poll_interval = ContactSelector::pollInterval($contact['priority'], (!$poll_enabled)); $poll_interval = ContactSelector::pollInterval($contact['priority'], !$poll_enabled);
} }
$profile_select = null; $profile_select = null;
if ($contact['network'] == Protocol::DFRN) { if ($contact['network'] == Protocol::DFRN) {
$profile_select = ContactSelector::profileAssign($contact['profile-id'], (($contact['network'] !== Protocol::DFRN) ? true : false)); $profile_select = ContactSelector::profileAssign($contact['profile-id'], $contact['network'] !== Protocol::DFRN);
} }
/// @todo Only show the following link with DFRN when the remote version supports it /// @todo Only show the following link with DFRN when the remote version supports it
@ -570,12 +569,12 @@ class Contact extends BaseModule
$follow_text = ''; $follow_text = '';
if (in_array($contact['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) { if (in_array($contact['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) {
if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
$follow = $a->getBaseURL(true) . "/unfollow?url=" . urlencode($contact["url"]); $follow = $a->getBaseURL(true) . '/unfollow?url=' . urlencode($contact['url']);
$follow_text = L10n::t("Disconnect/Unfollow"); $follow_text = L10n::t('Disconnect/Unfollow');
} }
} else { } else {
$follow = $a->getBaseURL(true) . "/follow?url=" . urlencode($contact["url"]); $follow = $a->getBaseURL(true) . '/follow?url=' . urlencode($contact['url']);
$follow_text = L10n::t("Connect/Follow"); $follow_text = L10n::t('Connect/Follow');
} }
// Load contactact related actions like hide, suggest, delete and others // Load contactact related actions like hide, suggest, delete and others
@ -591,9 +590,9 @@ class Contact extends BaseModule
$contact_settings_label = null; $contact_settings_label = null;
} }
$tpl = get_markup_template("contact_edit.tpl"); $tpl = get_markup_template('contact_edit.tpl');
$o .= replace_macros($tpl, [ $o .= replace_macros($tpl, [
'$header' => L10n::t("Contact"), '$header' => L10n::t('Contact'),
'$tab_str' => $tab_str, '$tab_str' => $tab_str,
'$submit' => L10n::t('Submit'), '$submit' => L10n::t('Submit'),
'$lbl_vis1' => $lbl_vis1, '$lbl_vis1' => $lbl_vis1,
@ -607,7 +606,7 @@ class Contact extends BaseModule
'$visit' => L10n::t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']), '$visit' => L10n::t('Visit %s\'s profile [%s]', $contact['name'], $contact['url']),
'$blockunblock' => L10n::t('Block/Unblock contact'), '$blockunblock' => L10n::t('Block/Unblock contact'),
'$ignorecont' => L10n::t('Ignore contact'), '$ignorecont' => L10n::t('Ignore contact'),
'$lblcrepair' => L10n::t("Repair URL settings"), '$lblcrepair' => L10n::t('Repair URL settings'),
'$lblrecent' => L10n::t('View conversations'), '$lblrecent' => L10n::t('View conversations'),
'$lblsuggest' => $lblsuggest, '$lblsuggest' => $lblsuggest,
'$nettype' => $nettype, '$nettype' => $nettype,
@ -644,19 +643,19 @@ class Contact extends BaseModule
'$profileurllabel'=> L10n::t('Profile URL'), '$profileurllabel'=> L10n::t('Profile URL'),
'$profileurl' => $contact['url'], '$profileurl' => $contact['url'],
'$account_type' => Model\Contact::getAccountType($contact), '$account_type' => Model\Contact::getAccountType($contact),
'$location' => BBCode::convert($contact["location"]), '$location' => BBCode::convert($contact['location']),
'$location_label' => L10n::t("Location:"), '$location_label' => L10n::t('Location:'),
'$xmpp' => BBCode::convert($contact["xmpp"]), '$xmpp' => BBCode::convert($contact['xmpp']),
'$xmpp_label' => L10n::t("XMPP:"), '$xmpp_label' => L10n::t('XMPP:'),
'$about' => BBCode::convert($contact["about"], false), '$about' => BBCode::convert($contact['about'], false),
'$about_label' => L10n::t("About:"), '$about_label' => L10n::t('About:'),
'$keywords' => $contact["keywords"], '$keywords' => $contact['keywords'],
'$keywords_label' => L10n::t("Tags:"), '$keywords_label' => L10n::t('Tags:'),
'$contact_action_button' => L10n::t("Actions"), '$contact_action_button' => L10n::t('Actions'),
'$contact_actions'=> $contact_actions, '$contact_actions'=> $contact_actions,
'$contact_status' => L10n::t("Status"), '$contact_status' => L10n::t('Status'),
'$contact_settings_label' => $contact_settings_label, '$contact_settings_label' => $contact_settings_label,
'$contact_profile_label' => L10n::t("Profile"), '$contact_profile_label' => L10n::t('Profile'),
]); ]);
$arr = ['contact' => $contact, 'output' => $o]; $arr = ['contact' => $contact, 'output' => $o];
@ -800,7 +799,7 @@ class Contact extends BaseModule
} }
} }
$tpl = get_markup_template("contacts-template.tpl"); $tpl = get_markup_template('contacts-template.tpl');
$o .= replace_macros($tpl, [ $o .= replace_macros($tpl, [
'$baseurl' => System::baseUrl(), '$baseurl' => System::baseUrl(),
'$header' => L10n::t('Contacts') . (($nets) ? ' - ' . ContactSelector::networkToName($nets) : ''), '$header' => L10n::t('Contacts') . (($nets) ? ' - ' . ContactSelector::networkToName($nets) : ''),
@ -808,7 +807,7 @@ class Contact extends BaseModule
'$total' => $total, '$total' => $total,
'$search' => $search_hdr, '$search' => $search_hdr,
'$desc' => L10n::t('Search your contacts'), '$desc' => L10n::t('Search your contacts'),
'$finding' => $searching ? L10n::t('Results for: %s', $search) : "", '$finding' => $searching ? L10n::t('Results for: %s', $search) : '',
'$submit' => L10n::t('Find'), '$submit' => L10n::t('Find'),
'$cmd' => $a->cmd, '$cmd' => $a->cmd,
'$contacts' => $contacts, '$contacts' => $contacts,
@ -816,10 +815,10 @@ class Contact extends BaseModule
'multiselect' => 1, 'multiselect' => 1,
'$batch_actions' => [ '$batch_actions' => [
'contacts_batch_update' => L10n::t('Update'), 'contacts_batch_update' => L10n::t('Update'),
'contacts_batch_block' => L10n::t('Block') . "/" . L10n::t("Unblock"), 'contacts_batch_block' => L10n::t('Block') . '/' . L10n::t('Unblock'),
"contacts_batch_ignore" => L10n::t('Ignore') . "/" . L10n::t("Unignore"), 'contacts_batch_ignore' => L10n::t('Ignore') . '/' . L10n::t('Unignore'),
"contacts_batch_archive" => L10n::t('Archive') . "/" . L10n::t("Unarchive"), 'contacts_batch_archive' => L10n::t('Archive') . '/' . L10n::t('Unarchive'),
"contacts_batch_drop" => L10n::t('Delete'), 'contacts_batch_drop' => L10n::t('Delete'),
], ],
'$h_batch_actions' => L10n::t('Batch Actions'), '$h_batch_actions' => L10n::t('Batch Actions'),
'$paginate' => paginate($a), '$paginate' => paginate($a),
@ -938,18 +937,16 @@ class Contact extends BaseModule
} }
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$a->page['aside'] = ""; $a->page['aside'] = '';
$profiledata = Model\Contact::getDetailsByURL($contact["url"]); $profiledata = Model\Contact::getDetailsByURL($contact['url']);
if (local_user()) { if (local_user() && in_array($profiledata['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
if (in_array($profiledata["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) { $profiledata['remoteconnect'] = System::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
$profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
}
} }
Model\Profile::load($a, "", 0, $profiledata, true); Model\Profile::load($a, '', 0, $profiledata, true);
$o .= Model\Contact::getPostsFromUrl($contact["url"], true, $update); $o .= Model\Contact::getPostsFromUrl($contact['url'], true, $update);
} }
return $o; return $o;
@ -962,18 +959,16 @@ class Contact extends BaseModule
$o = self::getTabsHTML($a, $contact, 2); $o = self::getTabsHTML($a, $contact, 2);
if (DBA::isResult($contact)) { if (DBA::isResult($contact)) {
$a->page['aside'] = ""; $a->page['aside'] = '';
$profiledata = Model\Contact::getDetailsByURL($contact["url"]); $profiledata = Model\Contact::getDetailsByURL($contact['url']);
if (local_user()) { if (local_user() && in_array($profiledata['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
if (in_array($profiledata["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) { $profiledata['remoteconnect'] = System::baseUrl() . '/follow?url=' . urlencode($profiledata['url']);
$profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
}
} }
Model\Profile::load($a, "", 0, $profiledata, true); Model\Profile::load($a, '', 0, $profiledata, true);
$o .= Model\Contact::getPostsFromUrl($contact["url"]); $o .= Model\Contact::getPostsFromUrl($contact['url']);
} }
return $o; return $o;