X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FContact.php;h=d12f003c2e2a24e05e235022fc0754a758d57c63;hb=5e60fa8210b502797209de770780d6d7ba81b86c;hp=fb0bf0edeeab4341cd84b67a0a74c8ba88104264;hpb=9c9ebfc7c97016881d9ad2bb3c3b54a5640d2f08;p=friendica.git diff --git a/src/Module/Contact.php b/src/Module/Contact.php index fb0bf0edee..d12f003c2e 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -6,12 +6,14 @@ use Friendica\App; use Friendica\BaseModule; use Friendica\Content\ContactSelector; use Friendica\Content\Nav; +use Friendica\Content\Pager; use Friendica\Content\Text\BBCode; use Friendica\Content\Widget; use Friendica\Core\ACL; use Friendica\Core\Addon; use Friendica\Core\L10n; use Friendica\Core\Protocol; +use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Core\Worker; use Friendica\Database\DBA; @@ -20,6 +22,7 @@ use Friendica\Module\Login; use Friendica\Network\Probe; use Friendica\Util\DateTimeFormat; use Friendica\Util\Proxy as ProxyUtils; +use Friendica\Util\Strings; /** * Manages and show Contacts and their content @@ -37,11 +40,8 @@ class Contact extends BaseModule } $nets = defaults($_GET, 'nets', ''); - if ($nets == 'all') { - $nets = ''; - } - if (!x($a->page, 'aside')) { + if (empty($a->page['aside'])) { $a->page['aside'] = ''; } @@ -75,14 +75,14 @@ class Contact extends BaseModule $a->data['contact'] = $contact; if (($contact['network'] != '') && ($contact['network'] != Protocol::DFRN)) { - $networkname = format_network_name($contact['network'], $contact['url']); + $networkname = Strings::formatNetworkName($contact['network'], $contact['url']); } else { $networkname = ''; } /// @TODO Add nice spaces - $vcard_widget = replace_macros(get_markup_template('vcard-widget.tpl'), [ - '$name' => htmlentities($contact['name']), + $vcard_widget = Renderer::replaceMacros(Renderer::getMarkupTemplate('vcard-widget.tpl'), [ + '$name' => $contact['name'], '$photo' => $contact['photo'], '$url' => Model\Contact::MagicLink($contact['url']), '$addr' => defaults($contact, 'addr', ''), @@ -112,7 +112,7 @@ class Contact extends BaseModule $groups_widget = null; } - $a->page['aside'] .= replace_macros(get_markup_template('contacts-widget-sidebar.tpl'), [ + $a->page['aside'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contacts-widget-sidebar.tpl'), [ '$vcard_widget' => $vcard_widget, '$findpeople_widget' => $findpeople_widget, '$follow_widget' => $follow_widget, @@ -121,8 +121,8 @@ class Contact extends BaseModule ]); $base = $a->getBaseURL(); - $tpl = get_markup_template('contacts-head.tpl'); - $a->page['htmlhead'] .= replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('contacts-head.tpl'); + $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [ '$baseurl' => System::baseUrl(true), '$base' => $base ]); @@ -136,7 +136,7 @@ class Contact extends BaseModule $contacts_id = $_POST['contact_batch']; - $stmt = DBA::select('contact', ['id'], ['id' => $contacts_id, 'uid' => local_user(), 'self' => false]); + $stmt = DBA::select('contact', ['id', 'archive'], ['id' => $contacts_id, 'uid' => local_user(), 'self' => false]); $orig_records = DBA::toArray($stmt); $count_actions = 0; @@ -211,14 +211,14 @@ class Contact extends BaseModule $fetch_further_information = intval(defaults($_POST, 'fetch_further_information', 0)); - $ffi_keyword_blacklist = escape_tags(trim(defaults($_POST, 'ffi_keyword_blacklist', ''))); + $ffi_keyword_blacklist = Strings::escapeHtml(trim(defaults($_POST, 'ffi_keyword_blacklist', ''))); $priority = intval(defaults($_POST, 'poll', 0)); if ($priority > 5 || $priority < 0) { $priority = 0; } - $info = escape_tags(trim($_POST['info'])); + $info = Strings::escapeHtml(trim(defaults($_POST, 'info', ''))); $r = DBA::update('contact', [ 'profile-id' => $profile_id, @@ -301,7 +301,7 @@ class Contact extends BaseModule } } - $fields['nurl'] = normalise_link($data['url']); + $fields['nurl'] = Strings::normaliseLink($data['url']); if (!empty($data['priority'])) { $fields['priority'] = intval($data['priority']); @@ -334,7 +334,7 @@ class Contact extends BaseModule private static function archiveContact($contact_id, $orig_record) { - $archived = (($orig_record['archive']) ? 0 : 1); + $archived = (defaults($orig_record, 'archive', '') ? 0 : 1); $r = DBA::update('contact', ['archive' => $archived], ['id' => $contact_id, 'uid' => local_user()]); return DBA::isResult($r); @@ -437,7 +437,7 @@ class Contact extends BaseModule $a->page['aside'] = ''; - return replace_macros(get_markup_template('contact_drop_confirm.tpl'), [ + return Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_drop_confirm.tpl'), [ '$header' => L10n::t('Drop contact'), '$contact' => self::getContactTemplateVars($orig_record), '$method' => 'get', @@ -474,7 +474,7 @@ class Contact extends BaseModule $contact_id = $a->data['contact']['id']; $contact = $a->data['contact']; - $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), [ + $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('contact_head.tpl'), [ '$baseurl' => $a->getBaseURL(true), ]); @@ -567,12 +567,12 @@ class Contact extends BaseModule /// @todo Only show the following link with DFRN when the remote version supports it $follow = ''; $follow_text = ''; - if (in_array($contact['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) { + if ($contact['uid'] && in_array($contact['rel'], [Model\Contact::FRIEND, Model\Contact::SHARING])) { if (in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { $follow = $a->getBaseURL(true) . '/unfollow?url=' . urlencode($contact['url']); $follow_text = L10n::t('Disconnect/Unfollow'); } - } else { + } elseif(!$contact['pending']) { $follow = $a->getBaseURL(true) . '/follow?url=' . urlencode($contact['url']); $follow_text = L10n::t('Connect/Follow'); } @@ -590,8 +590,8 @@ class Contact extends BaseModule $contact_settings_label = null; } - $tpl = get_markup_template('contact_edit.tpl'); - $o .= replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('contact_edit.tpl'); + $o .= Renderer::replaceMacros($tpl, [ '$header' => L10n::t('Contact'), '$tab_str' => $tab_str, '$submit' => L10n::t('Submit'), @@ -599,7 +599,7 @@ class Contact extends BaseModule '$lbl_vis2' => L10n::t('Please choose the profile you would like to display to %s when viewing your profile securely.', $contact['name']), '$lbl_info1' => $lbl_info1, '$lbl_info2' => L10n::t('Their personal note'), - '$reason' => trim(notags($contact['reason'])), + '$reason' => trim(Strings::escapeTags($contact['reason'])), '$infedit' => L10n::t('Edit contact notes'), '$common_link' => 'common/loc/' . local_user() . '/' . $contact['id'], '$relation_text' => $relation_text, @@ -636,7 +636,7 @@ class Contact extends BaseModule '$ffi_keyword_blacklist' => $contact['ffi_keyword_blacklist'], '$ffi_keyword_blacklist' => ['ffi_keyword_blacklist', L10n::t('Blacklisted keywords'), $contact['ffi_keyword_blacklist'], L10n::t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')], '$photo' => $contact['photo'], - '$name' => htmlentities($contact['name']), + '$name' => $contact['name'], '$dir_icon' => $dir_icon, '$sparkle' => $sparkle, '$url' => $url, @@ -692,8 +692,8 @@ class Contact extends BaseModule $sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM); - $search = notags(trim(defaults($_GET, 'search', ''))); - $nets = notags(trim(defaults($_GET, 'nets' , ''))); + $search = Strings::escapeTags(trim(defaults($_GET, 'search', ''))); + $nets = Strings::escapeTags(trim(defaults($_GET, 'nets' , ''))); $tabs = [ [ @@ -752,10 +752,18 @@ class Contact extends BaseModule 'id' => 'showhidden-tab', 'accesskey' => 'h', ], + [ + 'label' => L10n::t('Groups'), + 'url' => 'group', + 'sel' => ($hidden) ? 'active' : '', + 'title' => L10n::t('Organize your contact groups'), + 'id' => 'contactgroups-tab', + 'accesskey' => 'e', + ], ]; - $tab_tpl = get_markup_template('common_tabs.tpl'); - $t = replace_macros($tab_tpl, ['$tabs' => $tabs]); + $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); + $t = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]); $total = 0; $searching = false; @@ -763,7 +771,7 @@ class Contact extends BaseModule if ($search) { $searching = true; $search_hdr = $search; - $search_txt = DBA::escape(protect_sprintf(preg_quote($search))); + $search_txt = DBA::escape(Strings::protectSprintf(preg_quote($search))); $sql_extra .= " AND (name REGEXP '$search_txt' OR url REGEXP '$search_txt' OR nick REGEXP '$search_txt') "; } @@ -778,9 +786,9 @@ class Contact extends BaseModule intval($_SESSION['uid']) ); if (DBA::isResult($r)) { - $a->setPagerTotal($r[0]['total']); $total = $r[0]['total']; } + $pager = new Pager($a->query_string); $sql_extra3 = Widget::unavailableNetworks(); @@ -788,8 +796,8 @@ class Contact extends BaseModule $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 $sql_extra3 ORDER BY `name` ASC LIMIT %d , %d ", intval($_SESSION['uid']), - intval($a->pager['start']), - intval($a->pager['itemspage']) + $pager->getStart(), + $pager->getItemsPerPage() ); if (DBA::isResult($r)) { foreach ($r as $rr) { @@ -799,8 +807,8 @@ class Contact extends BaseModule } } - $tpl = get_markup_template('contacts-template.tpl'); - $o .= replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('contacts-template.tpl'); + $o .= Renderer::replaceMacros($tpl, [ '$baseurl' => System::baseUrl(), '$header' => L10n::t('Contacts') . (($nets) ? ' - ' . ContactSelector::networkToName($nets) : ''), '$tabs' => $t, @@ -821,7 +829,7 @@ class Contact extends BaseModule 'contacts_batch_drop' => L10n::t('Delete'), ], '$h_batch_actions' => L10n::t('Batch Actions'), - '$paginate' => paginate($a), + '$paginate' => $pager->renderFull($total), ]); return $o; @@ -902,8 +910,8 @@ class Contact extends BaseModule ]; } - $tab_tpl = get_markup_template('common_tabs.tpl'); - $tab_str = replace_macros($tab_tpl, ['$tabs' => $tabs]); + $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); + $tab_str = Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]); return $tab_str; } @@ -1022,14 +1030,14 @@ class Contact extends BaseModule 'alt_text' => $alt_text, 'dir_icon' => $dir_icon, 'thumb' => ProxyUtils::proxifyUrl($rr['thumb'], false, ProxyUtils::SIZE_THUMB), - 'name' => htmlentities($rr['name']), - 'username' => htmlentities($rr['name']), + 'name' => $rr['name'], + 'username' => $rr['name'], 'account_type' => Model\Contact::getAccountType($rr), 'sparkle' => $sparkle, 'itemurl' => defaults($rr, 'addr', $rr['url']), 'url' => $url, 'network' => ContactSelector::networkToName($rr['network'], $rr['url']), - 'nick' => htmlentities($rr['nick']), + 'nick' => $rr['nick'], ]; }