X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=21a4f7446aca19c319a328012f5626222649a816;hb=696404739bdd3db8eae4255c2d622de8a45df18d;hp=26dfe0607837afc4b58f1305b8688e5d3972d11e;hpb=d2280d4120ca09ff5f3013e961a1f43bb5244cc6;p=friendica.git diff --git a/mod/contacts.php b/mod/contacts.php index 26dfe06078..21a4f7446a 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -1,13 +1,16 @@ data['contact'] = $r[0]; + $a->data['contact'] = $r[0]; - if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) { - $networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']); - } else { - $networkname = ''; - } + if (($a->data['contact']['network'] != "") AND ($a->data['contact']['network'] != NETWORK_DFRN)) { + $networkname = format_network_name($a->data['contact']['network'],$a->data['contact']['url']); + } else { + $networkname = ''; + } - $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array( - '$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'], - '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""), - '$network_name' => $networkname, - '$network' => t('Network:'), - '$account_type' => account_type($a->data['contact']) - )); - $finpeople_widget = ''; - $follow_widget = ''; - $networks_widget = ''; - } - else { + /// @TODO Add nice spaces + $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array( + '$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'], + '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""), + '$network_name' => $networkname, + '$network' => t('Network:'), + '$account_type' => account_type($a->data['contact']) + )); + + $finpeople_widget = ''; + $follow_widget = ''; + $networks_widget = ''; + } else { $vcard_widget = ''; $networks_widget .= networks_widget('contacts',$_GET['nets']); - if (isset($_GET['add'])) + if (isset($_GET['add'])) { $follow_widget = follow_widget($_GET['add']); - else + } else { $follow_widget = follow_widget(); + } $findpeople_widget .= findpeople_widget(); } @@ -95,7 +100,7 @@ function contacts_init(App &$a) { } -function contacts_batch_actions(App &$a){ +function contacts_batch_actions(App $a) { $contacts_id = $_POST['contact_batch']; if (!is_array($contacts_id)) return; @@ -142,7 +147,7 @@ function contacts_batch_actions(App &$a){ } -function contacts_post(App &$a) { +function contacts_post(App $a) { if (! local_user()) { return; @@ -189,13 +194,13 @@ function contacts_post(App &$a) { $fetch_further_information = intval($_POST['fetch_further_information']); - $ffi_keyword_blacklist = fix_mce_lf(escape_tags(trim($_POST['ffi_keyword_blacklist']))); + $ffi_keyword_blacklist = escape_tags(trim($_POST['ffi_keyword_blacklist'])); $priority = intval($_POST['poll']); if($priority > 5 || $priority < 0) $priority = 0; - $info = fix_mce_lf(escape_tags(trim($_POST['info']))); + $info = escape_tags(trim($_POST['info'])); $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `info` = '%s', `hidden` = %d, `notify_new_posts` = %d, `fetch_further_information` = %d, @@ -258,7 +263,7 @@ function _contact_update_profile($contact_id) { if ($uid != local_user()) return; - $data = probe_url($r[0]["url"]); + $data = Probe::uri($r[0]["url"], "", 0, false); // "Feed" or "Unknown" is mostly a sign of communication problems if ((in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM))) AND ($data["network"] != $r[0]["network"])) @@ -347,7 +352,7 @@ function _contact_drop($contact_id, $orig_record) { } -function contacts_content(App &$a) { +function contacts_content(App $a) { $sort_type = 0; $o = ''; @@ -487,20 +492,14 @@ function contacts_content(App &$a) { $contact_id = $a->data['contact']['id']; $contact = $a->data['contact']; - $editselect = 'none'; - if( feature_enabled(local_user(),'richtext') ) - $editselect = 'exact'; - $a->page['htmlhead'] .= replace_macros(get_markup_template('contact_head.tpl'), array( '$baseurl' => App::get_baseurl(true), - '$editselect' => $editselect, )); $a->page['end'] .= replace_macros(get_markup_template('contact_end.tpl'), array( '$baseurl' => App::get_baseurl(true), - '$editselect' => $editselect, )); - require_once('include/contact_selectors.php'); + require_once 'include/contact_selectors.php'; $tpl = get_markup_template("contact_edit.tpl"); @@ -538,13 +537,13 @@ function contacts_content(App &$a) { $insecure = t('Private communications are not available for this contact.'); - $last_update = (($contact['last-update'] == '0000-00-00 00:00:00') + $last_update = (($contact['last-update'] <= NULL_DATE) ? t('Never') : datetime_convert('UTC',date_default_timezone_get(),$contact['last-update'],'D, j M Y, g:i A')); - if($contact['last-update'] !== '0000-00-00 00:00:00') + if ($contact['last-update'] > NULL_DATE) { $last_update .= ' ' . (($contact['last-update'] <= $contact['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29")); - + } $lblsuggest = (($contact['network'] === NETWORK_DFRN) ? t('Suggest friends') : ''); $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2)); @@ -562,12 +561,12 @@ function contacts_content(App &$a) { // tabs $tab_str = contacts_tab($a, $contact_id, 2); - $lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : ''); + $lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : ''); - if ($contact['network'] == NETWORK_FEED) + if ($contact['network'] == NETWORK_FEED) { $fetch_further_information = array('fetch_further_information', t('Fetch further information for feeds'), $contact['fetch_further_information'], t('Fetch further information for feeds'), array('0'=>t('Disabled'), '1'=>t('Fetch information'), '2'=>t('Fetch information and keywords'))); - + } if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2))) $poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled)); @@ -829,13 +828,13 @@ function contacts_content(App &$a) { /** * @brief List of pages for the Contact TabBar - * + * * Available Pages are 'Status', 'Profile', 'Contacts' and 'Common Friends' - * - * @param app $a + * + * @param App $a * @param int $contact_id The ID of the contact * @param int $active_tab 1 if tab should be marked as active - * + * * @return array with with contact TabBar data */ function contacts_tab($a, $contact_id, $active_tab) { @@ -959,9 +958,9 @@ function _contact_detail_for_template($rr){ /** * @brief Gives a array with actions which can performed to a given contact - * + * * This includes actions like e.g. 'block', 'hide', 'archive', 'delete' and others - * + * * @param array $contact Data about the Contact * @return array with contact related actions */ @@ -1017,7 +1016,7 @@ function contact_actions($contact) { $contact_actions['delete'] = array( 'label' => t('Delete'), - 'url' => 'contacts/' . $contact['id'] . '/drop', + 'url' => 'contacts/' . $contact['id'] . '/drop', 'title' => t('Delete contact'), 'sel' => '', 'id' => 'delete',