intval($intro_id)
);
if(! $fid) {
- $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1",
+
+ // The check for blocked and pending is in case the friendship was already approved
+ // and we just want to get rid of the now pointless notification
+
+ $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 AND `blocked` = 1 AND `pending` = 1 LIMIT 1",
intval($contact_id),
intval(local_user())
);
}
- return;
+ goaway($a->get_baseurl(true) . '/notifications/intros');
}
if($_POST['submit'] == t('Ignore')) {
$r = q("UPDATE `intro` SET `ignore` = 1 WHERE `id` = %d LIMIT 1",
intval($intro_id));
- return;
+ goaway($a->get_baseurl(true) . '/notifications/intros');
}
}
}
notice( t('Permission denied.') . EOL);
return;
}
-
- $notif_tpl = get_markup_template('notifications.tpl');
-
+
+ nav_set_selected('notifications');
+
+ $json = (($a->argc > 1 && $a->argv[$a->argc - 1] === 'json') ? true : false);
+
+
+ $o = '';
$tabs = array(
- 'net' => array('label' => t('Network'), 'url'=>$a->get_baseurl().'/notifications/network', 'sel'=>''),
- 'home' => array('label' => t('Home'), 'url'=>$a->get_baseurl().'/notifications/home', 'sel'=>''),
- 'intros'=> array('label' => t('Introductions'), 'url'=>$a->get_baseurl().'/notifications/intros', 'sel'=>''),
- 'msg' => array('label' => t('Messages'), 'url'=>$a->get_baseurl().'/message', 'sel'=>''),
+ array(
+ 'label' => t('System'),
+ 'url'=>$a->get_baseurl(true) . '/notifications/system',
+ 'sel'=> (($a->argv[1] == 'system') ? 'active' : ''),
+ ),
+ array(
+ 'label' => t('Network'),
+ 'url'=>$a->get_baseurl(true) . '/notifications/network',
+ 'sel'=> (($a->argv[1] == 'network') ? 'active' : ''),
+ ),
+ array(
+ 'label' => t('Personal'),
+ 'url'=>$a->get_baseurl(true) . '/notifications/personal',
+ 'sel'=> (($a->argv[1] == 'personal') ? 'active' : ''),
+ ),
+ array(
+ 'label' => t('Home'),
+ 'url' => $a->get_baseurl(true) . '/notifications/home',
+ 'sel'=> (($a->argv[1] == 'home') ? 'active' : ''),
+ ),
+ array(
+ 'label' => t('Introductions'),
+ 'url' => $a->get_baseurl(true) . '/notifications/intros',
+ 'sel'=> (($a->argv[1] == 'intros') ? 'active' : ''),
+ ),
+ array(
+ 'label' => t('Messages'),
+ 'url' => $a->get_baseurl(true) . '/message',
+ 'sel'=> '',
+ ),
);
-
-
- $o = '';
+ $o = "";
+
if( (($a->argc > 1) && ($a->argv[1] == 'intros')) || (($a->argc == 1))) {
-
+ nav_set_selected('introductions');
if(($a->argc > 2) && ($a->argv[2] == 'all'))
$sql_extra = '';
else
$sql_extra = " AND `ignore` = 0 ";
-
+ $notif_tpl = get_markup_template('notifications.tpl');
$notif_content .= '<a href="' . ((strlen($sql_extra)) ? 'notifications/intros/all' : 'notifications/intros' ) . '" id="notifications-show-hide-link" >'
. ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '</a></div>' . "\r\n";
'$intro_id' => $rr['intro_id'],
'$madeby' => sprintf( t('suggested by %s'),$rr['name']),
'$contact_id' => $rr['contact-id'],
- '$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/default-profile.jpg"),
+ '$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/person-175.jpg"),
'$fullname' => $rr['fname'],
- '$url' => $rr['furl'],
+ '$url' => zrl($rr['furl']),
+ '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
+ '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
+
'$knowyou' => $knowyou,
'$approve' => t('Approve'),
'$note' => $rr['note'],
'$uid' => $_SESSION['uid'],
'$intro_id' => $rr['intro_id'],
'$contact_id' => $rr['contact-id'],
- '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/default-profile.jpg"),
+ '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"),
'$fullname' => $rr['name'],
- '$url' => $rr['url'],
+ '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''),
+ '$activity' => array('activity', t('Post a new friend activity'), (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), t('if applicable')),
+ '$url' => zrl($rr['url']),
'$knowyou' => $knowyou,
'$approve' => t('Approve'),
'$note' => $rr['note'],
}
}
else
- $notif_content .= t('<p>No notifications.</p>');
-
- $tabs['intros']['sel']='active';
+ info( t('No introductions.') . EOL);
+
$o .= replace_macros($notif_tpl,array(
- '$notif_content' => $notif_content,
+ '$notif_header' => t('Notifications'),
'$tabs' => $tabs,
+ '$notif_content' => $notif_content,
));
$o .= paginate($a);
} else if (($a->argc > 1) && ($a->argv[1] == 'network')) {
+ $notif_tpl = get_markup_template('notifications.tpl');
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`,
`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
- WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
+ WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND `pitem`.`parent` != 0
`item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" ,
intval(local_user())
);
$notif_content = '';
- if (count($r) > 0) {
+ if ($r) {
foreach ($r as $it) {
switch($it['verb']){
case ACTIVITY_LIKE:
$notif_content .= replace_macros($tpl_item_likes,array(
- '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+ '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
'$item_image' => $it['author-avatar'],
'$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
'$item_when' => relative_date($it['created'])
case ACTIVITY_DISLIKE:
$notif_content .= replace_macros($tpl_item_dislikes,array(
- '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+ '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
'$item_image' => $it['author-avatar'],
'$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
'$item_when' => relative_date($it['created'])
$it['fname'] = $obj->title;
$notif_content .= replace_macros($tpl_item_friends,array(
- '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+ '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
'$item_image' => $it['author-avatar'],
'$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
'$item_when' => relative_date($it['created'])
$tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments);
$notif_content .= replace_macros($tpl,array(
- '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+ '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
'$item_image' => $it['author-avatar'],
'$item_text' => $item_text,
'$item_when' => relative_date($it['created'])
} else {
- $notif_content = t('Nothing new!');
+ $notif_content = t('No more network notifications.');
}
- $tabs['net']['sel']='active';
$o .= replace_macros($notif_tpl,array(
+ '$notif_header' => t('Network Notifications'),
+ '$tabs' => $tabs,
'$notif_content' => $notif_content,
+ ));
+
+ } else if (($a->argc > 1) && ($a->argv[1] == 'system')) {
+
+ $notif_tpl = get_markup_template('notifications.tpl');
+
+ $not_tpl = get_markup_template('notify.tpl');
+ require_once('include/bbcode.php');
+
+ $r = q("SELECT * from notify where uid = %d and seen = 0 order by date desc",
+ intval(local_user())
+ );
+
+ if (count($r) > 0) {
+ foreach ($r as $it) {
+ $notif_content .= replace_macros($not_tpl,array(
+ '$item_link' => $a->get_baseurl(true).'/notify/view/'. $it['id'],
+ '$item_image' => $it['photo'],
+ '$item_text' => strip_tags(bbcode($it['msg'])),
+ '$item_when' => relative_date($it['date'])
+ ));
+ }
+ } else {
+ $notif_content .= t('No more system notifications.');
+ }
+
+ $o .= replace_macros($notif_tpl,array(
+ '$notif_header' => t('System Notifications'),
'$tabs' => $tabs,
+ '$notif_content' => $notif_content,
));
+
+ } else if (($a->argc > 1) && ($a->argv[1] == 'personal')) {
+
+ $notif_tpl = get_markup_template('notifications.tpl');
+ $myurl = $a->get_baseurl(true) . '/profile/'. $a->user['nickname'];
+ $myurl = substr($myurl,strpos($myurl,'://')+3);
+ $myurl = str_replace(array('www.','.'),array('','\\.'),$myurl);
+ $diasp_url = str_replace('/profile/','/u/',$myurl);
+ $sql_extra .= sprintf(" AND ( `item`.`author-link` regexp '%s' or `item`.`tag` regexp '%s' or `item`.`tag` regexp '%s' ) ",
+ dbesc($myurl . '$'),
+ dbesc($myurl . '\\]'),
+ dbesc($diasp_url . '\\]')
+ );
+
+
+ $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
+ `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`,
+ `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
+ FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
+ WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1
+ $sql_extra
+ AND `item`.`deleted` = 0 AND `item`.`uid` = %d AND `item`.`wall` = 0 ORDER BY `item`.`created` DESC" ,
+ intval(local_user())
+ );
+
+ $tpl_item_likes = get_markup_template('notifications_likes_item.tpl');
+ $tpl_item_dislikes = get_markup_template('notifications_dislikes_item.tpl');
+ $tpl_item_friends = get_markup_template('notifications_friends_item.tpl');
+ $tpl_item_comments = get_markup_template('notifications_comments_item.tpl');
+ $tpl_item_posts = get_markup_template('notifications_posts_item.tpl');
+
+ $notif_content = '';
+
+ if (count($r) > 0) {
+
+ foreach ($r as $it) {
+ switch($it['verb']){
+ case ACTIVITY_LIKE:
+ $notif_content .= replace_macros($tpl_item_likes,array(
+ '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
+ '$item_image' => $it['author-avatar'],
+ '$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
+ '$item_when' => relative_date($it['created'])
+ ));
+ break;
+
+ case ACTIVITY_DISLIKE:
+ $notif_content .= replace_macros($tpl_item_dislikes,array(
+ '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
+ '$item_image' => $it['author-avatar'],
+ '$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
+ '$item_when' => relative_date($it['created'])
+ ));
+ break;
+
+ case ACTIVITY_FRIEND:
+
+ $xmlhead="<"."?xml version='1.0' encoding='UTF-8' ?".">";
+ $obj = parse_xml_string($xmlhead.$it['object']);
+ $it['fname'] = $obj->title;
+
+ $notif_content .= replace_macros($tpl_item_friends,array(
+ '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
+ '$item_image' => $it['author-avatar'],
+ '$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
+ '$item_when' => relative_date($it['created'])
+ ));
+ break;
+
+ default:
+ $item_text = (($it['id'] == $it['parent'])
+ ? sprintf( t("%s created a new post"), $it['author-name'])
+ : sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']));
+ $tpl = (($it['id'] == $it['parent']) ? $tpl_item_posts : $tpl_item_comments);
+
+ $notif_content .= replace_macros($tpl,array(
+ '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
+ '$item_image' => $it['author-avatar'],
+ '$item_text' => $item_text,
+ '$item_when' => relative_date($it['created'])
+ ));
+ }
+ }
+
+ } else {
+
+ $notif_content = t('No more personal notifications.');
+ }
+
+ $o .= replace_macros($notif_tpl,array(
+ '$notif_header' => t('Personal Notifications'),
+ '$tabs' => $tabs,
+ '$notif_content' => $notif_content,
+ ));
+
+
+
+
+
+
} else if (($a->argc > 1) && ($a->argv[1] == 'home')) {
+ $notif_tpl = get_markup_template('notifications.tpl');
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`,
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object` as `object`,
switch($it['verb']){
case ACTIVITY_LIKE:
$notif_content .= replace_macros($tpl_item_likes,array(
- '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+ '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
'$item_image' => $it['author-avatar'],
'$item_text' => sprintf( t("%s liked %s's post"), $it['author-name'], $it['pname']),
'$item_when' => relative_date($it['created'])
break;
case ACTIVITY_DISLIKE:
$notif_content .= replace_macros($tpl_item_dislikes,array(
- '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+ '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
'$item_image' => $it['author-avatar'],
'$item_text' => sprintf( t("%s disliked %s's post"), $it['author-name'], $it['pname']),
'$item_when' => relative_date($it['created'])
$it['fname'] = $obj->title;
$notif_content .= replace_macros($tpl_item_friends,array(
- '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+ '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
'$item_image' => $it['author-avatar'],
'$item_text' => sprintf( t("%s is now friends with %s"), $it['author-name'], $it['fname']),
'$item_when' => relative_date($it['created'])
break;
default:
$notif_content .= replace_macros($tpl_item_comments,array(
- '$item_link' => $a->get_baseurl().'/display/'.$a->user['nickname']."/".$it['parent'],
+ '$item_link' => $a->get_baseurl(true).'/display/'.$a->user['nickname']."/".$it['parent'],
'$item_image' => $it['author-avatar'],
'$item_text' => sprintf( t("%s commented on %s's post"), $it['author-name'], $it['pname']),
'$item_when' => relative_date($it['created'])
}
} else {
- $notif_content = t('Nothing new!');
+ $notif_content = t('No more home notifications.');
}
- $tabs['home']['sel'] = 'active';
$o .= replace_macros($notif_tpl,array(
- '$notif_content' => $notif_content,
+ '$notif_header' => t('Home Notifications'),
'$tabs' => $tabs,
+ '$notif_content' => $notif_content,
));
}
projects / friendica.git / blobdiff