X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcontacts.php;h=c2d28dc1f25e5d7363e041170724c66fb2fb5474;hb=2856664eeb44bfb2b1190965562b55740dc22113;hp=999617aa19d155328ca638096cc51e7409fad362;hpb=a6cde63fd87f003f8678247a25ecd883cd019689;p=friendica.git
diff --git a/mod/contacts.php b/mod/contacts.php
index 999617aa19..c2d28dc1f2 100644
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -1,12 +1,26 @@
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) {
-
if(! local_user())
return;
@@ -17,44 +31,58 @@ function contacts_post(&$a) {
$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id),
- intval($_SESSION['uid'])
+ intval(local_user())
);
if(! count($orig_record)) {
- notice("Could not access contact record." . EOL);
+ notice( t('Could not access contact record.') . EOL);
goaway($a->get_baseurl() . '/contacts');
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($_SESSION['uid'])
+ intval(local_user())
);
if(! count($r)) {
- notice("Cannot locate selected profile." . EOL);
+ notice( t('Could not locate selected profile.') . EOL);
return;
}
}
+logger('contact_edit ' . print_r($_POST,true));
+
+ $priority = intval($_POST['poll']);
+ if($priority == (-1))
+
+ if($priority > 5 || $priority < 0)
+ $priority = 0;
+
$rating = intval($_POST['reputation']);
if($rating > 5 || $rating < 0)
$rating = 0;
$reason = notags(trim($_POST['reason']));
- $r = q("UPDATE `contact` SET `profile-id` = %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($_SESSION['uid'])
+ intval(local_user())
);
if($r)
- notice("Contact updated." . EOL);
+ notice( t('Contact updated.') . EOL);
else
- notice("Failed to update contact record." . EOL);
+ notice( t('Failed to update contact record.') . EOL);
return;
}
@@ -63,8 +91,14 @@ function contacts_post(&$a) {
function contacts_content(&$a) {
+ $sort_type = 0;
+ $o = '';
+ $o .= '';
+
+ $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
if(! local_user()) {
- $_SESSION['sysmsg'] .= "Permission denied." . EOL;
+ notice( t('Permission denied.') . EOL);
return;
}
@@ -78,53 +112,86 @@ function contacts_content(&$a) {
$orig_record = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id),
- intval($_SESSION['uid'])
+ intval(local_user())
);
if(! count($orig_record)) {
- notice("Could not access contact record." . EOL);
+ notice( t('Could not access contact record.') . EOL);
goaway($a->get_baseurl() . '/contacts');
return; // NOTREACHED
}
+ if($cmd === 'update') {
- $photo = str_replace('-4.jpg', '' , $r[0]['photo']);
- $photos = q("SELECT `id` FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d",
- dbesc($photo),
- intval($_SESSION['uid'])
- );
-
- 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($_SESSION['uid'])
+ intval(local_user())
+ );
+ if($r) {
+ notice( t('Contact has been ') . (($blocked) ? t('blocked') : t('unblocked')) . EOL );
+ }
+ goaway($a->get_baseurl() . '/contacts/' . $contact_id);
+ return; // NOTREACHED
+ }
+
+ 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())
);
if($r) {
- $msg = "Contact has been " . (($blocked) ? '' : 'un') . "blocked." . EOL ;
- notice($msg);
+ notice( t('Contact has been ') . (($readonly) ? t('ignored') : t('unignored')) . EOL );
}
- goaway($a->get_baseurl() ."/contacts/$contact_id");
+ goaway($a->get_baseurl() . '/contacts/' . $contact_id);
return; // NOTREACHED
}
- if($cmd == 'drop') {
- $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($contact_id),
- intval($_SESSION['uid']));
- if(count($photos)) {
- foreach($photos as $p) {
- q("DELETE FROM `photos` WHERE `id` = %d LIMIT 1",
- $p['id']);
+ 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' => '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($intval($contact_id))
- q("DELETE FROM `item` WHERE `contact-id` = %d LIMIT 1",
- intval($contact_id)
- );
-
- notice("Contact has been removed." . EOL );
+
+ 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');
return; // NOTREACHED
}
@@ -134,42 +201,74 @@ function contacts_content(&$a) {
$contact_id = intval($a->argv[1]);
$r = q("SELECT * FROM `contact` WHERE `uid` = %d and `id` = %d LIMIT 1",
- $_SESSION['uid'],
+ intval(local_user()),
intval($contact_id)
);
if(! count($r)) {
- notice("Contact not found.");
+ notice( t('Contact not found.') . EOL);
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 = file_get_contents("view/contact_edit.tpl");
+ $tpl = load_view_file("view/contact_edit.tpl");
- $direction = '';
- if(strlen($r[0]['issued-id'])) {
- if(strlen($r[0]['dfrn-id'])) {
- $direction = DIRECTION_BOTH;
+ switch($r[0]['rel']) {
+ case REL_BUD:
$dir_icon = 'images/lrarrow.gif';
- $alt_text = 'Mutual Friendship';
- }
- else {
- $direction = DIRECTION_IN;
+ $alt_text = t('Mutual Friendship');
+ break;
+ case REL_VIP;
$dir_icon = 'images/larrow.gif';
- $alt_text = 'is a fan of yours';
- }
+ $alt_text = t('is a fan of yours');
+ break;
+
+ case REL_FAN;
+ $dir_icon = 'images/rarrow.gif';
+ $alt_text = t('you are a fan of');
+ break;
+ default:
+ break;
}
- else {
- $direction = DIRECTION_OUT;
- $dir_icon = 'images/rarrow.gif';
- $alt_text = 'you are a fan of';
+
+ if(($r[0]['network'] === 'dfrn') && ($r[0]['rel'])) {
+ $url = "redir/{$r[0]['id']}";
+ $sparkle = ' class="sparkle" ';
+ }
+ else {
+ $url = $r[0]['url'];
+ $sparkle = '';
}
+ $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(
- '$profile_select' => contact_profile_assign($r[0]['profile-id']),
+ '$header' => t('Contact Editor'),
+ '$visit' => t('Visit $name\'s profile'),
+ '$blockunblock' => t('Block/Unblock contact'),
+ '$ignorecont' => t('Ignore contact'),
+ '$delete' => t('Delete contact'),
+ '$poll_interval' => contact_poll_interval($r[0]['priority']),
+ '$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']) ? 'Unblock this contact' : 'Block this contact' ),
- '$blocked' => (($r[0]['blocked']) ? 'Currently blocked
' : ''),
+ '$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'] === 'stat') ? load_view_file('view/insecure_net.tpl') : ''),
+ '$info' => $r[0]['info'],
+ '$blocked' => (($r[0]['blocked']) ? '' . t('Currently blocked') . '
' : ''),
+ '$ignored' => (($r[0]['readonly']) ? '' . t('Currently ignored') . '
' : ''),
'$rating' => contact_reputation($r[0]['rating']),
'$reason' => $r[0]['reason'],
'$groups' => '', // group_selector(),
@@ -177,79 +276,109 @@ function contacts_content(&$a) {
'$name' => $r[0]['name'],
'$dir_icon' => $dir_icon,
'$alt_text' => $alt_text,
- '$url' => (($direction != DIRECTION_IN) ? "redir/{$r[0]['id']}" : $r[0]['url'] )
+ '$sparkle' => $sparkle,
+ '$url' => $url
));
- return $o;
+ $arr = array('contact' => $r[0],'output' => $o);
+
+ call_hooks('contact_edit', $arr);
+
+ return $arr['output'];
}
- if(($a->argc == 2) && ($a->argv[1] == 'all'))
+
+ if(($a->argc == 2) && ($a->argv[1] === 'all'))
$sql_extra = '';
else
$sql_extra = " AND `blocked` = 0 ";
- $tpl = file_get_contents("view/contacts-top.tpl");
+ $search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
+
+ $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)) ? 'Show Blocked Connections' : 'Hide Blocked Connections')
+ '$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
+ '$search' => $search,
+ '$finding' => (strlen($search) ? '' . t('Finding: ') . "'" . $search . "'" . '
' : ""),
+ '$submit' => t('Find'),
+ '$cmd' => $a->cmd
+
+
));
- switch($sort_type) {
- case DIRECTION_BOTH :
- $sql_extra = " AND `dfrn-id` != '' AND `issued-id` != '' ";
- break;
- case DIRECTION_IN :
- $sql_extra = " AND `dfrn-id` = '' AND `issued-id` != '' ";
- break;
- case DIRECTION_OUT :
- $sql_extra = " AND `dfrn-id` != '' AND `issued-id` = '' ";
- break;
- case DIRECTION_ANY :
- default:
- $sql_extra = '';
- break;
- }
+ if($search)
+ $search = dbesc($search.'*');
+ $sql_extra .= ((strlen($search)) ? " AND MATCH `name` AGAINST ('$search' IN BOOLEAN MODE) " : "");
+
+ $sql_extra2 = ((($sort_type > 0) && ($sort_type <= REL_BUD)) ? sprintf(" AND `rel` = %d ",intval($sort_type)) : '');
- $r = q("SELECT * FROM `contact` WHERE `uid` = %d $sql_extra",
+
+ $r = q("SELECT COUNT(*) AS `total` FROM `contact`
+ WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
intval($_SESSION['uid']));
+ if(count($r))
+ $a->set_pager_total($r[0]['total']);
+
+ $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
+ intval($_SESSION['uid']),
+ intval($a->pager['start']),
+ intval($a->pager['itemspage'])
+ );
if(count($r)) {
- $tpl = file_get_contents("view/contact_template.tpl");
+ $tpl = load_view_file("view/contact_template.tpl");
foreach($r as $rr) {
if($rr['self'])
continue;
- $direction = '';
- if(strlen($rr['issued-id'])) {
- if(strlen($rr['dfrn-id'])) {
- $direction = DIRECTION_BOTH;
+
+ switch($rr['rel']) {
+ case REL_BUD:
$dir_icon = 'images/lrarrow.gif';
- $alt_text = 'Mutual Friendship';
- }
- else {
- $direction = DIRECTION_IN;
+ $alt_text = t('Mutual Friendship');
+ break;
+ case REL_VIP;
$dir_icon = 'images/larrow.gif';
- $alt_text = 'is a fan of yours';
- }
+ $alt_text = t('is a fan of yours');
+ break;
+ case REL_FAN;
+ $dir_icon = 'images/rarrow.gif';
+ $alt_text = t('you are a fan of');
+ break;
+ default:
+ break;
}
- else {
- $direction = DIRECTION_OUT;
- $dir_icon = 'images/rarrow.gif';
- $alt_text = 'you are a fan of';
+ if(($rr['network'] === 'dfrn') && ($rr['rel'])) {
+ $url = "redir/{$rr['id']}";
+ $sparkle = ' class="sparkle" ';
+ }
+ else {
+ $url = $rr['url'];
+ $sparkle = '';
}
+
$o .= replace_macros($tpl, array(
+ '$img_hover' => t('Visit ') . $rr['name'] . t('\'s profile'),
+ '$edit_hover' => t('Edit contact'),
'$id' => $rr['id'],
'$alt_text' => $alt_text,
'$dir_icon' => $dir_icon,
'$thumb' => $rr['thumb'],
- '$name' => $rr['name'],
- '$url' => (($direction != DIRECTION_IN) ? "redir/{$rr['id']}" : $rr['url'] )
+ '$name' => substr($rr['name'],0,20),
+ '$sparkle' => $sparkle,
+ '$url' => $url
));
}
+
+ $o .= '';
+
}
+ $o .= paginate($a);
return $o;
}
\ No newline at end of file