X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=mod%2Fcontacts.php;h=aee6548fe6a225e9fccb67b28911e9d4aabdf687;hb=ee11a74d0b7cff5061a4d498f8ecd15e55b91b07;hp=beb1f1ecb82c29f46a7045263e1e264bf1f759af;hpb=eb5e6aae7273fef06a06f983fe78aaad737aa729;p=friendica.git diff --git a/mod/contacts.php b/mod/contacts.php index beb1f1ecb8..aee6548fe6 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -4,18 +4,25 @@ require_once('include/Contact.php'); function contacts_init(&$a) { require_once('include/group.php'); + if(! x($a->page,'aside')) + $a->page['aside'] = ''; $a->page['aside'] .= group_side(); if($a->config['register_policy'] != REGISTER_CLOSED) - $a->page['aside'] .= '
'; + $a->page['aside'] .= ''; + + if(strlen(get_config('system','directory_submit_url'))) + $a->page['aside'] .= ''; $tpl = load_view_file('view/follow.tpl'); $a->page['aside'] .= replace_macros($tpl,array( - '$label' => t('Connect/Follow [profile address]'), + '$label' => t('Connect/Follow'), '$hint' => t('Example: bob@example.com, http://example.com/barbara'), '$follow' => t('Follow') )); + + } function contacts_post(&$a) { @@ -38,6 +45,8 @@ function contacts_post(&$a) { return; // NOTREACHED } + call_hooks('contact_edit_post', $_POST); + $profile_id = intval($_POST['profile-assign']); if($profile_id) { $r = q("SELECT `id` FROM `profile` WHERE `id` = %d AND `uid` = %d LIMIT 1", @@ -49,9 +58,9 @@ function contacts_post(&$a) { return; } } +logger('contact_edit ' . print_r($_POST,true)); - - $priority = intval($_POST['priority']); + $priority = intval($_POST['poll']); if($priority == (-1)) if($priority > 5 || $priority < 0) @@ -63,12 +72,15 @@ function contacts_post(&$a) { $reason = notags(trim($_POST['reason'])); - $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s' + $info = escape_tags(trim($_POST['info'])); + + $r = q("UPDATE `contact` SET `profile-id` = %d, `priority` = %d , `rating` = %d, `reason` = '%s', `info` = '%s' WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($profile_id), intval($priority), intval($rating), dbesc($reason), + dbesc($info), intval($contact_id), intval(local_user()) ); @@ -84,7 +96,12 @@ function contacts_post(&$a) { function contacts_content(&$a) { + $sort_type = 0; + $o = ''; $o .= ''; + + $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd; + if(! local_user()) { notice( t('Permission denied.') . EOL); return; @@ -109,6 +126,13 @@ function contacts_content(&$a) { return; // NOTREACHED } + if($cmd === 'update') { + + // pull feed and consume it, which should subscribe to the hub. + proc_run('php',"include/poller.php","$contact_id"); + goaway($a->get_baseurl() . '/contacts/' . $contact_id); + // NOTREACHED + } if($cmd === 'block') { $blocked = (($orig_record[0]['blocked']) ? 0 : 1); @@ -118,7 +142,8 @@ function contacts_content(&$a) { intval(local_user()) ); if($r) { - notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL ); + //notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL ); + notice( (($blocked) ? t('Contact has been blocked') : t('Contact has been unblocked')) . EOL ); } goaway($a->get_baseurl() . '/contacts/' . $contact_id); return; // NOTREACHED @@ -132,13 +157,45 @@ function contacts_content(&$a) { intval(local_user()) ); if($r) { - notice( t('Contact has been ') . (($readonly) ? t('ignored') : t('unignored')) . EOL ); + notice( (($readonly) ? t('Contact has been ignored') : t('Contact has been unignored')) . EOL ); } goaway($a->get_baseurl() . '/contacts/' . $contact_id); return; // NOTREACHED } if($cmd === 'drop') { + + // create an unfollow slap + + if($orig_record[0]['network'] === 'stat') { + $tpl = load_view_file('view/follow_slap.tpl'); + $slap = replace_macros($tpl, array( + '$name' => $a->user['username'], + '$profile_page' => $a->get_baseurl() . '/profile/' . $a->user['nickname'], + '$photo' => $a->contact['photo'], + '$thumb' => $a->contact['thumb'], + '$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME), + '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . random_string(), + '$title' => '', + '$type' => 'text', + '$content' => t('stopped following'), + '$nick' => $a->user['nickname'], + '$verb' => ACTIVITY_UNFOLLOW, + '$ostat_follow' => '' + . t('Private communications are not available for this contact.') . '