X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=c22bc3c836031ca23afb667bcea19edbd9de4a9c;hb=cde17704ddbbe2b4926824aa2aa7aec7a9ac2dd6;hp=8c244697916c54c0413c978259c72429d9c77cf6;hpb=f5615068ca338153ab7dacf5c9ce46c6ed7b1ab4;p=friendica.git diff --git a/mod/contacts.php b/mod/contacts.php index 8c24469791..c22bc3c836 100644 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -4,10 +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'), + '$hint' => t('Example: bob@example.com, http://example.com/barbara'), + '$follow' => t('Follow') + )); + + + } function contacts_post(&$a) { @@ -21,7 +36,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,24 +45,22 @@ 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; } } +logger('contact_edit ' . print_r($_POST,true)); - $usehub = ((intval($_POST['usehub'])) ? 1 : 0); - if($orig_record[0]['usehub'] && (! $usehub)) { - // remove hub subscription - } - - $priority = intval($_POST['priority']); + $priority = intval($_POST['poll']); if($priority == (-1)) if($priority > 5 || $priority < 0) @@ -59,15 +72,17 @@ function contacts_post(&$a) { $reason = notags(trim($_POST['reason'])); - $r = q("UPDATE `contact` SET `profile-id` = %d, `usehub` = %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($usehub), intval($priority), intval($rating), dbesc($reason), + dbesc($info), intval($contact_id), - intval(get_uid()) + intval(local_user()) ); if($r) notice( t('Contact updated.') . EOL); @@ -81,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; @@ -97,7 +117,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)) { @@ -106,16 +126,24 @@ 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); $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 @@ -126,16 +154,48 @@ function contacts_content(&$a) { $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') { + + // 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' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW, + '$ostat_follow' => '' // 'http://ostatus.org/schema/1.0/unfollow' . "\r\n" + )); + + if((x($orig_record[0],'notify')) && (strlen($orig_record[0]['notify']))) { + require_once('include/salmon.php'); + slapper($a->user,$orig_record[0]['notify'],$slap); + } + } + + if($orig_record[0]['network'] === 'dfrn') { + require_once('include/items.php'); + dfrn_deliver($a->user,$orig_record[0],'placeholder', 1); + } + + contact_remove($contact_id); notice( t('Contact has been removed.') . EOL ); goaway($a->get_baseurl() . '/contacts'); @@ -147,7 +207,7 @@ function contacts_content(&$a) { $contact_id = intval($a->argv[1]); $r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1", - intval(get_uid()), + intval(local_user()), intval($contact_id) ); if(! count($r)) { @@ -155,7 +215,10 @@ function contacts_content(&$a) { return; } - require_once('view/contact_selectors.php'); + $tpl = load_view_file('view/contact_head.tpl'); + $a->page['htmlhead'] .= replace_macros($tpl, array('$baseurl' => $a->get_baseurl())); + + require_once('include/contact_selectors.php'); $tpl = load_view_file("view/contact_edit.tpl"); @@ -177,7 +240,7 @@ function contacts_content(&$a) { break; } - if($r[0]['rel'] != REL_FAN) { + if(($r[0]['network'] === 'dfrn') && ($r[0]['rel'])) { $url = "redir/{$r[0]['id']}"; $sparkle = ' class="sparkle" '; } @@ -186,25 +249,44 @@ function contacts_content(&$a) { $sparkle = ''; } - $huburl = get_config('system','huburl'); - if($huburl) { - // finish selector - $hubenable = ''; - } - else - $hubenable = ''; + $insecure = '

' . t('Privacy Unavailable') . ' ' + . t('Private communications are not available for this contact.') . '

