Added response active support to smoothly

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 991b59885c780df5bf568791bb7e453df9800cd5..ba8ad45c39926568deceb9fab40f1e945cefef86 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -237,7 +237,7 @@ function _contact_update($contact_id) {
                                intval($contact_id));
        } else
                // pull feed and consume it, which should subscribe to the hub.
-               proc_run('php',"include/onepoll.php","$contact_id", "force");
+               proc_run(PRIORITY_MEDIUM, "include/onepoll.php", $contact_id, "force");
 }
 
 function _contact_update_profile($contact_id) {
@@ -434,7 +434,8 @@ function contacts_content(&$a) {
                                $a->page['aside'] = '';
 
                                return replace_macros(get_markup_template('contact_drop_confirm.tpl'), array(
-                                       '$contact' =>  _contact_detail_for_template($orig_record[0]),
+                                       '$header' => t('Drop contact'),
+                                       '$contact' => _contact_detail_for_template($orig_record[0]),
                                        '$method' => 'get',
                                        '$message' => t('Do you really want to delete this contact?'),
                                        '$extra_inputs' => $inputs,
@@ -571,6 +572,7 @@ function contacts_content(&$a) {
 
                $o .= replace_macros($tpl, array(
                        //'$header' => t('Contact Editor'),
+                       '$header' => t("Contact"),
                        '$tab_str' => $tab_str,
                        '$submit' => t('Submit'),
                        '$lbl_vis1' => t('Profile Visibility'),
@@ -604,6 +606,7 @@ function contacts_content(&$a) {
                        '$ignore_text' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
                        '$insecure' => (($contact['network'] !== NETWORK_DFRN && $contact['network'] !== NETWORK_MAIL && $contact['network'] !== NETWORK_FACEBOOK && $contact['network'] !== NETWORK_DIASPORA) ? $insecure : ''),
                        '$info' => $contact['info'],
+                       '$cinfo' => array('info', '', $contact['info'], ''),
                        '$blocked' => (($contact['blocked']) ? t('Currently blocked') : ''),
                        '$ignored' => (($contact['readonly']) ? t('Currently ignored') : ''),
                        '$archived' => (($contact['archive']) ? t('Currently archived') : ''),
@@ -620,6 +623,7 @@ function contacts_content(&$a) {
                        '$url' => $url,
                        '$profileurllabel' => t('Profile URL'),
                        '$profileurl' => $contact['url'],
+                       'account_type' => (($contact['forum'] || $contact['prv']) ? t('Forum') : ''),
                        '$location' => bbcode($contact["location"]),
                        '$location_label' => t("Location:"),
                        '$about' => bbcode($contact["about"], false, false),
@@ -630,6 +634,7 @@ function contacts_content(&$a) {
                        '$contact_actions' => $contact_actions,
                        '$contact_status' => t("Status"),
                        '$contact_settings_label' => t('Contact Settings'),
+                       '$contact_profile_label' => t("Profile"),
 
                ));
 
@@ -787,7 +792,7 @@ function contacts_content(&$a) {
                '$total' => $total,
                '$search' => $search_hdr,
                '$desc' => t('Search your contacts'),
-               '$finding' => (($searching) ? t('Finding: ') . "'" . $search . "'" : ""),
+               '$finding' => (($searching) ? sprintf(t('Results for: %s'),$search) : ""),
                '$submit' => t('Find'),
                '$cmd' => $a->cmd,
                '$contacts' => $contacts,
@@ -800,6 +805,7 @@ function contacts_content(&$a) {
                        "contacts_batch_archive" => t('Archive')."/".t("Unarchive"),
                        "contacts_batch_drop" => t('Delete'),
                ),
+               '$h_batch_actions' => t('Batch Actions'),
                '$paginate' => paginate($a),
 
        ));
@@ -970,7 +976,7 @@ function contact_actions($contact) {
        if($contact['network'] === NETWORK_DFRN) {
                $contact_actions['suggest'] = array(
                                                        'label' => t('Suggest friends'),
-                                                       'url'   => app::get_baseurl(true) . '/fsuggest/' . $contact['id'],
+                                                       'url'   => 'fsuggest/' . $contact['id'],
                                                        'title' => '',
                                                        'sel'   => '',
                                                        'id'    =>  'suggest',
@@ -980,7 +986,7 @@ function contact_actions($contact) {
        if($poll_enabled) {
                $contact_actions['update'] = array(
                                                        'label' => t('Update now'),
-                                                       'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/update',
+                                                       'url'   => 'contacts/' . $contact['id'] . '/update',
                                                        'title' => '',
                                                        'sel'   => '',
                                                        'id'    => 'update',
@@ -989,7 +995,7 @@ function contact_actions($contact) {
 
        $contact_actions['block'] = array(
                                                'label' => (intval($contact['blocked']) ? t('Unblock') : t('Block') ),
-                                               'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/block',
+                                               'url'   => 'contacts/' . $contact['id'] . '/block',
                                                'title' => t('Toggle Blocked status'),
                                                'sel'   => (intval($contact['blocked']) ? 'active' : ''),
                                                'id'    => 'toggle-block',
@@ -997,7 +1003,7 @@ function contact_actions($contact) {
 
        $contact_actions['ignore'] = array(
                                                'label' => (intval($contact['readonly']) ? t('Unignore') : t('Ignore') ),
-                                               'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/ignore',
+                                               'url'   => 'contacts/' . $contact['id'] . '/ignore',
                                                'title' => t('Toggle Ignored status'),
                                                'sel'   => (intval($contact['readonly']) ? 'active' : ''),
                                                'id'    => 'toggle-ignore',
@@ -1005,7 +1011,7 @@ function contact_actions($contact) {
 
        $contact_actions['archive'] = array(
                                                'label' => (intval($contact['archive']) ? t('Unarchive') : t('Archive') ),
-                                               'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/archive',
+                                               'url'   => 'contacts/' . $contact['id'] . '/archive',
                                                'title' => t('Toggle Archive status'),
                                                'sel'   => (intval($contact['archive']) ? 'active' : ''),
                                                'id'    => 'toggle-archive',
@@ -1013,7 +1019,7 @@ function contact_actions($contact) {
 
        $contact_actions['delete'] = array(
                                                'label' => t('Delete'),
-                                               'url'   => app::get_baseurl(true) . '/contacts/' . $contact['id'] . '/drop', 
+                                               'url'   => 'contacts/' . $contact['id'] . '/drop', 
                                                'title' => t('Delete contact'),
                                                'sel'   => '',
                                                'id'    => 'delete',