X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcontacts.php;h=c58dc0fc4f0fdffa059cececf6ee9213ff3a6acc;hb=0b5f7da270bcaa679cb684dbbbbe40781f0b49c6;hp=35be8e79e3f21efaad3494b98f569a0baf6c68eb;hpb=b65247a251bff7ec75b34e5c4aacf89c99490d0d;p=friendica.git diff --git a/mod/contacts.php b/mod/contacts.php index 35be8e79e3..c58dc0fc4f 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -1,16 +1,19 @@ page,'aside')) { @@ -61,22 +64,22 @@ function contacts_init(App $a) { '$account_type' => Contact::getAccountType($a->data['contact']) )); - $finpeople_widget = ''; + $findpeople_widget = ''; $follow_widget = ''; $networks_widget = ''; } else { $vcard_widget = ''; - $networks_widget .= networks_widget('contacts',$_GET['nets']); + $networks_widget = networks_widget('contacts', $nets); if (isset($_GET['add'])) { $follow_widget = follow_widget($_GET['add']); } else { $follow_widget = follow_widget(); } - $findpeople_widget .= findpeople_widget(); + $findpeople_widget = findpeople_widget(); } - $groups_widget .= group_side('contacts','group','full',0,$contact_id); + $groups_widget = Group::sidebarWidget('contacts','group','full',0,$contact_id); $a->page['aside'] .= replace_macros(get_markup_template("contacts-widget-sidebar.tpl"),array( '$vcard_widget' => $vcard_widget, @@ -309,10 +312,10 @@ function _contact_update_profile($contact_id) { ); // Update the entry in the contact table - update_contact_avatar($data['photo'], local_user(), $contact_id, true); + Contact::updateAvatar($data['photo'], local_user(), $contact_id, true); // Update the entry in the gcontact table - GlobalContact::updateFromProbe($data["url"]); + GContact::updateFromProbe($data["url"]); } function _contact_block($contact_id, $orig_record) { @@ -513,8 +516,6 @@ function contacts_content(App $a) { require_once 'include/contact_selectors.php'; - $tpl = get_markup_template("contact_edit.tpl"); - switch($contact['rel']) { case CONTACT_IS_FRIEND: $dir_icon = 'images/lrarrow.gif'; @@ -558,7 +559,7 @@ function contacts_content(App $a) { } $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)); + $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL)); $nettype = sprintf( t('Network type: %s'),network_to_name($contact['network'], $contact["url"])); @@ -575,6 +576,7 @@ function contacts_content(App $a) { $lost_contact = (($contact['archive'] && $contact['term-date'] > NULL_DATE && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : ''); + $fetch_further_information = null; if ($contact['network'] == NETWORK_FEED) { $fetch_further_information = array('fetch_further_information', t('Fetch further information for feeds'), @@ -585,12 +587,19 @@ function contacts_content(App $a) { '3' => t('Fetch keywords'), '2' => t('Fetch information and keywords'))); } - if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2))) + + $poll_interval = null; + if (in_array($contact['network'], array(NETWORK_FEED, NETWORK_MAIL))) { $poll_interval = contact_poll_interval($contact['priority'],(! $poll_enabled)); + } - if ($contact['network'] == NETWORK_DFRN) + $profile_select = null; + if ($contact['network'] == NETWORK_DFRN) { $profile_select = contact_profile_assign($contact['profile-id'],(($contact['network'] !== NETWORK_DFRN) ? true : false)); + } + $follow = ''; + $follow_text = ''; if (in_array($contact['network'], array(NETWORK_DIASPORA, NETWORK_OSTATUS))) { if ($contact['rel'] == CONTACT_IS_FOLLOWER) { $follow = System::baseUrl(true)."/follow?url=".urlencode($contact["url"]); @@ -604,7 +613,7 @@ function contacts_content(App $a) { // Load contactact related actions like hide, suggest, delete and others $contact_actions = contact_actions($contact); - + $tpl = get_markup_template("contact_edit.tpl"); $o .= replace_macros($tpl, array( //'$header' => t('Contact Editor'), '$header' => t("Contact"), @@ -616,9 +625,7 @@ function contacts_content(App $a) { '$lbl_info2' => t('Their personal note'), '$reason' => trim(notags($contact['reason'])), '$infedit' => t('Edit contact notes'), - '$common_text' => $common_text, '$common_link' => 'common/loc/' . local_user() . '/' . $contact['id'], - '$all_friends' => $all_friends, '$relation_text' => $relation_text, '$visit' => sprintf( t('Visit %s\'s profile [%s]'),$contact['name'],$contact['url']), '$blockunblock' => t('Block/Unblock contact'), @@ -656,7 +663,6 @@ function contacts_content(App $a) { '$photo' => $contact['photo'], '$name' => htmlentities($contact['name']), '$dir_icon' => $dir_icon, - '$alt_text' => $alt_text, '$sparkle' => $sparkle, '$url' => $url, '$profileurllabel' => t('Profile URL'), @@ -686,36 +692,33 @@ function contacts_content(App $a) { } - $blocked = false; - $hidden = false; - $ignored = false; - $all = false; + $blocked = false; + $hidden = false; + $ignored = false; + $archived = false; + $all = false; if(($a->argc == 2) && ($a->argv[1] === 'all')) { $sql_extra = ''; $all = true; - } - elseif(($a->argc == 2) && ($a->argv[1] === 'blocked')) { + } elseif(($a->argc == 2) && ($a->argv[1] === 'blocked')) { $sql_extra = " AND `blocked` = 1 "; $blocked = true; - } - elseif(($a->argc == 2) && ($a->argv[1] === 'hidden')) { + } elseif(($a->argc == 2) && ($a->argv[1] === 'hidden')) { $sql_extra = " AND `hidden` = 1 "; $hidden = true; - } - elseif(($a->argc == 2) && ($a->argv[1] === 'ignored')) { + } elseif(($a->argc == 2) && ($a->argv[1] === 'ignored')) { $sql_extra = " AND `readonly` = 1 "; $ignored = true; - } - elseif(($a->argc == 2) && ($a->argv[1] === 'archived')) { + } elseif(($a->argc == 2) && ($a->argv[1] === 'archived')) { $sql_extra = " AND `archive` = 1 "; $archived = true; - } - else + } else { $sql_extra = " AND `blocked` = 0 "; + } - $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : ''); - $nets = ((x($_GET,'nets')) ? notags(trim($_GET['nets'])) : ''); + $search = x($_GET, 'search') ? notags(trim($_GET['search'])) : ''; + $nets = x($_GET, 'nets') ? notags(trim($_GET['nets'])) : ''; $tabs = array( array( @@ -784,25 +787,25 @@ function contacts_content(App $a) { $tab_tpl = get_markup_template('common_tabs.tpl'); $t = replace_macros($tab_tpl, array('$tabs'=>$tabs)); - - $searching = false; - if($search) { + $search_hdr = null; + if ($search) { $search_hdr = $search; $search_txt = dbesc(protect_sprintf(preg_quote($search))); $searching = true; } $sql_extra .= (($searching) ? " AND (name REGEXP '$search_txt' OR url REGEXP '$search_txt' OR nick REGEXP '$search_txt') " : ""); - if($nets) + if ($nets) { $sql_extra .= sprintf(" AND network = '%s' ", dbesc($nets)); + } $sql_extra2 = ((($sort_type > 0) && ($sort_type <= CONTACT_IS_FRIEND)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : ''); - $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ", - intval($_SESSION['uid'])); + intval($_SESSION['uid']) + ); if (DBM::is_result($r)) { $a->set_pager_total($r[0]['total']); $total = $r[0]['total']; @@ -832,7 +835,7 @@ function contacts_content(App $a) { '$total' => $total, '$search' => $search_hdr, '$desc' => t('Search your contacts'), - '$finding' => (($searching) ? sprintf(t('Results for: %s'),$search) : ""), + '$finding' => $searching ? t('Results for: %s', $search) : "", '$submit' => t('Find'), '$cmd' => $a->cmd, '$contacts' => $contacts, @@ -847,7 +850,6 @@ function contacts_content(App $a) { ), '$h_batch_actions' => t('Batch Actions'), '$paginate' => paginate($a), - )); return $o; @@ -886,7 +888,7 @@ function contacts_tab($a, $contact_id, $active_tab) { ); // Show this tab only if there is visible friend list - $x = GlobalContact::countAllFriends(local_user(), $contact_id); + $x = GContact::countAllFriends(local_user(), $contact_id); if ($x) $tabs[] = array('label'=>t('Contacts'), 'url' => "allfriends/".$contact_id, @@ -896,7 +898,7 @@ function contacts_tab($a, $contact_id, $active_tab) { 'accesskey' => 't'); // Show this tab only if there is visible common friend list - $common = GlobalContact::countCommonFriends(local_user(), $contact_id); + $common = GContact::countCommonFriends(local_user(), $contact_id); if ($common) $tabs[] = array('label'=>t('Common Friends'), 'url' => "common/loc/".local_user()."/".$contact_id, @@ -925,12 +927,11 @@ function contact_posts($a, $contact_id) { $contact = $r[0]; $a->page['aside'] = ""; profile_load($a, "", 0, Contact::getDetailsByURL($contact["url"])); - } else - $profile = ""; + } $tab_str = contacts_tab($a, $contact_id, 1); - $o .= $tab_str; + $o = $tab_str; $o .= Contact::getPostsFromUrl($contact["url"]); @@ -993,7 +994,7 @@ function _contact_detail_for_template($rr){ */ function contact_actions($contact) { - $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2)); + $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL)); $contact_action = array(); // Provide friend suggestion only for Friendica contacts