Merge pull request #2104 from rabuzarus/2611_contacts_directory

display contact information in contact and directory according to the…

diff --cc include/text.php
Simple merge

diff --cc mod/contacts.php
index 0c0b88a8235f65424d5e97a80706c26b6e2cdf75,83388ed4ed9e68e91b96f1c35d678ea765a94616..992f8ed6b2e43d51aba7db7fcd168131452d518e
--- 1/mod/contacts.php
--- 2/mod/contacts.php
+++ b/mod/contacts.php
@@@ -812,125 -829,10 +812,128 @@@ function contacts_content(&$a) 
        return $o;
  }
  
 +function contact_tabs($a, $contact_id, $active_tab) {
 +      // tabs
 +      $tabs = array(
 +              array(
 +                      'label'=>t('Status'),
 +                      'url' => "contacts/".$contact_id."/posts",
 +                      'sel' => (($active_tab == 1)?'active':''),
 +                      'title' => t('Status Messages and Posts'),
 +                      'id' => 'status-tab',
 +                      'accesskey' => 'm',
 +              ),
 +              array(
 +                      'label'=>t('Profile'),
 +                      'url' => "contacts/".$contact_id,
 +                      'sel' => (($active_tab == 2)?'active':''),
 +                      'title' => t('Profile Details'),
 +                      'id' => 'status-tab',
 +                      'accesskey' => 'r',
 +              ),
 +              array(
 +                      'label' => t('Repair'),
 +                      'url'   => $a->get_baseurl(true) . '/crepair/' . $contact_id,
 +                      'sel' => (($active_tab == 3)?'active':''),
 +                      'title' => t('Advanced Contact Settings'),
 +                      'id'    => 'repair-tab',
 +                      'accesskey' => 'r',
 +              ),
 +              array(
 +                      'label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
 +                      'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
 +                      'sel'   => '',
 +                      'title' => t('Toggle Blocked status'),
 +                      'id'    => 'toggle-block-tab',
 +                      'accesskey' => 'b',
 +              ),
 +              array(
 +                      'label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
 +                      'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
 +                      'sel'   => '',
 +                      'title' => t('Toggle Ignored status'),
 +                      'id'    => 'toggle-ignore-tab',
 +                      'accesskey' => 'i',
 +              ),
 +              array(
 +                      'label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
 +                      'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
 +                      'sel'   => '',
 +                      'title' => t('Toggle Archive status'),
 +                      'id'    => 'toggle-archive-tab',
 +                      'accesskey' => 'v',
 +              )
 +      );
 +      $tab_tpl = get_markup_template('common_tabs.tpl');
 +      $tab_str = replace_macros($tab_tpl, array('$tabs' => $tabs));
 +
 +      return $tab_str;
 +}
 +
 +function contact_posts($a, $contact_id) {
 +
 +      require_once('include/conversation.php');
 +
 +      $r = q("SELECT * FROM `contact` WHERE `id` = %d", intval($contact_id));
 +      if ($r) {
 +              $contact = $r[0];
 +              $a->page['aside'] = "";
 +              profile_load($a, "", 0, get_contact_details_by_url($contact["url"]));
 +      }
 +
 +      if(get_config('system', 'old_pager')) {
 +              $r = q("SELECT COUNT(*) AS `total` FROM `item`
 +                      WHERE `item`.`uid` = %d AND (`author-link` = '%s')",
 +                      intval(local_user()), dbesc($contact["url"]));
 +
 +              $a->set_pager_total($r[0]['total']);
 +      }
 +
 +      $r = q("SELECT `item`.`uri`, `item`.*, `item`.`id` AS `item_id`,
 +                      `author-name` AS `name`, `owner-avatar` AS `photo`,
 +                      `owner-link` AS `url`, `owner-avatar` AS `thumb`
 +              FROM `item` FORCE INDEX (uid_contactid_created)
 +              WHERE `item`.`uid` = %d AND `contact-id` = %d
 +                      AND (`author-link` = '%s')
 +              ORDER BY `item`.`created` DESC LIMIT %d, %d",
 +              intval(local_user()),
 +              intval($contact_id),
 +              dbesc($contact["url"]),
 +              intval($a->pager['start']),
 +              intval($a->pager['itemspage'])
 +      );
 +
 +      $tab_str = contact_tabs($a, $contact_id, 1);
 +
 +      $header = $contact["name"];
 +
 +      if ($contact["addr"] != "")
 +              $header .= " <".$contact["addr"].">";
 +
 +      $header .= " (".network_to_name($contact['network'], $contact['url']).")";
 +
 +      $tpl = get_markup_template("section_title.tpl");
 +      $o = replace_macros($tpl,array(
 +                '$title' => htmlentities($header)
 +        ));
 +
 +      $o .= $tab_str;
 +
 +      $o .= conversation($a,$r,'community',false);
 +
 +      if(!get_config('system', 'old_pager')) {
 +              $o .= alt_pager($a,count($r));
 +      } else {
 +              $o .= paginate($a);
 +      }
 +
 +      return $o;
 +}
 +
  function _contact_detail_for_template($rr){
+ 
+       $community = '';
+ 
        switch($rr['rel']) {
                case CONTACT_IS_FRIEND:
                        $dir_icon = 'images/lrarrow.gif';