Merge remote-tracking branch 'friendika/master' into newui

[friendica.git] / mod / contacts.php

diff --git a/mod/contacts.php b/mod/contacts.php
index e4be93cd5c13d6b162f58e47a9c632a863f5c8e3..3b2b16acf90345e4d49b113bfff8c10eba7e884d 100644 (file)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -163,9 +163,9 @@ function contacts_content(&$a) {
                if($cmd === 'block') {
                        $blocked = (($orig_record[0]['blocked']) ? 0 : 1);
                        $r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                                       intval($blocked),
-                                       intval($contact_id),
-                                       intval(local_user())
+                               intval($blocked),
+                               intval($contact_id),
+                               intval(local_user())
                        );
                        if($r) {
                                //notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
@@ -178,9 +178,9 @@ function contacts_content(&$a) {
                if($cmd === 'ignore') {
                        $readonly = (($orig_record[0]['readonly']) ? 0 : 1);
                        $r = q("UPDATE `contact` SET `readonly` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                                       intval($readonly),
-                                       intval($contact_id),
-                                       intval(local_user())
+                               intval($readonly),
+                               intval($contact_id),
+                               intval(local_user())
                        );
                        if($r) {
                                info( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL );
@@ -193,7 +193,7 @@ function contacts_content(&$a) {
 
                        // create an unfollow slap
 
-                       if($orig_record[0]['network'] === 'stat') {
+                       if($orig_record[0]['network'] === NETWORK_OSTATUS) {
                                $tpl = get_markup_template('follow_slap.tpl');
                                $slap = replace_macros($tpl, array(
                                        '$name' => $a->user['username'],
@@ -215,13 +215,15 @@ function contacts_content(&$a) {
                                        slapper($a->user,$orig_record[0]['notify'],$slap);
                                }
                        }
-
-                       if($orig_record[0]['network'] === 'dfrn') {
+                       elseif($orig_record[0]['network'] === NETWORK_DIASPORA) {
+                               require_once('include/diaspora.php');
+                               diaspora_unshare($a->user,$orig_record[0]);
+                       }
+                       elseif($orig_record[0]['network'] === NETWORK_DFRN) {
                                require_once('include/items.php');
                                dfrn_deliver($a->user,$orig_record[0],'placeholder', 1);
                        }
 
-
                        contact_remove($orig_record[0]['id']);
                        info( t('Contact has been removed.') . EOL );
                        goaway($a->get_baseurl() . '/contacts');
@@ -290,6 +292,9 @@ function contacts_content(&$a) {
                $lblsuggest = (($r[0]['network'] === NETWORK_DFRN) 
                        ? '<div id="contact-suggest-wrapper"><a href="fsuggest/' . $r[0]['id'] . '" id="contact-suggest">' . t('Suggest friends') . '</a></div>' : '');
 
+               $poll_enabled = (($r[0]['network'] !== NETWORK_DIASPORA) ? true : false);
+
+               $nettype = '<div id="contact-edit-nettype">' . sprintf( t('Network type: %s'),network_to_name($r[0]['network'])) . '</div>';
 
                $o .= replace_macros($tpl,array(
                        '$header' => t('Contact Editor'),
@@ -310,7 +315,9 @@ function contacts_content(&$a) {
                        '$lblsuggest' => $lblsuggest,
                        '$grps' => $grps,
                        '$delete' => t('Delete contact'),
-                       '$poll_interval' => contact_poll_interval($r[0]['priority']),
+                       '$nettype' => $nettype,
+                       '$poll_interval' => contact_poll_interval($r[0]['priority'],(! $poll_enabled)),
+                       '$poll_enabled' => $poll_enabled,
                        '$lastupdtext' => t('Last updated: '),
                        '$updpub' => t('Update public posts: '),
                        '$last_update' => $last_update,
@@ -420,11 +427,12 @@ function contacts_content(&$a) {
                        $o .= replace_macros($tpl, array(
                                '$img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
                                '$edit_hover' => t('Edit contact'),
+                               '$contact_photo_menu' => contact_photo_menu($rr),
                                '$id' => $rr['id'],
                                '$alt_text' => $alt_text,
                                '$dir_icon' => $dir_icon,
                                '$thumb' => $rr['thumb'], 
-                               '$name' => substr($rr['name'],0,20),
+                               '$name' => $rr['name'],
                                '$username' => $rr['name'],
                                '$sparkle' => $sparkle,
                                '$url' => $url