Merge branch 'fixes/poller-warning' into rhaeder-develop

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index f83b1b5daac4e49e44367e55981f7b1d4cb1f1e3..7f758b43c57b38756897038a60b982ea408a02c3 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -44,7 +44,7 @@ function contacts_init(&$a) {
                        $vcard_widget = replace_macros(get_markup_template("vcard-widget.tpl"),array(
                                '$name' => htmlentities($a->data['contact']['name']),
                                '$photo' => $a->data['contact']['photo'],
-                               '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? z_root()."/redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
+                               '$url' => ($a->data['contact']['network'] == NETWORK_DFRN) ? "redir/".$a->data['contact']['id'] : $a->data['contact']['url'],
                                '$addr' => (($a->data['contact']['addr'] != "") ? ($a->data['contact']['addr']) : ""),
                                '$network_name' => $networkname,
                                '$network' => t('Network:'),
@@ -125,13 +125,13 @@ function contacts_batch_actions(&$a){
                }
        }
        if ($count_actions>0) {
-               info ( sprintf( tt("%d contact edited.", "%d contacts edited", $count_actions), $count_actions) );
+               info ( sprintf( tt("%d contact edited.", "%d contacts edited.", $count_actions), $count_actions) );
        }
 
        if(x($_SESSION,'return_url'))
-               goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+               goaway('' . $_SESSION['return_url']);
        else
-               goaway($a->get_baseurl(true) . '/contacts');
+               goaway('contacts');
 
 }
 
@@ -157,7 +157,7 @@ function contacts_post(&$a) {
 
        if(! count($orig_record)) {
                notice( t('Could not access contact record.') . EOL);
-               goaway($a->get_baseurl(true) . '/contacts');
+               goaway('contacts');
                return; // NOTREACHED
        }
 
@@ -293,23 +293,8 @@ function _contact_update_profile($contact_id) {
                intval(local_user())
        );
 
-       $photos = import_profile_photo($data['photo'], local_user(), $contact_id);
-
-       $r = q("UPDATE `contact` SET `photo` = '%s',
-                       `thumb` = '%s',
-                       `micro` = '%s',
-                       `name-date` = '%s',
-                       `uri-date` = '%s',
-                       `avatar-date` = '%s'
-                       WHERE `id` = %d",
-                       dbesc($data["photo"]),
-                       dbesc($photos[1]),
-                       dbesc($photos[2]),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       dbesc(datetime_convert()),
-                       intval($contact_id)
-               );
+       // Update the entry in the contact table
+       update_contact_avatar($data['photo'], local_user(), $contact_id);
 
        // Update the entry in the gcontact table
        update_gcontact_from_probe($data["url"]);
@@ -381,19 +366,19 @@ function contacts_content(&$a) {
 
                if(! count($orig_record)) {
                        notice( t('Could not access contact record.') . EOL);
-                       goaway($a->get_baseurl(true) . '/contacts');
+                       goaway('contacts');
                        return; // NOTREACHED
                }
 
                if($cmd === 'update') {
                        _contact_update($contact_id);
-                       goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+                       goaway('contacts/' . $contact_id);
                        // NOTREACHED
                }
 
                if($cmd === 'updateprofile') {
                        _contact_update_profile($contact_id);
-                       goaway($a->get_baseurl(true) . '/crepair/' . $contact_id);
+                       goaway('crepair/' . $contact_id);
                        // NOTREACHED
                }
 
@@ -404,7 +389,7 @@ function contacts_content(&$a) {
                                info((($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')).EOL);
                        }
 
-                       goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+                       goaway('contacts/' . $contact_id);
                        return; // NOTREACHED
                }
 
@@ -415,7 +400,7 @@ function contacts_content(&$a) {
                                info((($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')).EOL);
                        }
 
-                       goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+                       goaway('contacts/' . $contact_id);
                        return; // NOTREACHED
                }
 
@@ -427,7 +412,7 @@ function contacts_content(&$a) {
                                info((($archived) ? t('Contact has been archived') : t('Contact has been unarchived')).EOL);
                        }
 
-                       goaway($a->get_baseurl(true) . '/contacts/' . $contact_id);
+                       goaway('contacts/' . $contact_id);
                        return; // NOTREACHED
                }
 
@@ -462,17 +447,17 @@ function contacts_content(&$a) {
                        // Now check how the user responded to the confirmation query
                        if($_REQUEST['canceled']) {
                                if(x($_SESSION,'return_url'))
-                                       goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+                                       goaway('' . $_SESSION['return_url']);
                                else
-                                       goaway($a->get_baseurl(true) . '/contacts');
+                                       goaway('contacts');
                        }
 
                        _contact_drop($contact_id, $orig_record[0]);
                        info( t('Contact has been removed.') . EOL );
                        if(x($_SESSION,'return_url'))
-                               goaway($a->get_baseurl(true) . '/' . $_SESSION['return_url']);
+                               goaway('' . $_SESSION['return_url']);
                        else
-                               goaway($a->get_baseurl(true) . '/contacts');
+                               goaway('contacts');
                        return; // NOTREACHED
                }
                if($cmd === 'posts') {
@@ -590,7 +575,7 @@ function contacts_content(&$a) {
                        '$lbl_info1' => t('Contact Information / Notes'),
                        '$infedit' => t('Edit contact notes'),
                        '$common_text' => $common_text,
-                       '$common_link' => $a->get_baseurl(true) . '/common/loc/' . local_user() . '/' . $contact['id'],
+                       '$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']),
@@ -683,7 +668,7 @@ function contacts_content(&$a) {
        $tabs = array(
                array(
                        'label' => t('Suggestions'),
-                       'url'   => $a->get_baseurl(true) . '/suggest',
+                       'url'   => 'suggest',
                        'sel'   => '',
                        'title' => t('Suggest potential friends'),
                        'id'    => 'suggestions-tab',
@@ -691,7 +676,7 @@ function contacts_content(&$a) {
                ),
                array(
                        'label' => t('All Contacts'),
-                       'url'   => $a->get_baseurl(true) . '/contacts/all',
+                       'url'   => 'contacts/all',
                        'sel'   => ($all) ? 'active' : '',
                        'title' => t('Show all contacts'),
                        'id'    => 'showall-tab',
@@ -699,7 +684,7 @@ function contacts_content(&$a) {
                ),
                array(
                        'label' => t('Unblocked'),
-                       'url'   => $a->get_baseurl(true) . '/contacts',
+                       'url'   => 'contacts',
                        'sel'   => ((! $all) && (! $blocked) && (! $hidden) && (! $search) && (! $nets) && (! $ignored) && (! $archived)) ? 'active' : '',
                        'title' => t('Only show unblocked contacts'),
                        'id'    => 'showunblocked-tab',
@@ -708,7 +693,7 @@ function contacts_content(&$a) {
 
                array(
                        'label' => t('Blocked'),
-                       'url'   => $a->get_baseurl(true) . '/contacts/blocked',
+                       'url'   => 'contacts/blocked',
                        'sel'   => ($blocked) ? 'active' : '',
                        'title' => t('Only show blocked contacts'),
                        'id'    => 'showblocked-tab',
@@ -717,7 +702,7 @@ function contacts_content(&$a) {
 
                array(
                        'label' => t('Ignored'),
-                       'url'   => $a->get_baseurl(true) . '/contacts/ignored',
+                       'url'   => 'contacts/ignored',
                        'sel'   => ($ignored) ? 'active' : '',
                        'title' => t('Only show ignored contacts'),
                        'id'    => 'showignored-tab',
@@ -726,7 +711,7 @@ function contacts_content(&$a) {
 
                array(
                        'label' => t('Archived'),
-                       'url'   => $a->get_baseurl(true) . '/contacts/archived',
+                       'url'   => 'contacts/archived',
                        'sel'   => ($archived) ? 'active' : '',
                        'title' => t('Only show archived contacts'),
                        'id'    => 'showarchived-tab',
@@ -735,7 +720,7 @@ function contacts_content(&$a) {
 
                array(
                        'label' => t('Hidden'),
-                       'url'   => $a->get_baseurl(true) . '/contacts/hidden',
+                       'url'   => 'contacts/hidden',
                        'sel'   => ($hidden) ? 'active' : '',
                        'title' => t('Only show hidden contacts'),
                        'id'    => 'showhidden-tab',
@@ -855,7 +840,7 @@ function contacts_tab($a, $contact_id, $active_tab) {
                                'accesskey' => 'd');
 
        $tabs[] = array('label' => t('Repair'),
-                       'url'   => $a->get_baseurl(true) . '/crepair/' . $contact_id,
+                       'url'   => 'crepair/' . $contact_id,
                        'sel' => (($active_tab == 5)?'active':''),
                        'title' => t('Advanced Contact Settings'),
                        'id'    => 'repair-tab',
@@ -863,21 +848,21 @@ function contacts_tab($a, $contact_id, $active_tab) {
 
 
        $tabs[] = array('label' => (($contact['blocked']) ? t('Unblock') : t('Block') ),
-                       'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/block',
+                       'url'   => 'contacts/' . $contact_id . '/block',
                        'sel'   => '',
                        'title' => t('Toggle Blocked status'),
                        'id'    => 'toggle-block-tab',
                        'accesskey' => 'b');
 
        $tabs[] = array('label' => (($contact['readonly']) ? t('Unignore') : t('Ignore') ),
-                       'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/ignore',
+                       'url'   => 'contacts/' . $contact_id . '/ignore',
                        'sel'   => '',
                        'title' => t('Toggle Ignored status'),
                        'id'    => 'toggle-ignore-tab',
                        'accesskey' => 'i');
 
        $tabs[] = array('label' => (($contact['archive']) ? t('Unarchive') : t('Archive') ),
-                       'url'   => $a->get_baseurl(true) . '/contacts/' . $contact_id . '/archive',
+                       'url'   => 'contacts/' . $contact_id . '/archive',
                        'sel'   => '',
                        'title' => t('Toggle Archive status'),
                        'id'    => 'toggle-archive-tab',
@@ -903,7 +888,10 @@ function contact_posts($a, $contact_id) {
 
        $o .= $tab_str;
 
-       if ($contact["url"]) {
+       $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"])));