Merge develop into 0602_contact_profile

diff --cc mod/contacts.php
index 77176f6ca65fea803262ff76ab4edc70fe9611ad,cef8bdb8978671ddac5cb1548ee799bcb49dc60a..a2287382a4c61d3726b5e62b7bc2c5d30d73e1ba
--- 1/mod/contacts.php
--- 2/mod/contacts.php
+++ b/mod/contacts.php
@@@ -959,81 -974,5 +981,81 @@@ function _contact_detail_for_template($
                'url' => $url,
                'network' => network_to_name($rr['network'], $rr['url']),
        );
- 
+ }
  }
 +
 +/**
 + * @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 actions related actions
 + */
 +function contact_actions($contact) {
 +
 +      $poll_enabled = in_array($contact['network'], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_FEED, NETWORK_MAIL, NETWORK_MAIL2));
 +      $contact_action = array();
 +
 +      if($contact['network'] === NETWORK_DFRN) {
 +              $contact_actions['suggest'] = array(
 +                                                      'label' => t('Suggest friends'),
 +                                                      'url'   => app::get_baseurl(true) . '/fsuggest/' . $contact['id'],
 +                                                      'title' => '',
 +                                                      'sel'   => '',
 +                                                      'id'    =>  'suggest',
 +                                      );
 +      }
 +
 +      if($poll_enabled) {
 +              $contact_actions['update'] = array(
 +                                                      'label' => t('Update now'),
 +                                                      'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/update',
 +                                                      'title' => '',
 +                                                      'sel'   => '',
 +                                                      'id'    => 'update',
 +                                      );
 +      }
 +
 +      $contact_actions['repair'] = array(
 +                                              'label' => t('Repair'),
 +                                              'url'   => app::get_baseurl(true) . '/crepair/' . $contact['id'],
 +                                              'title' => t('Advanced Contact Settings'),
 +                                              'sel'   => '',
 +                                              'id'    => 'repair',
 +                              );
 +
 +      $contact_actions['block'] = array(
 +                                              'label' => (intval($contact['blocked']) ? t('Unblock') : t('Block') ),
 +                                              'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/block',
 +                                              'title' => t('Toggle Blocked status'),
 +                                              'sel'   => (intval($contact['blocked']) ? 'active' : ''),
 +                                              'id'    => 'toggle-block',
 +                              );
 +
 +      $contact_actions['ignore'] = array(
 +                                              'label' => (intval($contact['readonly']) ? t('Unignore') : t('Ignore') ),
 +                                              'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/ignore',
 +                                              'title' => t('Toggle Ignored status'),
 +                                              'sel'   => (intval($contact['readonly']) ? 'active' : ''),
 +                                              'id'    => 'toggle-ignore',
 +                              );
 +
 +      $contact_actions['archive'] = array(
 +                                              'label' => (intval($contact['archive']) ? t('Unarchive') : t('Archive') ),
 +                                              'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/archive',
 +                                              'title' => t('Toggle Archive status'),
 +                                              'sel'   => (intval($contact['archive']) ? 'active' : ''),
 +                                              'id'    => 'toggle-archive',
 +                              );
 +
 +      $contact_actions['delete'] = array(
 +                                              'label' => t('Delete'),
 +                                              'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/drop', 
 +                                              'title' => t('Delete contact'),
 +                                              'sel'   => '',
 +                                              'id'    => 'delete',
 +                              );
 +
 +      return $contact_actions;
 +}