X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=029330b7ab8fe97e9936ab7a78b585f963cd3521;hb=7e33c1072a4a948941e2522afe0123899b0abddd;hp=6541c1c0af0042bfaef271ffecbf12436da57ebb;hpb=d5a13b1e4c0f35445aa539ff6b3779062907a9cb;p=friendica.git diff --git a/mod/contacts.php b/mod/contacts.php index 6541c1c0af..029330b7ab 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -4,10 +4,20 @@ 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'] .= '
'; + + $tpl = load_view_file('view/follow.tpl'); + $a->page['aside'] .= replace_macros($tpl,array( + '$label' => t('Connect/Follow'), + '$hint' => t('Example: bob@example.com, http://example.com/barbara'), + '$follow' => t('Follow') + )); + } function contacts_post(&$a) { @@ -21,7 +31,7 @@ function contacts_post(&$a) { $orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($contact_id), - intval(get_uid()) + intval(local_user()) ); if(! count($orig_record)) { @@ -30,18 +40,24 @@ 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", intval($profile_id), - intval(get_uid()) + intval(local_user()) ); if(! count($r)) { notice( t('Could not locate selected profile.') . EOL); return; } } - $priority = intval($_POST['priority']); +logger('contact_edit ' . print_r($_POST,true)); + + $priority = intval($_POST['poll']); + if($priority == (-1)) + if($priority > 5 || $priority < 0) $priority = 0; @@ -51,14 +67,17 @@ 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(get_uid()) + intval(local_user()) ); if($r) notice( t('Contact updated.') . EOL); @@ -72,7 +91,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; @@ -88,7 +112,7 @@ function contacts_content(&$a) { $orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($contact_id), - intval(get_uid()) + intval(local_user()) ); if(! count($orig_record)) { @@ -97,36 +121,76 @@ function contacts_content(&$a) { return; // NOTREACHED } + if($cmd === 'update') { - if($cmd == 'block') { + // 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); $r = q("UPDATE `contact` SET `blocked` = %d WHERE `id` = %d AND `uid` = %d LIMIT 1", intval($blocked), intval($contact_id), - intval(get_uid()) + 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 } - if($cmd == 'ignore') { + 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(get_uid()) + 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') { + 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' => '