Cleanup for #3010 - added spaces, thanks to @annando .

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index 4eb435fc7550697abf23d6c4543140b08e31a616..735ccec727e191599d53282ec2558c4d88afb37b 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -19,7 +19,7 @@ function contacts_init(&$a) {
                        intval(local_user()),
                        intval($contact_id)
                );
-               if(! count($r)) {
+               if(! dbm::is_result($r)) {
                        $contact_id = 0;
                }
        }
@@ -38,7 +38,7 @@ function contacts_init(&$a) {
 
                        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 
+                       } else
                                $networkname = '';
 
                        $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
@@ -48,7 +48,7 @@ function contacts_init(&$a) {
                                '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
                                '$network_name' => $networkname,
                                '$network' => t('Network:'),
-                               'account_type' => (($a->data['contact']['forum'] || $a->data['contact']['prv']) ? t('Forum') : '')
+                               '$account_type' => account_type($a->data['contact'])
                        ));
                        $finpeople_widget = '';
                        $follow_widget = '';
@@ -169,7 +169,7 @@ function contacts_post(&$a) {
                        intval($profile_id),
                        intval(local_user())
                );
-               if(! count($r)) {
+               if(! dbm::is_result($r)) {
                        notice( t('Could not locate selected profile.') . EOL);
                        return;
                }
@@ -211,7 +211,7 @@ function contacts_post(&$a) {
                intval($contact_id),
                intval(local_user())
        );
-       if($r && count($r))
+       if($r && dbm::is_result($r))
                $a->data['contact'] = $r[0];
 
        return;
@@ -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_HIGH, "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,8 +623,11 @@ function contacts_content(&$a) {
                        '$url' => $url,
                        '$profileurllabel' => t('Profile URL'),
                        '$profileurl' => $contact['url'],
+                       '$account_type' => account_type($contact),
                        '$location' => bbcode($contact["location"]),
                        '$location_label' => t("Location:"),
+                       '$xmpp' => bbcode($contact["xmpp"]),
+                       '$xmpp_label' => t("XMPP:"),
                        '$about' => bbcode($contact["about"], false, false),
                        '$about_label' => t("About:"),
                        '$keywords' => $contact["keywords"],
@@ -630,6 +636,7 @@ function contacts_content(&$a) {
                        '$contact_actions' => $contact_actions,
                        '$contact_status' => t("Status"),
                        '$contact_settings_label' => t('Contact Settings'),
+                       '$contact_profile_label' => t("Profile"),
 
                ));
 
@@ -758,7 +765,7 @@ function contacts_content(&$a) {
        $r = q("SELECT COUNT(*) AS `total` FROM `contact`
                WHERE `uid` = %d AND `self` = 0 AND `pending` = 0 $sql_extra $sql_extra2 ",
                intval($_SESSION['uid']));
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                $a->set_pager_total($r[0]['total']);
                $total = $r[0]['total'];
        }
@@ -773,8 +780,8 @@ function contacts_content(&$a) {
 
        $contacts = array();
 
-       if(count($r)) {
-               foreach($r as $rr) {
+       if (dbm::is_result($r)) {
+               foreach ($r as $rr) {
                        $contacts[] = _contact_detail_for_template($rr);
                }
        }
@@ -887,24 +894,13 @@ function contact_posts($a, $contact_id) {
 
        $o .= $tab_str;
 
-       $r = q("SELECT `id` FROM `item` WHERE `contact-id` = %d LIMIT 1", intval($contact_id));
-       if ($r)
-               $o .= posts_from_contact($a, $contact_id);
-       elseif ($contact["url"]) {
-               $r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-                       dbesc(normalise_link($contact["url"])));
-
-               if ($r[0]["id"] <> 0)
-                       $o .= posts_from_gcontact($a, $r[0]["id"]);
-       }
+       $o .= posts_from_contact_url($a, $contact["url"]);
 
        return $o;
 }
 
 function _contact_detail_for_template($rr){
 
-       $community = '';
-
        switch($rr['rel']) {
                case CONTACT_IS_FRIEND:
                        $dir_icon = 'images/lrarrow.gif';
@@ -930,11 +926,6 @@ function _contact_detail_for_template($rr){
                $sparkle = '';
        }
 
-       //test if contact is a forum page
-       if (isset($rr['forum']) OR isset($rr['prv']))
-                               $community = ($rr['forum'] OR $rr['prv']);
-
-
        return array(
                'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
                'edit_hover' => t('Edit contact'),
@@ -945,7 +936,7 @@ function _contact_detail_for_template($rr){
                'thumb' => proxy_url($rr['thumb'], false, PROXY_SIZE_THUMB),
                'name' => htmlentities($rr['name']),
                'username' => htmlentities($rr['name']),
-               'account_type' => ($community ? t('Forum') : ''),
+               'account_type' => account_type($rr),
                'sparkle' => $sparkle,
                'itemurl' => (($rr['addr'] != "") ? $rr['addr'] : $rr['url']),
                'url' => $url,