'; + $last_update = (($r[0]['last-update'] == '0000-00-00 00:00:00') + ? t('Never') + : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')); + + if($r[0]['last-update'] !== '0000-00-00 00:00:00') + $last_update .= ' ' . (($r[0]['last-update'] == $r[0]['success_update']) ? t("\x28Update was successful\x29") : t("\x28Update was not successful\x29")); $o .= replace_macros($tpl,array( + '$header' => t('Contact Editor'), + '$submit' => t('Submit'), + '$lbl_vis1' => t('Profile Visibility'), + '$lbl_vis2' => sprintf( t('Please choose the profile you would like to display to %s when viewing your profile securely.'), $r[0]['name']), + '$lbl_info1' => t('Contact Information / Notes'), + '$lbl_rep1' => t('Online Reputation'), + '$lbl_rep2' => t('Occasionally your friends may wish to inquire about this person\'s online legitimacy.'), + '$lbl_rep3' => t('You may help them choose whether or not to interact with this person by providing a reputation to guide them.'), + '$lbl_rep4' => t('Please take a moment to elaborate on this selection if you feel it could be helpful to others.'), + '$visit' => t('Visit $name\'s profile'), + '$blockunblock' => t('Block/Unblock contact'), + '$ignorecont' => t('Ignore contact'), + '$altcrepair' => t('Repair contact URL settings'), + '$lblcrepair' => t("Repair contact URL settings \x28WARNING: Advanced\x29"), + '$lblrecent' => t('View conversations'), + '$delete' => t('Delete contact'), '$poll_interval' => contact_poll_interval($r[0]['priority']), - '$hubenable' => $hubenable, - '$last_update' => (($r[0]['last-update'] == '0000-00-00 00:00:00') - ? t('Never') - : datetime_convert('UTC',date_default_timezone_get(),$r[0]['last-update'],'D, j M Y, g:i A')), - '$profile_select' => contact_profile_assign($r[0]['profile-id']), + '$lastupdtext' => t('Last updated: '), + '$updpub' => t('Update public posts: '), + '$last_update' => $last_update, + '$udnow' => t('Update now'), + '$profile_select' => contact_profile_assign($r[0]['profile-id'],(($r[0]['network'] !== 'dfrn') ? true : false)), '$contact_id' => $r[0]['id'], '$block_text' => (($r[0]['blocked']) ? t('Unblock this contact') : t('Block this contact') ), '$ignore_text' => (($r[0]['readonly']) ? t('Unignore this contact') : t('Ignore this contact') ), + '$insecure' => (($r[0]['network'] !== NETWORK_DFRN && $r[0]['network'] !== NETWORK_MAIL && $r[0]['network'] !== NETWORK_FACEBOOK) ? $insecure : ''), + '$info' => $r[0]['info'], '$blocked' => (($r[0]['blocked']) ? '
' . t('Currently blocked') . '
' : ''), '$ignored' => (($r[0]['readonly']) ? '
' . t('Currently ignored') . '
' : ''), '$rating' => contact_reputation($r[0]['rating']), @@ -219,7 +301,11 @@ function contacts_content(&$a) { )); - return $o; + $arr = array('contact' => $r[0],'output' => $o); + + call_hooks('contact_edit', $arr); + + return $arr['output']; } @@ -233,6 +319,7 @@ function contacts_content(&$a) { $tpl = load_view_file("view/contacts-top.tpl"); $o .= replace_macros($tpl,array( + '$header' => t('Contacts'), '$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ), '$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')), '$search' => $search, @@ -286,8 +373,7 @@ function contacts_content(&$a) { default: break; } - - if($rr['rel'] != REL_FAN) { + if(($rr['network'] === 'dfrn') && ($rr['rel'])) { $url = "redir/{$rr['id']}"; $sparkle = ' class="sparkle" '; } @@ -298,17 +384,19 @@ function contacts_content(&$a) { $o .= replace_macros($tpl, array( - '$img_hover' => t('Visit ') . $rr['name'] . t('\'s profile'), + '$img_hover' => t('Visit $username\'s profile'), '$edit_hover' => t('Edit contact'), '$id' => $rr['id'], '$alt_text' => $alt_text, '$dir_icon' => $dir_icon, '$thumb' => $rr['thumb'], - '$name' => $rr['name'], + '$name' => substr($rr['name'],0,20), + '$username' => $rr['name'], '$sparkle' => $sparkle, '$url' => $url )); } + $o .= '
'; }