X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcontacts.php;h=02c75c7755c6d9d28942ed420803847f5f12944b;hb=57fe19da72be37104915676b8003326d8e440343;hp=45f792d30f4f874b812def3b30cc2795da2ccc68;hpb=65a420b22755f774dc2422f7fdf3709e01289945;p=friendica.git
diff --git a/mod/contacts.php b/mod/contacts.php
index 45f792d30f..02c75c7755 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 [profile address]'),
+ '$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)) {
@@ -34,14 +44,18 @@ function contacts_post(&$a) {
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']);
+ if($priority == (-1))
+
if($priority > 5 || $priority < 0)
$priority = 0;
@@ -58,7 +72,7 @@ function contacts_post(&$a) {
intval($rating),
dbesc($reason),
intval($contact_id),
- intval(get_uid())
+ intval(local_user())
);
if($r)
notice( t('Contact updated.') . EOL);
@@ -72,7 +86,11 @@ function contacts_post(&$a) {
function contacts_content(&$a) {
+ $sort_type = 0;
+ $o = '';
$o .= '';
+
+
if(! local_user()) {
notice( t('Permission denied.') . EOL);
return;
@@ -88,7 +106,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)) {
@@ -98,12 +116,12 @@ function contacts_content(&$a) {
}
- if($cmd == 'block') {
+ 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 );
@@ -112,12 +130,12 @@ function contacts_content(&$a) {
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 );
@@ -126,7 +144,7 @@ function contacts_content(&$a) {
return; // NOTREACHED
}
- if($cmd == 'drop') {
+ if($cmd === 'drop') {
contact_remove($contact_id);
notice( t('Contact has been removed.') . EOL );
goaway($a->get_baseurl() . '/contacts');
@@ -138,7 +156,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)) {
@@ -146,21 +164,23 @@ function contacts_content(&$a) {
return;
}
+ $_SESSION['return_url'] = $a->get_baseurl() . '/' . $a->cmd;
+
require_once('view/contact_selectors.php');
- $tpl = file_get_contents("view/contact_edit.tpl");
+ $tpl = load_view_file("view/contact_edit.tpl");
switch($r[0]['rel']) {
- case DIRECTION_BOTH:
+ case REL_BUD:
$dir_icon = 'images/lrarrow.gif';
$alt_text = t('Mutual Friendship');
break;
- case DIRECTION_IN;
+ case REL_VIP;
$dir_icon = 'images/larrow.gif';
$alt_text = t('is a fan of yours');
break;
- case DIRECTION_OUT;
+ case REL_FAN;
$dir_icon = 'images/rarrow.gif';
$alt_text = t('you are a fan of');
break;
@@ -168,15 +188,25 @@ function contacts_content(&$a) {
break;
}
+ if(($r[0]['network'] === 'dfrn') && ($r[0]['rel'])) {
+ $url = "redir/{$r[0]['id']}";
+ $sparkle = ' class="sparkle" ';
+ }
+ else {
+ $url = $r[0]['url'];
+ $sparkle = '';
+ }
+
$o .= replace_macros($tpl,array(
'$poll_interval' => contact_poll_interval($r[0]['priority']),
'$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']),
+ '$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'] === 'dfrn') ? '' : load_view_file('view/insecure_net.tpl')),
'$blocked' => (($r[0]['blocked']) ? '' . t('Currently blocked') . '
' : ''),
'$ignored' => (($r[0]['readonly']) ? '' . t('Currently ignored') . '
' : ''),
'$rating' => contact_reputation($r[0]['rating']),
@@ -186,7 +216,8 @@ function contacts_content(&$a) {
'$name' => $r[0]['name'],
'$dir_icon' => $dir_icon,
'$alt_text' => $alt_text,
- '$url' => (($r[0]['rel'] != DIRECTION_OUT) ? "redir/{$r[0]['id']}" : $r[0]['url'] )
+ '$sparkle' => $sparkle,
+ '$url' => $url
));
@@ -195,14 +226,14 @@ function contacts_content(&$a) {
}
- if(($a->argc == 2) && ($a->argv[1] == 'all'))
+ if(($a->argc == 2) && ($a->argv[1] === 'all'))
$sql_extra = '';
else
$sql_extra = " AND `blocked` = 0 ";
$search = ((x($_GET,'search')) ? notags(trim($_GET['search'])) : '');
- $tpl = file_get_contents("view/contacts-top.tpl");
+ $tpl = load_view_file("view/contacts-top.tpl");
$o .= replace_macros($tpl,array(
'$hide_url' => ((strlen($sql_extra)) ? 'contacts/all' : 'contacts' ),
'$hide_text' => ((strlen($sql_extra)) ? t('Show Blocked Connections') : t('Hide Blocked Connections')),
@@ -218,23 +249,9 @@ function contacts_content(&$a) {
$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)) : '');
- switch($sort_type) {
- case DIRECTION_BOTH :
- $sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` != '' ";
- break;
- case DIRECTION_IN :
- $sql_extra2 = " AND `dfrn-id` = '' AND `issued-id` != '' ";
- break;
- case DIRECTION_OUT :
- $sql_extra2 = " AND `dfrn-id` != '' AND `issued-id` = '' ";
- break;
- case DIRECTION_NONE :
- default:
- $sql_extra2 = '';
- break;
- }
-
+
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ",
intval($_SESSION['uid']));
@@ -249,28 +266,37 @@ function contacts_content(&$a) {
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;
switch($rr['rel']) {
- case DIRECTION_BOTH:
+ case REL_BUD:
$dir_icon = 'images/lrarrow.gif';
$alt_text = t('Mutual Friendship');
break;
- case DIRECTION_IN;
+ case REL_VIP;
$dir_icon = 'images/larrow.gif';
$alt_text = t('is a fan of yours');
break;
- case DIRECTION_OUT;
+ case REL_FAN;
$dir_icon = 'images/rarrow.gif';
$alt_text = t('you are a fan of');
break;
default:
break;
}
+ 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'),
@@ -280,7 +306,8 @@ function contacts_content(&$a) {
'$dir_icon' => $dir_icon,
'$thumb' => $rr['thumb'],
'$name' => $rr['name'],
- '$url' => (($rr['rel'] != DIRECTION_OUT) ? "redir/{$rr['id']}" : $rr['url'] )
+ '$sparkle' => $sparkle,
+ '$url' => $url
));
}
$o .= '';